feat!: extract anti-fee-sniping from create_psbt

Cargo.toml

@@ -17,7 +17,6 @@ unexpected_cfgs = { level = "warn", check-cfg = ['cfg(coverage_nightly)'] }
 miniscript = { version = "12.3.5", default-features = false }
 bdk_coin_select = "0.4.0"
 rand_core = { version = "0.6.4", default-features = false }
-rand = { version = "0.8", optional = true }
 
 [dev-dependencies]
 anyhow = "1"
@@ -26,10 +25,11 @@ bitcoin = { version = "0.32", default-features = false, features = ["rand-std"]
 bdk_testenv = "0.13.0"
 bdk_bitcoind_rpc = "0.20.0"
 bdk_chain = { version = "0.23.0" }
+rand = "0.8"
 
 [features]
 default = ["std"]
-std = ["miniscript/std", "rand/std"]
+std = ["miniscript/std"]
 
 [[example]]
 name = "synopsis"

examples/anti_fee_sniping.rs

@@ -1,10 +1,10 @@
 #![allow(dead_code)]
 use bdk_testenv::{bitcoincore_rpc::RpcApi, TestEnv};
 use bdk_tx::{
-    filter_unspendable, group_by_spk, selection_algorithm_lowest_fee_bnb, Output, PsbtParams,
-    SelectorParams,
+    filter_unspendable, group_by_spk, selection_algorithm_lowest_fee_bnb, Output, PsbtBuildParams,
+    SelectorParams, TxTemplateParams,
 };
-use bitcoin::{absolute::LockTime, key::Secp256k1, Amount, FeeRate, Sequence};
+use bitcoin::{absolute::LockTime, key::Secp256k1, Amount, FeeRate};
 use miniscript::Descriptor;
 
 mod common;
@@ -88,16 +88,11 @@ fn main() -> anyhow::Result<()> {
                 },
             )?;
 
-        let fallback_locktime: LockTime = LockTime::from_consensus(tip_height.to_consensus_u32());
-
-        let selection_inputs = selection.inputs.clone();
-
-        let psbt = selection.create_psbt(PsbtParams {
-            enable_anti_fee_sniping: true,
-            fallback_locktime,
-            fallback_sequence: Sequence::ENABLE_RBF_NO_LOCKTIME,
-            ..Default::default()
-        })?;
+        let selection_inputs = selection.inputs().to_vec();
+        let (psbt, _) = selection
+            .into_template(TxTemplateParams::default())
+            .apply_anti_fee_sniping(tip_height, &mut rand::thread_rng())?
+            .create_psbt(PsbtBuildParams::default())?;
 
         let tx = psbt.unsigned_tx;
 

examples/synopsis.rs

@@ -1,9 +1,9 @@
 use bdk_testenv::{bitcoincore_rpc::RpcApi, TestEnv};
 use bdk_tx::{
-    filter_unspendable, group_by_spk, selection_algorithm_lowest_fee_bnb, Output, PsbtParams,
-    SelectorParams, Signer,
+    filter_unspendable, group_by_spk, selection_algorithm_lowest_fee_bnb, Output, PsbtBuildParams,
+    SelectorParams, Signer, TxTemplateParams,
 };
-use bitcoin::{key::Secp256k1, Amount, FeeRate, Sequence};
+use bitcoin::{key::Secp256k1, Amount, FeeRate};
 use miniscript::Descriptor;
 
 mod common;
@@ -68,11 +68,9 @@ fn main() -> anyhow::Result<()> {
             },
         )?;
 
-    let mut psbt = selection.create_psbt(PsbtParams {
-        fallback_sequence: Sequence::ENABLE_RBF_NO_LOCKTIME,
-        ..Default::default()
-    })?;
-    let finalizer = selection.into_finalizer();
+    let (mut psbt, finalizer) = selection
+        .into_template(TxTemplateParams::default())
+        .create_psbt(PsbtBuildParams::default())?;
 
     let _ = psbt.sign(&signer, &secp);
     let res = finalizer.finalize(&mut psbt);
@@ -149,21 +147,18 @@ fn main() -> anyhow::Result<()> {
                 },
             )?;
 
-        let mut psbt = selection.create_psbt(PsbtParams {
-            // Not strictly necessary, but it may help us replace the tx faster.
-            fallback_sequence: Sequence::ENABLE_RBF_NO_LOCKTIME,
-            ..Default::default()
-        })?;
         println!(
             "selected inputs: {:?}",
             selection
-                .inputs
+                .inputs()
                 .iter()
                 .map(|input| input.prev_outpoint())
                 .collect::<Vec<_>>()
         );
 
-        let finalizer = selection.into_finalizer();
+        let (mut psbt, finalizer) = selection
+            .into_template(TxTemplateParams::default())
+            .create_psbt(PsbtBuildParams::default())?;
         psbt.sign(&signer, &secp).expect("failed to sign");
         assert!(
             finalizer.finalize(&mut psbt).is_finalized(),