Merge pull request #684 from fluidvanadium/cleanup_height_from_transp…

…arent_note remove unused TransparentNote field
zingolabs · Nov 24, 2023 · a66dc43 · a66dc43
2 parents d0b0001 + 0732155
commit a66dc43
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/zingolib/src/wallet/data.rs b/zingolib/src/wallet/data.rs
@@ -551,7 +551,6 @@ pub struct TransparentNote {
     pub output_index: u64,
     pub script: Vec<u8>,
     pub value: u64,
-    pub height: i32,
 
     pub spent_at_height: Option<i32>,
     pub spent: Option<TxId>, // If this utxo was confirmed spent Todo: incoherent with unconfirmed_spent
@@ -585,7 +584,7 @@ impl TransparentNote {
 
         let output_index = reader.read_u64::<LittleEndian>()?;
         let value = reader.read_u64::<LittleEndian>()?;
-        let height = reader.read_i32::<LittleEndian>()?;
+        let _height = reader.read_i32::<LittleEndian>()?;
 
         let script = Vector::read(&mut reader, |r| {
             let mut byte = [0; 1];
@@ -623,7 +622,6 @@ impl TransparentNote {
             output_index,
             script,
             value,
-            height,
             spent_at_height,
             spent,
             unconfirmed_spent: None,
@@ -640,7 +638,7 @@ impl TransparentNote {
 
         writer.write_u64::<LittleEndian>(self.output_index)?;
         writer.write_u64::<LittleEndian>(self.value)?;
-        writer.write_i32::<LittleEndian>(self.height)?;
+        writer.write_i32::<LittleEndian>(0)?;
 
         Vector::write(&mut writer, &self.script, |w, b| w.write_all(&[*b]))?;
 

diff --git a/zingolib/src/wallet/transactions.rs b/zingolib/src/wallet/transactions.rs
@@ -697,13 +697,12 @@ impl TransactionMetadataSet {
         );
 
         // Add this UTXO if it doesn't already exist
-        if let Some(utxo) = transaction_metadata
+        if transaction_metadata
             .transparent_notes
             .iter_mut()
-            .find(|utxo| utxo.txid == txid && utxo.output_index == output_num as u64)
+            .any(|utxo| utxo.txid == txid && utxo.output_index == output_num as u64)
         {
             // If it already exists, it is likely an mempool tx, so update the height
-            utxo.height = height as i32
         } else {
             transaction_metadata
                 .transparent_notes
@@ -713,7 +712,6 @@ impl TransactionMetadataSet {
                     output_index: output_num as u64,
                     script: vout.script_pubkey.0.clone(),
                     value: u64::try_from(vout.value).expect("Valid value for u64."),
-                    height: height as i32,
                     spent_at_height: None,
                     spent: None,
                     unconfirmed_spent: None,