Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2025-02-03 02:50:11 -05:00
Code Issues Packages Projects Releases Wiki Activity

Inline step function because it has been reduced to a single statement

Browse Source
This commit is contained in:
Thomas Eizinger 2021-03-18 12:58:37 +11:00
parent afb7e816a1
commit 8c9285f1f9
No known key found for this signature in database
GPG Key ID: 651AC83A6C6C8B96
2 changed files with 29 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
swap/src/protocol/alice/steps.rs
View File

@ -1,39 +1,6 @@
use crate::bitcoin; use crate::bitcoin;
use crate::bitcoin::{CancelTimelock, PunishTimelock, TxCancel, TxLock, TxRefund}; use crate::bitcoin::{PunishTimelock, TxCancel, TxRefund};
use anyhow::{bail, Context, Result}; use anyhow::{bail, Result};
pub async fn publish_cancel_transaction(
tx_lock: TxLock,
a: bitcoin::SecretKey,
B: bitcoin::PublicKey,
cancel_timelock: CancelTimelock,
tx_cancel_sig_bob: bitcoin::Signature,
bitcoin_wallet: &bitcoin::Wallet,
) -> Result<()> {
let tx_cancel = bitcoin::TxCancel::new(&tx_lock, cancel_timelock, a.public(), B);
// If Bob hasn't yet broadcasted the tx cancel, we do it
if bitcoin_wallet
.get_raw_transaction(tx_cancel.txid())
.await
.is_err()
{
// TODO(Franck): Maybe the cancel transaction is already mined, in this case,
// the broadcast will error out.
let transaction = tx_cancel
.complete_as_alice(a, B, tx_cancel_sig_bob)
.context("Failed to complete Bitcoin cancel transaction")?;
// TODO(Franck): Error handling is delicate, why can't we broadcast?
let (..) = bitcoin_wallet.broadcast(transaction, "cancel").await?;
// TODO(Franck): Wait until transaction is mined and returned mined
// block height
}
Ok(())
}
pub async fn wait_for_bitcoin_refund( pub async fn wait_for_bitcoin_refund(
tx_cancel: &TxCancel, tx_cancel: &TxCancel,

37
swap/src/protocol/alice/swap.rs
View File

@ -6,7 +6,7 @@ use crate::env::Config;
use crate::monero_ext::ScalarExt; use crate::monero_ext::ScalarExt;
use crate::protocol::alice; use crate::protocol::alice;
use crate::protocol::alice::event_loop::EventLoopHandle; use crate::protocol::alice::event_loop::EventLoopHandle;
use crate::protocol::alice::steps::{publish_cancel_transaction, wait_for_bitcoin_refund}; use crate::protocol::alice::steps::wait_for_bitcoin_refund;
use crate::protocol::alice::AliceState; use crate::protocol::alice::AliceState;
use crate::{bitcoin, database, monero}; use crate::{bitcoin, database, monero};
use anyhow::{bail, Context, Result}; use anyhow::{bail, Context, Result};
@ -259,15 +259,32 @@ async fn run_until_internal(
state3, state3,
monero_wallet_restore_blockheight, monero_wallet_restore_blockheight,
} => { } => {
publish_cancel_transaction( let tx_cancel = state3.tx_cancel();
state3.tx_lock.clone(),
state3.a.clone(), // If Bob hasn't yet broadcasted the tx cancel, we do it
state3.B, if bitcoin_wallet
state3.cancel_timelock, .get_raw_transaction(tx_cancel.txid())
state3.tx_cancel_sig_bob.clone(), .await
&bitcoin_wallet, .is_err()
) {
.await?; let transaction = tx_cancel
.complete_as_alice(
state3.a.clone(),
state3.B,
state3.tx_cancel_sig_bob.clone(),
)
.context("Failed to complete Bitcoin cancel transaction")?;
if let Err(e) = bitcoin_wallet.broadcast(transaction, "cancel").await {
tracing::debug!(
"Assuming transaction is already broadcasted because: {:#}",
e
)
}
// TODO(Franck): Wait until transaction is mined and
// returned mined block height
}
let state = AliceState::BtcCancelled { let state = AliceState::BtcCancelled {
state3, state3,