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

Allow cancel, refund for swap that are in SwapSetupCompleted state

Browse Source
This commit is contained in:
binarybaron 2022-05-12 20:19:13 +02:00
parent 365078d394
commit 15b8be7838
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
swap/src/cli/cancel.rs
View File

@ -14,6 +14,7 @@ pub async fn cancel(
let state = db.get_state(swap_id).await?.try_into()?; let state = db.get_state(swap_id).await?.try_into()?;
let state6 = match state { let state6 = match state {
BobState::SwapSetupCompleted(state2) => state2.cancel(),
BobState::BtcLocked { state3, .. } => state3.cancel(), BobState::BtcLocked { state3, .. } => state3.cancel(),
BobState::XmrLockProofReceived { state, .. } => state.cancel(), BobState::XmrLockProofReceived { state, .. } => state.cancel(),
BobState::XmrLocked(state4) => state4.cancel(), BobState::XmrLocked(state4) => state4.cancel(),
@ -23,7 +24,6 @@ pub async fn cancel(
BobState::BtcCancelled(state6) => state6, BobState::BtcCancelled(state6) => state6,
BobState::Started { .. } BobState::Started { .. }
| BobState::SwapSetupCompleted(_)
| BobState::BtcRedeemed(_) | BobState::BtcRedeemed(_)
| BobState::XmrRedeemed { .. } | BobState::XmrRedeemed { .. }
| BobState::BtcPunished { .. } | BobState::BtcPunished { .. }

2
swap/src/cli/refund.rs
View File

@ -14,6 +14,7 @@ pub async fn refund(
let state = db.get_state(swap_id).await?.try_into()?; let state = db.get_state(swap_id).await?.try_into()?;
let state6 = match state { let state6 = match state {
BobState::SwapSetupCompleted(state2) => state2.cancel(),
BobState::BtcLocked { state3, .. } => state3.cancel(), BobState::BtcLocked { state3, .. } => state3.cancel(),
BobState::XmrLockProofReceived { state, .. } => state.cancel(), BobState::XmrLockProofReceived { state, .. } => state.cancel(),
BobState::XmrLocked(state4) => state4.cancel(), BobState::XmrLocked(state4) => state4.cancel(),
@ -21,7 +22,6 @@ pub async fn refund(
BobState::CancelTimelockExpired(state6) => state6, BobState::CancelTimelockExpired(state6) => state6,
BobState::BtcCancelled(state6) => state6, BobState::BtcCancelled(state6) => state6,
BobState::Started { .. } BobState::Started { .. }
| BobState::SwapSetupCompleted(_)
| BobState::BtcRedeemed(_) | BobState::BtcRedeemed(_)
| BobState::BtcRefunded(_) | BobState::BtcRefunded(_)
| BobState::XmrRedeemed { .. } | BobState::XmrRedeemed { .. }

16
swap/src/protocol/bob/state.rs
View File

@ -331,6 +331,22 @@ impl State2 {
} }
} }
pub fn cancel(&self) -> State6 {
State6 {
A: self.A,
b: self.b.clone(),
s_b: self.s_b,
cancel_timelock: self.cancel_timelock,
punish_timelock: self.punish_timelock,
refund_address: self.refund_address.clone(),
tx_lock: self.tx_lock.clone(),
tx_cancel_sig_a: self.tx_cancel_sig_a.clone(),
tx_refund_encsig: self.tx_refund_encsig.clone(),
tx_refund_fee: self.tx_refund_fee,
tx_cancel_fee: self.tx_cancel_fee,
}
}
pub async fn lock_btc(self) -> Result<(State3, TxLock)> { pub async fn lock_btc(self) -> Result<(State3, TxLock)> {
Ok(( Ok((
State3 { State3 {