Merge pull request #313 from th0br0/revert309310

revert #309 and #310

Author: chrisdukakis

ui/js/ui.login.js

@@ -127,22 +127,7 @@ var UI = (function(UI, $, undefined) {
         iota.api.getAccountData(connection.seed, function(error, accountData) {
           UI.isLoggingIn = false;
 
-          if (!error) {
-            if (accountData.balance === 0) {
-              //if no balance found, look at the first 10 addresses
-              iota.api.getAccountData(connection.seed, {start:0 , end:10}, function(error, accountData) {
-                  if (!error) {
-                    connection.accountData = accountData;
-                    $("#login-password").val("");
-                    $("#login-btn").loadingReset("login", {"icon": "fa-cog fa-spin fa-fw"});
-
-                    UI.showAppScreen();
-                  }
-                });
-            } else {
-              connection.accountData = accountData;
-            }
-          }
+          connection.accountData = accountData;
 
           if (error) {
             connection.seed = "";

ui/js/ui.transfers.js

@@ -62,7 +62,7 @@ var UI = (function(UI, $, undefined) {
 
       UI.isDoingPOW = true;
 
-      getUnspentInputs(connection.seed, 0, 10, amount, function(error, inputs) {
+      getUnspentInputs(connection.seed, 0, amount, function(error, inputs) {
         if (error) {
           UI.isDoingPOW = false;
           UI.formError("transfer", error, {"initial": "send_it_now"});
@@ -259,15 +259,12 @@ function filterSpentAddresses(inputs) {
   })
 }
 
-function getUnspentInputs(seed, start, step, threshold, inputs, cb) {
-  // TODO: define limit in settings to stop scanning for balance
-  var limit = 500 //connection.maxIndex
-  end = start + step
-  if (arguments.length === 5) {
-    cb = arguments[4]
+function getUnspentInputs(seed, start, threshold, inputs, cb) {
+  if (arguments.length === 4) {
+    cb = arguments[3]
     inputs = {inputs: [], totalBalance: 0, allBalance: 0}
   }
-  getInputs(seed, {start: start, end: end, threshold: threshold}, (err, res) => {
+  iota.api.getInputs(seed, {start: start, threshold: threshold}, (err, res) => {
     if (err) {
       cb(err)
       return
@@ -277,13 +274,9 @@ function getUnspentInputs(seed, start, step, threshold, inputs, cb) {
       var collected = filtered.reduce((sum, input) => sum + input.balance, 0)
       var diff = threshold - collected
       if (diff > 0) {
-        start = end + 1
-        end += step
-        if (end > limit) {
-          cb('Not enough balance')
-          return
-        }
-        getUnspentInputs(seed, start, step, diff, {inputs: inputs.inputs.concat(filtered), totalBalance: inputs.totalBalance + collected, allBalance: inputs.allBalance}, cb)
+        var ordered = res.inputs.sort((a, b) => a.keyIndex - b.keyIndex).reverse()
+        var end = ordered[0].keyIndex
+        getUnspentInputs(seed, end + 1, diff, {inputs: inputs.inputs.concat(filtered), totalBalance: inputs.totalBalance + collected, allBalance: inputs.allBalance}, cb)
       }
       else {
         cb(null, {inputs: inputs.inputs.concat(filtered), totalBalance: inputs.totalBalance + collected, allBalance: inputs.allBalance})
@@ -292,40 +285,3 @@ function getUnspentInputs(seed, start, step, threshold, inputs, cb) {
   })
 }
 
-function getInputs(seed, options, cb) {
-  if (!options) {
-    options = {}
-  }
-  var start = options.start || 0
-  var end = options.end || 10
-  var security = options.security || 2
-  var threshold = options.threshold || null
-  addresses = []
-  for (var i = start; i <= end; i++) {
-    addresses.push(iota.api._newAddress(seed, i, security, false))
-  }
-  iota.api.getBalances(addresses, 100, (err, res) => {
-    if (err) {
-      cb(err)
-      return
-    }
-    var inputs = []
-    var sum = 0
-    for (var i = 0; i < addresses.length; i++) {
-      var balance = parseInt(res.balances[i])
-      if (balance > 0) {
-        sum += balance
-        inputs.push({
-          address: addresses[i],
-          balance: balance,
-          keyIndex: start + i,
-          security: security
-        })
-        if (threshold && sum >= threshold) {
-          break
-        }
-      }
-    }
-    cb(null, {inputs: inputs, totalBalance: sum})
-  })
-}

ui/js/ui.update.js

@@ -74,24 +74,10 @@ var UI = (function(UI, $, undefined) {
               console.log(new Date());
 
               if (!error) {
-                if (accountData.balance === 0) {
-                  //if no balance found, look at the first 10 addresses
-                  iota.api.getAccountData(connection.seed, {start:0 , end:10}, function(error, accountData) {
-                      if (!error) {
-                        connection.previousAccountData = connection.accountData;
-                        connection.accountData = accountData;
-                        UI.update();
-
-                      }
-                    });
-                } else {
-                  connection.previousAccountData = connection.accountData;
-                  connection.accountData = accountData;
-                }
                 connection.previousAccountData = connection.accountData;
                 connection.accountData = accountData;
               }
-
+              
               isUpdatingState = false;
 
               UI.createStateInterval(UI.updateIntervalTime);