feat: bash scripts

Author: 0ptimizerr

contracts/javascore/Intent_Contracts/.keystores/icon_wallet.json

@@ -0,0 +1 @@
+{"version":3,"id":"451433de-8585-46b9-b23a-74ad6066235a","address":"hx6b54588d3a7621eb8b69b501026d1fea43eae613","crypto":{"ciphertext":"ac3d6e30a38ee7eb7f7a6e0365172980d6641778b056f22779ae8eaadb01e99f","cipherparams":{"iv":"1a20a240e1ea0996a90887d18179bbcd"},"cipher":"aes-128-ctr","kdf":"scrypt","kdfparams":{"dklen":32,"salt":"506cf7d325761d756ec48793ab1af24c26b44074e930e43b058e7f11ef734731","n":16384,"r":8,"p":1},"mac":"82cb8bf06b2d6ef8a3bdb3ede2371420325ab72b2b2f84820d7f38422d2a7d49"},"coinType":"icx"}

contracts/javascore/Intent_Contracts/.keystores/icon_wallet2.json

@@ -0,0 +1 @@
+{"version":3,"id":"359f516b-88e4-4565-b581-91e022203368","address":"hx2510636000161b66745abe841730ad60e4ec8cdc","crypto":{"ciphertext":"86947d1fe3e182331e8e03b6177b87a10377039a6e6343be9f6e2b6da788b3fb","cipherparams":{"iv":"ab37469c94f8812fd6b5d349252be98d"},"cipher":"aes-128-ctr","kdf":"scrypt","kdfparams":{"dklen":32,"salt":"f8f79d3936cf85b095672798c032090a68f080860a4af9f6a5700bd79bc93e1d","n":16384,"r":8,"p":1},"mac":"b2525d038c1ba0cad8af757ccee71ab08557be2b2964f21ed809ae03509970d3"},"coinType":"icx"}

contracts/javascore/Intent_Contracts/app/build.gradle

@@ -1,8 +1,9 @@
 dependencies {
         compileOnly 'foundation.icon:javaee-api:0.9.6'
+        implementation 'foundation.icon:javaee-scorex:0.5.2'
         implementation 'com.github.sink772:javaee-tokens:0.6.4'
-        implementation 'org.json:json:20230227'
-    	testImplementation 'foundation.icon:javaee-unittest:0.10.0'
+        implementation 'com.github.sink772:minimal-json:0.9.7'
+        testImplementation 'foundation.icon:javaee-unittest:0.10.0'
     	testImplementation 'org.mockito:mockito-core:4.8.0'
     	testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.0'
     	testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.0'
@@ -11,10 +12,11 @@ dependencies {
 optimizedJar {
      mainClassName = 'network.icon.intent.Intent'
      archivesBaseName = "intent" + 1 + ".jar"
-	from {
-    	    configurations.runtimeClasspath.collect {it.isDirectory() ? it : zipTree(it) }
-	}
-
+     duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+    from {
+            configurations.runtimeClasspath.collect {it.isDirectory() ? it : zipTree(it) 
+            }
+    }
 }
 
 deployJar {

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

@@ -57,6 +57,7 @@ public BigInteger getConnSn() {
     }
 
     void onlyRelay() {
+        Context.println(relayAddress.get().toString());
         Context.require(Context.getCaller().equals(relayAddress.get()), "OnlyRelayer");
     }
 

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

@@ -13,7 +13,8 @@
 import score.annotation.EventLog;
 import score.annotation.External;
 import score.annotation.Payable;
-import org.json.JSONObject;
+import com.eclipsesource.json.Json;
+import com.eclipsesource.json.JsonObject;
 
 public class Intent extends GeneralizedConnection {
 
@@ -68,19 +69,14 @@ public Intent(String _nid, BigInteger _protocolFee, Address _feeHandler, Address
     @Payable
     public void swap(SwapOrderData swapOrderData) {
         Context.require(swapOrderData.token != null, "Token can't be null");
-        Context.require(Context.getCaller().toString().equals(swapOrderData.creator),
+        Context.require(Context.getCaller().toString().equals(extractAddress(swapOrderData.creator)),
                 "Creator must be sender");
+        Context.require(Context.getValue().equals(swapOrderData.amount),
+                "Deposit amount not equal to order amount");
 
-        Address token = Address.fromString(swapOrderData.token);
+        Address token = Address.fromString(extractAddress(swapOrderData.token));
         Address nativAddress = nativeAddress.get();
-        if (token.equals(nativAddress)) {
-            Context.require(Context.getValue().equals(swapOrderData.amount),
-                    "Deposit amount not equal to order amount");
-        } else {
-            Context.require(Context.getValue().equals(BigInteger.valueOf(0)),
-                    "Nativ Token Must Be Zero");
-            Context.call(token, "transfer", Context.getAddress(), swapOrderData.amount);
-        }
+        Context.require(token.equals(nativAddress), "Not a native token");
 
         SwapOrder swapOrder = new SwapOrder(swapOrderData.id, swapOrderData.emitter,
                 swapOrderData.srcNID,
@@ -89,15 +85,17 @@ public void swap(SwapOrderData swapOrderData) {
                 swapOrderData.amount, swapOrderData.toToken, swapOrderData.toAmount,
                 swapOrderData.data);
 
+        deposit.at(swapOrderData.creator).set(swapOrderData.token, swapOrderData.amount);
+
         _swap(swapOrder);
     }
 
     void _swap(SwapOrder swapOrder) {
         BigInteger id = this.depositId.getOrDefault(BigInteger.ZERO).add(BigInteger.valueOf(1));
         swapOrder.id = id;
         Context.require(swapOrder.srcNID.equals(this.networkId.get()), "NID is misconfigured");
-        Context.require(swapOrder.emitter.equals(Context.getAddress().toString()),
-                "Emitter specified is not this");
+        Context.require(extractAddress(swapOrder.emitter).equals(Context.getAddress().toString()),
+                "Emitter specified is not this"); // emitter contract or eoa?
         orders.set(id, swapOrder);
         SwapIntent(id, swapOrder.emitter, swapOrder.srcNID, swapOrder.dstNID,
                 swapOrder.creator,
@@ -121,13 +119,15 @@ public void fill(SwapOrderData swapOrderData, String solverAddress) {
         Context.require(!isFilled, "Order has already been filled");
         finishedOrders.set(orderHash, true);
 
-        BigInteger fee = swapOrder.toAmount.multiply(protocolFee.get()).divide(BigInteger.valueOf(1000)); // add divide
-                                                                                                          // by 10000
+        BigInteger fee = swapOrder.toAmount.multiply(protocolFee.get()).divide(BigInteger.valueOf(10000)); // add divide
+                                                                                                           // by 10000
         BigInteger toAmount = swapOrder.toAmount.subtract(fee);
+
         _transferResult(swapOrder.destinationAddress, swapOrder.toToken, toAmount,
                 fee);
 
         OrderFill orderFill = new OrderFill(swapOrder.id, orderBytes, solverAddress);
+
         if (swapOrder.srcNID.equals(swapOrder.dstNID)) {
             _resolveFill(networkId.get(), orderFill);
             return;
@@ -143,7 +143,7 @@ public void cancel(BigInteger id) {
         if (order == null) {
             Context.revert("Order already has been cancelled");
         }
-        Context.require(Address.fromString(order.creator).equals(Context.getCaller()),
+        Context.require(Address.fromString(extractAddress(order.creator)).equals(Context.getCaller()),
                 "Only creator can cancel this order");
 
         if (order.srcNID.equals(order.dstNID)) {
@@ -199,35 +199,36 @@ void _resolveFill(String srcNetwork, OrderFill _fill) {
         if (order == null) {
             Context.revert("There is no order to resolve");
         }
+        Context.require(Arrays.equals(Context.hash("keccak-256", order.toBytes()),
+                Context.hash("keccak-256",
+                        _fill.orderBytes)),
+                "Mismatched order");
 
-        Context.require(Arrays.equals(Context.hash("keccak-256", order.toBytes()), Context.hash("keccak-256",
-                _fill.orderBytes)), "Mismatched order");
         Context.require(order.dstNID.equals(srcNetwork), "Invalid Network");
 
         orders.set(_fill.id, null);
         OrderClosed(_fill.id);
 
-        Address tokenAddress = Address.fromString(order.token);
+        Address tokenAddress = Address.fromString(extractAddress(order.token));
         if (tokenAddress.equals(nativeAddress.get())) {
-            Context.transfer(Address.fromString(_fill.solver), order.amount);
-
+            Context.transfer(Address.fromString(extractAddress(_fill.solver)), order.amount);
         } else {
-            Context.call(tokenAddress, "transfer", Address.fromString(_fill.solver), order.amount);
+            Context.call(tokenAddress, "transfer", Address.fromString(extractAddress(_fill.solver)), order.amount);
         }
     }
 
     void _transferResult(String _toAddress, String _toToken, BigInteger amount,
             BigInteger fee) {
-        Address toAddress = Address.fromString(_toAddress);
-        Address toTokenAddress = Address.fromString(_toToken);
+        Address toAddress = Address.fromString(extractAddress(_toAddress));
+        Address toTokenAddress = Address.fromString(extractAddress(_toToken));
         if (toTokenAddress.equals(nativeAddress.get())) {
             Context.require(Context.getValue().equals(amount.add(fee)), "\"Deposit amount not equal to order amount\"");
             _nativeTransfer(toAddress, amount);
             _nativeTransfer(feeHandler.get(), fee);
         } else {
-            Context.call(toTokenAddress, "transferFrom", Context.getAddress(), toAddress,
+            Context.call(toTokenAddress, "transfer", toAddress,
                     amount);
-            Context.call(toTokenAddress, "transferFrom", Context.getAddress(),
+            Context.call(toTokenAddress, "transfer",
                     feeHandler.get(), fee);
         }
     }
@@ -236,48 +237,28 @@ void _nativeTransfer(Address to, BigInteger amount) {
         Context.transfer(to, amount);
     }
 
-    public static byte[] hexStringToByteArray(String s) {
-        int len = s.length();
-        byte[] data = new byte[len / 2];
-        for (int i = 0; i < len; i += 2) {
-            data[i / 2] = (byte) ((Character.digit(s.charAt(i), 16) << 4)
-                    + Character.digit(s.charAt(i + 1), 16));
-        }
-        return data;
-    }
-
     @External
     public void tokenFallback(Address _from, BigInteger _value, byte[] _data) {
         Context.require(_value.compareTo(BigInteger.ZERO) > 0, "Zero transfers not allowed");
+
         String unpackedData = new String(_data);
         Context.require(!unpackedData.equals(""), "Token Fallback: Data can't be empty");
+        JsonObject json = Json.parse(unpackedData).asObject();
 
-        JSONObject jsonObject = new JSONObject(unpackedData);
-        // string(address of depositer) -> string (deposits token address) -> amount of
+        // string(address of depositer) -> string (deposits token address) -> amountof
         // token
-        String depositor = jsonObject.get("depositor").toString();
-        String token = jsonObject.get("token").toString();
-        BigInteger amount = jsonObject.getBigInteger("amount");
+        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(jsonObject.get("swapOrderDataBytes").toString()));
-        Context.require(amount.equals(swapOrder.getAmount()), "Token amount must be equal");
+                .fromBytes(hexStringToByteArray(json.get("swapOrderDataBytes").asString()));
+
+        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(swapOrder.getCreator()),
+        Context.require(Context.getCaller().toString().equals(extractAddress(swapOrder.getCreator())),
                 "Creator must be sender");
-
-        Address swapOrderToken = Address.fromString(swapOrder.getToken());
-        Address nativAddress = nativeAddress.get();
-        if (swapOrderToken.equals(nativAddress)) {
-            Context.require(Context.getValue().equals(swapOrder.getAmount()),
-                    "Deposit amount not equal to order amount");
-        } else {
-            Context.require(Context.getValue().equals(BigInteger.valueOf(0)),
-                    "Nativ Token Must Be Zero");
-            Context.call(swapOrderToken, "transfer", Context.getAddress(), swapOrder.getAmount());
-        }
         _swap(swapOrder);
     }
 
@@ -317,4 +298,26 @@ public static BigInteger getDepositAmount(String depositer, String token) {
     static void OnlyOwner() {
         Context.require(owner.get().equals(Context.getCaller()), "Not Owner");
     }
+
+    public static String extractAddress(String input) {
+        if (input.contains("0x2.icon/")) {
+            int lastSlashIndex = input.lastIndexOf('/');
+            if (lastSlashIndex != -1 && lastSlashIndex < input.length() - 1) {
+                return input.substring(lastSlashIndex + 1);
+            }
+        } else {
+            return input;
+        }
+        return null;
+    }
+
+    public static byte[] hexStringToByteArray(String s) {
+        int len = s.length();
+        byte[] data = new byte[len / 2];
+        for (int i = 0; i < len; i += 2) {
+            data[i / 2] = (byte) ((Character.digit(s.charAt(i), 16) << 4)
+                    + Character.digit(s.charAt(i + 1), 16));
+        }
+        return data;
+    }
 }

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

@@ -47,17 +47,39 @@ public static void writeObject(ObjectWriter writer, SwapOrder obj) {
     public static SwapOrder readObject(ObjectReader reader) {
         SwapOrder obj = new SwapOrder();
         reader.beginList();
+        Context.println("reading swap order");
         obj.id = reader.readBigInteger();
+        Context.println(obj.id.toString());
         obj.emitter = reader.readString();
+        Context.println(obj.emitter.toString());
+
         obj.srcNID = reader.readString();
+        Context.println(obj.srcNID.toString());
+
         obj.dstNID = reader.readString();
+        Context.println(obj.dstNID.toString());
+
         obj.creator = reader.readString();
+        Context.println(obj.creator.toString());
+
         obj.destinationAddress = reader.readString();
+        Context.println(obj.destinationAddress.toString());
+
         obj.token = reader.readString();
+        Context.println(obj.token.toString());
+
         obj.amount = reader.readBigInteger();
+        Context.println(obj.amount.toString());
+
         obj.toToken = reader.readString();
+        Context.println(obj.toToken.toString());
+
         obj.toAmount = reader.readBigInteger();
+        Context.println(obj.toAmount.toString());
+
         obj.data = reader.readString();
+        Context.println(obj.data.toString());
+
         reader.end();
         return obj;
     }