Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2025-10-12 05:20:53 -04:00
Code Issues Projects Releases Packages Wiki Activity

Shorten function name

Browse source 
This struct is a wallet. The only thing it can meaningfully broadcast
are transactions. The fact that they have to be signed for that is
implied. You cannot broadcast unsigned transactions.
This commit is contained in:
Thomas Eizinger 2021-03-02 12:25:47 +11:00
parent 45cff81ea5
commit 3a503bf95f
No known key found for this signature in database
GPG key ID: 651AC83A6C6C8B96
3 changed files with 7 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
swap/src/bitcoin/wallet.rs
View file

@ -147,7 +147,7 @@ impl Wallet {
self.inner.lock().await.network() self.inner.lock().await.network()
} }
pub async fn broadcast_signed_transaction(&self, transaction: Transaction) -> Result<Txid> { pub async fn broadcast(&self, transaction: Transaction) -> Result<Txid> {
let txid = transaction.txid(); let txid = transaction.txid();
self.inner self.inner

12
swap/src/protocol/alice/steps.rs
View file

@ -130,9 +130,7 @@ pub async fn publish_bitcoin_redeem_transaction(
bitcoin_wallet: Arc<bitcoin::Wallet>, bitcoin_wallet: Arc<bitcoin::Wallet>,
) -> Result<::bitcoin::Txid> { ) -> Result<::bitcoin::Txid> {
info!("Attempting to publish bitcoin redeem txn"); info!("Attempting to publish bitcoin redeem txn");
let txid = bitcoin_wallet let txid = bitcoin_wallet.broadcast(redeem_tx).await?;
.broadcast_signed_transaction(redeem_tx)
.await?;
Ok(txid) Ok(txid)
} }
@ -172,9 +170,7 @@ pub async fn publish_cancel_transaction(
.expect("sig_{a,b} to be valid signatures for tx_cancel"); .expect("sig_{a,b} to be valid signatures for tx_cancel");
// TODO(Franck): Error handling is delicate, why can't we broadcast? // TODO(Franck): Error handling is delicate, why can't we broadcast?
bitcoin_wallet bitcoin_wallet.broadcast(tx_cancel).await?;
.broadcast_signed_transaction(tx_cancel)
.await?;
// TODO(Franck): Wait until transaction is mined and returned mined // TODO(Franck): Wait until transaction is mined and returned mined
// block height // block height
@ -258,9 +254,7 @@ pub async fn publish_bitcoin_punish_transaction(
bitcoin_wallet: Arc<bitcoin::Wallet>, bitcoin_wallet: Arc<bitcoin::Wallet>,
execution_params: ExecutionParams, execution_params: ExecutionParams,
) -> Result<bitcoin::Txid> { ) -> Result<bitcoin::Txid> {
let txid = bitcoin_wallet let txid = bitcoin_wallet.broadcast(punish_tx).await?;
.broadcast_signed_transaction(punish_tx)
.await?;
bitcoin_wallet bitcoin_wallet
.wait_for_transaction_finality(txid, execution_params) .wait_for_transaction_finality(txid, execution_params)

12
swap/src/protocol/bob/state.rs
View file

@ -272,9 +272,7 @@ impl State2 {
let signed_tx_lock = bitcoin_wallet.sign_tx_lock(self.tx_lock.clone()).await?; let signed_tx_lock = bitcoin_wallet.sign_tx_lock(self.tx_lock.clone()).await?;
tracing::debug!("locking BTC in transaction {}", self.tx_lock.txid()); tracing::debug!("locking BTC in transaction {}", self.tx_lock.txid());
let _ = bitcoin_wallet let _ = bitcoin_wallet.broadcast(signed_tx_lock).await?;
.broadcast_signed_transaction(signed_tx_lock)
.await?;
Ok(State3 { Ok(State3 {
A: self.A, A: self.A,
@ -477,9 +475,7 @@ impl State4 {
tx_cancel", tx_cancel",
); );
let tx_id = bitcoin_wallet let tx_id = bitcoin_wallet.broadcast(tx_cancel).await?;
.broadcast_signed_transaction(tx_cancel)
.await?;
Ok(tx_id) Ok(tx_id)
} }
@ -548,9 +544,7 @@ impl State4 {
let signed_tx_refund = let signed_tx_refund =
tx_refund.add_signatures((self.A, sig_a), (self.b.public(), sig_b))?; tx_refund.add_signatures((self.A, sig_a), (self.b.public(), sig_b))?;
let txid = bitcoin_wallet let txid = bitcoin_wallet.broadcast(signed_tx_refund).await?;
.broadcast_signed_transaction(signed_tx_refund)
.await?;
bitcoin_wallet bitcoin_wallet
.wait_for_transaction_finality(txid, execution_params) .wait_for_transaction_finality(txid, execution_params)