fix: update eip types based on new contract requirements

Author: frrist

go/eip712/extradata.go

@@ -82,8 +82,9 @@ func (e *ExtraDataEncoder) EncodeCreateDataSetExtraData(
 }
 
 // EncodeAddPiecesExtraData encodes the extraData for piecesAdded callback
-// Format matches: abi.decode(extraData, (bytes, string[][], string[][]))
+// Format matches: abi.decode(extraData, (uint256, string[][], string[][], bytes))
 func (e *ExtraDataEncoder) EncodeAddPiecesExtraData(
+	nonce *big.Int,
 	signature *AuthSignature,
 	metadata [][]MetadataEntry,
 ) ([]byte, error) {
@@ -107,12 +108,13 @@ func (e *ExtraDataEncoder) EncodeAddPiecesExtraData(
 	}
 
 	arguments := abi.Arguments{
-		{Type: bytesType},              // signature
+		{Type: uint256Type},            // nonce
 		{Type: stringDoubleArrayType},  // metadataKeys[][]
 		{Type: stringDoubleArrayType},  // metadataValues[][]
+		{Type: bytesType},              // signature
 	}
 
-	return arguments.Pack(signatureBytes, keysArray, valuesArray)
+	return arguments.Pack(nonce, keysArray, valuesArray, signatureBytes)
 }
 
 // EncodeSchedulePieceRemovalsExtraData encodes the extraData for piecesScheduledRemove callback

go/eip712/extradata_test.go

@@ -49,31 +49,36 @@ func TestEncodingMatchesContractDecoding(t *testing.T) {
 
 	// Test AddPieces encoding
 	t.Run("AddPieces", func(t *testing.T) {
+		nonce := big.NewInt(7)
 		signature := &AuthSignature{V: 27, R: [32]byte{1}, S: [32]byte{2}}
 		metadata := [][]MetadataEntry{
 			{{Key: "piece1", Value: "value1"}},
 			{{Key: "piece2", Value: "value2"}},
 		}
 
-		encoded, err := encoder.EncodeAddPiecesExtraData(signature, metadata)
+		encoded, err := encoder.EncodeAddPiecesExtraData(nonce, signature, metadata)
 		require.NoError(t, err)
 
 		// Decode using the contract's expected format
 		arguments := abi.Arguments{
-			{Type: bytesType},
+			{Type: uint256Type},
 			{Type: stringDoubleArrayType},
 			{Type: stringDoubleArrayType},
+			{Type: bytesType},
 		}
 
 		unpacked, err := arguments.Unpack(encoded)
 		require.NoError(t, err)
-		require.Len(t, unpacked, 3)
+		require.Len(t, unpacked, 4)
+
+		// Verify nonce
+		require.Equal(t, nonce, unpacked[0].(*big.Int))
 
 		// Verify signature
-		require.NotEmpty(t, unpacked[0].([]byte))
+		require.NotEmpty(t, unpacked[3].([]byte))
 
 		// Verify metadata keys
-		keys := unpacked[1].([][]string)
+		keys := unpacked[1].([][]string) // wt operations preserve order
 		require.Len(t, keys, 2)
 		require.Equal(t, []string{"piece1"}, keys[0])
 		require.Equal(t, []string{"piece2"}, keys[1])
@@ -188,4 +193,4 @@ func TestEncodingBreakageDetection(t *testing.T) {
 		_, exists := serviceContractABI.Methods[methodName]
 		require.True(t, exists, "Required method %s must exist in contract ABI", methodName)
 	}
-}
+}

go/eip712/types.go

@@ -37,7 +37,7 @@ type PieceMetadata struct {
 
 type AddPieces struct {
 	ClientDataSetId *big.Int        `json:"clientDataSetId"`
-	FirstAdded      *big.Int        `json:"firstAdded"`
+	Nonce           *big.Int        `json:"nonce"`
 	PieceData       []Cid           `json:"pieceData"`
 	PieceMetadata   []PieceMetadata `json:"pieceMetadata"`
 }
@@ -77,7 +77,7 @@ var EIP712Types = apitypes.Types{
 	},
 	"AddPieces": {
 		{Name: "clientDataSetId", Type: "uint256"},
-		{Name: "firstAdded", Type: "uint256"},
+		{Name: "nonce", Type: "uint256"},
 		{Name: "pieceData", Type: "Cid[]"},
 		{Name: "pieceMetadata", Type: "PieceMetadata[]"},
 	},