Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2025-08-08 14:32:24 -04:00
Code Issues Projects Releases Packages Wiki Activity

fix(asb): Accept cooperative redeem request in both AliceState::BtcPunishable and AliceState::BtcPunished (#156)

Browse source 
Alice will accept a cooperative redeem request in both `AliceState::BtcPunishable` and `AliceState::BtcPunished` states. This allows Bob to request a cooperative redeem even if `tx_punish` has not been confirmed yet.
This commit is contained in:
binarybaron 2024-11-13 15:33:27 +01:00 • committed by GitHub
parent 65e8c8991a
commit f1fabcf8e3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
swap/src/asb/event_loop.rs
View file

@ -327,6 +327,7 @@ where
let swap_peer = self.db.get_peer_id(swap_id).await; let swap_peer = self.db.get_peer_id(swap_id).await;
let swap_state = self.db.get_state(swap_id).await; let swap_state = self.db.get_state(swap_id).await;
// If we do not find the swap in the database, or we do not have a peer-id for it, reject
let (swap_peer, swap_state) = match (swap_peer, swap_state) { let (swap_peer, swap_state) = match (swap_peer, swap_state) {
(Ok(peer), Ok(state)) => (peer, state), (Ok(peer), Ok(state)) => (peer, state),
_ => { _ => {
@ -343,6 +344,7 @@ where
} }
}; };
// If the peer is not the one associated with the swap, reject
if swap_peer != peer { if swap_peer != peer {
tracing::warn!( tracing::warn!(
swap_id = %swap_id, swap_id = %swap_id,
@ -357,7 +359,10 @@ where
continue; continue;
} }
let State::Alice (AliceState::BtcPunished { state3 }) = swap_state else { // If we are in either of these states, the punish timelock has expired
// Bob cannot refund the Bitcoin anymore. We can publish tx_punish to redeem the Bitcoin.
// Therefore it is safe to reveal s_a to let him redeem the Monero
let State::Alice (AliceState::BtcPunished { state3 } | AliceState::BtcPunishable { state3, .. }) = swap_state else {
tracing::warn!( tracing::warn!(
swap_id = %swap_id, swap_id = %swap_id,
reason = "swap is in invalid state", reason = "swap is in invalid state",