Reintroduce space output exclusion

Author: buffrr

node/src/wallets.rs

@@ -153,9 +153,10 @@ impl RpcWallet {
         skip_tx_check: bool,
         fee_rate: FeeRate,
     ) -> anyhow::Result<Vec<TxResponse>> {
+        let unspendables = wallet.list_spaces_outpoints(state)?;
         let tx_events = wallet.get_tx_events(txid)?;
         let builder =
-            wallet.build_fee_bump(txid, fee_rate)?;
+            wallet.build_fee_bump(unspendables, txid, fee_rate)?;
 
         let psbt = builder.finish()?;
         let replacement = wallet.sign(psbt, None)?;
@@ -859,6 +860,7 @@ impl RpcWallet {
             }
         }
 
+        let unspendables = wallet.list_spaces_outpoints(store)?;
         let median_time = source.get_median_time()?;
         let mut checker = TxChecker::new(store);
 
@@ -875,8 +877,7 @@ impl RpcWallet {
             }
         }
 
-
-        let mut tx_iter = builder.build_iter(tx.dust, median_time, wallet, bid_replacement)?;
+        let mut tx_iter = builder.build_iter(tx.dust, median_time, wallet, unspendables, bid_replacement)?;
         let mut result_set = Vec::new();
 
         while let Some(tx_result) = tx_iter.next() {

wallet/src/builder.rs

@@ -60,6 +60,7 @@ pub struct BuilderIterator<'a> {
     force: bool,
     median_time: u64,
     confirmed_only: bool,
+    unspendables: Vec<OutPoint>
 }
 
 pub enum BuilderStack {
@@ -324,6 +325,7 @@ impl Builder {
         reveals: Option<&Vec<SpaceScriptSigningInfo>>,
         space_transfers: Vec<SpaceTransfer>,
         coin_transfers: Vec<CoinTransfer>,
+        unspendables: Vec<OutPoint>,
         fee_rate: FeeRate,
         dust: Option<Amount>,
         confirmed_only: bool,
@@ -359,7 +361,7 @@ impl Builder {
         }
 
         let commit_psbt = {
-            let mut builder = w.build_tx(confirmed_only)?;
+            let mut builder = w.build_tx(unspendables, confirmed_only)?;
             builder.nlocktime(magic_lock_time(median_time));
 
             // handle transfers
@@ -478,9 +480,11 @@ impl Iterator for BuilderIterator<'_> {
                     Some(&reveals),
                     params.transfers.clone(),
                     params.sends.clone(),
+                    self.unspendables.clone(),
                     self.fee_rate,
                     self.dust,
                     self.confirmed_only,
+
                 ) {
                     Ok(prep) => prep,
                     Err(err) => return Some(Err(err)),
@@ -571,6 +575,7 @@ impl Iterator for BuilderIterator<'_> {
                     self.wallet,
                     params.clone(),
                     self.fee_rate,
+                    self.unspendables.clone(),
                     self.confirmed_only,
                     self.force,
                 );
@@ -586,6 +591,7 @@ impl Iterator for BuilderIterator<'_> {
                     self.wallet,
                     params,
                     self.fee_rate,
+                    self.unspendables.clone(),
                     self.confirmed_only,
                     self.force,
                 );
@@ -607,6 +613,7 @@ impl Iterator for BuilderIterator<'_> {
                     bid.space.clone(),
                     bid.amount,
                     self.fee_rate,
+                    self.unspendables.clone(),
                     self.confirmed_only,
                     self.force,
                 );
@@ -692,6 +699,7 @@ impl Builder {
         dust: Option<Amount>,
         median_time: u64,
         wallet: &mut SpacesWallet,
+        unspendables: Vec<OutPoint>,
         confirmed_only: bool,
     ) -> anyhow::Result<BuilderIterator> {
         let fee_rate = self
@@ -799,6 +807,7 @@ impl Builder {
             fee_rate,
             wallet,
             force: self.force,
+            unspendables,
             confirmed_only,
             median_time,
         })
@@ -809,12 +818,13 @@ impl Builder {
         prev: FullSpaceOut,
         bid: Amount,
         fee_rate: FeeRate,
+        unspendables: Vec<OutPoint>,
         confirmed_only: bool,
         force: bool,
     ) -> anyhow::Result<Transaction> {
         let (offer, placeholder) = w.new_bid_psbt(bid, confirmed_only)?;
         let bid_psbt = {
-            let mut builder = w.build_tx(confirmed_only)?;
+            let mut builder = w.build_tx(unspendables, confirmed_only)?;
             builder
                 .nlocktime(LockTime::Blocks(Height::ZERO))
                 .set_exact_sequence(BID_PSBT_INPUT_SEQUENCE)
@@ -838,13 +848,14 @@ impl Builder {
         w: &mut SpacesWallet,
         params: OpenRevealParams,
         fee_rate: FeeRate,
+        unspendables: Vec<OutPoint>,
         confirmed_only: bool,
         force: bool,
     ) -> anyhow::Result<Transaction> {
         let (offer, placeholder) = w.new_bid_psbt(params.initial_bid, confirmed_only)?;
         let mut extra_prevouts = BTreeMap::new();
         let open_psbt = {
-            let mut builder = w.build_tx(confirmed_only)?;
+            let mut builder = w.build_tx(unspendables, confirmed_only)?;
             builder.ordering(TxOrdering::Untouched).add_bid(
                 None,
                 offer,
@@ -871,6 +882,7 @@ impl Builder {
         w: &mut SpacesWallet,
         params: ExecuteParams,
         fee_rate: FeeRate,
+        unspendables: Vec<OutPoint>,
         confirmed_only: bool,
         _force: bool,
     ) -> anyhow::Result<(Transaction, usize)> {
@@ -881,7 +893,7 @@ impl Builder {
                 .internal
                 .next_unused_address(KeychainKind::Internal)
                 .script_pubkey();
-            let mut builder = w.build_tx(confirmed_only)?;
+            let mut builder = w.build_tx(unspendables, confirmed_only)?;
 
             builder
                 // Added first to keep an odd number of outputs before adding transfers
@@ -935,7 +947,7 @@ pub struct SelectionOutput {
 pub struct SpacesAwareCoinSelection {
     pub default_algorithm: DefaultCoinSelectionAlgorithm,
     // Exclude outputs
-    pub exclude_outputs: Vec<SelectionOutput>,
+    pub exclude_outputs: Vec<OutPoint>,
     // Whether to use confirmed only outputs
     // to fund the transaction
     pub confirmed_only: bool,
@@ -945,7 +957,7 @@ impl SpacesAwareCoinSelection {
     // Will skip any outputs with value less than the dust threshold
     // to avoid accidentally spending space outputs
     pub const DUST_THRESHOLD: Amount = Amount::from_sat(1200);
-    pub fn new(excluded: Vec<SelectionOutput>, confirmed_only: bool) -> Self {
+    pub fn new(excluded: Vec<OutPoint>, confirmed_only: bool) -> Self {
         Self {
             default_algorithm: DefaultCoinSelectionAlgorithm::default(),
             exclude_outputs: excluded,
@@ -986,7 +998,7 @@ impl CoinSelectionAlgorithm for SpacesAwareCoinSelection {
                 && !self
                 .exclude_outputs
                 .iter()
-                .any(|o| o.outpoint == weighted_utxo.utxo.outpoint())
+                .any(|o| o == &weighted_utxo.utxo.outpoint())
         });
 
         let mut result = self.default_algorithm.coin_select(

wallet/src/lib.rs

@@ -4,7 +4,6 @@ use std::{
     fs,
     path::PathBuf,
 };
-
 use anyhow::{anyhow, Context};
 use bdk_wallet::{chain, chain::BlockId, coin_selection::{CoinSelectionAlgorithm, CoinSelectionResult, Excess, InsufficientFunds}, rusqlite::Connection, tx_builder::TxOrdering, AddressInfo, KeychainKind, LocalOutput, PersistedWallet, SignOptions, TxBuilder, Update, Wallet, WalletTx, WeightedUtxo};
 use bdk_wallet::chain::{ChainPosition, Indexer};
@@ -209,11 +208,6 @@ impl SpacesWallet {
         self.internal.get_utxo(outpoint)
     }
 
-    pub fn build_tx(&mut self, confirmed_only: bool)
-                    -> anyhow::Result<TxBuilder<SpacesAwareCoinSelection>> {
-        self.create_builder(None, confirmed_only)
-    }
-
     pub fn next_unused_address(&mut self, keychain_kind: KeychainKind) -> AddressInfo {
         self.internal.next_unused_address(keychain_kind)
     }
@@ -245,7 +239,22 @@ impl SpacesWallet {
         self.internal.calculate_fee(tx)
     }
 
-    pub fn build_fee_bump(&mut self, txid: Txid, fee_rate: FeeRate) -> anyhow::Result<TxBuilder<'_, SpacesAwareCoinSelection>> {
+    pub fn build_tx(&mut self, unspendables: Vec<OutPoint>, confirmed_only: bool)
+                    -> anyhow::Result<TxBuilder<SpacesAwareCoinSelection>> {
+        self.create_builder(unspendables, None, confirmed_only)
+    }
+
+    pub fn list_spaces_outpoints(&self, src: &mut impl DataSource) -> anyhow::Result<Vec<OutPoint>> {
+        let mut outs = Vec::new();
+        for unspent in self.list_unspent() {
+            if src.get_spaceout(&unspent.outpoint)?.and_then(|out| out.space).is_some() {
+                outs.push(unspent.outpoint);
+            }
+        }
+        Ok(outs)
+    }
+
+    pub fn build_fee_bump(&mut self, unspendables: Vec<OutPoint>, txid: Txid, fee_rate: FeeRate) -> anyhow::Result<TxBuilder<'_, SpacesAwareCoinSelection>> {
         let events = self.get_tx_events(txid)?;
         for event in events {
             match event.kind {
@@ -261,16 +270,18 @@ impl SpacesWallet {
             }
         }
 
-        self.create_builder(Some((txid, fee_rate)), false)
+        self.create_builder(unspendables, Some((txid, fee_rate)), false)
     }
 
     fn create_builder(
         &mut self,
+        unspendables: Vec<OutPoint>,
         replace: Option<(Txid, FeeRate)>,
         confirmed_only: bool,
     ) -> anyhow::Result<TxBuilder<'_, SpacesAwareCoinSelection>> {
-        // TODO: fill excluded
-        let selection = SpacesAwareCoinSelection::new(vec![], confirmed_only);
+        let selection = SpacesAwareCoinSelection::new(
+            unspendables, confirmed_only
+        );
 
         let mut builder = match replace {
             None => {
@@ -437,7 +448,6 @@ impl SpacesWallet {
     ) -> anyhow::Result<()> {
         self.internal
             .apply_block_connected_to(&block, height, block_id)?;
-
         Ok(())
     }