fix: optimized flow of recvPacket

Author: gcranju

contracts/javascore/ics20/src/main/java/ibc/ics20/ICS20Transfer.java

@@ -305,33 +305,17 @@ public byte[] onRecvPacket(byte[] packet, Address relayer) {
 
         Address receiverAddr = Address.fromString(data.receiver);
 
-        if (isSource) {
-            String denomOnly = data.denom.substring(denomPrefix.length());
-
-            if (isNativeAsset(denomOnly)) {
-                try {
-                    Context.transfer(receiverAddr, data.amount);
-                } catch (Exception e) {
-                    ack = ICS20Lib.FAILED_ACKNOWLEDGEMENT_JSON;
-                }
+        try {
+            if (isSource) {
+                String denomOnly = data.denom.substring(denomPrefix.length());
+                handleSourceToken(denomOnly, receiverAddr, data.amount, data.memo);
             } else {
-                try {
-                    Address tokenContractAddress = getTokenContractAddress(denomOnly);
-                    Context.call(tokenContractAddress, "transfer", receiverAddr, data.amount, data.memo.getBytes());
-                } catch (Exception e) {
-                    ack = ICS20Lib.FAILED_ACKNOWLEDGEMENT_JSON;
-                }
-            }
-        } else {
-            denomPrefix = getDenomPrefix(packetDb.getDestinationPort(), packetDb.getDestinationChannel());
-            String prefixedDenom = denomPrefix + data.denom;
-
-            try {
-                Address tokenContractAddress = getTokenContractAddress(prefixedDenom);
-                Context.call(tokenContractAddress, "mint", receiverAddr, data.amount);
-            } catch (Exception e) {
-                ack = ICS20Lib.FAILED_ACKNOWLEDGEMENT_JSON;
+                denomPrefix = getDenomPrefix(packetDb.getDestinationPort(), packetDb.getDestinationChannel());
+                String prefixedDenom = denomPrefix + data.denom;
+                handleDestinationToken(prefixedDenom, receiverAddr, data.amount);
             }
+        } catch (Exception e) {
+            ack = ICS20Lib.FAILED_ACKNOWLEDGEMENT_JSON;
         }
 
         return ack;
@@ -366,6 +350,40 @@ public void onTimeoutPacket(byte[] packet, Address relayer) {
         refundTokens(packetDb);
     }
 
+    /**
+     * Refunds tokens based on the provided packet.
+     *
+     * @param packet the packet containing the token data
+     */
+    private void refundTokens(Packet packet) {
+        ICS20Lib.FungibleTokenPacketData data = ICS20Lib.unmarshalFungibleTokenPacketData(packet.getData());
+
+        String denomPrefix = getDenomPrefix(packet.getSourcePort(), packet.getSourceChannel());
+        boolean isSource = !data.denom.startsWith(denomPrefix);
+
+        Address sender = Address.fromString(data.sender);
+
+        if (isSource) {
+            handleSourceToken(data.denom, sender, data.amount, data.memo);
+        } else {
+            handleDestinationToken(data.denom, sender, data.amount);
+        }
+    }
+
+    private void handleSourceToken(String denom, Address address, BigInteger amount, String memo) {
+        if (isNativeAsset(denom)) {
+            Context.transfer(address, amount);
+        } else {
+            Address tokenContractAddress = getTokenContractAddress(denom);
+            Context.call(tokenContractAddress, "transfer", address, amount, memo.getBytes());
+        }
+    }
+
+    private void handleDestinationToken(String denom, Address address, BigInteger amount) {
+        Address tokenContractAddress = getTokenContractAddress(denom);
+        Context.call(tokenContractAddress, "mint", address, amount);
+    }
+
     /**
      * Initializes the channel opening process.
      *
@@ -461,33 +479,6 @@ public void onChanCloseConfirm(String portId, String channelId) {
         onlyIBC();
     }
 
-    /**
-     * Refunds tokens based on the provided packet.
-     *
-     * @param packet the packet containing the token data
-     */
-    private void refundTokens(Packet packet) {
-        ICS20Lib.FungibleTokenPacketData data = ICS20Lib.unmarshalFungibleTokenPacketData(packet.getData());
-
-        String denomPrefix = getDenomPrefix(packet.getSourcePort(), packet.getSourceChannel());
-        boolean isSource = !data.denom.startsWith(denomPrefix);
-
-        Address sender = Address.fromString(data.sender);
-
-        if (isSource) {
-            if (isNativeAsset(data.denom)) {
-                Context.transfer(sender, data.amount);
-                return;
-            }
-
-            Address tokenContractAddress = getTokenContractAddress(data.denom);
-            Context.call(tokenContractAddress, "transfer", sender, data.amount, data.memo.getBytes());
-        } else {
-            Address tokenContractAddress = getTokenContractAddress(data.denom);
-            Context.call(tokenContractAddress, "mint", sender, data.amount);
-        }
-    }
-
     private static String getDenomPrefix(String port, String channel) {
         return port + "/" + channel + "/";
     }