Skip to content

Commit

Permalink
Rename PartiallySignedBitcoinTransaction to PartiallySignedTransaction
Browse files Browse the repository at this point in the history
  • Loading branch information
notmandatory committed Nov 7, 2022
1 parent 3a07b48 commit 9a381f6
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 20 deletions.
12 changes: 6 additions & 6 deletions src/bdk.udl
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ interface Blockchain {
constructor(BlockchainConfig config);

[Throws=BdkError]
void broadcast([ByRef] PartiallySignedBitcoinTransaction psbt);
void broadcast([ByRef] PartiallySignedTransaction psbt);

[Throws=BdkError]
u32 get_height();
Expand Down Expand Up @@ -188,7 +188,7 @@ interface Wallet {
Balance get_balance();

[Throws=BdkError]
boolean sign([ByRef] PartiallySignedBitcoinTransaction psbt);
boolean sign([ByRef] PartiallySignedTransaction psbt);

[Throws=BdkError]
sequence<TransactionDetails> list_transactions();
Expand All @@ -202,7 +202,7 @@ interface Wallet {
sequence<LocalUtxo> list_unspent();
};

interface PartiallySignedBitcoinTransaction {
interface PartiallySignedTransaction {
[Throws=BdkError]
constructor(string psbt_base64);

Expand All @@ -213,11 +213,11 @@ interface PartiallySignedBitcoinTransaction {
sequence<u8> extract_tx();

[Throws=BdkError]
PartiallySignedBitcoinTransaction combine(PartiallySignedBitcoinTransaction other);
PartiallySignedTransaction combine(PartiallySignedTransaction other);
};

dictionary TxBuilderResult {
PartiallySignedBitcoinTransaction psbt;
PartiallySignedTransaction psbt;
TransactionDetails transaction_details;
};

Expand Down Expand Up @@ -270,7 +270,7 @@ interface BumpFeeTxBuilder {
BumpFeeTxBuilder enable_rbf_with_sequence(u32 nsequence);

[Throws=BdkError]
PartiallySignedBitcoinTransaction finish([ByRef] Wallet wallet);
PartiallySignedTransaction finish([ByRef] Wallet wallet);
};

interface Mnemonic {
Expand Down
28 changes: 14 additions & 14 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ impl Blockchain {
self.blockchain_mutex.lock().expect("blockchain")
}

fn broadcast(&self, psbt: &PartiallySignedBitcoinTransaction) -> Result<(), BdkError> {
fn broadcast(&self, psbt: &PartiallySignedTransaction) -> Result<(), BdkError> {
let tx = psbt.internal.lock().unwrap().clone().extract_tx();
self.get_blockchain().broadcast(&tx)
}
Expand Down Expand Up @@ -341,14 +341,14 @@ impl fmt::Debug for ProgressHolder {
}

#[derive(Debug)]
pub struct PartiallySignedBitcoinTransaction {
internal: Mutex<PartiallySignedTransaction>,
pub struct PartiallySignedTransaction {
internal: Mutex<BdkPartiallySignedTransaction>,
}

impl PartiallySignedBitcoinTransaction {
impl PartiallySignedTransaction {
fn new(psbt_base64: String) -> Result<Self, BdkError> {
let psbt: PartiallySignedTransaction = PartiallySignedTransaction::from_str(&psbt_base64)?;
Ok(PartiallySignedBitcoinTransaction {
let psbt: BdkPartiallySignedTransaction = BdkPartiallySignedTransaction::from_str(&psbt_base64)?;
Ok(PartiallySignedTransaction {
internal: Mutex::new(psbt),
})
}
Expand Down Expand Up @@ -379,13 +379,13 @@ impl PartiallySignedBitcoinTransaction {
/// In accordance with BIP 174 this function is commutative i.e., `A.combine(B) == B.combine(A)`
fn combine(
&self,
other: Arc<PartiallySignedBitcoinTransaction>,
) -> Result<Arc<PartiallySignedBitcoinTransaction>, BdkError> {
other: Arc<PartiallySignedTransaction>,
) -> Result<Arc<PartiallySignedTransaction>, BdkError> {
let other_psbt = other.internal.lock().unwrap().clone();
let mut original_psbt = self.internal.lock().unwrap().clone();

original_psbt.combine(other_psbt)?;
Ok(Arc::new(PartiallySignedBitcoinTransaction {
Ok(Arc::new(PartiallySignedTransaction {
internal: Mutex::new(original_psbt),
}))
}
Expand Down Expand Up @@ -460,7 +460,7 @@ impl Wallet {
}

/// Sign a transaction with all the wallet’s signers.
fn sign(&self, psbt: &PartiallySignedBitcoinTransaction) -> Result<bool, BdkError> {
fn sign(&self, psbt: &PartiallySignedTransaction) -> Result<bool, BdkError> {
let mut psbt = psbt.internal.lock().unwrap();
self.get_wallet().sign(&mut psbt, SignOptions::default())
}
Expand Down Expand Up @@ -532,7 +532,7 @@ enum RbfValue {
/// The result after calling the TxBuilder finish() function. Contains unsigned PSBT and
/// transaction details.
pub struct TxBuilderResult {
pub psbt: Arc<PartiallySignedBitcoinTransaction>,
pub psbt: Arc<PartiallySignedTransaction>,
pub transaction_details: TransactionDetails,
}

Expand Down Expand Up @@ -770,7 +770,7 @@ impl TxBuilder {
tx_builder
.finish()
.map(|(psbt, tx_details)| TxBuilderResult {
psbt: Arc::new(PartiallySignedBitcoinTransaction {
psbt: Arc::new(PartiallySignedTransaction {
internal: Mutex::new(psbt),
}),
transaction_details: TransactionDetails::from(&tx_details),
Expand Down Expand Up @@ -828,7 +828,7 @@ impl BumpFeeTxBuilder {
}

/// Finish building the transaction. Returns the BIP174 PSBT.
fn finish(&self, wallet: &Wallet) -> Result<Arc<PartiallySignedBitcoinTransaction>, BdkError> {
fn finish(&self, wallet: &Wallet) -> Result<Arc<PartiallySignedTransaction>, BdkError> {
let wallet = wallet.get_wallet();
let txid = Txid::from_str(self.txid.as_str())?;
let mut tx_builder = wallet.build_fee_bump(txid)?;
Expand All @@ -851,7 +851,7 @@ impl BumpFeeTxBuilder {
}
tx_builder
.finish()
.map(|(psbt, _)| PartiallySignedBitcoinTransaction {
.map(|(psbt, _)| PartiallySignedTransaction {
internal: Mutex::new(psbt),
})
.map(Arc::new)
Expand Down

0 comments on commit 9a381f6

Please sign in to comment.