Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/jota/IotaAPIProxy.java

src/main/java/jota/IotaAPIProxy.java

@@ -285,7 +285,7 @@ public class IotaAPIProxy {
      * @param {array} trytes
      * @param {int} depth
      * @param {int} minWeightMagnitude
-     * @return 
+     * @return
      */
     public List<Transaction> sendTrytes(final String trytes, final int minWeightMagnitude) {
         
@@ -335,7 +335,7 @@ public class IotaAPIProxy {
         }
         return trxs;
     }
-
+    
     /**
      * Wrapper function for findTransactions, getTrytes and transactionObjects
      * Returns the transactionObject of a transaction hash. The input can be a valid
@@ -557,10 +557,12 @@ public class IotaAPIProxy {
 
     //  Calls getBalances and formats the output
     //  returns the final inputsObject then
-    public GetBalancesAndFormatResponse getBalanceAndFormat(final List<String> addresses, 
-            final List<String> balances, long threshold, int start, int end) {
+    public GetBalancesAndFormatResponse getBalanceAndFormat(final List<String> addresses, List<String> balances, long threshold, int start, int end) {
 
-        GetBalancesResponse bres = getBalances(100, addresses);
+        if (balances == null || balances.isEmpty()) {
+            GetBalancesResponse getBalancesResponse = getBalances(100, addresses);
+            balances = Arrays.asList(getBalancesResponse.getBalances());
+        }
 
         // If threshold defined, keep track of whether reached or not
         // else set default to true
@@ -605,6 +607,30 @@ public class IotaAPIProxy {
         return null; //IotaAPIUtils.getBundle(transaction);
     }
 
+    /**
+     *   Replays a transfer by doing Proof of Work again
+     *
+     *   @method replayBundle
+     *   @param {string} tail
+     *   @param {int} depth
+     *   @param {int} minWeightMagnitude
+     *   @param {function} callback
+     *   @returns {object} analyzed Transaction objects
+     **/
+    public List<Transaction> replayTransfer(String transaction, int depth, int minWeightMagnitude) {
+
+        List<String> bundleTrytes = new ArrayList<>();
+
+        GetBundleResponse bundle = getBundle(transaction);
+
+        for (Transaction element : bundle.getTransactions()) {
+
+            bundleTrytes.add(IotaAPIUtils.transactionTrytes(element));
+        }
+
+        return sendTrytes(bundleTrytes, minWeightMagnitude);
+    }
+
     /**
      *   Wrapper function for getNodeInfo and getInclusionStates
      *

src/main/java/jota/utils/Converter.java

@@ -2,14 +2,12 @@ package jota.utils;
 
 import jota.model.Transaction;
 import jota.pow.Curl;
-
-import java.util.Arrays;
-import java.util.Optional;
-
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Arrays;
+
 public class Converter {
     
     private static final Logger log = LoggerFactory.getLogger(Converter.class);
@@ -69,12 +67,39 @@ public class Converter {
     }
 
     public static int[] trits(final String trytes) {
-
         final int[] trits = new int[trytes.length() * NUMBER_OF_TRITS_IN_A_TRYTE];
-        for (int i = 0; i < trytes.length(); i++) {
-            System.arraycopy(TRYTE_TO_TRITS_MAPPINGS[Constants.TRYTE_ALPHABET.indexOf(trytes.charAt(i))], 0, trits, i * NUMBER_OF_TRITS_IN_A_TRYTE, NUMBER_OF_TRITS_IN_A_TRYTE);
-        }
 
+        if (InputValidator.isValue(trytes)) {
+
+            int value = Integer.parseInt(trytes);
+
+            long absoluteValue = value < 0 ? -value : value;
+
+            while (absoluteValue > 0) {
+
+                int remainder = (int) (absoluteValue % RADIX);
+                absoluteValue /= RADIX;
+
+                if (remainder > MAX_TRIT_VALUE) {
+                    remainder = MIN_TRIT_VALUE;
+                    absoluteValue++;
+                }
+
+                trits[trits.length] = remainder;
+            }
+            if (value < 0) {
+
+                for (int i = 0; i < trits.length; i++) {
+
+                    trits[i] = -trits[i];
+                }
+            }
+        } else {
+
+            for (int i = 0; i < trytes.length(); i++) {
+                System.arraycopy(TRYTE_TO_TRITS_MAPPINGS[Constants.TRYTE_ALPHABET.indexOf(trytes.charAt(i))], 0, trits, i * NUMBER_OF_TRITS_IN_A_TRYTE, NUMBER_OF_TRITS_IN_A_TRYTE);
+            }
+        }
         return trits;
     }
 

src/test/java/jota/InputValidatorTest.java

@@ -1,8 +1,12 @@
 package jota;
 
+import jota.model.Transfer;
 import jota.utils.InputValidator;
 import org.junit.Test;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import static org.junit.Assert.assertEquals;
 
 /**
@@ -11,8 +15,11 @@ import static org.junit.Assert.assertEquals;
 public class InputValidatorTest {
 
     private static final String TEST_ADDRESS_WITHOUT_CHECKSUM = "PNGMCSNRCTRHCHPXYTPKEJYPCOWKOMRXZFHH9N9VDIKMNVAZCMIYRHVJIAZARZTUETJVFDMBEBIQE9QTHBFWDAOEFA";
+    private static final String TEST_ADDRESS_WITH_CHECKSUM = "PNGMCSNRCTRHCHPXYTPKEJYPCOWKOMRXZFHH9N9VDIKMNVAZCMIYRHVJIAZARZTUETJVFDMBEBIQE9QTHBFWDAOEFA";
     private static final String TEST_TRYTES = "BYSWEAUTWXHXZ9YBZISEK9LUHWGMHXCGEVNZHRLUWQFCUSDXZHOFHWHL9MQPVJXXZLIXPXPXF9KYEREFSKCPKYIIKPZVLHUTDFQKKVVBBN9ATTLPCNPJDWDEVIYYLGPZGCWXOBDXMLJC9VO9QXTTBLAXTTBFUAROYEGQIVB9MJWJKXJMCUPTWAUGFZBTZCSJVRBGMYXTVBDDS9MYUJCPZ9YDWWQNIPUAIJXXSNLKUBSCOIJPCLEFPOXFJREXQCUVUMKSDOVQGGHRNILCO9GNCLWFM9APMNMWYASHXQAYBEXF9QRIHIBHYEJOYHRQJAOKAQ9AJJFQ9WEIWIJOTZATIBOXQLBMIJU9PCGBLVDDVFP9CFFSXTDUXMEGOOFXWRTLFGV9XXMYWEMGQEEEDBTIJ9OJOXFAPFQXCDAXOUDMLVYRMRLUDBETOLRJQAEDDLNVIRQJUBZBO9CCFDHIX9MSQCWYAXJVWHCUPTRSXJDESISQPRKZAFKFRULCGVRSBLVFOPEYLEE99JD9SEBALQINPDAZHFAB9RNBH9AZWIJOTLBZVIEJIAYGMC9AZGNFWGRSWAXTYSXVROVNKCOQQIWGPNQZKHUNODGYADPYLZZZUQRTJRTODOUKAOITNOMWNGHJBBA99QUMBHRENGBHTH9KHUAOXBVIVDVYYZMSEYSJWIOGGXZVRGN999EEGQMCOYVJQRIRROMPCQBLDYIGQO9AMORPYFSSUGACOJXGAQSPDY9YWRRPESNXXBDQ9OZOXVIOMLGTSWAMKMTDRSPGJKGBXQIVNRJRFRYEZ9VJDLHIKPSKMYC9YEGHFDS9SGVDHRIXBEMLFIINOHVPXIFAZCJKBHVMQZEVWCOSNWQRDYWVAIBLSCBGESJUIBWZECPUCAYAWMTQKRMCHONIPKJYYTEGZCJYCT9ABRWTJLRQXKMWY9GWZMHYZNWPXULNZAPVQLPMYQZCYNEPOCGOHBJUZLZDPIXVHLDMQYJUUBEDXXPXFLNRGIPWBRNQQZJSGSJTTYHIGGFAWJVXWL9THTPWOOHTNQWCNYOYZXALHAZXVMIZE9WMQUDCHDJMIBWKTYH9AC9AFOT9DPCADCV9ZWUTE9QNOMSZPTZDJLJZCJGHXUNBJFUBJWQUEZDMHXGBPTNSPZBR9TGSKVOHMOQSWPGFLSWNESFKSAZY9HHERAXALZCABFYPOVLAHMIHVDBGKUMDXC9WHHTIRYHZVWNXSVQUWCR9M9RAGMFEZZKZ9XEOQGOSLFQCHHOKLDSA9QCMDGCGMRYJZLBVIFOLBIJPROKMHOYTBTJIWUZWJMCTKCJKKTR9LCVYPVJI9AHGI9JOWMIWZAGMLDFJA9WU9QAMEFGABIBEZNNAL9OXSBFLOEHKDGHWFQSHMPLYFCNXAAZYJLMQDEYRGL9QKCEUEJ9LLVUOINVSZZQHCIKPAGMT9CAYIIMTTBCPKWTYHOJIIY9GYNPAJNUJ9BKYYXSV9JSPEXYMCFAIKTGNRSQGUNIYZCRT9FOWENSZQPD9ALUPYYAVICHVYELYFPUYDTWUSWNIYFXPX9MICCCOOZIWRNJIDALWGWRATGLJXNAYTNIZWQ9YTVDBOFZRKO9CFWRPAQQRXTPACOWCPRLYRYSJARRKSQPR9TCFXDVIXLP9XVL99ERRDSOHBFJDJQQGGGCZNDQ9NYCTQJWVZIAELCRBJJFDMCNZU9FIZRPGNURTXOCDSQGXTQHKHUECGWFUUYS9J9NYQ9U9P9UUP9YMZHWWWCIASCFLCMSKTELZWUGCDE9YOKVOVKTAYPHDF9ZCCQAYPJIJNGSHUIHHCOSSOOBUDOKE9CJZGYSSGNCQJVBEFTZFJ9SQUHOASKRRGBSHWKBCBWBTJHOGQ9WOMQFHWJVEG9NYX9KWBTCAIXNXHEBDIOFO9ALYMFGRICLCKKLG9FOBOX9PDWNQRGHBKHGKKRLWTBEQMCWQRLHAVYYZDIIPKVQTHYTWQMTOACXZOQCDTJTBAAUWXSGJF9PNQIJ9AJRUMUVCPWYVYVARKR9RKGOUHHNKNVGGPDDLGKPQNOYHNKAVVKCXWXOQPZNSLATUJT9AUWRMPPSWHSTTYDFAQDXOCYTZHOYYGAIM9CELMZ9AZPWB9MJXGHOKDNNSZVUDAGXTJJSSZCPZVPZBYNNTUQABSXQWZCHDQSLGK9UOHCFKBIBNETK999999999999999999999999999999999999999999999999999999999999999999999999999999999NOXDXXKUDWLOFJLIPQIBRBMGDYCPGDNLQOLQS99EQYKBIU9VHCJVIPFUYCQDNY9APGEVYLCENJIOBLWNB999999999XKBRHUD99C99999999NKZKEKWLDKMJCI9N9XQOLWEPAYWSH9999999999999999999999999KDDTGZLIPBNZKMLTOLOXQVNGLASESDQVPTXALEKRMIOHQLUHD9ELQDBQETS9QFGTYOYWLNTSKKMVJAUXSIROUICDOXKSYZTDPEDKOQENTJOWJONDEWROCEJIEWFWLUAACVSJFTMCHHXJBJRKAAPUDXXVXFWP9X9999IROUICDOXKSYZTDPEDKOQENTJOWJONDEWROCEJIEWFWLUAACVSJFTMCHHXJBJRKAAPUDXXVXFWP9X9999";
-
+    private static final String TEST_HASH = "OAATQS9VQLSXCLDJVJJVYUGONXAXOFMJOZNSYWRZSWECMXAQQURHQBJNLD9IOFEPGZEPEMPXCIVRX9999";
+    private static final String TEST_MESSAGE = "JOTA";
+    private static final String TEST_TAG = "JOTASPAM9999999999999999999";
     @Test
     public void shouldIsAddress() {
         assertEquals(InputValidator.isAddress(TEST_ADDRESS_WITHOUT_CHECKSUM), true);
@@ -27,4 +34,22 @@ public class InputValidatorTest {
     public void shouldIsTrytes() {
         assertEquals(InputValidator.isTrytes(TEST_TRYTES, TEST_TRYTES.length()), true);
     }
-}
+
+    @Test
+    public void shouldIsValue() {
+        assertEquals(InputValidator.isValue("1234"), true);
+    }
+
+    @Test
+    public void shouldIsArrayOfHashes() {
+        assertEquals(InputValidator.isArrayOfHashes(new String[]{TEST_HASH, TEST_HASH}), true);
+    }
+
+    @Test
+    public void shouldIsTransfersCollectionCorrect() {
+        List<Transfer> transfers = new ArrayList<>();
+        transfers.add(new jota.model.Transfer(TEST_ADDRESS_WITH_CHECKSUM, 0, TEST_MESSAGE, TEST_TAG));
+        transfers.add(new jota.model.Transfer(TEST_ADDRESS_WITH_CHECKSUM, 0, TEST_MESSAGE, TEST_TAG));
+        assertEquals(InputValidator.isTransfersCollectionCorrect(transfers), true);
+    }
+}