Problem: duplicated encoding when passing state overrides (#394)

* Problem: duplicated encoding when passing state overrides use json.RawMessage to avoid decoding json unnesserarily * optional parameter
yihuang · Jan 11, 2024 · ddb3035 · ddb3035
1 parent 2c2d539
commit ddb3035
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/rpc/backend/backend.go b/rpc/backend/backend.go
@@ -17,6 +17,7 @@ package backend
 
 import (
 	"context"
+	"encoding/json"
 	"math/big"
 	"time"
 
@@ -128,7 +129,7 @@ type EVMBackend interface {
 	SendRawTransaction(data hexutil.Bytes) (common.Hash, error)
 	SetTxDefaults(args evmtypes.TransactionArgs) (evmtypes.TransactionArgs, error)
 	EstimateGas(args evmtypes.TransactionArgs, blockNrOptional *rpctypes.BlockNumber) (hexutil.Uint64, error)
-	DoCall(args evmtypes.TransactionArgs, blockNr rpctypes.BlockNumber, overrides *rpctypes.StateOverride) (*evmtypes.MsgEthereumTxResponse, error)
+	DoCall(args evmtypes.TransactionArgs, blockNr rpctypes.BlockNumber, overrides *json.RawMessage) (*evmtypes.MsgEthereumTxResponse, error)
 	GasPrice() (*hexutil.Big, error)
 
 	// Filter API

diff --git a/rpc/backend/call_tx.go b/rpc/backend/call_tx.go
@@ -360,7 +360,7 @@ func (b *Backend) EstimateGas(args evmtypes.TransactionArgs, blockNrOptional *rp
 // estimated gas used on the operation or an error if fails.
 func (b *Backend) DoCall(
 	args evmtypes.TransactionArgs, blockNr rpctypes.BlockNumber,
-	overrides *rpctypes.StateOverride,
+	overrides *json.RawMessage,
 ) (*evmtypes.MsgEthereumTxResponse, error) {
 	bz, err := json.Marshal(&args)
 	if err != nil {
@@ -372,20 +372,17 @@ func (b *Backend) DoCall(
 		return nil, errors.New("header not found")
 	}
 
-	var overridesJSON []byte
+	var bzOverrides []byte
 	if overrides != nil {
-		overridesJSON, err = json.Marshal(overrides)
-		if err != nil {
-			return nil, err
-		}
+		bzOverrides = *overrides
 	}
 
 	req := evmtypes.EthCallRequest{
 		Args:            bz,
 		GasCap:          b.RPCGasCap(),
 		ProposerAddress: sdk.ConsAddress(header.Block.ProposerAddress),
 		ChainId:         b.chainID.Int64(),
-		Overrides:       overridesJSON,
+		Overrides:       bzOverrides,
 	}
 
 	// From ContextWithHeight: if the provided height is 0,

diff --git a/rpc/namespaces/ethereum/eth/api.go b/rpc/namespaces/ethereum/eth/api.go
@@ -17,6 +17,7 @@ package eth
 
 import (
 	"context"
+	"encoding/json"
 
 	"github.com/ethereum/go-ethereum/signer/core/apitypes"
 
@@ -85,7 +86,7 @@ type EthereumAPI interface {
 	//
 	// Allows developers to read data from the blockchain which includes executing
 	// smart contracts. However, no data is published to the Ethereum network.
-	Call(args evmtypes.TransactionArgs, blockNrOrHash rpctypes.BlockNumberOrHash, overrides *rpctypes.StateOverride) (hexutil.Bytes, error)
+	Call(args evmtypes.TransactionArgs, blockNrOrHash rpctypes.BlockNumberOrHash, overrides *json.RawMessage) (hexutil.Bytes, error)
 
 	// Chain Information
 	//
@@ -281,7 +282,7 @@ func (e *PublicAPI) GetProof(address common.Address,
 // Call performs a raw contract call.
 func (e *PublicAPI) Call(args evmtypes.TransactionArgs,
 	blockNrOrHash rpctypes.BlockNumberOrHash,
-	overrides *rpctypes.StateOverride,
+	overrides *json.RawMessage,
 ) (hexutil.Bytes, error) {
 	e.logger.Debug("eth_call", "args", args.String(), "block number or hash", blockNrOrHash)