fix: changes made

Author: 0ptimizerr

contracts/javascore/Intent_Contracts/app/src/main/java/network/icon/intent/Intent.java

@@ -41,7 +41,7 @@ public void SwapIntent(
             BigInteger amount,
             String toToken,
             BigInteger toAmount,
-            String data) {
+            byte[] data) {
     }
 
     @EventLog(indexed = 2)
@@ -247,19 +247,44 @@ public void tokenFallback(Address _from, BigInteger _value, byte[] _data) {
 
         // string(address of depositer) -> string (deposits token address) -> amountof
         // token
-        String depositor = json.get("depositor").asString();
-        String token = json.get("token").asString();
-        BigInteger amount = new BigInteger(json.get("amount").asString());
-
-        deposit.at(depositor).set(token, amount);
-        SwapOrder swapOrder = SwapOrder
-                .fromBytes(hexStringToByteArray(json.get("swapOrderDataBytes").asString()));
+        // String depositor = json.get("depositor").asString();
+        // String token = json.get("token").asString();
+        // BigInteger amount = new BigInteger(json.get("amount").asString());
+        String type = json.get("type").asString();
+        // deposit.at(depositor).set(token, amount);
+        if (type.equals("swap")) {
+            SwapOrder swapOrder = SwapOrder
+                    .fromBytes(hexStringToByteArray(json.get("swapOrderDataBytes").asString()));
+            deposit.at(swapOrder.creator).set(swapOrder.token, swapOrder.amount);
+
+            // Context.require(amount.equals(swapOrder.amount), "Token amount must be
+            // equal");
+            // Context.require(swapOrder.getToken() != null, "Token can't be null");
+            Context.require(Context.getCaller().toString().equals(extractAddress(swapOrder.getCreator())),
+                    "Creator must be sender");
+            _swap(swapOrder);
+        } else {
+            SwapOrder swapOrder = SwapOrder
+                    .fromBytes(hexStringToByteArray(json.get("swapOrderDataBytes").asString()));
+
+            SwapOrderData swapOrderData = new SwapOrderData();
+            swapOrderData.id = swapOrder.id;
+            swapOrderData.emitter = swapOrder.emitter;
+            swapOrderData.srcNID = swapOrder.srcNID;
+            swapOrderData.dstNID = swapOrder.dstNID;
+            swapOrderData.creator = swapOrder.creator;
+            swapOrderData.destinationAddress = swapOrder.destinationAddress;
+            swapOrderData.token = swapOrder.token;
+            swapOrderData.amount = swapOrder.amount;
+            swapOrderData.toToken = swapOrder.toToken;
+            swapOrderData.toAmount = swapOrder.toAmount;
+            swapOrderData.data = swapOrder.data;
+
+            String solver = json.get("solver").asString();
+            fill(swapOrderData, solver);
+        }
+        ;
 
-        Context.require(amount.equals(swapOrder.amount), "Token amount must be equal");
-        Context.require(swapOrder.getToken() != null, "Token can't be null");
-        Context.require(Context.getCaller().toString().equals(extractAddress(swapOrder.getCreator())),
-                "Creator must be sender");
-        _swap(swapOrder);
     }
 
     @External

contracts/javascore/Intent_Contracts/app/src/main/java/network/icon/intent/structs/SwapOrder.java

@@ -18,11 +18,11 @@ public class SwapOrder {
     public BigInteger amount; // Amount of the token to be swapped
     public String toToken; // Token to receive on the destination network
     public BigInteger toAmount; // Minimum amount of the toToken to receive
-    public String data; // Additional data (if any) for future use (is this the right type?)
+    public byte[] data; // Additional data (if any) for future use (is this the right type?)
 
     public SwapOrder(BigInteger id, String emitter, String srcNID, String dstNID, String creator,
             String destinationAddress, String token, BigInteger amount, String toToken, BigInteger toAmount,
-            String data) {
+            byte[] data) {
         this.id = id;
         this.emitter = emitter;
         this.srcNID = srcNID;
@@ -77,7 +77,7 @@ public static SwapOrder readObject(ObjectReader reader) {
         obj.toAmount = reader.readBigInteger();
         Context.println(obj.toAmount.toString());
 
-        obj.data = reader.readString();
+        obj.data = reader.readByteArray();
         Context.println(obj.data.toString());
 
         reader.end();
@@ -191,11 +191,11 @@ public void setToAmount(BigInteger toAmount) {
         this.toAmount = toAmount;
     }
 
-    public String getData() {
+    public byte[] getData() {
         return data;
     }
 
-    public void setData(String data) {
+    public void setData(byte[] data) {
         this.data = data;
     }
 }

contracts/javascore/Intent_Contracts/app/src/main/java/network/icon/intent/utils/SwapOrderData.java

@@ -13,5 +13,5 @@ public class SwapOrderData {
     public BigInteger amount;
     public String toToken;
     public BigInteger toAmount;
-    public String data;
+    public byte[] data;
 }