fix(legacy-refunds): support going the spending path on refund #2280

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft

mariocynicys wants to merge 25 commits into dev from robust-swaps

+598 −543

mm2src/mm2_main/src/lp_swap.rs

-Original file line number
+Diff line change
@@ Expand Up / @@ -503,6 +503,22 @@ pub struct RecoveredSwap { @@
         transaction: TransactionEnum,
     }
+    #[derive(Display, Debug, PartialEq)]
+    pub enum RecoverSwapError {
+        // We might not find the original payment tx on chain (e.g. re-orged). This doesn't mean though that nobody has it.
+        // TODO: These coins should be spent ASAP to avoid them getting locked (or stolen).
+        #[display(fmt = "The payment tx is not on-chain. Nothing to recover.")]
+        PaymentTxNotFound,
+        #[display(fmt = "An unknown error occurred. Retrying might fix it: {}", _0)]
+        Temporary(String),
+        #[display(fmt = "The swap is not recoverable: {}", _0)]
+        Irrecoverable(String),
+        #[display(fmt = "Wait {}s and try to recover again.", _0)]
+        WaitAndRetry(u64),
+        #[display(fmt = "The funds will be automatically recovered after lock-time: {}", _0)]
+        AutoRecoverableAfter(u64),
+    }
     /// Represents the amount of a coin locked by ongoing swap
     #[derive(Debug)]
     pub struct LockedAmount {
@@ Expand Down Expand Up / @@ -547,8 +563,11 @@ struct LockedAmountInfo { @@
         locked_amount: LockedAmount,
     }
+    /// A running swap is the swap accompanied by the abort handle of the thread the swap is running on.
+    type RunningSwap = (Arc<dyn AtomicSwap>, AbortOnDropHandle);
     struct SwapsContext {
-        running_swaps: Mutex<HashMap<Uuid, Arc<dyn AtomicSwap>>>,
+        running_swaps: Mutex<HashMap<Uuid, RunningSwap>>,
         active_swaps_v2_infos: Mutex<HashMap<Uuid, ActiveSwapV2Info>>,
         banned_pubkeys: Mutex<TimedMap<H256Json, BanReason>>,
         swap_msgs: Mutex<HashMap<Uuid, SwapMsgStore>>,
@@ Expand Down Expand Up @@
         let swap_ctx = SwapsContext::from_ctx(ctx).unwrap();
         let swap_lock = swap_ctx.running_swaps.lock().unwrap();
-        let mut locked =
-            swap_lock
-                .values()
-                .flat_map(|swap| swap.locked_amount())
-                .fold(MmNumber::from(0), |mut total_amount, locked| {
-                    if locked.coin == coin {
-                        total_amount += locked.amount;
-                    }
-                    if let Some(trade_fee) = locked.trade_fee {
-                        if trade_fee.coin == coin && !trade_fee.paid_from_trading_vol {
-                            total_amount += trade_fee.amount;
-                        }
+        let mut locked = swap_lock.values().flat_map(|(swap, _)| swap.locked_amount()).fold(
+            MmNumber::from(0),
+            |mut total_amount, locked| {
+                if locked.coin == coin {
+                    total_amount += locked.amount;
+                }
+                if let Some(trade_fee) = locked.trade_fee {
+                    if trade_fee.coin == coin && !trade_fee.paid_from_trading_vol {
+                        total_amount += trade_fee.amount;
                     }
-                    total_amount
-                });
+                }
+                total_amount
+            },
+        );
         drop(swap_lock);
         let locked_amounts = swap_ctx.locked_amounts.lock().unwrap();
@@ Expand All @@
     /// Clear up all the running swaps.
     ///
-    /// This doesn't mean that these swaps will be stopped. They can only be stopped from the abortable systems they are running on top of.
+    /// This also auto-stops any running swaps since their abort handles will get triggered (assuming these abort handles aren't already triggered by other means).
     pub fn clear_running_swaps(ctx: &MmArc) {
         let swap_ctx = SwapsContext::from_ctx(ctx).unwrap();
         swap_ctx.running_swaps.lock().unwrap().clear();
@@ Expand All @@
         swap_lock
             .values()
-            .filter(|swap| swap.uuid() != except_uuid)
-            .flat_map(|swap| swap.locked_amount())
+            .filter(|(swap, _)| swap.uuid() != except_uuid)
+            .flat_map(|(swap, _)| swap.locked_amount())
             .fold(MmNumber::from(0), |mut total_amount, locked| {
                 if locked.coin == coin {
                     total_amount += locked.amount;
@@ Expand All @@
         let swap_ctx = try_s!(SwapsContext::from_ctx(ctx));
         let swaps = try_s!(swap_ctx.running_swaps.lock());
         let mut uuids = vec![];
-        for swap in swaps.values() {
+        for (swap, _) in swaps.values() {
             if coins.contains(&swap.maker_coin().to_string()) || coins.contains(&swap.taker_coin().to_string()) {
                 uuids.push(*swap.uuid())
             }
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix(legacy-refunds): support going the spending path on refund #2280

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!

fix(legacy-refunds): support going the spending path on refund #2280

Are you sure you want to change the base?

fix(legacy-refunds): support going the spending path on refund #2280

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!