Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2024-10-01 01:45:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Refund swap if resumed from a step that requires further communication

Browse Source
This commit is contained in:
Franck Royer 2020-12-02 14:58:17 +11:00
parent 11cea9ba69
commit c095693a5f
No known key found for this signature in database
GPG Key ID: A82ED75A8DFC50A4
1 changed files with 73 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

110
swap/src/alice/swap.rs
View File

@ -45,12 +45,12 @@ pub enum AliceState {
state0: State0,
},
Negotiated {
channel: ResponseChannel<AliceToBob>,
channel: Option<ResponseChannel<AliceToBob>>,
amounts: SwapAmounts,
state3: State3,
},
BtcLocked {
channel: ResponseChannel<AliceToBob>,
channel: Option<ResponseChannel<AliceToBob>>,
amounts: SwapAmounts,
state3: State3,
},
@ -159,7 +159,7 @@ pub async fn run_until(
run_until(
AliceState::Negotiated {
channel,
channel: Some(channel),
amounts,
state3,
},
@ -176,48 +176,84 @@ pub async fn run_until(
channel,
amounts,
} => {
let _ =
wait_for_locked_bitcoin(state3.tx_lock.txid(), bitcoin_wallet.clone(), config)
match channel {
Some(channel) => {
let _ = wait_for_locked_bitcoin(
state3.tx_lock.txid(),
bitcoin_wallet.clone(),
config,
)
.await?;
run_until(
AliceState::BtcLocked {
channel,
amounts,
state3,
},
is_target_state,
event_loop_handle,
bitcoin_wallet,
monero_wallet,
config,
)
.await
run_until(
AliceState::BtcLocked {
channel: Some(channel),
amounts,
state3,
},
is_target_state,
event_loop_handle,
bitcoin_wallet,
monero_wallet,
config,
)
.await
}
None => {
tracing::info!("Cannot resume swap from negotiated state, aborting");
// Alice did not lock Xmr yet
run_until(
AliceState::SafelyAborted,
is_target_state,
event_loop_handle,
bitcoin_wallet,
monero_wallet,
config,
)
.await
}
}
}
AliceState::BtcLocked {
channel,
amounts,
state3,
} => {
lock_xmr(
channel,
amounts,
state3.clone(),
&mut event_loop_handle,
monero_wallet.clone(),
)
.await?;
} => match channel {
Some(channel) => {
lock_xmr(
channel,
amounts,
state3.clone(),
&mut event_loop_handle,
monero_wallet.clone(),
)
.await?;
run_until(
AliceState::XmrLocked { state3 },
is_target_state,
event_loop_handle,
bitcoin_wallet,
monero_wallet,
config,
)
.await
}
run_until(
AliceState::XmrLocked { state3 },
is_target_state,
event_loop_handle,
bitcoin_wallet,
monero_wallet,
config,
)
.await
}
None => {
tracing::info!("Cannot resume swap from BTC locked state, aborting");
// Alice did not lock Xmr yet
swap(
AliceState::SafelyAborted,
event_loop_handle,
bitcoin_wallet,
monero_wallet,
config,
)
.await
}
},
AliceState::XmrLocked { state3 } => {
// todo: match statement and wait for t1 can probably be expressed more cleanly
match state3.current_epoch(bitcoin_wallet.as_ref()).await? {