Update OverrideAccount & BlockOverrides Ethereum types

Author: m-Peter

api/debug.go

@@ -181,10 +181,10 @@ func (d *DebugAPI) TraceCall(
 
 	if config.BlockOverrides != nil {
 		blocksProvider = blocksProvider.WithBlockOverrides(&ethTypes.BlockOverrides{
-			Number:   config.BlockOverrides.Number,
-			Time:     config.BlockOverrides.Time,
-			Coinbase: config.BlockOverrides.FeeRecipient,
-			Random:   config.BlockOverrides.PrevRandao,
+			Number:       config.BlockOverrides.Number,
+			Time:         config.BlockOverrides.Time,
+			FeeRecipient: config.BlockOverrides.FeeRecipient,
+			PrevRandao:   config.BlockOverrides.PrevRandao,
 		})
 	}
 	viewProvider := query.NewViewProvider(

eth/types/types.go

@@ -433,29 +433,32 @@ type SignTransactionResult struct {
 // of a message call.
 // Note, state and stateDiff can't be specified at the same time. If state is
 // set, message execution will only use the data in the given state. Otherwise
-// if statDiff is set, all diff will be applied first and then execute the call
+// if stateDiff is set, all diff will be applied first and then execute the call
 // message.
 type OverrideAccount struct {
-	Nonce     *hexutil.Uint64              `json:"nonce"`
-	Code      *hexutil.Bytes               `json:"code"`
-	Balance   **hexutil.Big                `json:"balance"`
-	State     *map[common.Hash]common.Hash `json:"state"`
-	StateDiff *map[common.Hash]common.Hash `json:"stateDiff"`
+	Nonce            *hexutil.Uint64             `json:"nonce"`
+	Code             *hexutil.Bytes              `json:"code"`
+	Balance          *hexutil.Big                `json:"balance"`
+	State            map[common.Hash]common.Hash `json:"state"`
+	StateDiff        map[common.Hash]common.Hash `json:"stateDiff"`
+	MovePrecompileTo *common.Address             `json:"movePrecompileToAddress"`
 }
 
 // StateOverride is the collection of overridden accounts.
 type StateOverride map[common.Address]OverrideAccount
 
 // BlockOverrides is a set of header fields to override.
 type BlockOverrides struct {
-	Number      *hexutil.Big
-	Difficulty  *hexutil.Big
-	Time        *hexutil.Uint64
-	GasLimit    *hexutil.Uint64
-	Coinbase    *common.Address
-	Random      *common.Hash
-	BaseFee     *hexutil.Big
-	BlobBaseFee *hexutil.Big
+	Number        *hexutil.Big
+	Difficulty    *hexutil.Big // No-op if we're simulating post-merge calls.
+	Time          *hexutil.Uint64
+	GasLimit      *hexutil.Uint64
+	FeeRecipient  *common.Address
+	PrevRandao    *common.Hash
+	BaseFeePerGas *hexutil.Big
+	BlobBaseFee   *hexutil.Big
+	BeaconRoot    *common.Hash
+	Withdrawals   *types.Withdrawals
 }
 
 type Block struct {

services/requester/overridable_blocks_provider.go

@@ -54,12 +54,12 @@ func (bs *blockSnapshot) BlockContext() (evmTypes.BlockContext, error) {
 		blockContext.BlockTimestamp = uint64(*bs.blockOverrides.Time)
 	}
 
-	if bs.blockOverrides.Random != nil {
-		blockContext.Random = *bs.blockOverrides.Random
+	if bs.blockOverrides.PrevRandao != nil {
+		blockContext.Random = *bs.blockOverrides.PrevRandao
 	}
 
-	if bs.blockOverrides.Coinbase != nil {
-		blockContext.GasFeeCollector = evmTypes.NewAddress(*bs.blockOverrides.Coinbase)
+	if bs.blockOverrides.FeeRecipient != nil {
+		blockContext.GasFeeCollector = evmTypes.NewAddress(*bs.blockOverrides.FeeRecipient)
 	}
 
 	return blockContext, nil

services/requester/requester.go

@@ -538,18 +538,18 @@ func (e *EVM) dryRunTx(
 			}
 			// Override account balance.
 			if account.Balance != nil {
-				opts = append(opts, query.WithStateOverrideBalance(addr, (*big.Int)(*account.Balance)))
+				opts = append(opts, query.WithStateOverrideBalance(addr, (*big.Int)(account.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 {
-				opts = append(opts, query.WithStateOverrideState(addr, *account.State))
+				opts = append(opts, query.WithStateOverrideState(addr, account.State))
 			}
 			// Apply state diff into specified accounts.
 			if account.StateDiff != nil {
-				opts = append(opts, query.WithStateOverrideStateDiff(addr, *account.StateDiff))
+				opts = append(opts, query.WithStateOverrideStateDiff(addr, account.StateDiff))
 			}
 		}
 	}

tests/web3js/contract_call_overrides_test.js

@@ -87,7 +87,7 @@ it('should apply block overrides on eth_call', async () => {
     let random = '0x7914bb5b13bac6f621bc37bbf6e406fbf4472aaaaf17ec2f309a92aca4e27fc0'
     response = await helpers.callRPCMethod(
         'eth_call',
-        [call, 'latest', null, { random: random }]
+        [call, 'latest', null, { prevRandao: random }]
     )
     assert.equal(response.status, 200)
     assert.isDefined(response.body)