Merge branch 'main' into ARCH-331-keystore-encryptor-2

Author: connorwstein

pkg/loop/internal/goplugin/plugin_service.go

@@ -257,7 +257,17 @@ func (s *PluginService[P, S]) WaitCtx(ctx context.Context) error {
 	case <-s.serviceCh:
 		return nil
 	case <-s.stopCh:
-		return fmt.Errorf("service was stoped while waiting: %w", context.Canceled)
+		return fmt.Errorf("service was stopped while waiting: %w", context.Canceled)
+	}
+}
+
+// Wait waits for the service to start up until it receives the stop signal.
+func (s *PluginService[P, S]) Wait() error {
+	select {
+	case <-s.serviceCh:
+		return nil
+	case <-s.stopCh:
+		return fmt.Errorf("service was stopped while waiting: %w", context.Canceled)
 	}
 }
 

pkg/loop/relayer_service.go

@@ -43,10 +43,16 @@ func NewRelayerService(lggr logger.Logger, grpcOpts GRPCOpts, cmd func() *exec.C
 }
 
 func (r *RelayerService) EVM() (types.EVMService, error) {
+	if err := r.Wait(); err != nil {
+		return nil, err
+	}
 	return r.Service.EVM()
 }
 
 func (r *RelayerService) TON() (types.TONService, error) {
+	if err := r.Wait(); err != nil {
+		return nil, err
+	}
 	return r.Service.TON()
 }
 
@@ -107,6 +113,9 @@ func (r *RelayerService) GetChainStatus(ctx context.Context) (types.ChainStatus,
 }
 
 func (r *RelayerService) GetChainInfo(ctx context.Context) (types.ChainInfo, error) {
+	if err := r.WaitCtx(ctx); err != nil {
+		return types.ChainInfo{}, err
+	}
 	return r.Service.GetChainInfo(ctx)
 }
 

pkg/settings/cresettings/defaults.json

@@ -44,6 +44,7 @@
 		"LogTrigger": {
 			"Limit": "5",
 			"EventRateLimit": "every6s:10",
+			"EventSizeLimit": "5kb",
 			"FilterAddressLimit": "5",
 			"FilterTopicsPerSlotLimit": "10"
 		},

pkg/settings/cresettings/defaults.toml

@@ -45,6 +45,7 @@ RateLimit = 'every30s:3'
 [PerWorkflow.LogTrigger]
 Limit = '5'
 EventRateLimit = 'every6s:10'
+EventSizeLimit = '5kb'
 FilterAddressLimit = '5'
 FilterTopicsPerSlotLimit = '10'
 

pkg/settings/cresettings/settings.go

@@ -79,6 +79,7 @@ var Default = Schema{
 			EventRateLimit:           Rate(rate.Every(time.Minute/10), 10),
 			FilterAddressLimit:       Int(5),
 			FilterTopicsPerSlotLimit: Int(10),
+			EventSizeLimit:           Size(5 * config.KByte),
 		},
 		HTTPAction: httpAction{
 			RateLimit:         Rate(rate.Every(30*time.Second), 3),
@@ -171,6 +172,7 @@ type httpTrigger struct {
 type logTrigger struct {
 	Limit                    Setting[int] `unit:"{trigger}"`
 	EventRateLimit           Setting[config.Rate]
+	EventSizeLimit           Setting[config.Size]
 	FilterAddressLimit       Setting[int] `unit:"{address}"`
 	FilterTopicsPerSlotLimit Setting[int] `unit:"{topic}"`
 }

pkg/types/core/standard_capabilities_dependencies.go

@@ -1,7 +1,10 @@
 package core
 
+import "github.com/smartcontractkit/chainlink-common/pkg/services/orgresolver"
+
 // StandardCapabilitiesDependencies contains all the dependencies injected for capability initialization.
 // We use a struct to evolve the interface without requiring updates to all implementors.
+// i.e. Initialise(ctx context.Context, dependencies core.StandardCapabilitiesDependencies) error
 type StandardCapabilitiesDependencies struct {
 	Config             string
 	TelemetryService   TelemetryService
@@ -13,4 +16,5 @@ type StandardCapabilitiesDependencies struct {
 	OracleFactory      OracleFactory
 	GatewayConnector   GatewayConnector
 	P2PKeystore        Keystore
+	OrgResolver        orgresolver.OrgResolver
 }