update circom_runtime, README, and fix broken build

l-adic · Aug 2, 2024 · 7c5a093 · 7c5a093
1 parent 83665c3
commit 7c5a093
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 13 deletions.
diff --git a/.gitignore b/.gitignore
@@ -16,5 +16,6 @@ build/
 trusted-setup/
 !trusted-setup/pot14_final.ptau
 src/Contracts
-contracts
+contracts/*.sol
+!contracts/
 circuit.dot
diff --git a/README.md b/README.md
@@ -88,7 +88,8 @@ Assuming you have done the previous steps, copy the proving key and the compiled
 You should see the `circuit.wasm` solver binary is already there. Assuming you have deployed the verifying contract, you can start the frontend:
 
 ```
-export VERIFIER_ADDRESS=$(jq -r '.networks."420123".address' build/contracts/Groth16Verifier.json) && npm run parcel
+> npm run build
+> export VERIFIER_ADDRESS=$(jq -r '.networks."420123".address' build/contracts/Groth16Verifier.json) && npm run parcel
 ```
 
 NOTE: I used cliquebaite to write this readme, which has networkId/chainId `420123`. If you have a different chainId, you will need to subsitute it in the above command or just find the address in the artifact manually.

diff --git a/cabal.project b/cabal.project
@@ -26,6 +26,7 @@ source-repository-package
   type: git
   location: https://github.com/l-adic/arithmetic-circuits.git
   tag: 7323152c3942c546d676ad6dcafe747f88d72663
-  --sha256: ldjPgZN7M+hsD6S7kx0QsVJsK8FbCl0d7oSyPHQRoaw=
+  --sha256: PGfFEU+1fciGXBPFYTbAjdBIFBd0Ss6fte1hMbfQtLo=
 
-index-state: 2024-05-21T06:16:08Z
+index-state: 
+  2024-05-21T06:16:08Z
diff --git a/contracts/.gitkeep b/contracts/.gitkeep
diff --git a/flake.lock b/flake.lock
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -37,10 +37,10 @@
     "keccak": "^3.0.0",
     "secp256k1": "^5.0.0",
     "snarkjs": "github:l-adic/snarkjs#actually-use-wasm-options",
-    "circom_runtime": "github:l-adic/circom_runtime#968aaa5c7cf9f22dba72d939632778d78e57c56f"
+    "circom_runtime": "github:l-adic/circom_runtime#d359044d9b46d3e45b399856624fbd179f6b22c5"
   },
   "overrides": {
-    "circom_runtime": "github:l-adic/circom_runtime#968aaa5c7cf9f22dba72d939632778d78e57c56f"
+    "circom_runtime": "github:l-adic/circom_runtime#d359044d9b46d3e45b399856624fbd179f6b22c5"
   },
   "parcel": {
     "aliases": {

diff --git a/wasm-solver/cabal.project b/wasm-solver/cabal.project
@@ -36,4 +36,9 @@ source-repository-package
   type: git
   location: https://github.com/l-adic/arithmetic-circuits.git
   tag: 7323152c3942c546d676ad6dcafe747f88d72663
-  --sha256: ldjPgZN7M+hsD6S7kx0QsVJsK8FbCl0d7oSyPHQRoaw=
+  --sha256: PGfFEU+1fciGXBPFYTbAjdBIFBd0Ss6fte1hMbfQtLo=
+
+index-state: 2024-03-06T13:35:48Z
+
+constraints:
+    finite-typelits ==0.1.6.0
diff --git a/wasm-solver/default.nix b/wasm-solver/default.nix
@@ -10,7 +10,7 @@ let
       defaultGHC.dev.hsPkgs.ghc-lib-parser.components.library.version;
   };
 
-  ghcWasmDeps = [ inputs.ghc-wasm-meta.packages.${system}.all_9_8 ];
+  ghcWasmDeps = [ inputs.ghc-wasm-meta.packages.${system}.all_9_6 ];
 
 in
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,7 +10,7 @@ let @@
           defaultGHC.dev.hsPkgs.ghc-lib-parser.components.library.version;
       };
-      ghcWasmDeps = [ inputs.ghc-wasm-meta.packages.${system}.all_9_8 ];
+      ghcWasmDeps = [ inputs.ghc-wasm-meta.packages.${system}.all_9_6 ];
     in
@@ Expand Down @@