Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: merge journaled state during forks #705

Merged
merged 10 commits into from
Nov 6, 2024
Merged

fix: merge journaled state during forks #705

merged 10 commits into from
Nov 6, 2024

Conversation

nbaztec
Copy link
Collaborator

@nbaztec nbaztec commented Nov 6, 2024

What 💻

Why ✋

  • During forks any state changes are done on journaled_state

Evidence 📷

Tests pass

@nbaztec nbaztec requested a review from a team as a code owner November 6, 2024 15:33
@nbaztec nbaztec self-assigned this Nov 6, 2024
elfedy
elfedy previously approved these changes Nov 6, 2024
@nbaztec nbaztec requested a review from elfedy November 6, 2024 18:15
@nbaztec nbaztec merged commit c8c1e14 into main Nov 6, 2024
12 checks passed
@nbaztec nbaztec deleted the nish-fix-687 branch November 6, 2024 18:22
Copy link
Contributor

@Karrq Karrq left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't submit my review...

crates/evm/core/src/backend/mod.rs Show resolved Hide resolved
crates/evm/core/src/backend/mod.rs Show resolved Hide resolved
crates/evm/core/src/backend/mod.rs Show resolved Hide resolved
crates/evm/core/src/backend/mod.rs Show resolved Hide resolved
forkEra = vm.createSelectFork(Globals.ZKSYNC_MAINNET_URL, ERA_FORK_BLOCK);
}

function testZkEnsureContractMigratedWhenForkedIfPersistent() external {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
function testZkEnsureContractMigratedWhenForkedIfPersistent() external {
function testZkEnsurePersistentContractMigrationWhenForked() external {

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

calls to the persistent contract are not working after vm.makePersisent()
3 participants