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

Bob peer id can be retrieved from the DB

Browse source 
This remove branches where Alice resumes from the DB but cannot contact
Bob.
This commit is contained in:
Franck Royer 2021-01-22 14:56:11 +11:00
parent a910bc2046
commit 33db688e3a
No known key found for this signature in database
GPG key ID: A82ED75A8DFC50A4
6 changed files with 111 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

57
swap/src/protocol/alice/swap.rs
View file

@ -91,11 +91,11 @@ async fn run_until_internal(
} else {
match state {
AliceState::Started { amounts, state0 } => {
let (peer_id, state3) =
let (bob_peer_id, state3) =
negotiate(state0, amounts.xmr, &mut event_loop_handle, config).await?;
let state = AliceState::Negotiated {
bob_peer_id: Some(peer_id),
bob_peer_id,
amounts,
state3: Box::new(state3),
};
@ -120,27 +120,14 @@ async fn run_until_internal(
bob_peer_id,
amounts,
} => {
let state = match bob_peer_id {
Some(bob_peer_id) => {
let _ = wait_for_locked_bitcoin(
state3.tx_lock.txid(),
bitcoin_wallet.clone(),
config,
)
let _ =
wait_for_locked_bitcoin(state3.tx_lock.txid(), bitcoin_wallet.clone(), config)
.await?;
AliceState::BtcLocked {
bob_peer_id: Some(bob_peer_id),
amounts,
state3,
}
}
None => {
tracing::info!("Cannot resume swap from negotiated state, aborting");
// Alice did not lock Xmr yet
AliceState::SafelyAborted
}
let state = AliceState::BtcLocked {
bob_peer_id,
amounts,
state3,
};
let db_state = (&state).into();
@ -163,26 +150,16 @@ async fn run_until_internal(
amounts,
state3,
} => {
let state = match bob_peer_id {
Some(bob_peer_id) => {
lock_xmr(
bob_peer_id,
amounts,
*state3.clone(),
&mut event_loop_handle,
monero_wallet.clone(),
)
.await?;
lock_xmr(
bob_peer_id,
amounts,
*state3.clone(),
&mut event_loop_handle,
monero_wallet.clone(),
)
.await?;
AliceState::XmrLocked { state3 }
}
None => {
tracing::info!("Cannot resume swap from BTC locked state, aborting");
// Alice did not lock Xmr yet
AliceState::SafelyAborted
}
};
let state = AliceState::XmrLocked { state3 };
let db_state = (&state).into();
db.insert_latest_state(swap_id, database::Swap::Alice(db_state))