Commit e10a2652 authored by Adrian Sutton's avatar Adrian Sutton

batching: Use input instead of data when making eth_Call requests

parent 8abd5df5
...@@ -72,7 +72,7 @@ func toCallArg(msg ethereum.CallMsg) interface{} { ...@@ -72,7 +72,7 @@ func toCallArg(msg ethereum.CallMsg) interface{} {
"to": msg.To, "to": msg.To,
} }
if len(msg.Data) > 0 { if len(msg.Data) > 0 {
arg["data"] = hexutil.Bytes(msg.Data) arg["input"] = hexutil.Bytes(msg.Data)
} }
if msg.Value != nil { if msg.Value != nil {
arg["value"] = (*hexutil.Big)(msg.Value) arg["value"] = (*hexutil.Big)(msg.Value)
......
...@@ -23,7 +23,7 @@ func TestContractCall_ToCallArgs(t *testing.T) { ...@@ -23,7 +23,7 @@ func TestContractCall_ToCallArgs(t *testing.T) {
require.Equal(t, argMap["to"], &addr) require.Equal(t, argMap["to"], &addr)
expectedData, err := call.Pack() expectedData, err := call.Pack()
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, argMap["data"], hexutil.Bytes(expectedData)) require.Equal(t, argMap["input"], hexutil.Bytes(expectedData))
require.NotContains(t, argMap, "value") require.NotContains(t, argMap, "value")
require.NotContains(t, argMap, "gas") require.NotContains(t, argMap, "gas")
......
...@@ -76,7 +76,7 @@ func (l *AbiBasedRpc) CallContext(_ context.Context, out interface{}, method str ...@@ -76,7 +76,7 @@ func (l *AbiBasedRpc) CallContext(_ context.Context, out interface{}, method str
callOpts, ok := args[0].(map[string]any) callOpts, ok := args[0].(map[string]any)
require.True(l.t, ok) require.True(l.t, ok)
require.Equal(l.t, &l.addr, callOpts["to"]) require.Equal(l.t, &l.addr, callOpts["to"])
data, ok := callOpts["data"].(hexutil.Bytes) data, ok := callOpts["input"].(hexutil.Bytes)
require.True(l.t, ok) require.True(l.t, ok)
abiMethod, err := l.abi.MethodById(data[0:4]) abiMethod, err := l.abi.MethodById(data[0:4])
require.NoError(l.t, err) require.NoError(l.t, err)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment