forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-19 11:20:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ethclient: include data in call arguments

Browse source
This commit is contained in:
二狗同学 2026-07-06 11:38:41 +08:00
parent 2919267b64
commit 43349eb950
4 changed files with 38 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ethclient/ethclient.go
View file

@ -786,7 +786,9 @@ func toCallArg(msg ethereum.CallMsg) interface{} {
"to": msg.To, "to": msg.To,
} }
if len(msg.Data) > 0 { if len(msg.Data) > 0 {
arg["input"] = hexutil.Bytes(msg.Data) input := hexutil.Bytes(msg.Data)
arg["input"] = input
arg["data"] = input
} }
if msg.Value != nil { if msg.Value != nil {
arg["value"] = (*hexutil.Big)(msg.Value) arg["value"] = (*hexutil.Big)(msg.Value)

4
ethclient/gethclient/gethclient.go
View file

@ -370,7 +370,9 @@ func toCallArg(msg ethereum.CallMsg) interface{} {
"to": msg.To, "to": msg.To,
} }
if len(msg.Data) > 0 { if len(msg.Data) > 0 {
arg["input"] = hexutil.Bytes(msg.Data) input := hexutil.Bytes(msg.Data)
arg["input"] = input
arg["data"] = input
} }
if msg.Value != nil { if msg.Value != nil {
arg["value"] = (*hexutil.Big)(msg.Value) arg["value"] = (*hexutil.Big)(msg.Value)

16
ethclient/gethclient/gethclient_test.go
View file

@ -26,6 +26,7 @@ import (
"github.com/ethereum/go-ethereum" "github.com/ethereum/go-ethereum"
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/hexutil"
"github.com/ethereum/go-ethereum/consensus/ethash" "github.com/ethereum/go-ethereum/consensus/ethash"
"github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/core"
"github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/types"
@ -275,6 +276,21 @@ func testAccessList(t *testing.T, client *rpc.Client) {
} }
} }
func TestToCallArgIncludesDataAndInput(t *testing.T) {
input := common.FromHex("0x01020304")
arg := toCallArg(ethereum.CallMsg{Data: input}).(map[string]interface{})
for _, key := range []string{"input", "data"} {
have, ok := arg[key].(hexutil.Bytes)
if !ok {
t.Fatalf("missing call arg %q", key)
}
if !bytes.Equal(have, input) {
t.Fatalf("call arg %q = %x, want %x", key, have, input)
}
}
}
func testGetProof(t *testing.T, client *rpc.Client, addr common.Address) { func testGetProof(t *testing.T, client *rpc.Client, addr common.Address) {
ec := New(client) ec := New(client)
ethcl := ethclient.NewClient(client) ethcl := ethclient.NewClient(client)

16
ethclient/types_test.go
View file

@ -24,6 +24,7 @@ import (
"github.com/ethereum/go-ethereum" "github.com/ethereum/go-ethereum"
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/hexutil"
) )
func TestToFilterArg(t *testing.T) { func TestToFilterArg(t *testing.T) {
@ -179,3 +180,18 @@ func TestToFilterArg(t *testing.T) {
}) })
} }
} }
func TestToCallArgIncludesDataAndInput(t *testing.T) {
input := common.FromHex("0x01020304")
arg := toCallArg(ethereum.CallMsg{Data: input}).(map[string]interface{})
for _, key := range []string{"input", "data"} {
have, ok := arg[key].(hexutil.Bytes)
if !ok {
t.Fatalf("missing call arg %q", key)
}
if !reflect.DeepEqual(have, hexutil.Bytes(input)) {
t.Fatalf("call arg %q = %x, want %x", key, have, input)
}
}
}