Merge branch 'main' into peter/allow-specifying-build-tag

Author: m-Peter

api/api.go

@@ -723,6 +723,11 @@ func (b *BlockChainAPI) EstimateGas(
 		return handleError[hexutil.Uint64](err, b.logger, b.collector)
 	}
 
+	blockOverridesArgs, err := json.Marshal(blockOverrides)
+	if err != nil {
+		return handleError[hexutil.Uint64](err, b.logger, b.collector)
+	}
+
 	txArgs, err := json.Marshal(args)
 	if err != nil {
 		return handleError[hexutil.Uint64](err, b.logger, b.collector)
@@ -733,6 +738,7 @@ func (b *BlockChainAPI) EstimateGas(
 		RawJSON("args", txArgs).
 		Str("blockTag", fmt.Sprintf("%v", blockNumberOrHash)).
 		RawJSON("stateOverrides", stateOverridesArgs).
+		RawJSON("blockOverrides", blockOverridesArgs).
 		Logger()
 
 	if err := b.rateLimiter.Apply(ctx, EthEstimateGas); err != nil {

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/e2e_web3js_test.go

@@ -78,6 +78,10 @@ func TestWeb3_E2E(t *testing.T) {
 		runWeb3Test(t, "eth_deploy_contract_and_interact_test")
 	})
 
+	t.Run("apply state overrides", func(t *testing.T) {
+		runWeb3Test(t, "eth_state_overrides_test")
+	})
+
 	t.Run("test retrieval of contract storage slots", func(t *testing.T) {
 		runWeb3Test(t, "eth_get_storage_at_test")
 	})

tests/fixtures/storage.byte

@@ -11,6 +11,7 @@ contract Storage {
     error MyCustomError(uint value, string message);
 
     uint256 number;
+    address deployer = 0xea02F564664A477286B93712829180be4764fAe2;
 
     constructor() payable {
         number = 1337;
@@ -30,10 +31,18 @@ contract Storage {
         revert();
     }
 
-    function retrieve() public view returns (uint256){
+    function retrieve() public view returns (uint256) {
         return number;
     }
 
+    function getDeployer() public view returns (address) {
+        return deployer;
+    }
+
+    function getBalance(address addr) public view returns (uint256) {
+        return addr.balance;
+    }
+
     function sum(int A, int B) public returns (int) {
         int s = A+B;
         emit Calculated(msg.sender, A, B, s);
@@ -64,11 +73,11 @@ contract Storage {
         selfdestruct(payable(msg.sender));
     }
 
-    function assertError() public pure{
+    function assertError() public pure {
         require(false, "Assert Error Message");
     }
 
-    function customError() public pure{
+    function customError() public pure {
        revert MyCustomError(5, "Value is too low");
     }
 
@@ -86,14 +95,14 @@ contract Storage {
         return output;
     }
 
-    function verifyArchCallToFlowBlockHeight() public view returns (uint64){
+    function verifyArchCallToFlowBlockHeight() public view returns (uint64) {
         (bool ok, bytes memory data) = cadenceArch.staticcall(abi.encodeWithSignature("flowBlockHeight()"));
         require(ok, "unsuccessful call to arch ");
         uint64 output = abi.decode(data, (uint64));
         return output;
     }
 
-    function verifyArchCallToVerifyCOAOwnershipProof(address arg0 , bytes32 arg1 , bytes memory arg2 ) public view returns (bool){
+    function verifyArchCallToVerifyCOAOwnershipProof(address arg0, bytes32 arg1, bytes memory arg2) public view returns (bool) {
         (bool ok, bytes memory data) = cadenceArch.staticcall(abi.encodeWithSignature("verifyCOAOwnershipProof(address,bytes32,bytes)", arg0, arg1, arg2));
         require(ok, "unsuccessful call to arch");
         bool output = abi.decode(data, (bool));

tests/fixtures/storage.sol

@@ -162,6 +162,38 @@
 		"stateMutability": "nonpayable",
 		"type": "function"
 	},
+	{
+		"inputs": [
+			{
+				"internalType": "address",
+				"name": "addr",
+				"type": "address"
+			}
+		],
+		"name": "getBalance",
+		"outputs": [
+			{
+				"internalType": "uint256",
+				"name": "",
+				"type": "uint256"
+			}
+		],
+		"stateMutability": "view",
+		"type": "function"
+	},
+	{
+		"inputs": [],
+		"name": "getDeployer",
+		"outputs": [
+			{
+				"internalType": "address",
+				"name": "",
+				"type": "address"
+			}
+		],
+		"stateMutability": "view",
+		"type": "function"
+	},
 	{
 		"inputs": [],
 		"name": "random",

tests/fixtures/storageABI.json

@@ -7,10 +7,10 @@ require (
 	github.com/goccy/go-json v0.10.4
 	github.com/onflow/cadence v1.7.0
 	github.com/onflow/crypto v0.25.3
-	github.com/onflow/flow-emulator v1.7.2-0.20250916183715-baa3aeb95f6a
+	github.com/onflow/flow-emulator v1.7.2
 	github.com/onflow/flow-evm-gateway v0.0.0-20240201154855-4d4d3d3f19c7
 	github.com/onflow/flow-go v0.43.0
-	github.com/onflow/flow-go-sdk v1.8.1
+	github.com/onflow/flow-go-sdk v1.8.2
 	github.com/rs/zerolog v1.34.0
 	github.com/stretchr/testify v1.11.1
 	golang.org/x/sync v0.16.0
@@ -247,7 +247,7 @@ require (
 	google.golang.org/genproto/googleapis/api v0.0.0-20250707201910-8d1bb00bc6a7 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20250804133106-a7a43d27e69b // indirect
 	google.golang.org/grpc v1.75.1 // indirect
-	google.golang.org/protobuf v1.36.8 // indirect
+	google.golang.org/protobuf v1.36.9 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect