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

Fix fmt and clippy errors

Browse Source
This commit is contained in:
thunderbiscuit 2023-03-13 14:52:17 -04:00
parent 7557e214c8
commit 9437051668
No known key found for this signature in database
GPG Key ID: 88253696EB836462
3 changed files with 30 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
bdk-ffi/src/lib.rs
View File

@ -15,9 +15,11 @@ use crate::keys::{DescriptorPublicKey, DescriptorSecretKey, Mnemonic};
use crate::psbt::PartiallySignedTransaction; use crate::psbt::PartiallySignedTransaction;
use crate::wallet::{BumpFeeTxBuilder, TxBuilder, Wallet}; use crate::wallet::{BumpFeeTxBuilder, TxBuilder, Wallet};
use bdk::bitcoin::blockdata::script::Script as BdkScript; use bdk::bitcoin::blockdata::script::Script as BdkScript;
use bdk::bitcoin::consensus::{Decodable, serialize}; use bdk::bitcoin::consensus::{serialize, Decodable};
use bdk::bitcoin::psbt::serialize::Serialize; use bdk::bitcoin::psbt::serialize::Serialize;
use bdk::bitcoin::{Address as BdkAddress, Network, OutPoint as BdkOutPoint, Transaction as BdkTransaction, Txid}; use bdk::bitcoin::{
Address as BdkAddress, Network, OutPoint as BdkOutPoint, Transaction as BdkTransaction, Txid,
};
use bdk::blockchain::Progress as BdkProgress; use bdk::blockchain::Progress as BdkProgress;
use bdk::database::any::{SledDbConfiguration, SqliteDbConfiguration}; use bdk::database::any::{SledDbConfiguration, SqliteDbConfiguration};
use bdk::keys::bip39::WordCount; use bdk::keys::bip39::WordCount;
@ -211,7 +213,9 @@ impl NetworkLocalUtxo for LocalUtxo {
}, },
txout: TxOut { txout: TxOut {
value: x.txout.value, value: x.txout.value,
script_pubkey: Arc::new(Script { script: x.txout.script_pubkey.clone() }) script_pubkey: Arc::new(Script {
script: x.txout.script_pubkey.clone(),
}),
}, },
keychain: x.keychain, keychain: x.keychain,
is_spent: x.is_spent, is_spent: x.is_spent,
@ -265,19 +269,27 @@ impl Transaction {
fn new(transaction_bytes: Vec<u8>) -> Result<Self, BdkError> { fn new(transaction_bytes: Vec<u8>) -> Result<Self, BdkError> {
let mut decoder = Cursor::new(transaction_bytes); let mut decoder = Cursor::new(transaction_bytes);
let tx: BdkTransaction = BdkTransaction::consensus_decode(&mut decoder)?; let tx: BdkTransaction = BdkTransaction::consensus_decode(&mut decoder)?;
let inputs: Vec<TxIn> = tx.input.iter().map(|input| TxIn { let inputs: Vec<TxIn> = tx
previous_output: OutPoint { .input
txid: input.previous_output.txid.to_string(), .iter()
vout: input.previous_output.vout, .map(|input| TxIn {
}, previous_output: OutPoint {
script_sig: Arc::new(Script::from(input.script_sig.clone())), txid: input.previous_output.txid.to_string(),
sequence: input.sequence.0, vout: input.previous_output.vout,
witness: input.witness.to_vec(), },
}).collect(); script_sig: Arc::new(Script::from(input.script_sig.clone())),
let outputs: Vec<TxOut> = tx.output.iter().map(|output| TxOut { sequence: input.sequence.0,
value: output.value, witness: input.witness.to_vec(),
script_pubkey: Arc::new(Script::from(output.script_pubkey.clone())), })
}).collect(); .collect();
let outputs: Vec<TxOut> = tx
.output
.iter()
.map(|output| TxOut {
value: output.value,
script_pubkey: Arc::new(Script::from(output.script_pubkey.clone())),
})
.collect();
Ok(Transaction { Ok(Transaction {
internal: tx.clone(), internal: tx.clone(),

2
bdk-ffi/src/psbt.rs
View File

@ -1,9 +1,9 @@
use bdk::bitcoin::consensus::serialize;
use bdk::bitcoin::hashes::hex::ToHex; use bdk::bitcoin::hashes::hex::ToHex;
use bdk::bitcoin::util::psbt::PartiallySignedTransaction as BdkPartiallySignedTransaction; use bdk::bitcoin::util::psbt::PartiallySignedTransaction as BdkPartiallySignedTransaction;
use bdk::psbt::PsbtUtils; use bdk::psbt::PsbtUtils;
use std::str::FromStr; use std::str::FromStr;
use std::sync::{Arc, Mutex}; use std::sync::{Arc, Mutex};
use bdk::bitcoin::consensus::serialize;
use crate::{BdkError, FeeRate, Transaction}; use crate::{BdkError, FeeRate, Transaction};

5
bdk-ffi/src/wallet.rs
View File

@ -129,10 +129,7 @@ impl Wallet {
/// which first needs to be Wallet.sync manually. /// which first needs to be Wallet.sync manually.
pub(crate) fn list_unspent(&self) -> Result<Vec<LocalUtxo>, BdkError> { pub(crate) fn list_unspent(&self) -> Result<Vec<LocalUtxo>, BdkError> {
let unspents = self.get_wallet().list_unspent()?; let unspents = self.get_wallet().list_unspent()?;
Ok(unspents Ok(unspents.iter().map(|u| LocalUtxo::from_utxo(u)).collect())
.iter()
.map(|u| LocalUtxo::from_utxo(u))
.collect())
} }
} }