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

feat: allow vm2 tracers to stop execution #3183

Merged
merged 7 commits into from
Nov 1, 2024
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
integrate stage1 (tracers don't handle hooks yet)
  • Loading branch information
joonazan committed Oct 28, 2024
commit 30a12bc992605cda49a92c515d04b3014b27f0f1
4 changes: 2 additions & 2 deletions 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
@@ -230,7 +230,7 @@ zk_evm_1_4_1 = { package = "zk_evm", version = "0.141" }
zk_evm_1_5_0 = { package = "zk_evm", version = "=0.150.7" }

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

# Consensus dependencies.
zksync_concurrency = "=0.5.0"
11 changes: 9 additions & 2 deletions core/lib/multivm/src/versions/vm_fast/circuits_tracer.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
use circuit_sequencer_api_1_5_0::{geometry_config::get_geometry_config, toolset::GeometryConfig};
use zksync_vm2::interface::{CycleStats, GlobalStateInterface, Opcode, OpcodeType, Tracer};
use zksync_vm2::interface::{
CycleStats, ExecutionStatus, GlobalStateInterface, Opcode, OpcodeType, Tracer,
};
use zksync_vm_interface::CircuitStatistic;

use crate::vm_latest::tracers::circuits_capacity::*;
@@ -24,7 +26,10 @@ pub struct CircuitsTracer {
}

impl Tracer for CircuitsTracer {
fn after_instruction<OP: OpcodeType, S: GlobalStateInterface>(&mut self, _: &mut S) {
fn after_instruction<OP: OpcodeType, S: GlobalStateInterface>(
&mut self,
_: &mut S,
) -> ExecutionStatus {
self.main_vm_cycles += 1;

match OP::VALUE {
@@ -110,6 +115,8 @@ impl Tracer for CircuitsTracer {
self.ram_permutation_cycles += UMA_READ_RAM_CYCLES;
}
}

ExecutionStatus::Running
}

fn on_extra_prover_cycles(&mut self, stats: CycleStats) {
4 changes: 2 additions & 2 deletions prover/Cargo.lock

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

Loading