separate prover bin

Signed-off-by: noelwei <[email protected]>

Author: noel2004

Cargo.lock

@@ -1,5 +1,6 @@
 [workspace]
 members = [
+  "common/types-rs",
   "common/types-rs/base",
   "common/types-rs/circuit",
   "common/types-rs/aggregation",
@@ -30,6 +31,7 @@ sbv-core = { git = "https://github.com/scroll-tech/stateless-block-verifier", br
 sbv-primitives = { git = "https://github.com/scroll-tech/stateless-block-verifier", branch = "zkvm/euclid-upgrade", features = ["scroll"] }
 sbv-kv = { git = "https://github.com/scroll-tech/stateless-block-verifier", branch = "zkvm/euclid-upgrade" }
 sbv-trie = { git = "https://github.com/scroll-tech/stateless-block-verifier", branch = "zkvm/euclid-upgrade" }
+sbv-utils = { git = "https://github.com/scroll-tech/stateless-block-verifier", branch = "zkvm/euclid-upgrade" }
 
 alloy = { version = "0.11", default-features = false }
 alloy-primitives = { version = "0.8", default-features = false }

Cargo.toml

@@ -8,23 +8,10 @@ repository.workspace = true
 version = "0.2.0"
 
 [dependencies]
-alloy-primitives = { workspace = true, default-features = false, features = ["std", "map-hashbrown", "map-fxhash", "rkyv"] }
-rkyv.workspace = true
-sbv-trie = { workspace = true }
-sbv-core = { workspace = true }
-sbv-primitives = { workspace = true }
-sbv-kv = { workspace = true }
-vm-zstd = { workspace = true }
-serde.workspace = true
-itertools.workspace = true
-tiny-keccak = { workspace = true }
+types-base = { path = "base", package = "scroll-zkvm-circuit-input-types-base"}
+types-agg = { path = "aggregation", package = "scroll-zkvm-circuit-input-types-aggregation"}
+types-chunk = { path = "chunk", package = "scroll-zkvm-circuit-input-types-chunk"}
+types-batch = { path = "batch", package = "scroll-zkvm-circuit-input-types-batch"}
+types-bundle = { path = "bundle", package = "scroll-zkvm-circuit-input-types-bundle"}
 
-openvm = { workspace = true, features = ["std"] }
-openvm-rv32im-guest = {  workspace = true }
-openvm-custom-insn = { workspace = true }
-sha3 = "0.10.8"
-sha2 = "0.10.8"
 
-[features]
-default = []
-openvm = ["sbv-trie/openvm", "sbv-core/openvm", "sbv-primitives/openvm", "tiny-keccak/openvm"]

common/types-rs/Cargo.toml

@@ -13,6 +13,7 @@ rkyv.workspace = true
 serde.workspace = true
 openvm = { workspace = true, features = ["std"] }
 tiny-keccak = { workspace = true, features = ["openvm"]}
+itertools.workspace = true
 
 types-base = { path = "../base", package = "scroll-zkvm-circuit-input-types-base"}
 types-agg = { path = "../aggregation", package = "scroll-zkvm-circuit-input-types-aggregation"}

common/types-rs/circuit/Cargo.toml

@@ -3,6 +3,8 @@ pub use io::read_witnesses;
 
 use alloy_primitives::B256;
 use types_base::public_inputs::PublicInputs;
+use types_agg::{ProofCarryingWitness, ProgramCommitment, AggregationInput, verify_proof};
+use itertools::Itertools;
 
 /// Reveal the public-input values as openvm public values.
 pub fn reveal_pi_hash(pi_hash: B256) {
@@ -35,3 +37,60 @@ pub trait Circuit {
         reveal_pi_hash(pi.pi_hash())
     }
 }
+
+
+/// Circuit that additional aggregates proofs from other [`Circuits`][Circuit].
+pub trait AggCircuit: Circuit
+where
+    Self::Witness: ProofCarryingWitness,
+{
+    /// The public-input values of the proofs being aggregated.
+    type AggregatedPublicInputs: PublicInputs;
+
+    /// Check if the commitment in proof is valid (from program(s)
+    /// we have expected)
+    fn verify_commitments(commitment: &ProgramCommitment);
+
+    /// Verify the proofs being aggregated.
+    ///
+    /// Also returns the root proofs being aggregated.
+    fn verify_proofs(witness: &Self::Witness) -> Vec<AggregationInput> {
+        let proofs = witness.get_proofs();
+
+        for proof in proofs.iter() {
+            Self::verify_commitments(&proof.commitment);
+            verify_proof(&proof.commitment, proof.public_values.as_slice());
+        }
+
+        proofs
+    }
+
+    /// Derive the public-input values of the proofs being aggregated from the witness.
+    fn aggregated_public_inputs(witness: &Self::Witness) -> Vec<Self::AggregatedPublicInputs>;
+
+    /// Derive the public-input hashes of the aggregated proofs from the proofs itself.
+    fn aggregated_pi_hashes(proofs: &[AggregationInput]) -> Vec<B256>;
+
+    /// Validate that the public-input values of the aggregated proofs are well-formed.
+    ///
+    /// - That the public-inputs of contiguous chunks/batches are valid
+    /// - That the public-input values in fact hash to the pi_hash values from the root proofs.
+    fn validate_aggregated_pi(agg_pis: &[Self::AggregatedPublicInputs], agg_pi_hashes: &[B256]) {
+        // There should be at least a single proof being aggregated.
+        assert!(!agg_pis.is_empty(), "at least 1 pi to aggregate");
+
+        // Validation for the contiguous public-input values.
+        for w in agg_pis.windows(2) {
+            w[1].validate(&w[0]);
+        }
+
+        // Validation for public-input values hash being the pi_hash from root proof.
+        for (agg_pi, &agg_pi_hash) in agg_pis.iter().zip_eq(agg_pi_hashes.iter()) {
+            assert_eq!(
+                agg_pi.pi_hash(),
+                agg_pi_hash,
+                "pi hash mismatch between proofs and witness computed"
+            );
+        }
+    }
+}

common/types-rs/circuit/src/lib.rs

@@ -1,118 +0,0 @@
-#![feature(lazy_get)]
-use alloy_primitives::B256;
-use itertools::Itertools;
-
-pub mod batch;
-
-pub mod bundle;
-
-pub mod chunk;
-
-pub mod proof;
-
-pub mod utils;
-
-/// Defines behaviour to be implemented by types representing the public-input values of a circuit.
-pub trait PublicInputs {
-    /// Keccak-256 digest of the public inputs. The public-input hash are revealed as public values
-    /// via [`openvm::io::reveal`].
-    fn pi_hash(&self) -> B256;
-
-    /// Validation logic between public inputs of two contiguous instances.
-    fn validate(&self, prev_pi: &Self);
-}
-
-/// Circuit defines the higher-level behaviour to be observed by a [`openvm`] guest program.
-pub trait Circuit {
-    /// The witness provided to the circuit.
-    type Witness;
-
-    /// The public-input values for the circuit.
-    type PublicInputs: PublicInputs;
-
-    /// Setup openvm extensions as a preliminary step.
-    fn setup();
-
-    /// Reads bytes from openvm StdIn.
-    fn read_witness_bytes() -> Vec<u8>;
-
-    /// Deserialize raw bytes into the circuit's witness type.
-    fn deserialize_witness(witness_bytes: &[u8]) -> &Self::Witness;
-
-    /// Validate the witness to produce the circuit's public inputs.
-    fn validate(witness: &Self::Witness) -> Self::PublicInputs;
-
-    /// Reveal the public inputs.
-    fn reveal_pi(pi: &Self::PublicInputs) {
-        reveal_pi_hash(pi.pi_hash())
-    }
-}
-
-/// Reveal the public-input values as openvm public values.
-pub fn reveal_pi_hash(pi_hash: B256) {
-    openvm::io::println(format!("pi_hash = {pi_hash:?}"));
-    openvm::io::reveal_bytes32(*pi_hash);
-}
-
-/// Circuit that additional aggregates proofs from other [`Circuits`][Circuit].
-pub trait AggCircuit: Circuit
-where
-    Self::Witness: ProofCarryingWitness,
-{
-    /// The public-input values of the proofs being aggregated.
-    type AggregatedPublicInputs: PublicInputs;
-
-    /// Check if the commitment in proof is valid (from program(s)
-    /// we have expected)
-    fn verify_commitments(commitment: &proof::ProgramCommitment);
-
-    /// Verify the proofs being aggregated.
-    ///
-    /// Also returns the root proofs being aggregated.
-    fn verify_proofs(witness: &Self::Witness) -> Vec<proof::AggregationInput> {
-        let proofs = witness.get_proofs();
-
-        for proof in proofs.iter() {
-            Self::verify_commitments(&proof.commitment);
-            proof::verify_proof(&proof.commitment, proof.public_values.as_slice());
-        }
-
-        proofs
-    }
-
-    /// Derive the public-input values of the proofs being aggregated from the witness.
-    fn aggregated_public_inputs(witness: &Self::Witness) -> Vec<Self::AggregatedPublicInputs>;
-
-    /// Derive the public-input hashes of the aggregated proofs from the proofs itself.
-    fn aggregated_pi_hashes(proofs: &[proof::AggregationInput]) -> Vec<B256>;
-
-    /// Validate that the public-input values of the aggregated proofs are well-formed.
-    ///
-    /// - That the public-inputs of contiguous chunks/batches are valid
-    /// - That the public-input values in fact hash to the pi_hash values from the root proofs.
-    fn validate_aggregated_pi(agg_pis: &[Self::AggregatedPublicInputs], agg_pi_hashes: &[B256]) {
-        // There should be at least a single proof being aggregated.
-        assert!(!agg_pis.is_empty(), "at least 1 pi to aggregate");
-
-        // Validation for the contiguous public-input values.
-        for w in agg_pis.windows(2) {
-            w[1].validate(&w[0]);
-        }
-
-        // Validation for public-input values hash being the pi_hash from root proof.
-        for (agg_pi, &agg_pi_hash) in agg_pis.iter().zip_eq(agg_pi_hashes.iter()) {
-            assert_eq!(
-                agg_pi.pi_hash(),
-                agg_pi_hash,
-                "pi hash mismatch between proofs and witness computed"
-            );
-        }
-    }
-}
-
-/// Witness for an [`AggregationCircuit`][AggCircuit] that also carries proofs that are being
-/// aggregated.
-pub trait ProofCarryingWitness {
-    /// Get the root proofs from the witness.
-    fn get_proofs(&self) -> Vec<proof::AggregationInput>;
-}

common/types-rs/src/lib.rs

@@ -16,6 +16,7 @@ tracing = "0.1"
 futures = "0.3"
 alloy = { workspace = true, features = ["provider-http", "transport-http", "reqwest", "reqwest-rustls-tls", "json-rpc"] }
 itertools.workspace = true
+url = ">=2.5.3"
 
 # Re-export from proving-sdk
 reqwest = { version = "0.12.4", features = ["gzip"] }
@@ -31,5 +32,6 @@ tiny-keccak = { workspace = true, features = ["sha3", "keccak"] }
 scroll-zkvm-prover-euclid.workspace = true
 scroll-proving-sdk = { git = "https://github.com/scroll-tech/scroll-proving-sdk.git", branch = "refactor/scroll"}
 sbv-primitives.workspace = true
+sbv-utils = { workspace = true, features = ["scroll"] }
 serde.workspace = true
 serde_json.workspace = true