From 14f355b528528a1f5f1521f1dfd5e08add74d21e Mon Sep 17 00:00:00 2001
From: noelwei <fan@scroll.io>
Date: Sun, 18 May 2025 22:20:23 +0900
Subject: [PATCH] integrage libzkp into workspace

Signed-off-by: noelwei <fan@scroll.io>
---
 Cargo.lock                                  | 17 ++++++++++++++++
 Cargo.toml                                  |  4 +++-
 common/libzkp/impl/Cargo.toml               | 22 ++++++++-------------
 common/libzkp/impl/src/verifier/euclid.rs   |  4 ++--
 common/libzkp/impl/src/verifier/euclidv2.rs |  4 ++--
 zkvm-prover/integration/Cargo.toml          |  2 +-
 zkvm-prover/prover/Cargo.toml               |  4 ++--
 7 files changed, 35 insertions(+), 22 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c7290f256..032bd5c83 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -9586,6 +9586,23 @@ dependencies = [
  "subtle",
 ]
 
+[[package]]
+name = "zkp"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "base64 0.22.1",
+ "env_logger",
+ "libc",
+ "log",
+ "once_cell",
+ "scroll-zkvm-prover",
+ "scroll-zkvm-verifier",
+ "serde",
+ "serde_derive",
+ "serde_json",
+]
+
 [[package]]
 name = "zkvm-prover-bin"
 version = "0.1.0"
diff --git a/Cargo.toml b/Cargo.toml
index b0bc811d2..696bc83ed 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,13 +6,13 @@ members = [
   "common/types-rs/chunk",
   "common/types-rs/batch",
   "common/types-rs/bundle",
+  "common/libzkp/impl",
   "zkvm-prover/prover",
   "zkvm-prover/verifier",
   "zkvm-prover/integration",
   "zkvm-prover/bin",
 ]
 exclude = [
-  "common/libzkp/impl",
   "prover"
 ]
 
@@ -72,6 +72,8 @@ snark-verifier-sdk = { version = "0.2.0", default-features = false, features = [
     "halo2-axiom",
     "display",
 ] }
+once_cell = "1.20"
+base64 = "0.22"
 
 #TODO: upgrade
 vm-zstd = { git = "https://github.com/scroll-tech/rust-zstd-decompressor.git", tag = "v0.1.1" }
diff --git a/common/libzkp/impl/Cargo.toml b/common/libzkp/impl/Cargo.toml
index eee57e619..fefa6d3f6 100644
--- a/common/libzkp/impl/Cargo.toml
+++ b/common/libzkp/impl/Cargo.toml
@@ -7,25 +7,19 @@ edition = "2021"
 [lib]
 crate-type = ["cdylib"]
 
-[patch.crates-io]
-# patched add rkyv support & MSRV 1.77
-alloy-primitives = { git = "https://github.com/scroll-tech/alloy-core", branch = "v0.8.21" }
-ruint = { git = "https://github.com/scroll-tech/uint.git", branch = "v1.12.3" }
-tiny-keccak = { git = "https://github.com/scroll-tech/tiny-keccak", branch = "scroll-patch-v2.0.2-openvm-v1.0.0-rc.1" }
-
 [dependencies]
-euclid_prover = { git = "https://github.com/scroll-tech/zkvm-prover.git", tag = "v0.3.0", package = "scroll-zkvm-prover" }
-euclid_verifier = { git = "https://github.com/scroll-tech/zkvm-prover.git", tag = "v0.3.0", package = "scroll-zkvm-verifier" }
+scroll-zkvm-prover.workspace = true
+scroll-zkvm-verifier.workspace = true
 
-base64 = "0.13.0"
-env_logger = "0.9.0"
+env_logger = "0.11.0"
 libc = "0.2"
 log = "0.4"
-once_cell = "1.19"
-serde = "1.0"
+base64.workspace = true
+once_cell.workspace = true
+serde.workspace = true
 serde_derive = "1.0"
-serde_json = "1.0.66"
-anyhow = "1.0.86"
+serde_json.workspace = true
+anyhow = "1"
 
 [profile.test]
 opt-level = 3
diff --git a/common/libzkp/impl/src/verifier/euclid.rs b/common/libzkp/impl/src/verifier/euclid.rs
index 93673d454..076ff022a 100644
--- a/common/libzkp/impl/src/verifier/euclid.rs
+++ b/common/libzkp/impl/src/verifier/euclid.rs
@@ -3,8 +3,8 @@ use super::{ProofVerifier, TaskType, VKDump};
 use anyhow::Result;
 
 use crate::utils::panic_catch;
-use euclid_prover::{BatchProof, BundleProof, ChunkProof};
-use euclid_verifier::verifier::{BatchVerifier, BundleVerifierEuclidV1, ChunkVerifier};
+use scroll_zkvm_prover::{BatchProof, BundleProof, ChunkProof};
+use scroll_zkvm_verifier::verifier::{BatchVerifier, BundleVerifierEuclidV1, ChunkVerifier};
 use std::{fs::File, path::Path};
 
 pub struct EuclidVerifier {
diff --git a/common/libzkp/impl/src/verifier/euclidv2.rs b/common/libzkp/impl/src/verifier/euclidv2.rs
index 7f4cb9d43..63de5e43b 100644
--- a/common/libzkp/impl/src/verifier/euclidv2.rs
+++ b/common/libzkp/impl/src/verifier/euclidv2.rs
@@ -3,8 +3,8 @@ use super::{ProofVerifier, TaskType, VKDump};
 use anyhow::Result;
 
 use crate::utils::panic_catch;
-use euclid_prover::{BatchProof, BundleProof, ChunkProof};
-use euclid_verifier::verifier::{BatchVerifier, BundleVerifierEuclidV2, ChunkVerifier};
+use scroll_zkvm_prover::{BatchProof, BundleProof, ChunkProof};
+use scroll_zkvm_verifier::verifier::{BatchVerifier, BundleVerifierEuclidV2, ChunkVerifier};
 use std::{fs::File, path::Path};
 
 pub struct EuclidV2Verifier {
diff --git a/zkvm-prover/integration/Cargo.toml b/zkvm-prover/integration/Cargo.toml
index 68de67f6c..38f975fed 100644
--- a/zkvm-prover/integration/Cargo.toml
+++ b/zkvm-prover/integration/Cargo.toml
@@ -25,12 +25,12 @@ eyre.workspace = true
 serde_json.workspace = true
 tiny-keccak.workspace = true
 vm-zstd = { workspace = true, features = ["zstd"] }
+once_cell.workspace = true
 
 rayon = "1"
 chrono = "0.4"
 #ff = "0.13"
 glob = "0.3"
-once_cell = "1.20"
 #sha2 = "0.10"
 tracing-subscriber = "0.3"
 
diff --git a/zkvm-prover/prover/Cargo.toml b/zkvm-prover/prover/Cargo.toml
index b985ffb96..205fcbbb5 100644
--- a/zkvm-prover/prover/Cargo.toml
+++ b/zkvm-prover/prover/Cargo.toml
@@ -28,11 +28,11 @@ openvm-native-recursion = { workspace = true }
 openvm-sdk = { workspace = true }
 openvm-stark-sdk = { workspace = true, default-features = false }
 
-base64 = "0.22"
+once_cell.workspace = true
+base64.workspace = true
 git-version = "0.3.5"
 hex = "0.4"
 munge = "=0.4.1"
-once_cell = "1.20"
 serde_stacker = "0.1"
 thiserror = "2.0"
 toml = "0.8"