feat: openvm euclid v2

Cargo.toml

@@ -33,10 +33,10 @@ tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
 axum = "0.6.0"
 dotenv = "0.15"
 rocksdb = "0.23.0"
-sbv-utils = { git = "https://github.com/scroll-tech/stateless-block-verifier", branch = "zkvm/euclid-v2", features = [
+sbv-utils = { git = "https://github.com/scroll-tech/stateless-block-verifier", branch = "zkvm/euclid-upgrade", features = [
     "scroll",
 ], optional = true }
-sbv-primitives = { git = "https://github.com/scroll-tech/stateless-block-verifier", branch = "zkvm/euclid-v2", features = [
+sbv-primitives = { git = "https://github.com/scroll-tech/stateless-block-verifier", branch = "zkvm/euclid-upgrade", features = [
     "scroll",
 ], optional = true }
 url = "2.5.4"
@@ -47,8 +47,8 @@ openvm = ["dep:sbv-utils", "dep:sbv-primitives"]
 [patch.crates-io]
 # patched add rkyv support & MSRV 1.77
 alloy-primitives = { git = "https://github.com/scroll-tech/alloy-core", branch = "v0.8.21" }
-revm = { git = "https://github.com/scroll-tech/revm", branch = "scroll-evm-executor/v55" }
-revm-interpreter = { git = "https://github.com/scroll-tech/revm", branch = "scroll-evm-executor/v55" }
-revm-precompile = { git = "https://github.com/scroll-tech/revm", branch = "scroll-evm-executor/v55" }
-revm-primitives = { git = "https://github.com/scroll-tech/revm", branch = "scroll-evm-executor/v55" }
+#revm = { git = "https://github.com/scroll-tech/revm", branch = "scroll-evm-executor/v55" }
+#revm-interpreter = { git = "https://github.com/scroll-tech/revm", branch = "scroll-evm-executor/v55" }
+#revm-precompile = { git = "https://github.com/scroll-tech/revm", branch = "scroll-evm-executor/v55" }
+#revm-primitives = { git = "https://github.com/scroll-tech/revm", branch = "scroll-evm-executor/v55" }
 ruint = { git = "https://github.com/scroll-tech/uint.git", branch = "v1.12.3" }

conf/config.json

@@ -1,38 +1,23 @@
 {
-    "prover_name_prefix": "prover_name",
-    "keys_dir": "keys",
-    "coordinator": {
-      "base_url": "https://coordinator-api.scrollsdk",
-      "retry_count": 3,
-      "retry_wait_time_sec": 5,
-      "connection_timeout_sec": 60
-    },
-    "l2geth": {
-      "endpoint": "https://l2-rpc.scrollsdk"
-    },
-    "prover": {
-      "circuit_type": [1,2,3],
-      "circuit_version": "v0.13.1",
-      "cloud": {
-        "base_url": "<CLOUD_PROVING_SERVICE_BASE_URL>",
-        "api_key": "<API_KEY>",
-        "retry_count": 3,
-        "retry_wait_time_sec": 5,
-        "connection_timeout_sec": 60
-      },
-      "local": {
-        "low_version_circuit": {
-          "hard_fork_name": "bernoulli",
-          "params_path": "params",
-          "assets_path": "assets"
-        },
-        "high_version_circuit": {
-          "hard_fork_name": "curie",
-          "params_path": "params",
-          "assets_path": "assets"
-        }
-      }
-    },
-    "db_path": "db"
-  }
-
+  "prover_name_prefix": "prover_name",
+  "keys_dir": "keys",
+  "coordinator": {
+    "base_url": "http://localhost:8555",
+    "retry_count": 10,
+    "retry_wait_time_sec": 10,
+    "connection_timeout_sec": 30
+  },
+  "l2geth": {
+    "endpoint": "http://localhost:9999"
+  },
+  "prover": {
+    "circuit_type": 2,
+    "supported_proof_types": [
+      1,
+      2,
+      3
+    ],
+    "circuit_version": "v0.13.1"
+  },
+  "db_path": "db"
+}

src/coordinator_handler/api.rs

@@ -49,9 +49,10 @@ impl Api {
     {
         let url = self.build_url(method)?;
         let request_body = serde_json::to_string(req)?;
+        let size = request_body.len();
 
         log::info!("[coordinator client], {method}, sent request");
-        log::debug!("[coordinator client], {method}, request: {request_body}");
+        log::debug!("[coordinator client], {method}, request: {request_body}, token: {token}, request size: {size}");
         let response = self
             .client
             .post(url)
@@ -63,10 +64,6 @@ impl Api {
             .await?;
 
         if response.status() != http::status::StatusCode::OK {
-            // log::error!(
-            //     "[coordinator client], {method}, status not ok: {}",
-            //     response.status()
-            // );
             anyhow::bail!(
                 "[coordinator client], {method}, status not ok: {}",
                 response.status()

src/coordinator_handler/types.rs

@@ -126,6 +126,8 @@ pub struct GetTaskResponseData {
 #[derive(Debug, Clone, Deserialize)]
 pub struct ChunkTaskDetail {
     pub block_hashes: Vec<CommonHash>,
+    pub prev_msg_queue_hash: CommonHash,
+    pub fork_name: String,
 }
 
 #[derive(Serialize, Deserialize)] // TODO: Default?

src/db.rs

@@ -12,6 +12,7 @@ impl Db {
     }
 
     pub fn get_task(&self, public_key: String) -> (Option<GetTaskResponseData>, Option<String>) {
+        log::debug!("[db], get task, public_key: {public_key}");
         (
             self.get_coordinator_task_by_public_key(public_key.clone()),
             self.get_proving_task_id_by_public_key(public_key),
@@ -24,6 +25,7 @@ impl Db {
         coordinator_task: &GetTaskResponseData,
         proving_task_id: String,
     ) {
+        log::debug!("[db], set task, public_key: {public_key}");
         self.set_coordinator_task_by_public_key(public_key.clone(), coordinator_task);
         self.set_proving_task_id_by_public_key(public_key, proving_task_id);
     }

src/prover/builder.rs

@@ -62,7 +62,12 @@ where
 
         let key_signers: Result<Vec<_>, _> = (0..self.cfg.prover.n_workers)
             .map(|i| {
-                let key_path = PathBuf::from(&self.cfg.keys_dir).join(i.to_string());
+                let keys_dir = PathBuf::from(&self.cfg.keys_dir);
+                if !keys_dir.exists() {
+                    std::fs::create_dir_all(&keys_dir)
+                        .map_err(|e| anyhow::anyhow!("failed to create keys directory {}: {e}", keys_dir.display()))?;
+                }
+                let key_path = keys_dir.join(i.to_string());
                 KeySigner::new(&key_path)
             })
             .collect();