From a46e4ac0d85919556fe5424d86d182f0271b6e20 Mon Sep 17 00:00:00 2001 From: Roshan <19766713+rpalakkal@users.noreply.github.com> Date: Thu, 18 Jan 2024 18:06:40 -0500 Subject: [PATCH] fix: web build (#58) --- cli/package.json | 6 +++--- cli/pnpm-lock.yaml | 18 +++++++++--------- halo2-lib-js/package.json | 2 +- halo2-lib-js/pnpm-lock.yaml | 8 ++------ halo2-repl/package.json | 2 +- halo2-repl/pnpm-lock.yaml | 28 +++++++++------------------- halo2-wasm/js/js/index.ts | 1 + halo2-wasm/js/web/index.ts | 1 + halo2-wasm/scripts/build-web.sh | 2 +- 9 files changed, 28 insertions(+), 40 deletions(-) diff --git a/cli/package.json b/cli/package.json index fed1c3b..4151405 100644 --- 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 index a200cd8..fe182c8 100644 --- a/cli/pnpm-lock.yaml +++ b/cli/pnpm-lock.yaml @@ -6,11 +6,11 @@ settings: dependencies: '@axiom-crypto/halo2-lib-js': - specifier: 0.2.15-alpha.0 - version: 0.2.15-alpha.0 + specifier: 0.3.2 + version: 0.3.2 '@axiom-crypto/halo2-wasm': - specifier: 0.2.12-alpha.0 - version: 0.2.12-alpha.0 + specifier: link:../halo2-wasm/pkg + version: link:../halo2-wasm/pkg commander: specifier: ^11.1.0 version: 11.1.0 @@ -32,10 +32,10 @@ packages: resolution: {integrity: sha512-nA9XHtlAkYfJxY7bce8DcN7eKxWWCWkU+1GR9d+U6MbNpfwQp8TI7vqOsBsMcHoT4mBu2kypKoSKnghEzOOq5Q==} dev: false - /@axiom-crypto/halo2-lib-js@0.2.15-alpha.0: - resolution: {integrity: sha512-jwEiKTAd/Vm7GH9jljrMu3gNTygN+QwisvVDGU/GCklJigy6R0D0zeweZbDNERGi8e1UGrg6aZamztCkEFaweg==} + /@axiom-crypto/halo2-lib-js@0.3.2: + resolution: {integrity: sha512-MT4NMU6sCnCnpf8Oy4LRx9txezf8RHr0p06j8a1aNCp/gi9fQ1v9201dS1j7Ck/Nr7YwTC4ZK4J6n8lNJqf9Pg==} dependencies: - '@axiom-crypto/halo2-wasm': 0.2.12-alpha.0 + '@axiom-crypto/halo2-wasm': 0.3.2 ethers: 6.9.0 prettier: 1.18.2 transitivePeerDependencies: @@ -43,8 +43,8 @@ packages: - utf-8-validate dev: false - /@axiom-crypto/halo2-wasm@0.2.12-alpha.0: - resolution: {integrity: sha512-zZyAK8chlq36frrGhD9QpvatRhAflcY/XVk62tMv6eAqBjC1rZNi1IF1rRF6toLrIM0vMQUbgFO9oVv+/r50mQ==} + /@axiom-crypto/halo2-wasm@0.3.2: + resolution: {integrity: sha512-7k4YbEtrKgH6JVoJKgdiot9cllTC7q4aPK7btFTLbXVYMl8oWcAHo+lkEtyjpj5iFqUYx9JTc35KwHUzPfhj7g==} dev: false /@babel/code-frame@7.22.13: diff --git a/halo2-lib-js/package.json b/halo2-lib-js/package.json index 2b13b3f..4357f40 100644 --- a/halo2-lib-js/package.json +++ b/halo2-lib-js/package.json @@ -39,4 +39,4 @@ "publishConfig": { "directory": "dist" } -} +} \ No newline at end of file diff --git a/halo2-lib-js/pnpm-lock.yaml b/halo2-lib-js/pnpm-lock.yaml index 3babb2a..fc37247 100644 --- a/halo2-lib-js/pnpm-lock.yaml +++ b/halo2-lib-js/pnpm-lock.yaml @@ -6,8 +6,8 @@ settings: dependencies: '@axiom-crypto/halo2-wasm': - specifier: 0.2.12-alpha.0 - version: 0.2.12-alpha.0 + specifier: link:../halo2-wasm/pkg + version: link:../halo2-wasm/pkg ethers: specifier: ^6.8.0 version: 6.8.0 @@ -58,10 +58,6 @@ packages: '@jridgewell/trace-mapping': 0.3.20 dev: true - /@axiom-crypto/halo2-wasm@0.2.12-alpha.0: - resolution: {integrity: sha512-zZyAK8chlq36frrGhD9QpvatRhAflcY/XVk62tMv6eAqBjC1rZNi1IF1rRF6toLrIM0vMQUbgFO9oVv+/r50mQ==} - dev: false - /@babel/code-frame@7.22.13: resolution: {integrity: sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==} engines: {node: '>=6.9.0'} diff --git a/halo2-repl/package.json b/halo2-repl/package.json index d4637b7..0d8abc9 100644 --- a/halo2-repl/package.json +++ b/halo2-repl/package.json @@ -41,4 +41,4 @@ "devDependencies": { "@types/prettier": "1.18.2" } -} +} \ No newline at end of file diff --git a/halo2-repl/pnpm-lock.yaml b/halo2-repl/pnpm-lock.yaml index 95a22fe..aa5b287 100644 --- a/halo2-repl/pnpm-lock.yaml +++ b/halo2-repl/pnpm-lock.yaml @@ -6,11 +6,11 @@ settings: dependencies: '@axiom-crypto/halo2-lib-js': - specifier: 0.3.0-rc2.0 - version: 0.3.0-rc2.0 + specifier: link:../halo2-lib-js/dist + version: link:../halo2-lib-js/dist '@axiom-crypto/halo2-wasm': - specifier: 0.3.0-rc2.0 - version: 0.3.0-rc2.0 + specifier: link:../halo2-wasm/pkg + version: link:../halo2-wasm/pkg '@devbookhq/splitter': specifier: ^1.4.2 version: 1.4.2 @@ -119,21 +119,6 @@ packages: '@jridgewell/trace-mapping': 0.3.21 dev: false - /@axiom-crypto/halo2-lib-js@0.3.0-rc2.0: - resolution: {integrity: sha512-h3v5VaImQ/5HLenz76B2cCVC7oqjBBEdkvVcD7HdVoXFlWRwwPmvSIDjYp5+JozrIkGdAs/WWBI046G1GCtCvw==} - dependencies: - '@axiom-crypto/halo2-wasm': 0.3.0-rc2.0 - ethers: 6.10.0 - prettier: 1.18.2 - transitivePeerDependencies: - - bufferutil - - utf-8-validate - dev: false - - /@axiom-crypto/halo2-wasm@0.3.0-rc2.0: - resolution: {integrity: sha512-NWz7mQnSYED2S/6UsS+rlTvxbFumTGFibzLczTXE1KiWXlyh7oQzHMQnjHfgTDKgl0VuhcLUkd12EAJ/V5JFsg==} - dev: false - /@babel/code-frame@7.23.5: resolution: {integrity: sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==} engines: {node: '>=6.9.0'} @@ -885,6 +870,7 @@ packages: dependencies: is-glob: 4.0.3 micromatch: 4.0.5 + napi-wasm: 1.1.0 dev: false bundledDependencies: - napi-wasm @@ -4336,6 +4322,10 @@ packages: hasBin: true dev: false + /napi-wasm@1.1.0: + resolution: {integrity: sha512-lHwIAJbmLSjF9VDRm9GoVOy9AGp3aIvkjv+Kvz9h16QR3uSVYH78PNQUnT2U4X53mhlnV2M7wrhibQ3GHicDmg==} + dev: false + /natural-compare@1.4.0: resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==} dev: false diff --git a/halo2-wasm/js/js/index.ts b/halo2-wasm/js/js/index.ts index 1f69243..f48042f 100644 --- 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 index e873cca..0e6b40c 100644 --- 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 index 7224038..39da4df 100755 --- 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