psbt: Add PsbtParams::canonicalization_params

Author: ValuedMammal

src/psbt/params.rs

@@ -175,6 +175,19 @@ impl PsbtParams {
         self
     }
 
+    /// Set the parameters for modifying the wallet's view of canonical transactions.
+    ///
+    /// The `params` can be used to resolve conflicts manually, or to assert that a particular
+    /// transaction should be treated as canonical for the purpose of building the current PSBT.
+    /// Refer to [`CanonicalizationParams`] for more.
+    pub fn canonicalization_params(
+        &mut self,
+        params: bdk_chain::CanonicalizationParams,
+    ) -> &mut Self {
+        self.canonical_params = params;
+        self
+    }
+
     /// Set the definite descriptor used for generating the change output.
     pub fn change_descriptor(&mut self, desc: DefiniteDescriptor) -> &mut Self {
         self.change_descriptor = Some(desc);

src/wallet/mod.rs

@@ -2770,12 +2770,8 @@ impl Wallet {
         });
 
         // Get wallet txouts.
-        let mut canon_params = params.canonical_params.clone();
-        canon_params
-            .assume_canonical
-            .extend(params.utxos.iter().map(|op| op.txid));
         let txouts = self
-            .list_indexed_txouts(canon_params)
+            .list_indexed_txouts(params.canonical_params.clone())
             .map(|(_, txo)| (txo.outpoint, txo))
             .collect();
 

tests/psbt.rs

@@ -147,7 +147,7 @@ fn test_create_psbt_cltv() {
 #[test]
 fn test_create_psbt_csv() {
     use bitcoin::relative;
-    use bitcoin::Sequence; 
+    use bitcoin::Sequence;
 
     let desc = get_test_single_sig_csv();
     let mut wallet = Wallet::create_single(desc)
@@ -204,7 +204,9 @@ fn test_create_psbt_csv() {
         };
         insert_checkpoint(&mut wallet, anchor.block_id);
         let mut params = PsbtParams::default();
-        params.add_recipients([(addr.script_pubkey(), Amount::from_btc(0.42).unwrap())]);
+        params
+            .add_utxos(&[op])
+            .add_recipients([(addr.script_pubkey(), Amount::from_btc(0.42).unwrap())]);
         let (psbt, _) = wallet.create_psbt(params).unwrap();
         assert_eq!(psbt.unsigned_tx.input[0].sequence, Sequence(6));
     }

tests/wallet.rs

@@ -77,8 +77,11 @@ fn test_spend_non_canonical_txout() -> anyhow::Result<()> {
 
     // Create tx2, spending the change of tx1
     let mut params = psbt::PsbtParams::default();
+    let canonical_params = bdk_chain::CanonicalizationParams {
+        assume_canonical: vec![to_select_op.txid],
+    };
     params
-        .add_utxos(&[to_select_op])
+        .canonicalization_params(canonical_params)
         .add_recipients([(recip, Amount::from_btc(0.01)?)]);
 
     let psbt = wallet.create_psbt(params)?.0;