Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2024-12-24 23:19:34 -05:00
Code Issues Packages Projects Releases Wiki Activity

Move check to outside of select, in case Alice redeems the BTC and we saw that before we get confirmation that she received the encrypted signature.

Browse Source
This commit is contained in:
pokkst 2023-08-14 00:56:39 -05:00 committed by binarybaron
parent 9f09bd759c
commit c9f379a108
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
swap/src/protocol/bob/swap.rs
View File

@ -186,17 +186,13 @@ async fn next_state(
let tx_lock_status = bitcoin_wallet.subscribe_to(state.tx_lock.clone()).await; let tx_lock_status = bitcoin_wallet.subscribe_to(state.tx_lock.clone()).await;
if let Ok(state5) = state.check_for_tx_redeem(bitcoin_wallet).await { if let Ok(state5) = state.check_for_tx_redeem(bitcoin_wallet).await {
// this is in case we send the encrypted signature to alice, but we don't get confirmation that she received it. alice would be able to redeem the btc, but we would be stuck in xmrlocked, never being able to redeem the xmr.
BobState::BtcRedeemed(state5) BobState::BtcRedeemed(state5)
} else if let ExpiredTimelocks::None { .. } = state.expired_timelock(bitcoin_wallet).await? { } else if let ExpiredTimelocks::None { .. } = state.expired_timelock(bitcoin_wallet).await? {
// Alice has locked Xmr // Alice has locked Xmr
// Bob sends Alice his key // Bob sends Alice his key
select! { select! {
state5 = state.watch_for_redeem_btc(bitcoin_wallet) => {
// there seems to be a weird edge case where you can send the encrypted signature, alice can redeem the btc, but your database doesn't update to encsigsent or btcredeemed, so here we will watch for redemption too, so we have a chance to unlock xmr.
// this seemed to have happened when a surge of blocks came in on stagenet within a short time frame
BobState::BtcRedeemed(state5?)
},
result = event_loop_handle.send_encrypted_signature(state.tx_redeem_encsig()) => { result = event_loop_handle.send_encrypted_signature(state.tx_redeem_encsig()) => {
match result { match result {
Ok(_) => BobState::EncSigSent(state), Ok(_) => BobState::EncSigSent(state),