BCF-2654 chain reader evm poc get latest value impl

core/services/job/models.go

@@ -279,6 +279,34 @@ func (r JSONConfig) Bytes() []byte {
 	return b
 }
 
+// BytesWithPreservedJson returns raw bytes and properly marshals any potential json structure strings.
+func (r JSONConfig) BytesWithPreservedJson() []byte {
+	var retCopy = make(JSONConfig, 0)
+	for key, value := range r {
+		copiedVal := value
+		// If the value is a json structure string, unmarshal it to preserve JSON structure
+		// e.g. instead of this {"key":"{\"nestedKey\":{\"nestedValue\":123}}"}
+		//      we want this    {"key":{"nestedKey":{"nestedValue":123}}},
+		if strValue, ok := copiedVal.(string); ok {
+			if isValidJSONStruct(strValue) {
+				var parsedValue interface{}
+				if err := json.Unmarshal([]byte(strValue), &parsedValue); err == nil {
+					copiedVal = parsedValue
+				}
+			}
+		}
+		retCopy[key] = copiedVal
+	}
+
+	b, _ := json.Marshal(retCopy)
+	return b
+}
+
+func isValidJSONStruct(s string) bool {
+	var js map[string]interface{}
+	return json.Unmarshal([]byte(s), &js) == nil
+}
+
 // Value returns this instance serialized for database storage.
 func (r JSONConfig) Value() (driver.Value, error) {
 	return json.Marshal(r)

core/services/job/models_test.go

@@ -71,3 +71,69 @@ func TestOCR2OracleSpec_RelayIdentifier(t *testing.T) {
 		})
 	}
 }
+
+func TestJSONConfig_BytesWithPreservedJson(t *testing.T) {
+	type testCases struct {
+		name     string
+		Input    JSONConfig
+		Expected []byte
+	}
+	tests := []testCases{
+		{
+			name: "json",
+			Input: JSONConfig{
+				"key": "{\"nestedKey\": {\"nestedValue\":123}}",
+			},
+			// regular Bytes marshals to this: {"key":"{\"nestedKey\": {\"nestedValue\":123}}"}
+			Expected: []byte(`{"key":{"nestedKey":{"nestedValue":123}}}`),
+		},
+		{
+			name: "broken json gets treated as a regular string",
+			Input: JSONConfig{
+				"key": "2324{\"nes4tedKey\":\"nestedValue\"}",
+			},
+			Expected: []byte(`{"key":"2324{\"nes4tedKey\":\"nestedValue\"}"}`),
+		},
+		{
+			name: "number",
+			Input: JSONConfig{
+				"key": 1,
+			},
+			Expected: []byte(`{"key":1}`),
+		},
+		{
+			name: "string",
+			Input: JSONConfig{
+				"key": "abc",
+			},
+			Expected: []byte(`{"key":"abc"}`),
+		},
+		{
+			name: "string number stays string number",
+			Input: JSONConfig{
+				"key1": "1",
+			},
+			Expected: []byte(`{"key1":"1"}`),
+		},
+		{
+			name: "all together",
+			Input: JSONConfig{
+				"key1": "{\"nestedKey\": {\"nestedValue\":123}}",
+				"key2": "2324{\"key\":\"value\"}",
+				"key3": 1,
+				"key4": "abc",
+			},
+			Expected: []byte(`{"key1":{"nestedKey":{"nestedValue":123}},"key2":"2324{\"key\":\"value\"}","key3":1,"key4":"abc"}`),
+		},
+	}
+
+	for _, tc := range tests {
+		t.Run(tc.name, func(t *testing.T) {
+			result := tc.Input.BytesWithPreservedJson()
+			if !reflect.DeepEqual(result, tc.Expected) {
+				t.Errorf("Input: %v, BytesWithPreservedJson() returned unexpected result. Expected: %s, Got: %s", tc.Input, tc.Expected, result)
+			}
+		})
+
+	}
+}

core/services/ocr2/delegate.go

@@ -315,7 +315,7 @@ func (d *Delegate) cleanupEVM(jb job.Job, q pg.Queryer, relayID relay.ID) error
 		JobID:         jb.ID,
 		ContractID:    spec.ContractID,
 		New:           false,
-		RelayConfig:   spec.RelayConfig.Bytes(),
+		RelayConfig:   spec.RelayConfig.BytesWithPreservedJson(),
 	}
 
 	relayFilters, err := evmrelay.FilterNamesFromRelayArgs(rargs)
@@ -552,7 +552,7 @@ func (d *Delegate) newServicesGenericPlugin(
 		JobID:         spec.ID,
 		ContractID:    spec.ContractID,
 		New:           d.isNewlyCreatedJob,
-		RelayConfig:   spec.RelayConfig.Bytes(),
+		RelayConfig:   spec.RelayConfig.BytesWithPreservedJson(),
 		ProviderType:  cconf.ProviderType,
 	}, types.PluginArgs{
 		TransmitterID: spec.TransmitterID.String,
@@ -664,7 +664,7 @@ func (d *Delegate) newServicesMercury(
 			JobID:         jb.ID,
 			ContractID:    spec.ContractID,
 			New:           d.isNewlyCreatedJob,
-			RelayConfig:   spec.RelayConfig.Bytes(),
+			RelayConfig:   spec.RelayConfig.BytesWithPreservedJson(),
 			ProviderType:  string(spec.PluginType),
 		}, types.PluginArgs{
 			TransmitterID: transmitterID,
@@ -785,7 +785,7 @@ func (d *Delegate) newServicesDKG(
 			JobID:         jb.ID,
 			ContractID:    spec.ContractID,
 			New:           d.isNewlyCreatedJob,
-			RelayConfig:   spec.RelayConfig.Bytes(),
+			RelayConfig:   spec.RelayConfig.BytesWithPreservedJson(),
 		}, types.PluginArgs{
 			TransmitterID: spec.TransmitterID.String,
 			PluginConfig:  spec.PluginConfig.Bytes(),
@@ -870,7 +870,7 @@ func (d *Delegate) newServicesOCR2VRF(
 			JobID:         jb.ID,
 			ContractID:    spec.ContractID,
 			New:           d.isNewlyCreatedJob,
-			RelayConfig:   spec.RelayConfig.Bytes(),
+			RelayConfig:   spec.RelayConfig.BytesWithPreservedJson(),
 		}, types.PluginArgs{
 			TransmitterID: transmitterID,
 			PluginConfig:  spec.PluginConfig.Bytes(),
@@ -884,7 +884,7 @@ func (d *Delegate) newServicesOCR2VRF(
 			ExternalJobID: jb.ExternalJobID,
 			JobID:         jb.ID,
 			ContractID:    cfg.DKGContractAddress,
-			RelayConfig:   spec.RelayConfig.Bytes(),
+			RelayConfig:   spec.RelayConfig.BytesWithPreservedJson(),
 		}, types.PluginArgs{
 			TransmitterID: transmitterID,
 			PluginConfig:  spec.PluginConfig.Bytes(),
@@ -1327,7 +1327,7 @@ func (d *Delegate) newServicesOCR2Functions(
 				ExternalJobID: jb.ExternalJobID,
 				JobID:         jb.ID,
 				ContractID:    spec.ContractID,
-				RelayConfig:   spec.RelayConfig.Bytes(),
+				RelayConfig:   spec.RelayConfig.BytesWithPreservedJson(),
 				New:           d.isNewlyCreatedJob,
 			},
 			types.PluginArgs{

core/services/ocr2/plugins/median/services.go

@@ -26,6 +26,8 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/plugins"
 )
 
+const ContractName = "offchain_aggregator"
+
 type MedianConfig interface {
 	JobPipelineMaxSuccessfulRuns() uint64
 	plugins.RegistrarConfig
@@ -92,7 +94,7 @@ func NewMedianServices(ctx context.Context,
 		JobID:         jb.ID,
 		ContractID:    spec.ContractID,
 		New:           isNewlyCreatedJob,
-		RelayConfig:   spec.RelayConfig.Bytes(),
+		RelayConfig:   spec.RelayConfig.BytesWithPreservedJson(),
 		ProviderType:  string(spec.PluginType),
 	}, types.PluginArgs{
 		TransmitterID: spec.TransmitterID.String,
@@ -185,17 +187,17 @@ type medianContract struct {
 }
 
 type latestTransmissionDetailsResponse struct {
-	configDigest    ocr2types.ConfigDigest
-	epoch           uint32
-	round           uint8
-	latestAnswer    *big.Int
-	latestTimestamp time.Time
+	ConfigDigest    ocr2types.ConfigDigest
+	Epoch           uint32
+	Round           uint8
+	LatestAnswer    *big.Int
+	LatestTimestamp uint64
 }
 
 type latestRoundRequested struct {
-	configDigest ocr2types.ConfigDigest
-	epoch        uint32
-	round        uint8
+	ConfigDigest ocr2types.ConfigDigest
+	Epoch        uint32
+	Round        uint8
 }
 
 func (m *medianContract) LatestTransmissionDetails(ctx context.Context) (configDigest ocr2types.ConfigDigest, epoch uint32, round uint8, latestAnswer *big.Int, latestTimestamp time.Time, err error) {
@@ -205,8 +207,7 @@ func (m *medianContract) LatestTransmissionDetails(ctx context.Context) (configD
 	if err != nil {
 		return
 	}
-
-	return resp.configDigest, resp.epoch, resp.round, resp.latestAnswer, resp.latestTimestamp, err
+	return resp.ConfigDigest, resp.Epoch, resp.Round, resp.LatestAnswer, time.Unix(int64(resp.LatestTimestamp), 0), err
 }
 
 func (m *medianContract) LatestRoundRequested(ctx context.Context, lookback time.Duration) (configDigest ocr2types.ConfigDigest, epoch uint32, round uint8, err error) {
@@ -217,10 +218,10 @@ func (m *medianContract) LatestRoundRequested(ctx context.Context, lookback time
 		return
 	}
 
-	return resp.configDigest, resp.epoch, resp.round, err
+	return resp.ConfigDigest, resp.Epoch, resp.Round, err
 }
 
 func newMedianContract(chainReader types.ChainReader, address common.Address) *medianContract {
-	contract := types.BoundContract{Address: address.String(), Name: "median", Pending: true}
+	contract := types.BoundContract{Address: address.String(), Name: ContractName, Pending: true}
 	return &medianContract{chainReader, contract}
 }

core/services/ocr2/plugins/ocr2keeper/util.go

@@ -52,7 +52,7 @@ func EVMProvider(db *sqlx.DB, chain evm.Chain, lggr logger.Logger, spec job.Job,
 			ExternalJobID: spec.ExternalJobID,
 			JobID:         oSpec.ID,
 			ContractID:    oSpec.ContractID,
-			RelayConfig:   oSpec.RelayConfig.Bytes(),
+			RelayConfig:   oSpec.RelayConfig.BytesWithPreservedJson(),
 		},
 		types.PluginArgs{
 			TransmitterID: oSpec.TransmitterID.String,

core/services/ocrbootstrap/delegate.go

@@ -109,7 +109,7 @@ func (d *Delegate) ServicesForSpec(jb job.Job) (services []job.ServiceCtx, err e
 	ctx := ctxVals.ContextWithValues(context.Background())
 
 	var routerFields relayConfigRouterContractFields
-	if err = json.Unmarshal(spec.RelayConfig.Bytes(), &routerFields); err != nil {
+	if err = json.Unmarshal(spec.RelayConfig.BytesWithPreservedJson(), &routerFields); err != nil {
 		return nil, err
 	}
 
@@ -124,12 +124,12 @@ func (d *Delegate) ServicesForSpec(jb job.Job) (services []job.ServiceCtx, err e
 				ExternalJobID: jb.ExternalJobID,
 				JobID:         jb.ID,
 				ContractID:    spec.ContractID,
-				RelayConfig:   spec.RelayConfig.Bytes(),
+				RelayConfig:   spec.RelayConfig.BytesWithPreservedJson(),
 				New:           d.isNewlyCreatedJob,
 				ProviderType:  string(types.Functions),
 			},
 			types.PluginArgs{
-				PluginConfig: spec.RelayConfig.Bytes(), // contains all necessary fields for config provider
+				PluginConfig: spec.RelayConfig.BytesWithPreservedJson(), // contains all necessary fields for config provider
 			},
 		)
 	} else {
@@ -138,7 +138,7 @@ func (d *Delegate) ServicesForSpec(jb job.Job) (services []job.ServiceCtx, err e
 			JobID:         jb.ID,
 			ContractID:    spec.ContractID,
 			New:           d.isNewlyCreatedJob,
-			RelayConfig:   spec.RelayConfig.Bytes(),
+			RelayConfig:   spec.RelayConfig.BytesWithPreservedJson(),
 		})
 	}