Merge #349: Backport #337 - fix(wallet): Don't fail in build_fee_bump for missing parent txid

238c82a ci: Pin `quote` to 1.0.41 (valued mammal)
2f643dd fix(wallet): Don't fail in `build_fee_bump` for missing parent txid (valued mammal)
43529b3 test: Add `test_bump_fee_pay_to_anchor_foreign_utxo` (valued mammal)

Pull request description:

  ### Description

  Backport #337 to the `release/2.x` branch in preparation for `wallet-2.3.0`.

  ### Checklists

  #### All Submissions:

  * [x] I've signed all my commits
  * [x] I followed the [contribution guidelines](https://github.com/bitcoindevkit/bdk/blob/master/CONTRIBUTING.md)
  * [x] I ran `just p` before pushing

  #### Bugfixes:

  * ~~[ ] This pull request breaks the existing API~~
  * [x] I've added tests to reproduce the issue which are now passing

ACKs for top commit:
  notmandatory:
    ACK 238c82a

Tree-SHA512: 30797c689f9260f4c1f94a57de0f9cc954e209e52516fced3999c399e89a227d31f60d3b7e798b2f62287103703b7c4c8bb99b8fc9826190d54a50d17794e0b4

Author: notmandatory

ci/pin-msrv.sh

@@ -12,3 +12,4 @@ set -euo pipefail
 
 cargo update -p once_cell --precise "1.20.3"
 cargo update -p syn --precise "2.0.106"
+cargo update -p quote --precise "1.0.41"

wallet/Cargo.toml

@@ -18,7 +18,7 @@ workspace = true
 [dependencies]
 rand_core = { version = "0.6.0" }
 miniscript = { version = "12.3.1", features = [ "serde" ], default-features = false }
-bitcoin = { version = "0.32.6", features = [ "serde", "base64" ], default-features = false }
+bitcoin = { version = "0.32.7", features = [ "serde", "base64" ], default-features = false }
 serde = { version = "^1.0", features = ["derive"] }
 serde_json = { version = "^1.0" }
 bdk_chain = { version = "0.23.1", features = [ "miniscript", "serde" ], default-features = false }

wallet/src/wallet/mod.rs

@@ -1714,15 +1714,15 @@ impl Wallet {
         &mut self,
         txid: Txid,
     ) -> Result<TxBuilder<'_, DefaultCoinSelectionAlgorithm>, BuildFeeBumpError> {
-        let graph = self.indexed_graph.graph();
+        let tx_graph = self.indexed_graph.graph();
         let txout_index = &self.indexed_graph.index;
         let chain_tip = self.chain.tip().block_id();
-        let chain_positions = graph
+        let chain_positions: HashMap<Txid, ChainPosition<_>> = tx_graph
             .list_canonical_txs(&self.chain, chain_tip, CanonicalizationParams::default())
             .map(|canon_tx| (canon_tx.tx_node.txid, canon_tx.chain_position))
-            .collect::<HashMap<Txid, _>>();
+            .collect();
 
-        let mut tx = graph
+        let mut tx = tx_graph
             .get_tx(txid)
             .ok_or(BuildFeeBumpError::TransactionNotFound(txid))?
             .as_ref()
@@ -1749,73 +1749,62 @@ impl Wallet {
         let fee = self
             .calculate_fee(&tx)
             .map_err(|_| BuildFeeBumpError::FeeRateUnavailable)?;
-        let fee_rate = self
-            .calculate_fee_rate(&tx)
-            .map_err(|_| BuildFeeBumpError::FeeRateUnavailable)?;
+        let fee_rate = fee / tx.weight();
 
-        // remove the inputs from the tx and process them
-        let utxos = tx
+        // Remove the inputs from the tx and process them.
+        let utxos: Vec<WeightedUtxo> = tx
             .input
             .drain(..)
             .map(|txin| -> Result<_, BuildFeeBumpError> {
-                graph
-                    // Get previous transaction
-                    .get_tx(txin.previous_output.txid)
-                    .ok_or(BuildFeeBumpError::UnknownUtxo(txin.previous_output))
-                    // Get chain position
-                    .and_then(|prev_tx| {
+                let outpoint = txin.previous_output;
+                let prev_txout = tx_graph
+                    .get_txout(outpoint)
+                    .cloned()
+                    .ok_or(BuildFeeBumpError::UnknownUtxo(outpoint))?;
+                match txout_index.index_of_spk(prev_txout.script_pubkey.clone()) {
+                    Some(&(keychain, derivation_index)) => {
+                        let txout = prev_txout;
                         let chain_position = chain_positions
-                            .get(&txin.previous_output.txid)
+                            .get(&outpoint.txid)
                             .cloned()
-                            .ok_or(BuildFeeBumpError::UnknownUtxo(txin.previous_output))?;
-                        let prev_txout = prev_tx
-                            .output
-                            .get(txin.previous_output.vout as usize)
-                            .ok_or(BuildFeeBumpError::InvalidOutputIndex(txin.previous_output))
-                            .cloned()?;
-                        Ok((prev_tx, prev_txout, chain_position))
-                    })
-                    .map(|(prev_tx, prev_txout, chain_position)| {
-                        match txout_index.index_of_spk(prev_txout.script_pubkey.clone()) {
-                            Some(&(keychain, derivation_index)) => WeightedUtxo {
-                                satisfaction_weight: self
-                                    .public_descriptor(keychain)
-                                    .max_weight_to_satisfy()
-                                    .unwrap(),
-                                utxo: Utxo::Local(LocalOutput {
-                                    outpoint: txin.previous_output,
-                                    txout: prev_txout.clone(),
-                                    keychain,
-                                    is_spent: true,
-                                    derivation_index,
-                                    chain_position,
-                                }),
-                            },
-                            None => {
-                                let satisfaction_weight = Weight::from_wu_usize(
-                                    serialize(&txin.script_sig).len() * 4
-                                        + serialize(&txin.witness).len(),
-                                );
-                                WeightedUtxo {
-                                    utxo: Utxo::Foreign {
-                                        outpoint: txin.previous_output,
-                                        sequence: txin.sequence,
-                                        psbt_input: Box::new(psbt::Input {
-                                            witness_utxo: prev_txout
-                                                .script_pubkey
-                                                .witness_version()
-                                                .map(|_| prev_txout.clone()),
-                                            non_witness_utxo: Some(prev_tx.as_ref().clone()),
-                                            ..Default::default()
-                                        }),
-                                    },
-                                    satisfaction_weight,
-                                }
-                            }
-                        }
-                    })
+                            .ok_or(BuildFeeBumpError::TransactionNotFound(outpoint.txid))?;
+                        Ok(WeightedUtxo {
+                            satisfaction_weight: self
+                                .public_descriptor(keychain)
+                                .max_weight_to_satisfy()
+                                .expect("descriptor should be satisfiable"),
+                            utxo: Utxo::Local(LocalOutput {
+                                outpoint,
+                                txout,
+                                keychain,
+                                is_spent: true,
+                                derivation_index,
+                                chain_position,
+                            }),
+                        })
+                    }
+                    None => Ok(WeightedUtxo {
+                        satisfaction_weight: Weight::from_wu_usize(
+                            serialize(&txin.script_sig).len() * 4 + serialize(&txin.witness).len(),
+                        ),
+                        utxo: Utxo::Foreign {
+                            outpoint,
+                            sequence: txin.sequence,
+                            psbt_input: Box::new(psbt::Input {
+                                witness_utxo: prev_txout
+                                    .script_pubkey
+                                    .witness_version()
+                                    .map(|_| prev_txout),
+                                non_witness_utxo: tx_graph
+                                    .get_tx(outpoint.txid)
+                                    .map(|tx| tx.as_ref().clone()),
+                                ..Default::default()
+                            }),
+                        },
+                    }),
+                }
             })
-            .collect::<Result<Vec<WeightedUtxo>, BuildFeeBumpError>>()?;
+            .collect::<Result<_, _>>()?;
 
         if tx.output.len() > 1 {
             let mut change_index = None;
@@ -1835,7 +1824,6 @@ impl Wallet {
         }
 
         let params = TxParams {
-            // TODO: figure out what rbf option should be?
             version: Some(tx.version),
             recipients: tx
                 .output

wallet/tests/build_fee_bump.rs

@@ -8,8 +8,8 @@ use bdk_wallet::psbt::PsbtUtils;
 use bdk_wallet::test_utils::*;
 use bdk_wallet::KeychainKind;
 use bitcoin::{
-    absolute, transaction, Address, Amount, FeeRate, OutPoint, ScriptBuf, Sequence, Transaction,
-    TxOut,
+    absolute, hashes::Hash, psbt, transaction, Address, Amount, FeeRate, OutPoint, ScriptBuf,
+    Sequence, Transaction, TxOut, Weight,
 };
 
 mod common;
@@ -944,3 +944,51 @@ fn test_legacy_bump_fee_absolute_add_input() {
 
     assert_eq!(fee, Amount::from_sat(6_000));
 }
+
+// Test that we can fee-bump a tx containing a foreign (p2a) utxo.
+#[test]
+fn test_bump_fee_pay_to_anchor_foreign_utxo() {
+    let (mut wallet, _) = get_funded_wallet_wpkh();
+    let drain_spk = wallet
+        .next_unused_address(KeychainKind::External)
+        .script_pubkey();
+
+    let witness_utxo = TxOut {
+        value: Amount::ONE_SAT,
+        script_pubkey: bitcoin::ScriptBuf::new_p2a(),
+    };
+    // Remember to include this as a "floating" txout in the wallet.
+    let outpoint = OutPoint::new(Hash::hash(b"prev"), 1);
+    wallet.insert_txout(outpoint, witness_utxo.clone());
+    let satisfaction_weight = Weight::from_wu(71);
+    let psbt_input = psbt::Input {
+        witness_utxo: Some(witness_utxo),
+        ..Default::default()
+    };
+
+    let mut tx_builder = wallet.build_tx();
+    tx_builder
+        .add_foreign_utxo(outpoint, psbt_input, satisfaction_weight)
+        .unwrap()
+        .only_witness_utxo()
+        .fee_rate(FeeRate::from_sat_per_vb_unchecked(2))
+        .drain_to(drain_spk.clone());
+    let psbt = tx_builder.finish().unwrap();
+    let tx = psbt.unsigned_tx.clone();
+    assert!(tx.input.iter().any(|txin| txin.previous_output == outpoint));
+    let txid1 = tx.compute_txid();
+    wallet.apply_unconfirmed_txs([(tx, 123456)]);
+
+    // Now build fee bump.
+    let mut tx_builder = wallet
+        .build_fee_bump(txid1)
+        .expect("`build_fee_bump` should succeed");
+    tx_builder
+        .set_recipients(vec![])
+        .drain_to(drain_spk)
+        .only_witness_utxo()
+        .fee_rate(FeeRate::from_sat_per_vb_unchecked(5));
+    let psbt = tx_builder.finish().unwrap();
+    let tx = &psbt.unsigned_tx;
+    assert!(tx.input.iter().any(|txin| txin.previous_output == outpoint));
+}