nik/liana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

commands: add weights before converting to vbytes

Browse Source 
Converting to vbytes first can lead to a larger result and
therefore a lower feerate, which could fall below 1 and fail the
sanity check.
This commit is contained in:
jp1ac4 2023-10-20 09:50:43 +01:00
parent 4f2ff1abc0
commit 176859ed92
No known key found for this signature in database
GPG Key ID: A7ACD32423568D7B
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/commands/mod.rs
View File

@ -202,7 +202,14 @@ fn sanity_check_psbt(
}
// Check the feerate isn't insane.
let tx_vb = (tx.vsize() + spent_desc.max_sat_vbytes() * tx.input.len()) as u64;
// Add weights together before converting to vbytes to avoid rounding up multiple times
// and increasing the result, which could lead to the feerate in sats/vb falling below 1.
let tx_wu = tx.weight().to_wu() + (spent_desc.max_sat_weight() * tx.input.len()) as u64;
let tx_vb = tx_wu
.checked_add(descriptors::WITNESS_FACTOR as u64 - 1)
.unwrap()
.checked_div(descriptors::WITNESS_FACTOR as u64)
.unwrap();
let feerate_sats_vb = abs_fee
.checked_div(tx_vb)
.ok_or(CommandError::InsaneFees(InsaneFeeInfo::InvalidFeerate))?;

2
src/descriptors/mod.rs
View File

@ -17,7 +17,7 @@ pub use keys::*;
pub mod analysis;
pub use analysis::*;
const WITNESS_FACTOR: usize = 4;
pub const WITNESS_FACTOR: usize = 4;
#[derive(Debug)]
pub enum LianaDescError {