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

Post review changes

Browse Source
This commit is contained in:
Zoe Faltibà 2022-06-18 15:38:39 +02:00
parent 8f5ca7f0fc
commit 28a9b302d5
No known key found for this signature in database
GPG Key ID: 05CB7E816D1A93A8
2 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/bdk.udl
View File

@ -168,6 +168,7 @@ dictionary LocalUtxo {
OutPoint outpoint; OutPoint outpoint;
TxOut txout; TxOut txout;
KeychainKind keychain; KeychainKind keychain;
boolean is_spent;
}; };
interface Wallet { interface Wallet {

35
src/lib.rs
View File

@ -15,7 +15,8 @@ use bdk::miniscript::BareCtx;
use bdk::wallet::AddressIndex as BdkAddressIndex; use bdk::wallet::AddressIndex as BdkAddressIndex;
use bdk::wallet::AddressInfo as BdkAddressInfo; use bdk::wallet::AddressInfo as BdkAddressInfo;
use bdk::{ use bdk::{
BlockTime, Error, FeeRate, SignOptions, SyncOptions as BdkSyncOptions, Wallet as BdkWallet, BlockTime, Error, FeeRate, KeychainKind, SignOptions, SyncOptions as BdkSyncOptions,
Wallet as BdkWallet,
}; };
use std::convert::{From, TryFrom}; use std::convert::{From, TryFrom};
use std::fmt; use std::fmt;
@ -182,27 +183,15 @@ pub struct TxOut {
address: String, address: String,
} }
pub enum KeychainKind {
External = 0,
Internal = 1,
}
impl From<bdk::KeychainKind> for KeychainKind {
fn from(x: bdk::KeychainKind) -> KeychainKind {
match x {
bdk::KeychainKind::External => KeychainKind::External,
bdk::KeychainKind::Internal => KeychainKind::Internal,
}
}
}
pub struct LocalUtxo { pub struct LocalUtxo {
outpoint: OutPoint, outpoint: OutPoint,
txout: TxOut, txout: TxOut,
keychain: KeychainKind, keychain: KeychainKind,
is_spent: bool,
} }
trait NetworkLocalUtxo: { /// Trait used to convert a script to an address using the wallet network
trait NetworkLocalUtxo {
fn from_utxo(x: &bdk::LocalUtxo, network: Network) -> LocalUtxo; fn from_utxo(x: &bdk::LocalUtxo, network: Network) -> LocalUtxo;
} }
@ -216,9 +205,14 @@ impl NetworkLocalUtxo for LocalUtxo {
txout: TxOut { txout: TxOut {
value: x.txout.value, value: x.txout.value,
address: bdk::bitcoin::util::address::Address::from_script( address: bdk::bitcoin::util::address::Address::from_script(
&x.txout.script_pubkey, network).unwrap().to_string(), &x.txout.script_pubkey,
network,
)
.unwrap()
.to_string(),
}, },
keychain: KeychainKind::from(x.keychain), keychain: x.keychain,
is_spent: x.is_spent,
} }
} }
} }
@ -337,7 +331,10 @@ impl Wallet {
fn list_unspent(&self) -> Result<Vec<LocalUtxo>, Error> { fn list_unspent(&self) -> Result<Vec<LocalUtxo>, Error> {
let unspents = self.get_wallet().list_unspent()?; let unspents = self.get_wallet().list_unspent()?;
Ok(unspents.iter().map(|u| LocalUtxo::from_utxo(u, self.get_network())).collect()) Ok(unspents
.iter()
.map(|u| LocalUtxo::from_utxo(u, self.get_network()))
.collect())
} }
} }