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

Simplify

Browse Source
This commit is contained in:
Sudarsan Balaji 2022-03-31 17:22:52 +01:00
parent 87a0a15ea7
commit a48f9b4387
No known key found for this signature in database
GPG Key ID: 6644FFAC82AC1970
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/lib.rs
View File

@ -336,9 +336,10 @@ impl TxBuilder {
let wallet = wallet.get_wallet(); let wallet = wallet.get_wallet();
let mut tx_builder = wallet.build_tx(); let mut tx_builder = wallet.build_tx();
for (address, amount) in &self.recipients { for (address, amount) in &self.recipients {
let address = let script_pubkey = Address::from_str(address)
Address::from_str(address).map_err(|e| BdkError::Generic(e.to_string()))?; .map(|x| x.script_pubkey())
tx_builder.add_recipient(address.script_pubkey(), *amount); .map_err(|e| BdkError::Generic(e.to_string()))?;
tx_builder.add_recipient(script_pubkey, *amount);
} }
if let Some(sat_per_vb) = self.fee_rate { if let Some(sat_per_vb) = self.fee_rate {
tx_builder.fee_rate(FeeRate::from_sat_per_vb(sat_per_vb)); tx_builder.fee_rate(FeeRate::from_sat_per_vb(sat_per_vb));
@ -347,9 +348,10 @@ impl TxBuilder {
tx_builder.drain_wallet(); tx_builder.drain_wallet();
} }
if let Some(address) = &self.drain_to { if let Some(address) = &self.drain_to {
let drain_to = let script_pubkey = Address::from_str(address)
Address::from_str(address).map_err(|e| BdkError::Generic(e.to_string()))?; .map(|a| a.script_pubkey())
tx_builder.drain_to(drain_to.script_pubkey()); .map_err(|e| BdkError::Generic(e.to_string()))?;
tx_builder.drain_to(script_pubkey);
} }
tx_builder tx_builder
.finish() .finish()