Masp miscellaneous fixes

.changelog/unreleased/SDK/2282-masp-misc-fixes.md

@@ -0,0 +1,2 @@
+- Removed useless epoch for fee unshielding.
+  ([\#2282](https://github.com/anoma/namada/pull/2282))

.changelog/unreleased/bug-fixes/2240-nullifier-uniqueness.md

@@ -0,0 +1,2 @@
+- Prevents double-spending in masp by adding a nullifier set.
+  ([\#2240](https://github.com/anoma/namada/pull/2240))

.changelog/unreleased/bug-fixes/2244-spend-description-validation.md

@@ -0,0 +1,2 @@
+- Updates masp tx to store the notes and the native vp to validate them and the
+  anchors. ([\#2244](https://github.com/anoma/namada/pull/2244))

.changelog/unreleased/bug-fixes/2248-convert-description-validation.md

@@ -0,0 +1,2 @@
+- Updates the masp vp to validate the convert description's anchor.
+  ([\#2248](https://github.com/anoma/namada/pull/2248))

.changelog/unreleased/improvements/2282-masp-misc-fixes.md

@@ -0,0 +1,2 @@
+- Removed useless epoch for fee unshielding and refactored tests.
+  ([\#2282](https://github.com/anoma/namada/pull/2282))

apps/src/lib/client/tx.rs

@@ -223,7 +223,7 @@ pub async fn submit_reveal_aux<'a>(
                 "Submitting a tx to reveal the public key for address \
                  {address}..."
             );
-            let (mut tx, signing_data, _epoch) =
+            let (mut tx, signing_data) =
                 tx::build_reveal_pk(context, &args, &public_key).await?;
 
             signing::generate_test_vector(context, &tx).await?;
@@ -244,7 +244,7 @@ pub async fn submit_bridge_pool_tx<'a, N: Namada<'a>>(
     args: args::EthereumBridgePool,
 ) -> Result<(), error::Error> {
     let tx_args = args.tx.clone();
-    let (mut tx, signing_data, _epoch) = args.clone().build(namada).await?;
+    let (mut tx, signing_data) = args.clone().build(namada).await?;
 
     signing::generate_test_vector(namada, &tx).await?;
 
@@ -272,7 +272,7 @@ where
 {
     submit_reveal_aux(namada, args.tx.clone(), &args.owner).await?;
 
-    let (mut tx, signing_data, _epoch) = args.build(namada).await?;
+    let (mut tx, signing_data) = args.build(namada).await?;
 
     signing::generate_test_vector(namada, &tx).await?;
 
@@ -296,7 +296,7 @@ pub async fn submit_update_account<'a, N: Namada<'a>>(
 where
     <N::Client as namada::ledger::queries::Client>::Error: std::fmt::Display,
 {
-    let (mut tx, signing_data, _epoch) = args.build(namada).await?;
+    let (mut tx, signing_data) = args.build(namada).await?;
 
     signing::generate_test_vector(namada, &tx).await?;
 
@@ -320,8 +320,7 @@ pub async fn submit_init_account<'a, N: Namada<'a>>(
 where
     <N::Client as namada::ledger::queries::Client>::Error: std::fmt::Display,
 {
-    let (mut tx, signing_data, _epoch) =
-        tx::build_init_account(namada, &args).await?;
+    let (mut tx, signing_data) = tx::build_init_account(namada, &args).await?;
 
     signing::generate_test_vector(namada, &tx).await?;
 
@@ -919,7 +918,7 @@ where
     <N::Client as namada::ledger::queries::Client>::Error: std::fmt::Display,
 {
     submit_reveal_aux(namada, args.tx.clone(), &args.source).await?;
-    let (mut tx, signing_data, _epoch) = args.build(namada).await?;
+    let (mut tx, signing_data) = args.build(namada).await?;
     signing::generate_test_vector(namada, &tx).await?;
 
     if args.tx.dump_tx {
@@ -945,8 +944,7 @@ where
     let current_epoch = rpc::query_and_print_epoch(namada).await;
     let governance_parameters =
         rpc::query_governance_parameters(namada.client()).await;
-    let (mut tx_builder, signing_data, _fee_unshield_epoch) = if args.is_offline
-    {
+    let (mut tx_builder, signing_data) = if args.is_offline {
         let proposal = OfflineProposal::try_from(args.proposal_data.as_ref())
             .map_err(|e| {
                 error::TxError::FailedGovernaneProposalDeserialize(
@@ -1071,8 +1069,7 @@ pub async fn submit_vote_proposal<'a, N: Namada<'a>>(
 where
     <N::Client as namada::ledger::queries::Client>::Error: std::fmt::Display,
 {
-    let (mut tx_builder, signing_data, _fee_unshield_epoch) = if args.is_offline
-    {
+    let (mut tx_builder, signing_data) = if args.is_offline {
         let default_signer = Some(args.voter.clone());
         let signing_data = aux_signing_data(
             namada,
@@ -1247,8 +1244,7 @@ where
     let default_address = args.source.clone().unwrap_or(args.validator.clone());
     submit_reveal_aux(namada, args.tx.clone(), &default_address).await?;
 
-    let (mut tx, signing_data, _fee_unshield_epoch) =
-        args.build(namada).await?;
+    let (mut tx, signing_data) = args.build(namada).await?;
     signing::generate_test_vector(namada, &tx).await?;
 
     if args.tx.dump_tx {
@@ -1271,7 +1267,7 @@ pub async fn submit_unbond<'a, N: Namada<'a>>(
 where
     <N::Client as namada::ledger::queries::Client>::Error: std::fmt::Display,
 {
-    let (mut tx, signing_data, _fee_unshield_epoch, latest_withdrawal_pre) =
+    let (mut tx, signing_data, latest_withdrawal_pre) =
         args.build(namada).await?;
     signing::generate_test_vector(namada, &tx).await?;
 
@@ -1297,8 +1293,7 @@ pub async fn submit_withdraw<'a, N: Namada<'a>>(
 where
     <N::Client as namada::ledger::queries::Client>::Error: std::fmt::Display,
 {
-    let (mut tx, signing_data, _fee_unshield_epoch) =
-        args.build(namada).await?;
+    let (mut tx, signing_data) = args.build(namada).await?;
     signing::generate_test_vector(namada, &tx).await?;
 
     if args.tx.dump_tx {
@@ -1321,8 +1316,7 @@ pub async fn submit_claim_rewards<'a, N: Namada<'a>>(
 where
     <N::Client as namada::ledger::queries::Client>::Error: std::fmt::Display,
 {
-    let (mut tx, signing_data, _fee_unshield_epoch) =
-        args.build(namada).await?;
+    let (mut tx, signing_data) = args.build(namada).await?;
     signing::generate_test_vector(namada, &tx).await?;
 
     if args.tx.dump_tx {
@@ -1368,8 +1362,7 @@ pub async fn submit_validator_commission_change<'a, N: Namada<'a>>(
 where
     <N::Client as namada::ledger::queries::Client>::Error: std::fmt::Display,
 {
-    let (mut tx, signing_data, _fee_unshield_epoch) =
-        args.build(namada).await?;
+    let (mut tx, signing_data) = args.build(namada).await?;
     signing::generate_test_vector(namada, &tx).await?;
 
     if args.tx.dump_tx {
@@ -1392,8 +1385,7 @@ pub async fn submit_validator_metadata_change<'a, N: Namada<'a>>(
 where
     <N::Client as namada::ledger::queries::Client>::Error: std::fmt::Display,
 {
-    let (mut tx, signing_data, _fee_unshield_epoch) =
-        args.build(namada).await?;
+    let (mut tx, signing_data) = args.build(namada).await?;
     signing::generate_test_vector(namada, &tx).await?;
 
     if args.tx.dump_tx {
@@ -1438,8 +1430,7 @@ pub async fn submit_unjail_validator<'a, N: Namada<'a>>(
 where
     <N::Client as namada::ledger::queries::Client>::Error: std::fmt::Display,
 {
-    let (mut tx, signing_data, _fee_unshield_epoch) =
-        args.build(namada).await?;
+    let (mut tx, signing_data) = args.build(namada).await?;
     signing::generate_test_vector(namada, &tx).await?;
 
     if args.tx.dump_tx {
@@ -1462,8 +1453,7 @@ pub async fn submit_deactivate_validator<'a, N: Namada<'a>>(
 where
     <N::Client as namada::ledger::queries::Client>::Error: std::fmt::Display,
 {
-    let (mut tx, signing_data, _fee_unshield_epoch) =
-        args.build(namada).await?;
+    let (mut tx, signing_data) = args.build(namada).await?;
     signing::generate_test_vector(namada, &tx).await?;
 
     if args.tx.dump_tx {
@@ -1486,8 +1476,7 @@ pub async fn submit_reactivate_validator<'a, N: Namada<'a>>(
 where
     <N::Client as namada::ledger::queries::Client>::Error: std::fmt::Display,
 {
-    let (mut tx, signing_data, _fee_unshield_epoch) =
-        args.build(namada).await?;
+    let (mut tx, signing_data) = args.build(namada).await?;
     signing::generate_test_vector(namada, &tx).await?;
 
     if args.tx.dump_tx {
@@ -1510,8 +1499,7 @@ pub async fn submit_update_steward_commission<'a, N: Namada<'a>>(
 where
     <N::Client as namada::ledger::queries::Client>::Error: std::fmt::Display,
 {
-    let (mut tx, signing_data, _fee_unshield_epoch) =
-        args.build(namada).await?;
+    let (mut tx, signing_data) = args.build(namada).await?;
 
     signing::generate_test_vector(namada, &tx).await?;
 
@@ -1535,7 +1523,7 @@ pub async fn submit_resign_steward<'a, N: Namada<'a>>(
 where
     <N::Client as namada::ledger::queries::Client>::Error: std::fmt::Display,
 {
-    let (mut tx, signing_data, _epoch) = args.build(namada).await?;
+    let (mut tx, signing_data) = args.build(namada).await?;
 
     signing::generate_test_vector(namada, &tx).await?;
 

apps/src/lib/node/ledger/shell/finalize_block.rs

@@ -1,25 +1,34 @@
 //! Implementation of the `FinalizeBlock` ABCI++ method for the Shell
 
 use data_encoding::HEXUPPER;
+use masp_primitives::merkle_tree::CommitmentTree;
+use masp_primitives::sapling::Node;
+use masp_proofs::bls12_381;
 use namada::core::ledger::inflation;
 use namada::core::ledger::masp_conversions::update_allowed_conversions;
 use namada::core::ledger::pgf::ADDRESS as pgf_address;
+use namada::core::types::storage::KeySeg;
 use namada::ledger::events::EventType;
 use namada::ledger::gas::{GasMetering, TxGasMeter};
 use namada::ledger::parameters::storage as params_storage;
 use namada::ledger::pos::{namada_proof_of_stake, staking_token_address};
 use namada::ledger::protocol;
 use namada::ledger::storage::wl_storage::WriteLogAndStorage;
+use namada::ledger::storage::write_log::StorageModification;
 use namada::ledger::storage::EPOCH_SWITCH_BLOCKS_DELAY;
 use namada::ledger::storage_api::token::credit_tokens;
-use namada::ledger::storage_api::{pgf, StorageRead, StorageWrite};
+use namada::ledger::storage_api::{pgf, ResultExt, StorageRead, StorageWrite};
 use namada::proof_of_stake::{
     find_validator_by_raw_hash, read_last_block_proposer_address,
     read_pos_params, read_total_stake, write_last_block_proposer_address,
 };
+use namada::types::address::MASP;
 use namada::types::dec::Dec;
 use namada::types::key::tm_raw_hash_to_string;
 use namada::types::storage::{BlockHash, BlockResults, Epoch, Header};
+use namada::types::token::{
+    MASP_NOTE_COMMITMENT_ANCHOR_PREFIX, MASP_NOTE_COMMITMENT_TREE_KEY,
+};
 use namada::types::transaction::protocol::{
     ethereum_tx_data_variants, ProtocolTxType,
 };
@@ -557,6 +566,25 @@ where
         tracing::info!("{}", stats);
         tracing::info!("{}", stats.format_tx_executed());
 
+        // Update the MASP commitment tree anchor if the tree was updated
+        let tree_key = Key::from(MASP.to_db_key())
+            .push(&MASP_NOTE_COMMITMENT_TREE_KEY.to_owned())
+            .expect("Cannot obtain a storage key");
+        if let Some(StorageModification::Write { value }) =
+            self.wl_storage.write_log.read(&tree_key).0
+        {
+            let updated_tree = CommitmentTree::<Node>::try_from_slice(value)
+                .into_storage_result()?;
+            let anchor_key = Key::from(MASP.to_db_key())
+                .push(&MASP_NOTE_COMMITMENT_ANCHOR_PREFIX.to_owned())
+                .expect("Cannot obtain a storage key")
+                .push(&namada::core::types::hash::Hash(
+                    bls12_381::Scalar::from(updated_tree.root()).to_bytes(),
+                ))
+                .expect("Cannot obtain a storage key");
+            self.wl_storage.write(&anchor_key, ())?;
+        }
+
         if update_for_tendermint {
             self.update_epoch(&mut response);
             // send the latest oracle configs. These may have changed due to

apps/src/lib/node/ledger/shell/init_chain.rs

@@ -2,17 +2,25 @@
 use std::collections::HashMap;
 use std::hash::Hash;
 
+use masp_primitives::merkle_tree::CommitmentTree;
+use masp_primitives::sapling::Node;
+use masp_proofs::bls12_381;
 use namada::ledger::parameters::Parameters;
 use namada::ledger::storage::traits::StorageHasher;
 use namada::ledger::storage::{DBIter, DB};
 use namada::ledger::storage_api::token::{credit_tokens, write_denom};
 use namada::ledger::storage_api::StorageWrite;
 use namada::ledger::{ibc, pos};
 use namada::proof_of_stake::BecomeValidator;
+use namada::types::address::MASP;
 use namada::types::hash::Hash as CodeHash;
 use namada::types::key::*;
 use namada::types::storage::KeySeg;
 use namada::types::time::{DateTimeUtc, TimeZone, Utc};
+use namada::types::token::{
+    MASP_CONVERT_ANCHOR_KEY, MASP_NOTE_COMMITMENT_ANCHOR_PREFIX,
+    MASP_NOTE_COMMITMENT_TREE_KEY,
+};
 use namada::vm::validate_untrusted_wasm;
 use namada_sdk::eth_bridge::EthBridgeStatus;
 use namada_sdk::proof_of_stake::types::ValidatorMetaData;
@@ -172,6 +180,41 @@ where
 
         ibc::init_genesis_storage(&mut self.wl_storage);
 
+        // Init masp commitment tree and anchor
+        let empty_commitment_tree: CommitmentTree<Node> =
+            CommitmentTree::empty();
+        let anchor = empty_commitment_tree.root();
+        let note_commitment_tree_key = Key::from(MASP.to_db_key())
+            .push(&MASP_NOTE_COMMITMENT_TREE_KEY.to_owned())
+            .expect("Cannot obtain a storage key");
+        self.wl_storage
+            .write(&note_commitment_tree_key, empty_commitment_tree)
+            .unwrap();
+        let commitment_tree_anchor_key = Key::from(MASP.to_db_key())
+            .push(&MASP_NOTE_COMMITMENT_ANCHOR_PREFIX.to_owned())
+            .expect("Cannot obtain a storage key")
+            .push(&namada::core::types::hash::Hash(
+                bls12_381::Scalar::from(anchor).to_bytes(),
+            ))
+            .expect("Cannot obtain a storage key");
+        self.wl_storage
+            .write(&commitment_tree_anchor_key, ())
+            .unwrap();
+
+        // Init masp convert anchor
+        let convert_anchor_key = Key::from(MASP.to_db_key())
+            .push(&MASP_CONVERT_ANCHOR_KEY.to_owned())
+            .expect("Cannot obtain a storage key");
+        self.wl_storage.write(
+            &convert_anchor_key,
+            namada::core::types::hash::Hash(
+                bls12_381::Scalar::from(
+                    self.wl_storage.storage.conversion_state.tree.root(),
+                )
+                .to_bytes(),
+            ),
+        )?;
+
         // Set the initial validator set
         response.validators = self
             .get_abci_validator_updates(true, |pk, power| {

benches/Cargo.toml

@@ -42,6 +42,7 @@ path = "host_env.rs"
 [dev-dependencies]
 namada = { path = "../shared", features = ["testing"] }
 namada_apps = { path = "../apps", features = ["benches"] }
+masp_primitives.workspace = true
 borsh.workspace = true
 borsh-ext.workspace = true
 criterion = { version = "0.5", features = ["html_reports"] }