Merge branch 'main' into BCFR-967

pkg/capabilities/consensus/ocr3/capability_test.go

@@ -101,6 +101,7 @@ func TestOCR3Capability(t *testing.T) {
 					"encoder_config":     map[string]any{},
 					"encoder":            "evm",
 					"report_id":          "ffff",
+					"key_id":             "evm",
 				},
 			)
 			require.NoError(t, err)
@@ -164,6 +165,7 @@ func TestOCR3Capability_Eviction(t *testing.T) {
 			"encoder_config":     map[string]any{},
 			"encoder":            "evm",
 			"report_id":          "aaaa",
+			"key_id":             "evm",
 		},
 	)
 	require.NoError(t, err)
@@ -231,6 +233,7 @@ func TestOCR3Capability_EvictionUsingConfig(t *testing.T) {
 			"encoder_config":     map[string]any{},
 			"encoder":            "evm",
 			"report_id":          "aaaa",
+			"key_id":             "evm",
 			"request_timeout_ms": 10000,
 		},
 	)
@@ -296,6 +299,7 @@ func TestOCR3Capability_Registration(t *testing.T) {
 		"encoder":            "",
 		"encoder_config":     map[string]any{},
 		"report_id":          "000f",
+		"key_id":             "evm",
 	})
 	require.NoError(t, err)
 
@@ -342,6 +346,7 @@ func TestOCR3Capability_ValidateConfig(t *testing.T) {
 			"encoder":            "",
 			"encoder_config":     map[string]any{},
 			"report_id":          "aaaa",
+			"key_id":             "evm",
 		})
 		require.NoError(t, err)
 
@@ -354,6 +359,7 @@ func TestOCR3Capability_ValidateConfig(t *testing.T) {
 		config, err := values.NewMap(map[string]any{
 			"aggregation_method": "data_feeds",
 			"report_id":          "aaaa",
+			"key_id":             "evm",
 		})
 		require.NoError(t, err)
 
@@ -370,6 +376,7 @@ func TestOCR3Capability_ValidateConfig(t *testing.T) {
 			"encoder":            "",
 			"encoder_config":     map[string]any{},
 			"report_id":          "aa",
+			"key_id":             "evm",
 		})
 		require.NoError(t, err)
 
@@ -378,6 +385,22 @@ func TestOCR3Capability_ValidateConfig(t *testing.T) {
 		assert.Contains(t, err.Error(), "does not match pattern") // taken from the error json schema error message
 		require.Nil(t, c)
 	})
+
+	t.Run("InvalidConfig no key_id", func(t *testing.T) {
+		config, err := values.NewMap(map[string]any{
+			"aggregation_method": "data_feeds",
+			"aggregation_config": map[string]any{},
+			"encoder":            "",
+			"encoder_config":     map[string]any{},
+			"report_id":          "aaaa",
+		})
+		require.NoError(t, err)
+
+		c, err := o.ValidateConfig(config)
+		require.Error(t, err)
+		assert.Contains(t, err.Error(), "missing properties: 'key_id'") // taken from the error json schema error message
+		require.Nil(t, c)
+	})
 }
 
 func TestOCR3Capability_RespondsToLateRequest(t *testing.T) {
@@ -399,6 +422,7 @@ func TestOCR3Capability_RespondsToLateRequest(t *testing.T) {
 			"encoder_config":     map[string]any{},
 			"encoder":            "evm",
 			"report_id":          "ffff",
+			"key_id":             "evm",
 		},
 	)
 	require.NoError(t, err)
@@ -458,6 +482,7 @@ func TestOCR3Capability_RespondingToLateRequestDoesNotBlockOnSlowResponseConsume
 			"encoder_config":     map[string]any{},
 			"encoder":            "evm",
 			"report_id":          "ffff",
+			"key_id":             "evm",
 		},
 	)
 	require.NoError(t, err)

pkg/capabilities/consensus/ocr3/models.go

@@ -12,7 +12,7 @@ type config struct {
 	ReportID          string      `mapstructure:"report_id" json:"report_id" jsonschema:"required,pattern=^[a-f0-9]{4}$"`
 	RequestTimeoutMS  int64       `mapstructure:"request_timeout_ms" json:"request_timeout_ms"`
 
-	KeyID string `mapstructure:"key_id" json:"key_id"`
+	KeyID string `mapstructure:"key_id" json:"key_id,omitempty" jsonschema:"required"`
 }
 
 type inputs struct {

pkg/capabilities/consensus/ocr3/ocr3cap/ocr3cap_common-schema.json

@@ -52,6 +52,12 @@
       "type": "object",
       "additionalProperties": true
     },
+    "key_id" : {
+      "type": "string",
+      "examples": [
+        "evm"
+      ]
+    },
     "report_id" : {
       "type": "string",
       "pattern": "^[a-f0-9]{4}$",

pkg/capabilities/consensus/ocr3/ocr3cap/ocr3cap_data_feeds_consensus-schema.json

@@ -67,6 +67,9 @@
         "encoder_config": {
           "$ref": "ocr3cap_common-schema.json#/$defs/encoder_config"
         },
+        "key_id": {
+          "$ref": "ocr3cap_common-schema.json#/$defs/key_id"
+        },
         "report_id": {
             "$ref": "ocr3cap_common-schema.json#/$defs/report_id"
         }
@@ -78,6 +81,7 @@
         "aggregation_config",
         "encoder",
         "encoder_config",
+        "key_id",
         "report_id"
       ]
     },

pkg/capabilities/consensus/ocr3/transmitter_test.go

@@ -57,6 +57,7 @@ func TestTransmitter(t *testing.T) {
 		"encoder":            "",
 		"encoder_config":     map[string]any{},
 		"report_id":          hex.EncodeToString(repID),
+		"key_id":             "evm",
 	})
 	require.NoError(t, err)
 
@@ -145,6 +146,7 @@ func TestTransmitter_ShouldReportFalse(t *testing.T) {
 		"encoder":            "",
 		"encoder_config":     map[string]any{},
 		"report_id":          "aaff",
+		"key_id":             "evm",
 	})
 	require.NoError(t, err)
 

pkg/config/validate.go

@@ -78,7 +78,7 @@ func validate(v reflect.Value, checkInterface bool) (err error) {
 		for iter.Next() {
 			mk := iter.Key()
 			mv := iter.Value()
-			if !v.CanInterface() {
+			if !mv.CanInterface() {
 				continue
 			}
 			if mv.Kind() == reflect.Ptr && mv.IsNil() {
@@ -92,7 +92,7 @@ func validate(v reflect.Value, checkInterface bool) (err error) {
 	case reflect.Slice, reflect.Array:
 		for i := 0; i < v.Len(); i++ {
 			iv := v.Index(i)
-			if !v.CanInterface() {
+			if !iv.CanInterface() {
 				continue
 			}
 			if iv.Kind() == reflect.Ptr && iv.IsNil() {

pkg/loop/internal/relayer/pluginprovider/contractreader/contract_reader.go

@@ -618,11 +618,11 @@ func convertLimitAndSortToProto(limitAndSort query.LimitAndSort) (*pb.LimitAndSo
 		var tp pb.SortType
 
 		switch sort := sortBy.(type) {
-		case query.SortByBlock:
+		case query.SortByBlock, *query.SortByBlock:
 			tp = pb.SortType_SortBlock
-		case query.SortByTimestamp:
+		case query.SortByTimestamp, *query.SortByTimestamp:
 			tp = pb.SortType_SortTimestamp
-		case query.SortBySequence:
+		case query.SortBySequence, *query.SortBySequence:
 			tp = pb.SortType_SortSequence
 		default:
 			return &pb.LimitAndSort{}, status.Errorf(codes.InvalidArgument, "Unknown sort by type: %T", sort)
@@ -902,5 +902,7 @@ func convertSequencesFromProto(pbSequences []*pb.Sequence, sequenceDataType any)
 }
 
 func RegisterContractReaderService(s *grpc.Server, contractReader types.ContractReader) {
-	pb.RegisterServiceServer(s, &goplugin.ServiceServer{Srv: contractReader})
+	service := goplugin.ServiceServer{Srv: contractReader}
+	pb.RegisterServiceServer(s, &service)
+	pb.RegisterContractReaderServer(s, NewServer(contractReader))
 }

pkg/workflows/sdk/builder_test.go

@@ -62,6 +62,7 @@ type ModifiedConfig struct {
 	DefaultDeviation        string        `yaml:"default_deviation" json:"default_deviation"`
 	FeedInfo                []FeedInfo    `yaml:"feed_info" json:"feed_info"`
 	ReportID                ocr3.ReportId `yaml:"report_id" json:"report_id"`
+	KeyID                   ocr3.KeyId    `yaml:"key_id" json:"key_id"`
 	Encoder                 ocr3.Encoder
 	EncoderConfig           ocr3.EncoderConfig `yaml:"encoder_config" json:"encoder_config"`
 	ChainWriter             *chainwriter.TargetConfig
@@ -87,6 +88,7 @@ func NewWorkflowRemapped(rawConfig []byte) (*sdk.WorkflowSpecFactory, error) {
 		Encoder:           conf.Encoder,
 		EncoderConfig:     conf.EncoderConfig,
 		ReportId:          conf.ReportID,
+		KeyId:             conf.KeyID,
 		AggregationConfig: ocr3.DataFeedsConsensusConfigAggregationConfig{
 			AllowedPartialStaleness: conf.AllowedPartialStaleness,
 		},
@@ -167,6 +169,7 @@ func NewWorkflowSpecFromPrimitives(rawConfig []byte) (*sdk.WorkflowSpecFactory,
 		Encoder:           conf.Ocr.Encoder,
 		EncoderConfig:     conf.Ocr.EncoderConfig,
 		ReportId:          conf.Ocr.ReportID,
+		KeyId:             conf.Ocr.KeyID,
 	}
 
 	consensus := ocrConfig.New(workflow, "data-feeds-report", ocr3.DataFeedsConsensusInput{
@@ -263,6 +266,7 @@ func TestBuilder_ValidSpec(t *testing.T) {
 							"Abi": "(bytes32 FeedID, uint224 Price, uint32 Timestamp)[] Reports",
 						},
 						"report_id": "0001",
+						"key_id":    "evm",
 					},
 					CapabilityType: capabilities.CapabilityTypeConsensus,
 				},
@@ -676,6 +680,7 @@ type ModifiedConsensusConfig struct {
 	Encoder                 ocr3.Encoder                                   `json:"encoder" yaml:"encoder" mapstructure:"encoder"`
 	EncoderConfig           ocr3.EncoderConfig                             `json:"encoder_config" yaml:"encoder_config" mapstructure:"encoder_config"`
 	ReportID                ocr3.ReportId                                  `json:"report_id" yaml:"report_id" mapstructure:"report_id"`
+	KeyID                   ocr3.KeyId                                     `json:"key_id" yaml:"key_id" mapstructure:"key_id"`
 }
 
 func UnmarshalYaml[T any](raw []byte) (*T, error) {