Remove wrapper fee unshielding

.changelog/unreleased/features/1356-tx-batch.md

@@ -0,0 +1,2 @@
+- Introduced transaction batches.
+  ([\#1356](https://github.com/anoma/namada/pull/1356))

.changelog/unreleased/improvements/3217-masp-fees.md

@@ -0,0 +1,2 @@
+- Removed fee unshielding from wrapper transactions.
+  ([\#3217](https://github.com/anoma/namada/pull/3217))

crates/apps/src/lib/bench_utils.rs

@@ -25,7 +25,7 @@ use namada::core::masp::{
 use namada::core::storage::{BlockHeight, Epoch, Key, KeySeg, TxIndex};
 use namada::core::time::DateTimeUtc;
 use namada::core::token::{Amount, DenominatedAmount, Transfer};
-use namada::events::extend::{ComposeEvent, ValidMaspTx};
+use namada::events::extend::{ComposeEvent, MaspTxBatchRefs, MaspTxBlockIndex};
 use namada::events::Event;
 use namada::governance::storage::proposal::ProposalType;
 use namada::governance::InitProposalData;
@@ -74,9 +74,13 @@ use namada::ledger::queries::{
 };
 use namada::state::StorageRead;
 use namada::tx::data::pos::Bond;
-use namada::tx::data::{Fee, TxResult, VpsResult};
-use namada::tx::event::{new_tx_event, InnerTx};
-use namada::tx::{Authorization, Code, Data, Section, Tx};
+use namada::tx::data::{
+    BatchResults, BatchedTxResult, Fee, TxResult, VpsResult,
+};
+use namada::tx::event::{new_tx_event, Batch};
+use namada::tx::{
+    Authorization, BatchedTx, BatchedTxRef, Code, Data, Section, Tx,
+};
 use namada::vm::wasm::run;
 use namada::{proof_of_stake, tendermint};
 use namada_sdk::masp::{
@@ -240,7 +244,7 @@ impl Default for BenchShell {
             vec![&defaults::albert_keypair()],
         );
 
-        bench_shell.execute_tx(&signed_tx);
+        bench_shell.execute_tx(&signed_tx.to_ref());
         bench_shell.state.commit_tx();
 
         // Initialize governance proposal
@@ -265,7 +269,7 @@ impl Default for BenchShell {
             vec![&defaults::albert_keypair()],
         );
 
-        bench_shell.execute_tx(&signed_tx);
+        bench_shell.execute_tx(&signed_tx.to_ref());
         bench_shell.state.commit_tx();
         bench_shell.commit_block();
 
@@ -291,7 +295,7 @@ impl BenchShell {
         shielded: Option<Transaction>,
         extra_sections: Option<Vec<Section>>,
         signers: Vec<&SecretKey>,
-    ) -> Tx {
+    ) -> BatchedTx {
         let mut tx = Tx::from_type(namada::tx::data::TxType::Raw);
 
         // NOTE: here we use the code hash to avoid including the cost for the
@@ -327,10 +331,15 @@ impl BenchShell {
             )));
         }
 
-        tx
+        let cmt = tx.first_commitments().unwrap().clone();
+        tx.batch_tx(cmt)
     }
 
-    pub fn generate_ibc_tx(&self, wasm_code_path: &str, data: Vec<u8>) -> Tx {
+    pub fn generate_ibc_tx(
+        &self,
+        wasm_code_path: &str,
+        data: Vec<u8>,
+    ) -> BatchedTx {
         // This function avoid serializaing the tx data with Borsh
         let mut tx = Tx::from_type(namada::tx::data::TxType::Raw);
         let code_hash = self
@@ -343,10 +352,11 @@ impl BenchShell {
 
         tx.set_data(Data::new(data));
         // NOTE: the Ibc VP doesn't actually check the signature
-        tx
+        let cmt = tx.first_commitments().unwrap().clone();
+        tx.batch_tx(cmt)
     }
 
-    pub fn generate_ibc_transfer_tx(&self) -> Tx {
+    pub fn generate_ibc_transfer_tx(&self) -> BatchedTx {
         let token = PrefixedCoin {
             denom: address::testing::nam().to_string().parse().unwrap(),
             amount: Amount::native_whole(1000)
@@ -390,14 +400,18 @@ impl BenchShell {
     }
 
     /// Execute the tx and return a set of verifiers inserted by the tx.
-    pub fn execute_tx(&mut self, tx: &Tx) -> BTreeSet<Address> {
+    pub fn execute_tx(
+        &mut self,
+        batched_tx: &BatchedTxRef,
+    ) -> BTreeSet<Address> {
         let gas_meter =
             RefCell::new(TxGasMeter::new_from_sub_limit(u64::MAX.into()));
         run::tx(
             &mut self.inner.state,
             &gas_meter,
             &TxIndex(0),
-            tx,
+            batched_tx.tx,
+            batched_tx.cmt,
             &mut self.inner.vp_wasm_cache,
             &mut self.inner.tx_wasm_cache,
         )
@@ -595,15 +609,14 @@ impl BenchShell {
             },
             defaults::albert_keypair().ref_to(),
             0.into(),
-            None,
         );
         self.last_block_masp_txs
             .push((masp_tx, self.state.write_log().get_keys()));
         self.state.commit_tx();
     }
 }
 
-pub fn generate_foreign_key_tx(signer: &SecretKey) -> Tx {
+pub fn generate_foreign_key_tx(signer: &SecretKey) -> BatchedTx {
     let wasm_code =
         std::fs::read("../../wasm_for_tests/tx_write.wasm").unwrap();
 
@@ -622,7 +635,8 @@ pub fn generate_foreign_key_tx(signer: &SecretKey) -> Tx {
         None,
     )));
 
-    tx
+    let cmt = tx.first_commitments().unwrap().clone();
+    tx.batch_tx(cmt)
 }
 
 pub struct BenchShieldedCtx {
@@ -885,17 +899,33 @@ impl Client for BenchShell {
                     .iter()
                     .enumerate()
                     .map(|(idx, (tx, changed_keys))| {
-                        let tx_result = TxResult {
+                        let tx_result = TxResult::<String> {
                             gas_used: 0.into(),
-                            wrapper_changed_keys: Default::default(),
-                            changed_keys: changed_keys.to_owned(),
-                            vps_result: VpsResult::default(),
-                            initialized_accounts: vec![],
-                            events: BTreeSet::default(),
+                            batch_results: BatchResults(
+                                [(
+                                    tx.first_commitments().unwrap().get_hash(),
+                                    Ok(BatchedTxResult {
+                                        changed_keys: changed_keys.to_owned(),
+                                        vps_result: VpsResult::default(),
+                                        initialized_accounts: vec![],
+                                        events: BTreeSet::default(),
+                                    }),
+                                )]
+                                .into_iter()
+                                .collect(),
+                            ),
                         };
                         let event: Event = new_tx_event(tx, height.value())
-                            .with(InnerTx(&tx_result))
-                            .with(ValidMaspTx(TxIndex::must_from_usize(idx)))
+                            .with(Batch(&tx_result))
+                            .with(MaspTxBlockIndex(TxIndex::must_from_usize(
+                                idx,
+                            )))
+                            .with(MaspTxBatchRefs(
+                                vec![
+                                    tx.first_commitments().unwrap().get_hash(),
+                                ]
+                                .into(),
+                            ))
                             .into();
                         namada::tendermint::abci::Event::from(event)
                     })
@@ -1005,7 +1035,7 @@ impl BenchShieldedCtx {
         amount: Amount,
         source: TransferSource,
         target: TransferTarget,
-    ) -> (Self, Tx) {
+    ) -> (Self, BatchedTx) {
         let denominated_amount = DenominatedAmount::native(amount);
         let async_runtime = tokio::runtime::Runtime::new().unwrap();
         let spending_key = self
@@ -1101,7 +1131,7 @@ impl BenchShieldedCtx {
         amount: Amount,
         source: TransferSource,
         target: TransferTarget,
-    ) -> (Self, Tx) {
+    ) -> (Self, BatchedTx) {
         let (ctx, tx) = self.generate_masp_tx(
             amount,
             source.clone(),
@@ -1141,8 +1171,10 @@ impl BenchShieldedCtx {
         };
 
         let transfer =
-            Transfer::deserialize(&mut tx.data().unwrap().as_slice()).unwrap();
+            Transfer::deserialize(&mut tx.tx.data(&tx.cmt).unwrap().as_slice())
+                .unwrap();
         let masp_tx = tx
+            .tx
             .get_section(&transfer.shielded.unwrap())
             .unwrap()
             .masp_tx()
@@ -1155,7 +1187,7 @@ impl BenchShieldedCtx {
         let mut ibc_tx = ctx
             .shell
             .generate_ibc_tx(TX_IBC_WASM, msg.serialize_to_vec());
-        ibc_tx.add_masp_tx_section(masp_tx);
+        ibc_tx.tx.add_masp_tx_section(masp_tx);
 
         (ctx, ibc_tx)
     }

crates/apps/src/lib/cli.rs

@@ -3089,8 +3089,6 @@ pub mod args {
     pub const EXPIRATION_OPT: ArgOpt<DateTimeUtc> = arg_opt("expiration");
     pub const EMAIL: Arg<String> = arg("email");
     pub const EMAIL_OPT: ArgOpt<String> = EMAIL.opt();
-    pub const FEE_UNSHIELD_SPENDING_KEY: ArgOpt<WalletTransferSource> =
-        arg_opt("gas-spending-key");
     pub const FEE_AMOUNT_OPT: ArgOpt<token::DenominatedAmount> =
         arg_opt("gas-price");
     pub const FEE_PAYER_OPT: ArgOpt<WalletPublicKey> = arg_opt("gas-payer");
@@ -6409,9 +6407,6 @@ pub mod args {
                 wallet_alias_force: self.wallet_alias_force,
                 fee_amount: self.fee_amount,
                 fee_token: ctx.get(&self.fee_token).into(),
-                fee_unshield: self
-                    .fee_unshield
-                    .map(|ref fee_unshield| ctx.get_cached(fee_unshield)),
                 gas_limit: self.gas_limit,
                 signing_keys: self
                     .signing_keys
@@ -6487,10 +6482,6 @@ pub mod args {
                  this transaction",
             ))
             .arg(FEE_TOKEN.def().help("The token for paying the gas"))
-            .arg(FEE_UNSHIELD_SPENDING_KEY.def().help(
-                "The spending key to be used for fee unshielding. If none is \
-                 provided, fee will be paid from the unshielded balance only.",
-            ))
             .arg(GAS_LIMIT.def().help(
                 "The multiplier of the gas limit resolution defining the \
                  maximum amount of gas needed to run transaction.",
@@ -6520,16 +6511,11 @@ pub mod args {
                     )
                     .conflicts_with_all([EXPIRATION_OPT.name]),
             )
-            .arg(
-                DISPOSABLE_SIGNING_KEY
-                    .def()
-                    .help(
-                        "Generates an ephemeral, disposable keypair to sign \
-                         the wrapper transaction. This keypair will be \
-                         immediately discarded after use.",
-                    )
-                    .requires(FEE_UNSHIELD_SPENDING_KEY.name),
-            )
+            .arg(DISPOSABLE_SIGNING_KEY.def().help(
+                "Generates an ephemeral, disposable keypair to sign the \
+                 wrapper transaction. This keypair will be immediately \
+                 discarded after use.",
+            ))
             .arg(
                 SIGNING_KEYS
                     .def()
@@ -6587,7 +6573,6 @@ pub mod args {
             let fee_amount =
                 FEE_AMOUNT_OPT.parse(matches).map(InputAmount::Unvalidated);
             let fee_token = FEE_TOKEN.parse(matches);
-            let fee_unshield = FEE_UNSHIELD_SPENDING_KEY.parse(matches);
             let _wallet_alias_force = WALLET_ALIAS_FORCE.parse(matches);
             let gas_limit = GAS_LIMIT.parse(matches);
             let wallet_alias_force = WALLET_ALIAS_FORCE.parse(matches);
@@ -6622,7 +6607,6 @@ pub mod args {
                 wallet_alias_force,
                 fee_amount,
                 fee_token,
-                fee_unshield,
                 gas_limit,
                 expiration,
                 disposable_signing_key,

crates/apps/src/lib/client/rpc.rs

@@ -44,7 +44,7 @@ use namada_sdk::rpc::{
     self, enriched_bonds_and_unbonds, query_epoch, TxResponse,
 };
 use namada_sdk::tendermint_rpc::endpoint::status;
-use namada_sdk::tx::display_inner_resp;
+use namada_sdk::tx::display_batch_resp;
 use namada_sdk::wallet::AddressVpType;
 use namada_sdk::{display, display_line, edisplay_line, error, Namada};
 
@@ -664,18 +664,6 @@ pub async fn query_protocol_parameters(
         fee_unshielding_gas_limit
     );
 
-    let key = param_storage::get_fee_unshielding_descriptions_limit_key();
-    let fee_unshielding_descriptions_limit: u64 =
-        query_storage_value(context.client(), &key)
-            .await
-            .expect("Parameter should be defined.");
-    display_line!(
-        context.io(),
-        "{:4}Fee unshielding descriptions limit: {:?}",
-        "",
-        fee_unshielding_descriptions_limit
-    );
-
     let key = param_storage::get_gas_cost_key();
     let gas_cost_table: BTreeMap<Address, token::Amount> =
         query_storage_value(context.client(), &key)
@@ -1898,7 +1886,7 @@ pub async fn query_result(context: &impl Namada, args: args::QueryResult) {
                     cli::safe_exit(1)
                 }
             };
-            display_inner_resp(context, &resp);
+            display_batch_resp(context, &resp);
         }
         Err(err) => {
             // Print the errors that caused the lookups to fail