Merge branch 'main' into haoyu/sindri_tokio

Author: yiweichi

.DS_Store

@@ -20,7 +20,6 @@ target/
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
 #.idea/
 
-config.json
 keys/
 db/
 

.gitignore

@@ -2,7 +2,7 @@
 apiVersion: v2
 description: Example chart for showing how to package a service built using the scroll-proving-sdk library
 name: scroll-proving-sdk
-version: 0.0.6
+version: 0.0.7
 kubeVersion: ">=1.22.0-0"
 maintainers:
   - name: scroll-tech

charts/scroll-proving-sdk/Chart.yaml

@@ -1,6 +1,6 @@
 # scroll-proving-sdk
 
-![Version: 0.0.6](https://img.shields.io/badge/Version-0.0.6-informational?style=flat-square)
+![Version: 0.0.7](https://img.shields.io/badge/Version-0.0.7-informational?style=flat-square)
 
 Example chart for showing how to package a service built using the scroll-proving-sdk library
 

charts/scroll-proving-sdk/README.md

@@ -84,5 +84,6 @@ scrollConfig: |
 #       "retry_wait_time_sec": 5,
 #       "connection_timeout_sec": 60
 #     }
-#   }
+#   },
+#   "db_path": "db"
 #  }

charts/scroll-proving-sdk/values.yaml

@@ -0,0 +1,26 @@
+{
+  "prover_name_prefix": "cloud_prover_",
+  "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": 3,
+    "circuit_version": "v0.13.1",
+    "n_workers": 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
+    }
+  },
+  "db_path": "db"
+}

conf/config.json

@@ -8,7 +8,7 @@ use std::fs::File;
 pub struct Config {
     pub prover_name_prefix: String,
     pub keys_dir: String,
-    pub db_path: String,
+    pub db_path: Option<String>,
     pub coordinator: CoordinatorConfig,
     pub l2geth: Option<L2GethConfig>,
     pub prover: ProverConfig,
@@ -125,7 +125,7 @@ impl Config {
             }
         }
         if let Some(val) = Self::get_env_var("DB_PATH")? {
-            self.db_path = val;
+            self.db_path = Option::from(val);
         }
 
         Ok(())

src/.DS_Store

@@ -86,6 +86,10 @@ impl ProverBuilder {
             None => None,
         };
 
+        let db_path = self.cfg.db_path.unwrap_or_else(|| {
+            panic!("Missing database path");
+        });
+
         Ok(Prover {
             circuit_type: self.cfg.prover.circuit_type,
             circuit_version: self.cfg.prover.circuit_version,
@@ -94,7 +98,7 @@ impl ProverBuilder {
             proving_service: self.proving_service.unwrap(),
             n_workers: self.cfg.prover.n_workers,
             health_listener_addr: self.cfg.health_listener_addr,
-            db: Db::new(&self.cfg.db_path)?,
+            db: Db::new(&db_path)?,
         })
     }
 }