jleony/nanoreth
1
0
Fork 0
mirror of https://github.com/hl-archive-node/nanoreth.git synced 2025-12-06 10:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: apply block overrides before create env (#7135)

Browse Source
This commit is contained in:
Matthias Seitz
2024-03-13 21:53:34 +01:00
committed by GitHub
parent 28f3a2e2d9
commit 455b2afa5e
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
crates/rpc/rpc/src/eth/revm_utils.rs
View File

@ -237,7 +237,7 @@ where
/// - `nonce` is set to `None`
pub(crate) fn prepare_call_env<DB>(
mut cfg: CfgEnvWithHandlerCfg,
block: BlockEnv,
mut block: BlockEnv,
request: TransactionRequest,
gas_limit: u64,
db: &mut CacheDB<DB>,
@ -260,24 +260,25 @@ where
// <https://github.com/ethereum/go-ethereum/blob/ee8e83fa5f6cb261dad2ed0a7bbcde4930c41e6c/internal/ethapi/api.go#L985>
cfg.disable_base_fee = true;
let request_gas = request.gas;
let mut env = build_call_evm_env(cfg, block, request)?;
env.tx.nonce = None;
// apply state overrides
if let Some(state_overrides) = overrides.state {
apply_state_overrides(state_overrides, db)?;
}
// apply block overrides
// apply block overrides, we need to apply them first so that they take effect when we we create
// the evm env via `build_call_evm_env`, e.g. basefee
if let Some(mut block_overrides) = overrides.block {
if let Some(block_hashes) = block_overrides.block_hash.take() {
// override block hashes
db.block_hashes
.extend(block_hashes.into_iter().map(|(num, hash)| (U256::from(num), hash)))
}
apply_block_overrides(*block_overrides, &mut env.env.block);
apply_block_overrides(*block_overrides, &mut block);
}
let request_gas = request.gas;
let mut env = build_call_evm_env(cfg, block, request)?;
// set nonce to None so that the next nonce is used when transacting the call
env.tx.nonce = None;
// apply state overrides
if let Some(state_overrides) = overrides.state {
apply_state_overrides(state_overrides, db)?;
}
if request_gas.is_none() {