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

Simplify racing cancel timelock against learning enc-sig

Browse Source
This commit is contained in:
Thomas Eizinger 2021-03-17 17:13:47 +11:00
parent 575893fb51
commit a1e065b4e7
No known key found for this signature in database
GPG Key ID: 651AC83A6C6C8B96
2 changed files with 18 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
swap/src/protocol/alice/steps.rs
View File

@ -1,6 +1,4 @@
use crate::bitcoin::{ use crate::bitcoin::{CancelTimelock, PunishTimelock, TxCancel, TxLock, TxRefund};
CancelTimelock, EncryptedSignature, PunishTimelock, TxCancel, TxLock, TxRefund,
};
use crate::protocol::alice; use crate::protocol::alice;
use crate::protocol::alice::event_loop::EventLoopHandle; use crate::protocol::alice::event_loop::EventLoopHandle;
use crate::{bitcoin, monero}; use crate::{bitcoin, monero};
@ -32,19 +30,6 @@ pub async fn lock_xmr(
Ok(()) Ok(())
} }
pub async fn wait_for_bitcoin_encrypted_signature(
event_loop_handle: &mut EventLoopHandle,
) -> Result<EncryptedSignature> {
let msg3 = event_loop_handle
.recv_encrypted_signature()
.await
.context("Failed to receive Bitcoin encrypted signature from Bob")?;
tracing::debug!("Message 3 received, returning it");
Ok(msg3)
}
pub async fn publish_cancel_transaction( pub async fn publish_cancel_transaction(
tx_lock: TxLock, tx_lock: TxLock,
a: bitcoin::SecretKey, a: bitcoin::SecretKey,

29
swap/src/protocol/alice/swap.rs
View File

@ -7,8 +7,7 @@ use crate::monero_ext::ScalarExt;
use crate::protocol::alice; use crate::protocol::alice;
use crate::protocol::alice::event_loop::EventLoopHandle; use crate::protocol::alice::event_loop::EventLoopHandle;
use crate::protocol::alice::steps::{ use crate::protocol::alice::steps::{
extract_monero_private_key, lock_xmr, publish_cancel_transaction, extract_monero_private_key, lock_xmr, publish_cancel_transaction, wait_for_bitcoin_refund,
wait_for_bitcoin_encrypted_signature, wait_for_bitcoin_refund,
}; };
use crate::protocol::alice::AliceState; use crate::protocol::alice::AliceState;
use crate::{bitcoin, database, monero}; use crate::{bitcoin, database, monero};
@ -18,6 +17,7 @@ use futures::future::{select, Either};
use futures::pin_mut; use futures::pin_mut;
use rand::{CryptoRng, RngCore}; use rand::{CryptoRng, RngCore};
use std::sync::Arc; use std::sync::Arc;
use tokio::select;
use tokio::time::timeout; use tokio::time::timeout;
use tracing::{error, info}; use tracing::{error, info};
use uuid::Uuid; use uuid::Uuid;
@ -141,25 +141,22 @@ async fn run_until_internal(
} => { } => {
let state = match state3.expired_timelocks(bitcoin_wallet.as_ref()).await? { let state = match state3.expired_timelocks(bitcoin_wallet.as_ref()).await? {
ExpiredTimelocks::None => { ExpiredTimelocks::None => {
let wait_for_enc_sig = select! {
wait_for_bitcoin_encrypted_signature(&mut event_loop_handle); _ = state3.wait_for_cancel_timelock_to_expire(bitcoin_wallet.as_ref()) => {
let state3_clone = state3.clone(); AliceState::CancelTimelockExpired {
let cancel_timelock_expires = state3_clone
.wait_for_cancel_timelock_to_expire(bitcoin_wallet.as_ref());
pin_mut!(wait_for_enc_sig);
pin_mut!(cancel_timelock_expires);
match select(cancel_timelock_expires, wait_for_enc_sig).await {
Either::Left(_) => AliceState::CancelTimelockExpired {
state3, state3,
monero_wallet_restore_blockheight, monero_wallet_restore_blockheight,
}, }
Either::Right((enc_sig, _)) => AliceState::EncSigLearned { }
enc_sig = event_loop_handle.recv_encrypted_signature() => {
tracing::info!("Received encrypted signature");
AliceState::EncSigLearned {
state3, state3,
encrypted_signature: Box::new(enc_sig?), encrypted_signature: Box::new(enc_sig?),
monero_wallet_restore_blockheight, monero_wallet_restore_blockheight,
}, }
}
} }
} }
_ => AliceState::CancelTimelockExpired { _ => AliceState::CancelTimelockExpired {