milksad
/
rust-bitcoin-unsafe-fast
14
0
Fork 0
Code Issues Pull Requests Activity

Remove reachable unreachable call in psbt 

A bunch of changes have been implemented lately in the fee calculation
logic. As a result of this a at once time `unreachable` statement is now
reachable - bad rust-bitcoin devs, no biscuit.

Saturate to `FeeRate::MAX` when calculating the fee rate, check against
the limit arg, and win.

Co-developed-by: Andrew Poelstra <apoelstra@wpsoftware.net>
This commit is contained in:
Tobin C. Harding 2025-06-12 10:58:50 +10:00
parent c736e73ae0
commit e7c90c57e7
No known key found for this signature in database
GPG Key ID: 40BF9E4C269D6607
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
bitcoin/src/psbt/mod.rs
View File

@ -20,7 +20,6 @@ use std::collections::{HashMap, HashSet};
use internals::write_err; use internals::write_err;
use secp256k1::{Keypair, Message, Secp256k1, Signing, Verification}; use secp256k1::{Keypair, Message, Secp256k1, Signing, Verification};
use units::NumOpResult;
use crate::bip32::{self, DerivationPath, KeySource, Xpriv, Xpub}; use crate::bip32::{self, DerivationPath, KeySource, Xpriv, Xpub};
use crate::crypto::key::{PrivateKey, PublicKey}; use crate::crypto::key::{PrivateKey, PublicKey};
@ -206,18 +205,12 @@ impl Psbt {
// Note: Move prevents usage of &self from now on. // Note: Move prevents usage of &self from now on.
let tx = self.internal_extract_tx(); let tx = self.internal_extract_tx();
// Now that the extracted Transaction is made, decide how to return it. let fee_rate = (fee / tx.weight()).unwrap_or(FeeRate::MAX);
match fee / tx.weight() { if fee_rate > max_fee_rate {
NumOpResult::Valid(fee_rate) => { Err(ExtractTxError::AbsurdFeeRate { fee_rate, tx })
// Prefer to return an AbsurdFeeRate error when both trigger. } else {
if fee_rate > max_fee_rate { Ok(tx)
return Err(ExtractTxError::AbsurdFeeRate { fee_rate, tx });
}
}
NumOpResult::Error(_) => unreachable!("weight() is always non-zero"),
} }
Ok(tx)
} }
/// Combines this [`Psbt`] with `other` PSBT as described by BIP 174. /// Combines this [`Psbt`] with `other` PSBT as described by BIP 174.