Filter out spent inputs from orderbook

Confirmed or broadcasted

Author: arminsabouri

cospend.toml.example

@@ -1,7 +1,7 @@
 [simulation]
 seed = 42
-max_timestep = 40
-num_payment_obligations = 10
+max_timestep = 15
+num_payment_obligations = 5
 
 # Takers: have payment obligations, build cospend proposals using the order book
 [[wallet_types]]
@@ -30,6 +30,7 @@ payment_obligation_weight = 1.0
 coordination_weight = 2.0
 
 # Aggregators: create aggregate proposals from pending interests
+# For now they are a distinct role that should not have payment obligations
 [[wallet_types]]
 name = "aggregator"
 count = 1

src/lib.rs

@@ -608,7 +608,10 @@ impl<'a> Simulation {
                 let info = &self.wallet_info[wallet.last_wallet_info_id.0];
                 info.registered_inputs
                     .iter()
-                    .filter(|outpoint| info.confirmed_utxos.contains(outpoint))
+                    .filter(|outpoint| {
+                        info.confirmed_utxos.contains(outpoint)
+                            && !info.unconfirmed_spends.contains(outpoint)
+                    })
                     .map(|outpoint| UtxoWithMetadata {
                         outpoint: *outpoint,
                         amount: outpoint.with(self).data().amount,

src/wallet.rs

@@ -467,7 +467,10 @@ impl<'a> WalletHandleMut<'a> {
                         BroadcastMessageType::ContributeInputs(op) => Some(op),
                         _ => None,
                     })
-                    .filter(|op| self.info().confirmed_utxos.contains(op))
+                    .filter(|op| {
+                        self.info().confirmed_utxos.contains(op)
+                            && !self.info().unconfirmed_spends.contains(op)
+                    })
                     .map(|op| Input { outpoint: *op })
                     .collect();
                 self.info_mut().active_multi_party_payjoins.insert(
@@ -495,6 +498,16 @@ impl<'a> WalletHandleMut<'a> {
                     .iter()
                     .flat_map(|i| i.utxos.iter())
                     .filter(|u| seen_outpoints.insert(u.outpoint))
+                    // Skip UTXOs that have been spent since the interest was recorded.
+                    // Interests are non-committal and may go stale between proposal and
+                    // aggregation (e.g. the owner spent the coin unilaterally in the same
+                    // tick before the aggregator ran).
+                    .filter(|u| {
+                        let info = &self.sim.wallet_info
+                            [self.sim.wallet_data[u.owner.0].last_wallet_info_id.0];
+                        info.confirmed_utxos.contains(&u.outpoint)
+                            && !info.unconfirmed_spends.contains(&u.outpoint)
+                    })
                     .collect();
                 // Pre-fill all unique inputs on the bulletin board
                 for u in &unique_utxos {