chore: bump `revm` to `21.0.0` release #10183

zerosnacks · 2025-03-26T15:46:07Z

Motivation

Opening for visibility / easier collaboration

Restructured commit history so it is easier to revert to known good changes whilst iteratively implementing the complex changes (handler, journal)

Uses #10051 as reference

CI is expected to be failing for quite some time

Solution

Depends on:

Next steps:

Blocking

Currently is blocking:

Knowing breaking changes for end users are:

Noted by Yash: because of internal Revm fields changing Anvil state files are known to currently break

Follow ups:

chore: switch from CustomPrintTracer to use Revm's TracerEip3155 #10329

Issues:

with_evm copies l1_block_info, this field no longer exists yielding the question whether Cheatcodes, like Anvil, expects OpEvm
The get_prank cheatcode expects depth to be a u64, not a usize - try_into? works
Pattern ccx.ecx.journaled_state.load_account(&mut ccx.ecx.db(), *from) causes cannot borrow ccx.ecx as mutable more than once at a time second mutable borrow occurs here

Closes: #10367

PR Checklist

Added Tests
Added Documentation
Breaking changes

zerosnacks · 2025-04-24T09:14:04Z

crates/anvil/src/eth/backend/executor.rs

+            // if let Some(factory) = &self.precompile_factory {
+            //     inject_precompiles(&mut evm, factory.precompiles());
+            // }


Possibly related: alloy-rs/evm#71

cc @yash-atreya

should be merged soon

zerosnacks · 2025-04-29T10:05:06Z

crates/cheatcodes/src/evm/mapping.rs

                let offset = interpreter.stack.peek(0).expect("stack size > 1").saturating_to();
-                let data = interpreter.shared_memory.slice(offset, 0x40);
+                let data = interpreter.memory.slice_len(offset, 0x40);


cc @rakita is this correct?

Yes, it is equivalent

zerosnacks · 2025-04-29T10:10:01Z

crates/evm/core/src/backend/mod.rs

@@ -1232,8 +1238,6 @@ impl DatabaseExt for Backend {
        update_env_block(env, &block);

        // replay all transactions that came before
-        let env = env.clone();


This may still be necessary

zerosnacks · 2025-04-29T10:20:54Z

crates/evm/evm/src/inspectors/stack.rs

-            evm.context.evm.inner.journaled_state.depth = 1;
+            evm.journaled_state.depth = 1;


observation: cargo test --package forge --test cli -- cmd::gas_report_all_contracts --exact --show-output -- --nocapture appears to not run the inspector if this is set to 1. If disabled it does run but with the output as follows:

---- expected: tests/cli/cmd.rs:1627:81 ++++ actual: stdout 1 1 | ... 2 2 | ╭----------------------------------------+-----------------+-------+--------+-------+---------╮ 3 3 | | src/Contracts.sol:ContractOne Contract | | | | | | 4 4 | +=============================================================================================+ 5 5 | | Deployment Cost | Deployment Size | | | | | 6 6 | |----------------------------------------+-----------------+-------+--------+-------+---------| 7 - | 133027 | 394 | | | | | 7 + | 170470 | 394 | | | | | 8 8 | |----------------------------------------+-----------------+-------+--------+-------+---------| 9 9 | | | | | | | | 10 10 | |----------------------------------------+-----------------+-------+--------+-------+---------| 11 11 | | Function Name | Min | Avg | Median | Max | # Calls | 12 12 | |----------------------------------------+-----------------+-------+--------+-------+---------| 13 - | foo | 45656 | 45656 | 45656 | 45656 | 1 | 13 + | foo | 24592 | 37706 | 37706 | 50821 | 2 | 14 14 | ╰----------------------------------------+-----------------+-------+--------+-------+---------╯ 15 15 | 16 16 | ╭------------------------------------------+-----------------+--------+--------+--------+---------╮ 17 17 | | src/Contracts.sol:ContractThree Contract | | | | | | 18 18 | +=================================================================================================+ 19 19 | | Deployment Cost | Deployment Size | | | | | 20 20 | |------------------------------------------+-----------------+--------+--------+--------+---------| 21 - | 133243 | 395 | | | | | 21 + | 170686 | 395 | | | | | 22 22 | |------------------------------------------+-----------------+--------+--------+--------+---------| 23 23 | | | | | | | | 24 24 | |------------------------------------------+-----------------+--------+--------+--------+---------| 25 25 | | Function Name | Min | Avg | Median | Max | # Calls | 26 26 | |------------------------------------------+-----------------+--------+--------+--------+---------| 27 - | baz | 287711 | 287711 | 287711 | 287711 | 1 | 27 + | baz | 266647 | 279772 | 279772 | 292898 | 2 | 28 28 | ╰------------------------------------------+-----------------+--------+--------+--------+---------╯ 29 29 | 30 30 | ╭----------------------------------------+-----------------+-------+--------+-------+---------╮ 31 31 | | src/Contracts.sol:ContractTwo Contract | | | | | | 32 32 | +=============================================================================================+ 33 33 | | Deployment Cost | Deployment Size | | | | | 34 34 | |----------------------------------------+-----------------+-------+--------+-------+---------| 35 - | 133027 | 394 | | | | | 35 + | 170470 | 394 | | | | | 36 36 | |----------------------------------------+-----------------+-------+--------+-------+---------| 37 37 | | | | | | | | 38 38 | |----------------------------------------+-----------------+-------+--------+-------+---------| 39 39 | | Function Name | Min | Avg | Median | Max | # Calls | 40 40 | |----------------------------------------+-----------------+-------+--------+-------+---------| 41 - | bar | 67683 | 67683 | 67683 | 67683 | 1 | 41 + | bar | 46619 | 59733 | 59733 | 72848 | 2 | 42 42 | ╰----------------------------------------+-----------------+-------+--------+-------+---------╯ 43 43 | 44 44 | 45 45 | Ran 3 test suites [ELAPSED]: 3 tests passed, 0 failed, 0 skipped (3 total tests)

This has been introduced in the isolate mode PR cc @klkvr, would you have an idea what could be the cause?

zerosnacks · 2025-04-29T11:23:51Z

crates/evm/core/src/utils.rs


    // Type 3, EIP-4844
    env.tx.blob_hashes = blob_versioned_hashes.clone().unwrap_or_default();
-    env.tx.max_fee_per_blob_gas = max_fee_per_blob_gas.map(U256::from);
+    env.tx.max_fee_per_blob_gas = max_fee_per_blob_gas.unwrap_or_default();


using a default value of 0 may be an issue here given 4844 asserts

assert tx.max_fee_per_blob_gas >= get_base_fee_per_blob_gas(block.header)

* downgrade op-revm to 2.0.0 to resolve dep conflict * op-revm 3.0 uses revm 22 * add `as_mut_dyn` to trait `MaybeFullDatabase` as we now require mut db_ref access ( * Revert "add `as_mut_dyn` to trait `MaybeFullDatabase` as we now require mut db_ref access (" This reverts commit 84d11f1. * fix: Inspector should be generic over CTX not DB * fixes helpers: new_evm_with_inspector_* to use CTX generic * fix: pass TxEnv to evm.transact * fix: inspector inference in TransactionExecutor and build_access_list_with_state * workaround: dup LogCollector to use with AnvilEvmContext * coz FoundryEvmContext is not generic over DB, instead hardoded to dyn DatabaseExt * fix tests * fix traces test * fix: use default kzg settings in blob validation * reintroduce OptimismHardfork * fix: disable nonce check if nonce is None * fix!: load state tests by addressing breaking changes in state files * BlockEnv Breaking change: - most fields now use `u64` instead of `U64` / `U256` - coinbase renamed to beneficiary - best_block_number is `u64`, prev `U64` * fix: access_list test by using evm.inspect_with_tx * fix: replace evm.transact with evm.inspect_with_tx * fix: make impl Inspector for AnvilInspector generic over CTX * fix: clone inspector in TransactionExecutor to enable evm.inspect_commit * fix: remove cloned inspector from TransactionExecutor * feat(`anvil`): op support revm 21 (#10407) * enable OpHardforks in NodeConfig * feat: add is_optimism flag to foundry_evm::Env * feat(`anvil`): set is_optimism in Backend * feat(`anvil`): introducing EvmContext enum holding Eth and Op variants. * adds OpEnv to foundry_evm_core * feat: EitherEvm * impl Evm for EitherEvm * integrate EitherEvm into RPC and executor *Map OpHaltReason and OpTransactionError * rm old evm helpers * feat(`foundry_evm`): add deposit tx parts field to Env * fix(`anvil`): set deposit tx parts in tx executor and backend.inspect_tx * nit * docs EitherEvm * nit * refac: return TxEnv and Deposit parts separately * nits * nit * make anvil result aliases more generic * nit

Cargo.toml

…ogCollector`, entire codebase builds (#10412) * temp refactor, still facing issue * clean up * clean up * temp cleanup, can later be refd * clean up, refactor stack.rs to apply ecx restore from cache to outside lamba * fix * clean up * clean up * avoid borrowing mutably for clarity * use EthEvmContext directly * FoundryEvmContext -> EthEvmContext * continue * fix tests * fix inspectors * codebase now builds entirely * fix clippy lints * remove duplicate LogCollector in Anvil * fmt * fix clippy * fix doctests

zerosnacks · 2025-04-30T15:03:29Z

crates/evm/evm/src/inspectors/stack.rs

+            let res = evm.transact(env.tx.clone());

            // need to reset the env in case it was modified via cheatcodes during execution
-            ecx.env = evm.context.evm.inner.env;
+            ecx.cfg = cached_env.evm_env.cfg_env;
+            ecx.block = cached_env.evm_env.block_env;
+            ecx.tx = cached_env.tx;
+


In master we are

foundry/crates/evm/evm/src/inspectors/stack.rs

Lines 639 to 640 in 497b6ee

// need to reset the env in case it was modified via cheatcodes during execution

ecx.env = evm.context.evm.inner.env;

Previously we were applying the cached_env in order to, as the prior comment states, reset the env.

I think we should instead do what we are doing in master, which is applying the changes to the outer EVM.

I think instead we should:

let res = evm.transact(evm.tx.clone()); // apply the changes to the env *env.cfg = evm.cfg.clone(); *env.block = evm.block.clone(); *env.tx = evm.tx.clone();

Note: this currently results in a underflow of a gas refund, investigating

zerosnacks · 2025-05-01T11:47:00Z

crates/cheatcodes/src/evm.rs

+        ensure!(*newHeight <= U256::from(u64::MAX), "block height must be less than 2^64 - 1");
+        ccx.ecx.block.number = newHeight.saturating_to();


This will automatically address the issue raised in #10367

zerosnacks added 12 commits March 26, 2025 15:18

start fixing imports

6933c85

continue fixing imports

bc48af7

continue fixing imports

1122da1

continue fixing imports

85036e8

add alloy-evm

03083a7

fix known good changes

edb2455

more known good fixes

1c11e70

more known good fixes

5f4f8e5

more known good fixes

94d8397

more known good fixes, unclear how OptimismFields should be ported

8d0e45f

start introducing crate::Env

bc856c4

continue introducing crate::Env

eccc959

github-project-automation bot added this to Foundry Mar 26, 2025

zerosnacks assigned klkvr and zerosnacks Mar 26, 2025

zerosnacks added A-dependencies Area: dependencies T-chore Type: chore labels Mar 26, 2025

zerosnacks moved this to In Progress in Foundry Mar 26, 2025

zerosnacks added this to the v1.1.0 milestone Mar 26, 2025

zerosnacks mentioned this pull request Mar 26, 2025

reference draft to update REVM #10116

Closed

zerosnacks added 10 commits March 27, 2025 10:35

fix cow types

6bf4e91

fix type

c75903a

add journaledstate types, fix env types

39206bd

fix JournaledState = JournalInner<JournalEntry>

5208520

fix types

e3ecba7

fix merge type

b3e648e

add odyssey precompile

d72eb16

continue fixing type issues, handler abstraction

5dbabaf

start working on create2 handler

933ea20

revert to type instead of struct, investigating handlers

256a414

zerosnacks added 2 commits April 23, 2025 19:14

revert to replay

5843f31

apply possible nonce 0/1 fixes, committed to proceed

5005376

zerosnacks commented Apr 24, 2025

View reviewed changes

zerosnacks added 12 commits April 24, 2025 12:10

disable nonce check in local_evm_env

c78af12

undo is_odyssey remove

73f1842

always spawn evm with handler

e3d51f3

replay() -> inspect_replay()

ad855f5

modify macro, comment out anvil related cast tests for the time being

b8dfec2

reapply state depth = 1

3624b54

something like this?

e4b3493

introduce outer block for early return

058731e

print debugging

25a5ce7

clean up

1d28788

merge in master, note no known equivalent of bytecode_address, to do

34face7

fix merge

ab71127

zerosnacks commented Apr 29, 2025

View reviewed changes

zerosnacks mentioned this pull request Apr 29, 2025

intermediary(revm bump): re-enable Anvil tests, remove duplicate LogCollector, entire codebase builds #10412

Merged

4 tasks

merge in master

4aa7b08

DaniPopes reviewed Apr 29, 2025

View reviewed changes

Cargo.toml Show resolved Hide resolved

zerosnacks and others added 4 commits April 30, 2025 09:58

fix merge conflicts

69c1e57

disable nonce checks on forks, enforce setting of tx.nonce on set_nonce

0c11f5a

fix: use transact from alloy-evm (#10417)

6ada1ed

zerosnacks commented Apr 30, 2025

View reviewed changes

Merge branch 'master' into zerosnacks/revm-bump-2

0957ba6

zerosnacks commented May 1, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore: bump `revm` to `21.0.0` release #10183

chore: bump `revm` to `21.0.0` release #10183

zerosnacks commented Mar 26, 2025 •

edited by rakita

Loading

zerosnacks Apr 24, 2025

jenpaff Apr 24, 2025

zerosnacks Apr 29, 2025

rakita May 1, 2025

zerosnacks Apr 29, 2025

zerosnacks Apr 29, 2025

zerosnacks Apr 29, 2025

zerosnacks Apr 30, 2025 •

edited

Loading

zerosnacks Apr 30, 2025

zerosnacks May 1, 2025 •

edited

Loading

		evm.context.evm.inner.journaled_state.depth = 1;
		evm.journaled_state.depth = 1;

	// need to reset the env in case it was modified via cheatcodes during execution
	ecx.env = evm.context.evm.inner.env;

		ensure!(*newHeight <= U256::from(u64::MAX), "block height must be less than 2^64 - 1");
		ccx.ecx.block.number = newHeight.saturating_to();

chore: bump revm to 21.0.0 release #10183

Are you sure you want to change the base?

chore: bump revm to 21.0.0 release #10183

Conversation

zerosnacks commented Mar 26, 2025 • edited by rakita Loading

Motivation

Solution

Blocking

PR Checklist

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

zerosnacks Apr 30, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

zerosnacks May 1, 2025 • edited Loading

Choose a reason for hiding this comment

chore: bump `revm` to `21.0.0` release #10183

chore: bump `revm` to `21.0.0` release #10183

zerosnacks commented Mar 26, 2025 •

edited by rakita

Loading

zerosnacks Apr 30, 2025 •

edited

Loading

zerosnacks May 1, 2025 •

edited

Loading