Fixed missing segment in circuit path

- Was missing `zero_bin`. - Also made the circuit directory error a bit more helpful (now also contains underlying IO error).
0xPolygonZero · Jul 10, 2024 · 3fbe039 · 3fbe039
1 parent 788cf3c
commit 3fbe039
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/zero_bin/common/src/prover_state/persistence.rs b/zero_bin/common/src/prover_state/persistence.rs
@@ -77,10 +77,11 @@ pub(crate) trait DiskResource {
 
         // Create the base folder if non-existent.
         if std::fs::metadata(&circuits_dir).is_err() {
-            std::fs::create_dir(&circuits_dir).map_err(|_| {
-                DiskResourceError::IoError::<Self::Error>(std::io::Error::other(
-                    format!("Could not create circuits folder at {}", circuits_dir),
-                ))
+            std::fs::create_dir(&circuits_dir).map_err(|err| {
+                DiskResourceError::IoError::<Self::Error>(std::io::Error::other(format!(
+                    "Could not create circuits folder at {} (err: {})", err,
+                    circuits_dir
+                )))
             })?;
         }
 
@@ -282,6 +283,6 @@ fn prover_to_disk(
 /// current directory.
 fn relative_circuit_dir_path() -> String {
     env::var(ZK_EVM_WORKSPACE_DIR_ENV)
-        .map(|p| format!("{}tools/{}", p, CIRCUITS_DIR))
+        .map(|p| format!("{}zero_bin/tools/{}", p, CIRCUITS_DIR))
         .unwrap_or_else(|_| CIRCUITS_DIR.to_string())
 }
diff --git a/zero_bin/tools/prove_rpc.sh b/zero_bin/tools/prove_rpc.sh
@@ -40,7 +40,7 @@ fi
 TOOLS_DIR=$(dirname $(realpath "$0"))
 
 # Set the environment variable to let the binary know that we're running in the project workspace.
-export CARGO_WORKSPACE_DIR="${TOOLS_DIR}/../"
+export CARGO_WORKSPACE_DIR="${TOOLS_DIR}/../../"
 
 PROOF_OUTPUT_DIR="${TOOLS_DIR}/proofs"
 OUT_LOG_PATH="${PROOF_OUTPUT_DIR}/b$1_$2.log"

diff --git a/zero_bin/tools/prove_stdio.sh b/zero_bin/tools/prove_stdio.sh
@@ -20,7 +20,7 @@ VERIFY_OUT_PATH="${TOOLS_DIR}/verify.out"
 TEST_OUT_PATH="${TOOLS_DIR}/test.out"
 
 # Set the environment variable to let the binary know that we're running in the project workspace.
-export ZK_EVM_WORKSPACE_DIR="${TOOLS_DIR}/../"
+export ZK_EVM_WORKSPACE_DIR="${TOOLS_DIR}/../../"
 
 # Configured Rayon and Tokio with rough defaults
 export RAYON_NUM_THREADS=$num_procs