merge queue: checking maint-201.0 (acbb667) and #5025 together

Cargo.toml

@@ -191,8 +191,8 @@ libfuzzer-sys = "0.4"
 libloading = "0.8"
 linkme = "0.3"
 madato = "0.7"
-masp_primitives = "3.0.8"
-masp_proofs = { version = "3.0.8", default-features = false, features = ["local-prover"] }
+masp_primitives = "3.2.0"
+masp_proofs = { version = "3.2.0", default-features = false, features = ["local-prover"] }
 num256 = "0.6"
 num_cpus = "1.13"
 num_enum = "0.7"

about.toml

@@ -6,6 +6,7 @@ accepted = [
     "BSD-2-Clause",
     "BSD-3-Clause",
     "CC0-1.0",
+    "CDLA-Permissive-2.0",
     "MPL-2.0",
     "GPL-3.0-or-later",
     "GPL-3.0-only",

crates/sdk/Cargo.toml

@@ -26,8 +26,7 @@ async-send = ["namada_io/async-send"]
 namada-eth-bridge = ["namada_ethereum_bridge/namada-eth-bridge"]
 benches = ["namada_core/benches", "namada_core/testing", "namada_state/benches"]
 wasm-runtime = ["namada_vm/wasm-runtime"]
-masp = ["namada_core/task_env", "namada_core/control_flow", "namada_token/masp"]
-historic-masp = ["masp", "namada_token/historic-masp"]
+historic-masp = ["namada_token/historic-masp"]
 # for tests and test utilities
 testing = [
   "masp_primitives/test-dependencies",
@@ -86,7 +85,7 @@ namada_parameters.workspace = true
 namada_proof_of_stake.workspace = true
 namada_state.workspace = true
 namada_storage.workspace = true
-namada_token = { workspace = true, features = ["masp"] }
+namada_token = { workspace = true, features = ["masp", "masp-validation"] }
 namada_tx.workspace = true
 namada_vm = { workspace = true, default-features = false }
 namada_vote_ext.workspace = true

crates/sdk/about.toml

@@ -7,6 +7,7 @@ accepted = [
     "BSD-2-Clause",
     "BSD-3-Clause",
     "CC0-1.0",
+    "CDLA-Permissive-2.0",
     "MPL-2.0",
     "OSL-3.0",
     "OpenSSL",

crates/shielded_token/Cargo.toml

@@ -30,13 +30,15 @@ testing = [
 ]
 download-params = ["masp_proofs/download-params"]
 masp = [
+  "masp_proofs",
   "namada_io",
   "namada_wallet",
   "namada_core/control_flow",
   "namada_core/task_env",
   "flume",
 ]
-historic = ["masp"]
+historic = ["masp", "masp-validation"]
+masp-validation = ["masp_proofs"]
 
 [dependencies]
 namada_account.workspace = true
@@ -64,7 +66,7 @@ itertools.workspace = true
 lazy_static.workspace = true
 linkme = { workspace = true, optional = true }
 masp_primitives.workspace = true
-masp_proofs.workspace = true
+masp_proofs = { workspace = true, optional = true }
 proptest = { workspace = true, optional = true }
 rand_core.workspace = true
 rand.workspace = true

crates/shielded_token/src/lib.rs

@@ -24,7 +24,9 @@ pub mod masp;
 mod storage;
 pub mod storage_key;
 pub mod utils;
+#[cfg(feature = "masp-validation")]
 pub mod validation;
+#[cfg(feature = "masp-validation")]
 pub mod vp;
 
 use std::str::FromStr;

crates/shielded_token/src/masp.rs

@@ -54,6 +54,7 @@ pub use crate::masp::shielded_sync::{
     ShieldedSyncConfig, ShieldedSyncConfigBuilder, utils,
 };
 pub use crate::masp::wallet_migrations::{VersionedWallet, VersionedWalletRef};
+#[cfg(feature = "masp-validation")]
 pub use crate::validation::{
     CONVERT_NAME, ENV_VAR_MASP_PARAMS_DIR, OUTPUT_NAME, PVKs, SPEND_NAME,
     partial_deauthorize, preload_verifying_keys,
@@ -324,6 +325,7 @@ mod tests {
     /// quick and dirty test. will fail on size check
     #[test]
     #[should_panic(expected = "parameter file size is not correct")]
+    #[cfg(feature = "masp-validation")]
     fn test_wrong_masp_params() {
         use std::io::Write;
 
@@ -356,6 +358,7 @@ mod tests {
     /// size but the wrong hash.
     #[test]
     #[should_panic(expected = "parameter file is not correct")]
+    #[cfg(feature = "masp-validation")]
     fn test_wrong_masp_params_hash() {
         use masp_primitives::ff::PrimeField;
         use masp_proofs::bellman::groth16::{
@@ -960,7 +963,7 @@ pub mod testing {
     }
 }
 
-#[cfg(feature = "std")]
+#[cfg(all(feature = "std", feature = "masp-validation"))]
 /// Implementation of MASP functionality depending on a standard filesystem
 pub mod fs {
     use std::env;