review: add SAVED_SWAP_V for new version fields in TakerSavedSwap and…

… MakerSavedSwap

mm2src/mm2_main/src/lp_swap.rs

@@ -158,6 +158,10 @@ const NEGOTIATE_SEND_INTERVAL: f64 = 30.;
 /// If a certain P2P message is not received, swap will be aborted after this time expires.
 const NEGOTIATION_TIMEOUT_SEC: u64 = 90;
 
+/// `MakerPaymentSpendConfirmed` and `MakerPaymentSpendConfirmFailed` events were added to Taker Swap.
+/// Nothing has been changed on Maker Swap side.
+const SAVED_SWAP_V: u8 = 1;
+
 cfg_wasm32! {
     use mm2_db::indexed_db::{ConstructibleDb, DbLocked};
     use saved_swap::migrate_swaps_data;

mm2src/mm2_main/src/lp_swap/maker_swap.rs

@@ -9,7 +9,8 @@ use super::{broadcast_my_swap_status, broadcast_p2p_tx_msg, broadcast_swap_msg_e
             wait_for_maker_payment_conf_until, AtomicSwap, LockedAmount, MySwapInfo, NegotiationDataMsg,
             NegotiationDataV2, NegotiationDataV3, RecoveredSwap, RecoveredSwapAction, SavedSwap, SavedSwapIo,
             SavedTradeFee, SecretHashAlgo, SwapConfirmationsSettings, SwapError, SwapMsg, SwapPubkeys, SwapTxDataMsg,
-            SwapsContext, TransactionIdentifier, INCLUDE_REFUND_FEE, NO_REFUND_FEE, WAIT_CONFIRM_INTERVAL_SEC};
+            SwapsContext, TransactionIdentifier, INCLUDE_REFUND_FEE, NO_REFUND_FEE, SAVED_SWAP_V,
+            WAIT_CONFIRM_INTERVAL_SEC};
 use crate::lp_dispatcher::{DispatcherContext, LpEvents};
 use crate::lp_network::subscribe_to_topic;
 use crate::lp_ordermatch::MakerOrderBuilder;
@@ -101,6 +102,7 @@ async fn save_my_maker_swap_event(ctx: &MmArc, swap: &MakerSwap, event: MakerSav
             events: vec![],
             success_events: MAKER_SUCCESS_EVENTS.iter().map(|event| event.to_string()).collect(),
             error_events: MAKER_ERROR_EVENTS.iter().map(|event| event.to_string()).collect(),
+            version: Some(SAVED_SWAP_V),
         }),
         Err(e) => return ERR!("{}", e),
     };
@@ -1806,6 +1808,7 @@ pub struct MakerSavedSwap {
     pub mm_version: Option<String>,
     pub success_events: Vec<String>,
     pub error_events: Vec<String>,
+    pub version: Option<u8>,
 }
 
 #[cfg(test)]
@@ -1862,6 +1865,7 @@ impl MakerSavedSwap {
             mm_version: None,
             success_events: vec![],
             error_events: vec![],
+            version: None,
         }
     }
 }

mm2src/mm2_main/src/lp_swap/recreate_swap_data.rs

@@ -94,6 +94,7 @@ fn recreate_maker_swap(ctx: MmArc, taker_swap: TakerSavedSwap) -> RecreateSwapRe
         mm_version: Some(ctx.mm_version.clone()),
         success_events: MAKER_SUCCESS_EVENTS.iter().map(|event| event.to_string()).collect(),
         error_events: MAKER_ERROR_EVENTS.iter().map(|event| event.to_string()).collect(),
+        version: taker_swap.version,
     };
 
     let mut event_it = taker_swap.events.into_iter();
@@ -297,6 +298,7 @@ async fn recreate_taker_swap(ctx: MmArc, maker_swap: MakerSavedSwap) -> Recreate
         mm_version: Some(ctx.mm_version.clone()),
         success_events: TAKER_SUCCESS_EVENTS.iter().map(|event| event.to_string()).collect(),
         error_events: TAKER_ERROR_EVENTS.iter().map(|event| event.to_string()).collect(),
+        version: maker_swap.version,
     };
 
     let mut event_it = maker_swap.events.into_iter();

mm2src/mm2_main/src/lp_swap/taker_swap.rs

@@ -9,7 +9,8 @@ use super::{broadcast_my_swap_status, broadcast_swap_message, broadcast_swap_msg
             recv_swap_msg, swap_topic, wait_for_maker_payment_conf_until, AtomicSwap, LockedAmount, MySwapInfo,
             NegotiationDataMsg, NegotiationDataV2, NegotiationDataV3, RecoveredSwap, RecoveredSwapAction, SavedSwap,
             SavedSwapIo, SavedTradeFee, SwapConfirmationsSettings, SwapError, SwapMsg, SwapPubkeys, SwapTxDataMsg,
-            SwapsContext, TransactionIdentifier, INCLUDE_REFUND_FEE, NO_REFUND_FEE, WAIT_CONFIRM_INTERVAL_SEC};
+            SwapsContext, TransactionIdentifier, INCLUDE_REFUND_FEE, NO_REFUND_FEE, SAVED_SWAP_V,
+            WAIT_CONFIRM_INTERVAL_SEC};
 use crate::lp_network::subscribe_to_topic;
 use crate::lp_ordermatch::TakerOrderBuilder;
 use crate::lp_swap::swap_v2_common::mark_swap_as_finished;
@@ -135,6 +136,7 @@ async fn save_my_taker_swap_event(ctx: &MmArc, swap: &TakerSwap, event: TakerSav
                 TAKER_SUCCESS_EVENTS.iter().map(<&str>::to_string).collect()
             },
             error_events: TAKER_ERROR_EVENTS.iter().map(<&str>::to_string).collect(),
+            version: Some(SAVED_SWAP_V),
         }),
         Err(e) => return ERR!("{}", e),
     };
@@ -214,6 +216,7 @@ pub struct TakerSavedSwap {
     pub mm_version: Option<String>,
     pub success_events: Vec<String>,
     pub error_events: Vec<String>,
+    pub version: Option<u8>,
 }
 
 impl TakerSavedSwap {
@@ -264,39 +267,35 @@ impl TakerSavedSwap {
         if !self.is_finished() {
             return false;
         };
-        let mut maker_payment_spent = false;
-        let mut maker_payment_spent_by_watcher = false;
-        let mut maker_payment_spend_confirmed_failed = false;
         for event in self.events.iter() {
-            match event.event {
-                TakerSwapEvent::StartFailed(_)
-                | TakerSwapEvent::NegotiateFailed(_)
-                | TakerSwapEvent::TakerFeeSendFailed(_)
-                | TakerSwapEvent::MakerPaymentValidateFailed(_)
-                | TakerSwapEvent::TakerPaymentRefunded(_)
-                | TakerSwapEvent::TakerPaymentRefundedByWatcher(_)
-                | TakerSwapEvent::MakerPaymentSpendConfirmed
-                | TakerSwapEvent::MakerPaymentWaitConfirmFailed(_) => {
-                    return false;
-                },
-                TakerSwapEvent::MakerPaymentSpent(_) => {
-                    maker_payment_spent = true;
-                },
-                TakerSwapEvent::MakerPaymentSpentByWatcher(_) => {
-                    maker_payment_spent_by_watcher = true;
+            match &self.version {
+                Some(SAVED_SWAP_V) => match event.event {
+                    TakerSwapEvent::StartFailed(_)
+                    | TakerSwapEvent::NegotiateFailed(_)
+                    | TakerSwapEvent::TakerFeeSendFailed(_)
+                    | TakerSwapEvent::MakerPaymentValidateFailed(_)
+                    | TakerSwapEvent::TakerPaymentRefunded(_)
+                    | TakerSwapEvent::TakerPaymentRefundedByWatcher(_)
+                    | TakerSwapEvent::MakerPaymentSpendConfirmed
+                    | TakerSwapEvent::MakerPaymentWaitConfirmFailed(_) => return false,
+                    _ => (),
                 },
-                TakerSwapEvent::MakerPaymentSpendConfirmFailed(_) => {
-                    maker_payment_spend_confirmed_failed = true;
+                // original legacy event version
+                None => match event.event {
+                    TakerSwapEvent::StartFailed(_)
+                    | TakerSwapEvent::NegotiateFailed(_)
+                    | TakerSwapEvent::TakerFeeSendFailed(_)
+                    | TakerSwapEvent::MakerPaymentValidateFailed(_)
+                    | TakerSwapEvent::TakerPaymentRefunded(_)
+                    | TakerSwapEvent::TakerPaymentRefundedByWatcher(_)
+                    | TakerSwapEvent::MakerPaymentSpent(_)
+                    | TakerSwapEvent::MakerPaymentSpentByWatcher(_)
+                    | TakerSwapEvent::MakerPaymentWaitConfirmFailed(_) => return false,
+                    _ => (),
                 },
                 _ => (),
             }
         }
-        // MakerPaymentSpent or MakerPaymentSpentByWatcher were the last success events but a new step `MakerPaymentSpendConfirmed` was added after them.
-        // For backward compatibility (old saved swaps) we need to check for MakerPaymentSpent or MakerPaymentSpentByWatcher
-        // and if there is no MakerPaymentSpendConfirmFailed.
-        if (maker_payment_spent || maker_payment_spent_by_watcher) && !maker_payment_spend_confirmed_failed {
-            return false;
-        }
 
         true
     }