Merge pull request #697 from smartcontractkit/fix/stom-proxy-round-id-decode

fix(ocr2): restore low-bit round ID decode for STOM proxy feeds

Author: cawthorne

relayer/pkg/chainlink/ocr2/types.go

@@ -60,10 +60,7 @@ func NewRoundData(felts []*felt.Felt) (data RoundData, err error) {
 		return data, fmt.Errorf("expected number of felts to be 5 but got %d", len(felts))
 	}
 	roundID := felts[0].BigInt(big.NewInt(0))
-	if !roundID.IsUint64() {
-		return data, fmt.Errorf("aggregator round id does not fit in a uint64 '%s'", felts[0].String())
-	}
-	roundID64 := felts[0].BigInt(big.NewInt(0)).Uint64()
+	roundID64 := roundID.Uint64()
 	if roundID64 > math.MaxUint32 {
 		return data, fmt.Errorf("aggregator round id does not fit in a uint32 '%s'", felts[0].String())
 	}

relayer/pkg/chainlink/ocr2/types_test.go

@@ -32,6 +32,52 @@ func TestNewRoundData(t *testing.T) {
 	require.Equal(t, expectedRound, actualRound)
 }
 
+func TestNewRoundData_ProxyPhasePrefixedRoundID(t *testing.T) {
+	t.Parallel()
+
+	testCases := []struct {
+		name          string
+		roundIDHex    string
+		expectedRound uint32
+	}{
+		{
+			name:          "DAI/USD phase 1",
+			roundIDHex:    "0x100000000000000000000000000010c80",
+			expectedRound: 0x10c80,
+		},
+		{
+			name:          "USDC/USD phase 1",
+			roundIDHex:    "0x10000000000000000000000000001192e",
+			expectedRound: 0x1192e,
+		},
+		{
+			name:          "ETH/USD phase 1",
+			roundIDHex:    "0x10000000000000000000000000001664b",
+			expectedRound: 0x1664b,
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			t.Parallel()
+
+			raw := []string{
+				tc.roundIDHex,
+				"0x5f5e100",
+				"0x1087",
+				"0x633344a3",
+				"0x633344a5",
+			}
+			felts, err := starknetutils.HexArrToFelt(raw)
+			require.NoError(t, err)
+
+			actualRound, err := NewRoundData(felts)
+			require.NoError(t, err)
+			require.Equal(t, tc.expectedRound, actualRound.RoundID)
+		})
+	}
+}
+
 // Helpers
 
 func bigIntFromString(s string) *big.Int {