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

Introduce T1Expired state for Bob properly and check expiries in states after both locked

Browse Source
This commit is contained in:
Daniel Karzel 2020-12-17 15:17:15 +11:00
parent 6ef6fc894f
commit 093cbaa4b4
2 changed files with 65 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
swap/src/bob/swap.rs
View File

@ -33,6 +33,7 @@ pub enum BobState {
XmrLocked(bob::State4, PeerId),
EncSigSent(bob::State4, PeerId),
BtcRedeemed(bob::State5),
T1Expired(bob::State4),
Cancelled(bob::State4),
BtcRefunded(bob::State4),
XmrRedeemed,
@ -49,6 +50,7 @@ impl fmt::Display for BobState {
BobState::XmrLocked(..) => write!(f, "xmr_locked"),
BobState::EncSigSent(..) => write!(f, "encsig_sent"),
BobState::BtcRedeemed(..) => write!(f, "btc_redeemed"),
BobState::T1Expired(..) => write!(f, "t1_expired"),
BobState::Cancelled(..) => write!(f, "cancelled"),
BobState::BtcRefunded(..) => write!(f, "btc_refunded"),
BobState::XmrRedeemed => write!(f, "xmr_redeemed"),
@ -70,6 +72,7 @@ impl From<BobState> for state::Bob {
BobState::XmrLocked(state4, peer_id) => Bob::XmrLocked { state4, peer_id },
BobState::EncSigSent(state4, peer_id) => Bob::EncSigSent { state4, peer_id },
BobState::BtcRedeemed(state5) => Bob::BtcRedeemed(state5),
BobState::T1Expired(state4) => Bob::T1Expired(state4),
BobState::Cancelled(state4) => Bob::BtcCancelled(state4),
BobState::BtcRefunded(_)
| BobState::XmrRedeemed
@ -90,6 +93,7 @@ impl TryFrom<state::Swap> for BobState {
Bob::XmrLocked { state4, peer_id } => BobState::XmrLocked(state4, peer_id),
Bob::EncSigSent { state4, peer_id } => BobState::EncSigSent(state4, peer_id),
Bob::BtcRedeemed(state5) => BobState::BtcRedeemed(state5),
Bob::T1Expired(state4) => BobState::T1Expired(state4),
Bob::BtcCancelled(state4) => BobState::Cancelled(state4),
Bob::SwapComplete => BobState::SafelyAborted,
};
@ -272,18 +276,27 @@ where
.await
}
BobState::XmrLocked(state, alice_peer_id) => {
// Alice has locked Xmr
// Bob sends Alice his key
let tx_redeem_encsig = state.tx_redeem_encsig();
// Do we have to wait for a response?
// What if Alice fails to receive this? Should we always resend?
// todo: If we cannot dial Alice we should go to EncSigSent. Maybe dialing
// should happen in this arm?
event_loop_handle
.send_message3(alice_peer_id.clone(), tx_redeem_encsig)
.await?;
let state = if let Epoch::T0 = state.current_epoch(bitcoin_wallet.as_ref()).await? {
// Alice has locked Xmr
// Bob sends Alice his key
let tx_redeem_encsig = state.tx_redeem_encsig();
let state = BobState::EncSigSent(state, alice_peer_id);
let state4_clone = state.clone();
let enc_sig_sent_watcher =
event_loop_handle.send_message3(alice_peer_id.clone(), tx_redeem_encsig);
let bitcoin_wallet = bitcoin_wallet.clone();
let t1_timeout = state4_clone.wait_for_t1(bitcoin_wallet.as_ref());
pin_mut!(enc_sig_sent_watcher);
pin_mut!(t1_timeout);
match select(enc_sig_sent_watcher, t1_timeout).await {
Either::Left((..)) => BobState::EncSigSent(state, alice_peer_id),
Either::Right((..)) => BobState::T1Expired(state),
}
} else {
BobState::T1Expired(state)
};
let db_state = state.clone().into();
db.insert_latest_state(swap_id, state::Swap::Bob(db_state))
.await?;
@ -300,28 +313,20 @@ where
.await
}
BobState::EncSigSent(state, ..) => {
let state_clone = state.clone();
let redeem_watcher = state_clone.watch_for_redeem_btc(bitcoin_wallet.as_ref());
let t1_timeout = state_clone.wait_for_t1(bitcoin_wallet.as_ref());
let state = if let Epoch::T0 = state.current_epoch(bitcoin_wallet.as_ref()).await? {
let state_clone = state.clone();
let redeem_watcher = state_clone.watch_for_redeem_btc(bitcoin_wallet.as_ref());
let t1_timeout = state_clone.wait_for_t1(bitcoin_wallet.as_ref());
pin_mut!(redeem_watcher);
pin_mut!(t1_timeout);
pin_mut!(redeem_watcher);
pin_mut!(t1_timeout);
let state = match select(redeem_watcher, t1_timeout).await {
Either::Left((val, _)) => BobState::BtcRedeemed(val?),
Either::Right((..)) => {
// Check whether TxCancel has been published.
// We should not fail if the transaction is already on the blockchain
if state
.check_for_tx_cancel(bitcoin_wallet.as_ref())
.await
.is_err()
{
state.submit_tx_cancel(bitcoin_wallet.as_ref()).await?;
}
BobState::Cancelled(state)
match select(redeem_watcher, t1_timeout).await {
Either::Left((val, _)) => BobState::BtcRedeemed(val?),
Either::Right((..)) => BobState::T1Expired(state),
}
} else {
BobState::T1Expired(state)
};
let db_state = state.clone().into();
@ -359,6 +364,31 @@ where
)
.await
}
BobState::T1Expired(state4) => {
if state4
.check_for_tx_cancel(bitcoin_wallet.as_ref())
.await
.is_err()
{
state4.submit_tx_cancel(bitcoin_wallet.as_ref()).await?;
}
let state = BobState::Cancelled(state4);
db.insert_latest_state(swap_id, state::Swap::Bob(state.clone().into()))
.await?;
run_until(
state,
is_target_state,
event_loop_handle,
db,
bitcoin_wallet,
monero_wallet,
rng,
swap_id,
)
.await
}
BobState::Cancelled(state) => {
// TODO
// Bob has cancelled the swap

8
swap/src/state.rs
View File

@ -60,6 +60,7 @@ pub enum Bob {
peer_id: PeerId,
},
BtcRedeemed(bob::State5),
T1Expired(bob::State4),
BtcCancelled(bob::State4),
SwapComplete,
}
@ -106,9 +107,10 @@ impl Display for Bob {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
match self {
Bob::Negotiated { .. } => f.write_str("Handshake complete"),
Bob::BtcLocked { .. } | Bob::XmrLocked { .. } | Bob::BtcCancelled(_) => {
f.write_str("Bitcoin refundable")
}
Bob::BtcLocked { .. }
| Bob::XmrLocked { .. }
| Bob::T1Expired(_)
| Bob::BtcCancelled(_) => f.write_str("Bitcoin refundable"),
Bob::BtcRedeemed(_) => f.write_str("Monero redeemable"),
Bob::SwapComplete => f.write_str("Swap complete"),
Bob::EncSigSent { .. } => f.write_str("Encrypted signature sent"),