Use effective value instead of value

yancyribbens · Feb 2, 2024 · bef818e · bef818e
1 parent ba3c269
commit bef818e
Show file tree

Hide file tree

Showing 5 changed files with 400 additions and 108 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -15,7 +15,7 @@ keywords = ["crypto", "bitcoin"]
 readme = "README.md"
 
 [dependencies]
-bitcoin = { git="https://github.com/yancyribbens/rust-bitcoin", branch = "add-effective-value-calculation" }
+bitcoin = { git="https://github.com/yancyribbens/rust-bitcoin", branch = "tmp/mark-txin-base-weight-public" }
 rand = {version = "0.8.5", default-features = false, optional = true}
 
 [dev-dependencies]
@@ -24,10 +24,10 @@ rust-bitcoin-coin-selection = {path = ".", features = ["rand"]}
 rand = "0.8.5"
 
 [patch.crates-io]
-bitcoin_hashes = { git = "https://github.com/yancyribbens/rust-bitcoin", branch = "add-effective-value-calculation" }
-bitcoin-io = { git = "https://github.com/yancyribbens/rust-bitcoin", branch = "add-effective-value-calculation" }
-bitcoin-units = { git = "https://github.com/yancyribbens/rust-bitcoin", branch = "add-effective-value-calculation" }
-bitcoin-internals = { git = "https://github.com/yancyribbens/rust-bitcoin", branch = "add-effective-value-calculation" }
+bitcoin_hashes = { git = "https://github.com/yancyribbens/rust-bitcoin", branch = "tmp/mark-txin-base-weight-public" }
+bitcoin-io = { git = "https://github.com/yancyribbens/rust-bitcoin", branch = "tmp/mark-txin-base-weight-public" }
+bitcoin-units = { git = "https://github.com/yancyribbens/rust-bitcoin", branch = "tmp/mark-txin-base-weight-public" }
+bitcoin-internals = { git = "https://github.com/yancyribbens/rust-bitcoin", branch = "tmp/mark-txin-base-weight-public" }
 
 [[bench]]
 name = "coin_selection"

diff --git a/README.md b/README.md
@@ -25,10 +25,10 @@ To run the benchmarks use: `cargo bench`.
 
 A basic performance comparison between this current [Rust BnB](https://github.com/p2pderivatives/rust-bitcoin-coin-selection/pull/28/files#diff-9098d62be93e83524a8371395c973d761a95000d1c295f600a8c808e917c16d9R122) implementation and the [Bitcoin Core](https://github.com/bitcoin/bitcoin/blob/4b1196a9855dcd188a24f393aa2fa21e2d61f061/src/wallet/coinselection.cpp#L76) version using commodity hardware (My rather old laptop).
 
-|implementation|pool size|ns/iter|
-|-------------:|---------|-------|
-|      Rust BnB|    1,000|936,560|
-|  C++ Core BnB|    1,000|816,374|
+|implementation|pool size|  ns/iter|
+|-------------:|---------|---------|
+|      Rust BnB|    1,000|1,263,600|
+|  C++ Core BnB|    1,000|  816,374|
 
 ## Minimum Supported Rust Version (MSRV)
 

diff --git a/benches/coin_selection.rs b/benches/coin_selection.rs
@@ -1,6 +1,7 @@
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
 
 use bitcoin::Amount;
+use bitcoin::FeeRate;
 use bitcoin::ScriptBuf;
 use bitcoin::TxOut;
 use bitcoin::Weight;
@@ -30,7 +31,9 @@ pub fn criterion_benchmark(c: &mut Criterion) {
             let result = select_coins_bnb(
                 black_box(target),
                 black_box(cost_of_change),
-                black_box(&mut utxo_pool.clone()),
+                black_box(FeeRate::ZERO),
+                black_box(FeeRate::ZERO),
+                black_box(&mut utxo_pool),
             )
             .unwrap();
             assert_eq!(2, result.len());