Skip to content

Commit

Permalink
Merge branch 'grarco/masp-parallel-verification' (#2972)
Browse files Browse the repository at this point in the history
* origin/grarco/masp-parallel-verification:
  Changelog #2972
  Updates masp gas costs
  Reworks gas metering for masp validation
  Fixes masp benchmarks
  Updates masp dep. Patch reddsa dep
  Updates benchmarks for parallel masp verification
  Run masp verification in parallel
  • Loading branch information
brentstone committed May 31, 2024
2 parents 98bbd7f + 15affec commit 6d2f5bf
Show file tree
Hide file tree
Showing 8 changed files with 750 additions and 320 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Improved masp vp verification to run in parallel.
([\#2972](https://github.com/anoma/namada/pull/2972))
153 changes: 151 additions & 2 deletions Cargo.lock

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

4 changes: 4 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,10 @@ winapi = "0.3.9"
yansi = "0.5.1"
zeroize = { version = "1.5.5", features = ["zeroize_derive"] }

[patch.crates-io]
# Patch to the fork containing the correct personalization and basepoints for masp
reddsa = { git = "https://github.com/heliaxdev/reddsa", rev = "46d363b929e1b940688fa0c53d637e304a755185" }

[profile.release]
lto = true
opt-level = 3
Expand Down
25 changes: 13 additions & 12 deletions crates/benches/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,20 @@ name = "native_vps"
harness = false
path = "native_vps.rs"

[[bench]]
name = "process_wrapper"
harness = false
path = "process_wrapper.rs"
# [[bench]]
# name = "process_wrapper"
# harness = false
# path = "process_wrapper.rs"

[[bench]]
name = "host_env"
harness = false
path = "host_env.rs"
# [[bench]]
# name = "host_env"
# harness = false
# path = "host_env.rs"

[[bench]]
name = "wasm_opcodes"
harness = false
path = "wasm_opcodes.rs"
# [[bench]]
# name = "wasm_opcodes"
# harness = false
# path = "wasm_opcodes.rs"

[features]
namada-eth-bridge = [
Expand All @@ -46,6 +46,7 @@ namada = { path = "../namada", features = ["rand", "benches"] }
namada_apps_lib = { path = "../apps_lib" }
namada_node = { path = "../node", features = ["benches"] }
masp_primitives.workspace = true
masp_proofs = { workspace = true, features = ["benchmarks"] }
borsh.workspace = true
borsh-ext.workspace = true
criterion = { version = "0.5", features = ["html_reports"] }
Expand Down
Loading

0 comments on commit 6d2f5bf

Please sign in to comment.