test: Add coverage for create_psbt and similar

Adds several tests to exercise create-psbt logic and user flow.

- test-utils: Add `insert_tx_anchor` test helper for adding
a transaction to the wallet with associated anchor block.

- deps: Bump `bitcoin` to 0.32.7 in order to make use of
`ScriptBuf::new_p2a`.

Author: ValuedMammal

Cargo.toml

@@ -20,7 +20,7 @@ rustdoc-args = ["--cfg", "docsrs"]
 bdk_chain = { version = "0.23.1", features = ["miniscript", "serde"], default-features = false }
 bdk_coin_select = { version = "0.4.1" }
 bdk_tx = { version = "0.1.0" }
-bitcoin = { version = "0.32.6", features = ["serde", "base64"], default-features = false }
+bitcoin = { version = "0.32.7", features = ["serde", "base64"], default-features = false }
 miniscript = { version = "12.3.1", features = ["serde"], default-features = false }
 rand_core = { version = "0.6.0" }
 serde_json = { version = "1" }

src/test_utils.rs

@@ -317,6 +317,31 @@ pub fn insert_checkpoint(wallet: &mut Wallet, block: BlockId) {
         .unwrap();
 }
 
+/// Inserts a transaction to be anchored by `block_id`. This is particularly useful for
+/// adding a coinbase tx to the wallet for testing, since transactions of this kind
+/// must always appear confirmed.
+///
+/// This will also insert the anchor `block_id`. See [`insert_anchor`] for more.
+pub fn insert_tx_anchor(wallet: &mut Wallet, tx: Transaction, block_id: BlockId) {
+    insert_checkpoint(wallet, block_id);
+    let anchor = ConfirmationBlockTime {
+        block_id,
+        confirmation_time: 1234567000,
+    };
+    let txid = tx.compute_txid();
+
+    let mut tx_update = TxUpdate::default();
+    tx_update.txs = vec![Arc::new(tx)];
+    tx_update.anchors = [(anchor, txid)].into();
+
+    wallet
+        .apply_update(Update {
+            tx_update,
+            ..Default::default()
+        })
+        .expect("failed to apply update");
+}
+
 /// Inserts a transaction into the local view, assuming it is currently present in the mempool.
 ///
 /// This can be used, for example, to track a transaction immediately after it is broadcast.

tests/add_foreign_utxo.rs

@@ -5,7 +5,7 @@ use bdk_wallet::signer::SignOptions;
 use bdk_wallet::test_utils::*;
 use bdk_wallet::tx_builder::AddForeignUtxoError;
 use bdk_wallet::KeychainKind;
-use bitcoin::{psbt, Address, Amount};
+use bitcoin::{hashes::Hash, psbt, Address, Amount, OutPoint, ScriptBuf, Sequence, TxOut};
 
 mod common;
 
@@ -290,3 +290,55 @@ fn test_taproot_foreign_utxo() {
         "foreign_utxo should be in there"
     );
 }
+
+#[test]
+fn test_add_planned_psbt_input() -> anyhow::Result<()> {
+    let (mut wallet, _) = get_funded_wallet_wpkh();
+    let op1 = wallet.list_unspent().next().unwrap().outpoint;
+
+    // We'll use `PsbtParams` to sweep a foreign anchor output.
+    let op2 = OutPoint::new(Hash::hash(b"txid"), 2);
+    let txout = TxOut {
+        value: Amount::ZERO,
+        script_pubkey: ScriptBuf::new_p2a(),
+    };
+    let psbt_input = psbt::Input {
+        witness_utxo: Some(txout),
+        ..Default::default()
+    };
+    let input = bdk_tx::Input::from_psbt_input(
+        op2,
+        Sequence::ENABLE_LOCKTIME_NO_RBF,
+        psbt_input,
+        /* satisfaction_weight: */ 0,
+        /* status: */ None,
+        /* is_coinbase: */ false,
+    )?;
+
+    let send_to = wallet.reveal_next_address(KeychainKind::External).address;
+
+    // Build tx: 2-in / 2-out
+    let mut params = bdk_wallet::PsbtParams::default();
+    params.add_utxos(&[op1]);
+    params.add_planned_input(input);
+    params.add_recipients([(send_to, Amount::from_sat(20_000))]);
+
+    let (psbt, _) = wallet.create_psbt(params)?;
+
+    assert!(
+        psbt.unsigned_tx
+            .input
+            .iter()
+            .any(|input| input.previous_output == op1),
+        "Psbt should contain the wallet spend"
+    );
+    assert!(
+        psbt.unsigned_tx
+            .input
+            .iter()
+            .any(|input| input.previous_output == op2),
+        "Psbt should contain the planned input"
+    );
+
+    Ok(())
+}