Skip to content

Commit

Permalink
Bump new VM revision
Browse files Browse the repository at this point in the history
  • Loading branch information
slowli committed Aug 27, 2024
1 parent 0c164de commit f7cfe5c
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ zk_evm_1_4_1 = { package = "zk_evm", version = "0.141.0" }
zk_evm_1_5_0 = { package = "zk_evm", version = "=0.150.4" }

# New VM; pinned to a specific commit because of instability
vm2 = { git = "https://github.com/matter-labs/vm2.git", rev = "9a38900d7af9b1d72b47ce3be980e77c1239a61d" }
vm2 = { git = "https://github.com/matter-labs/vm2.git", rev = "bcc6e2033edc9a549de83fee0f46f6e3db51c543" }

# Consensus dependencies.
zksync_concurrency = "=0.1.0-rc.11"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -176,9 +176,8 @@ fn get_used_contracts_with_out_of_gas_far_call() {
let (vm, counter_bytecode_hash, exec_result) = execute_proxy_counter(10_000);
assert_matches!(exec_result.result, ExecutionResult::Revert { .. });
let decommitted_hashes = vm.vm.decommitted_hashes().collect::<HashSet<_>>();
// FIXME: this diverges from the old VM behavior
assert!(
!decommitted_hashes.contains(&counter_bytecode_hash),
decommitted_hashes.contains(&counter_bytecode_hash),
"{decommitted_hashes:?}"
);
}
2 changes: 1 addition & 1 deletion prover/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit f7cfe5c

Please sign in to comment.