From 4bc94ba024ce53b7539fc36b112454d31d06d060 Mon Sep 17 00:00:00 2001
From: Akshay Aggarwal <akshay.aggarwal@smartcontract.com>
Date: Tue, 26 Sep 2023 23:11:23 +0100
Subject: [PATCH] Fix mercury v0.3 decoding

---
 .../ocr2keeper/evm21/streams_lookup.go        |  7 +++--
 .../ocr2keeper/evm21/streams_lookup_test.go   | 31 ++++++++++---------
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/streams_lookup.go b/core/services/ocr2/plugins/ocr2keeper/evm21/streams_lookup.go
index c7345e4ed2f..9adf50f145c 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evm21/streams_lookup.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evm21/streams_lookup.go
@@ -66,10 +66,10 @@ type MercuryV03Response struct {
 }
 
 type MercuryV03Report struct {
-	FeedID                []byte `json:"feedID"` // feed id in hex
+	FeedID                string `json:"feedID"` // feed id in hex encoded
 	ValidFromTimestamp    uint32 `json:"validFromTimestamp"`
 	ObservationsTimestamp uint32 `json:"observationsTimestamp"`
-	FullReport            []byte `json:"fullReport"` // the actual mercury report of this feed, can be sent to verifier
+	FullReport            string `json:"fullReport"` // the actual hex encoded mercury report of this feed, can be sent to verifier
 }
 
 type MercuryData struct {
@@ -533,7 +533,8 @@ func (r *EvmRegistry) multiFeedsRequest(ctx context.Context, ch chan<- MercuryDa
 			}
 			var reportBytes [][]byte
 			for _, rsp := range response.Reports {
-				reportBytes = append(reportBytes, rsp.FullReport)
+				b, _ := hexutil.Decode(rsp.FullReport)
+				reportBytes = append(reportBytes, b)
 			}
 			ch <- MercuryData{
 				Index:     0,
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/streams_lookup_test.go b/core/services/ocr2/plugins/ocr2keeper/evm21/streams_lookup_test.go
index 95b43c98195..8d7ac09486c 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evm21/streams_lookup_test.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evm21/streams_lookup_test.go
@@ -681,16 +681,16 @@ func TestEvmRegistry_MultiFeedRequest(t *testing.T) {
 			response: &MercuryV03Response{
 				Reports: []MercuryV03Report{
 					{
-						FeedID:                hexutil.MustDecode("0x4554482d5553442d415242495452554d2d544553544e45540000000000000000"),
+						FeedID:                "0x4554482d5553442d415242495452554d2d544553544e45540000000000000000",
 						ValidFromTimestamp:    123456,
 						ObservationsTimestamp: 123456,
-						FullReport:            hexutil.MustDecode("0xab2123dc00000012"),
+						FullReport:            "0xab2123dc00000012",
 					},
 					{
-						FeedID:                hexutil.MustDecode("0x4254432d5553442d415242495452554d2d544553544e45540000000000000000"),
+						FeedID:                "0x4254432d5553442d415242495452554d2d544553544e45540000000000000000",
 						ValidFromTimestamp:    123458,
 						ObservationsTimestamp: 123458,
-						FullReport:            hexutil.MustDecode("0xab2123dc00000016"),
+						FullReport:            "0xab2123dc00000016",
 					},
 				},
 			},
@@ -711,16 +711,16 @@ func TestEvmRegistry_MultiFeedRequest(t *testing.T) {
 			response: &MercuryV03Response{
 				Reports: []MercuryV03Report{
 					{
-						FeedID:                hexutil.MustDecode("0x4554482d5553442d415242495452554d2d544553544e45540000000000000000"),
+						FeedID:                "0x4554482d5553442d415242495452554d2d544553544e45540000000000000000",
 						ValidFromTimestamp:    123456,
 						ObservationsTimestamp: 123456,
-						FullReport:            hexutil.MustDecode("0xab2123dc00000012"),
+						FullReport:            "0xab2123dc00000012",
 					},
 					{
-						FeedID:                hexutil.MustDecode("0x4254432d5553442d415242495452554d2d544553544e45540000000000000000"),
+						FeedID:                "0x4254432d5553442d415242495452554d2d544553544e45540000000000000000",
 						ValidFromTimestamp:    123458,
 						ObservationsTimestamp: 123458,
-						FullReport:            hexutil.MustDecode("0xab2123dc00000019"),
+						FullReport:            "0xab2123dc00000019",
 					},
 				},
 			},
@@ -789,26 +789,26 @@ func TestEvmRegistry_MultiFeedRequest(t *testing.T) {
 			firstResponse: &MercuryV03Response{
 				Reports: []MercuryV03Report{
 					{
-						FeedID:                hexutil.MustDecode("0x4554482d5553442d415242495452554d2d544553544e45540000000000000000"),
+						FeedID:                "0x4554482d5553442d415242495452554d2d544553544e45540000000000000000",
 						ValidFromTimestamp:    123456,
 						ObservationsTimestamp: 123456,
-						FullReport:            hexutil.MustDecode("0xab2123dc00000012"),
+						FullReport:            "0xab2123dc00000012",
 					},
 				},
 			},
 			response: &MercuryV03Response{
 				Reports: []MercuryV03Report{
 					{
-						FeedID:                hexutil.MustDecode("0x4554482d5553442d415242495452554d2d544553544e45540000000000000000"),
+						FeedID:                "0x4554482d5553442d415242495452554d2d544553544e45540000000000000000",
 						ValidFromTimestamp:    123456,
 						ObservationsTimestamp: 123456,
-						FullReport:            hexutil.MustDecode("0xab2123dc00000012"),
+						FullReport:            "0xab2123dc00000012",
 					},
 					{
-						FeedID:                hexutil.MustDecode("0x4254432d5553442d415242495452554d2d544553544e45540000000000000000"),
+						FeedID:                "0x4254432d5553442d415242495452554d2d544553544e45540000000000000000",
 						ValidFromTimestamp:    123458,
 						ObservationsTimestamp: 123458,
-						FullReport:            hexutil.MustDecode("0xab2123dc00000019"),
+						FullReport:            "0xab2123dc00000019",
 					},
 				},
 			},
@@ -880,7 +880,8 @@ func TestEvmRegistry_MultiFeedRequest(t *testing.T) {
 				assert.Nil(t, m.Error)
 				var reports [][]byte
 				for _, rsp := range tt.response.Reports {
-					reports = append(reports, rsp.FullReport)
+					b, _ := hexutil.Decode(rsp.FullReport)
+					reports = append(reports, b)
 				}
 				assert.Equal(t, reports, m.Bytes)
 			}