Register all common inputs

Co-Authored-By: bc1cindy <bc1cindy@proton.me>

Author: arminsabouri

mppj/config.toml

@@ -0,0 +1,44 @@
+[simulation]
+seed = 42
+max_timestep = 15
+num_payment_obligations = 5
+
+# Takers: have payment obligations, build cospend proposals using the order book
+[[wallet_types]]
+name = "taker"
+count = 1
+strategies = ["TakerStrategy"]
+script_type = "p2wpkh"
+
+[wallet_types.scorer]
+fee_savings_weight = 1.0
+privacy_weight = 1.0
+payment_obligation_weight = 2.0
+coordination_weight = 1.0
+
+# Makers: register UTXOs in the order book and participate in cospends
+[[wallet_types]]
+name = "maker"
+count = 3
+strategies = ["MakerStrategy"]
+script_type = "p2wpkh"
+
+[wallet_types.scorer]
+fee_savings_weight = 0.5
+privacy_weight = 1.0
+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
+strategies = ["AggregatorStrategy"]
+script_type = "p2wpkh"
+
+[wallet_types.scorer]
+fee_savings_weight = 0.0
+privacy_weight = 0.0
+payment_obligation_weight = 0.0
+coordination_weight = 0.0

mppj/results.json

@@ -0,0 +1,94 @@
+{
+  "total_payment_obligations": 8,
+  "percentage_payment_obligations_missed": 0.75,
+  "total_block_weight_wu": 10100,
+  "average_fee_cost_sats": 220,
+  "dust_utxo_count": 0,
+  "utxo_size_distribution_sats": [
+    3519,
+    4483,
+    5409,
+    16713,
+    4999983177,
+    4999994481,
+    4999995407,
+    4999996371,
+    5000000000,
+    5000000000,
+    5000000000,
+    5000000000,
+    5000000000,
+    5000000000,
+    5000000000,
+    5000000000,
+    5000000000,
+    5000000000,
+    5000000000,
+    5000000000,
+    5000000000,
+    5000000000,
+    5000000000,
+    5000000000,
+    5000000000,
+    5000000000,
+    5000000000,
+    5000000000,
+    5000000000,
+    5000000000,
+    5000000000,
+    5000000000,
+    5000000000,
+    5000000000,
+    5000000000,
+    5000000000,
+    5000000000,
+    5000000000,
+    5000000000,
+    5000000000,
+    5000000000,
+    5000000000,
+    5000000000,
+    5000000000,
+    5000000000,
+    5000000000,
+    5000000220,
+    5000000220
+  ],
+  "wallet_utxo_stats": [
+    {
+      "wallet_id": 0,
+      "dust_count": 0,
+      "total_count": 21,
+      "p50_sats": 5000000000,
+      "p90_sats": 5000000000
+    },
+    {
+      "wallet_id": 1,
+      "dust_count": 0,
+      "total_count": 8,
+      "p50_sats": 5000000000,
+      "p90_sats": 5000000000
+    },
+    {
+      "wallet_id": 2,
+      "dust_count": 0,
+      "total_count": 8,
+      "p50_sats": 5000000000,
+      "p90_sats": 5000000000
+    },
+    {
+      "wallet_id": 3,
+      "dust_count": 0,
+      "total_count": 6,
+      "p50_sats": 5000000000,
+      "p90_sats": 5000000000
+    },
+    {
+      "wallet_id": 4,
+      "dust_count": 0,
+      "total_count": 5,
+      "p50_sats": 5000000000,
+      "p90_sats": 5000000000
+    }
+  ]
+}

src/actions.rs

@@ -55,7 +55,7 @@ pub(crate) enum Action {
     /// Aggregator creates an aggregate session from pending interests
     CreateAggregateProposal(Vec<CospendInterest>),
     /// Register a single UTXO in the order book (maker action)
-    RegisterInput(Outpoint),
+    RegisterInput(Vec<Outpoint>),
     /// Do nothing. There may be better oppurtunities to spend a payment obligation or participate in a payjoin.
     Wait,
 }
@@ -405,21 +405,20 @@ impl Strategy for MakerStrategy {
                     .collect()
             })
             .collect();
-        let common_input: Option<Outpoint> = per_action_spent
+        let common_inputs: Vec<Outpoint> = per_action_spent
             .iter()
             .skip(1)
             .fold(
                 per_action_spent.first().cloned().unwrap_or_default(),
                 |acc, s| acc.intersection(s).copied().collect(),
             )
-            .into_iter()
-            .next();
-        if let Some(outpoint) = common_input {
-            if !state.registered_inputs.contains(&outpoint) {
-                actions.push(Action::RegisterInput(outpoint));
-            }
+            .iter()
+            .filter(|o| !state.registered_inputs.contains(o))
+            .copied()
+            .collect();
+        if !common_inputs.is_empty() {
+            actions.push(Action::RegisterInput(common_inputs));
         }
-
         if actions.is_empty() {
             actions.push(Action::Wait);
         }

src/wallet.rs

@@ -576,8 +576,10 @@ impl<'a> WalletHandleMut<'a> {
             Action::ContinueParticipateInCospend(bulletin_board_id) => {
                 self.participate_in_multi_party_payjoin(bulletin_board_id);
             }
-            Action::RegisterInput(outpoint) => {
-                self.register_input(outpoint);
+            Action::RegisterInput(outpoints) => {
+                for outpoint in outpoints {
+                    self.register_input(&outpoint);
+                }
             }
         }
     }