fix(legacy-swap): taker failed spend maker payment marked as failed

mm2src/coins/eth.rs

@@ -2257,7 +2257,7 @@ impl MarketCoinOps for EthCoin {
         }
     }
 
-    fn wait_for_confirmations(&self, input: ConfirmPaymentInput) -> Box<dyn Future<Item = (), Error = String> + Send> {
+    fn wait_for_confirmations(&self, input: ConfirmPaymentInput) -> Box<dyn Future<Item = u64, Error = String> + Send> {
         macro_rules! update_status_with_error {
             ($status: ident, $error: ident) => {
                 match $error.get_inner() {
@@ -2328,7 +2328,8 @@ impl MarketCoinOps for EthCoin {
                     Ok(conf) => {
                         if conf == confirmed_at {
                             status.append(" Confirmed.");
-                            break Ok(());
+                            // Let's avoid risking additional errors by calling `current_block` and instead return required_confirms
+                            break Ok(required_confirms.as_u64());
                         }
                     },
                     Err(e) => {

mm2src/coins/lightning.rs

@@ -1120,7 +1120,7 @@ impl MarketCoinOps for LightningCoin {
 
     // Todo: Add waiting for confirmations logic for the case of if the channel is closed and the htlc can be claimed on-chain
     // Todo: The above is postponed and might not be needed after this issue is resolved https://github.com/lightningdevkit/rust-lightning/issues/2017
-    fn wait_for_confirmations(&self, input: ConfirmPaymentInput) -> Box<dyn Future<Item = (), Error = String> + Send> {
+    fn wait_for_confirmations(&self, input: ConfirmPaymentInput) -> Box<dyn Future<Item = u64, Error = String> + Send> {
         let payment_hash = try_f!(payment_hash_from_slice(&input.payment_tx).map_err(|e| e.to_string()));
         let payment_hex = hex::encode(payment_hash.0);
 
@@ -1139,7 +1139,7 @@ impl MarketCoinOps for LightningCoin {
                     Ok(Some(payment)) => {
                         match payment.payment_type {
                             PaymentType::OutboundPayment { .. } => match payment.status {
-                                HTLCStatus::Pending | HTLCStatus::Succeeded => return Ok(()),
+                                HTLCStatus::Pending | HTLCStatus::Succeeded => return Ok(1u64),
                                 HTLCStatus::Claimable => {
                                     return ERR!(
                                         "Payment {} has an invalid status of {} in the db",
@@ -1153,7 +1153,7 @@ impl MarketCoinOps for LightningCoin {
                                 HTLCStatus::Failed => return ERR!("Lightning swap payment {} failed", payment_hex),
                             },
                             PaymentType::InboundPayment => match payment.status {
-                                HTLCStatus::Claimable | HTLCStatus::Succeeded => return Ok(()),
+                                HTLCStatus::Claimable | HTLCStatus::Succeeded => return Ok(1u64),
                                 HTLCStatus::Pending => info!("Payment {} not received yet!", payment_hex),
                                 HTLCStatus::Failed => return ERR!("Lightning swap payment {} failed", payment_hex),
                             },

mm2src/coins/lp_coins.rs

@@ -2085,7 +2085,8 @@ pub trait MarketCoinOps {
     /// Signs raw utxo transaction in hexadecimal format as input and returns signed transaction in hexadecimal format
     async fn sign_raw_tx(&self, args: &SignRawTransactionRequest) -> RawTransactionResult;
 
-    fn wait_for_confirmations(&self, input: ConfirmPaymentInput) -> Box<dyn Future<Item = (), Error = String> + Send>;
+    /// Wait for confirmations and return the number of confirmed blocks
+    fn wait_for_confirmations(&self, input: ConfirmPaymentInput) -> Box<dyn Future<Item = u64, Error = String> + Send>;
 
     fn wait_for_htlc_tx_spend(&self, args: WaitForHTLCTxSpendArgs<'_>) -> TransactionFut;
 

mm2src/coins/qrc20.rs

@@ -1250,7 +1250,7 @@ impl MarketCoinOps for Qrc20Coin {
         utxo_common::sign_raw_tx(self, args).await
     }
 
-    fn wait_for_confirmations(&self, input: ConfirmPaymentInput) -> Box<dyn Future<Item = (), Error = String> + Send> {
+    fn wait_for_confirmations(&self, input: ConfirmPaymentInput) -> Box<dyn Future<Item = u64, Error = String> + Send> {
         let tx: UtxoTx = try_fus!(deserialize(input.payment_tx.as_slice()).map_err(|e| ERRL!("{:?}", e)));
         let selfi = self.clone();
         let fut = async move {

mm2src/coins/qrc20/swap.rs

@@ -374,9 +374,9 @@ impl Qrc20Coin {
         requires_nota: bool,
         wait_until: u64,
         check_every: u64,
-    ) -> Result<(), String> {
+    ) -> Result<u64, String> {
         let tx_hash = H256Json::from(qtum_tx.hash().reversed());
-        try_s!(
+        let confirmations = try_s!(
             self.utxo
                 .rpc_client
                 .wait_for_confirmations(
@@ -415,7 +415,7 @@ impl Qrc20Coin {
             try_s!(check_if_contract_call_completed(&receipt));
         }
 
-        Ok(())
+        Ok(confirmations)
     }
 
     /// Generate `ContractCallOutput` outputs required to send a swap payment.

mm2src/coins/siacoin.rs

@@ -366,7 +366,10 @@ impl MarketCoinOps for SiaCoin {
     #[inline(always)]
     async fn sign_raw_tx(&self, _args: &SignRawTransactionRequest) -> RawTransactionResult { unimplemented!() }
 
-    fn wait_for_confirmations(&self, _input: ConfirmPaymentInput) -> Box<dyn Future<Item = (), Error = String> + Send> {
+    fn wait_for_confirmations(
+        &self,
+        _input: ConfirmPaymentInput,
+    ) -> Box<dyn Future<Item = u64, Error = String> + Send> {
         unimplemented!()
     }
 

mm2src/coins/solana.rs

@@ -725,7 +725,10 @@ impl MarketCoinOps for SolanaCoin {
         })
     }
 
-    fn wait_for_confirmations(&self, _input: ConfirmPaymentInput) -> Box<dyn Future<Item = (), Error = String> + Send> {
+    fn wait_for_confirmations(
+        &self,
+        _input: ConfirmPaymentInput,
+    ) -> Box<dyn Future<Item = u64, Error = String> + Send> {
         unimplemented!()
     }
 

mm2src/coins/solana/spl.rs

@@ -274,7 +274,10 @@ impl MarketCoinOps for SplToken {
         })
     }
 
-    fn wait_for_confirmations(&self, _input: ConfirmPaymentInput) -> Box<dyn Future<Item = (), Error = String> + Send> {
+    fn wait_for_confirmations(
+        &self,
+        _input: ConfirmPaymentInput,
+    ) -> Box<dyn Future<Item = u64, Error = String> + Send> {
         unimplemented!()
     }
 

mm2src/coins/tendermint/tendermint_coin.rs

@@ -2560,7 +2560,7 @@ impl MarketCoinOps for TendermintCoin {
         })
     }
 
-    fn wait_for_confirmations(&self, input: ConfirmPaymentInput) -> Box<dyn Future<Item = (), Error = String> + Send> {
+    fn wait_for_confirmations(&self, input: ConfirmPaymentInput) -> Box<dyn Future<Item = u64, Error = String> + Send> {
         // Sanity check
         let _: TxRaw = try_fus!(Message::decode(input.payment_tx.as_slice()));
 
@@ -2581,7 +2581,8 @@ impl MarketCoinOps for TendermintCoin {
 
                 if let Some(tx_status_code) = tx_status_code {
                     return match tx_status_code {
-                        cosmrs::tendermint::abci::Code::Ok => Ok(()),
+                        // Tendermint uses Byzantine Fault Tolerance (BFT), achieve instant finality once a block is committed.
+                        cosmrs::tendermint::abci::Code::Ok => Ok(1u64),
                         cosmrs::tendermint::abci::Code::Err(err_code) => Err(format!(
                             "Got error code: '{}' for tx: '{}'. Broadcasted tx isn't valid.",
                             err_code, tx_hash

mm2src/coins/tendermint/tendermint_token.rs

@@ -434,7 +434,7 @@ impl MarketCoinOps for TendermintToken {
         })
     }
 
-    fn wait_for_confirmations(&self, input: ConfirmPaymentInput) -> Box<dyn Future<Item = (), Error = String> + Send> {
+    fn wait_for_confirmations(&self, input: ConfirmPaymentInput) -> Box<dyn Future<Item = u64, Error = String> + Send> {
         self.platform_coin.wait_for_confirmations(input)
     }
 

mm2src/coins/test_coin.rs

@@ -88,7 +88,10 @@ impl MarketCoinOps for TestCoin {
     #[inline(always)]
     async fn sign_raw_tx(&self, _args: &SignRawTransactionRequest) -> RawTransactionResult { unimplemented!() }
 
-    fn wait_for_confirmations(&self, _input: ConfirmPaymentInput) -> Box<dyn Future<Item = (), Error = String> + Send> {
+    fn wait_for_confirmations(
+        &self,
+        _input: ConfirmPaymentInput,
+    ) -> Box<dyn Future<Item = u64, Error = String> + Send> {
         unimplemented!()
     }
 

mm2src/coins/utxo/bch.rs

@@ -1225,7 +1225,7 @@ impl MarketCoinOps for BchCoin {
         utxo_common::sign_raw_tx(self, args).await
     }
 
-    fn wait_for_confirmations(&self, input: ConfirmPaymentInput) -> Box<dyn Future<Item = (), Error = String> + Send> {
+    fn wait_for_confirmations(&self, input: ConfirmPaymentInput) -> Box<dyn Future<Item = u64, Error = String> + Send> {
         utxo_common::wait_for_confirmations(&self.utxo_arc, input)
     }
 

mm2src/coins/utxo/qtum.rs

@@ -845,7 +845,7 @@ impl MarketCoinOps for QtumCoin {
         utxo_common::sign_raw_tx(self, args).await
     }
 
-    fn wait_for_confirmations(&self, input: ConfirmPaymentInput) -> Box<dyn Future<Item = (), Error = String> + Send> {
+    fn wait_for_confirmations(&self, input: ConfirmPaymentInput) -> Box<dyn Future<Item = u64, Error = String> + Send> {
         utxo_common::wait_for_confirmations(&self.utxo_arc, input)
     }
 

mm2src/coins/utxo/rpc_clients.rs

@@ -163,7 +163,7 @@ impl UtxoRpcClientEnum {
         requires_notarization: bool,
         wait_until: u64,
         check_every: u64,
-    ) -> Box<dyn Future<Item = (), Error = String> + Send> {
+    ) -> Box<dyn Future<Item = u64, Error = String> + Send> {
         let selfi = self.clone();
         let mut tx_not_found_retries = TX_NOT_FOUND_RETRIES;
         let fut = async move {
@@ -185,7 +185,7 @@ impl UtxoRpcClientEnum {
                             t.rawconfirmations.unwrap_or(t.confirmations)
                         };
                         if tx_confirmations >= confirmations {
-                            return Ok(());
+                            return Ok(tx_confirmations as u64);
                         } else {
                             info!(
                                 "Waiting for tx {:?} confirmations, now {}, required {}, requires_notarization {}",

mm2src/coins/utxo/slp.rs

@@ -1184,7 +1184,7 @@ impl MarketCoinOps for SlpToken {
         utxo_common::sign_raw_tx(self, args).await
     }
 
-    fn wait_for_confirmations(&self, input: ConfirmPaymentInput) -> Box<dyn Future<Item = (), Error = String> + Send> {
+    fn wait_for_confirmations(&self, input: ConfirmPaymentInput) -> Box<dyn Future<Item = u64, Error = String> + Send> {
         self.platform_coin.wait_for_confirmations(input)
     }
 

mm2src/coins/utxo/utxo_common.rs

@@ -2844,7 +2844,7 @@ async fn sign_raw_utxo_tx<T: AsRef<UtxoCoinFields> + UtxoTxGenerationOps>(
 pub fn wait_for_confirmations(
     coin: &UtxoCoinFields,
     input: ConfirmPaymentInput,
-) -> Box<dyn Future<Item = (), Error = String> + Send> {
+) -> Box<dyn Future<Item = u64, Error = String> + Send> {
     let mut tx: UtxoTx = try_fus!(deserialize(input.payment_tx.as_slice()).map_err(|e| ERRL!("{:?}", e)));
     tx.tx_hash_algo = coin.tx_hash_algo;
     coin.rpc_client.wait_for_confirmations(

mm2src/coins/utxo/utxo_standard.rs

@@ -917,7 +917,7 @@ impl MarketCoinOps for UtxoStandardCoin {
         utxo_common::sign_raw_tx(self, args).await
     }
 
-    fn wait_for_confirmations(&self, input: ConfirmPaymentInput) -> Box<dyn Future<Item = (), Error = String> + Send> {
+    fn wait_for_confirmations(&self, input: ConfirmPaymentInput) -> Box<dyn Future<Item = u64, Error = String> + Send> {
         utxo_common::wait_for_confirmations(&self.utxo_arc, input)
     }
 

mm2src/coins/z_coin.rs

@@ -1157,7 +1157,7 @@ impl MarketCoinOps for ZCoin {
         utxo_common::sign_raw_tx(self, args).await
     }
 
-    fn wait_for_confirmations(&self, input: ConfirmPaymentInput) -> Box<dyn Future<Item = (), Error = String> + Send> {
+    fn wait_for_confirmations(&self, input: ConfirmPaymentInput) -> Box<dyn Future<Item = u64, Error = String> + Send> {
         utxo_common::wait_for_confirmations(self.as_ref(), input)
     }
 

mm2src/mm2_main/src/for_tests/iris_nimda_rick_taker_swap.json

@@ -145,12 +145,14 @@
     "Started",
     "Negotiated",
     "TakerFeeSent",
+    "TakerPaymentInstructionsReceived",
     "MakerPaymentReceived",
     "MakerPaymentWaitConfirmStarted",
     "MakerPaymentValidatedAndConfirmed",
     "TakerPaymentSent",
     "TakerPaymentSpent",
     "MakerPaymentSpent",
+    "MakerPaymentSpendConfirmed",
     "Finished"
   ],
   "error_events": [
@@ -164,8 +166,12 @@
     "TakerPaymentDataSendFailed",
     "TakerPaymentWaitForSpendFailed",
     "MakerPaymentSpendFailed",
+    "MakerPaymentSpendConfirmFailed",
     "TakerPaymentWaitRefundStarted",
+    "TakerPaymentRefundStarted",
     "TakerPaymentRefunded",
-    "TakerPaymentRefundFailed"
+    "TakerPaymentRefundedByWatcher",
+    "TakerPaymentRefundFailed",
+    "TakerPaymentRefundFinished"
   ]
 }

mm2src/mm2_main/src/for_tests/recreate_maker_swap_maker_payment_wait_confirm_failed_taker_saved.json

@@ -49,6 +49,6 @@
     "taker_coin":"MORTY",
     "gui":"atomicDEX 0.5.1 iOS",
     "mm_version":"1b065636a",
-    "success_events":["Started","Negotiated","TakerFeeSent","TakerPaymentInstructionsReceived","MakerPaymentReceived","MakerPaymentWaitConfirmStarted","MakerPaymentValidatedAndConfirmed","TakerPaymentSent","TakerPaymentSpent","MakerPaymentSpent","Finished"],
+    "success_events":["Started","Negotiated","TakerFeeSent","TakerPaymentInstructionsReceived","MakerPaymentReceived","MakerPaymentWaitConfirmStarted","MakerPaymentValidatedAndConfirmed","TakerPaymentSent","TakerPaymentSpent","MakerPaymentSpent","MakerPaymentSpendConfirmed","Finished"],
     "error_events":["StartFailed","NegotiateFailed","TakerFeeSendFailed","MakerPaymentValidateFailed","MakerPaymentWaitConfirmFailed","TakerPaymentTransactionFailed","TakerPaymentWaitConfirmFailed","TakerPaymentDataSendFailed","TakerPaymentWaitForSpendFailed","MakerPaymentSpendFailed","TakerPaymentWaitRefundStarted","TakerPaymentRefunded","TakerPaymentRefundedByWatcher","TakerPaymentRefundFailed"]
 }

mm2src/mm2_main/src/for_tests/recreate_maker_swap_taker_saved.json

@@ -61,6 +61,6 @@
     "taker_coin":"MORTY",
     "gui":"atomicDEX 0.5.1 iOS",
     "mm_version":"1b065636a",
-    "success_events":["Started","Negotiated","TakerFeeSent","TakerPaymentInstructionsReceived","MakerPaymentReceived","MakerPaymentWaitConfirmStarted","MakerPaymentValidatedAndConfirmed","TakerPaymentSent","TakerPaymentSpent","MakerPaymentSpent","Finished"],
+    "success_events":["Started","Negotiated","TakerFeeSent","TakerPaymentInstructionsReceived","MakerPaymentReceived","MakerPaymentWaitConfirmStarted","MakerPaymentValidatedAndConfirmed","TakerPaymentSent","TakerPaymentSpent","MakerPaymentSpent","MakerPaymentSpendConfirmed","Finished"],
     "error_events":["StartFailed","NegotiateFailed","TakerFeeSendFailed","MakerPaymentValidateFailed","MakerPaymentWaitConfirmFailed","TakerPaymentTransactionFailed","TakerPaymentWaitConfirmFailed","TakerPaymentDataSendFailed","TakerPaymentWaitForSpendFailed","MakerPaymentSpendFailed","TakerPaymentWaitRefundStarted","TakerPaymentRefunded","TakerPaymentRefundedByWatcher","TakerPaymentRefundFailed"]
 }

mm2src/mm2_main/src/for_tests/recreate_taker_swap_taker_expected.json

@@ -57,6 +57,6 @@
                 "taker_coin":"MORTY",
                 "gui":null,
                 "mm_version":"",
-                "success_events":["Started","Negotiated","TakerFeeSent","TakerPaymentInstructionsReceived","MakerPaymentReceived","MakerPaymentWaitConfirmStarted","MakerPaymentValidatedAndConfirmed","TakerPaymentSent","TakerPaymentSpent","MakerPaymentSpent","Finished"],
-                "error_events":["StartFailed","NegotiateFailed","TakerFeeSendFailed","MakerPaymentValidateFailed","MakerPaymentWaitConfirmFailed","TakerPaymentTransactionFailed","TakerPaymentWaitConfirmFailed","TakerPaymentDataSendFailed","TakerPaymentWaitForSpendFailed","MakerPaymentSpendFailed","TakerPaymentWaitRefundStarted","TakerPaymentRefundStarted","TakerPaymentRefunded","TakerPaymentRefundedByWatcher","TakerPaymentRefundFailed","TakerPaymentRefundFinished"]
+                "success_events":["Started","Negotiated","TakerFeeSent","TakerPaymentInstructionsReceived","MakerPaymentReceived","MakerPaymentWaitConfirmStarted","MakerPaymentValidatedAndConfirmed","TakerPaymentSent","TakerPaymentSpent","MakerPaymentSpent","MakerPaymentSpendConfirmed","Finished"],
+                "error_events":["StartFailed","NegotiateFailed","TakerFeeSendFailed","MakerPaymentValidateFailed","MakerPaymentWaitConfirmFailed","TakerPaymentTransactionFailed","TakerPaymentWaitConfirmFailed","TakerPaymentDataSendFailed","TakerPaymentWaitForSpendFailed","MakerPaymentSpendFailed","MakerPaymentSpendConfirmFailed","TakerPaymentWaitRefundStarted","TakerPaymentRefundStarted","TakerPaymentRefunded","TakerPaymentRefundedByWatcher","TakerPaymentRefundFailed","TakerPaymentRefundFinished"]
 }

mm2src/mm2_main/src/for_tests/recreate_taker_swap_taker_payment_wait_confirm_failed_taker_expected.json

@@ -53,6 +53,6 @@
     "taker_coin":"MORTY",
     "gui":null,
     "mm_version":"",
-    "success_events":["Started","Negotiated","TakerFeeSent","TakerPaymentInstructionsReceived","MakerPaymentReceived","MakerPaymentWaitConfirmStarted","MakerPaymentValidatedAndConfirmed","TakerPaymentSent","TakerPaymentSpent","MakerPaymentSpent","Finished"],
-    "error_events":["StartFailed","NegotiateFailed","TakerFeeSendFailed","MakerPaymentValidateFailed","MakerPaymentWaitConfirmFailed","TakerPaymentTransactionFailed","TakerPaymentWaitConfirmFailed","TakerPaymentDataSendFailed","TakerPaymentWaitForSpendFailed","MakerPaymentSpendFailed","TakerPaymentWaitRefundStarted","TakerPaymentRefundStarted","TakerPaymentRefunded","TakerPaymentRefundedByWatcher","TakerPaymentRefundFailed","TakerPaymentRefundFinished"]
+    "success_events":["Started","Negotiated","TakerFeeSent","TakerPaymentInstructionsReceived","MakerPaymentReceived","MakerPaymentWaitConfirmStarted","MakerPaymentValidatedAndConfirmed","TakerPaymentSent","TakerPaymentSpent","MakerPaymentSpent","MakerPaymentSpendConfirmed","Finished"],
+    "error_events":["StartFailed","NegotiateFailed","TakerFeeSendFailed","MakerPaymentValidateFailed","MakerPaymentWaitConfirmFailed","TakerPaymentTransactionFailed","TakerPaymentWaitConfirmFailed","TakerPaymentDataSendFailed","TakerPaymentWaitForSpendFailed","MakerPaymentSpendFailed","MakerPaymentSpendConfirmFailed","TakerPaymentWaitRefundStarted","TakerPaymentRefundStarted","TakerPaymentRefunded","TakerPaymentRefundedByWatcher","TakerPaymentRefundFailed","TakerPaymentRefundFinished"]
 }

mm2src/mm2_main/src/lp_swap/maker_swap.rs

@@ -1679,7 +1679,7 @@ impl MakerSwapEvent {
             },
             MakerSwapEvent::TakerPaymentSpent(_) => "Taker payment spent...".to_owned(),
             MakerSwapEvent::TakerPaymentSpendFailed(_) => "Taker payment spend failed...".to_owned(),
-            MakerSwapEvent::TakerPaymentSpendConfirmStarted => "Taker payment send wait confirm started...".to_owned(),
+            MakerSwapEvent::TakerPaymentSpendConfirmStarted => "Taker payment spend confirm started...".to_owned(),
             MakerSwapEvent::TakerPaymentSpendConfirmed => "Taker payment spend confirmed...".to_owned(),
             MakerSwapEvent::TakerPaymentSpendConfirmFailed(_) => "Taker payment spend confirm failed...".to_owned(),
             MakerSwapEvent::MakerPaymentWaitRefundStarted { wait_until } => {

mm2src/mm2_main/src/lp_swap/recreate_swap_data.rs

@@ -264,6 +264,8 @@ fn convert_taker_to_maker_events(
             | TakerSwapEvent::MakerPaymentWaitConfirmStarted
             | TakerSwapEvent::MakerPaymentValidatedAndConfirmed
             | TakerSwapEvent::MakerPaymentSpent(_)
+            | TakerSwapEvent::MakerPaymentSpendConfirmed
+            | TakerSwapEvent::MakerPaymentSpendConfirmFailed(_)
             | TakerSwapEvent::MakerPaymentSpentByWatcher(_)
             | TakerSwapEvent::MakerPaymentSpendFailed(_)
             // We don't know the reason at the moment, so we rely on the errors handling above.

mm2src/mm2_main/src/lp_swap/taker_restart.rs

@@ -49,6 +49,7 @@ pub async fn get_command_based_on_maker_or_watcher_activity(
             Err(e) => ERR!("Error {} when trying to find taker payment spend", e),
         },
         TakerSwapCommand::SpendMakerPayment => check_maker_payment_spend_and_add_event(ctx, swap, saved).await,
+        TakerSwapCommand::ConfirmMakerPaymentSpend => Ok(command),
         TakerSwapCommand::PrepareForTakerPaymentRefund | TakerSwapCommand::RefundTakerPayment => {
             #[cfg(not(any(test, feature = "run-docker-tests")))]
             {