Skip to content

Commit c4245d6

Browse files
authored
fix(forge): do not panic on checkpoint revert (#11380)
1 parent aa74f7c commit c4245d6

File tree

3 files changed

+16
-20
lines changed

3 files changed

+16
-20
lines changed

Cargo.lock

Lines changed: 13 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -403,8 +403,8 @@ idna_adapter = "=1.1.0"
403403
# alloy-op-evm = { git = "https://github.com/alloy-rs/evm.git", rev = "7762adc" }
404404

405405
## revm
406-
revm = { git = "https://github.com/bluealloy/revm.git", rev = "d9cda3a" }
407-
op-revm = { git = "https://github.com/bluealloy/revm.git", rev = "d9cda3a" }
406+
revm = { git = "https://github.com/bluealloy/revm.git", rev = "409c2b3" }
407+
op-revm = { git = "https://github.com/bluealloy/revm.git", rev = "409c2b3" }
408408
# revm-inspectors = { git = "https://github.com/paradigmxyz/revm-inspectors.git", rev = "956bc98" }
409409

410410
## foundry

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1133,8 +1133,6 @@ impl DatabaseExt for Backend {
11331133
// selected. This ensures that there are no gaps in depth which would
11341134
// otherwise cause issues with the tracer
11351135
fork.journaled_state.depth = active_journaled_state.depth;
1136-
// Set proper journal of state changes into the fork.
1137-
fork.journaled_state.journal = active_journaled_state.journal.clone();
11381136

11391137
// another edge case where a fork is created and selected during setup with not
11401138
// necessarily the same caller as for the test, however we must always
@@ -1200,10 +1198,8 @@ impl DatabaseExt for Backend {
12001198

12011199
let active = self.inner.get_fork_mut(active_idx);
12021200
active.journaled_state = self.fork_init_journaled_state.clone();
1203-
12041201
active.journaled_state.depth = journaled_state.depth;
1205-
// Set proper journal of state changes into the fork.
1206-
active.journaled_state.journal = journaled_state.journal.clone();
1202+
12071203
for addr in persistent_addrs {
12081204
merge_journaled_state_data(addr, journaled_state, &mut active.journaled_state);
12091205
}

0 commit comments

Comments
 (0)