wallet: improve outpoint and UTXO accessors

BP-WG · Sep 20, 2024 · 65588b5 · 65588b5
1 parent 7e6e933
commit 65588b5
Showing 1 changed file with 37 additions and 20 deletions.
diff --git a/src/wallet.rs b/src/wallet.rs
@@ -341,24 +341,20 @@ impl<L2C: Layer2Cache> WalletCache<L2C> {
         })
     }
 
-    pub fn txos(&self) -> impl Iterator<Item = WalletUtxo> + '_ {
-        self.tx.iter().flat_map(|(txid, tx)| {
-            tx.outputs.iter().enumerate().filter_map(|(vout, out)| {
-                if let Party::Wallet(w) = out.beneficiary {
-                    Some(WalletUtxo {
-                        outpoint: Outpoint::new(*txid, vout as u32),
-                        value: out.value,
-                        terminal: w.terminal,
-                        status: tx.status,
-                    })
-                } else {
-                    None
-                }
-            })
-        })
+    pub fn has_outpoint(&self, outpoint: Outpoint) -> bool {
+        let Some(tx) = self.tx.get(&outpoint.txid) else {
+            return false;
+        };
+        let Some(out) = tx.outputs.get(outpoint.vout.to_usize()) else {
+            return false;
+        };
+        matches!(out.beneficiary, Party::Wallet(_))
     }
 
-    pub fn utxo_by(&self, outpoint: Outpoint) -> Result<WalletUtxo, NonWalletItem> {
+    #[inline]
+    pub fn is_unspent(&self, outpoint: Outpoint) -> bool { self.utxo.contains(&outpoint) }
+
+    pub fn outpoint_by(&self, outpoint: Outpoint) -> Result<WalletUtxo, NonWalletItem> {
         let tx = self.tx.get(&outpoint.txid).ok_or(NonWalletItem::NonWalletTx(outpoint.txid))?;
         let debit = tx
             .outputs
@@ -374,6 +370,23 @@ impl<L2C: Layer2Cache> WalletCache<L2C> {
         })
     }
 
+    pub fn txos(&self) -> impl Iterator<Item = WalletUtxo> + '_ {
+        self.tx.iter().flat_map(|(txid, tx)| {
+            tx.outputs.iter().enumerate().filter_map(|(vout, out)| {
+                if let Party::Wallet(w) = out.beneficiary {
+                    Some(WalletUtxo {
+                        outpoint: Outpoint::new(*txid, vout as u32),
+                        value: out.value,
+                        terminal: w.terminal,
+                        status: tx.status,
+                    })
+                } else {
+                    None
+                }
+            })
+        })
+    }
+
     pub fn utxos(&self) -> impl Iterator<Item = WalletUtxo> + '_ {
         self.utxo.iter().map(|outpoint| {
             let tx = self.tx.get(&outpoint.txid).expect("cache data inconsistency");
@@ -461,7 +474,7 @@ impl<K, D: Descriptor<K>, L2: Layer2> PsbtConstructor for Wallet<K, D, L2> {
     fn descriptor(&self) -> &D { &self.descr.generator }
 
     fn utxo(&self, outpoint: Outpoint) -> Option<Utxo> {
-        self.cache.utxo_by(outpoint).ok().map(WalletUtxo::into_utxo)
+        self.cache.outpoint_by(outpoint).ok().map(WalletUtxo::into_utxo)
     }
 
     fn network(&self) -> Network { self.descr.network }
@@ -582,10 +595,14 @@ impl<K, D: Descriptor<K>, L2: Layer2> Wallet<K, D, L2> {
         self.cache.history()
     }
 
-    pub fn txos(&self) -> impl Iterator<Item = WalletUtxo> + '_ { self.cache.txos() }
-    pub fn utxo_by(&self, outpoint: Outpoint) -> Result<WalletUtxo, NonWalletItem> {
-        self.cache.utxo_by(outpoint)
+    pub fn has_outpoint(&self, outpoint: Outpoint) -> bool { self.cache.has_outpoint(outpoint) }
+    pub fn is_unspent(&self, outpoint: Outpoint) -> bool { self.cache.is_unspent(outpoint) }
+
+    pub fn outpoint_by(&self, outpoint: Outpoint) -> Result<WalletUtxo, NonWalletItem> {
+        self.cache.outpoint_by(outpoint)
     }
+
+    pub fn txos(&self) -> impl Iterator<Item = WalletUtxo> + '_ { self.cache.txos() }
     pub fn utxos(&self) -> impl Iterator<Item = WalletUtxo> + '_ { self.cache.utxos() }
 
     pub fn coinselect<'a>(