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

Update swap.rs

Browse source
This commit is contained in:
binarybaron 2024-07-03 20:02:04 +02:00
parent d7b649b7a6
commit 26e66ce9b9
1 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

19
swap/src/protocol/bob/swap.rs
View file

@ -17,6 +17,15 @@ pub fn is_complete(state: &BobState) -> bool {
) )
} }
// Checks if this is a state where we should exit after
// but we don't want to prevent resuming the swap in this state
// This is currently only used for the BtcPunished state because we might be able to
// recover from this state by attempting a cooperative XMR redeem but it might also fail.
// We want to avoid an infinite retry loop but also allow the user to retry manually by resuming the swap.
pub fn is_exit_early(state: &BobState) -> bool {
matches!(state, BobState::BtcPunished { .. })
}
#[allow(clippy::too_many_arguments)] #[allow(clippy::too_many_arguments)]
pub async fn run(swap: bob::Swap) -> Result<BobState> { pub async fn run(swap: bob::Swap) -> Result<BobState> {
run_until(swap, is_complete).await run_until(swap, is_complete).await
@ -39,14 +48,14 @@ pub async fn run_until(
swap.monero_receive_address, swap.monero_receive_address,
) )
.await?; .await?;
swap.db swap.db
.insert_latest_state(swap.id, current_state.clone().into()) .insert_latest_state(swap.id, current_state.clone().into())
.await?; .await?;
if matches!(current_state, BobState::BtcPunished { .. })
&& matches!(swap.state, BobState::BtcPunished { .. }) if is_exit_early(&current_state) {
{ break;
break; // Stops swap when cooperative redeem fails without preventing resuming swap in BtcPunished state. }
};
} }
Ok(current_state) Ok(current_state)