Skip to content

Commit 7621bbd

Browse files
lispclispc
authored
Merge pull request #83 from scroll-tech/chore/upgrade-openvm-0315
update openvm: finally a version without any known issues.
1 parent dc20b05 commit 7621bbd

File tree

17 files changed

+139
-108
lines changed

17 files changed

+139
-108
lines changed

‎Cargo.lock

Lines changed: 88 additions & 61 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -20,28 +20,29 @@ repository = "https://github.com/scroll-tech/zkvm-prover"
2020
version = "0.1.0-rc.5"
2121

2222
[workspace.dependencies]
23-
openvm = { git = "https://github.com/openvm-org/openvm.git", rev = "6169765", default-features = false }
24-
openvm-algebra-complex-macros = { git = "https://github.com/openvm-org/openvm.git", rev = "6169765", default-features = false }
25-
openvm-algebra-guest = { git = "https://github.com/openvm-org/openvm.git", rev = "6169765", default-features = false }
26-
openvm-bigint-guest = { git = "https://github.com/openvm-org/openvm.git", rev = "6169765", default-features = false }
27-
openvm-build = { git = "https://github.com/openvm-org/openvm.git", rev = "6169765", default-features = false }
28-
openvm-circuit = { git = "https://github.com/openvm-org/openvm.git", rev = "6169765", default-features = false }
29-
openvm-custom-insn = { git = "https://github.com/openvm-org/openvm.git", rev = "6169765", default-features = false }
30-
openvm-ecc-guest = { git = "https://github.com/openvm-org/openvm.git", rev = "6169765", default-features = false }
31-
openvm-instructions ={ git = "https://github.com/openvm-org/openvm.git", rev = "6169765", default-features = false }
32-
openvm-keccak256-guest = { git = "https://github.com/openvm-org/openvm.git", rev = "6169765", default-features = false }
33-
openvm-native-circuit = { git = "https://github.com/openvm-org/openvm.git", rev = "6169765", default-features = false }
34-
openvm-native-compiler = { git = "https://github.com/openvm-org/openvm.git", rev = "6169765", default-features = false }
35-
openvm-native-recursion = { git = "https://github.com/openvm-org/openvm.git", rev = "6169765", default-features = false }
36-
openvm-native-transpiler = { git = "https://github.com/openvm-org/openvm.git", rev = "6169765", default-features = false }
37-
openvm-pairing-guest = { git = "https://github.com/openvm-org/openvm.git", rev = "6169765", default-features = false }
38-
openvm-rv32im-guest = { git = "https://github.com/openvm-org/openvm.git", rev = "6169765", default-features = false }
39-
openvm-rv32im-transpiler = { git = "https://github.com/openvm-org/openvm.git", rev = "6169765", default-features = false }
40-
openvm-sdk = { git = "https://github.com/openvm-org/openvm.git", rev = "6169765", default-features = false, features = ["parallel", "bench-metrics"] }
41-
openvm-sha256-guest = { git = "https://github.com/openvm-org/openvm.git", rev = "6169765", default-features = false }
42-
openvm-transpiler = { git = "https://github.com/openvm-org/openvm.git", rev = "6169765", default-features = false }
23+
openvm = { git = "https://github.com/openvm-org/openvm.git", rev = "84f07ea", default-features = false }
24+
openvm-algebra-complex-macros = { git = "https://github.com/openvm-org/openvm.git", rev = "84f07ea", default-features = false }
25+
openvm-algebra-guest = { git = "https://github.com/openvm-org/openvm.git", rev = "84f07ea", default-features = false }
26+
openvm-bigint-guest = { git = "https://github.com/openvm-org/openvm.git", rev = "84f07ea", default-features = false }
27+
openvm-build = { git = "https://github.com/openvm-org/openvm.git", rev = "84f07ea", default-features = false }
28+
openvm-circuit = { git = "https://github.com/openvm-org/openvm.git", rev = "84f07ea", default-features = false }
29+
openvm-custom-insn = { git = "https://github.com/openvm-org/openvm.git", rev = "84f07ea", default-features = false }
30+
openvm-continuations = { git = "https://github.com/openvm-org/openvm.git", rev = "84f07ea", default-features = false }
31+
openvm-ecc-guest = { git = "https://github.com/openvm-org/openvm.git", rev = "84f07ea", default-features = false }
32+
openvm-instructions ={ git = "https://github.com/openvm-org/openvm.git", rev = "84f07ea", default-features = false }
33+
openvm-keccak256-guest = { git = "https://github.com/openvm-org/openvm.git", rev = "84f07ea", default-features = false }
34+
openvm-native-circuit = { git = "https://github.com/openvm-org/openvm.git", rev = "84f07ea", default-features = false }
35+
openvm-native-compiler = { git = "https://github.com/openvm-org/openvm.git", rev = "84f07ea", default-features = false }
36+
openvm-native-recursion = { git = "https://github.com/openvm-org/openvm.git", rev = "84f07ea", default-features = false }
37+
openvm-native-transpiler = { git = "https://github.com/openvm-org/openvm.git", rev = "84f07ea", default-features = false }
38+
openvm-pairing-guest = { git = "https://github.com/openvm-org/openvm.git", rev = "84f07ea", default-features = false }
39+
openvm-rv32im-guest = { git = "https://github.com/openvm-org/openvm.git", rev = "84f07ea", default-features = false }
40+
openvm-rv32im-transpiler = { git = "https://github.com/openvm-org/openvm.git", rev = "84f07ea", default-features = false }
41+
openvm-sdk = { git = "https://github.com/openvm-org/openvm.git", rev = "84f07ea", default-features = false, features = ["parallel", "bench-metrics"] }
42+
openvm-sha256-guest = { git = "https://github.com/openvm-org/openvm.git", rev = "84f07ea", default-features = false }
43+
openvm-transpiler = { git = "https://github.com/openvm-org/openvm.git", rev = "84f07ea", default-features = false }
4344

44-
openvm-stark-sdk = { git = "https://github.com/openvm-org/stark-backend.git", rev = "9f7368b3c73fc559a92684b2ecf6c7d9ed00368b", default-features = false }
45+
openvm-stark-sdk = { git = "https://github.com/openvm-org/stark-backend.git", rev = "fdb808bec40ff21dce7e462c2c18dbb997207adb", default-features = false }
4546

4647

4748
sbv-core = { git = "https://github.com/scroll-tech/stateless-block-verifier", branch = "zkvm/euclid-upgrade", features = ["scroll"] }

‎crates/circuits/batch-circuit/src/child_commitments.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
//! Generated by crates/build-guest. DO NOT OVERWRITE!
22
3-
pub const EXE_COMMIT: [u32; 8] = [624603111, 23691077, 660022572, 655479189, 1397320944, 1674367586, 655541720, 383919749];
4-
pub const LEAF_COMMIT: [u32; 8] = [898118063, 1059948328, 1056778963, 601504938, 1354148767, 696878295, 1060534054, 867834690];
3+
pub const EXE_COMMIT: [u32; 8] = [1307575183, 1432991238, 1679583114, 1047081251, 1917434717, 601579926, 1976945311, 1655953959];
4+
pub const LEAF_COMMIT: [u32; 8] = [368068002, 1942216764, 1635802902, 1511427596, 1463882649, 87343453, 1879515416, 894208742];

‎crates/circuits/bundle-circuit/src/child_commitments.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
//! Generated by crates/build-guest. DO NOT OVERWRITE!
22
3-
pub const EXE_COMMIT: [u32; 8] = [295555509, 1438640067, 563248788, 1842841544, 1048391586, 395459821, 996961306, 754588775];
4-
pub const LEAF_COMMIT: [u32; 8] = [109585789, 1537364545, 1520165975, 1488509710, 793765228, 1479837013, 1268068893, 1802163225];
3+
pub const EXE_COMMIT: [u32; 8] = [1114934207, 644132598, 105577638, 1678185992, 1681012133, 924938901, 70892354, 1825714379];
4+
pub const LEAF_COMMIT: [u32; 8] = [1333252559, 756241672, 1530100022, 66653451, 1290741549, 1369731430, 1549845805, 1055583159];

‎crates/prover/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ metrics-tracing-context.workspace = true
2020
snark-verifier-sdk.workspace = true
2121

2222
openvm-circuit = { workspace = true }
23+
openvm-continuations.workspace = true
2324
openvm-native-circuit = { workspace = true, default-features = false }
2425
openvm-native-recursion = { workspace = true }
2526
openvm-sdk = { workspace = true }

‎crates/prover/src/commitments/batch.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
//! Generated by crates/build-guest. DO NOT OVERWRITE!
22
3-
pub const EXE_COMMIT: [u32; 8] = [295555509, 1438640067, 563248788, 1842841544, 1048391586, 395459821, 996961306, 754588775];
4-
pub const LEAF_COMMIT: [u32; 8] = [109585789, 1537364545, 1520165975, 1488509710, 793765228, 1479837013, 1268068893, 1802163225];
3+
pub const EXE_COMMIT: [u32; 8] = [1114934207, 644132598, 105577638, 1678185992, 1681012133, 924938901, 70892354, 1825714379];
4+
pub const LEAF_COMMIT: [u32; 8] = [1333252559, 756241672, 1530100022, 66653451, 1290741549, 1369731430, 1549845805, 1055583159];

‎crates/prover/src/commitments/bundle.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
//! Generated by crates/build-guest. DO NOT OVERWRITE!
22
3-
pub const EXE_COMMIT: [u32; 8] = [573652114, 275002213, 1913389268, 1580113096, 530449428, 880829946, 168576478, 1007211961];
4-
pub const LEAF_COMMIT: [u32; 8] = [1629346903, 489234992, 613319861, 1172462118, 673736376, 668232154, 1185450786, 632570600];
3+
pub const EXE_COMMIT: [u32; 8] = [1993714584, 1825686828, 1130023410, 1825448126, 215216006, 467237239, 1614248149, 1914754258];
4+
pub const LEAF_COMMIT: [u32; 8] = [301834222, 1855520184, 55878721, 637183968, 1594559641, 1089405305, 158508113, 1514174080];

‎crates/prover/src/commitments/chunk.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
//! Generated by crates/build-guest. DO NOT OVERWRITE!
22
3-
pub const EXE_COMMIT: [u32; 8] = [624603111, 23691077, 660022572, 655479189, 1397320944, 1674367586, 655541720, 383919749];
4-
pub const LEAF_COMMIT: [u32; 8] = [898118063, 1059948328, 1056778963, 601504938, 1354148767, 696878295, 1060534054, 867834690];
3+
pub const EXE_COMMIT: [u32; 8] = [1307575183, 1432991238, 1679583114, 1047081251, 1917434717, 601579926, 1976945311, 1655953959];
4+
pub const LEAF_COMMIT: [u32; 8] = [368068002, 1942216764, 1635802902, 1511427596, 1463882649, 87343453, 1879515416, 894208742];

‎crates/prover/src/proof/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use std::path::Path;
22

3+
use openvm_continuations::verifier::root::types::RootVmVerifierInput;
34
use openvm_native_recursion::halo2::EvmProof as OpenVmEvmProof;
4-
use openvm_sdk::verifier::root::types::RootVmVerifierInput;
55
use openvm_stark_sdk::{openvm_stark_backend::proof::Proof, p3_baby_bear::BabyBear};
66
use sbv_primitives::B256;
77
use scroll_zkvm_circuit_input_types::{batch::BatchInfo, bundle::BundleInfo, chunk::ChunkInfo};

‎crates/prover/src/prover/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ use openvm_native_recursion::{
1616
};
1717
pub use openvm_sdk::{self, F, SC};
1818
use openvm_sdk::{
19-
NonRootCommittedExe, Sdk, StdIn,
19+
DefaultStaticVerifierPvHandler, NonRootCommittedExe, Sdk, StdIn,
2020
commit::AppExecutionCommit,
2121
config::{AggConfig, AggStarkConfig, SdkVmConfig},
22-
keygen::{AggStarkProvingKey, AppProvingKey, RootVerifierProvingKey},
22+
keygen::{AggStarkProvingKey, AppProvingKey},
2323
prover::{AggStarkProver, AppProver, ContinuationProver},
2424
};
2525
use serde::{Serialize, de::DeserializeOwned};
@@ -111,7 +111,7 @@ impl<Type: ProverType> Prover<Type> {
111111
.agg_keygen(
112112
AggConfig::default(),
113113
&halo2_params_reader,
114-
None::<&RootVerifierProvingKey>,
114+
&DefaultStaticVerifierPvHandler,
115115
)
116116
.map_err(|e| Error::Setup {
117117
path: PathBuf::from(DEFAULT_PARAMS_DIR),

‎crates/prover/src/setup.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ use std::{fs::read_to_string, path::Path};
33
use openvm_circuit::arch::instructions::exe::VmExe;
44
use openvm_native_recursion::halo2::utils::CacheHalo2ParamsReader;
55
use openvm_sdk::{
6-
Sdk,
6+
DefaultStaticVerifierPvHandler, Sdk,
77
commit::AppExecutionCommit,
88
config::{AggConfig, AppConfig, SdkVmConfig},
99
fs::{read_app_pk_from_file, read_exe_from_file},
10-
keygen::{AggProvingKey, AppProvingKey, RootVerifierProvingKey},
10+
keygen::{AggProvingKey, AppProvingKey},
1111
};
1212
use openvm_stark_sdk::p3_baby_bear::BabyBear;
1313

@@ -66,7 +66,7 @@ pub fn gen_agg_pk(params_dir: &str) -> Result<AggProvingKey, Error> {
6666
Sdk.agg_keygen(
6767
AggConfig::default(),
6868
&halo2_params_reader,
69-
None::<&RootVerifierProvingKey>,
69+
&DefaultStaticVerifierPvHandler,
7070
)
7171
.map_err(|e| Error::Keygen(e.to_string()))
7272
}

‎crates/verifier/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ openvm-circuit.workspace = true
1212
openvm-native-circuit.workspace = true
1313
openvm-native-recursion = { workspace = true, features = ["static-verifier"] }
1414
openvm-sdk.workspace = true
15+
openvm-continuations.workspace = true
1516
openvm-stark-sdk.workspace = true
1617

1718
itertools.workspace = true

‎crates/verifier/src/commitments/batch.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
//! Generated by crates/build-guest. DO NOT OVERWRITE!
22
3-
pub const EXE_COMMIT: [u32; 8] = [295555509, 1438640067, 563248788, 1842841544, 1048391586, 395459821, 996961306, 754588775];
4-
pub const LEAF_COMMIT: [u32; 8] = [109585789, 1537364545, 1520165975, 1488509710, 793765228, 1479837013, 1268068893, 1802163225];
3+
pub const EXE_COMMIT: [u32; 8] = [1114934207, 644132598, 105577638, 1678185992, 1681012133, 924938901, 70892354, 1825714379];
4+
pub const LEAF_COMMIT: [u32; 8] = [1333252559, 756241672, 1530100022, 66653451, 1290741549, 1369731430, 1549845805, 1055583159];

‎crates/verifier/src/commitments/bundle.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
//! Generated by crates/build-guest. DO NOT OVERWRITE!
22
3-
pub const EXE_COMMIT: [u32; 8] = [573652114, 275002213, 1913389268, 1580113096, 530449428, 880829946, 168576478, 1007211961];
4-
pub const LEAF_COMMIT: [u32; 8] = [1629346903, 489234992, 613319861, 1172462118, 673736376, 668232154, 1185450786, 632570600];
3+
pub const EXE_COMMIT: [u32; 8] = [1993714584, 1825686828, 1130023410, 1825448126, 215216006, 467237239, 1614248149, 1914754258];
4+
pub const LEAF_COMMIT: [u32; 8] = [301834222, 1855520184, 55878721, 637183968, 1594559641, 1089405305, 158508113, 1514174080];

‎crates/verifier/src/commitments/chunk.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
//! Generated by crates/build-guest. DO NOT OVERWRITE!
22
3-
pub const EXE_COMMIT: [u32; 8] = [624603111, 23691077, 660022572, 655479189, 1397320944, 1674367586, 655541720, 383919749];
4-
pub const LEAF_COMMIT: [u32; 8] = [898118063, 1059948328, 1056778963, 601504938, 1354148767, 696878295, 1060534054, 867834690];
3+
pub const EXE_COMMIT: [u32; 8] = [1307575183, 1432991238, 1679583114, 1047081251, 1917434717, 601579926, 1976945311, 1655953959];
4+
pub const LEAF_COMMIT: [u32; 8] = [368068002, 1942216764, 1635802902, 1511427596, 1463882649, 87343453, 1879515416, 894208742];

‎crates/verifier/src/verifier.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@ use std::{marker::PhantomData, path::Path};
22

33
use itertools::Itertools;
44
use openvm_circuit::{arch::SingleSegmentVmExecutor, system::program::trace::VmCommittedExe};
5+
use openvm_continuations::verifier::root::types::RootVmVerifierInput;
56
use openvm_native_circuit::NativeConfig;
67
use openvm_native_recursion::{
78
halo2::{EvmProof, wrapper::EvmVerifier},
89
hints::Hintable,
910
};
10-
use openvm_sdk::{F, RootSC, SC, verifier::root::types::RootVmVerifierInput};
11+
use openvm_sdk::{F, RootSC, SC};
1112
use scroll_zkvm_circuit_input_types::proof::ProgramCommitment;
1213

1314
#[cfg(feature = "euclidv2")]

‎scripts/update-openvm.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
# fmt: shfmt -w -i 4 scripts/update-openvm.sh
22

3-
SED='s#rev = \"830053d\"#rev = \"0eb7b2c\"#'
3+
SED='s#rev = \"6169765\"#rev = \"84f07ea\"#'
44
#SED='s#rev = \"f1b4844\"#tag = \"v1.0.0-rc.1\"#'
55

66
function update_openvm() {
77
cargo update
88
pkgs="tiny-keccak revm alloy-primitives"
99
for pkg in $pkgs; do
10+
cargo clean -p $pkg
1011
crate=$(cargo metadata --format-version=1 | jq -r '.packages[] | select(.name == "'$pkg'") | select(.manifest_path | contains("git")) | .manifest_path')
1112
workspace=$(echo $crate | sed 's#crates.*#Cargo.toml#')
1213
echo updating $crate
1314
echo updating $workspace
1415
sed -i "$SED" "$crate" "$workspace"
15-
cargo clean -p $pkg
1616
done
1717
sed -i "$SED" Cargo.toml
1818
cargo update

0 commit comments

Comments
 (0)