TXIN_BASE_WEIGHT shouldn't include the script len

We would before calculate the TXIN_BASE_WEIGHT as prev_txid (32 bytes) + prev_vout (4 bytes) + sequence (4 bytes) + script_sig_len (1 bytes), but that's wrong: the script_sig_len shouldn't be included, as miniscript already includes it in the `max_satisfaction_size` calculation. Fixes #160
bitcoindevkit · Jul 21, 2022 · cbf8464 · cbf8464
1 parent 2466746
commit cbf8464
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/wallet/coin_selection.rs b/src/wallet/coin_selection.rs
@@ -29,7 +29,7 @@
 //! # use bdk::wallet::{self, coin_selection::*};
 //! # use bdk::database::Database;
 //! # use bdk::*;
-//! # const TXIN_BASE_WEIGHT: usize = (32 + 4 + 4 + 1) * 4;
+//! # const TXIN_BASE_WEIGHT: usize = (32 + 4 + 4) * 4;
 //! #[derive(Debug)]
 //! struct AlwaysSpendEverything;
 //!
@@ -108,8 +108,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;
 
 /// Result of a successful coin selection
 #[derive(Debug)]
@@ -616,7 +616,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;
 
@@ -628,7 +628,7 @@ mod test {
         ))
         .unwrap();
         WeightedUtxo {
-            satisfaction_weight: P2WPKH_WITNESS_SIZE,
+            satisfaction_weight: P2WPKH_SATISFACTION_SIZE,
             utxo: Utxo::Local(LocalUtxo {
                 outpoint,
                 txout: TxOut {
@@ -708,7 +708,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",
@@ -728,7 +728,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",
@@ -1162,7 +1162,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);
     }

diff --git a/src/wallet/mod.rs b/src/wallet/mod.rs
@@ -3707,7 +3707,7 @@ pub(crate) mod test {
             .unwrap();
 
         let mut builder = wallet.build_fee_bump(txid).unwrap();
-        builder.fee_rate(FeeRate::from_sat_per_vb(141.0));
+        builder.fee_rate(FeeRate::from_sat_per_vb(142.0));
         let (psbt, details) = builder.finish().unwrap();
 
         assert_eq!(