From e01dafc93b8fb5720d7a3bb1a856777876acaca0 Mon Sep 17 00:00:00 2001 From: Rohit Narurkar Date: Tue, 18 Nov 2025 11:59:27 +0000 Subject: [PATCH 1/4] (libzkp): refactor batch header variants --- Cargo.lock | 14 +++++----- Cargo.toml | 6 ++--- crates/libzkp/src/tasks/batch.rs | 46 +++++++++++++------------------- 3 files changed, 29 insertions(+), 37 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f73e8a9262..c5ee2e447b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8779,7 +8779,7 @@ dependencies = [ [[package]] name = "scroll-zkvm-prover" version = "0.7.0" -source = "git+https://github.com/scroll-tech/zkvm-prover?branch=feat%2Fgalileo#90e7ede94329e73ca2c79c956caf1f9490732d41" +source = "git+https://github.com/scroll-tech/zkvm-prover?branch=chore%2Fgalileo-refactor-header#2c6b4578fbb0e72b826d91e64b1fc9aa2d87028b" dependencies = [ "base64 0.22.1", "bincode 1.3.3", @@ -8806,7 +8806,7 @@ dependencies = [ [[package]] name = "scroll-zkvm-types" version = "0.7.0" -source = "git+https://github.com/scroll-tech/zkvm-prover?branch=feat%2Fgalileo#90e7ede94329e73ca2c79c956caf1f9490732d41" +source = "git+https://github.com/scroll-tech/zkvm-prover?branch=chore%2Fgalileo-refactor-header#2c6b4578fbb0e72b826d91e64b1fc9aa2d87028b" dependencies = [ "alloy-primitives", "base64 0.22.1", @@ -8830,7 +8830,7 @@ dependencies = [ [[package]] name = "scroll-zkvm-types-base" version = "0.7.0" -source = "git+https://github.com/scroll-tech/zkvm-prover?branch=feat%2Fgalileo#90e7ede94329e73ca2c79c956caf1f9490732d41" +source = "git+https://github.com/scroll-tech/zkvm-prover?branch=chore%2Fgalileo-refactor-header#2c6b4578fbb0e72b826d91e64b1fc9aa2d87028b" dependencies = [ "alloy-primitives", "alloy-serde 1.0.41", @@ -8843,7 +8843,7 @@ dependencies = [ [[package]] name = "scroll-zkvm-types-batch" version = "0.7.0" -source = "git+https://github.com/scroll-tech/zkvm-prover?branch=feat%2Fgalileo#90e7ede94329e73ca2c79c956caf1f9490732d41" +source = "git+https://github.com/scroll-tech/zkvm-prover?branch=chore%2Fgalileo-refactor-header#2c6b4578fbb0e72b826d91e64b1fc9aa2d87028b" dependencies = [ "alloy-primitives", "c-kzg", @@ -8865,7 +8865,7 @@ dependencies = [ [[package]] name = "scroll-zkvm-types-bundle" version = "0.7.0" -source = "git+https://github.com/scroll-tech/zkvm-prover?branch=feat%2Fgalileo#90e7ede94329e73ca2c79c956caf1f9490732d41" +source = "git+https://github.com/scroll-tech/zkvm-prover?branch=chore%2Fgalileo-refactor-header#2c6b4578fbb0e72b826d91e64b1fc9aa2d87028b" dependencies = [ "rkyv", "scroll-zkvm-types-base", @@ -8875,7 +8875,7 @@ dependencies = [ [[package]] name = "scroll-zkvm-types-chunk" version = "0.7.0" -source = "git+https://github.com/scroll-tech/zkvm-prover?branch=feat%2Fgalileo#90e7ede94329e73ca2c79c956caf1f9490732d41" +source = "git+https://github.com/scroll-tech/zkvm-prover?branch=chore%2Fgalileo-refactor-header#2c6b4578fbb0e72b826d91e64b1fc9aa2d87028b" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -8900,7 +8900,7 @@ dependencies = [ [[package]] name = "scroll-zkvm-verifier" version = "0.7.0" -source = "git+https://github.com/scroll-tech/zkvm-prover?branch=feat%2Fgalileo#90e7ede94329e73ca2c79c956caf1f9490732d41" +source = "git+https://github.com/scroll-tech/zkvm-prover?branch=chore%2Fgalileo-refactor-header#2c6b4578fbb0e72b826d91e64b1fc9aa2d87028b" dependencies = [ "bincode 1.3.3", "eyre", diff --git a/Cargo.toml b/Cargo.toml index 792dfc4ffa..176a5d6fba 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,9 +17,9 @@ repository = "https://github.com/scroll-tech/scroll" version = "4.7.1" [workspace.dependencies] -scroll-zkvm-prover = { git = "https://github.com/scroll-tech/zkvm-prover", branch = "feat/galileo" } -scroll-zkvm-verifier = { git = "https://github.com/scroll-tech/zkvm-prover", branch = "feat/galileo" } -scroll-zkvm-types = { git = "https://github.com/scroll-tech/zkvm-prover", branch = "feat/galileo" } +scroll-zkvm-prover = { git = "https://github.com/scroll-tech/zkvm-prover", branch = "chore/galileo-refactor-header" } +scroll-zkvm-verifier = { git = "https://github.com/scroll-tech/zkvm-prover", branch = "chore/galileo-refactor-header" } +scroll-zkvm-types = { git = "https://github.com/scroll-tech/zkvm-prover", branch = "chore/galileo-refactor-header" } sbv-primitives = { git = "https://github.com/scroll-tech/stateless-block-verifier", tag = "scroll-v91", features = ["scroll", "rkyv"] } sbv-utils = { git = "https://github.com/scroll-tech/stateless-block-verifier", tag = "scroll-v91" } diff --git a/crates/libzkp/src/tasks/batch.rs b/crates/libzkp/src/tasks/batch.rs index b1100e4a6e..9dd3cbb6fa 100644 --- a/crates/libzkp/src/tasks/batch.rs +++ b/crates/libzkp/src/tasks/batch.rs @@ -3,9 +3,9 @@ use eyre::Result; use sbv_primitives::{B256, U256}; use scroll_zkvm_types::{ batch::{ - build_point_eval_witness, BatchHeader, BatchHeaderV6, BatchHeaderV7, BatchHeaderV8, - BatchHeaderValidium, BatchInfo, BatchWitness, Envelope, EnvelopeV6, EnvelopeV7, EnvelopeV8, - LegacyBatchWitness, ReferenceHeader, N_BLOB_BYTES, + build_point_eval_witness, BatchHeader, BatchHeaderV6, BatchHeaderV7, BatchHeaderValidium, + BatchInfo, BatchWitness, Envelope, EnvelopeV6, EnvelopeV7, LegacyBatchWitness, + ReferenceHeader, N_BLOB_BYTES, }, chunk::ChunkInfo, public_inputs::{ForkName, Version}, @@ -34,17 +34,18 @@ pub struct BatchHeaderValidiumWithHash { /// defination, i.e. v6- v8 (current), and validium #[derive(Clone, serde::Deserialize, serde::Serialize)] #[serde(untagged)] +#[allow(non_camel_case_types)] pub enum BatchHeaderV { Validium(BatchHeaderValidiumWithHash), V6(BatchHeaderV6), - V7_8_9(BatchHeaderV7), + V7_V8_V9(BatchHeaderV7), } impl core::fmt::Display for BatchHeaderV { fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result { match self { BatchHeaderV::V6(_) => write!(f, "V6"), - BatchHeaderV::V7_8_9(_) => write!(f, "V7_8_9"), + BatchHeaderV::V7_V8_V9(_) => write!(f, "V7_V8_V9"), BatchHeaderV::Validium(_) => write!(f, "Validium"), } } @@ -54,7 +55,7 @@ impl BatchHeaderV { pub fn batch_hash(&self) -> B256 { match self { BatchHeaderV::V6(h) => h.batch_hash(), - BatchHeaderV::V7_8_9(h) => h.batch_hash(), + BatchHeaderV::V7_V8_V9(h) => h.batch_hash(), BatchHeaderV::Validium(h) => h.header.batch_hash(), } } @@ -66,17 +67,10 @@ impl BatchHeaderV { } } - pub fn must_v7_header(&self) -> &BatchHeaderV7 { + pub fn must_v7_v8_v9_header(&self) -> &BatchHeaderV7 { match self { - BatchHeaderV::V7_8_9(h) => h, - _ => unreachable!("A header of {} is considered to be v7", self), - } - } - - pub fn must_v8_header(&self) -> &BatchHeaderV8 { - match self { - BatchHeaderV::V7_8_9(h) => h, - _ => unreachable!("A header of {} is considered to be v8", self), + BatchHeaderV::V7_V8_V9(h) => h, + _ => unreachable!("A header of {} is considered to be in [v7, v8, v9]", self), } } @@ -157,10 +151,8 @@ impl BatchProvingTask { version.fork, ForkName::EuclidV1, ), - BatchHeaderV::V7_8_9(_) => assert!( - version.fork == ForkName::EuclidV2 || - version.fork == ForkName::Feynman || - version.fork == ForkName::Galileo, + BatchHeaderV::V7_V8_V9(_) => assert!( + matches!(version.fork, ForkName::EuclidV2 | ForkName::Feynman | ForkName::Galileo), "hardfork mismatch for da-codec@v7/8/9 header: found={}, expected={:?}", version.fork, [ForkName::EuclidV2, ForkName::Feynman, ForkName::Galileo], @@ -187,8 +179,6 @@ impl BatchProvingTask { } Codec::V7 => ::from_slice(padded_blob_bytes.as_slice()) .challenge_digest(versioned_hash), - Codec::V8 => ::from_slice(padded_blob_bytes.as_slice()) - .challenge_digest(versioned_hash), }; let (proof, _) = point_eval::get_kzg_proof(&blob, challenge_digest); @@ -237,11 +227,13 @@ impl BatchProvingTask { (Domain::Scroll, STFVersion::V6) => { ReferenceHeader::V6(*self.batch_header.must_v6_header()) } - (Domain::Scroll, STFVersion::V7) => { - ReferenceHeader::V7(*self.batch_header.must_v7_header()) - } - (Domain::Scroll, STFVersion::V8) | (Domain::Scroll, STFVersion::V9) => { - ReferenceHeader::V8(*self.batch_header.must_v8_header()) + (Domain::Scroll, stf_version) + if matches!( + stf_version, + STFVersion::V7 | STFVersion::V8 | STFVersion::V9 + ) => + { + ReferenceHeader::V7_V8_V9(*self.batch_header.must_v7_v8_v9_header()) } (Domain::Validium, STFVersion::V1) => { ReferenceHeader::Validium(*self.batch_header.must_validium_header()) From 18fc22cc3da683f00537d588562995925b915cc5 Mon Sep 17 00:00:00 2001 From: Rohit Narurkar Date: Tue, 18 Nov 2025 15:09:49 +0000 Subject: [PATCH 2/4] fix: update corresponding parts after zkvm-prover refactor --- Cargo.lock | 14 +++++++------- crates/libzkp/src/lib.rs | 29 +++++++++++++++++++++++++---- crates/libzkp/src/tasks.rs | 14 +++++++------- 3 files changed, 39 insertions(+), 18 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c5ee2e447b..89f4d73b6a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8779,7 +8779,7 @@ dependencies = [ [[package]] name = "scroll-zkvm-prover" version = "0.7.0" -source = "git+https://github.com/scroll-tech/zkvm-prover?branch=chore%2Fgalileo-refactor-header#2c6b4578fbb0e72b826d91e64b1fc9aa2d87028b" +source = "git+https://github.com/scroll-tech/zkvm-prover?branch=chore%2Fgalileo-refactor-header#74d25ff8a063ba47543c2b8c876e97e0c4851336" dependencies = [ "base64 0.22.1", "bincode 1.3.3", @@ -8806,7 +8806,7 @@ dependencies = [ [[package]] name = "scroll-zkvm-types" version = "0.7.0" -source = "git+https://github.com/scroll-tech/zkvm-prover?branch=chore%2Fgalileo-refactor-header#2c6b4578fbb0e72b826d91e64b1fc9aa2d87028b" +source = "git+https://github.com/scroll-tech/zkvm-prover?branch=chore%2Fgalileo-refactor-header#74d25ff8a063ba47543c2b8c876e97e0c4851336" dependencies = [ "alloy-primitives", "base64 0.22.1", @@ -8830,7 +8830,7 @@ dependencies = [ [[package]] name = "scroll-zkvm-types-base" version = "0.7.0" -source = "git+https://github.com/scroll-tech/zkvm-prover?branch=chore%2Fgalileo-refactor-header#2c6b4578fbb0e72b826d91e64b1fc9aa2d87028b" +source = "git+https://github.com/scroll-tech/zkvm-prover?branch=chore%2Fgalileo-refactor-header#74d25ff8a063ba47543c2b8c876e97e0c4851336" dependencies = [ "alloy-primitives", "alloy-serde 1.0.41", @@ -8843,7 +8843,7 @@ dependencies = [ [[package]] name = "scroll-zkvm-types-batch" version = "0.7.0" -source = "git+https://github.com/scroll-tech/zkvm-prover?branch=chore%2Fgalileo-refactor-header#2c6b4578fbb0e72b826d91e64b1fc9aa2d87028b" +source = "git+https://github.com/scroll-tech/zkvm-prover?branch=chore%2Fgalileo-refactor-header#74d25ff8a063ba47543c2b8c876e97e0c4851336" dependencies = [ "alloy-primitives", "c-kzg", @@ -8865,7 +8865,7 @@ dependencies = [ [[package]] name = "scroll-zkvm-types-bundle" version = "0.7.0" -source = "git+https://github.com/scroll-tech/zkvm-prover?branch=chore%2Fgalileo-refactor-header#2c6b4578fbb0e72b826d91e64b1fc9aa2d87028b" +source = "git+https://github.com/scroll-tech/zkvm-prover?branch=chore%2Fgalileo-refactor-header#74d25ff8a063ba47543c2b8c876e97e0c4851336" dependencies = [ "rkyv", "scroll-zkvm-types-base", @@ -8875,7 +8875,7 @@ dependencies = [ [[package]] name = "scroll-zkvm-types-chunk" version = "0.7.0" -source = "git+https://github.com/scroll-tech/zkvm-prover?branch=chore%2Fgalileo-refactor-header#2c6b4578fbb0e72b826d91e64b1fc9aa2d87028b" +source = "git+https://github.com/scroll-tech/zkvm-prover?branch=chore%2Fgalileo-refactor-header#74d25ff8a063ba47543c2b8c876e97e0c4851336" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -8900,7 +8900,7 @@ dependencies = [ [[package]] name = "scroll-zkvm-verifier" version = "0.7.0" -source = "git+https://github.com/scroll-tech/zkvm-prover?branch=chore%2Fgalileo-refactor-header#2c6b4578fbb0e72b826d91e64b1fc9aa2d87028b" +source = "git+https://github.com/scroll-tech/zkvm-prover?branch=chore%2Fgalileo-refactor-header#74d25ff8a063ba47543c2b8c876e97e0c4851336" dependencies = [ "bincode 1.3.3", "eyre", diff --git a/crates/libzkp/src/lib.rs b/crates/libzkp/src/lib.rs index 5186b29e1b..679cbf76ba 100644 --- a/crates/libzkp/src/lib.rs +++ b/crates/libzkp/src/lib.rs @@ -7,7 +7,7 @@ pub use verifier::{TaskType, VerifierConfig}; mod utils; use sbv_primitives::B256; -use scroll_zkvm_types::utils::vec_as_base64; +use scroll_zkvm_types::{utils::vec_as_base64, version::Version}; use serde::{Deserialize, Serialize}; use serde_json::value::RawValue; use std::{collections::HashMap, path::Path, sync::OnceLock}; @@ -138,35 +138,56 @@ pub fn gen_universal_task( let mut task = serde_json::from_str::(task_json)?; // normailze fork name field in task task.fork_name = task.fork_name.to_lowercase(); + let version = Version::from(task.version); // always respect the fork_name_str (which has been normalized) being passed // if the fork_name wrapped in task is not match, consider it a malformed task if fork_name_str != task.fork_name.as_str() { eyre::bail!("fork name in chunk task not match the calling arg, expected {fork_name_str}, get {}", task.fork_name); } + if fork_name_str != version.fork.as_str() { + eyre::bail!( + "given task version, expected fork={fork_name_str}, got={version_fork}", + version_fork = version.fork.as_str() + ); + } let (pi_hash, metadata, u_task) = - utils::panic_catch(move || gen_universal_chunk_task(task, fork_name_str.into())) + utils::panic_catch(move || gen_universal_chunk_task(task, version)) .map_err(|e| eyre::eyre!("caught panic in chunk task{e}"))??; (pi_hash, AnyMetaData::Chunk(metadata), u_task) } x if x == TaskType::Batch as i32 => { let mut task = serde_json::from_str::(task_json)?; task.fork_name = task.fork_name.to_lowercase(); + let version = Version::from(task.version); if fork_name_str != task.fork_name.as_str() { eyre::bail!("fork name in batch task not match the calling arg, expected {fork_name_str}, get {}", task.fork_name); } + if fork_name_str != version.fork.as_str() { + eyre::bail!( + "given task version, expected fork={fork_name_str}, got={version_fork}", + version_fork = version.fork.as_str() + ); + } let (pi_hash, metadata, u_task) = - utils::panic_catch(move || gen_universal_batch_task(task, fork_name_str.into())) + utils::panic_catch(move || gen_universal_batch_task(task, version)) .map_err(|e| eyre::eyre!("caught panic in chunk task{e}"))??; (pi_hash, AnyMetaData::Batch(metadata), u_task) } x if x == TaskType::Bundle as i32 => { let mut task = serde_json::from_str::(task_json)?; task.fork_name = task.fork_name.to_lowercase(); + let version = Version::from(task.version); if fork_name_str != task.fork_name.as_str() { eyre::bail!("fork name in bundle task not match the calling arg, expected {fork_name_str}, get {}", task.fork_name); } + if fork_name_str != version.fork.as_str() { + eyre::bail!( + "given task version, expected fork={fork_name_str}, got={version_fork}", + version_fork = version.fork.as_str() + ); + } let (pi_hash, metadata, u_task) = - utils::panic_catch(move || gen_universal_bundle_task(task, fork_name_str.into())) + utils::panic_catch(move || gen_universal_bundle_task(task, version)) .map_err(|e| eyre::eyre!("caught panic in chunk task{e}"))??; (pi_hash, AnyMetaData::Bundle(metadata), u_task) } diff --git a/crates/libzkp/src/tasks.rs b/crates/libzkp/src/tasks.rs index 5eab672a79..7f438b5457 100644 --- a/crates/libzkp/src/tasks.rs +++ b/crates/libzkp/src/tasks.rs @@ -14,7 +14,7 @@ use crate::{ utils::panic_catch, }; use sbv_primitives::B256; -use scroll_zkvm_types::public_inputs::{ForkName, MultiVersionPublicInputs, Version}; +use scroll_zkvm_types::public_inputs::{MultiVersionPublicInputs, Version}; fn encode_task_to_witness(task: &T) -> eyre::Result> { let config = bincode::config::standard(); @@ -61,12 +61,12 @@ impl ProvintTaskExt { /// Generate required staff for chunk proving pub fn gen_universal_chunk_task( task: ChunkProvingTask, - fork_name: ForkName, + version: Version, ) -> eyre::Result<(B256, ChunkProofMetadata, ProvingTask)> { let chunk_total_gas = task.stats().total_gas_used; let chunk_info = task.precheck_and_build_metadata()?; let proving_task = task.try_into()?; - let expected_pi_hash = chunk_info.pi_hash_by_fork(fork_name); + let expected_pi_hash = chunk_info.pi_hash_by_version(version); Ok(( expected_pi_hash, ChunkProofMetadata { @@ -80,11 +80,11 @@ pub fn gen_universal_chunk_task( /// Generate required staff for batch proving pub fn gen_universal_batch_task( task: BatchProvingTask, - fork_name: ForkName, + version: Version, ) -> eyre::Result<(B256, BatchProofMetadata, ProvingTask)> { let batch_info = task.precheck_and_build_metadata()?; let proving_task = task.try_into()?; - let expected_pi_hash = batch_info.pi_hash_by_fork(fork_name); + let expected_pi_hash = batch_info.pi_hash_by_version(version); Ok(( expected_pi_hash, @@ -99,11 +99,11 @@ pub fn gen_universal_batch_task( /// Generate required staff for bundle proving pub fn gen_universal_bundle_task( task: BundleProvingTask, - fork_name: ForkName, + version: Version, ) -> eyre::Result<(B256, BundleProofMetadata, ProvingTask)> { let bundle_info = task.precheck_and_build_metadata()?; let proving_task = task.try_into()?; - let expected_pi_hash = bundle_info.pi_hash_by_fork(fork_name); + let expected_pi_hash = bundle_info.pi_hash_by_version(version); Ok(( expected_pi_hash, From 06749961617ad28ce954a490f1dd8b20fb1fcbc3 Mon Sep 17 00:00:00 2001 From: Rohit Narurkar Date: Tue, 18 Nov 2025 15:13:13 +0000 Subject: [PATCH 3/4] chore: clippy warning --- crates/libzkp/src/tasks/batch.rs | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/crates/libzkp/src/tasks/batch.rs b/crates/libzkp/src/tasks/batch.rs index 9dd3cbb6fa..dd0e7daeae 100644 --- a/crates/libzkp/src/tasks/batch.rs +++ b/crates/libzkp/src/tasks/batch.rs @@ -227,12 +227,7 @@ impl BatchProvingTask { (Domain::Scroll, STFVersion::V6) => { ReferenceHeader::V6(*self.batch_header.must_v6_header()) } - (Domain::Scroll, stf_version) - if matches!( - stf_version, - STFVersion::V7 | STFVersion::V8 | STFVersion::V9 - ) => - { + (Domain::Scroll, STFVersion::V7 | STFVersion::V8 | STFVersion::V9) => { ReferenceHeader::V7_V8_V9(*self.batch_header.must_v7_v8_v9_header()) } (Domain::Validium, STFVersion::V1) => { From 1b539b4e398718acb6969746aa7c6c590b2c1269 Mon Sep 17 00:00:00 2001 From: Rohit Narurkar Date: Tue, 18 Nov 2025 16:04:14 +0000 Subject: [PATCH 4/4] chore: bump to using tag --- Cargo.lock | 14 +++++++------- Cargo.toml | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 89f4d73b6a..155c0de02c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8779,7 +8779,7 @@ dependencies = [ [[package]] name = "scroll-zkvm-prover" version = "0.7.0" -source = "git+https://github.com/scroll-tech/zkvm-prover?branch=chore%2Fgalileo-refactor-header#74d25ff8a063ba47543c2b8c876e97e0c4851336" +source = "git+https://github.com/scroll-tech/zkvm-prover?tag=v0.7.0-rc.4#db70d808b717aeaebb066cb1603e14d3b10e51c7" dependencies = [ "base64 0.22.1", "bincode 1.3.3", @@ -8806,7 +8806,7 @@ dependencies = [ [[package]] name = "scroll-zkvm-types" version = "0.7.0" -source = "git+https://github.com/scroll-tech/zkvm-prover?branch=chore%2Fgalileo-refactor-header#74d25ff8a063ba47543c2b8c876e97e0c4851336" +source = "git+https://github.com/scroll-tech/zkvm-prover?tag=v0.7.0-rc.4#db70d808b717aeaebb066cb1603e14d3b10e51c7" dependencies = [ "alloy-primitives", "base64 0.22.1", @@ -8830,7 +8830,7 @@ dependencies = [ [[package]] name = "scroll-zkvm-types-base" version = "0.7.0" -source = "git+https://github.com/scroll-tech/zkvm-prover?branch=chore%2Fgalileo-refactor-header#74d25ff8a063ba47543c2b8c876e97e0c4851336" +source = "git+https://github.com/scroll-tech/zkvm-prover?tag=v0.7.0-rc.4#db70d808b717aeaebb066cb1603e14d3b10e51c7" dependencies = [ "alloy-primitives", "alloy-serde 1.0.41", @@ -8843,7 +8843,7 @@ dependencies = [ [[package]] name = "scroll-zkvm-types-batch" version = "0.7.0" -source = "git+https://github.com/scroll-tech/zkvm-prover?branch=chore%2Fgalileo-refactor-header#74d25ff8a063ba47543c2b8c876e97e0c4851336" +source = "git+https://github.com/scroll-tech/zkvm-prover?tag=v0.7.0-rc.4#db70d808b717aeaebb066cb1603e14d3b10e51c7" dependencies = [ "alloy-primitives", "c-kzg", @@ -8865,7 +8865,7 @@ dependencies = [ [[package]] name = "scroll-zkvm-types-bundle" version = "0.7.0" -source = "git+https://github.com/scroll-tech/zkvm-prover?branch=chore%2Fgalileo-refactor-header#74d25ff8a063ba47543c2b8c876e97e0c4851336" +source = "git+https://github.com/scroll-tech/zkvm-prover?tag=v0.7.0-rc.4#db70d808b717aeaebb066cb1603e14d3b10e51c7" dependencies = [ "rkyv", "scroll-zkvm-types-base", @@ -8875,7 +8875,7 @@ dependencies = [ [[package]] name = "scroll-zkvm-types-chunk" version = "0.7.0" -source = "git+https://github.com/scroll-tech/zkvm-prover?branch=chore%2Fgalileo-refactor-header#74d25ff8a063ba47543c2b8c876e97e0c4851336" +source = "git+https://github.com/scroll-tech/zkvm-prover?tag=v0.7.0-rc.4#db70d808b717aeaebb066cb1603e14d3b10e51c7" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -8900,7 +8900,7 @@ dependencies = [ [[package]] name = "scroll-zkvm-verifier" version = "0.7.0" -source = "git+https://github.com/scroll-tech/zkvm-prover?branch=chore%2Fgalileo-refactor-header#74d25ff8a063ba47543c2b8c876e97e0c4851336" +source = "git+https://github.com/scroll-tech/zkvm-prover?tag=v0.7.0-rc.4#db70d808b717aeaebb066cb1603e14d3b10e51c7" dependencies = [ "bincode 1.3.3", "eyre", diff --git a/Cargo.toml b/Cargo.toml index 176a5d6fba..197077e996 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,9 +17,9 @@ repository = "https://github.com/scroll-tech/scroll" version = "4.7.1" [workspace.dependencies] -scroll-zkvm-prover = { git = "https://github.com/scroll-tech/zkvm-prover", branch = "chore/galileo-refactor-header" } -scroll-zkvm-verifier = { git = "https://github.com/scroll-tech/zkvm-prover", branch = "chore/galileo-refactor-header" } -scroll-zkvm-types = { git = "https://github.com/scroll-tech/zkvm-prover", branch = "chore/galileo-refactor-header" } +scroll-zkvm-prover = { git = "https://github.com/scroll-tech/zkvm-prover", tag = "v0.7.0-rc.4" } +scroll-zkvm-verifier = { git = "https://github.com/scroll-tech/zkvm-prover", tag = "v0.7.0-rc.4" } +scroll-zkvm-types = { git = "https://github.com/scroll-tech/zkvm-prover", tag = "v0.7.0-rc.4" } sbv-primitives = { git = "https://github.com/scroll-tech/stateless-block-verifier", tag = "scroll-v91", features = ["scroll", "rkyv"] } sbv-utils = { git = "https://github.com/scroll-tech/stateless-block-verifier", tag = "scroll-v91" }