Rename PartiallySignedBitcoinTransaction to PartiallySignedTransaction

This commit is contained in:
Steve Myers 2022-10-17 16:14:55 -05:00
parent 3a07b4838a
commit 9a381f6d32
No known key found for this signature in database
GPG Key ID: 8105A46B22C2D051
2 changed files with 20 additions and 20 deletions

View File

@ -137,7 +137,7 @@ interface Blockchain {
constructor(BlockchainConfig config); constructor(BlockchainConfig config);
[Throws=BdkError] [Throws=BdkError]
void broadcast([ByRef] PartiallySignedBitcoinTransaction psbt); void broadcast([ByRef] PartiallySignedTransaction psbt);
[Throws=BdkError] [Throws=BdkError]
u32 get_height(); u32 get_height();
@ -188,7 +188,7 @@ interface Wallet {
Balance get_balance(); Balance get_balance();
[Throws=BdkError] [Throws=BdkError]
boolean sign([ByRef] PartiallySignedBitcoinTransaction psbt); boolean sign([ByRef] PartiallySignedTransaction psbt);
[Throws=BdkError] [Throws=BdkError]
sequence<TransactionDetails> list_transactions(); sequence<TransactionDetails> list_transactions();
@ -202,7 +202,7 @@ interface Wallet {
sequence<LocalUtxo> list_unspent(); sequence<LocalUtxo> list_unspent();
}; };
interface PartiallySignedBitcoinTransaction { interface PartiallySignedTransaction {
[Throws=BdkError] [Throws=BdkError]
constructor(string psbt_base64); constructor(string psbt_base64);
@ -213,11 +213,11 @@ interface PartiallySignedBitcoinTransaction {
sequence<u8> extract_tx(); sequence<u8> extract_tx();
[Throws=BdkError] [Throws=BdkError]
PartiallySignedBitcoinTransaction combine(PartiallySignedBitcoinTransaction other); PartiallySignedTransaction combine(PartiallySignedTransaction other);
}; };
dictionary TxBuilderResult { dictionary TxBuilderResult {
PartiallySignedBitcoinTransaction psbt; PartiallySignedTransaction psbt;
TransactionDetails transaction_details; TransactionDetails transaction_details;
}; };
@ -270,7 +270,7 @@ interface BumpFeeTxBuilder {
BumpFeeTxBuilder enable_rbf_with_sequence(u32 nsequence); BumpFeeTxBuilder enable_rbf_with_sequence(u32 nsequence);
[Throws=BdkError] [Throws=BdkError]
PartiallySignedBitcoinTransaction finish([ByRef] Wallet wallet); PartiallySignedTransaction finish([ByRef] Wallet wallet);
}; };
interface Mnemonic { interface Mnemonic {

View File

@ -210,7 +210,7 @@ impl Blockchain {
self.blockchain_mutex.lock().expect("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(); let tx = psbt.internal.lock().unwrap().clone().extract_tx();
self.get_blockchain().broadcast(&tx) self.get_blockchain().broadcast(&tx)
} }
@ -341,14 +341,14 @@ impl fmt::Debug for ProgressHolder {
} }
#[derive(Debug)] #[derive(Debug)]
pub struct PartiallySignedBitcoinTransaction { pub struct PartiallySignedTransaction {
internal: Mutex<PartiallySignedTransaction>, internal: Mutex<BdkPartiallySignedTransaction>,
} }
impl PartiallySignedBitcoinTransaction { impl PartiallySignedTransaction {
fn new(psbt_base64: String) -> Result<Self, BdkError> { fn new(psbt_base64: String) -> Result<Self, BdkError> {
let psbt: PartiallySignedTransaction = PartiallySignedTransaction::from_str(&psbt_base64)?; let psbt: BdkPartiallySignedTransaction = BdkPartiallySignedTransaction::from_str(&psbt_base64)?;
Ok(PartiallySignedBitcoinTransaction { Ok(PartiallySignedTransaction {
internal: Mutex::new(psbt), internal: Mutex::new(psbt),
}) })
} }
@ -379,13 +379,13 @@ impl PartiallySignedBitcoinTransaction {
/// In accordance with BIP 174 this function is commutative i.e., `A.combine(B) == B.combine(A)` /// In accordance with BIP 174 this function is commutative i.e., `A.combine(B) == B.combine(A)`
fn combine( fn combine(
&self, &self,
other: Arc<PartiallySignedBitcoinTransaction>, other: Arc<PartiallySignedTransaction>,
) -> Result<Arc<PartiallySignedBitcoinTransaction>, BdkError> { ) -> Result<Arc<PartiallySignedTransaction>, BdkError> {
let other_psbt = other.internal.lock().unwrap().clone(); let other_psbt = other.internal.lock().unwrap().clone();
let mut original_psbt = self.internal.lock().unwrap().clone(); let mut original_psbt = self.internal.lock().unwrap().clone();
original_psbt.combine(other_psbt)?; original_psbt.combine(other_psbt)?;
Ok(Arc::new(PartiallySignedBitcoinTransaction { Ok(Arc::new(PartiallySignedTransaction {
internal: Mutex::new(original_psbt), internal: Mutex::new(original_psbt),
})) }))
} }
@ -460,7 +460,7 @@ impl Wallet {
} }
/// Sign a transaction with all the wallets signers. /// Sign a transaction with all the wallets signers.
fn sign(&self, psbt: &PartiallySignedBitcoinTransaction) -> Result<bool, BdkError> { fn sign(&self, psbt: &PartiallySignedTransaction) -> Result<bool, BdkError> {
let mut psbt = psbt.internal.lock().unwrap(); let mut psbt = psbt.internal.lock().unwrap();
self.get_wallet().sign(&mut psbt, SignOptions::default()) self.get_wallet().sign(&mut psbt, SignOptions::default())
} }
@ -532,7 +532,7 @@ enum RbfValue {
/// The result after calling the TxBuilder finish() function. Contains unsigned PSBT and /// The result after calling the TxBuilder finish() function. Contains unsigned PSBT and
/// transaction details. /// transaction details.
pub struct TxBuilderResult { pub struct TxBuilderResult {
pub psbt: Arc<PartiallySignedBitcoinTransaction>, pub psbt: Arc<PartiallySignedTransaction>,
pub transaction_details: TransactionDetails, pub transaction_details: TransactionDetails,
} }
@ -770,7 +770,7 @@ impl TxBuilder {
tx_builder tx_builder
.finish() .finish()
.map(|(psbt, tx_details)| TxBuilderResult { .map(|(psbt, tx_details)| TxBuilderResult {
psbt: Arc::new(PartiallySignedBitcoinTransaction { psbt: Arc::new(PartiallySignedTransaction {
internal: Mutex::new(psbt), internal: Mutex::new(psbt),
}), }),
transaction_details: TransactionDetails::from(&tx_details), transaction_details: TransactionDetails::from(&tx_details),
@ -828,7 +828,7 @@ impl BumpFeeTxBuilder {
} }
/// Finish building the transaction. Returns the BIP174 PSBT. /// 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 wallet = wallet.get_wallet();
let txid = Txid::from_str(self.txid.as_str())?; let txid = Txid::from_str(self.txid.as_str())?;
let mut tx_builder = wallet.build_fee_bump(txid)?; let mut tx_builder = wallet.build_fee_bump(txid)?;
@ -851,7 +851,7 @@ impl BumpFeeTxBuilder {
} }
tx_builder tx_builder
.finish() .finish()
.map(|(psbt, _)| PartiallySignedBitcoinTransaction { .map(|(psbt, _)| PartiallySignedTransaction {
internal: Mutex::new(psbt), internal: Mutex::new(psbt),
}) })
.map(Arc::new) .map(Arc::new)