diff --git a/Cargo.lock b/Cargo.lock index 33476e9fad..0cdf95f237 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8395,7 +8395,7 @@ dependencies = [ [[package]] name = "scroll-zkvm-prover" version = "0.5.0" -source = "git+https://github.com/scroll-tech/zkvm-prover?branch=feat%2F0.5.1#8f29f60cc73495e8586338a67433a812097427c4" +source = "git+https://github.com/scroll-tech/zkvm-prover?tag=0.5.4#72f9abb00f0ef7c5e46b7856d58bb86cbb332509" dependencies = [ "alloy-primitives", "base64 0.22.1", @@ -8433,7 +8433,7 @@ dependencies = [ [[package]] name = "scroll-zkvm-types" version = "0.5.0" -source = "git+https://github.com/scroll-tech/zkvm-prover?branch=feat%2F0.5.1#8f29f60cc73495e8586338a67433a812097427c4" +source = "git+https://github.com/scroll-tech/zkvm-prover?tag=0.5.4#72f9abb00f0ef7c5e46b7856d58bb86cbb332509" dependencies = [ "base64 0.22.1", "bincode", @@ -8453,7 +8453,7 @@ dependencies = [ [[package]] name = "scroll-zkvm-types-base" version = "0.5.0" -source = "git+https://github.com/scroll-tech/zkvm-prover?branch=feat%2F0.5.1#8f29f60cc73495e8586338a67433a812097427c4" +source = "git+https://github.com/scroll-tech/zkvm-prover?tag=0.5.4#72f9abb00f0ef7c5e46b7856d58bb86cbb332509" dependencies = [ "alloy-primitives", "alloy-serde 1.0.16", @@ -8468,7 +8468,7 @@ dependencies = [ [[package]] name = "scroll-zkvm-types-batch" version = "0.5.0" -source = "git+https://github.com/scroll-tech/zkvm-prover?branch=feat%2F0.5.1#8f29f60cc73495e8586338a67433a812097427c4" +source = "git+https://github.com/scroll-tech/zkvm-prover?tag=0.5.4#72f9abb00f0ef7c5e46b7856d58bb86cbb332509" dependencies = [ "alloy-primitives", "halo2curves-axiom", @@ -8488,7 +8488,7 @@ dependencies = [ [[package]] name = "scroll-zkvm-types-bundle" version = "0.5.0" -source = "git+https://github.com/scroll-tech/zkvm-prover?branch=feat%2F0.5.1#8f29f60cc73495e8586338a67433a812097427c4" +source = "git+https://github.com/scroll-tech/zkvm-prover?tag=0.5.4#72f9abb00f0ef7c5e46b7856d58bb86cbb332509" dependencies = [ "alloy-primitives", "itertools 0.14.0", @@ -8501,7 +8501,7 @@ dependencies = [ [[package]] name = "scroll-zkvm-types-chunk" version = "0.5.0" -source = "git+https://github.com/scroll-tech/zkvm-prover?branch=feat%2F0.5.1#8f29f60cc73495e8586338a67433a812097427c4" +source = "git+https://github.com/scroll-tech/zkvm-prover?tag=0.5.4#72f9abb00f0ef7c5e46b7856d58bb86cbb332509" dependencies = [ "alloy-primitives", "itertools 0.14.0", @@ -8521,7 +8521,7 @@ dependencies = [ [[package]] name = "scroll-zkvm-verifier" version = "0.5.0" -source = "git+https://github.com/scroll-tech/zkvm-prover?branch=feat%2F0.5.1#8f29f60cc73495e8586338a67433a812097427c4" +source = "git+https://github.com/scroll-tech/zkvm-prover?tag=0.5.4#72f9abb00f0ef7c5e46b7856d58bb86cbb332509" dependencies = [ "bincode", "eyre", diff --git a/Cargo.toml b/Cargo.toml index adc6765da7..09325eae71 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,9 +17,9 @@ repository = "https://github.com/scroll-tech/scroll" version = "4.5.8" [workspace.dependencies] -scroll-zkvm-prover-euclid = { git = "https://github.com/scroll-tech/zkvm-prover", branch = "feat/0.5.1", package = "scroll-zkvm-prover" } -scroll-zkvm-verifier-euclid = { git = "https://github.com/scroll-tech/zkvm-prover", branch = "feat/0.5.1", package = "scroll-zkvm-verifier" } -scroll-zkvm-types = { git = "https://github.com/scroll-tech/zkvm-prover", branch = "feat/0.5.1" } +scroll-zkvm-prover-euclid = { git = "https://github.com/scroll-tech/zkvm-prover", tag = "0.5.4", package = "scroll-zkvm-prover" } +scroll-zkvm-verifier-euclid = { git = "https://github.com/scroll-tech/zkvm-prover", tag = "0.5.4", package = "scroll-zkvm-verifier" } +scroll-zkvm-types = { git = "https://github.com/scroll-tech/zkvm-prover", tag = "0.5.4" } sbv-primitives = { git = "https://github.com/scroll-tech/stateless-block-verifier", branch = "chore/openvm-1.3", features = ["scroll"] } sbv-utils = { git = "https://github.com/scroll-tech/stateless-block-verifier", branch = "chore/openvm-1.3" } diff --git a/crates/libzkp/src/tasks/bundle.rs b/crates/libzkp/src/tasks/bundle.rs index 66aceaf3e2..21a74a625d 100644 --- a/crates/libzkp/src/tasks/bundle.rs +++ b/crates/libzkp/src/tasks/bundle.rs @@ -83,7 +83,7 @@ impl TryFrom for ProvingTask { .into_iter() .map(|w_proof| w_proof.proof.into_root_proof().expect("expect root proof")) .collect(), - serialized_witness: vec![witness.rkyv_serialize(None)?.to_vec()], + serialized_witness: vec![witness.rkyv_serialize(Some(ForkName::Feynman))?.to_vec()], vk: Vec::new(), }) } diff --git a/crates/libzkp/src/tasks/chunk.rs b/crates/libzkp/src/tasks/chunk.rs index b6f637f3a0..f1107463b6 100644 --- a/crates/libzkp/src/tasks/chunk.rs +++ b/crates/libzkp/src/tasks/chunk.rs @@ -3,6 +3,7 @@ use eyre::Result; use sbv_primitives::{types::BlockWitness, B256}; use scroll_zkvm_types::{ chunk::{execute, ChunkInfo, ChunkWitness, ToArchievedWitness}, + public_inputs::ForkName, task::ProvingTask, }; @@ -71,7 +72,7 @@ impl TryFrom for ProvingTask { identifier: value.identifier(), fork_name: value.fork_name, aggregated_proofs: Vec::new(), - serialized_witness: vec![witness.rkyv_serialize(None)?.to_vec()], + serialized_witness: vec![witness.rkyv_serialize(Some(ForkName::Feynman))?.to_vec()], vk: Vec::new(), }) }