Skip to content

fix: Validate prevouts in get_psbt_input #232

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
Open

fix: Validate prevouts in get_psbt_input #232

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
da638c0
fix: Validate prevouts in `get_psbt_input`
ItshMoh Mar 24, 2025
99d83fe
fix!: Check prevout bounds in `Wallet::build_fee_bump`
evanlinjin May 16, 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
5 changes: 5 additions & 0 deletions wallet/src/wallet/error.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,8 @@ pub enum BuildFeeBumpError {
IrreplaceableTransaction(Txid),
/// Node doesn't have data to estimate a fee rate
FeeRateUnavailable,
/// Input references an invalid output index in the previous transaction
InvalidOutputIndex(OutPoint),
}

impl fmt::Display for BuildFeeBumpError {
Expand All @@ -247,6 +249,9 @@ impl fmt::Display for BuildFeeBumpError {
write!(f, "Transaction can't be replaced with txid: {}", txid)
}
Self::FeeRateUnavailable => write!(f, "Fee rate unavailable"),
Self::InvalidOutputIndex(op) => {
write!(f, "A txin referenced an invalid output: {}", op)
}
}
}
}
Expand Down
28 changes: 18 additions & 10 deletions wallet/src/wallet/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1648,15 +1648,19 @@ impl Wallet {
.ok_or(BuildFeeBumpError::UnknownUtxo(txin.previous_output))
// Get chain position
.and_then(|prev_tx| {
chain_positions
let chain_position = chain_positions
.get(&txin.previous_output.txid)
.cloned()
.ok_or(BuildFeeBumpError::UnknownUtxo(txin.previous_output))
.map(|chain_position| (prev_tx, chain_position))
.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, chain_position)| {
let txout = prev_tx.output[txin.previous_output.vout as usize].clone();
match txout_index.index_of_spk(txout.script_pubkey.clone()) {
.map(|(prev_tx, prev_txout, chain_position)| {
match txout_index.index_of_spk(prev_txout.script_pubkey.clone()) {
Some(&(keychain, derivation_index)) => (
txin.previous_output,
WeightedUtxo {
Expand All @@ -1666,7 +1670,7 @@ impl Wallet {
.unwrap(),
utxo: Utxo::Local(LocalOutput {
outpoint: txin.previous_output,
txout: txout.clone(),
txout: prev_txout.clone(),
keychain,
is_spent: true,
derivation_index,
Expand All @@ -1687,10 +1691,10 @@ impl Wallet {
outpoint: txin.previous_output,
sequence: txin.sequence,
psbt_input: Box::new(psbt::Input {
witness_utxo: txout
witness_utxo: prev_txout
.script_pubkey
.witness_version()
.map(|_| txout.clone()),
.map(|_| prev_txout.clone()),
non_witness_utxo: Some(prev_tx.as_ref().clone()),
..Default::default()
}),
Expand Down Expand Up @@ -2166,8 +2170,12 @@ impl Wallet {

let prev_output = utxo.outpoint;
if let Some(prev_tx) = self.indexed_graph.graph().get_tx(prev_output.txid) {
// We want to check that the prevout actually exists in the tx before continuing.
let prevout = prev_tx.output.get(prev_output.vout as usize).ok_or(
MiniscriptPsbtError::UtxoUpdate(miniscript::psbt::UtxoUpdateError::UtxoCheck),
)?;
if desc.is_witness() || desc.is_taproot() {
psbt_input.witness_utxo = Some(prev_tx.output[prev_output.vout as usize].clone());
psbt_input.witness_utxo = Some(prevout.clone());
}
if !desc.is_taproot() && (!desc.is_witness() || !only_witness_utxo) {
psbt_input.non_witness_utxo = Some(prev_tx.as_ref().clone());
Expand Down
Loading