Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(swap): merge cancel/refund commands into one command
- Loading branch information
Showing
12 changed files
with
220 additions
and
177 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,115 @@ | ||
| use crate::bitcoin::wallet::Subscription; | ||
| use crate::bitcoin::{parse_rpc_error_code, RpcErrorCode, Wallet}; | ||
| use crate::protocol::bob::BobState; | ||
| use crate::protocol::Database; | ||
| use anyhow::{bail, Result}; | ||
| use bitcoin::Txid; | ||
| use std::sync::Arc; | ||
| use uuid::Uuid; | ||
|
|
||
| pub async fn cancel_and_refund( | ||
| swap_id: Uuid, | ||
| bitcoin_wallet: Arc<Wallet>, | ||
| db: Arc<dyn Database>, | ||
| ) -> Result<BobState> { | ||
| if let Err(err) = cancel(swap_id, bitcoin_wallet.clone(), db.clone()).await { | ||
| tracing::info!(%err, "Could not submit cancel transaction"); | ||
| }; | ||
|
|
||
| let state = match refund(swap_id, bitcoin_wallet, db).await { | ||
| Ok(s) => s, | ||
| Err(e) => bail!(e), | ||
| }; | ||
|
|
||
| tracing::info!("Refund transaction submitted"); | ||
| Ok(state) | ||
| } | ||
|
|
||
| pub async fn cancel( | ||
| swap_id: Uuid, | ||
| bitcoin_wallet: Arc<Wallet>, | ||
| db: Arc<dyn Database>, | ||
| ) -> Result<(Txid, Subscription, BobState)> { | ||
| let state = db.get_state(swap_id).await?.try_into()?; | ||
|
|
||
| let state6 = match state { | ||
| BobState::BtcLocked { state3, .. } => state3.cancel(), | ||
| BobState::XmrLockProofReceived { state, .. } => state.cancel(), | ||
| BobState::XmrLocked(state4) => state4.cancel(), | ||
| BobState::EncSigSent(state4) => state4.cancel(), | ||
| BobState::CancelTimelockExpired(state6) => state6, | ||
| BobState::BtcRefunded(state6) => state6, | ||
| BobState::BtcCancelled(state6) => state6, | ||
|
|
||
| BobState::Started { .. } | ||
| | BobState::SwapSetupCompleted(_) | ||
| | BobState::BtcRedeemed(_) | ||
| | BobState::XmrRedeemed { .. } | ||
| | BobState::BtcPunished { .. } | ||
| | BobState::SafelyAborted => bail!( | ||
| "Cannot cancel swap {} because it is in state {} which is not refundable.", | ||
| swap_id, | ||
| state | ||
| ), | ||
| }; | ||
|
|
||
| tracing::info!(%swap_id, "Manually cancelling swap"); | ||
|
|
||
| let (txid, subscription) = match state6.submit_tx_cancel(bitcoin_wallet.as_ref()).await { | ||
| Ok(txid) => txid, | ||
| Err(err) => { | ||
| if let Ok(error_code) = parse_rpc_error_code(&err) { | ||
| tracing::debug!(%error_code, "parse rpc error"); | ||
| if error_code == i64::from(RpcErrorCode::RpcVerifyAlreadyInChain) { | ||
| tracing::info!("Cancel transaction has already been confirmed on chain"); | ||
| } else if error_code == i64::from(RpcErrorCode::RpcVerifyError) { | ||
| tracing::info!("General error trying to submit cancel transaction"); | ||
| } | ||
| } | ||
| bail!(err); | ||
| } | ||
| }; | ||
|
|
||
| let state = BobState::BtcCancelled(state6); | ||
| db.insert_latest_state(swap_id, state.clone().into()) | ||
| .await?; | ||
|
|
||
| Ok((txid, subscription, state)) | ||
| } | ||
|
|
||
| pub async fn refund( | ||
| swap_id: Uuid, | ||
| bitcoin_wallet: Arc<Wallet>, | ||
| db: Arc<dyn Database>, | ||
| ) -> Result<BobState> { | ||
| let state = db.get_state(swap_id).await?.try_into()?; | ||
|
|
||
| let state6 = match state { | ||
| BobState::BtcLocked { state3, .. } => state3.cancel(), | ||
| BobState::XmrLockProofReceived { state, .. } => state.cancel(), | ||
| BobState::XmrLocked(state4) => state4.cancel(), | ||
| BobState::EncSigSent(state4) => state4.cancel(), | ||
| BobState::CancelTimelockExpired(state6) => state6, | ||
| BobState::BtcCancelled(state6) => state6, | ||
| BobState::Started { .. } | ||
| | BobState::SwapSetupCompleted(_) | ||
| | BobState::BtcRedeemed(_) | ||
| | BobState::BtcRefunded(_) | ||
| | BobState::XmrRedeemed { .. } | ||
| | BobState::BtcPunished { .. } | ||
| | BobState::SafelyAborted => bail!( | ||
| "Cannot refund swap {} because it is in state {} which is not refundable.", | ||
| swap_id, | ||
| state | ||
| ), | ||
| }; | ||
|
|
||
| tracing::info!(%swap_id, "Manually refunding swap"); | ||
| state6.publish_refund_btc(bitcoin_wallet.as_ref()).await?; | ||
|
|
||
| let state = BobState::BtcRefunded(state6); | ||
| db.insert_latest_state(swap_id, state.clone().into()) | ||
| .await?; | ||
|
|
||
| Ok(state) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.