Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
115 changes: 56 additions & 59 deletions Cargo.lock

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ edition = "2021"
homepage = "https://github.com/scroll-tech/zkvm-prover"
readme = "README.md"
repository = "https://github.com/scroll-tech/zkvm-prover"
version = "0.7.0"
version = "0.7.1"

[workspace.dependencies]
# openvm guest libs
Expand Down Expand Up @@ -70,11 +70,11 @@ openvm-transpiler = { git = "https://github.com/openvm-org/openvm.git", tag = "v
# more openvm related libs
openvm-stark-sdk = { git = "https://github.com/openvm-org/stark-backend.git", tag = "v1.2.1" }

sbv-core = { git = "https://github.com/scroll-tech/stateless-block-verifier", tag = "scroll-v91" }
sbv-helpers = { git = "https://github.com/scroll-tech/stateless-block-verifier", tag = "scroll-v91", features = ["dev"] }
sbv-primitives = { git = "https://github.com/scroll-tech/stateless-block-verifier", tag = "scroll-v91" }
sbv-utils = { git = "https://github.com/scroll-tech/stateless-block-verifier", tag = "scroll-v91" }
sbv-trie = { git = "https://github.com/scroll-tech/stateless-block-verifier", tag = "scroll-v91" }
sbv-core = { git = "https://github.com/scroll-tech/stateless-block-verifier", tag = "scroll-v91.2" }
sbv-helpers = { git = "https://github.com/scroll-tech/stateless-block-verifier", tag = "scroll-v91.2", features = ["dev"] }
sbv-primitives = { git = "https://github.com/scroll-tech/stateless-block-verifier", tag = "scroll-v91.2" }
sbv-utils = { git = "https://github.com/scroll-tech/stateless-block-verifier", tag = "scroll-v91.2" }
sbv-trie = { git = "https://github.com/scroll-tech/stateless-block-verifier", tag = "scroll-v91.2" }

alloy-consensus = "1.0"
alloy-provider = "1.0"
Expand Down
2 changes: 1 addition & 1 deletion crates/circuits/batch-circuit/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "scroll-zkvm-batch-circuit"
edition.workspace = true
readme.workspace = true
repository.workspace = true
version = "0.7.0"
version = "0.7.1"

[dependencies]
scroll-zkvm-types-circuit.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion crates/circuits/batch-circuit/batch_exe_commit.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#![cfg_attr(rustfmt, rustfmt_skip)]
//! Generated by crates/build-guest. DO NOT EDIT!

pub const COMMIT: [u32; 8] = [785797281, 1503046428, 1723442098, 1435956418, 1765830355, 482303835, 1354624549, 1218025248];
pub const COMMIT: [u32; 8] = [890757180, 1649007893, 1418561989, 1736314948, 223360016, 1081880906, 1677391942, 1226516817];
2 changes: 1 addition & 1 deletion crates/circuits/bundle-circuit/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "scroll-zkvm-bundle-circuit"
edition.workspace = true
readme.workspace = true
repository.workspace = true
version = "0.7.0"
version = "0.7.1"

[dependencies]
bincode.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion crates/circuits/bundle-circuit/bundle_exe_commit.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#![cfg_attr(rustfmt, rustfmt_skip)]
//! Generated by crates/build-guest. DO NOT EDIT!

pub const COMMIT: [u32; 8] = [937604430, 1562589477, 821989304, 1679885151, 643808946, 1649581635, 181247682, 253726358];
pub const COMMIT: [u32; 8] = [1247172214, 1931214656, 1068729231, 398739518, 1658920406, 920892194, 1958141633, 1294205275];
2 changes: 1 addition & 1 deletion crates/circuits/chunk-circuit/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "scroll-zkvm-chunk-circuit"
edition.workspace = true
readme.workspace = true
repository.workspace = true
version = "0.7.0"
version = "0.7.1"

[dependencies]
bincode = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion crates/circuits/chunk-circuit/chunk_exe_commit.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#![cfg_attr(rustfmt, rustfmt_skip)]
//! Generated by crates/build-guest. DO NOT EDIT!

pub const COMMIT: [u32; 8] = [393332172, 117752347, 1533506325, 905201856, 1743252499, 1773630484, 453382683, 1429716804];
pub const COMMIT: [u32; 8] = [521613781, 1622539563, 151651136, 1386962758, 237337157, 1727643820, 1779614850, 552755794];
8 changes: 4 additions & 4 deletions crates/integration/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use crate::axiom::AxiomProver;
use cargo_metadata::MetadataCommand;
use once_cell::sync::OnceCell;
use openvm_sdk::{Sdk, StdIn};
use openvm_sdk::StdIn;
use scroll_zkvm_prover::{
Prover,
setup::{read_app_config, read_app_exe},
Expand Down Expand Up @@ -49,7 +49,7 @@ pub fn testing_hardfork() -> ForkName {

/// Test settings (version).
pub fn testing_version() -> Version {
Version::galileo()
Version::galileo_v2()
}

pub fn testing_version_validium() -> Version {
Expand Down Expand Up @@ -367,8 +367,8 @@ pub fn tester_execute<T: ProverTester>(
.map(|p| p.as_stark_proof().expect("must be stark proof")),
)?;

let sdk = Sdk::new(app_config)?;
let ret = scroll_zkvm_prover::utils::vm::execute_guest(&sdk, app_exe, &stdin)?;
let ret =
scroll_zkvm_prover::utils::vm::execute_guest(app_config.app_vm_config, &app_exe, &stdin)?;
Ok(ret)
}

Expand Down
9 changes: 9 additions & 0 deletions crates/integration/src/testers/chunk.rs
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,7 @@ pub fn preset_chunk() -> ChunkTaskGenerator {
ForkName::EuclidV2 => (Version::euclid_v2(), 1u64..=4u64),
ForkName::Feynman => (Version::feynman(), 16525000u64..=16525003u64),
ForkName::Galileo => (Version::galileo(), 20239156..=20239235),
ForkName::GalileoV2 => (Version::galileo_v2(), 20239240..=20239245),
};

ChunkTaskGenerator {
Expand Down Expand Up @@ -289,6 +290,14 @@ pub fn preset_chunk_multiple() -> Vec<ChunkTaskGenerator> {
],
Version::galileo(),
),
ForkName::GalileoV2 => (
vec![
20239240..=20239240,
20239241..=20239241,
20239242..=20239242,
],
Version::galileo_v2(),
),
};
create_canonical_tasks(version, block_range.into_iter())
.expect("must success for preset collections")
Expand Down
6 changes: 5 additions & 1 deletion crates/integration/src/utils/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ pub fn build_batch_witnesses(
blob_data_proof: point_evaluations.map(|u| B256::new(u.to_be_bytes())),
})
}
ForkName::EuclidV2 | ForkName::Feynman | ForkName::Galileo => {
ForkName::EuclidV2 | ForkName::Feynman | ForkName::Galileo | ForkName::GalileoV2 => {
use scroll_zkvm_types::batch::BatchHeaderV7;
ReferenceHeader::V7_V8_V9(BatchHeaderV7 {
version: last_header.version,
Expand Down Expand Up @@ -431,6 +431,10 @@ fn test_build_and_parse_batch_task() -> eyre::Result<()> {
block_range: (20239156..=20239192).collect(),
..Default::default()
},
ForkName::GalileoV2 => ChunkTaskGenerator {
block_range: (20239240..=20239245).collect(),
..Default::default()
},
}
.get_or_build_witness()?;

Expand Down
5,241 changes: 5,241 additions & 0 deletions crates/integration/testdata/galileov2/witnesses/20239240.json

Large diffs are not rendered by default.

Loading