Skip to content

Commit

Permalink
shielded_token: feature guard validation to avoid compilation into wasm
Browse files Browse the repository at this point in the history
  • Loading branch information
tzemanovic committed Jun 25, 2024
1 parent d056b13 commit 4f03fc3
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 19 deletions.
6 changes: 3 additions & 3 deletions Cargo.lock

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

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,8 @@ libc = "0.2.97"
libloading = "0.7.2"
linkme = "0.3.24"
# branch = "main"
masp_primitives = { git = "https://github.com/anoma/masp", rev = "4ede1c42d76d6348af8224bc8bfac4404321fe82" }
masp_proofs = { git = "https://github.com/anoma/masp", rev = "4ede1c42d76d6348af8224bc8bfac4404321fe82", default-features = false, features = ["local-prover"] }
masp_primitives = { git = "https://github.com/anoma/masp", rev = "71b36beba21e35f8611f3ba6910ed5b78ec11af1" }
masp_proofs = { git = "https://github.com/anoma/masp", rev = "71b36beba21e35f8611f3ba6910ed5b78ec11af1", default-features = false, features = ["local-prover"] }
num256 = "0.3.5"
num_cpus = "1.13.0"
num-derive = "0.4"
Expand Down
2 changes: 1 addition & 1 deletion crates/encoding_spec/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ default = []
namada-eth-bridge = ["namada/namada-eth-bridge"]

[dependencies]
namada = { path = "../namada", features = ["rand", "tendermint-rpc", "download-params"] }
namada = { path = "../namada", features = ["rand", "tendermint-rpc"] }
borsh.workspace = true
itertools.workspace = true
lazy_static.workspace = true
Expand Down
2 changes: 0 additions & 2 deletions crates/namada/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,6 @@ multicore = [
"namada_sdk/multicore",
"namada_token/multicore",
]
# Download MASP params if they're not present
download-params = ["namada_sdk/download-params"]
rand = ["namada_sdk/rand"]
migrations = [
"namada_migrations",
Expand Down
4 changes: 2 additions & 2 deletions crates/sdk/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ version.workspace = true
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[features]
default = ["tendermint-rpc", "download-params", "std", "rand", "migrations"]
default = ["tendermint-rpc", "std", "rand", "migrations"]

mainnet = ["namada_core/mainnet", "namada_events/mainnet"]

multicore = ["masp_proofs/multicore"]

namada-sdk = ["tendermint-rpc", "masp_primitives/transparent-inputs"]

std = ["fd-lock"]
std = ["fd-lock", "download-params"]
rand = ["dep:rand", "rand_core", "namada_core/rand"]

# tendermint-rpc support
Expand Down
5 changes: 2 additions & 3 deletions crates/shielded_token/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,12 @@ version.workspace = true
[features]
default = []
multicore = ["dep:rayon"]
# Download MASP params if they're not present
download-params = ["masp_proofs/download-params"]
testing = [
"multicore",
"namada_core/testing",
"masp_primitives/test-dependencies",
]
download-params = ["masp_proofs/download-params"]

[dependencies]
namada_controller = { path = "../controller" }
Expand All @@ -34,7 +33,7 @@ namada_trans_token = { path = "../trans_token" }
borsh.workspace = true
lazy_static.workspace = true
masp_primitives.workspace = true
masp_proofs.workspace = true
masp_proofs = { workspace = true }
rand_core.workspace = true
rayon = { workspace = true, optional = true }
serde.workspace = true
Expand Down
6 changes: 3 additions & 3 deletions wasm/Cargo.lock

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

6 changes: 3 additions & 3 deletions wasm_for_tests/Cargo.lock

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

0 comments on commit 4f03fc3

Please sign in to comment.