refactor(anvil): remove Env wrapper entirely#13947
Merged
mattsse merged 1 commit intofoundry-rs:masterfrom Mar 26, 2026
Merged
Conversation
… `NetworkConfigs` `Env` was a thin wrapper over (`EvmEnv`, `NetworkConfigs`) - `Backend.env`: `Arc<RwLock<Env>>` -> `evm_env: Arc<RwLock<EvmEnv>>` + `networks: NetworkConfigs` - fn `env() -> &Arc<RwLock<Env>>` renamed to `evm_env() -> &Arc<RwLock<EvmEnv>>` - `with_genesis()` takes `Arc<RwLock<EvmEnv>>` + `NetworkConfigs` instead of `Arc<RwLock<Env>>` - config.rs: `Env::new()` replaced with plain `EvmEnv` construction; networks passed separately to with_genesis(); `setup_fork_db` / `setup_fork_db_config` now take &mut EvmEnv directly - `env.networks.*` replaced with `self.networks.*` - Local `Env` clones in do_mine_block, with_pending_block, replay_tx_with_inspector, reset_fork, reset_block_number replaced with `EvmEnv`-only clones - env.rs deleted
mablr
requested review from
0xrusowsky,
DaniPopes,
grandizzy,
mattsse,
onbjerg and
zerosnacks
as code owners
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Motivation
#13941 #13942 #13945 Follow-up - final stage: remove
Envwrapper entirelyBackend.env:Arc<RwLock<Env>>->evm_env: Arc<RwLock<EvmEnv>>+networks: NetworkConfigsenv() -> &Arc<RwLock<Env>>renamed toevm_env() -> &Arc<RwLock<EvmEnv>>with_genesis()takesArc<RwLock<EvmEnv>>+NetworkConfigsinstead ofArc<RwLock<Env>>Env::new()replaced with plainEvmEnvconstruction; networks passed separately to with_genesis();setup_fork_db/setup_fork_db_confignow take &mut EvmEnv directlyenv.networks.*replaced withself.networks.*Envclones in do_mine_block,with_pending_block,replay_tx_with_inspector,reset_fork,reset_block_numberreplaced withEvmEnv-only clones