Update metadata with uas only after creating it

Author: AloeareV

lib/src/blaze/fetch_full_transaction.rs

@@ -70,6 +70,7 @@ impl TransactionContext {
         block_time: u32,
         price: Option<f64>,
     ) {
+        let mut arbitrary_memos_with_txids = Vec::new();
         // Remember if this is an outgoing Tx. Useful for when we want to grab the outgoing metadata.
         let mut is_outgoing_transaction = false;
 
@@ -95,6 +96,7 @@ impl TransactionContext {
             block_time,
             &mut is_outgoing_transaction,
             &mut outgoing_metadatas,
+            &mut arbitrary_memos_with_txids,
         )
         .await;
         self.scan_orchard_bundle(
@@ -104,6 +106,7 @@ impl TransactionContext {
             block_time,
             &mut is_outgoing_transaction,
             &mut outgoing_metadatas,
+            &mut arbitrary_memos_with_txids,
         )
         .await;
 
@@ -152,6 +155,9 @@ impl TransactionContext {
                 .add_outgoing_metadata(&transaction.txid(), outgoing_metadatas);
         }
 
+        self.update_outgoing_metadatas_with_uas(arbitrary_memos_with_txids)
+            .await;
+
         // Update price if available
         if price.is_some() {
             self.transaction_metadata_set
@@ -163,6 +169,52 @@ impl TransactionContext {
         //info!("Finished Fetching full transaction {}", tx.txid());
     }
 
+    async fn update_outgoing_metadatas_with_uas(
+        &self,
+        arbitrary_memos_with_txids: Vec<([u8; 511], TxId)>,
+    ) {
+        for (wallet_internal_data, txid) in arbitrary_memos_with_txids {
+            let mut uas_bytes = vec![0; 511];
+            wallet_internal_data
+                .as_slice()
+                .read(&mut uas_bytes)
+                .unwrap();
+            let uas_string = String::from_utf8(uas_bytes);
+            if let Ok(uas_string) = uas_string {
+                for ua_string in uas_string.split('!') {
+                    if let Some(RecipientAddress::Unified(ua)) =
+                        RecipientAddress::decode(&self.config.chain, ua_string)
+                    {
+                        if let Some(transaction) = self
+                            .transaction_metadata_set
+                            .write()
+                            .await
+                            .current
+                            .get_mut(&txid)
+                        {
+                            let outgoing_potential_recievers = [
+                                ua.orchard()
+                                    .map(|oaddr| oaddr.b32encode_for_network(&self.config.chain)),
+                                ua.sapling()
+                                    .map(|zaddr| zaddr.b32encode_for_network(&self.config.chain)),
+                                address_from_pubkeyhash(&self.config, ua.transparent().cloned()),
+                            ];
+                            if let Some(metadata) =
+                                transaction.outgoing_metadata.iter_mut().find(|metadata| {
+                                    outgoing_potential_recievers
+                                        .contains(&Some(metadata.address.clone()))
+                                })
+                            {
+                                metadata.ua = Some(ua_string.to_string());
+                            } else {
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
     async fn scan_transparent_bundle(
         &self,
         transaction: &Transaction,
@@ -275,6 +327,7 @@ impl TransactionContext {
         block_time: u32,
         is_outgoing_transaction: &mut bool,
         outgoing_metadatas: &mut Vec<OutgoingTxMetadata>,
+        arbitrary_memos_with_txids: &mut Vec<([u8; 511], TxId)>,
     ) {
         self.scan_bundle::<SaplingDomain<ChainType>>(
             transaction,
@@ -283,6 +336,7 @@ impl TransactionContext {
             block_time,
             is_outgoing_transaction,
             outgoing_metadatas,
+            arbitrary_memos_with_txids,
         )
         .await
     }
@@ -294,6 +348,7 @@ impl TransactionContext {
         block_time: u32,
         is_outgoing_transaction: &mut bool,
         outgoing_metadatas: &mut Vec<OutgoingTxMetadata>,
+        arbitrary_memos_with_txids: &mut Vec<([u8; 511], TxId)>,
     ) {
         self.scan_bundle::<OrchardDomain>(
             transaction,
@@ -302,6 +357,7 @@ impl TransactionContext {
             block_time,
             is_outgoing_transaction,
             outgoing_metadatas,
+            arbitrary_memos_with_txids,
         )
         .await;
     }
@@ -319,6 +375,7 @@ impl TransactionContext {
         block_time: u32,
         is_outgoing_transaction: &mut bool, // Isn't this also NA for unconfirmed?
         outgoing_metadatas: &mut Vec<OutgoingTxMetadata>,
+        arbitrary_memos_with_txids: &mut Vec<([u8; 511], TxId)>,
     ) where
         D: zingo_traits::DomainWalletExt<ChainType>,
         D::Note: Clone + PartialEq,
@@ -407,48 +464,8 @@ impl TransactionContext {
                 .try_into()
                 .unwrap_or(Memo::Future(memo_bytes));
             if let Memo::Arbitrary(ref wallet_internal_data) = memo {
-                let mut uas_bytes = vec![0; 511];
-                wallet_internal_data
-                    .as_slice()
-                    .read(&mut uas_bytes)
-                    .unwrap();
-                let uas_string = String::from_utf8(uas_bytes);
-                if let Ok(uas_string) = uas_string {
-                    for ua_string in uas_string.split('!') {
-                        if let Some(RecipientAddress::Unified(ua)) =
-                            RecipientAddress::decode(&self.config.chain, ua_string)
-                        {
-                            if let Some(transaction) = self
-                                .transaction_metadata_set
-                                .write()
-                                .await
-                                .current
-                                .get_mut(&transaction.txid())
-                            {
-                                let outgoing_potential_recievers = [
-                                    ua.orchard().map(|oaddr| {
-                                        oaddr.b32encode_for_network(&self.config.chain)
-                                    }),
-                                    ua.sapling().map(|zaddr| {
-                                        zaddr.b32encode_for_network(&self.config.chain)
-                                    }),
-                                    address_from_pubkeyhash(
-                                        &self.config,
-                                        ua.transparent().cloned(),
-                                    ),
-                                ];
-                                if let Some(metadata) =
-                                    transaction.outgoing_metadata.iter_mut().find(|metadata| {
-                                        outgoing_potential_recievers
-                                            .contains(&Some(metadata.address.clone()))
-                                    })
-                                {
-                                    metadata.ua = Some(ua_string.to_string());
-                                }
-                            }
-                        }
-                    }
-                }
+                arbitrary_memos_with_txids
+                    .push((*wallet_internal_data.as_ref(), transaction.txid()));
             }
             self.transaction_metadata_set
                 .write()