Skip to content

Commit 2d40f0f

Browse files
roynalnarutocolinlyguo
authored andcommitted
fix: chunk task deserialisation from prove request input (#1620)
1 parent fcbaa67 commit 2d40f0f

File tree

1 file changed

+23
-16
lines changed

1 file changed

+23
-16
lines changed

zkvm-prover/src/zk_circuits_handler/euclid.rs

Lines changed: 23 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,33 @@ impl EuclidHandler {
2424
let cache_dir = workspace_path.join("cache");
2525
let chunk_exe = workspace_path.join("chunk/app.vmexe");
2626
let chunk_app_config = workspace_path.join("chunk/openvm.toml");
27-
let chunk_prover = ChunkProver::setup(chunk_exe, chunk_app_config, Some(cache_dir.clone()))
28-
.expect("Failed to setup chunk prover");
27+
let chunk_prover = ChunkProver::setup(
28+
chunk_exe,
29+
chunk_app_config,
30+
Some(cache_dir.clone()),
31+
Default::default(),
32+
)
33+
.expect("Failed to setup chunk prover");
2934

3035
let batch_exe = workspace_path.join("batch/app.vmexe");
3136
let batch_app_config = workspace_path.join("batch/openvm.toml");
32-
let batch_prover = BatchProver::setup(batch_exe, batch_app_config, Some(cache_dir.clone()))
33-
.expect("Failed to setup batch prover");
37+
let batch_prover = BatchProver::setup(
38+
batch_exe,
39+
batch_app_config,
40+
Some(cache_dir.clone()),
41+
Default::default(),
42+
)
43+
.expect("Failed to setup batch prover");
3444

3545
let bundle_exe = workspace_path.join("bundle/app.vmexe");
3646
let bundle_app_config = workspace_path.join("bundle/openvm.toml");
37-
let bundle_prover = BundleProver::setup(bundle_exe, bundle_app_config, Some(cache_dir))
38-
.expect("Failed to setup bundle prover");
47+
let bundle_prover = BundleProver::setup(
48+
bundle_exe,
49+
bundle_app_config,
50+
Some(cache_dir),
51+
Default::default(),
52+
)
53+
.expect("Failed to setup bundle prover");
3954

4055
Self {
4156
chunk_prover,
@@ -59,16 +74,8 @@ impl CircuitsHandler for Arc<Mutex<EuclidHandler>> {
5974
async fn get_proof_data(&self, prove_request: ProveRequest) -> Result<String> {
6075
match prove_request.proof_type {
6176
ProofType::Chunk => {
62-
let witnesses: Vec<sbv_primitives::types::BlockWitness> =
63-
serde_json::from_str(&prove_request.input)?;
64-
65-
let proof = self
66-
.try_lock()
67-
.unwrap()
68-
.chunk_prover
69-
.gen_proof(&ChunkProvingTask {
70-
block_witnesses: witnesses,
71-
})?;
77+
let task: ChunkProvingTask = serde_json::from_str(&prove_request.input)?;
78+
let proof = self.try_lock().unwrap().chunk_prover.gen_proof(&task)?;
7279

7380
Ok(serde_json::to_string(&proof)?)
7481
}

0 commit comments

Comments
 (0)