hardfork: GalileoV2 (#236)

* feat: galileo-v2

* Revert "refactor sdk cycle counting (#222)"

This reverts commit 5f0509c.

* x

* data

* 0.7.1

* commit

---------

Co-authored-by: Zhang Zhuo <mycinbrin@gmail.com>

Author: roynalnaruto

Cargo.lock

@@ -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
@@ -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"

Cargo.toml

@@ -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

crates/circuits/batch-circuit/Cargo.toml

@@ -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];

crates/circuits/batch-circuit/batch_exe_commit.rs

@@ -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

crates/circuits/bundle-circuit/Cargo.toml

@@ -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];

crates/circuits/bundle-circuit/bundle_exe_commit.rs

@@ -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 }

crates/circuits/chunk-circuit/Cargo.toml

@@ -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];

crates/circuits/chunk-circuit/chunk_exe_commit.rs

@@ -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},
@@ -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 {
@@ -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)
 }
 

crates/integration/src/lib.rs

@@ -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 {
@@ -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")