fix(anvil): sync state snapshots with reset and revert#14317
Closed
solanaXpeter wants to merge 2 commits intofoundry-rs:masterfrom
Closed
fix(anvil): sync state snapshots with reset and revert#14317solanaXpeter wants to merge 2 commits intofoundry-rs:masterfrom
solanaXpeter wants to merge 2 commits intofoundry-rs:masterfrom
Conversation
solanaXpeter
requested review from
0xrusowsky,
DaniPopes,
figtracer,
grandizzy,
mablr,
mattsse,
onbjerg,
stevencartavia and
zerosnacks
as code owners
mablr
reviewed
Apr 18, 2026
Comment on lines
+2256
to
+2261
| let Some(block) = self.block_by_hash(hash).await? else { | ||
| self.active_state_snapshots.lock().remove(&id); | ||
| return Ok(false); | ||
| }; | ||
|
|
||
| let reset_time = block.header.timestamp(); | ||
| self.time.reset(reset_time); | ||
| if !self.db.write().await.revert_state(id, RevertStateSnapshotAction::RevertRemove) { |
Collaborator
There was a problem hiding this comment.
Would we rather need to revert_state any case ? (even if self.block_by_hash(hash).await? is None)
Contributor
Author
There was a problem hiding this comment.
@mablr Good point, I agree this branch still needs handling. I think we should drop the DB snapshot and return false when block_by_hash(hash) is None, since calling revert_state there would leave things half-reverted. Do you think that makes sense?
figtracer
reviewed
Apr 20, 2026
Collaborator
figtracer
left a comment
figtracer
left a comment
There was a problem hiding this comment.
i think we don't need this now tbf, pending another review
mablr
reviewed
Apr 20, 2026
Collaborator
mablr
left a comment
mablr
left a comment
There was a problem hiding this comment.
Yes I think it's not necessary to apply these changes, as Anvil's internals are going to be completely refactored soon.
Thanks for the effort @solanaXpeter 👍
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
3 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
State snapshot metadata can diverge from backend state.
anvil_resetclears chain and DB state without clearingactive_state_snapshots, andrevert_state_snapshotremoved metadata before the DB revert succeeded. That can leaveanvil_metadatareporting stale snapshots and makeevm_revertdepend on a partially applied rollback path.Solution
Clear
active_state_snapshotsin both reset paths, and only remove a snapshot entry after the DB revert succeeds. When the backing snapshot block or DB snapshot is already gone, drop the stale metadata entry and returnfalsewithout mutating chain state. Added regression tests for failed revert, in-memory reset, and fork reset paths.PR Checklist