From 593e18a5795af9e4ee638bc7c88a222237c9857e Mon Sep 17 00:00:00 2001 From: Marco Granelli Date: Wed, 15 May 2024 11:58:10 +0200 Subject: [PATCH] Updates masp dep. Patch reddsa dep --- Cargo.lock | 180 +++++++++++++++++++++--- Cargo.toml | 8 +- crates/benches/native_vps.rs | 124 +++++++++------- crates/sdk/src/masp.rs | 47 ++----- crates/shielded_token/src/conversion.rs | 16 +-- wasm/Cargo.lock | 6 +- wasm_for_tests/Cargo.lock | 6 +- 7 files changed, 259 insertions(+), 128 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ae341298548..be499319434 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -310,6 +310,15 @@ dependencies = [ "rustc_version 0.4.0", ] +[[package]] +name = "atomic-polyfill" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cf2bce30dfe09ef0bfaef228b9d414faaf7e563035494d7fe092dba54b300f4" +dependencies = [ + "critical-section", +] + [[package]] name = "auto_impl" version = "1.1.0" @@ -503,12 +512,12 @@ dependencies = [ [[package]] name = "bip0039" -version = "0.10.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef0f0152ec5cf17f49a5866afaa3439816207fd4f0a224c0211ffaf5e278426" +checksum = "568b6890865156d9043af490d4c4081c385dd68ea10acd6ca15733d511e6b51c" dependencies = [ "hmac 0.12.1", - "pbkdf2 0.10.1", + "pbkdf2 0.12.2", "rand 0.8.5", "sha2 0.10.8", "unicode-normalization", @@ -1038,6 +1047,12 @@ name = "clru" version = "0.5.0" source = "git+https://github.com/marmeladema/clru-rs.git?rev=71ca566#71ca566915f21f3c308091ca7756a91b0f8b5afc" +[[package]] +name = "cobs" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15" + [[package]] name = "coins-bip32" version = "0.8.7" @@ -1158,6 +1173,12 @@ dependencies = [ "windows", ] +[[package]] +name = "const-crc32" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68d13f542d70e5b339bf46f6f74704ac052cfd526c58cd87996bd1ef4615b9a0" + [[package]] name = "const-hex" version = "1.10.0" @@ -1420,6 +1441,12 @@ dependencies = [ "itertools 0.10.5", ] +[[package]] +name = "critical-section" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216" + [[package]] name = "crossbeam-channel" version = "0.5.12" @@ -1633,6 +1660,12 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" +[[package]] +name = "debugless-unwrap" +version = "0.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f400d0750c0c069e8493f2256cb4da6f604b6d2eeb69a0ca8863acde352f8400" + [[package]] name = "der" version = "0.7.8" @@ -1669,6 +1702,17 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "derive-getters" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a2c35ab6e03642397cdda1dd58abbc05d418aef8e36297f336d5aba060fe8df" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "derive_more" version = "0.99.17" @@ -1759,6 +1803,15 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" +[[package]] +name = "document-features" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef5282ad69563b5fc40319526ba27e0e7363d552a896f0297d54f767717f9b95" +dependencies = [ + "litrs", +] + [[package]] name = "drain_filter_polyfill" version = "0.1.3" @@ -1917,6 +1970,12 @@ dependencies = [ "zeroize", ] +[[package]] +name = "embedded-io" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef1a6892d9eef45c8fa6b9e0086428a2cca8491aca8f787c534a3d6d0bcb3ced" + [[package]] name = "encoding_rs" version = "0.8.33" @@ -2502,6 +2561,40 @@ dependencies = [ "num-traits 0.2.17", ] +[[package]] +name = "frost-core" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45d6280625f1603d160df24b23e4984a6a7286f41455ae606823d0104c32e834" +dependencies = [ + "byteorder", + "const-crc32", + "debugless-unwrap", + "derive-getters", + "document-features", + "hex", + "itertools 0.12.1", + "postcard", + "rand_core 0.6.4", + "serde 1.0.193", + "serdect", + "thiserror", + "visibility", + "zeroize", +] + +[[package]] +name = "frost-rerandomized" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52c58f58ea009000db490efd9a3936d0035647a2b00c7ba8f3868c2ed0306b0b" +dependencies = [ + "derive-getters", + "document-features", + "frost-core", + "rand_core 0.6.4", +] + [[package]] name = "fs_extra" version = "1.3.0" @@ -2783,6 +2876,15 @@ version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" +[[package]] +name = "hash32" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67" +dependencies = [ + "byteorder", +] + [[package]] name = "hashbrown" version = "0.11.2" @@ -2850,6 +2952,20 @@ dependencies = [ "http 0.2.11", ] +[[package]] +name = "heapless" +version = "0.7.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdc6457c0eb62c71aac4bc17216026d8410337c4126773b9c5daba343f17964f" +dependencies = [ + "atomic-polyfill", + "hash32", + "rustc_version 0.4.0", + "serde 1.0.193", + "spin 0.9.8", + "stable_deref_trait", +] + [[package]] name = "heck" version = "0.4.1" @@ -4157,6 +4273,12 @@ version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" +[[package]] +name = "litrs" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5" + [[package]] name = "lock_api" version = "0.4.11" @@ -4220,7 +4342,7 @@ dependencies = [ [[package]] name = "masp_note_encryption" version = "1.0.0" -source = "git+https://github.com/anoma/masp?rev=d1e0876b304968edfa36707ffe4fb8fbbee131d2#d1e0876b304968edfa36707ffe4fb8fbbee131d2" +source = "git+https://github.com/anoma/masp?rev=b5e87a01c5928ce341f2d2a63a6fa6c4033be395#b5e87a01c5928ce341f2d2a63a6fa6c4033be395" dependencies = [ "borsh 1.2.1", "chacha20", @@ -4233,7 +4355,7 @@ dependencies = [ [[package]] name = "masp_primitives" version = "1.0.0" -source = "git+https://github.com/anoma/masp?rev=d1e0876b304968edfa36707ffe4fb8fbbee131d2#d1e0876b304968edfa36707ffe4fb8fbbee131d2" +source = "git+https://github.com/anoma/masp?rev=b5e87a01c5928ce341f2d2a63a6fa6c4033be395#b5e87a01c5928ce341f2d2a63a6fa6c4033be395" dependencies = [ "aes", "bip0039", @@ -4265,7 +4387,7 @@ dependencies = [ [[package]] name = "masp_proofs" version = "1.0.0" -source = "git+https://github.com/anoma/masp?rev=d1e0876b304968edfa36707ffe4fb8fbbee131d2#d1e0876b304968edfa36707ffe4fb8fbbee131d2" +source = "git+https://github.com/anoma/masp?rev=b5e87a01c5928ce341f2d2a63a6fa6c4033be395#b5e87a01c5928ce341f2d2a63a6fa6c4033be395" dependencies = [ "bellman", "blake2b_simd", @@ -4646,6 +4768,7 @@ dependencies = [ "criterion", "lazy_static", "masp_primitives", + "masp_proofs", "namada", "namada_apps", "prost 0.12.3", @@ -5831,9 +5954,9 @@ dependencies = [ [[package]] name = "password-hash" -version = "0.3.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d791538a6dcc1e7cb7fe6f6b58aca40e7f79403c45b2bc274008b5e647af1d8" +checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166" dependencies = [ "base64ct", "rand_core 0.6.4", @@ -5877,16 +6000,6 @@ dependencies = [ "crypto-mac 0.8.0", ] -[[package]] -name = "pbkdf2" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "271779f35b581956db91a3e55737327a03aa051e90b1c47aeb189508533adfd7" -dependencies = [ - "digest 0.10.7", - "password-hash", -] - [[package]] name = "pbkdf2" version = "0.11.0" @@ -5904,6 +6017,7 @@ checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" dependencies = [ "digest 0.10.7", "hmac 0.12.1", + "password-hash", ] [[package]] @@ -6072,6 +6186,18 @@ dependencies = [ "universal-hash", ] +[[package]] +name = "postcard" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a55c51ee6c0db07e68448e336cf8ea4131a620edefebf9893e759b2d793420f8" +dependencies = [ + "cobs", + "embedded-io", + "heapless", + "serde 1.0.193", +] + [[package]] name = "powerfmt" version = "0.2.0" @@ -6487,11 +6613,11 @@ dependencies = [ [[package]] name = "reddsa" version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78a5191930e84973293aa5f532b513404460cd2216c1cfb76d08748c15b40b02" +source = "git+https://github.com/heliaxdev/reddsa?rev=46d363b929e1b940688fa0c53d637e304a755185#46d363b929e1b940688fa0c53d637e304a755185" dependencies = [ "blake2b_simd", "byteorder", + "frost-rerandomized", "group", "hex", "jubjub", @@ -7478,6 +7604,9 @@ name = "spin" version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] [[package]] name = "spki" @@ -8608,6 +8737,17 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +[[package]] +name = "visibility" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3fd98999db9227cf28e59d83e1f120f42bc233d4b152e8fab9bc87d5bb1e0f8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.52", +] + [[package]] name = "wait-timeout" version = "0.2.0" diff --git a/Cargo.toml b/Cargo.toml index 11531f5699f..7e042f179f1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -122,8 +122,8 @@ libc = "0.2.97" libloading = "0.7.2" linkme = "0.3.24" # branch = "murisi/namada-integration" -masp_primitives = { git = "https://github.com/anoma/masp", rev = "d1e0876b304968edfa36707ffe4fb8fbbee131d2" } -masp_proofs = { git = "https://github.com/anoma/masp", rev = "d1e0876b304968edfa36707ffe4fb8fbbee131d2", default-features = false, features = ["local-prover"] } +masp_primitives = { git = "https://github.com/anoma/masp", rev = "b5e87a01c5928ce341f2d2a63a6fa6c4033be395" } +masp_proofs = { git = "https://github.com/anoma/masp", rev = "b5e87a01c5928ce341f2d2a63a6fa6c4033be395", default-features = false, features = ["local-prover"] } num256 = "0.3.5" num_cpus = "1.13.0" num-derive = "0.3.3" @@ -195,6 +195,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 diff --git a/crates/benches/native_vps.rs b/crates/benches/native_vps.rs index 920613baff1..e825a25bc5c 100644 --- a/crates/benches/native_vps.rs +++ b/crates/benches/native_vps.rs @@ -226,13 +226,15 @@ fn governance(c: &mut Criterion) { group.bench_function(bench_name, |b| { b.iter(|| { - assert!(governance - .validate_tx( - &signed_tx, - governance.ctx.keys_changed, - governance.ctx.verifiers, - ) - .is_ok()) + assert!( + governance + .validate_tx( + &signed_tx, + governance.ctx.keys_changed, + governance.ctx.verifiers, + ) + .is_ok() + ) }) }); } @@ -444,13 +446,14 @@ fn ibc(c: &mut Criterion) { group.bench_function(bench_name, |b| { b.iter(|| { - assert!(ibc - .validate_tx( + assert!( + ibc.validate_tx( &signed_tx, ibc.ctx.keys_changed, ibc.ctx.verifiers, ) - .is_ok()) + .is_ok() + ) }) }); } @@ -508,13 +511,15 @@ fn vp_multitoken(c: &mut Criterion) { group.bench_function(bench_name, |b| { b.iter(|| { - assert!(multitoken - .validate_tx( - signed_tx, - multitoken.ctx.keys_changed, - multitoken.ctx.verifiers, - ) - .is_ok()) + assert!( + multitoken + .validate_tx( + signed_tx, + multitoken.ctx.keys_changed, + multitoken.ctx.verifiers, + ) + .is_ok() + ) }) }); } @@ -617,13 +622,14 @@ fn masp(c: &mut Criterion) { }; b.iter(|| { - assert!(masp - .validate_tx( + assert!( + masp.validate_tx( &signed_tx, masp.ctx.keys_changed, masp.ctx.verifiers, ) - .is_ok()); + .is_ok() + ); }) }); } @@ -903,7 +909,7 @@ fn customize_masp_tx_data( TransactionData, Transaction, )> { - let (_, tx) = setup_storage_for_masp_verification("unshielding"); + let (_, _, tx) = setup_storage_for_masp_verification("unshielding"); let transaction = tx .sections .into_iter() @@ -1072,8 +1078,11 @@ fn masp_batch_validate(c: &mut Criterion) { ctx }, |ctx| { - assert!(ctx - .validate(spend_vk, convert_vk, output_vk, OsRng)) + assert!( + ctx.validate( + spend_vk, convert_vk, output_vk, OsRng + ) + ) }, BatchSize::SmallInput, ) @@ -1155,13 +1164,14 @@ fn pgf(c: &mut Criterion) { group.bench_function(bench_name, |b| { b.iter(|| { - assert!(pgf - .validate_tx( + assert!( + pgf.validate_tx( &signed_tx, pgf.ctx.keys_changed, pgf.ctx.verifiers, ) - .is_ok()) + .is_ok() + ) }) }); } @@ -1230,13 +1240,14 @@ fn eth_bridge_nut(c: &mut Criterion) { c.bench_function("vp_eth_bridge_nut", |b| { b.iter(|| { - assert!(nut - .validate_tx( + assert!( + nut.validate_tx( &signed_tx, nut.ctx.keys_changed, nut.ctx.verifiers, ) - .is_ok()) + .is_ok() + ) }) }); } @@ -1301,13 +1312,15 @@ fn eth_bridge(c: &mut Criterion) { c.bench_function("vp_eth_bridge", |b| { b.iter(|| { - assert!(eth_bridge - .validate_tx( - &signed_tx, - eth_bridge.ctx.keys_changed, - eth_bridge.ctx.verifiers, - ) - .is_ok()) + assert!( + eth_bridge + .validate_tx( + &signed_tx, + eth_bridge.ctx.keys_changed, + eth_bridge.ctx.verifiers, + ) + .is_ok() + ) }) }); } @@ -1397,13 +1410,15 @@ fn eth_bridge_pool(c: &mut Criterion) { c.bench_function("vp_eth_bridge_pool", |b| { b.iter(|| { - assert!(bridge_pool - .validate_tx( - &signed_tx, - bridge_pool.ctx.keys_changed, - bridge_pool.ctx.verifiers, - ) - .is_ok()) + assert!( + bridge_pool + .validate_tx( + &signed_tx, + bridge_pool.ctx.keys_changed, + bridge_pool.ctx.verifiers, + ) + .is_ok() + ) }) }); } @@ -1463,13 +1478,15 @@ fn parameters(c: &mut Criterion) { group.bench_function(bench_name, |b| { b.iter(|| { - assert!(parameters - .validate_tx( - &signed_tx, - parameters.ctx.keys_changed, - parameters.ctx.verifiers, - ) - .is_ok()) + assert!( + parameters + .validate_tx( + &signed_tx, + parameters.ctx.keys_changed, + parameters.ctx.verifiers, + ) + .is_ok() + ) }) }); } @@ -1532,13 +1549,14 @@ fn pos(c: &mut Criterion) { group.bench_function(bench_name, |b| { b.iter(|| { - assert!(pos - .validate_tx( + assert!( + pos.validate_tx( &signed_tx, pos.ctx.keys_changed, pos.ctx.verifiers, ) - .is_ok()) + .is_ok() + ) }) }); } diff --git a/crates/sdk/src/masp.rs b/crates/sdk/src/masp.rs index 5aa12960122..26eaee78e63 100644 --- a/crates/sdk/src/masp.rs +++ b/crates/sdk/src/masp.rs @@ -1282,11 +1282,9 @@ impl ShieldedContext { let required = value / threshold; // Forget about the trace amount left over because we cannot // realize its value - let trace = I128Sum::from_pair(asset_type, value % threshold) - .expect("the trace should be a valid i128"); + let trace = I128Sum::from_pair(asset_type, value % threshold); let normed_trace = - I128Sum::from_pair(normed_asset_type, value % threshold) - .expect("the trace should be a valid i128"); + I128Sum::from_pair(normed_asset_type, value % threshold); // Record how much more of the given conversion has been used *usage += required; // Apply the conversions to input and move the trace amount to output @@ -1466,13 +1464,7 @@ impl ShieldedContext { // The amount contributed by this note before conversion let pre_contr = - I128Sum::from_pair(note.asset_type, note.value as i128) - .map_err(|()| { - Error::Other( - "received note has invalid value or asset type" - .to_string(), - ) - })?; + I128Sum::from_pair(note.asset_type, note.value as i128); let (contr, normed_contr, proposed_convs) = self .compute_exchanged_amount( context.client(), @@ -1553,12 +1545,10 @@ impl ShieldedContext { res += ValueSum::from_pair( pre_asset_type.token, decoded_change, - ) - .expect("expected this to fit"); + ); } None => { - undecoded += ValueSum::from_pair(*asset_type, *val) - .expect("expected this to fit"); + undecoded += ValueSum::from_pair(*asset_type, *val); } _ => {} } @@ -1588,11 +1578,9 @@ impl ShieldedContext { res += MaspAmount::from_pair( (decoded.epoch, decoded.token), decoded_change, - ) - .expect("unable to construct decoded amount"); + ); } else { - undecoded += ValueSum::from_pair(*asset_type, *val) - .expect("expected this to fit"); + undecoded += ValueSum::from_pair(*asset_type, *val); } } (res, undecoded) @@ -1611,8 +1599,7 @@ impl ShieldedContext { if let Some(decoded) = self.decode_asset_type(client, *asset_type).await { - res += ValueSum::from_pair((*asset_type, decoded), *val) - .expect("unable to construct decoded amount"); + res += ValueSum::from_pair((*asset_type, decoded), *val); } } res @@ -1825,9 +1812,7 @@ impl ShieldedContext { // Anotate the asset type in the value balance with its decoding in // order to facilitate cross-epoch computations - let value_balance = builder.value_balance().map_err(|e| { - Error::Other(format!("unable to complete value balance: {}", e)) - })?; + let value_balance = builder.value_balance(); let value_balance = context .shielded_mut() .await @@ -1917,8 +1902,7 @@ impl ShieldedContext { // Convert the shortfall into a I128Sum let mut shortfall = I128Sum::zero(); for (asset_type, val) in asset_types.iter().zip(rem_amount) { - shortfall += I128Sum::from_pair(*asset_type, val.into()) - .expect("unable to construct value sum"); + shortfall += I128Sum::from_pair(*asset_type, val.into()); } // Return an insufficient ffunds error return Result::Err(TransferErr::from( @@ -1930,16 +1914,7 @@ impl ShieldedContext { if let Some(sk) = spending_key { // Represents the amount of inputs we are short by let mut additional = I128Sum::zero(); - for (asset_type, amt) in builder - .value_balance() - .map_err(|e| { - Error::Other(format!( - "unable to complete value balance: {}", - e - )) - })? - .components() - { + for (asset_type, amt) in builder.value_balance().components() { match amt.cmp(&0) { Ordering::Greater => { // Send the change in this asset type back to the sender diff --git a/crates/shielded_token/src/conversion.rs b/crates/shielded_token/src/conversion.rs index 7c842ffc26f..34b97279841 100644 --- a/crates/shielded_token/src/conversion.rs +++ b/crates/shielded_token/src/conversion.rs @@ -386,13 +386,10 @@ where (MaspAmount::from_pair( old_asset, -(normed_inflation as i128), - ) - .unwrap() - + MaspAmount::from_pair( - new_asset, - new_normed_inflation as i128, - ) - .unwrap()) + ) + MaspAmount::from_pair( + new_asset, + new_normed_inflation as i128, + )) .into(), ); // Operations that happen exactly once for each token @@ -451,14 +448,11 @@ where current_convs.insert( (token.clone(), denom, digit), (MaspAmount::from_pair(old_asset, -(reward.1 as i128)) - .unwrap() + MaspAmount::from_pair(new_asset, reward.1 as i128) - .unwrap() + MaspAmount::from_pair( reward_assets[digit as usize], real_reward as i128, - ) - .unwrap()) + )) .into(), ); // Operations that happen exactly once for each token diff --git a/wasm/Cargo.lock b/wasm/Cargo.lock index 0cf96f6666a..b65c72e380e 100644 --- a/wasm/Cargo.lock +++ b/wasm/Cargo.lock @@ -3486,7 +3486,7 @@ dependencies = [ [[package]] name = "masp_note_encryption" version = "1.0.0" -source = "git+https://github.com/anoma/masp?rev=d1e0876b304968edfa36707ffe4fb8fbbee131d2#d1e0876b304968edfa36707ffe4fb8fbbee131d2" +source = "git+https://github.com/anoma/masp?rev=4ff41d1b51659adeca3b8c501586c89032479871#4ff41d1b51659adeca3b8c501586c89032479871" dependencies = [ "borsh 1.4.0", "chacha20", @@ -3499,7 +3499,7 @@ dependencies = [ [[package]] name = "masp_primitives" version = "1.0.0" -source = "git+https://github.com/anoma/masp?rev=d1e0876b304968edfa36707ffe4fb8fbbee131d2#d1e0876b304968edfa36707ffe4fb8fbbee131d2" +source = "git+https://github.com/anoma/masp?rev=4ff41d1b51659adeca3b8c501586c89032479871#4ff41d1b51659adeca3b8c501586c89032479871" dependencies = [ "aes", "bip0039", @@ -3531,7 +3531,7 @@ dependencies = [ [[package]] name = "masp_proofs" version = "1.0.0" -source = "git+https://github.com/anoma/masp?rev=d1e0876b304968edfa36707ffe4fb8fbbee131d2#d1e0876b304968edfa36707ffe4fb8fbbee131d2" +source = "git+https://github.com/anoma/masp?rev=4ff41d1b51659adeca3b8c501586c89032479871#4ff41d1b51659adeca3b8c501586c89032479871" dependencies = [ "bellman", "blake2b_simd", diff --git a/wasm_for_tests/Cargo.lock b/wasm_for_tests/Cargo.lock index 52a27b3eb95..43bed242377 100644 --- a/wasm_for_tests/Cargo.lock +++ b/wasm_for_tests/Cargo.lock @@ -3466,7 +3466,7 @@ dependencies = [ [[package]] name = "masp_note_encryption" version = "1.0.0" -source = "git+https://github.com/anoma/masp?rev=d1e0876b304968edfa36707ffe4fb8fbbee131d2#d1e0876b304968edfa36707ffe4fb8fbbee131d2" +source = "git+https://github.com/anoma/masp?rev=4ff41d1b51659adeca3b8c501586c89032479871#4ff41d1b51659adeca3b8c501586c89032479871" dependencies = [ "borsh 1.2.1", "chacha20", @@ -3479,7 +3479,7 @@ dependencies = [ [[package]] name = "masp_primitives" version = "1.0.0" -source = "git+https://github.com/anoma/masp?rev=d1e0876b304968edfa36707ffe4fb8fbbee131d2#d1e0876b304968edfa36707ffe4fb8fbbee131d2" +source = "git+https://github.com/anoma/masp?rev=4ff41d1b51659adeca3b8c501586c89032479871#4ff41d1b51659adeca3b8c501586c89032479871" dependencies = [ "aes", "bip0039", @@ -3511,7 +3511,7 @@ dependencies = [ [[package]] name = "masp_proofs" version = "1.0.0" -source = "git+https://github.com/anoma/masp?rev=d1e0876b304968edfa36707ffe4fb8fbbee131d2#d1e0876b304968edfa36707ffe4fb8fbbee131d2" +source = "git+https://github.com/anoma/masp?rev=4ff41d1b51659adeca3b8c501586c89032479871#4ff41d1b51659adeca3b8c501586c89032479871" dependencies = [ "bellman", "blake2b_simd",