Fix: Add hexutil Bytes encoding to batchcall data (#14165)

smartcontractkit · Aug 21, 2024 · e76463c · e76463c
1 parent 831d006
commit e76463c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/.changeset/odd-eagles-shave.md b/.changeset/odd-eagles-shave.md
@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+#internal Add hexutil Bytes encoding to batchcall data
diff --git a/core/services/relay/evm/batch_caller.go b/core/services/relay/evm/batch_caller.go
@@ -149,7 +149,7 @@ func (c *defaultEvmBatchCaller) batchCall(ctx context.Context, blockNumber uint6
 				map[string]interface{}{
 					"from": common.Address{},
 					"to":   call.ContractAddress,
-					"data": data,
+					"data": hexutil.Bytes(data),
 				},
 				blockNumStr,
 			},

diff --git a/core/services/relay/evm/batch_caller_test.go b/core/services/relay/evm/batch_caller_test.go
@@ -1,12 +1,12 @@
 package evm_test
 
 import (
-	"encoding/hex"
 	"fmt"
 	"math/big"
 	"testing"
 
 	"github.com/cometbft/cometbft/libs/rand"
+	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/rpc"
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
@@ -152,12 +152,10 @@ func TestDefaultEvmBatchCaller_batchCallLimit(t *testing.T) {
 				Run(func(args mock.Arguments) {
 					evmCalls := args.Get(1).([]rpc.BatchElem)
 					for i := range evmCalls {
-						arg := evmCalls[i].Args[0].(map[string]interface{})["data"].([]uint8)
-						bytes, err := hex.DecodeString(fmt.Sprintf("%x", arg))
-						require.NoError(t, err)
+						arg := evmCalls[i].Args[0].(map[string]interface{})["data"].(hexutil.Bytes)
 						str, isOk := evmCalls[i].Result.(*string)
 						require.True(t, isOk)
-						*str = fmt.Sprintf("0x%064x", new(big.Int).SetBytes(bytes[24:]).Uint64())
+						*str = fmt.Sprintf("0x%064x", new(big.Int).SetBytes(arg[24:]).Uint64())
 					}
 				}).Return(nil)