refactor: block override without block_env fn

Cargo.toml

@@ -19,9 +19,6 @@ codegen-units = 1
 panic = "abort"
 debug = true
 
-[patch."https://github.com/bluealloy/revm"]
-revm = { git = "https://github.com/onbjerg/revm", branch = "onbjerg/override-block-env" }
-
 ## Patch ethers-rs with a local checkout then run `cargo update -p ethers`
 #[patch."https://github.com/gakonst/ethers-rs"]
 #ethers = { path = "../ethers-rs" }

evm/src/executor/inspector/cheatcodes/env.rs

@@ -75,15 +75,15 @@ pub fn apply<DB: Database>(
 ) -> Option<Result<Bytes, Bytes>> {
  Some(match call {
  HEVMCalls::Warp(inner) => {
- state.block.timestamp = inner.0;
+ data.env.block.timestamp = inner.0;
  Ok(Bytes::new())
  }
  HEVMCalls::Roll(inner) => {
- state.block.number = inner.0;
+ data.env.block.number = inner.0;
  Ok(Bytes::new())
  }
  HEVMCalls::Fee(inner) => {
- state.block.basefee = inner.0;
+ data.env.block.basefee = inner.0;
  Ok(Bytes::new())
  }
  HEVMCalls::Store(inner) => {

evm/src/executor/inspector/cheatcodes/mod.rs

@@ -37,7 +37,7 @@ pub struct Cheatcodes {
  ///
  /// Used in the cheatcode handler to overwrite the block environment separately from the
  /// execution block environment.
- pub block: BlockEnv,
+ pub block: Option<BlockEnv>,
 
  /// Address labels
  pub labels: BTreeMap<Address, String>,
@@ -63,7 +63,7 @@ pub struct Cheatcodes {
 
 impl Cheatcodes {
  pub fn new(ffi: bool, block: BlockEnv) -> Self {
- Self { ffi, block, ..Default::default() }
+ Self { ffi, block: Some(block), ..Default::default() }
  }
 
  fn apply_cheatcode<DB: Database>(
@@ -89,10 +89,6 @@ impl<DB> Inspector<DB> for Cheatcodes
 where
  DB: Database,
 {
- fn block_env(&self) -> Option<&BlockEnv> {
- Some(&self.block)
- }
-
  fn call(
  &mut self,
  data: &mut EVMData<'_, DB>,
@@ -147,6 +143,21 @@ where
  }
  }
 
+ fn initialize_interp(
+ &mut self,
+ _: &mut Interpreter,
+ data: &mut EVMData<'_, DB>,
+ _: bool,
+ ) -> Return {
+ // When the first interpreter is initialized we've circumvented the balance and gas checks,
+ // so we apply our actual block data with the correct fees and all.
+ if let Some(block) = self.block.take() {
+ data.env.block = block;
+ }
+
+ Return::Continue
+ }
+
  fn step(&mut self, interpreter: &mut Interpreter, _: &mut EVMData<'_, DB>, _: bool) -> Return {
  // Record writes and reads if `record` has been called
  if let Some(storage_accesses) = &mut self.accesses {

evm/src/executor/inspector/stack.rs

@@ -1,9 +1,7 @@
 use super::{Cheatcodes, Debugger, LogCollector, Tracer};
 use bytes::Bytes;
 use ethers::types::{Address, H256};
-use revm::{
- db::Database, BlockEnv, CallInputs, CreateInputs, EVMData, Gas, Inspector, Interpreter, Return,
-};
+use revm::{db::Database, CallInputs, CreateInputs, EVMData, Gas, Inspector, Interpreter, Return};
 
 /// Helper macro to call the same method on multiple inspectors without resorting to dynamic
 /// dispatch
@@ -41,13 +39,6 @@ impl<DB> Inspector<DB> for InspectorStack
 where
  DB: Database,
 {
- fn block_env(&self) -> Option<&BlockEnv> {
- match &self.cheatcodes {
- Some(cheatcodes) => Inspector::<DB>::block_env(cheatcodes),
- None => None,
- }
- }
-
  fn initialize_interp(
  &mut self,
  interpreter: &mut Interpreter,

evm/src/executor/mod.rs

@@ -295,9 +295,7 @@ where
  };
 
  // Persist the changed block environment
- if let Some(ref cheats) = inspector.cheatcodes {
- self.inspector_config.block = cheats.block.clone();
- }
+ self.inspector_config.block = evm.env.block.clone();
 
  let InspectorData { logs, labels, traces, debug } = collect_inspector_states(inspector);
  Ok(RawCallResult {