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

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

Browse Source
This commit is contained in:
Alekos Filini
2020-12-07 11:21:21 +01:00
parent 8d9365099e 8dcb75dfa4
commit eef59e463d
10 changed files with 54 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/wallet/coin_selection.rs
View File

@@ -538,7 +538,7 @@ mod test {
value: 100_000,
script_pubkey: Script::new(),
},
is_internal: false,
script_type: ScriptType::External,
},
P2WPKH_WITNESS_SIZE,
),
@@ -552,7 +552,7 @@ mod test {
value: 200_000,
script_pubkey: Script::new(),
},
is_internal: true,
script_type: ScriptType::Internal,
},
P2WPKH_WITNESS_SIZE,
),
@@ -572,7 +572,7 @@ mod test {
value: rng.gen_range(0, 200000000),
script_pubkey: Script::new(),
},
is_internal: false,
script_type: ScriptType::External,
},
P2WPKH_WITNESS_SIZE,
));
@@ -591,7 +591,7 @@ mod test {
value: utxos_value,
script_pubkey: Script::new(),
},
is_internal: false,
script_type: ScriptType::External,
},
P2WPKH_WITNESS_SIZE,
);

65
src/wallet/mod.rs
View File

@@ -611,18 +611,6 @@ where
}
let deriv_ctx = descriptor_to_pk_ctx(&self.secp);
let external_weight = self
.get_descriptor_for_script_type(ScriptType::External)
.0
.max_satisfaction_weight(deriv_ctx)
.unwrap();
let internal_weight = self
.get_descriptor_for_script_type(ScriptType::Internal)
.0
.max_satisfaction_weight(deriv_ctx)
.unwrap();
let original_sequence = tx.input[0].sequence;
// remove the inputs from the tx and process them
@@ -636,26 +624,31 @@ where
.get_previous_output(&txin.previous_output)?
.ok_or(Error::UnknownUTXO)?;
let (weight, is_internal) = match self
let (weight, script_type) = match self
.database
.borrow()
.get_path_from_script_pubkey(&txout.script_pubkey)?
{
Some((ScriptType::Internal, _)) => (internal_weight, true),
Some((ScriptType::External, _)) => (external_weight, false),
Some((script_type, _)) => (
self.get_descriptor_for_script_type(script_type)
.0
.max_satisfaction_weight(deriv_ctx)
.unwrap(),
script_type,
),
None => {
// estimate the weight based on the scriptsig/witness size present in the
// original transaction
let weight =
serialize(&txin.script_sig).len() * 4 + serialize(&txin.witness).len();
(weight, false)
(weight, ScriptType::External)
}
};
let utxo = UTXO {
outpoint: txin.previous_output,
txout,
is_internal,
script_type,
};
Ok((utxo, weight))
@@ -1052,30 +1045,20 @@ where
fn get_available_utxos(&self) -> Result<Vec<(UTXO, usize)>, Error> {
let deriv_ctx = descriptor_to_pk_ctx(&self.secp);
let external_weight = self
.get_descriptor_for_script_type(ScriptType::External)
.0
.max_satisfaction_weight(deriv_ctx)
.unwrap();
let internal_weight = self
.get_descriptor_for_script_type(ScriptType::Internal)
.0
.max_satisfaction_weight(deriv_ctx)
.unwrap();
let add_weight = |utxo: UTXO| {
let weight = match utxo.is_internal {
true => internal_weight,
false => external_weight,
};
(utxo, weight)
};
let utxos = self.list_unspent()?.into_iter().map(add_weight).collect();
Ok(utxos)
Ok(self
.list_unspent()?
.into_iter()
.map(|utxo| {
let script_type = utxo.script_type;
(
utxo,
self.get_descriptor_for_script_type(script_type)
.0
.max_satisfaction_weight(deriv_ctx)
.unwrap(),
)
})
.collect())
}
/// Given the options returns the list of utxos that must be used to form the

12
src/wallet/tx_builder.rs
View File

@@ -566,8 +566,8 @@ impl ChangeSpendPolicy {
pub(crate) fn is_satisfied_by(&self, utxo: &UTXO) -> bool {
match self {
ChangeSpendPolicy::ChangeAllowed => true,
ChangeSpendPolicy::OnlyChange => utxo.is_internal,
ChangeSpendPolicy::ChangeForbidden => !utxo.is_internal,
ChangeSpendPolicy::OnlyChange => utxo.script_type == ScriptType::Internal,
ChangeSpendPolicy::ChangeForbidden => utxo.script_type == ScriptType::External,
}
}
}
@@ -662,7 +662,7 @@ mod test {
vout: 0,
},
txout: Default::default(),
is_internal: false,
script_type: ScriptType::External,
},
UTXO {
outpoint: OutPoint {
@@ -670,7 +670,7 @@ mod test {
vout: 1,
},
txout: Default::default(),
is_internal: true,
script_type: ScriptType::Internal,
},
]
}
@@ -695,7 +695,7 @@ mod test {
.collect::<Vec<_>>();
assert_eq!(filtered.len(), 1);
assert_eq!(filtered[0].is_internal, false);
assert_eq!(filtered[0].script_type, ScriptType::External);
}
#[test]
@@ -707,7 +707,7 @@ mod test {
.collect::<Vec<_>>();
assert_eq!(filtered.len(), 1);
assert_eq!(filtered[0].is_internal, true);
assert_eq!(filtered[0].script_type, ScriptType::Internal);
}
#[test]