Move psbt Params to src/psbt/params.rs

Author: ValuedMammal

wallet/examples/psbt.rs

@@ -8,7 +8,7 @@ use std::sync::Arc;
 use bdk_chain::BlockId;
 use bdk_chain::ConfirmationBlockTime;
 use bdk_chain::TxUpdate;
-use bdk_wallet::psbt_params::{Params, SelectionStrategy::*};
+use bdk_wallet::psbt::params::{Params, SelectionStrategy::*};
 use bdk_wallet::test_utils::*;
 use bdk_wallet::{KeychainKind::*, Update, Wallet};
 use bitcoin::FeeRate;

wallet/src/psbt/mod.rs

@@ -17,6 +17,9 @@ use bitcoin::FeeRate;
 use bitcoin::Psbt;
 use bitcoin::TxOut;
 
+#[allow(unused)]
+pub mod params;
+
 // TODO upstream the functions here to `rust-bitcoin`?
 
 /// Trait to add functions to extract utxos and calculate fees.

wallet/src/wallet/psbt_params.rs renamed to wallet/src/psbt/params.rs

@@ -11,13 +11,13 @@ use miniscript::plan::Assets;
 pub struct Params {
     // Inputs
     pub(crate) utxos: Vec<OutPoint>,
-    pub(crate) assets: Option<Assets>,
 
     // Outputs
     pub(crate) recipients: Vec<(ScriptBuf, Amount)>,
     pub(crate) change_descriptor: Option<DefiniteDescriptor>,
 
     // Coin Selection
+    pub(crate) assets: Option<Assets>,
     pub(crate) feerate: FeeRate,
     pub(crate) longterm_feerate: FeeRate,
     pub(crate) drain_wallet: bool,
@@ -96,6 +96,12 @@ impl Params {
         self.coin_selection = strategy;
         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);
+        self
+    }
 }
 
 /// Coin select strategy.

wallet/src/wallet/mod.rs

@@ -56,8 +56,6 @@ pub mod error;
 pub mod export;
 mod params;
 mod persisted;
-#[allow(unused)]
-pub mod psbt_params;
 pub mod signer;
 pub mod tx_builder;
 pub(crate) mod utils;
@@ -2640,9 +2638,8 @@ use bdk_tx::{
     Output, PsbtParams, Selector, SelectorParams, TxStatus,
 };
 use miniscript::plan::{Assets, Plan};
-use psbt_params::SelectionStrategy;
 
-use crate::wallet::psbt_params::AssetsExt;
+use crate::psbt::params::{self as psbt_params, AssetsExt, SelectionStrategy};
 
 /// Maps a chain position to tx confirmation status, if `pos` is the confirmed
 /// variant.