Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2025-12-16 09:03:54 -05:00
Code Issues Projects Releases Packages Wiki Activity

implement refund and lock check

Browse source
This commit is contained in:
patrini32 2024-06-05 01:58:53 +03:00 • committed by patrini32
parent 957c33bffe
commit a9a1724ad3
1 changed files with 40 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

67
swap/src/cli/cancel_and_refund.rs
View file

@ -1,4 +1,4 @@
use crate::bitcoin::{parse_rpc_error_code, RpcErrorCode, Wallet}; use crate::bitcoin::{parse_rpc_error_code, ExpiredTimelocks, RpcErrorCode, Wallet};
use crate::protocol::bob::BobState; use crate::protocol::bob::BobState;
use crate::protocol::Database; use crate::protocol::Database;
use anyhow::{bail, Result}; use anyhow::{bail, Result};
@ -11,14 +11,8 @@ pub async fn cancel_and_refund(
bitcoin_wallet: Arc<Wallet>, bitcoin_wallet: Arc<Wallet>,
db: Arc<dyn Database + Send + Sync>, db: Arc<dyn Database + Send + Sync>,
) -> Result<BobState> { ) -> Result<BobState> {
match cancel(swap_id, bitcoin_wallet.clone(), db.clone()).await { if let Err(err) = cancel(swap_id, bitcoin_wallet.clone(), db.clone()).await {
Ok((_, state @ BobState::BtcPunished { .. })) => { tracing::info!(%err, "Could not submit cancel transaction");
return Ok(state);
}
Err(err) => {
tracing::info!(%err, "Could not submit cancel transaction");
}
_ => {}
}; };
let state = match refund(swap_id, bitcoin_wallet, db).await { let state = match refund(swap_id, bitcoin_wallet, db).await {
@ -62,35 +56,36 @@ pub async fn cancel(
match state6.submit_tx_cancel(bitcoin_wallet.as_ref()).await { match state6.submit_tx_cancel(bitcoin_wallet.as_ref()).await {
Ok((txid, _)) => { Ok((txid, _)) => {
let state = BobState::BtcPunished { let state = BobState::BtcCancelled(state6);
tx_lock_id: state6.tx_lock_id(),
};
db.insert_latest_state(swap_id, state.clone().into()) db.insert_latest_state(swap_id, state.clone().into())
.await?; .await?;
Ok((txid, state)) Ok((txid, state))
} }
Err(err) => { Err(err) => {
if let Ok(error_code) = parse_rpc_error_code(&err) { if let Ok(error_code) = parse_rpc_error_code(&err) {
tracing::debug!(%error_code, "parse rpc error"); if error_code == i64::from(RpcErrorCode::RpcVerifyError) {
if error_code == i64::from(RpcErrorCode::RpcVerifyAlreadyInChain) if let ExpiredTimelocks::None { .. } =
|| error_code == i64::from(RpcErrorCode::RpcVerifyError) state6.expired_timelock(bitcoin_wallet.as_ref()).await?
{ {
let txid = state6 tracing::debug!(%error_code, "parse rpc error");
.construct_tx_cancel() tracing::info!("General error trying to submit cancel transaction");
.expect("Error when constructing tx_cancel") } else {
.txid(); let txid = state6
let state = BobState::BtcCancelled(state6); .construct_tx_cancel()
db.insert_latest_state(swap_id, state.clone().into()) .expect("Error when constructing tx_cancel")
.await?; .txid();
tracing::info!("Cancel transaction has already been confirmed on chain. The swap has therefore already been cancelled by Alice"); let state = BobState::BtcCancelled(state6);
return Ok((txid, state)); db.insert_latest_state(swap_id, state.clone().into())
.await?;
tracing::info!("Cancel transaction has already been confirmed on chain. The swap has therefore already been cancelled by Alice.");
return Ok((txid, state));
}
} }
} }
bail!(err); bail!(err);
} }
} }
} }
pub async fn refund( pub async fn refund(
swap_id: Uuid, swap_id: Uuid,
bitcoin_wallet: Arc<Wallet>, bitcoin_wallet: Arc<Wallet>,
@ -119,8 +114,26 @@ pub async fn refund(
}; };
tracing::info!(%swap_id, "Manually refunding swap"); tracing::info!(%swap_id, "Manually refunding swap");
state6.publish_refund_btc(bitcoin_wallet.as_ref()).await?;
match state6.publish_refund_btc(bitcoin_wallet.as_ref()).await {
Ok(_) => (),
Err(refund_error) => {
if refund_error
.to_string()
.contains("Failed to broadcast Bitcoin refund transaction")
{
let state = BobState::BtcPunished {
tx_lock_id: state6.tx_lock_id(),
};
db.insert_latest_state(swap_id, state.clone().into())
.await?;
tracing::info!("Cannot refund because BTC is punished by Alice.");
return Ok(state);
}
bail!(refund_error);
}
}
let state = BobState::BtcRefunded(state6); let state = BobState::BtcRefunded(state6);
db.insert_latest_state(swap_id, state.clone().into()) db.insert_latest_state(swap_id, state.clone().into())
.await?; .await?;