fixed ORAI to ORAI single step error no swap ops

Author: ducphamle2

contracts/cw-ics20-latest/artifacts/cw-ics20-latest.wasm

@@ -449,17 +449,15 @@ pub fn get_follow_up_msgs(
 ) -> Result<(Vec<CosmosMsg>, String), ContractError> {
     let config = CONFIG.load(storage)?;
     let mut cosmos_msgs: Vec<CosmosMsg> = vec![];
-    if memo.is_empty() {
-        return Ok((
-            vec![send_amount(to_send, receiver.to_string(), None)],
-            "".to_string(),
-        ));
-    }
     let destination: DestinationInfo = DestinationInfo::from_str(memo);
-    // if destination denom, then we simply transfers cw20 to the receiver address.
-    if destination.destination_denom.is_empty() {
+    if is_follow_up_msgs_only_send_amount(
+        &memo,
+        &destination.destination_denom,
+        &initial_receive_asset_info.to_string(),
+        &config.fee_denom,
+    ) {
         return Ok((
-            vec![send_amount(to_send, destination.receiver.clone(), None)],
+            vec![send_amount(to_send, receiver.to_string(), None)],
             "".to_string(),
         ));
     }
@@ -528,6 +526,32 @@ pub fn get_follow_up_msgs(
     return Ok((cosmos_msgs, ibc_error_msg));
 }
 
+pub fn is_follow_up_msgs_only_send_amount(
+    memo: &str,
+    destination_denom: &str,
+    initial_receive_asset_info: &str,
+    fee_denom: &str,
+) -> bool {
+    if memo.is_empty() {
+        return true;
+    }
+    // if destination denom, then we simply transfers cw20 to the receiver address.
+    if destination_denom.is_empty() {
+        return true;
+    }
+    // special case, if inital receiver asset info is native orai (fee denom in this case), and the destination is also orai => we just transfer instead of swapping
+    // the reason is that orai is the central asset info for swapping. There's no ORAI/ORAI pair
+    if initial_receive_asset_info.eq(&AssetInfo::NativeToken {
+        denom: fee_denom.to_string(),
+    }
+    .to_string())
+        && destination_denom.eq(fee_denom)
+    {
+        return true;
+    }
+    false
+}
+
 pub fn build_swap_operations(
     receiver_asset_info: AssetInfo,
     initial_receive_asset_info: AssetInfo,

contracts/cw-ics20-latest/src/ibc.rs

@@ -7,8 +7,8 @@ mod test {
 
     use crate::ibc::{
         ack_fail, build_ibc_msg, build_swap_msgs, check_gas_limit, handle_follow_up_failure,
-        ibc_packet_receive, parse_voucher_denom, send_amount, Ics20Ack, Ics20Packet, RECEIVE_ID,
-        REFUND_FAILURE_ID,
+        ibc_packet_receive, is_follow_up_msgs_only_send_amount, parse_voucher_denom, send_amount,
+        Ics20Ack, Ics20Packet, RECEIVE_ID, REFUND_FAILURE_ID,
     };
     use crate::ibc::{build_swap_operations, get_follow_up_msgs};
     use crate::test_helpers::*;
@@ -876,7 +876,7 @@ mod test {
             vec![CosmosMsg::Wasm(WasmMsg::Execute {
                 contract_addr: env.contract.address.to_string(),
                 msg: to_binary(&Cw20ExecuteMsg::Transfer {
-                    recipient: "cosmosabcd".to_string(),
+                    recipient: receiver.to_string(),
                     amount: amount.clone()
                 })
                 .unwrap(),
@@ -960,4 +960,55 @@ mod test {
         // should undo reduce channel state
         assert_eq!(channel_state.outstanding, remote_amount)
     }
+
+    #[test]
+    fn test_is_follow_up_msgs_only_send_amount() {
+        assert_eq!(
+            is_follow_up_msgs_only_send_amount("", "dest denom", "initial info", "fee denom"),
+            true
+        );
+        assert_eq!(
+            is_follow_up_msgs_only_send_amount("memo", "", "initial info", "fee denom"),
+            true
+        );
+        // dest denom no equal to fee denom, return false
+        assert_eq!(
+            is_follow_up_msgs_only_send_amount(
+                "memo",
+                "dest denom",
+                &AssetInfo::NativeToken {
+                    denom: "fee_denom".to_string()
+                }
+                .to_string(),
+                "fee_denom"
+            ),
+            false
+        );
+        // initial no equal to fee denom => return false
+        assert_eq!(
+            is_follow_up_msgs_only_send_amount(
+                "memo",
+                "fee_denom",
+                &AssetInfo::NativeToken {
+                    denom: "foobar".to_string()
+                }
+                .to_string(),
+                "fee_denom"
+            ),
+            false
+        );
+        // both dest denom and initial equal fee denom => true
+        assert_eq!(
+            is_follow_up_msgs_only_send_amount(
+                "memo",
+                "fee_denom",
+                &AssetInfo::NativeToken {
+                    denom: "fee_denom".to_string()
+                }
+                .to_string(),
+                "fee_denom"
+            ),
+            true
+        );
+    }
 }