Merge pull request #50 from 'fix/fix-bdk-tx-version'

Author: nymius

Cargo.lock

@@ -653,30 +653,32 @@ async fn main() -> anyhow::Result<()> {
 
             let (tip_height, tip_time) = wallet.tip_info();
             let longterm_feerate = FeeRate::from_sat_per_vb_unchecked(1);
+            let change_placeholder_spk = wallet.get_change_address().get_placeholder_p2tr_spk();
+            let change_min_value = change_placeholder_spk.minimal_non_dust().to_sat();
             let selection = wallet
                 .all_candidates()
                 .regroup(group_by_spk())
                 .filter(filter_unspendable_now(tip_height, tip_time))
                 .into_selection(
                     selection_algorithm_lowest_fee_bnb(longterm_feerate, 100_000),
                     SelectorParams::new(
-                        FeeRate::from_sat_per_vb_unchecked(fee_rate),
+                        bdk_tx::FeeStrategy::FeeRate(FeeRate::from_sat_per_vb_unchecked(fee_rate)),
                         outputs,
                         bdk_tx::ScriptSource::from_script(
                             wallet.get_change_address().get_placeholder_p2tr_spk(),
                         ),
-                        bdk_tx::ChangePolicyType::NoDustAndLeastWaste { longterm_feerate },
-                        DrainWeights {
-                            output_weight: TxOut {
-                                script_pubkey: wallet
-                                    .get_change_address()
-                                    .get_placeholder_p2tr_spk(),
-                                value: Amount::ZERO,
-                            }
-                            .weight()
-                            .to_wu(),
-                            spend_weight: SpWallet::DEFAULT_SPENDING_WEIGHT,
-                            n_outputs: 1,
+                        bdk_coin_select::ChangePolicy {
+                            min_value: change_min_value,
+                            drain_weights: DrainWeights {
+                                output_weight: TxOut {
+                                    script_pubkey: change_placeholder_spk,
+                                    value: Amount::ZERO,
+                                }
+                                .weight()
+                                .to_wu(),
+                                spend_weight: SpWallet::DEFAULT_SPENDING_WEIGHT,
+                                n_outputs: 1,
+                            },
                         },
                     ),
                 )?;

cli/v2/src/main.rs

@@ -6,7 +6,7 @@ authors.workspace = true
 
 [dependencies]
 bdk_sp = { version = "0.1.0", path = "../silentpayments" }
-bdk_tx = { version = "0.1.0", git = "https://github.com/bitcoindevkit/bdk-tx", branch = "master" }
+bdk_tx = { version = "0.1.0", git = "https://github.com/bitcoindevkit/bdk-tx", rev = "8d201770ffc81f89d4d3ae92c362f9f936ad5958" }
 indexer = { version = "0.1.0", path = "../indexer" , features = ["serde"]}
 serde = { version = "1.0.219", optional = true }