Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "zksync-os"]
path = zksync-os
url = git@github.com:matter-labs/zksync-os.git
url = https://github.com/matter-labs/zksync-os.git
34 changes: 17 additions & 17 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion proof_verifier_js/ts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
}
},
"scripts": {
"build:wasm": "cd ../wasm && RUST_MIN_STACK=267108864 wasm-pack build --target web --out-dir ../ts/wasm/pkg",
"build:wasm": "cd ../wasm && ./build_for_ts.sh",
"build:ts": "tsup",
"build": "yarn build:wasm && yarn build:ts",
"prepack": "yarn build"
Expand Down
15 changes: 8 additions & 7 deletions proof_verifier_js/wasm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ version = "0.1.0"
edition = "2021"
license = "MIT OR Apache-2.0"

[package.metadata.wasm-pack.profile.release]
wasm-opt = false
# Disabling `wasm-opt` makes the build faster, but the resulting wasm file is much larger.
# [package.metadata.wasm-pack.profile.release]
# wasm-opt = false

[lib]
crate-type = ["cdylib"]
Expand All @@ -19,11 +20,11 @@ serde = { version = "1", features = ["derive"] }
serde_json = "1"
wasm-bindgen = "0.2"

full_statement_verifier = { git = "https://github.com/matter-labs/zksync-airbender", branch = "popzxc-optimize-builds", default-features = false, features = ["unified_verifier_only_security_80"] }
verifier_common = { git = "https://github.com/matter-labs/zksync-airbender", branch = "popzxc-optimize-builds", default-features = false, features = ["proof_utils"] }
prover = { git = "https://github.com/matter-labs/zksync-airbender", branch = "popzxc-optimize-builds", default-features = false, features = ["definitions_only"] }
cs = { git = "https://github.com/matter-labs/zksync-airbender", branch = "popzxc-optimize-builds", default-features = false, features = ["compiler"] }
field = { git = "https://github.com/matter-labs/zksync-airbender", branch = "popzxc-optimize-builds", default-features = false, features = ["no_inline"] }
full_statement_verifier = { git = "https://github.com/matter-labs/zksync-airbender", branch = "dev", default-features = false, features = ["unified_verifier_only_security_80"] }
verifier_common = { git = "https://github.com/matter-labs/zksync-airbender", branch = "dev", default-features = false, features = ["proof_utils"] }
prover = { git = "https://github.com/matter-labs/zksync-airbender", branch = "dev", default-features = false, features = ["definitions_only"] }
cs = { git = "https://github.com/matter-labs/zksync-airbender", branch = "dev", default-features = false, features = ["compiler"] }
field = { git = "https://github.com/matter-labs/zksync-airbender", branch = "dev", default-features = false, features = ["no_inline"] }

# full_statement_verifier = { path = "../../../zksync-airbender/full_statement_verifier", default-features = false, features = ["unified_verifier_only_security_80"] }
# verifier_common = { path = "../../../zksync-airbender/verifier_common", default-features = false, features = ["proof_utils"] }
Expand Down
9 changes: 9 additions & 0 deletions proof_verifier_js/wasm/build_for_ts.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/usr/bin/env bash
set -e

RUST_MIN_STACK=267108864 wasm-pack build --target web --out-dir ../ts/wasm/pkg

# `wasm-pack` generates `.gitignore`, which prevents these files to be published to npm
# Right now, there is no flag to omit generating this file, so we just remove it here
# See: https://github.com/drager/wasm-pack/issues/728
rm ../ts/wasm/pkg/.gitignore
Loading