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

Move txid getter to PartiallySignedBitcoinTransaction

Browse Source
This commit is contained in:
Steve Myers 2022-04-22 14:10:00 -07:00
parent 4665c551dd
commit 11ba16ec1b
No known key found for this signature in database
GPG Key ID: 8105A46B22C2D051
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/bdk.udl
View File

@ -116,7 +116,7 @@ interface Blockchain {
[Throws=BdkError] [Throws=BdkError]
constructor(BlockchainConfig config); constructor(BlockchainConfig config);
[Throws=BdkError] [Throws=BdkError]
string broadcast([ByRef] PartiallySignedBitcoinTransaction psbt); void broadcast([ByRef] PartiallySignedBitcoinTransaction psbt);
}; };
callback interface Progress { callback interface Progress {
@ -143,6 +143,7 @@ interface PartiallySignedBitcoinTransaction {
[Throws=BdkError] [Throws=BdkError]
constructor(string psbt_base64); constructor(string psbt_base64);
string serialize(); string serialize();
string txid();
}; };
interface TxBuilder { interface TxBuilder {

15
src/lib.rs
View File

@ -133,12 +133,9 @@ impl Blockchain {
self.blockchain_mutex.lock().expect("blockchain") self.blockchain_mutex.lock().expect("blockchain")
} }
fn broadcast(&self, psbt: &PartiallySignedBitcoinTransaction) -> Result<String, Error> { fn broadcast(&self, psbt: &PartiallySignedBitcoinTransaction) -> Result<(), Error> {
let tx = psbt.internal.lock().unwrap().clone().extract_tx(); let tx = psbt.internal.lock().unwrap().clone().extract_tx();
self.get_blockchain().broadcast(&tx)?; self.get_blockchain().broadcast(&tx)
// TODO move txid getter to PartiallySignedBitcoinTransaction
let txid = tx.txid();
Ok(txid.to_hex())
} }
} }
@ -184,6 +181,12 @@ impl PartiallySignedBitcoinTransaction {
let psbt = self.internal.lock().unwrap().clone(); let psbt = self.internal.lock().unwrap().clone();
psbt.to_string() psbt.to_string()
} }
fn txid(&self) -> String {
let tx = self.internal.lock().unwrap().clone().extract_tx();
let txid = tx.txid();
txid.to_hex()
}
} }
impl Wallet { impl Wallet {
@ -220,8 +223,6 @@ impl Wallet {
&self, &self,
blockchain: &Blockchain, blockchain: &Blockchain,
progress: Option<Box<dyn Progress>>, progress: Option<Box<dyn Progress>>,
//progress_update: Box<dyn BdkProgress>,
//max_address_param: Option<u32>,
) -> Result<(), BdkError> { ) -> Result<(), BdkError> {
let bdk_sync_opts = BdkSyncOptions { let bdk_sync_opts = BdkSyncOptions {
progress: progress.map(|p| { progress: progress.map(|p| {