Skip to content
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

Jump to bottom

Various fixes to the fee_amount calculation in create_tx #666

Merged
merged 9 commits into from
Aug 3, 2022
+181 −38
Merged

Various fixes to the fee_amount calculation in create_tx #666

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
42fde6d
test: Check fee_amount in assert_fee_rate
danielabrozzoni Jul 27, 2022
00d426b
test: Check that the feerate is never below...
danielabrozzoni Aug 2, 2022
ac051d7
Calculate fee amount after output addition
danielabrozzoni Jul 11, 2022
7ac87b8
TXIN_BASE_WEIGHT shouldn't include the script len
danielabrozzoni Aug 2, 2022
ae91906
Take into account the segwit tx header when...
danielabrozzoni Jul 12, 2022
50af51d
test: Fix P2WPKH_FAKE_WITNESS_SIZE
danielabrozzoni Aug 2, 2022
2756411
test: Reproduce #660 conditions
danielabrozzoni Jul 13, 2022
632daba
test: Check tx feerate with longer signatures
danielabrozzoni Aug 2, 2022
419dc24
test: Document `test_bump_fee_add_input_change_dust`
danielabrozzoni Aug 2, 2022
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
16 changes: 8 additions & 8 deletions src/wallet/coin_selection.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
//! # use bdk::database::Database;
//! # use bdk::*;
//! # use bdk::wallet::coin_selection::decide_change;
//! # const TXIN_BASE_WEIGHT: usize = (32 + 4 + 4 + 1) * 4;
//! # const TXIN_BASE_WEIGHT: usize = (32 + 4 + 4) * 4;
//! #[derive(Debug)]
//! struct AlwaysSpendEverything;
//!
Expand Down Expand Up @@ -119,8 +119,8 @@ pub type DefaultCoinSelectionAlgorithm = BranchAndBoundCoinSelection;
pub type DefaultCoinSelectionAlgorithm = LargestFirstCoinSelection; // make the tests more predictable

// Base weight of a Txin, not counting the weight needed for satisfying it.
// prev_txid (32 bytes) + prev_vout (4 bytes) + sequence (4 bytes) + script_len (1 bytes)
pub(crate) const TXIN_BASE_WEIGHT: usize = (32 + 4 + 4 + 1) * 4;
// prev_txid (32 bytes) + prev_vout (4 bytes) + sequence (4 bytes)
pub(crate) const TXIN_BASE_WEIGHT: usize = (32 + 4 + 4) * 4;

#[derive(Debug)]
/// Remaining amount after performing coin selection
Expand Down Expand Up @@ -731,7 +731,7 @@ mod test {
use rand::seq::SliceRandom;
use rand::{Rng, SeedableRng};

const P2WPKH_WITNESS_SIZE: usize = 73 + 33 + 2;
const P2WPKH_SATISFACTION_SIZE: usize = 73 + 33 + 2 + 1;

const FEE_AMOUNT: u64 = 50;

Expand All @@ -743,7 +743,7 @@ mod test {
))
.unwrap();
WeightedUtxo {
satisfaction_weight: P2WPKH_WITNESS_SIZE,
satisfaction_weight: P2WPKH_SATISFACTION_SIZE,
utxo: Utxo::Local(LocalUtxo {
outpoint,
txout: TxOut {
Expand Down Expand Up @@ -823,7 +823,7 @@ mod test {
let mut res = Vec::new();
for _ in 0..utxos_number {
res.push(WeightedUtxo {
satisfaction_weight: P2WPKH_WITNESS_SIZE,
satisfaction_weight: P2WPKH_SATISFACTION_SIZE,
utxo: Utxo::Local(LocalUtxo {
outpoint: OutPoint::from_str(
"ebd9813ecebc57ff8f30797de7c205e3c7498ca950ea4341ee51a685ff2fa30a:0",
Expand All @@ -843,7 +843,7 @@ mod test {

fn generate_same_value_utxos(utxos_value: u64, utxos_number: usize) -> Vec<WeightedUtxo> {
let utxo = WeightedUtxo {
satisfaction_weight: P2WPKH_WITNESS_SIZE,
satisfaction_weight: P2WPKH_SATISFACTION_SIZE,
utxo: Utxo::Local(LocalUtxo {
outpoint: OutPoint::from_str(
"ebd9813ecebc57ff8f30797de7c205e3c7498ca950ea4341ee51a685ff2fa30a:0",
Expand Down Expand Up @@ -1313,7 +1313,7 @@ mod test {

assert_eq!(result.selected.len(), 1);
assert_eq!(result.selected_amount(), 100_000);
let input_size = (TXIN_BASE_WEIGHT + P2WPKH_WITNESS_SIZE).vbytes();
let input_size = (TXIN_BASE_WEIGHT + P2WPKH_SATISFACTION_SIZE).vbytes();
let epsilon = 0.5;
assert!((1.0 - (result.fee_amount as f32 / input_size as f32)).abs() < epsilon);
}
Expand Down
Loading