address feedback

Author: silaslenihan

pkg/report/datafeeds/id.go

@@ -1,8 +1,6 @@
 package datafeeds
 
 import (
-	"bytes"
-	"encoding/binary"
 	"encoding/hex"
 	"fmt"
 )
@@ -92,33 +90,3 @@ func GetDecimals(dataType uint8) (uint8, bool) {
 	// Else if the data type is not a number
 	return 0, false
 }
-
-func (rm Metadata) Encode() ([]byte, error) {
-	buf := new(bytes.Buffer)
-	err := binary.Write(buf, binary.BigEndian, rm)
-	if err != nil {
-		return nil, err
-	}
-	return buf.Bytes(), nil
-}
-
-func (rm Metadata) Length() int {
-	bytes, err := rm.Encode()
-	if err != nil {
-		return 0
-	}
-	return len(bytes)
-}
-
-// Note: This should be a shared type that the OCR3 package validates as well
-type Metadata struct {
-	Version             uint8
-	WorkflowExecutionID [32]byte
-	Timestamp           uint32
-	DonID               uint32
-	DonConfigVersion    uint32
-	WorkflowCID         [32]byte
-	WorkflowName        [10]byte
-	WorkflowOwner       [20]byte
-	ReportID            [2]byte
-}

pkg/report/datafeeds/metadata.go

@@ -0,0 +1,36 @@
+package datafeeds
+
+import (
+	"bytes"
+	"encoding/binary"
+)
+
+func (rm Metadata) Encode() ([]byte, error) {
+	buf := new(bytes.Buffer)
+	err := binary.Write(buf, binary.BigEndian, rm)
+	if err != nil {
+		return nil, err
+	}
+	return buf.Bytes(), nil
+}
+
+func (rm Metadata) Length() int {
+	bytes, err := rm.Encode()
+	if err != nil {
+		return 0
+	}
+	return len(bytes)
+}
+
+// TODO: Unify with chainlink-common type: https://smartcontract-it.atlassian.net/browse/BCFR-1223
+type Metadata struct {
+	Version             uint8
+	WorkflowExecutionID [32]byte
+	Timestamp           uint32
+	DonID               uint32
+	DonConfigVersion    uint32
+	WorkflowCID         [32]byte
+	WorkflowName        [10]byte
+	WorkflowOwner       [20]byte
+	ReportID            [2]byte
+}

pkg/report/datafeeds/types.go

@@ -7,16 +7,17 @@ import (
 	"github.com/ethereum/go-ethereum/accounts/abi"
 )
 
-// FeedPrice represents a decoded data record with the new types.
+// This is ABI encoding - abi: "(bytes32 FeedID, bytes RawReport)[] Reports" (set in workflow)
+// Encoded with: https://github.com/smartcontractkit/chainlink/blob/develop/core/services/relay/evm/cap_encoder.go
 type FeedReport struct {
 	FeedID    [32]byte
-	Price     *big.Int // *big.Int is used because go-ethereum converts large uints to *big.Int.
 	Timestamp uint32
+	Price     *big.Int // *big.Int is used because go-ethereum converts large uints to *big.Int.
 }
 
 type Reports = []FeedReport
 
-// Define the ABI schema for our tuple: (bytes32, uint224, uint32)[].
+// Define the ABI schema
 var schema = GetSchema()
 
 func GetSchema() abi.Arguments {
@@ -34,8 +35,8 @@ func GetSchema() abi.Arguments {
 			// This defines the array of tuple records.
 			Type: mustNewType("tuple(bytes32,uint224,uint32)[]", "", []abi.ArgumentMarshaling{
 				{Name: "feedID", Type: "bytes32"},
-				{Name: "price", Type: "uint224"},
 				{Name: "timestamp", Type: "uint32"},
+				{Name: "price", Type: "uint224"},
 			}),
 		},
 	})

pkg/report/pb/data-feeds/on-chain/registry/decode.go

@@ -32,7 +32,7 @@ func DecodeAsFeedUpdated(m *wt_msg.WriteConfirmed) ([]*FeedUpdated, error) {
 		feedID := datafeeds.FeedID(rf.FeedID)
 
 		// TODO: unsure if r.Data is correct for Report
-		msgs = append(msgs, NewFeedUpdated(m, feedID, rf.Timestamp, rf.Price, r.Data, false))
+		msgs = append(msgs, NewFeedUpdated(m, feedID, rf.Timestamp, rf.Price, []byte{}, false))
 	}
 
 	return msgs, nil