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

commands: use helper for unsigned tx max size

Browse Source
This commit is contained in:
jp1ac4 2023-12-14 14:43:04 +00:00
parent e9264bdf0d
commit af416f6502
No known key found for this signature in database
GPG Key ID: A7ACD32423568D7B
1 changed files with 5 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/commands/mod.rs
View File

@ -29,10 +29,7 @@ use std::{
}; };
use miniscript::{ use miniscript::{
bitcoin::{ bitcoin::{self, address, bip32, psbt::PartiallySignedTransaction as Psbt},
self, address, bip32, constants::WITNESS_SCALE_FACTOR,
psbt::PartiallySignedTransaction as Psbt,
},
psbt::PsbtExt, psbt::PsbtExt,
}; };
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
@ -179,29 +176,6 @@ impl<'a> TxGetter for BitcoindTxGetter<'a> {
} }
} }
/// An unsigned transaction's maximum possible size in vbytes after satisfaction.
///
/// This assumes all inputs are internal (or have the same `max_sat_weight` value).
///
/// `tx` is the unsigned transaction.
///
/// `max_sat_weight` is the maximum weight difference of an input in the
/// transaction before and after satisfaction. Must be in weight units.
fn unsigned_tx_max_vbytes(tx: &bitcoin::Transaction, max_sat_weight: u64) -> u64 {
let witness_factor: u64 = WITNESS_SCALE_FACTOR.try_into().unwrap();
let num_inputs: u64 = tx.input.len().try_into().unwrap();
let tx_wu: u64 = tx
.weight()
.to_wu()
.checked_add(max_sat_weight.checked_mul(num_inputs).unwrap())
.unwrap();
tx_wu
.checked_add(witness_factor.checked_sub(1).unwrap())
.unwrap()
.checked_div(witness_factor)
.unwrap()
}
fn coin_to_candidate( fn coin_to_candidate(
coin: &Coin, coin: &Coin,
must_select: bool, must_select: bool,
@ -826,12 +800,6 @@ impl DaemonControl {
if !is_cancel { if !is_cancel {
candidate_coins.extend(&confirmed_cands); candidate_coins.extend(&confirmed_cands);
} }
let max_sat_weight: u64 = self
.config
.main_descriptor
.max_sat_weight()
.try_into()
.expect("it must fit");
// Try with increasing fee until fee paid by replacement transaction is high enough. // Try with increasing fee until fee paid by replacement transaction is high enough.
// Replacement fee must be at least: // Replacement fee must be at least:
// sum of fees paid by original transactions + incremental feerate * replacement size. // sum of fees paid by original transactions + incremental feerate * replacement size.
@ -868,7 +836,10 @@ impl DaemonControl {
return Err(e.into()); return Err(e.into());
} }
}; };
replacement_vsize = unsigned_tx_max_vbytes(&rbf_psbt.unsigned_tx, max_sat_weight); replacement_vsize = self
.config
.main_descriptor
.unsigned_tx_max_vbytes(&rbf_psbt.unsigned_tx);
// Make sure it satisfies RBF rule 4. // Make sure it satisfies RBF rule 4.
if rbf_psbt.fee().expect("has already been sanity checked") if rbf_psbt.fee().expect("has already been sanity checked")