State override support (#3628)

* added stateOverride type

* solved import cycle

* refactoring

* imported wrong package

* fixed Call arguments

* typo

* override for traceCall

cmd/rpcdaemon/commands/eth_api.go

@@ -75,7 +75,7 @@ type EthAPI interface {
 	GasPrice(_ context.Context) (*hexutil.Big, error)
 
 	// Sending related (see ./eth_call.go)
-	Call(ctx context.Context, args ethapi.CallArgs, blockNrOrHash rpc.BlockNumberOrHash, overrides *map[common.Address]ethapi.Account) (hexutil.Bytes, error)
+	Call(ctx context.Context, args ethapi.CallArgs, blockNrOrHash rpc.BlockNumberOrHash, overrides *ethapi.StateOverrides) (hexutil.Bytes, error)
 	EstimateGas(ctx context.Context, args ethapi.CallArgs, blockNrOrHash *rpc.BlockNumberOrHash) (hexutil.Uint64, error)
 	SendRawTransaction(ctx context.Context, encodedTx hexutil.Bytes) (common.Hash, error)
 	SendTransaction(_ context.Context, txObject interface{}) (common.Hash, error)

cmd/rpcdaemon/commands/eth_call.go

@@ -30,7 +30,7 @@ import (
 )
 
 // Call implements eth_call. Executes a new message call immediately without creating a transaction on the block chain.
-func (api *APIImpl) Call(ctx context.Context, args ethapi.CallArgs, blockNrOrHash rpc.BlockNumberOrHash, overrides *map[common.Address]ethapi.Account) (hexutil.Bytes, error) {
+func (api *APIImpl) Call(ctx context.Context, args ethapi.CallArgs, blockNrOrHash rpc.BlockNumberOrHash, overrides *ethapi.StateOverrides) (hexutil.Bytes, error) {
 	tx, err := api.db.BeginRo(ctx)
 	if err != nil {
 		return nil, err

cmd/rpcdaemon/commands/tracing.go

@@ -200,6 +200,12 @@ func (api *PrivateDebugAPIImpl) TraceCall(ctx context.Context, args ethapi.CallA
 	}
 	ibs := state.New(stateReader)
 
+	if config != nil && config.StateOverrides != nil {
+		if err := config.StateOverrides.Override(ibs); err != nil {
+			return err
+		}
+	}
+
 	var baseFee *uint256.Int
 	if header != nil && header.BaseFee != nil {
 		var overflow bool

eth/tracers/api.go

 package tracers
 
-import "github.com/ledgerwatch/erigon/core/vm"
+import (
+	"github.com/ledgerwatch/erigon/core/vm"
+	"github.com/ledgerwatch/erigon/internal/ethapi"
+)
 
 // TraceConfig holds extra parameters to trace functions.
 type TraceConfig struct {
@@ -9,4 +12,5 @@ type TraceConfig struct {
 	Timeout        *string
 	Reexec         *uint64
 	NoRefunds      *bool // Turns off gas refunds when tracing
+	StateOverrides *ethapi.StateOverrides
 }

internal/ethapi/state_overrides.go

+package ethapi
+
+import (
+	"fmt"
+	"math/big"
+
+	"github.com/holiman/uint256"
+	"github.com/ledgerwatch/erigon/common"
+	"github.com/ledgerwatch/erigon/core/state"
+)
+
+type StateOverrides map[common.Address]Account
+
+func (overrides *StateOverrides) Override(state *state.IntraBlockState) error {
+
+	for addr, account := range *overrides {
+		// Override account nonce.
+		if account.Nonce != nil {
+			state.SetNonce(addr, uint64(*account.Nonce))
+		}
+		// Override account(contract) code.
+		if account.Code != nil {
+			state.SetCode(addr, *account.Code)
+		}
+		// Override account balance.
+		if account.Balance != nil {
+			balance, overflow := uint256.FromBig((*big.Int)(*account.Balance))
+			if overflow {
+				return fmt.Errorf("account.Balance higher than 2^256-1")
+			}
+			state.SetBalance(addr, balance)
+		}
+		if account.State != nil && account.StateDiff != nil {
+			return fmt.Errorf("account %s has both 'state' and 'stateDiff'", addr.Hex())
+		}
+		// Replace entire state if caller requires.
+		if account.State != nil {
+			state.SetStorage(addr, *account.State)
+		}
+		// Apply state diff into specified accounts.
+		if account.StateDiff != nil {
+			for key, value := range *account.StateDiff {
+				key := key
+				state.SetState(addr, &key, value)
+			}
+		}
+	}
+
+	return nil
+}

turbo/transactions/call.go

@@ -29,7 +29,7 @@ func DoCall(
 	ctx context.Context,
 	args ethapi.CallArgs,
 	tx kv.Tx, blockNrOrHash rpc.BlockNumberOrHash,
-	block *types.Block, overrides *map[common.Address]ethapi.Account,
+	block *types.Block, overrides *ethapi.StateOverrides,
 	gasCap uint64,
 	chainConfig *params.ChainConfig,
 	filters *filters.Filters,
@@ -53,38 +53,10 @@ func DoCall(
 
 	// Override the fields of specified contracts before execution.
 	if overrides != nil {
-		for addr, account := range *overrides {
-			// Override account nonce.
-			if account.Nonce != nil {
-				state.SetNonce(addr, uint64(*account.Nonce))
-			}
-			// Override account(contract) code.
-			if account.Code != nil {
-				state.SetCode(addr, *account.Code)
-			}
-			// Override account balance.
-			if account.Balance != nil {
-				balance, overflow := uint256.FromBig((*big.Int)(*account.Balance))
-				if overflow {
-					return nil, fmt.Errorf("account.Balance higher than 2^256-1")
-				}
-				state.SetBalance(addr, balance)
-			}
-			if account.State != nil && account.StateDiff != nil {
-				return nil, fmt.Errorf("account %s has both 'state' and 'stateDiff'", addr.Hex())
-			}
-			// Replace entire state if caller requires.
-			if account.State != nil {
-				state.SetStorage(addr, *account.State)
-			}
-			// Apply state diff into specified accounts.
-			if account.StateDiff != nil {
-				for key, value := range *account.StateDiff {
-					key := key
-					state.SetState(addr, &key, value)
-				}
-			}
+		if err := overrides.Override(state); err != nil {
+			return nil, err
 		}
+
 	}
 
 	// Setup context so it may be cancelled the call has completed