fix: web build (#58)

axiom-crypto · Jan 18, 2024 · a46e4ac · a46e4ac
1 parent f9f08ab
commit a46e4ac
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 40 deletions.
diff --git a/cli/package.json b/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@axiom-crypto/halo2-wasm-cli",
-  "version": "0.1.7-alpha.0",
+  "version": "0.3.2",
   "description": "Halo2 Javascript library",
   "main": "index.js",
   "scripts": {
@@ -18,8 +18,8 @@
   "author": "Intrinsic Technologies",
   "license": "ISC",
   "dependencies": {
-    "@axiom-crypto/halo2-lib-js": "0.3.0-rc.0",
-    "@axiom-crypto/halo2-wasm": "0.3.0-rc2.0",
+    "@axiom-crypto/halo2-lib-js": "0.3.2",
+    "@axiom-crypto/halo2-wasm": "0.3.3",
     "commander": "^11.1.0",
     "typescript": "^5.2.2"
   },

diff --git a/cli/pnpm-lock.yaml b/cli/pnpm-lock.yaml
diff --git a/halo2-lib-js/package.json b/halo2-lib-js/package.json
@@ -39,4 +39,4 @@
   "publishConfig": {
     "directory": "dist"
   }
-}
+}
diff --git a/halo2-lib-js/pnpm-lock.yaml b/halo2-lib-js/pnpm-lock.yaml
diff --git a/halo2-repl/package.json b/halo2-repl/package.json
@@ -41,4 +41,4 @@
   "devDependencies": {
     "@types/prettier": "1.18.2"
   }
-}
+}
diff --git a/halo2-repl/pnpm-lock.yaml b/halo2-repl/pnpm-lock.yaml
diff --git a/halo2-wasm/js/js/index.ts b/halo2-wasm/js/js/index.ts
@@ -53,5 +53,6 @@ export abstract class CircuitScaffold extends BaseCircuitScaffold {
     this.shouldTime = options?.shouldTime ?? false;
     this.loadedVk = false;
     this.halo2wasm.config(this.config);
+    this.setContext({getKzgParams})
   }
 }
diff --git a/halo2-wasm/js/web/index.ts b/halo2-wasm/js/web/index.ts
@@ -56,6 +56,7 @@ export abstract class CircuitScaffold extends BaseCircuitScaffold {
     this.config = options?.config ?? { ...DEFAULT_CIRCUIT_CONFIG };
     this.shouldTime = options?.shouldTime ?? false;
     this.loadedVk = false;
+    this.setContext({getKzgParams})
   }
 
   async setup(numThreads: number) {

diff --git a/halo2-wasm/scripts/build-web.sh b/halo2-wasm/scripts/build-web.sh
@@ -10,6 +10,6 @@ rm temp-pkg/.gitignore
 # Copy a modified version of package.json and readme.md to pkg/
 node ./scripts/makeSubdirPkg.js
 
-sed -i '' "s|const pkg = await import('../../..');|const pkg = await import('../../../halo2_wasm');|g" temp-pkg/snippets/wasm-bindgen-rayon-7afa899f36665473/src/workerHelpers.js
+# sed -i '' "s|const pkg = await import('../../..');|const pkg = await import('../../../halo2_wasm');|g" temp-pkg/snippets/wasm-bindgen-rayon-7afa899f36665473/src/workerHelpers.js
 
 mv temp-pkg pkg/web