Skip to content

Commit a9e24dc

Browse files
Not there yet
1 parent 159e7ab commit a9e24dc

File tree

1 file changed

+27
-4
lines changed

1 file changed

+27
-4
lines changed

src/lib.rs

Lines changed: 27 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,15 @@ use bdk::miniscript::BareCtx;
2222
use bdk::wallet::tx_builder::ChangeSpendPolicy;
2323
use bdk::wallet::AddressIndex as BdkAddressIndex;
2424
use bdk::wallet::AddressInfo as BdkAddressInfo;
25-
use bdk::{
26-
BlockTime, Error, FeeRate, KeychainKind, SignOptions, SyncOptions as BdkSyncOptions,
27-
Wallet as BdkWallet,
28-
};
25+
use bdk::{bitcoin, BlockTime, Error, FeeRate, KeychainKind, SignOptions, SyncOptions as BdkSyncOptions, Wallet as BdkWallet};
2926
use std::collections::HashSet;
3027
use std::convert::{From, TryFrom};
3128
use std::fmt;
3229
use std::ops::Deref;
3330
use std::str::FromStr;
3431
use std::sync::{Arc, Mutex, MutexGuard};
32+
// use bitcoin::blockdata::script::Script as BdkScript;
33+
// use bdk::bitcoin::Script as BdkScript;
3534

3635
uniffi_macros::include_scaffolding!("bdk");
3736

@@ -462,6 +461,30 @@ fn to_script_pubkey(address: &str) -> Result<Script, BdkError> {
462461
.map_err(|e| BdkError::Generic(e.to_string()))
463462
}
464463

464+
// impl From<String> for Script {
465+
// fn from(_: String) -> Self {
466+
// todo!()
467+
// }
468+
// }
469+
470+
struct BindingsScript {
471+
script: Script
472+
}
473+
474+
impl BindingsScript {
475+
fn from_address(address: &str) -> Self {
476+
Address::from_str(address)
477+
.map(|x| x.script_pubkey())
478+
.map_err(|e| BdkError::Generic(e.to_string()))
479+
}
480+
481+
fn from_raw_script(output_script_raw: Vec<u8>) -> Self {
482+
return BindingsScript {
483+
script: Script::from(output_script_raw)
484+
};
485+
}
486+
}
487+
465488
#[derive(Clone, Debug)]
466489
enum RbfValue {
467490
Default,

0 commit comments

Comments
 (0)