diff --git a/crates/bdk/tests/common.rs b/crates/bdk/tests/common.rs index 3e0292a2..c236ef18 100644 --- a/crates/bdk/tests/common.rs +++ b/crates/bdk/tests/common.rs @@ -4,7 +4,7 @@ use bdk::{wallet::AddressIndex, KeychainKind, LocalOutput, Wallet}; use bdk_chain::indexed_tx_graph::Indexer; use bdk_chain::{BlockId, ConfirmationTime}; use bitcoin::hashes::Hash; -use bitcoin::{Address, BlockHash, Network, OutPoint, Transaction, TxIn, TxOut, Txid}; +use bitcoin::{Address, BlockHash, FeeRate, Network, OutPoint, Transaction, TxIn, TxOut, Txid}; use std::str::FromStr; // Return a fake wallet that appears to be funded for testing. @@ -154,3 +154,16 @@ pub fn get_test_tr_with_taptree_xprv() -> &'static str { pub fn get_test_tr_dup_keys() -> &'static str { "tr(cNJmN3fH9DDbDt131fQNkVakkpzawJBSeybCUNmP1BovpmGQ45xG,{pk(8aee2b8120a5f157f1223f72b5e62b825831a27a9fdf427db7cc697494d4a642),pk(8aee2b8120a5f157f1223f72b5e62b825831a27a9fdf427db7cc697494d4a642)})" } + +/// Construct a new [`FeeRate`] from the given raw `sat_vb` feerate. This is +/// useful in cases where we want to create a feerate from a `f64`, as the +/// traditional [`FeeRate::from_sat_per_vb`] method will only accept an integer. +/// +/// **Note** this 'quick and dirty' conversion should only be used when the input +/// parameter has units of `satoshis/vbyte` **AND** is not expected to overflow, +/// or else the resulting value will be inaccurate. +fn feerate_unchecked(sat_vb: f64) -> FeeRate { + // 1 sat_vb / 4wu_vb * 1000kwu_wu = 250 sat_kwu + let sat_kwu = (sat_vb * 250.0).ceil() as u64; + FeeRate::from_sat_per_kwu(sat_kwu) +} diff --git a/crates/bdk/tests/psbt.rs b/crates/bdk/tests/psbt.rs index e3ace9db..935ddb11 100644 --- a/crates/bdk/tests/psbt.rs +++ b/crates/bdk/tests/psbt.rs @@ -1,3 +1,4 @@ +use bdk::bitcoin::FeeRate; use bdk::bitcoin::TxIn; use bdk::wallet::AddressIndex; use bdk::wallet::AddressIndex::New; @@ -10,12 +11,6 @@ use common::*; // from bip 174 const PSBT_STR: &str = "cHNidP8BAKACAAAAAqsJSaCMWvfEm4IS9Bfi8Vqz9cM9zxU4IagTn4d6W3vkAAAAAAD+////qwlJoIxa98SbghL0F+LxWrP1wz3PFTghqBOfh3pbe+QBAAAAAP7///8CYDvqCwAAAAAZdqkUdopAu9dAy+gdmI5x3ipNXHE5ax2IrI4kAAAAAAAAGXapFG9GILVT+glechue4O/p+gOcykWXiKwAAAAAAAEHakcwRAIgR1lmF5fAGwNrJZKJSGhiGDR9iYZLcZ4ff89X0eURZYcCIFMJ6r9Wqk2Ikf/REf3xM286KdqGbX+EhtdVRs7tr5MZASEDXNxh/HupccC1AaZGoqg7ECy0OIEhfKaC3Ibi1z+ogpIAAQEgAOH1BQAAAAAXqRQ1RebjO4MsRwUPJNPuuTycA5SLx4cBBBYAFIXRNTfy4mVAWjTbr6nj3aAfuCMIAAAA"; -fn feerate_unchecked(sat_vb: f64) -> bitcoin::FeeRate { - // 1 sat_vb / 4wu_vb * 1000kwu_wu = 250 sat_kwu - let sat_kwu = (sat_vb * 250.0).ceil() as u64; - bitcoin::FeeRate::from_sat_per_kwu(sat_kwu) -} - #[test] #[should_panic(expected = "InputIndexOutOfRange")] fn test_psbt_malformed_psbt_input_legacy() { @@ -88,7 +83,7 @@ fn test_psbt_sign_with_finalized() { fn test_psbt_fee_rate_with_witness_utxo() { use psbt::PsbtUtils; - let expected_fee_rate = feerate_unchecked(1.2345); + let expected_fee_rate = FeeRate::from_sat_per_kwu(310); let (mut wallet, _) = get_funded_wallet("wpkh(tprv8ZgxMBicQKsPd3EupYiPRhaMooHKUHJxNsTfYuScep13go8QFfHdtkG9nRkFGb7busX4isf6X9dURGCoKgitaApQ6MupRhZMcELAxTBRJgS/*)"); let addr = wallet.get_address(New); @@ -113,7 +108,7 @@ fn test_psbt_fee_rate_with_witness_utxo() { fn test_psbt_fee_rate_with_nonwitness_utxo() { use psbt::PsbtUtils; - let expected_fee_rate = feerate_unchecked(1.2345); + let expected_fee_rate = FeeRate::from_sat_per_kwu(310); let (mut wallet, _) = get_funded_wallet("pkh(tprv8ZgxMBicQKsPd3EupYiPRhaMooHKUHJxNsTfYuScep13go8QFfHdtkG9nRkFGb7busX4isf6X9dURGCoKgitaApQ6MupRhZMcELAxTBRJgS/*)"); let addr = wallet.get_address(New); @@ -137,7 +132,7 @@ fn test_psbt_fee_rate_with_nonwitness_utxo() { fn test_psbt_fee_rate_with_missing_txout() { use psbt::PsbtUtils; - let expected_fee_rate = feerate_unchecked(1.2345); + let expected_fee_rate = FeeRate::from_sat_per_kwu(310); let (mut wpkh_wallet, _) = get_funded_wallet("wpkh(tprv8ZgxMBicQKsPd3EupYiPRhaMooHKUHJxNsTfYuScep13go8QFfHdtkG9nRkFGb7busX4isf6X9dURGCoKgitaApQ6MupRhZMcELAxTBRJgS/*)"); let addr = wpkh_wallet.get_address(New); diff --git a/crates/bdk/tests/wallet.rs b/crates/bdk/tests/wallet.rs index a8a2c928..a0a91616 100644 --- a/crates/bdk/tests/wallet.rs +++ b/crates/bdk/tests/wallet.rs @@ -56,12 +56,6 @@ fn receive_output_in_latest_block(wallet: &mut Wallet, value: u64) -> OutPoint { receive_output(wallet, value, anchor) } -fn feerate_unchecked(sat_vb: f64) -> FeeRate { - // 1 sat_vb / 4wu_vb * 1000kwu_wu = 250 sat_kwu - let sat_kwu = (sat_vb * 250.0).ceil() as u64; - FeeRate::from_sat_per_kwu(sat_kwu) -} - // The satisfaction size of a P2WPKH is 112 WU = // 1 (elements in witness) + 1 (OP_PUSH) + 33 (pk) + 1 (OP_PUSH) + 72 (signature + sighash) + 1*4 (script len) // On the witness itself, we have to push once for the pk (33WU) and once for signature + sighash (72WU), for @@ -1581,8 +1575,9 @@ fn test_bump_fee_reduce_change() { .insert_tx(tx, ConfirmationTime::Unconfirmed { last_seen: 0 }) .unwrap(); + let feerate = FeeRate::from_sat_per_kwu(625); // 2.5 sat/vb let mut builder = wallet.build_fee_bump(txid).unwrap(); - builder.fee_rate(feerate_unchecked(2.5)).enable_rbf(); + builder.fee_rate(feerate).enable_rbf(); let psbt = builder.finish().unwrap(); let sent_received = wallet.sent_and_received(&psbt.clone().extract_tx()); let fee = check_fee!(wallet, psbt); @@ -1613,7 +1608,7 @@ fn test_bump_fee_reduce_change() { sent_received.1 ); - assert_fee_rate!(psbt, fee.unwrap_or(0), feerate_unchecked(2.5), @add_signature); + assert_fee_rate!(psbt, fee.unwrap_or(0), feerate, @add_signature); let mut builder = wallet.build_fee_bump(txid).unwrap(); builder.fee_absolute(200); @@ -1676,9 +1671,10 @@ fn test_bump_fee_reduce_single_recipient() { .insert_tx(tx, ConfirmationTime::Unconfirmed { last_seen: 0 }) .unwrap(); + let feerate = FeeRate::from_sat_per_kwu(625); // 2.5 sat/vb let mut builder = wallet.build_fee_bump(txid).unwrap(); builder - .fee_rate(feerate_unchecked(2.5)) + .fee_rate(feerate) .allow_shrinking(addr.script_pubkey()) .unwrap(); let psbt = builder.finish().unwrap(); @@ -1692,7 +1688,7 @@ fn test_bump_fee_reduce_single_recipient() { assert_eq!(tx.output.len(), 1); assert_eq!(tx.output[0].value + fee.unwrap_or(0), sent_received.0); - assert_fee_rate!(psbt, fee.unwrap_or(0), feerate_unchecked(2.5), @add_signature); + assert_fee_rate!(psbt, fee.unwrap_or(0), feerate, @add_signature); } #[test] @@ -2311,7 +2307,7 @@ fn test_fee_amount_negative_drain_val() { let send_to = Address::from_str("tb1ql7w62elx9ucw4pj5lgw4l028hmuw80sndtntxt") .unwrap() .assume_checked(); - let fee_rate = feerate_unchecked(2.01); + let fee_rate = FeeRate::from_sat_per_kwu(500); let incoming_op = receive_output_in_latest_block(&mut wallet, 8859); let mut builder = wallet.build_tx();