frost/bdk
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'refs/pull/146/head' of github.com:bitcoindevkit/bdk

Browse Source
This commit is contained in:
Alekos Filini 2020-10-29 11:53:22 +01:00
commit e6c2823a36
No known key found for this signature in database
GPG Key ID: 5E8AFC3034FDFA4F
2 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/wallet/coin_selection.rs
View File

@ -53,16 +53,16 @@
//! fn coin_select( //! fn coin_select(
//! &self, //! &self,
//! database: &D, //! database: &D,
//! must_use_utxos: Vec<(UTXO, usize)>, //! required_utxos: Vec<(UTXO, usize)>,
//! may_use_utxos: Vec<(UTXO, usize)>, //! optional_utxos: Vec<(UTXO, usize)>,
//! fee_rate: FeeRate, //! fee_rate: FeeRate,
//! amount_needed: u64, //! amount_needed: u64,
//! fee_amount: f32, //! fee_amount: f32,
//! ) -> Result<CoinSelectionResult, bdk::Error> { //! ) -> Result<CoinSelectionResult, bdk::Error> {
//! let mut selected_amount = 0; //! let mut selected_amount = 0;
//! let mut additional_weight = 0; //! let mut additional_weight = 0;
//! let all_utxos_selected = must_use_utxos //! let all_utxos_selected = required_utxos
//! .into_iter().chain(may_use_utxos) //! .into_iter().chain(optional_utxos)
//! .scan((&mut selected_amount, &mut additional_weight), |(selected_amount, additional_weight), (utxo, weight)| { //! .scan((&mut selected_amount, &mut additional_weight), |(selected_amount, additional_weight), (utxo, weight)| {
//! let txin = TxIn { //! let txin = TxIn {
//! previous_output: utxo.outpoint, //! previous_output: utxo.outpoint,
@ -139,10 +139,10 @@ pub trait CoinSelectionAlgorithm<D: Database>: std::fmt::Debug {
/// ///
/// - `database`: a reference to the wallet's database that can be used to lookup additional /// - `database`: a reference to the wallet's database that can be used to lookup additional
/// details for a specific UTXO /// details for a specific UTXO
/// - `must_use_utxos`: the utxos that must be spent regardless of `amount_needed` with their /// - `required_utxos`: the utxos that must be spent regardless of `amount_needed` with their
/// weight cost
/// - `optional_utxos`: the remaining available utxos to satisfy `amount_needed` with their
/// weight cost /// weight cost
/// - `may_be_spent`: the utxos that may be spent to satisfy `amount_needed` with their weight
/// cost
/// - `fee_rate`: fee rate to use /// - `fee_rate`: fee rate to use
/// - `amount_needed`: the amount in satoshi to select /// - `amount_needed`: the amount in satoshi to select
/// - `fee_amount`: the amount of fees in satoshi already accumulated from adding outputs and /// - `fee_amount`: the amount of fees in satoshi already accumulated from adding outputs and
@ -150,8 +150,8 @@ pub trait CoinSelectionAlgorithm<D: Database>: std::fmt::Debug {
fn coin_select( fn coin_select(
&self, &self,
database: &D, database: &D,
must_use_utxos: Vec<(UTXO, usize)>, required_utxos: Vec<(UTXO, usize)>,
may_use_utxos: Vec<(UTXO, usize)>, optional_utxos: Vec<(UTXO, usize)>,
fee_rate: FeeRate, fee_rate: FeeRate,
amount_needed: u64, amount_needed: u64,
fee_amount: f32, fee_amount: f32,
@ -169,8 +169,8 @@ impl<D: Database> CoinSelectionAlgorithm<D> for LargestFirstCoinSelection {
fn coin_select( fn coin_select(
&self, &self,
_database: &D, _database: &D,
must_use_utxos: Vec<(UTXO, usize)>, required_utxos: Vec<(UTXO, usize)>,
mut may_use_utxos: Vec<(UTXO, usize)>, mut optional_utxos: Vec<(UTXO, usize)>,
fee_rate: FeeRate, fee_rate: FeeRate,
amount_needed: u64, amount_needed: u64,
mut fee_amount: f32, mut fee_amount: f32,
@ -184,14 +184,14 @@ impl<D: Database> CoinSelectionAlgorithm<D> for LargestFirstCoinSelection {
fee_rate fee_rate
); );
// We put the "must_use" UTXOs first and make sure the "may_use" are sorted, initially // We put the "required UTXOs" first and make sure the optional UTXOs are sorted,
// smallest to largest, before being reversed with `.rev()`. // initially smallest to largest, before being reversed with `.rev()`.
let utxos = { let utxos = {
may_use_utxos.sort_unstable_by_key(|(utxo, _)| utxo.txout.value); optional_utxos.sort_unstable_by_key(|(utxo, _)| utxo.txout.value);
must_use_utxos required_utxos
.into_iter() .into_iter()
.map(|utxo| (true, utxo)) .map(|utxo| (true, utxo))
.chain(may_use_utxos.into_iter().rev().map(|utxo| (false, utxo))) .chain(optional_utxos.into_iter().rev().map(|utxo| (false, utxo)))
}; };
// Keep including inputs until we've got enough. // Keep including inputs until we've got enough.

16
src/wallet/mod.rs
View File

@ -348,7 +348,7 @@ where
)); ));
} }
let (must_use_utxos, may_use_utxos) = self.get_must_may_use_utxos( let (required_utxos, optional_utxos) = self.preselect_utxos(
builder.change_policy, builder.change_policy,
&builder.unspendable, &builder.unspendable,
&builder.utxos, &builder.utxos,
@ -363,8 +363,8 @@ where
mut fee_amount, mut fee_amount,
} = builder.coin_selection.coin_select( } = builder.coin_selection.coin_select(
self.database.borrow().deref(), self.database.borrow().deref(),
must_use_utxos, required_utxos,
may_use_utxos, optional_utxos,
fee_rate, fee_rate,
outgoing, outgoing,
fee_amount, fee_amount,
@ -604,7 +604,7 @@ where
.cloned() .cloned()
.collect::<Vec<_>>(); .collect::<Vec<_>>();
let (mut must_use_utxos, may_use_utxos) = self.get_must_may_use_utxos( let (mut required_utxos, optional_utxos) = self.preselect_utxos(
builder.change_policy, builder.change_policy,
&builder.unspendable, &builder.unspendable,
&builder_extra_utxos[..], &builder_extra_utxos[..],
@ -613,7 +613,7 @@ where
true, // we only want confirmed transactions for RBF true, // we only want confirmed transactions for RBF
)?; )?;
must_use_utxos.append(&mut original_utxos); required_utxos.append(&mut original_utxos);
let amount_needed = tx.output.iter().fold(0, |acc, out| acc + out.value); let amount_needed = tx.output.iter().fold(0, |acc, out| acc + out.value);
let (new_feerate, initial_fee) = match builder let (new_feerate, initial_fee) = match builder
@ -645,8 +645,8 @@ where
fee_amount, fee_amount,
} = builder.coin_selection.coin_select( } = builder.coin_selection.coin_select(
self.database.borrow().deref(), self.database.borrow().deref(),
must_use_utxos, required_utxos,
may_use_utxos, optional_utxos,
new_feerate, new_feerate,
amount_needed, amount_needed,
initial_fee, initial_fee,
@ -985,7 +985,7 @@ where
/// Given the options returns the list of utxos that must be used to form the /// Given the options returns the list of utxos that must be used to form the
/// transaction and any further that may be used if needed. /// transaction and any further that may be used if needed.
#[allow(clippy::type_complexity)] #[allow(clippy::type_complexity)]
fn get_must_may_use_utxos( fn preselect_utxos(
&self, &self,
change_policy: tx_builder::ChangeSpendPolicy, change_policy: tx_builder::ChangeSpendPolicy,
unspendable: &HashSet<OutPoint>, unspendable: &HashSet<OutPoint>,