Merge pull request #1029 from privacy-scaling-explorations/fix/circui…

…ts-shell
privacy-scaling-explorations · Jan 16, 2024 · 2ba8855 · 2ba8855
2 parents 4e64f8f + 4c121ca
commit 2ba8855
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/circuits/ts/compile.ts b/circuits/ts/compile.ts
@@ -1,6 +1,6 @@
 import { type CircomkitConfig, type CircuitConfig, Circomkit } from "circomkit";
 
-import { execSync } from "child_process";
+import { execFileSync } from "child_process";
 import fs from "fs";
 import path from "path";
 
@@ -60,7 +60,8 @@ export const compileCircuits = async (cWitness?: boolean, outputPath?: string):
     if (cWitness) {
       try {
         // build
-        execSync(`cd ${outPath}/${circuit.name}_cpp && make`);
+        execFileSync("cd", [`${outPath}/${circuit.name}_cpp`]);
+        execFileSync("make");
       } catch (error) {
         throw new Error(`Failed to compile the c witness for ${circuit.name}`);
       }

diff --git a/circuits/ts/proofs.ts b/circuits/ts/proofs.ts
@@ -8,7 +8,7 @@ import {
   type ISnarkJSVerificationKey,
 } from "snarkjs";
 
-import { execSync } from "child_process";
+import { execFileSync } from "child_process";
 import fs from "fs";
 import { tmpdir } from "os";
 import path from "path";
@@ -73,21 +73,21 @@ export const genProof = async ({
   fs.writeFileSync(inputJsonPath, jsonData);
 
   // Generate the witness
-  const witnessGenCmd = `${witnessExePath} ${inputJsonPath} ${outputWtnsPath}`;
-
-  execSync(witnessGenCmd, { stdio: silent ? "ignore" : "pipe" });
+  execFileSync(witnessExePath!, [inputJsonPath, outputWtnsPath], { stdio: silent ? "ignore" : "pipe" });
 
   if (!fs.existsSync(outputWtnsPath)) {
-    throw new Error(`Error executing ${witnessGenCmd}`);
+    throw new Error(`Error executing ${witnessExePath} ${inputJsonPath} ${outputWtnsPath}`);
   }
 
   // Generate the proof
-  const proofGenCmd = `${rapidsnarkExePath} ${zkeyPath} ${outputWtnsPath} ${proofJsonPath} ${publicJsonPath}`;
-
-  execSync(proofGenCmd, { stdio: silent ? "ignore" : "pipe" });
+  execFileSync(rapidsnarkExePath!, [zkeyPath, outputWtnsPath, proofJsonPath, publicJsonPath], {
+    stdio: silent ? "ignore" : "pipe",
+  });
 
   if (!fs.existsSync(proofJsonPath)) {
-    throw new Error(`Error executing ${proofGenCmd}`);
+    throw new Error(
+      `Error executing ${rapidsnarkExePath} ${zkeyPath} ${outputWtnsPath} ${proofJsonPath} ${publicJsonPath}`,
+    );
   }
 
   // Read the proof and public inputs