feat: apply unconfirmed txs (MetaMask#63)

Author: darioAnongba

src/bitcoin/wallet.rs

@@ -13,7 +13,7 @@ use crate::{
     },
 };
 
-use super::TxBuilder;
+use super::{TxBuilder, UnconfirmedTx};
 
 // We wrap a `BdkWallet` in `Rc<RefCell<...>>` because `wasm_bindgen` do not
 // support Rust's lifetimes. This allows us to forward a reference to the
@@ -183,6 +183,12 @@ impl Wallet {
             .derivation_of_spk(spk.into())
             .map(|(keychain, index)| SpkIndexed(keychain.into(), index))
     }
+
+    pub fn apply_unconfirmed_txs(&self, unconfirmed_txs: Vec<UnconfirmedTx>) {
+        self.0
+            .borrow_mut()
+            .apply_unconfirmed_txs(unconfirmed_txs.into_iter().map(Into::into))
+    }
 }
 
 #[wasm_bindgen]

src/bitcoin/wallet_tx.rs

@@ -1,4 +1,4 @@
-use std::collections::BTreeSet;
+use std::{collections::BTreeSet, sync::Arc};
 
 use bdk_wallet::{
     bitcoin::{Transaction as BdkTransaction, Txid as BdkTxid},
@@ -63,3 +63,32 @@ impl From<BdkWalletTx<'_>> for WalletTx {
         }
     }
 }
+
+#[wasm_bindgen]
+pub struct UnconfirmedTx(Transaction, pub u64);
+
+#[wasm_bindgen]
+impl UnconfirmedTx {
+    /// `tx` – your wrapped `Transaction`
+    /// `last_seen` – unix epoch seconds (same convention as the rest of the API)
+    #[wasm_bindgen(constructor)]
+    pub fn new(tx: Transaction, last_seen: u64) -> UnconfirmedTx {
+        UnconfirmedTx(tx, last_seen)
+    }
+
+    #[wasm_bindgen(getter)]
+    pub fn tx(&self) -> Transaction {
+        self.0.clone()
+    }
+
+    #[wasm_bindgen(getter)]
+    pub fn last_seen(&self) -> u64 {
+        self.1
+    }
+}
+
+impl From<UnconfirmedTx> for (Arc<BdkTransaction>, u64) {
+    fn from(uctx: UnconfirmedTx) -> Self {
+        (Arc::new(uctx.0.into()), uctx.1)
+    }
+}

src/types/fee.rs

@@ -59,19 +59,16 @@ impl FeeRate {
     }
 
     /// Returns raw fee rate.
-    #[wasm_bindgen(getter)]
     pub fn to_sat_per_kwu(&self) -> u64 {
         self.0.to_sat_per_kwu()
     }
 
     /// Converts to sat/vB rounding up.
-    #[wasm_bindgen(getter)]
     pub fn to_sat_per_vb_ceil(&self) -> u64 {
         self.0.to_sat_per_vb_ceil()
     }
 
     /// Converts to sat/vB rounding down.
-    #[wasm_bindgen(getter)]
     pub fn to_sat_per_vb_floor(&self) -> u64 {
         self.0.to_sat_per_vb_floor()
     }

tests/node/integration/esplora.test.ts

@@ -5,6 +5,7 @@ import {
   FeeRate,
   Network,
   Recipient,
+  UnconfirmedTx,
   Wallet,
   SignOptions,
 } from "../../../pkg/bitcoindevkit";
@@ -23,6 +24,7 @@ describe("Esplora client", () => {
     "tb1qd28npep0s8frcm3y7dxqajkcy2m40eysplyr9v",
     network
   );
+  const unixTimestamp = BigInt(Math.floor(Date.now() / 1000));
 
   let feeRate: FeeRate;
   let wallet: Wallet;
@@ -83,14 +85,10 @@ describe("Esplora client", () => {
     const currentDerivationIndex = wallet.derivation_index("internal");
     expect(initialDerivationIndex).toBeLessThan(currentDerivationIndex);
 
-    // Synchronizes the wallet to get the new state
-    const request = wallet.start_sync_with_revealed_spks();
-    const update = await esploraClient.sync(request, parallelRequests);
-    wallet.apply_update(update);
-
-    // Verify the sent transaction is part of the wallet in an unconfirmed state
+    // Assert that the transaction is in the wallet
+    wallet.apply_unconfirmed_txs([new UnconfirmedTx(tx, unixTimestamp)]);
     const walletTx = wallet.get_tx(txid);
-    expect(walletTx.last_seen_unconfirmed).toBeDefined();
+    expect(walletTx.last_seen_unconfirmed).toEqual(unixTimestamp);
     expect(walletTx.chain_position.is_confirmed).toBe(false);
   }, 30000);