convert atomic swaps to 'sell'

Author: dimxy

mm2src/mm2_main/src/lr_swap/lr_quote.rs

@@ -522,11 +522,19 @@ impl LrSwapCandidates {
                 continue;
             };
             let Some(dst_amount) = lr_data_0.dst_amount else {
-                log::debug!("estimate_lr_0_source_amounts no lr_data_0.dst_amount skipping candidate");
+                log::debug!(
+                    "estimate_lr_0_source_amounts no lr_data_0.dst_amount for {}/{} skipping candidate",
+                    lr_data_0._src_token,
+                    lr_data_0._dst_token
+                );
                 continue; // We may not calculate dst_amount if no cross prices were received at LR_1
             };
             let Some(ref lr_price) = lr_data_0.lr_price else {
-                log::debug!("estimate_lr_0_source_amounts no lr_data_0.lr_price skipping candidate");
+                log::debug!(
+                    "estimate_lr_0_source_amounts no lr_data_0.lr_price for {}/{} skipping candidate",
+                    lr_data_0._src_token,
+                    lr_data_0._dst_token
+                );
                 continue;
             };
             let dst_amount = mm_number_from_u256(dst_amount);
@@ -597,13 +605,17 @@ impl LrSwapCandidates {
         for candidate in self.inner.iter_mut() {
             let taker_amount = if let Some(ref lr_data_0) = candidate.lr_data_0 {
                 let Some(ref lr_swap_data) = lr_data_0.lr_swap_data else {
-                    log::debug!("estimate_lr_1_source_amounts_from_lr_0 lr_data_0 src_token {} dst_token={} no swap_data skipping", 
-                        lr_data_0._src_token, lr_data_0._dst_token);
+                    log::debug!(
+                        "estimate_lr_1_source_amounts_from_lr_0 lr_data_0 {}/{} no swap_data skipping",
+                        lr_data_0._src_token,
+                        lr_data_0._dst_token
+                    );
                     continue; // No LR provider quote - skip this candidate
                 };
                 let quote_dst_amount = U256::from_dec_str(&lr_swap_data.dst_amount)?; // Get the 'real' destination amount from the LR quote (not estimated)
                 let est_dst_amount = candidate.lr_data_0.as_ref().and_then(|lr_data_0| lr_data_0.dst_amount);
-                log::debug!("estimate_lr_1_source_amounts_from_lr_0 quote_dst_amount={quote_dst_amount} est_dst_amount={est_dst_amount:?}");
+                log::debug!("estimate_lr_1_source_amounts_from_lr_0 lr_data_0 {}/{} quote_dst_amount={quote_dst_amount} est_dst_amount={est_dst_amount:?}", 
+                    lr_data_0._src_token, lr_data_0._dst_token);
                 let volume_with_fees =
                     wei_to_coins_mm_number(quote_dst_amount, lr_data_0.dst_decimals()?).map_mm_err()?;
                 let maker_ticker = candidate.maker_order.maker_ticker();

mm2src/mm2_main/src/rpc/lp_commands/lr_swap_api.rs

@@ -10,7 +10,6 @@ use lr_api_types::{AtomicSwapRpcParams, LrExecuteRoutedTradeRequest, LrExecuteRo
 use mm2_core::mm_ctx::MmArc;
 use mm2_err_handle::prelude::MmResultExt;
 use mm2_err_handle::{map_mm_error::MapMmError, mm_error::MmResult};
-use mm2_rpc::data::legacy::TakerAction;
 
 #[cfg(all(test, not(target_arch = "wasm32"), feature = "test-ext-api"))]
 mod lr_api_tests;
@@ -57,8 +56,8 @@ pub async fn lr_find_best_quote_rpc(
 ) -> MmResult<LrFindBestQuoteResponse, ExtApiRpcError> {
     // TODO: add validation:
     // order.base_min_volume << req.amount <= order.base_max_volume - DONE
-    // when best order is selected validate against req.rel_max_volume and req.rel_min_volume - DONE
-    // order.coin is supported in 1inch
+    // when best order is selected validate against req.rel_max_volume and req.rel_min_volume (?)
+    // order coins are supported in 1inch
     // order.price not zero
     // coins in orders should be unique (?)
     // Check user available balance for user_base/user_rel when selecting best swap (?)
@@ -99,28 +98,15 @@ pub async fn lr_find_best_quote_rpc(
             .mm_err(|err| ExtApiRpcError::OneInchDataError(err.to_string()))
         })
         .transpose()?;
-
-    let (base, rel, price) = match action {
-        TakerAction::Buy => (
-            best_order.maker_ticker(),
-            best_order.taker_ticker(),
-            best_order.sell_price(),
-        ),
-        TakerAction::Sell => (
-            best_order.taker_ticker(),
-            best_order.maker_ticker(),
-            best_order.buy_price(),
-        ),
-    };
     Ok(LrFindBestQuoteResponse {
         lr_data_0,
         lr_data_1,
         atomic_swap: AtomicSwapRpcParams {
             volume: atomic_swap_volume,
-            base,
-            rel,
-            price,
-            method: req.method,
+            base: best_order.taker_ticker(),
+            rel: best_order.maker_ticker(),
+            price: best_order.sell_price(),
+            method: "sell".to_owned(), // Always convert to the 'sell' action to simplify LR_0 estimations
             order_uuid: best_order.order().uuid,
             match_by: None,
             order_type: None,

mm2src/mm2_main/src/rpc/lp_commands/lr_swap_api/lr_api_types.rs

@@ -62,6 +62,7 @@ impl AskOrBidOrder {
         }
     }
     /// Convert to maker buy price
+    #[allow(unused)]
     pub fn buy_price(&self) -> MmNumber {
         match self {
             AskOrBidOrder::Ask { order, .. } => &MmNumber::from(1) / &order.price.rational.clone().into(),