From 8edadbdd9a682b19f7a491666ef46dc901de42d0 Mon Sep 17 00:00:00 2001 From: Jonathan Wang <31040440+jonathanpwang@users.noreply.github.com> Date: Thu, 18 Jan 2024 19:09:09 -0500 Subject: [PATCH] chore: pin `wasm-bindgen-rayon` (#60) --- cli/pnpm-lock.yaml | 18 +++++++++--------- halo2-lib-js/pnpm-lock.yaml | 8 ++++++-- halo2-wasm/Cargo.toml | 4 ++-- halo2-wasm/package.json | 2 +- halo2-wasm/scripts/build-web.sh | 2 +- 5 files changed, 19 insertions(+), 15 deletions(-) diff --git a/cli/pnpm-lock.yaml b/cli/pnpm-lock.yaml index fe182c8..417c4a0 100644 --- a/cli/pnpm-lock.yaml +++ b/cli/pnpm-lock.yaml @@ -6,11 +6,11 @@ settings: dependencies: '@axiom-crypto/halo2-lib-js': - specifier: 0.3.2 - version: 0.3.2 + specifier: 0.3.3 + version: 0.3.3 '@axiom-crypto/halo2-wasm': - specifier: link:../halo2-wasm/pkg - version: link:../halo2-wasm/pkg + specifier: 0.3.3 + version: 0.3.3 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.3.2: - resolution: {integrity: sha512-MT4NMU6sCnCnpf8Oy4LRx9txezf8RHr0p06j8a1aNCp/gi9fQ1v9201dS1j7Ck/Nr7YwTC4ZK4J6n8lNJqf9Pg==} + /@axiom-crypto/halo2-lib-js@0.3.3: + resolution: {integrity: sha512-OSVeKNoZtLhX4dEVuVAGufF4CafraUKk4ej7dGOEgbbYZnCmSmprNy9fW46TWOpXDdJtvnMcu+Zroe6gZ9wk+Q==} dependencies: - '@axiom-crypto/halo2-wasm': 0.3.2 + '@axiom-crypto/halo2-wasm': 0.3.3 ethers: 6.9.0 prettier: 1.18.2 transitivePeerDependencies: @@ -43,8 +43,8 @@ packages: - utf-8-validate dev: false - /@axiom-crypto/halo2-wasm@0.3.2: - resolution: {integrity: sha512-7k4YbEtrKgH6JVoJKgdiot9cllTC7q4aPK7btFTLbXVYMl8oWcAHo+lkEtyjpj5iFqUYx9JTc35KwHUzPfhj7g==} + /@axiom-crypto/halo2-wasm@0.3.3: + resolution: {integrity: sha512-lqXzf6fqzXpcB+pStGrutwjV6TXXshNSFh+XEwLh1di/1UK6pt4fhs0qb2Xc6enYdPpFCXB62UDeTesi4brhFA==} dev: false /@babel/code-frame@7.22.13: diff --git a/halo2-lib-js/pnpm-lock.yaml b/halo2-lib-js/pnpm-lock.yaml index fc37247..3f9c5ce 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: link:../halo2-wasm/pkg - version: link:../halo2-wasm/pkg + specifier: 0.3.3 + version: 0.3.3 ethers: specifier: ^6.8.0 version: 6.8.0 @@ -58,6 +58,10 @@ packages: '@jridgewell/trace-mapping': 0.3.20 dev: true + /@axiom-crypto/halo2-wasm@0.3.3: + resolution: {integrity: sha512-lqXzf6fqzXpcB+pStGrutwjV6TXXshNSFh+XEwLh1di/1UK6pt4fhs0qb2Xc6enYdPpFCXB62UDeTesi4brhFA==} + dev: false + /@babel/code-frame@7.22.13: resolution: {integrity: sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==} engines: {node: '>=6.9.0'} diff --git a/halo2-wasm/Cargo.toml b/halo2-wasm/Cargo.toml index f66d152..b573d03 100644 --- a/halo2-wasm/Cargo.toml +++ b/halo2-wasm/Cargo.toml @@ -29,7 +29,7 @@ snark-verifier = { version = "0.1.7", default-features = false, features = ["loa getrandom = { version = "0.2", features = ["js"] } rand = "0.8" -itertools = "0.10" +itertools = "0.11" web-sys = { version = "0.3", features = ["Request", "Window", "Response", "console"] } console_error_panic_hook = "0.1.7" js-sys = "0.3" @@ -44,7 +44,7 @@ num-integer = "0.1.45" paste = "1.0.14" [target.'cfg(target_family = "wasm")'.dependencies] -wasm-bindgen-rayon = { version = "1.0" } +wasm-bindgen-rayon = { version = "=1.1.3" } [features] default = ["rayon"] diff --git a/halo2-wasm/package.json b/halo2-wasm/package.json index d5fb98a..f779665 100644 --- a/halo2-wasm/package.json +++ b/halo2-wasm/package.json @@ -1,7 +1,7 @@ { "name": "@axiom-crypto/halo2-wasm", "description": "Halo2 wasm bindings", - "version": "0.3.3", + "version": "0.3.4", "main": "index.js", "types": "index.d.ts", "scripts": { diff --git a/halo2-wasm/scripts/build-web.sh b/halo2-wasm/scripts/build-web.sh index 39da4df..bcd1d96 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-61c530a5c67cc8eb/src/workerHelpers.js mv temp-pkg pkg/web