Add addl tx data to RBF. Fix test.

diba-io · Dec 21, 2023 · 1e3c00c · 1e3c00c
1 parent 4ed58a9
commit 1e3c00c
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 6 deletions.
diff --git a/src/bitcoin.rs b/src/bitcoin.rs
@@ -630,7 +630,7 @@ pub async fn bump_fee(
     descriptor: &SecretString,
     change_descriptor: &SecretString,
     broadcast: bool,
-) -> Result<TransactionDetails, BitcoinError> {
+) -> Result<TransactionData, BitcoinError> {
     let txid = Txid::from_str(&txid)?;
 
     let wallet = get_wallet(descriptor, Some(change_descriptor)).await?;
@@ -643,6 +643,12 @@ pub async fn bump_fee(
         builder.finish()?
     };
 
+    let vsize = details
+        .transaction
+        .as_ref()
+        .expect("transaction exists")
+        .vsize();
+
     if broadcast {
         let _finalized = wallet
             .lock()
@@ -654,17 +660,28 @@ pub async fn bump_fee(
 
         let sent = tx.output.iter().fold(0, |sum, output| output.value + sum);
 
+        let txid = tx.txid();
+        let vsize = tx.vsize();
+
         let details = TransactionDetails {
-            txid: tx.txid(),
+            txid,
             transaction: Some(tx),
             received: 0,
             sent,
             fee: details.fee,
             confirmation_time: None,
         };
 
-        Ok(details)
+        Ok(TransactionData {
+            details,
+            vsize,
+            fee_rate,
+        })
     } else {
-        Ok(details)
+        Ok(TransactionData {
+            details,
+            vsize,
+            fee_rate,
+        })
     }
 }
diff --git a/tests/web_wallet.rs b/tests/web_wallet.rs
@@ -1,7 +1,7 @@
 #![cfg(target_arch = "wasm32")]
 use bitmask_core::{
     debug, info,
-    structs::{DecryptedWalletData, SecretString, TransactionDetails, WalletData},
+    structs::{DecryptedWalletData, SecretString, TransactionData, WalletData},
     web::{
         bitcoin::{
             decrypt_wallet, encrypt_wallet, get_wallet_data, hash_password, new_wallet, send_sats,
@@ -186,7 +186,7 @@ async fn import_test_wallet() {
     .await;
 
     info!("Parse tx_details");
-    let tx_data: TransactionDetails = json_parse(&tx_details);
+    let tx_data: TransactionData = json_parse(&tx_details);
 
     assert!(
         tx_data.confirmation_time.is_none(),