[Feat] Prover loading assets (circuits) dynamically

Cargo.toml

@@ -17,9 +17,9 @@ repository = "https://github.com/scroll-tech/scroll"
 version = "4.5.8"
 
 [workspace.dependencies]
-scroll-zkvm-prover-euclid = { git = "https://github.com/scroll-tech/zkvm-prover", branch = "feat/0.5.1", package = "scroll-zkvm-prover" }
-scroll-zkvm-verifier-euclid = { git = "https://github.com/scroll-tech/zkvm-prover", branch = "feat/0.5.1", package = "scroll-zkvm-verifier" }
-scroll-zkvm-types = { git = "https://github.com/scroll-tech/zkvm-prover", branch = "feat/0.5.1" }
+scroll-zkvm-prover = { git = "https://github.com/scroll-tech/zkvm-prover", rev = "2ec1303" }
+scroll-zkvm-verifier = { git = "https://github.com/scroll-tech/zkvm-prover", rev = "2ec1303" }
+scroll-zkvm-types = { git = "https://github.com/scroll-tech/zkvm-prover", rev = "2ec1303" }
 
 sbv-primitives = { git = "https://github.com/scroll-tech/stateless-block-verifier", branch = "chore/openvm-1.3", features = ["scroll"] }
 sbv-utils = { git = "https://github.com/scroll-tech/stateless-block-verifier", branch = "chore/openvm-1.3" }

crates/libzkp/Cargo.toml

@@ -6,7 +6,7 @@ edition.workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [dependencies]
 scroll-zkvm-types.workspace = true
-scroll-zkvm-verifier-euclid.workspace = true
+scroll-zkvm-verifier.workspace = true
 
 alloy-primitives.workspace = true #depress the effect of "native-keccak"
 sbv-primitives = {workspace = true, features = ["scroll-compress-ratio", "scroll"]}

crates/libzkp/src/lib.rs

@@ -5,7 +5,7 @@ pub use verifier::{TaskType, VerifierConfig};
 mod utils;
 
 use sbv_primitives::B256;
-use scroll_zkvm_types::util::vec_as_base64;
+use scroll_zkvm_types::utils::vec_as_base64;
 use serde::{Deserialize, Serialize};
 use serde_json::value::RawValue;
 use std::path::Path;

crates/libzkp/src/proofs.rs

@@ -10,7 +10,7 @@ use scroll_zkvm_types::{
     proof::{EvmProof, OpenVmEvmProof, ProofEnum, RootProof},
     public_inputs::{ForkName, MultiVersionPublicInputs},
     types_agg::{AggregationInput, ProgramCommitment},
-    util::vec_as_base64,
+    utils::vec_as_base64,
 };
 use serde::{de::DeserializeOwned, Deserialize, Serialize};
 

crates/libzkp/src/tasks/batch/utils.rs

@@ -18,7 +18,7 @@ pub mod base64 {
 pub mod point_eval {
     use c_kzg;
     use sbv_primitives::{types::eips::eip4844::BLS_MODULUS, B256 as H256, U256};
-    use scroll_zkvm_types::util::sha256_rv32;
+    use scroll_zkvm_types::utils::sha256_rv32;
 
     /// Given the blob-envelope, translate it to a fixed size EIP-4844 blob.
     ///

crates/libzkp/src/verifier.rs

@@ -1,7 +1,7 @@
 #![allow(static_mut_refs)]
 
-mod euclidv2;
-use euclidv2::EuclidV2Verifier;
+mod universal;
+use universal::Verifier;
 use eyre::Result;
 use serde::{Deserialize, Serialize};
 use std::{
@@ -61,7 +61,7 @@ pub fn init(config: VerifierConfig) {
     for cfg in &config.circuits {
         let canonical_fork_name = cfg.fork_name.to_lowercase();
 
-        let verifier = EuclidV2Verifier::new(&cfg.assets_path, canonical_fork_name.as_str().into());
+        let verifier = Verifier::new(&cfg.assets_path, canonical_fork_name.as_str().into());
         let ret = verifiers.insert(canonical_fork_name, Arc::new(Mutex::new(verifier)));
         assert!(
             ret.is_none(),

crates/libzkp/src/verifier/euclidv2.rs → crates/libzkp/src/verifier/universal.rs

@@ -7,15 +7,15 @@ use crate::{
     utils::panic_catch,
 };
 use scroll_zkvm_types::public_inputs::ForkName;
-use scroll_zkvm_verifier_euclid::verifier::UniversalVerifier;
+use scroll_zkvm_verifier::verifier::UniversalVerifier;
 use std::path::Path;
 
-pub struct EuclidV2Verifier {
+pub struct Verifier {
     verifier: UniversalVerifier,
     fork: ForkName,
 }
 
-impl EuclidV2Verifier {
+impl Verifier {
     pub fn new(assets_dir: &str, fork: ForkName) -> Self {
         let verifier_bin = Path::new(assets_dir).join("verifier.bin");
         let config = Path::new(assets_dir).join("root-verifier-vm-config");
@@ -29,7 +29,7 @@ impl EuclidV2Verifier {
     }
 }
 
-impl ProofVerifier for EuclidV2Verifier {
+impl ProofVerifier for Verifier {
     fn verify(&self, task_type: super::TaskType, proof: &[u8]) -> Result<bool> {
         panic_catch(|| match task_type {
             TaskType::Chunk => {

crates/prover-bin/Cargo.toml

@@ -7,7 +7,7 @@ edition.workspace = true
 
 [dependencies]
 scroll-zkvm-types.workspace = true
-scroll-zkvm-prover-euclid.workspace = true
+scroll-zkvm-prover.workspace = true
 scroll-proving-sdk = { git = "https://github.com/scroll-tech/scroll-proving-sdk.git", branch = "refactor/scroll" }
 serde.workspace = true
 serde_json.workspace = true
@@ -17,8 +17,9 @@ tiny-keccak = { workspace = true, features = ["sha3", "keccak"] }
 eyre.workspace = true
 
 futures = "0.3.30"
+futures-util = "0.3"
 
-reqwest = { version = "0.12.4", features = ["gzip"] }
+reqwest = { version = "0.12.4", features = ["gzip", "stream"] }
 reqwest-middleware = "0.3"
 reqwest-retry = "0.5"
 hex = "0.4.3"
@@ -30,5 +31,5 @@ sled = "0.34.7"
 http = "1.1.0"
 clap = { version = "4.5", features = ["derive"] }
 ctor = "0.2.8"
-url = "2.5.4"
+url = { version = "2.5.4", features = ["serde",] }
 serde_bytes = "0.11.15"