Created missing Objects added signing and missing API calls. Models are now closer to the default IOTA objects (Maybe add converter from IOTA objects to JS and other way around)

Author: gosticks

README.md

@@ -9,17 +9,17 @@ If you have any ideas please submit a request (I am totally not a Java guy so...
 
 #### Multisig
 - [x] composeAddress
-- [x] updateLeafToRoot (needs testing)
+- [x] updateLeafToRoot
 - [x] getDigest
 
 #### Model.Transfer
-- [x] prepare (needs testing)
-- [x] compose (needs testing)
+- [x] prepare
+- [x] compose
 - [x] close (needs testing)
-- [ ] applyTransfers
-- [ ] appliedSignatures 
-- [ ] getDiff 
-- [ ] sign 
+- [x] applyTransfers
+- [x] appliedSignatures 
+- [ ] getDiff (not used at the moment)
+- [x] sign 
 
 
 
@@ -28,6 +28,7 @@ If you have any ideas please submit a request (I am totally not a Java guy so...
 1. Clone repo
 2. Update maven ressources
 3. That's it.
+4. You can run a test transaction by running the main func in the Main Class.
 
 
 

iotaflashlibjswrapper.iml

@@ -13,5 +13,6 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Maven: com.eclipsesource.j2v8:j2v8_macosx_x86_64:4.6.0" level="project" />
     <orderEntry type="library" name="Maven: com.github.iotaledger:iota~lib~java:v0.9.10" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.2" level="project" />
   </component>
 </module>

pom.xml

@@ -26,6 +26,13 @@
             <artifactId>iota~lib~java</artifactId>
             <version>v0.9.10</version>
         </dependency>
+        <!--  Gson: Java to Json conversion -->
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.8.2</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <!-- https://maven.apache.org/settings.html#Properties -->

res/iota.flash.js

@@ -9472,7 +9472,7 @@ var is_null = function(arr) {
 }
 
 var trits_to_words = function(trits) {
-    if (trits.length != 243) {
+	if (trits.length != 243) {
         throw "Invalid trits length";
     }
 

src/main/java/Helpers.java

@@ -1,6 +1,8 @@
 import Model.*;
 
 import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
 
 public class Helpers {
     public static ArrayList<Bundle> createTransaction(UserObject user, ArrayList<Transfer> transfers, boolean shouldClose) {
@@ -11,18 +13,18 @@ public static ArrayList<Bundle> createTransaction(UserObject user, ArrayList<Tra
             System.out.println("No more addresses in channel.");
         }
 
-        ArrayList<Transaction> newTransfers;
+        ArrayList<Transfer> newTransfers;
 
         if (shouldClose) {
-            newTransfers = new ArrayList<>();
-            // newTransfers = IotaFlashBridge.close(user.getFlash().getSettlementAddresses(), user.getFlash().deposits);
+            newTransfers = IotaFlashBridge.close(user.getFlash().getSettlementAddresses(), user.getFlash().getDeposits());
         } else {
             newTransfers = IotaFlashBridge.prepare(
                     user.getFlash().getSettlementAddresses(),
                     user.getFlash().getDeposits(),
                     user.getUserIndex(),
                     transfers
                     );
+
         }
 
         ArrayList<Bundle> bundles = IotaFlashBridge.compose(
@@ -42,6 +44,33 @@ public static ArrayList<Signature> signTransaction(UserObject user, ArrayList<Bu
         return IotaFlashBridge.sign(user.getFlash().getRoot(), user.getSeed(), bundles);
     }
 
+    public static ArrayList<Bundle> appliedSignatures(ArrayList<Bundle> bundles, ArrayList<Signature> signatures) {
+        ArrayList<Bundle> clonedBundles = clone(bundles);
+        bundles.clone();
+
+        for (int i = 0; i < bundles.size(); i++) {
+            Signature sig = signatures.get(i);
+            Bundle b = bundles.get(i);
+            if (sig == null) {
+                continue;
+            }
+
+            ArrayList<Transaction> transactions = b.getBundles();
+            String addy = transactions.stream().filter(tx -> tx.getValue() < 0).findFirst().get().getAddress();
+            List<Transaction> tmp = transactions.stream()
+                    .filter(tx -> tx.getAddress().equals(addy))
+                    .collect(Collectors.toList());
+
+            tmp = tmp.subList(sig.getIndex(), sig.getIndex() + sig.getSignatureFragments().size());
+
+            for (int j = 0; j < tmp.size(); j++) {
+                tmp.get(j).setSignatureFragments(sig.getSignatureFragments().get(j));
+            }
+        }
+
+        return clonedBundles;
+    }
+
     public static void applyTransfers(UserObject user, ArrayList<Bundle> bundles) {
         IotaFlashBridge.applayTransfers(
                 user.getFlash().getRoot(),
@@ -52,4 +81,12 @@ public static void applyTransfers(UserObject user, ArrayList<Bundle> bundles) {
                 bundles
         );
     }
+
+    public static ArrayList<Bundle> clone(ArrayList<Bundle> bundles) {
+        ArrayList<Bundle> clonedBundles = new ArrayList<>();
+        for (Bundle b : bundles) {
+            clonedBundles.add(b.clone());
+        }
+        return clonedBundles;
+    }
 }

src/main/java/IotaFlashBridge.java

@@ -25,6 +25,14 @@ public static void boot() throws IOException {
         engine.executeVoidScript(file);
         multisig = (V8Object) engine.executeScript("iotaFlash.multisig");
         transfer = (V8Object) engine.executeScript("iotaFlash.transfer");
+
+        Model.Console console = new Model.Console();
+        V8Object v8Console = new V8Object(engine);
+        engine.add("console", v8Console);
+        v8Console.registerJavaMethod(console, "log", "log", new Class<?>[] { String.class });
+        v8Console.registerJavaMethod(console, "err", "err", new Class<?>[] { String.class });
+        v8Console.release();
+        engine.executeScript("console.log('Connected JS console to V8Engine output.');");
     }
 
     /**
@@ -93,11 +101,8 @@ public static CreateTransactionHelperObject updateLeafToRoot(MultisigAddress roo
 
         V8Object ret = multisig.executeObjectFunction("updateLeafToRoot", params);
         int generate = ret.getInteger("generate");
-        Map<String, ? super Object> multiSigMap = V8ObjectUtils.toMap((V8Object) ret.getObject("multisig"));
-        // Parse result into Java Obj.
-        String addr = (String) multiSigMap.get("address");
-        int secSum = (Integer) multiSigMap.get("securitySum");
-        MultisigAddress multisig = new MultisigAddress(addr, secSum);
+        V8Object multisigObject = (V8Object) ret.getObject("multisig");
+        MultisigAddress multisig = V8Converter.multisigAddressFromV8Object(multisigObject);
         return new CreateTransactionHelperObject(generate, multisig);
     }
 
@@ -110,7 +115,7 @@ public static CreateTransactionHelperObject updateLeafToRoot(MultisigAddress roo
      * @param transfers array of all transfers (value, address) pairs
      * @return
      */
-    public static ArrayList<Transaction> prepare(ArrayList<String> settlementAddresses, ArrayList<Integer> deposits, int index, ArrayList<Transfer> transfers) {
+    public static ArrayList<Transfer> prepare(ArrayList<String> settlementAddresses, ArrayList<Integer> deposits, int index, ArrayList<Transfer> transfers) {
 
         // Now put all params into JS ready array.
         List<Object> params = new ArrayList<>();
@@ -121,21 +126,28 @@ public static ArrayList<Transaction> prepare(ArrayList<String> settlementAddress
 
         // Call js function.
         V8Array ret = transfer.executeArrayFunction("prepare", V8ObjectUtils.toV8Array(engine, params));
-        List<Object> transfersReturnJS = V8ObjectUtils.toList(ret);
+        return V8Converter.transferListFromV8Array(ret);
+    }
 
-        ArrayList<Transaction> returnTransfers = new ArrayList<>();
 
-        for (Object b: transfersReturnJS) {
-            Map<String, ? super Object> values = (Map<String, ? super Object>) b;
-            String obsoleteTag = (String) values.get("obsoleteTag");
-            String address = (String) values.get("address");
-            Integer value = (Integer) values.get("value");
+    /**
+     *
+     * @param settlementAddresses
+     * @param deposits
+     * @return
+     */
+    public static ArrayList<Transfer> close(ArrayList<String> settlementAddresses, ArrayList<Integer> deposits) {
+        V8Array saJS = V8ObjectUtils.toV8Array(engine, settlementAddresses);
+        // Deposits
+        V8Array depositsJS = V8ObjectUtils.toV8Array(engine, deposits);
 
-            returnTransfers.add(new Transaction(address, value, "", "", 0));
-        }
+        // Add to prams
+        ArrayList<Object> paramsObj = new ArrayList<Object>();
 
-        // Call js.
-        return returnTransfers;
+        paramsObj.add(saJS);
+        paramsObj.add(depositsJS);
+        V8Array res = transfer.executeArrayFunction("close", V8ObjectUtils.toV8Array(engine, paramsObj));
+        return V8Converter.transferListFromV8Array(res);
     }
 
     /**
@@ -146,7 +158,7 @@ public static ArrayList<Transaction> prepare(ArrayList<String> settlementAddress
      * @param root
      * @param remainderAddress
      * @param history
-     * @param transactions
+     * @param transfers
      * @param close
      * @return
      */
@@ -156,7 +168,7 @@ public static ArrayList<Bundle> compose(int balance,
                                             MultisigAddress root,
                                             MultisigAddress remainderAddress,
                                             ArrayList<Bundle> history,
-                                            ArrayList<Transaction> transactions,
+                                            ArrayList<Transfer> transfers,
                                             boolean close) {
 
 
@@ -170,11 +182,10 @@ public static ArrayList<Bundle> compose(int balance,
         params.add(V8Converter.multisigToV8Object(engine, root));
         params.add(V8Converter.multisigToV8Object(engine, remainderAddress));
         params.add(V8Converter.bundleListToV8Array(engine, history));
-        params.add(V8Converter.transactionListToV8Array(engine, transactions));
+        params.add(V8Converter.transferListToV8Array(engine, transfers));
 
         // Call js function.
         V8Array ret = transfer.executeArrayFunction("compose", V8ObjectUtils.toV8Array(engine, params));
-        List<Object> transfersReturnJS = V8ObjectUtils.toList(ret);
 
         return V8Converter.bundleListFromV8Array(ret);
     }
@@ -193,8 +204,9 @@ public static ArrayList<Signature> sign(MultisigAddress root, String seed, Array
         List<Object> params = new ArrayList<>();
         params.add(V8Converter.multisigToV8Object(engine, root));
         params.add(seed);
-        params.add(V8Converter.bundleListToV8Array(engine, bundles));
 
+        // Create bundle nested list by incoding all bundles
+        params.add(V8Converter.bundleListToV8Array(engine, bundles));
         V8Array returnArray = transfer.executeArrayFunction("sign", V8ObjectUtils.toV8Array(engine, params));
 
         return V8Converter.v8ArrayToSignatureList(returnArray);
@@ -256,26 +268,6 @@ public static void applayTransfers(MultisigAddress root,
         transfer.executeFunction("applyTransfers", V8ObjectUtils.toV8Array(engine, params));
     }
 
-    /**
-     *
-     * @param settlementAddresses
-     * @param deposits
-     * @return
-     */
-    public static Object close(ArrayList<String> settlementAddresses, ArrayList<Integer> deposits) {
-        V8Array saJS = V8ObjectUtils.toV8Array(engine, settlementAddresses);
-        // Deposits
-        V8Array depositsJS = V8ObjectUtils.toV8Array(engine, deposits);
-
-        // Add to prams
-        ArrayList<Object> paramsObj = new ArrayList<Object>();
-
-        paramsObj.add(saJS);
-        paramsObj.add(depositsJS);
-        V8Object res = transfer.executeObjectFunction("close", V8ObjectUtils.toV8Array(engine, paramsObj));
-        return res;
-    }
-
     /// Utils
 
     /**

src/main/java/Main.java

@@ -72,7 +72,7 @@ public static void main(String[] argv) throws Exception {
 
         // Build flash trees
         for (int i = 1; i < oneMultisigs.size(); i++) {
-            System.out.println("Adding child (" + oneMultisigs.get(i).toString() + ") to root :" + oneMultisigs.get(i - 1).toString() );
+            System.out.println(oneMultisigs.get(i - 1).toString() + " -> "  + oneMultisigs.get(i).toString());
             oneMultisigs.get(i - 1).push(oneMultisigs.get(i));
         }
 
@@ -100,13 +100,12 @@ public static void main(String[] argv) throws Exception {
         ArrayList<Transfer> transfers = new ArrayList<>();
         transfers.add(new Transfer(twoSettlement, 200));
 
-        System.out.println("Creating a transaction");
+        System.out.println(oneFlash);
+
+        System.out.println("Creating a transaction: 200 to " + twoSettlement);
         ArrayList<Bundle> bundles = Helpers.createTransaction(oneFlash, transfers, false);
 
-        System.out.println("createTransaction completed");
-        for (Bundle b: bundles) {
-            System.out.println(b.toString());
-        }
+        System.out.println("[SUCCESS] createTransaction completed");
 
         // Sign the bundles.
         // Get signatures for the bundles
@@ -115,12 +114,20 @@ public static void main(String[] argv) throws Exception {
         // Generate USER TWO'S Singatures
         ArrayList<Signature> twoSignatures = Helpers.signTransaction(twoFlash, bundles);
 
+        System.out.println("[SUCCESS] Created signatures for users.");
+
         // Sign bundle with your USER ONE'S signatures
         ArrayList<Bundle> signedBundles = IotaFlashBridge.appliedSignatures(bundles, oneSignatures);
 
+        System.out.println("[SUCCESS] Parial applied Signature for User one on transfer bundle");
+
+
         // ADD USER TWOS'S signatures to the partially signed bundles
         signedBundles = IotaFlashBridge.appliedSignatures(signedBundles, twoSignatures);
 
+        System.out.println("[SUCCESS] Signed bundle bu second user. Bundle ready.");
+
+
         /////////////////////////////////
         /// APPLY SIGNED BUNDLES
 
@@ -134,9 +141,55 @@ public static void main(String[] argv) throws Exception {
         Helpers.applyTransfers(twoFlash, signedBundles);
         // Save latest channel bundles
         twoFlash.setBundles(signedBundles);
+        System.out.println("[SUCCESS] Apply Transfer to flash channel.");
+
 
         System.out.println("Transaction Applied!");
+        System.out.println(
+                "Transactable tokens: " +
+                oneFlash.getFlash().getDeposits().stream().mapToInt(v -> v.intValue()).sum()
+        );
+
+        System.out.println("Closing channel... not yet working...");
+/*
+
+        // Supplying the CORRECT varibles to create a closing bundle
+                bundles = Helpers.createTransaction(
+                        oneFlash,
+                        oneFlash.getFlash().getSettlementAddresses(),
+                        true
+                );
+
+        /////////////////////////////////
+        /// SIGN BUNDLES
+
+        // Get signatures for the bundles
+                oneSignatures = Helpers.signTransaction(oneFlash, bundles)
+
+        // Generate USER TWO'S Singatures
+                twoSignatures = Helpers.signTransaction(twoFlash, bundles)
+
+        // Sign bundle with your USER ONE'S signatures
+                signedBundles = transfer.appliedSignatures(bundles, oneSignatures)
+
+        // ADD USER TWOS'S signatures to the partially signed bundles
+                signedBundles = transfer.appliedSignatures(signedBundles, twoSignatures)
+
+        /////////////////////////////////
+        /// APPLY SIGNED BUNDLES
+
+        // Apply transfers to User ONE
+                oneFlash = Helpers.applyTransfers(oneFlash, signedBundles)
+        // Save latest channel bundles
+                oneFlash.bundles = signedBundles
+
+        // Apply transfers to User TWO
+                twoFlash = Helpers.applyTransfers(twoFlash, signedBundles)
+        // Save latest channel bundles
+                twoFlash.bundles = signedBundles
 
+                console.log("Channel Closed")
+                console.log("Final Bundle to be attached: ")*/
     }
 
     private static void setupUser(UserObject user, int TREE_DEPTH) {