Cache SRS, split js and web (#55)

Co-authored-by: Jonathan Wang <[email protected]>
axiom-crypto · Jan 18, 2024 · d1b7860 · d1b7860
1 parent 057642f
commit d1b7860
Show file tree

Hide file tree

Showing 27 changed files with 1,182 additions and 891 deletions.
diff --git a/.github/workflows/halo2-browser-tests.yml b/.github/workflows/halo2-browser-tests.yml
@@ -27,12 +27,9 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: 18
-      - name: Build halo2-wasm
-        working-directory: halo2-wasm
-        run: |
-          rustup toolchain install nightly-2023-08-12-x86_64-unknown-linux-gnu
-          rustup component add rust-src --toolchain nightly-2023-08-12-x86_64-unknown-linux-gnu
-          cargo build --target=x86_64-unknown-linux-gnu --verbose
+      - name: Set all packages to local and build
+        working-directory: ./
+        run: ./scripts/toggleLocal.sh ci
       - name: Build halo2-lib-js
         working-directory: halo2-lib-js
         run: |

diff --git a/cli/package.json b/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@axiom-crypto/halo2-wasm-cli",
-  "version": "0.1.6-rc.0",
+  "version": "0.1.7-alpha.0",
   "description": "Halo2 Javascript library",
   "main": "index.js",
   "scripts": {
@@ -18,13 +18,13 @@
   "author": "Intrinsic Technologies",
   "license": "ISC",
   "dependencies": {
-    "@axiom-crypto/halo2-lib-js": "0.2.14-rc.0",
-    "@axiom-crypto/halo2-wasm": "0.2.11-rc.1",
+    "@axiom-crypto/halo2-lib-js": "0.3.0-rc.0",
+    "@axiom-crypto/halo2-wasm": "0.3.0-rc2.0",
     "commander": "^11.1.0",
     "typescript": "^5.2.2"
   },
   "devDependencies": {
     "@types/jest": "^29.5.6",
     "@types/node": "^20.8.9"
   }
-}
+}
diff --git a/cli/pnpm-lock.yaml b/cli/pnpm-lock.yaml
diff --git a/cli/scripts/toggleLocal.js b/cli/scripts/toggleLocal.js
@@ -1,9 +1,15 @@
 const fs = require('fs');
 const packageJson = require('../package.json');
 
+let ci = false;
+if (process.argv[2] === "ci") {
+    ci = true;
+}
+const local = ci ? "file:" : "link:";
+
 const main = () => {
     const packageJsonCopy = { ...packageJson };
-    packageJsonCopy.dependencies['@axiom-crypto/halo2-wasm'] = 'link:../halo2-wasm/pkg';
+    packageJsonCopy.dependencies['@axiom-crypto/halo2-wasm'] = `${local}../halo2-wasm/pkg`;
     fs.writeFileSync('./package.json', JSON.stringify(packageJsonCopy, null, 2));
 }
 

diff --git a/halo2-lib-js/package.json b/halo2-lib-js/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@axiom-crypto/halo2-lib-js",
-  "version": "0.2.14-rc.0",
+  "version": "0.3.0-rc2.0",
   "description": "Halo2 Javascript library",
   "main": "index.js",
   "scripts": {
     "build": "rm -rf ./dist && tsc && node ./scripts/postTsc.js && pnpm build:docs",
     "build:docs": "./node_modules/.bin/dts-bundle-generator ./dist/halo2lib/functions.d.ts -o src/shared/build.d.ts && node ./scripts/convertDTs.js && rm -rf ./src/shared/build.d.ts",
     "test:vk": "./tests/test_vk.sh",
-    "test:constant": "./tests/test_constant.sh" 
+    "test:constant": "./tests/test_constant.sh"
   },
   "keywords": [
     "axiom",
@@ -32,11 +32,11 @@
     "typescript": "^5.2.2"
   },
   "dependencies": {
-    "@axiom-crypto/halo2-wasm": "0.2.11-rc.1",
+    "@axiom-crypto/halo2-wasm": "0.2.12-alpha.0",
     "ethers": "^6.8.0",
     "prettier": "1.18.2"
   },
   "publishConfig": {
     "directory": "dist"
   }
-}
+}
diff --git a/halo2-lib-js/pnpm-lock.yaml b/halo2-lib-js/pnpm-lock.yaml
diff --git a/halo2-lib-js/scripts/toggleLocal.js b/halo2-lib-js/scripts/toggleLocal.js
@@ -1,9 +1,15 @@
 const fs = require('fs');
 const packageJson = require('../package.json');
 
+let ci = false;
+if (process.argv[2] === "ci") {
+    ci = true;
+}
+const local = ci ? "file:" : "link:";
+
 const main = () => {
     const packageJsonCopy = { ...packageJson };
-    packageJsonCopy.dependencies['@axiom-crypto/halo2-wasm'] = 'link:../halo2-wasm/pkg';
+    packageJsonCopy.dependencies['@axiom-crypto/halo2-wasm'] = `${local}../halo2-wasm/pkg`;
     fs.writeFileSync('./package.json', JSON.stringify(packageJsonCopy, null, 2));
 }
 

diff --git a/halo2-lib-js/src/shared/index.ts b/halo2-lib-js/src/shared/index.ts
@@ -1,2 +1,3 @@
 export { RawCircuitInput, ConstantValue } from './types'
-export { convertRawInput } from './utils'
+export { convertRawInput } from './utils'
+export { BaseCircuitScaffold } from "@axiom-crypto/halo2-wasm/shared/scaffold";
diff --git a/halo2-lib-js/src/wasm/js.ts b/halo2-lib-js/src/wasm/js.ts
@@ -1 +1 @@
-export * from "@axiom-crypto/halo2-wasm/js"
+export * from "@axiom-crypto/halo2-wasm/js/"
diff --git a/halo2-lib-js/src/wasm/web.ts b/halo2-lib-js/src/wasm/web.ts
@@ -1 +1 @@
-export * from "@axiom-crypto/halo2-wasm/web"
+export * from "@axiom-crypto/halo2-wasm/web/"
diff --git a/halo2-repl/app/worker/halo2repl.ts b/halo2-repl/app/worker/halo2repl.ts
@@ -1,7 +1,7 @@
 import prettier from 'prettier/standalone';
 import parserTypescript from 'prettier/parser-typescript';
 import { Halo2CircuitRunner } from '@axiom-crypto/halo2-lib-js';
-import { Halo2LibWasm, getHalo2LibWasm, CircuitScaffold, getKzgParams, DEFAULT_CIRCUIT_CONFIG } from '@axiom-crypto/halo2-wasm/web'
+import { Halo2LibWasm, getHalo2LibWasm, CircuitScaffold, getKzgParams, DEFAULT_CIRCUIT_CONFIG } from '@axiom-crypto/halo2-wasm/web/'
 import { captureConsoleOutput } from '@/utils/log';
 
 

diff --git a/halo2-repl/package.json b/halo2-repl/package.json
@@ -9,8 +9,8 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "@axiom-crypto/halo2-lib-js": "0.2.14-rc.0",
-    "@axiom-crypto/halo2-wasm": "0.2.11-rc.1",
+    "@axiom-crypto/halo2-lib-js": "0.3.0-rc2.0",
+    "@axiom-crypto/halo2-wasm": "0.3.0-rc2.0",
     "@devbookhq/splitter": "^1.4.2",
     "@headlessui/react": "^1.7.17",
     "@heroicons/react": "^2.0.18",
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		export * from "@axiom-crypto/halo2-wasm/js"
		export * from "@axiom-crypto/halo2-wasm/js/"