Merge branch 'murisi/unconstrained-transfers' (#3459)

.changelog/unreleased/improvements/3446-generalize-vectorized-transfers.md

@@ -0,0 +1,2 @@
+- Combined the various Transfer formats into one general one.
+  ([\#3446](https://github.com/anoma/namada/pull/3446))

crates/apps_lib/src/cli.rs

@@ -3127,11 +3127,10 @@ pub mod args {
         TX_CHANGE_METADATA_WASM, TX_CLAIM_REWARDS_WASM,
         TX_DEACTIVATE_VALIDATOR_WASM, TX_IBC_WASM, TX_INIT_ACCOUNT_WASM,
         TX_INIT_PROPOSAL, TX_REACTIVATE_VALIDATOR_WASM, TX_REDELEGATE_WASM,
-        TX_RESIGN_STEWARD, TX_REVEAL_PK, TX_SHIELDED_TRANSFER_WASM,
-        TX_SHIELDING_TRANSFER_WASM, TX_TRANSPARENT_TRANSFER_WASM,
-        TX_UNBOND_WASM, TX_UNJAIL_VALIDATOR_WASM, TX_UNSHIELDING_TRANSFER_WASM,
-        TX_UPDATE_ACCOUNT_WASM, TX_UPDATE_STEWARD_COMMISSION, TX_VOTE_PROPOSAL,
-        TX_WITHDRAW_WASM, VP_USER_WASM,
+        TX_RESIGN_STEWARD, TX_REVEAL_PK, TX_TRANSFER_WASM, TX_UNBOND_WASM,
+        TX_UNJAIL_VALIDATOR_WASM, TX_UPDATE_ACCOUNT_WASM,
+        TX_UPDATE_STEWARD_COMMISSION, TX_VOTE_PROPOSAL, TX_WITHDRAW_WASM,
+        VP_USER_WASM,
     };
     use namada_sdk::DEFAULT_GAS_LIMIT;
 
@@ -4394,7 +4393,7 @@ pub mod args {
             let target = TARGET.parse(matches);
             let token = TOKEN.parse(matches);
             let amount = InputAmount::Unvalidated(AMOUNT.parse(matches));
-            let tx_code_path = PathBuf::from(TX_TRANSPARENT_TRANSFER_WASM);
+            let tx_code_path = PathBuf::from(TX_TRANSFER_WASM);
             let data = vec![TxTransparentTransferData {
                 source,
                 target,
@@ -4467,7 +4466,7 @@ pub mod args {
             let target = PAYMENT_ADDRESS_TARGET.parse(matches);
             let token = TOKEN.parse(matches);
             let amount = InputAmount::Unvalidated(AMOUNT.parse(matches));
-            let tx_code_path = PathBuf::from(TX_SHIELDED_TRANSFER_WASM);
+            let tx_code_path = PathBuf::from(TX_TRANSFER_WASM);
             let data = vec![TxShieldedTransferData {
                 source,
                 target,
@@ -4547,7 +4546,7 @@ pub mod args {
             let target = PAYMENT_ADDRESS_TARGET.parse(matches);
             let token = TOKEN.parse(matches);
             let amount = InputAmount::Unvalidated(AMOUNT.parse(matches));
-            let tx_code_path = PathBuf::from(TX_SHIELDING_TRANSFER_WASM);
+            let tx_code_path = PathBuf::from(TX_TRANSFER_WASM);
             let data = vec![TxShieldingTransferData {
                 source,
                 token,
@@ -4625,7 +4624,7 @@ pub mod args {
             let target = TARGET.parse(matches);
             let token = TOKEN.parse(matches);
             let amount = InputAmount::Unvalidated(AMOUNT.parse(matches));
-            let tx_code_path = PathBuf::from(TX_UNSHIELDING_TRANSFER_WASM);
+            let tx_code_path = PathBuf::from(TX_TRANSFER_WASM);
             let data = vec![TxUnshieldingTransferData {
                 target,
                 token,

crates/benches/host_env.rs

@@ -3,29 +3,30 @@ use namada::core::account::AccountPublicKeysMap;
 use namada::core::address;
 use namada::core::collections::{HashMap, HashSet};
 use namada::ledger::storage::DB;
-use namada::token::{Amount, TransparentTransfer, TransparentTransferData};
+use namada::token::{Amount, Transfer};
 use namada::tx::Authorization;
 use namada::vm::wasm::TxCache;
 use namada_apps_lib::wallet::defaults;
 use namada_apps_lib::wasm_loader;
 use namada_node::bench_utils::{
-    BenchShell, TX_INIT_PROPOSAL_WASM, TX_REVEAL_PK_WASM,
-    TX_TRANSPARENT_TRANSFER_WASM, TX_UPDATE_ACCOUNT_WASM, VP_USER_WASM,
-    WASM_DIR,
+    BenchShell, TX_INIT_PROPOSAL_WASM, TX_REVEAL_PK_WASM, TX_TRANSFER_WASM,
+    TX_UPDATE_ACCOUNT_WASM, VP_USER_WASM, WASM_DIR,
 };
 
 // Benchmarks the validation of a single signature on a single `Section` of a
 // transaction
 fn tx_section_signature_validation(c: &mut Criterion) {
     let shell = BenchShell::default();
-    let transfer_data = TransparentTransfer(vec![TransparentTransferData {
-        source: defaults::albert_address(),
-        target: defaults::bertha_address(),
-        token: address::testing::nam(),
-        amount: Amount::native_whole(500).native_denominated(),
-    }]);
+    let transfer_data = Transfer::default()
+        .transfer(
+            defaults::albert_address(),
+            defaults::bertha_address(),
+            address::testing::nam(),
+            Amount::native_whole(500).native_denominated(),
+        )
+        .unwrap();
     let tx = shell.generate_tx(
-        TX_TRANSPARENT_TRANSFER_WASM,
+        TX_TRANSFER_WASM,
         transfer_data,
         None,
         None,
@@ -62,7 +63,7 @@ fn compile_wasm(c: &mut Criterion) {
     let mut txs: HashMap<&str, Vec<u8>> = HashMap::default();
 
     for tx in [
-        TX_TRANSPARENT_TRANSFER_WASM,
+        TX_TRANSFER_WASM,
         TX_INIT_PROPOSAL_WASM,
         TX_REVEAL_PK_WASM,
         TX_UPDATE_ACCOUNT_WASM,
@@ -111,7 +112,7 @@ fn untrusted_wasm_validation(c: &mut Criterion) {
     let mut txs: HashMap<&str, Vec<u8>> = HashMap::default();
 
     for tx in [
-        TX_TRANSPARENT_TRANSFER_WASM,
+        TX_TRANSFER_WASM,
         TX_INIT_PROPOSAL_WASM,
         TX_REVEAL_PK_WASM,
         TX_UPDATE_ACCOUNT_WASM,

crates/benches/native_vps.rs

@@ -55,15 +55,14 @@ use namada::sdk::masp_primitives::merkle_tree::CommitmentTree;
 use namada::sdk::masp_primitives::transaction::Transaction;
 use namada::sdk::masp_proofs::sapling::SaplingVerificationContextInner;
 use namada::state::{Epoch, StorageRead, StorageWrite, TxIndex};
-use namada::token::{Amount, TransparentTransfer, TransparentTransferData};
+use namada::token::{Amount, Transfer};
 use namada::tx::{BatchedTx, Code, Section, Tx};
 use namada_apps_lib::wallet::defaults;
 use namada_node::bench_utils::{
     generate_foreign_key_tx, BenchShell, BenchShieldedCtx,
     ALBERT_PAYMENT_ADDRESS, ALBERT_SPENDING_KEY, BERTHA_PAYMENT_ADDRESS,
     TX_BRIDGE_POOL_WASM, TX_IBC_WASM, TX_INIT_PROPOSAL_WASM, TX_RESIGN_STEWARD,
-    TX_TRANSPARENT_TRANSFER_WASM, TX_UPDATE_STEWARD_COMMISSION,
-    TX_VOTE_PROPOSAL_WASM,
+    TX_TRANSFER_WASM, TX_UPDATE_STEWARD_COMMISSION, TX_VOTE_PROPOSAL_WASM,
 };
 use rand_core::OsRng;
 
@@ -475,13 +474,15 @@ fn vp_multitoken(c: &mut Criterion) {
         generate_foreign_key_tx(&defaults::albert_keypair());
 
     let transfer = shell.generate_tx(
-        TX_TRANSPARENT_TRANSFER_WASM,
-        TransparentTransfer(vec![TransparentTransferData {
-            source: defaults::albert_address(),
-            target: defaults::bertha_address(),
-            token: address::testing::nam(),
-            amount: Amount::native_whole(1000).native_denominated(),
-        }]),
+        TX_TRANSFER_WASM,
+        Transfer::default()
+            .transfer(
+                defaults::albert_address(),
+                defaults::bertha_address(),
+                address::testing::nam(),
+                Amount::native_whole(1000).native_denominated(),
+            )
+            .unwrap(),
         None,
         None,
         vec![&defaults::albert_keypair()],

crates/benches/process_wrapper.rs

@@ -4,13 +4,11 @@ use namada::core::key::RefTo;
 use namada::core::storage::BlockHeight;
 use namada::core::time::DateTimeUtc;
 use namada::state::TxIndex;
-use namada::token::{
-    Amount, DenominatedAmount, TransparentTransfer, TransparentTransferData,
-};
+use namada::token::{Amount, DenominatedAmount, Transfer};
 use namada::tx::data::{Fee, WrapperTx};
 use namada::tx::Authorization;
 use namada_apps_lib::wallet::defaults;
-use namada_node::bench_utils::{BenchShell, TX_TRANSPARENT_TRANSFER_WASM};
+use namada_node::bench_utils::{BenchShell, TX_TRANSFER_WASM};
 use namada_node::shell::process_proposal::ValidationMeta;
 
 fn process_tx(c: &mut Criterion) {
@@ -21,13 +19,15 @@ fn process_tx(c: &mut Criterion) {
         BlockHeight(2);
 
     let mut batched_tx = shell.generate_tx(
-        TX_TRANSPARENT_TRANSFER_WASM,
-        TransparentTransfer(vec![TransparentTransferData {
-            source: defaults::albert_address(),
-            target: defaults::bertha_address(),
-            token: address::testing::nam(),
-            amount: Amount::native_whole(1).native_denominated(),
-        }]),
+        TX_TRANSFER_WASM,
+        Transfer::default()
+            .transfer(
+                defaults::albert_address(),
+                defaults::bertha_address(),
+                address::testing::nam(),
+                Amount::native_whole(1).native_denominated(),
+            )
+            .unwrap(),
         None,
         None,
         vec![&defaults::albert_keypair()],

crates/encoding_spec/src/main.rs

@@ -81,14 +81,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     let signature_schema = schema_container_of::<Signature>();
     let init_account_schema = schema_container_of::<account::InitAccount>();
     let init_validator_schema = schema_container_of::<pos::BecomeValidator>();
-    let transparent_transfer_schema =
-        schema_container_of::<token::TransparentTransfer>();
-    let shielded_transfer_schema =
-        schema_container_of::<token::ShieldedTransfer>();
-    let shielding_transfer_schema =
-        schema_container_of::<token::ShieldingTransfer>();
-    let unshielding_transfer_schema =
-        schema_container_of::<token::UnshieldingTransfer>();
+    let transfer_schema = schema_container_of::<token::Transfer>();
     let update_account = schema_container_of::<account::UpdateAccount>();
     let pos_bond_schema = schema_container_of::<pos::Bond>();
     let pos_withdraw_schema = schema_container_of::<pos::Withdraw>();
@@ -115,10 +108,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     definitions.extend(btree(&signature_schema));
     definitions.extend(btree(&init_account_schema));
     definitions.extend(btree(&init_validator_schema));
-    definitions.extend(btree(&transparent_transfer_schema));
-    definitions.extend(btree(&shielded_transfer_schema));
-    definitions.extend(btree(&shielding_transfer_schema));
-    definitions.extend(btree(&unshielding_transfer_schema));
+    definitions.extend(btree(&transfer_schema));
     definitions.extend(btree(&update_account));
     definitions.extend(btree(&pos_bond_schema));
     definitions.extend(btree(&pos_withdraw_schema));
@@ -191,11 +181,10 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     ).with_rust_doc_link("https://dev.namada.net/master/rustdoc/namada/types/transaction/struct.InitValidator.html");
     tables.push(init_validator_table);
 
-    let token_transfer_definition = definitions
-        .remove(transparent_transfer_schema.declaration())
-        .unwrap();
+    let token_transfer_definition =
+        definitions.remove(transfer_schema.declaration()).unwrap();
     let token_transfer_table = definition_to_table(
-        transparent_transfer_schema.declaration(),
+        transfer_schema.declaration(),
         token_transfer_definition,
     ).with_rust_doc_link("https://dev.namada.net/master/rustdoc/namada/types/token/struct.Transfer.html");
     tables.push(token_transfer_table);

crates/ibc/src/actions.rs

@@ -212,7 +212,6 @@ where
     let data = MsgTransfer {
         message,
         transfer: None,
-        fee_unshield: None,
     }
     .serialize_to_vec();
 

crates/ibc/src/lib.rs

@@ -78,7 +78,7 @@ use ibc::primitives::proto::Any;
 pub use ibc::*;
 pub use msg::*;
 use namada_core::address::{self, Address};
-use namada_token::{ShieldingTransfer, UnshieldingTransferData};
+use namada_token::Transfer;
 pub use nft::*;
 use prost::Message;
 use thiserror::Error;
@@ -154,10 +154,7 @@ where
     pub fn execute(
         &mut self,
         tx_data: &[u8],
-    ) -> Result<
-        (Option<ShieldingTransfer>, Option<UnshieldingTransferData>),
-        Error,
-    > {
+    ) -> Result<Option<Transfer>, Error> {
         let message = decode_message(tx_data)?;
         match &message {
             IbcMessage::Transfer(msg) => {
@@ -172,7 +169,7 @@ where
                     msg.message.clone(),
                 )
                 .map_err(Error::TokenTransfer)?;
-                Ok((msg.transfer.clone(), msg.fee_unshield.clone()))
+                Ok(msg.transfer.clone())
             }
             IbcMessage::NftTransfer(msg) => {
                 let mut nft_transfer_ctx =
@@ -183,7 +180,7 @@ where
                     msg.message.clone(),
                 )
                 .map_err(Error::NftTransfer)?;
-                Ok((msg.transfer.clone(), msg.fee_unshield.clone()))
+                Ok(msg.transfer.clone())
             }
             IbcMessage::RecvPacket(msg) => {
                 let envelope =
@@ -196,7 +193,7 @@ where
                 } else {
                     None
                 };
-                Ok((transfer, None))
+                Ok(transfer)
             }
             IbcMessage::AckPacket(msg) => {
                 let envelope =
@@ -210,20 +207,20 @@ where
                     } else {
                         None
                     };
-                Ok((transfer, None))
+                Ok(transfer)
             }
             IbcMessage::Timeout(msg) => {
                 let envelope = MsgEnvelope::Packet(PacketMsg::Timeout(
                     msg.message.clone(),
                 ));
                 execute(&mut self.ctx, &mut self.router, envelope)
                     .map_err(|e| Error::Context(Box::new(e)))?;
-                Ok((msg.transfer.clone(), None))
+                Ok(msg.transfer.clone())
             }
             IbcMessage::Envelope(envelope) => {
                 execute(&mut self.ctx, &mut self.router, *envelope.clone())
                     .map_err(|e| Error::Context(Box::new(e)))?;
-                Ok((None, None))
+                Ok(None)
             }
         }
     }
@@ -338,15 +335,13 @@ pub fn decode_message(tx_data: &[u8]) -> Result<IbcMessage, Error> {
             let msg = MsgTransfer {
                 message,
                 transfer: None,
-                fee_unshield: None,
             };
             return Ok(IbcMessage::Transfer(msg));
         }
         if let Ok(message) = IbcMsgNftTransfer::try_from(any_msg) {
             let msg = MsgNftTransfer {
                 message,
                 transfer: None,
-                fee_unshield: None,
             };
             return Ok(IbcMessage::NftTransfer(msg));
         }