Merge branch 'grarco/masp-misc-fixes' (#2282)

anoma · Dec 20, 2023 · 82f6fb6 · 82f6fb6
2 parents 2ee0ae1 + 4f5a419
commit 82f6fb6
Show file tree

Hide file tree

Showing 11 changed files with 218 additions and 212 deletions.
diff --git a/.changelog/unreleased/SDK/2282-masp-misc-fixes.md b/.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))
diff --git a/.changelog/unreleased/improvements/2282-masp-misc-fixes.md b/.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))
diff --git a/apps/src/lib/client/tx.rs b/apps/src/lib/client/tx.rs
@@ -219,7 +219,7 @@ pub async fn submit_reveal_aux(
                 "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?;
 
             sign(context, &mut tx, &args, signing_data).await?;
@@ -236,7 +236,7 @@ pub async fn submit_bridge_pool_tx<N: Namada>(
     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?;
 
     if args.tx.dump_tx {
         tx::dump_tx(namada.io(), &args.tx, tx);
@@ -260,7 +260,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?;
 
     if args.tx.dump_tx {
         tx::dump_tx(namada.io(), &args.tx, tx);
@@ -280,7 +280,7 @@ pub async fn submit_update_account<N: Namada>(
 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?;
 
     if args.tx.dump_tx {
         tx::dump_tx(namada.io(), &args.tx, tx);
@@ -300,8 +300,7 @@ pub async fn submit_init_account<N: Namada>(
 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?;
 
     if args.tx.dump_tx {
         tx::dump_tx(namada.io(), &args.tx, tx);
@@ -962,7 +961,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?;
 
     if args.tx.dump_tx {
         tx::dump_tx(namada.io(), &args.tx, tx);
@@ -985,8 +984,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(
@@ -1114,8 +1112,7 @@ pub async fn submit_vote_proposal<N: Namada>(
 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,
@@ -1293,8 +1290,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?;
 
     if args.tx.dump_tx {
         tx::dump_tx(namada.io(), &args.tx, tx);
@@ -1314,7 +1310,7 @@ pub async fn submit_unbond<N: Namada>(
 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?;
 
     if args.tx.dump_tx {
@@ -1340,8 +1336,7 @@ pub async fn submit_withdraw<N: Namada>(
 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?;
 
     if args.tx.dump_tx {
         tx::dump_tx(namada.io(), &args.tx, tx);
@@ -1361,8 +1356,7 @@ pub async fn submit_claim_rewards<N: Namada>(
 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?;
 
     if args.tx.dump_tx {
         tx::dump_tx(namada.io(), &args.tx, tx);
@@ -1402,8 +1396,7 @@ pub async fn submit_validator_commission_change<N: Namada>(
 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?;
 
     if args.tx.dump_tx {
         tx::dump_tx(namada.io(), &args.tx, tx);
@@ -1423,8 +1416,7 @@ pub async fn submit_validator_metadata_change<N: Namada>(
 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?;
 
     if args.tx.dump_tx {
         tx::dump_tx(namada.io(), &args.tx, tx);
@@ -1444,8 +1436,7 @@ pub async fn submit_unjail_validator<N: Namada>(
 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?;
 
     if args.tx.dump_tx {
         tx::dump_tx(namada.io(), &args.tx, tx);
@@ -1465,8 +1456,7 @@ pub async fn submit_deactivate_validator<N: Namada>(
 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?;
 
     if args.tx.dump_tx {
         tx::dump_tx(namada.io(), &args.tx, tx);
@@ -1486,8 +1476,7 @@ pub async fn submit_reactivate_validator<N: Namada>(
 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?;
 
     if args.tx.dump_tx {
         tx::dump_tx(namada.io(), &args.tx, tx);
@@ -1507,8 +1496,7 @@ pub async fn submit_update_steward_commission<N: Namada>(
 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?;
 
     if args.tx.dump_tx {
         tx::dump_tx(namada.io(), &args.tx, tx);
@@ -1528,7 +1516,7 @@ pub async fn submit_resign_steward<N: Namada>(
 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?;
 
     if args.tx.dump_tx {
         tx::dump_tx(namada.io(), &args.tx, tx);

diff --git a/sdk/src/args.rs b/sdk/src/args.rs
@@ -178,7 +178,7 @@ impl TxCustom {
     pub async fn build(
         &self,
         context: &impl Namada,
-    ) -> crate::error::Result<(crate::proto::Tx, SigningTxData, Option<Epoch>)>
+    ) -> crate::error::Result<(crate::proto::Tx, SigningTxData)>
     {
         tx::build_custom(context, self).await
     }
@@ -398,7 +398,7 @@ impl TxIbcTransfer {
     pub async fn build(
         &self,
         context: &impl Namada,
-    ) -> crate::error::Result<(crate::proto::Tx, SigningTxData, Option<Epoch>)>
+    ) -> crate::error::Result<(crate::proto::Tx, SigningTxData)>
     {
         tx::build_ibc_transfer(context, self).await
     }
@@ -487,7 +487,7 @@ impl InitProposal {
     pub async fn build(
         &self,
         context: &impl Namada,
-    ) -> crate::error::Result<(crate::proto::Tx, SigningTxData, Option<Epoch>)>
+    ) -> crate::error::Result<(crate::proto::Tx, SigningTxData)>
     {
         let current_epoch = rpc::query_epoch(context.client()).await?;
         let governance_parameters =
@@ -644,7 +644,7 @@ impl VoteProposal {
     pub async fn build(
         &self,
         context: &impl Namada,
-    ) -> crate::error::Result<(crate::proto::Tx, SigningTxData, Option<Epoch>)>
+    ) -> crate::error::Result<(crate::proto::Tx, SigningTxData)>
     {
         let current_epoch = rpc::query_epoch(context.client()).await?;
         tx::build_vote_proposal(context, self, current_epoch).await
@@ -717,7 +717,7 @@ impl TxInitAccount {
     pub async fn build(
         &self,
         context: &impl Namada,
-    ) -> crate::error::Result<(crate::proto::Tx, SigningTxData, Option<Epoch>)>
+    ) -> crate::error::Result<(crate::proto::Tx, SigningTxData)>
     {
         tx::build_init_account(context, self).await
     }
@@ -872,7 +872,7 @@ impl TxUpdateAccount {
     pub async fn build(
         &self,
         context: &impl Namada,
-    ) -> crate::error::Result<(crate::proto::Tx, SigningTxData, Option<Epoch>)>
+    ) -> crate::error::Result<(crate::proto::Tx, SigningTxData)>
     {
         tx::build_update_account(context, self).await
     }
@@ -950,7 +950,7 @@ impl Bond {
     pub async fn build(
         &self,
         context: &impl Namada,
-    ) -> crate::error::Result<(crate::proto::Tx, SigningTxData, Option<Epoch>)>
+    ) -> crate::error::Result<(crate::proto::Tx, SigningTxData)>
     {
         tx::build_bond(context, self).await
     }
@@ -980,7 +980,6 @@ impl Unbond {
     ) -> crate::error::Result<(
         crate::proto::Tx,
         SigningTxData,
-        Option<Epoch>,
         Option<(Epoch, token::Amount)>,
     )> {
         tx::build_unbond(context, self).await
@@ -1131,7 +1130,7 @@ impl RevealPk {
     pub async fn build(
         &self,
         context: &impl Namada,
-    ) -> crate::error::Result<(crate::proto::Tx, SigningTxData, Option<Epoch>)>
+    ) -> crate::error::Result<(crate::proto::Tx, SigningTxData)>
     {
         tx::build_reveal_pk(context, &self.tx, &self.public_key).await
     }
@@ -1215,7 +1214,7 @@ impl Withdraw {
     pub async fn build(
         &self,
         context: &impl Namada,
-    ) -> crate::error::Result<(crate::proto::Tx, SigningTxData, Option<Epoch>)>
+    ) -> crate::error::Result<(crate::proto::Tx, SigningTxData)>
     {
         tx::build_withdraw(context, self).await
     }
@@ -1252,7 +1251,7 @@ impl ClaimRewards {
     pub async fn build(
         &self,
         context: &impl Namada,
-    ) -> crate::error::Result<(crate::proto::Tx, SigningTxData, Option<Epoch>)>
+    ) -> crate::error::Result<(crate::proto::Tx, SigningTxData)>
     {
         tx::build_claim_rewards(context, self).await
     }
@@ -1385,7 +1384,7 @@ impl CommissionRateChange {
     pub async fn build(
         &self,
         context: &impl Namada,
-    ) -> crate::error::Result<(crate::proto::Tx, SigningTxData, Option<Epoch>)>
+    ) -> crate::error::Result<(crate::proto::Tx, SigningTxData)>
     {
         tx::build_validator_commission_change(context, self).await
     }
@@ -1505,7 +1504,7 @@ impl MetaDataChange {
     pub async fn build(
         &self,
         context: &impl Namada,
-    ) -> crate::error::Result<(crate::proto::Tx, SigningTxData, Option<Epoch>)>
+    ) -> crate::error::Result<(crate::proto::Tx, SigningTxData)>
     {
         tx::build_validator_metadata_change(context, self).await
     }
@@ -1561,7 +1560,7 @@ impl UpdateStewardCommission {
     pub async fn build(
         &self,
         context: &impl Namada,
-    ) -> crate::error::Result<(crate::proto::Tx, SigningTxData, Option<Epoch>)>
+    ) -> crate::error::Result<(crate::proto::Tx, SigningTxData)>
     {
         tx::build_update_steward_commission(context, self).await
     }
@@ -1610,7 +1609,7 @@ impl ResignSteward {
     pub async fn build(
         &self,
         context: &impl Namada,
-    ) -> crate::error::Result<(crate::proto::Tx, SigningTxData, Option<Epoch>)>
+    ) -> crate::error::Result<(crate::proto::Tx, SigningTxData)>
     {
         tx::build_resign_steward(context, self).await
     }
@@ -1659,7 +1658,7 @@ impl TxUnjailValidator {
     pub async fn build(
         &self,
         context: &impl Namada,
-    ) -> crate::error::Result<(crate::proto::Tx, SigningTxData, Option<Epoch>)>
+    ) -> crate::error::Result<(crate::proto::Tx, SigningTxData)>
     {
         tx::build_unjail_validator(context, self).await
     }
@@ -1708,7 +1707,7 @@ impl TxDeactivateValidator {
     pub async fn build(
         &self,
         context: &impl Namada,
-    ) -> crate::error::Result<(crate::proto::Tx, SigningTxData, Option<Epoch>)>
+    ) -> crate::error::Result<(crate::proto::Tx, SigningTxData)>
     {
         tx::build_deactivate_validator(context, self).await
     }
@@ -1757,7 +1756,7 @@ impl TxReactivateValidator {
     pub async fn build(
         &self,
         context: &impl Namada,
-    ) -> crate::error::Result<(crate::proto::Tx, SigningTxData, Option<Epoch>)>
+    ) -> crate::error::Result<(crate::proto::Tx, SigningTxData)>
     {
         tx::build_reactivate_validator(context, self).await
     }
@@ -2294,7 +2293,7 @@ impl EthereumBridgePool {
     pub async fn build(
         self,
         context: &impl Namada,
-    ) -> crate::error::Result<(crate::proto::Tx, SigningTxData, Option<Epoch>)>
+    ) -> crate::error::Result<(crate::proto::Tx, SigningTxData)>
     {
         bridge_pool::build_bridge_pool_tx(context, self).await
     }

diff --git a/sdk/src/eth_bridge/bridge_pool.rs b/sdk/src/eth_bridge/bridge_pool.rs
@@ -18,7 +18,6 @@ use namada_core::types::eth_bridge_pool::{
 };
 use namada_core::types::ethereum_events::EthAddress;
 use namada_core::types::keccak::KeccakHash;
-use namada_core::types::storage::Epoch;
 use namada_core::types::token::{balance_key, Amount};
 use namada_core::types::voting_power::FractionalVotingPower;
 use owo_colors::OwoColorize;
@@ -61,7 +60,7 @@ pub async fn build_bridge_pool_tx(
         fee_token,
         code_path,
     }: args::EthereumBridgePool,
-) -> Result<(Tx, SigningTxData, Option<Epoch>), Error> {
+) -> Result<(Tx, SigningTxData), Error> {
     let sender_ = sender.clone();
     let (transfer, tx_code_hash, signing_data) = futures::try_join!(
         validate_bridge_pool_tx(
@@ -99,7 +98,7 @@ pub async fn build_bridge_pool_tx(
     )
     .add_data(transfer);
 
-    let epoch = prepare_tx(
+    prepare_tx(
         context,
         &tx_args,
         &mut tx,
@@ -108,7 +107,7 @@ pub async fn build_bridge_pool_tx(
     )
     .await?;
 
-    Ok((tx, signing_data, epoch))
+    Ok((tx, signing_data))
 }
 
 /// Perform client validation checks on a Bridge pool transfer.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		- Removed useless epoch for fee unshielding.
		([\#2282](https://github.com/anoma/namada/pull/2282))