forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

allow use the old "data" field

Browse source
This commit is contained in:
zhiqiangxu 2024-02-21 13:59:07 +08:00
parent bba3fa9af9
commit 972c574065
1 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
ethclient/ethclient.go
View file

@ -34,6 +34,7 @@ import (
// Client defines typed wrappers for the Ethereum RPC API. // Client defines typed wrappers for the Ethereum RPC API.
type Client struct { type Client struct {
c *rpc.Client c *rpc.Client
useData bool
} }
// Dial connects a client to the given URL. // Dial connects a client to the given URL.
@ -52,7 +53,7 @@ func DialContext(ctx context.Context, rawurl string) (*Client, error) {
// NewClient creates a client that uses the given RPC client. // NewClient creates a client that uses the given RPC client.
func NewClient(c *rpc.Client) *Client { func NewClient(c *rpc.Client) *Client {
return &Client{c} return &Client{c: c}
} }
// Close closes the underlying RPC connection. // Close closes the underlying RPC connection.
@ -60,6 +61,11 @@ func (ec *Client) Close() {
ec.c.Close() ec.c.Close()
} }
// UseData makes toCallArg use the old "data" field instead of "input" field
func (ec *Client) UseData() {
ec.useData = true
}
// Client gets the underlying RPC client. // Client gets the underlying RPC client.
func (ec *Client) Client() *rpc.Client { func (ec *Client) Client() *rpc.Client {
return ec.c return ec.c
@ -518,7 +524,7 @@ func (ec *Client) PendingTransactionCount(ctx context.Context) (uint, error) {
// blocks might not be available. // blocks might not be available.
func (ec *Client) CallContract(ctx context.Context, msg ethereum.CallMsg, blockNumber *big.Int) ([]byte, error) { func (ec *Client) CallContract(ctx context.Context, msg ethereum.CallMsg, blockNumber *big.Int) ([]byte, error) {
var hex hexutil.Bytes var hex hexutil.Bytes
err := ec.c.CallContext(ctx, &hex, "eth_call", toCallArg(msg), toBlockNumArg(blockNumber)) err := ec.c.CallContext(ctx, &hex, "eth_call", toCallArg(msg, ec.useData), toBlockNumArg(blockNumber))
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -529,7 +535,7 @@ func (ec *Client) CallContract(ctx context.Context, msg ethereum.CallMsg, blockN
// the block by block hash instead of block height. // the block by block hash instead of block height.
func (ec *Client) CallContractAtHash(ctx context.Context, msg ethereum.CallMsg, blockHash common.Hash) ([]byte, error) { func (ec *Client) CallContractAtHash(ctx context.Context, msg ethereum.CallMsg, blockHash common.Hash) ([]byte, error) {
var hex hexutil.Bytes var hex hexutil.Bytes
err := ec.c.CallContext(ctx, &hex, "eth_call", toCallArg(msg), rpc.BlockNumberOrHashWithHash(blockHash, false)) err := ec.c.CallContext(ctx, &hex, "eth_call", toCallArg(msg, ec.useData), rpc.BlockNumberOrHashWithHash(blockHash, false))
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -540,7 +546,7 @@ func (ec *Client) CallContractAtHash(ctx context.Context, msg ethereum.CallMsg,
// The state seen by the contract call is the pending state. // The state seen by the contract call is the pending state.
func (ec *Client) PendingCallContract(ctx context.Context, msg ethereum.CallMsg) ([]byte, error) { func (ec *Client) PendingCallContract(ctx context.Context, msg ethereum.CallMsg) ([]byte, error) {
var hex hexutil.Bytes var hex hexutil.Bytes
err := ec.c.CallContext(ctx, &hex, "eth_call", toCallArg(msg), "pending") err := ec.c.CallContext(ctx, &hex, "eth_call", toCallArg(msg, ec.useData), "pending")
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -605,7 +611,7 @@ func (ec *Client) FeeHistory(ctx context.Context, blockCount uint64, lastBlock *
// but it should provide a basis for setting a reasonable default. // but it should provide a basis for setting a reasonable default.
func (ec *Client) EstimateGas(ctx context.Context, msg ethereum.CallMsg) (uint64, error) { func (ec *Client) EstimateGas(ctx context.Context, msg ethereum.CallMsg) (uint64, error) {
var hex hexutil.Uint64 var hex hexutil.Uint64
err := ec.c.CallContext(ctx, &hex, "eth_estimateGas", toCallArg(msg)) err := ec.c.CallContext(ctx, &hex, "eth_estimateGas", toCallArg(msg, ec.useData))
if err != nil { if err != nil {
return 0, err return 0, err
} }
@ -639,14 +645,18 @@ func toBlockNumArg(number *big.Int) string {
return fmt.Sprintf("<invalid %d>", number) return fmt.Sprintf("<invalid %d>", number)
} }
func toCallArg(msg ethereum.CallMsg) interface{} { func toCallArg(msg ethereum.CallMsg, useData bool) interface{} {
arg := map[string]interface{}{ arg := map[string]interface{}{
"from": msg.From, "from": msg.From,
"to": msg.To, "to": msg.To,
} }
if len(msg.Data) > 0 { if len(msg.Data) > 0 {
if useData {
arg["data"] = hexutil.Bytes(msg.Data)
} else {
arg["input"] = 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)
} }