Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+103 −67
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
992a08f
test: Add `test_bump_fee_pay_to_anchor_foreign_utxo`
ValuedMammal Nov 5, 2025
f15582d
fix(wallet): Don't fail in `build_fee_bump` for missing parent txid
ValuedMammal Nov 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ rustdoc-args = ["--cfg", "docsrs"]

[dependencies]
bdk_chain = { version = "0.23.1", features = ["miniscript", "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 }
miniscript = { version = "12.3.1", features = ["serde"], default-features = false }
rand_core = { version = "0.6.0" }
serde_json = { version = "1" }
Expand Down
116 changes: 52 additions & 64 deletions src/wallet/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1711,15 +1711,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
Copy link
Contributor

@nymius nymius Nov 13, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The tx request here and the conditional below could be reduced to the same thing.

.get_tx(txid)
.ok_or(BuildFeeBumpError::TransactionNotFound(txid))?
.as_ref()
Expand All @@ -1746,73 +1746,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
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;
Copy link
Contributor

@nymius nymius Nov 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not rename prev_txout -> txout altogether?

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;
Expand All @@ -1832,7 +1821,6 @@ impl Wallet {
}

let params = TxParams {
// TODO: figure out what rbf option should be?
version: Some(tx.version),
recipients: tx
.output
Expand Down
52 changes: 50 additions & 2 deletions tests/build_fee_bump.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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));
}