Fixed bug related to isReattachable

iotaledger · Jul 20, 2017 · 45d5214 · 45d5214
1 parent f9fc823
commit 45d5214
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 12 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
     "name": "iota.lib.js",
-    "version": "0.3.7",
+    "version": "0.3.8",
     "description": "Javascript Library for IOTA",
     "main": "./dist/iota.js",
     "authors": [

diff --git a/dist/iota.js b/dist/iota.js
@@ -1806,17 +1806,27 @@ api.prototype.isReattachable = function(inputAddresses, callback) {
                 var results = addresses.map(function(address) {
 
                     var txs = addressTxsMap[address];
+                    var numTxs = txs.length;
 
-                    if (txs.length === 0) {
+                    if (numTxs === 0) {
                         return true;
                     }
 
                     var shouldReattach = true;
-                    txs.forEach(function(tx) {
+
+                    for (var i = 0; i < numTxs; i++) {
+
+                        var tx = txs[i];
 
                         var txIndex = valueTransactions.indexOf(tx);
-                        shouldReattach = inclusionStates[txIndex] ? false : true;
-                    })
+                        var isConfirmed = inclusionStates[txIndex];
+                        shouldReattach = isConfirmed ? false : true;
+
+                        // if tx confirmed, break
+                        if (isConfirmed)
+                            break;
+                    }
+
 
                     return shouldReattach;
 
@@ -17933,7 +17943,7 @@ function extend() {
 },{}],57:[function(require,module,exports){
 module.exports={
   "name": "iota.lib.js",
-  "version": "0.3.7",
+  "version": "0.3.8",
   "description": "Javascript Library for IOTA",
   "main": "./lib/iota.js",
   "scripts": {

diff --git a/dist/iota.min.js b/dist/iota.min.js
diff --git a/lib/api/api.js b/lib/api/api.js
@@ -1801,17 +1801,27 @@ api.prototype.isReattachable = function(inputAddresses, callback) {
                 var results = addresses.map(function(address) {
 
                     var txs = addressTxsMap[address];
+                    var numTxs = txs.length;
 
-                    if (txs.length === 0) {
+                    if (numTxs === 0) {
                         return true;
                     }
 
                     var shouldReattach = true;
-                    txs.forEach(function(tx) {
+
+                    for (var i = 0; i < numTxs; i++) {
+
+                        var tx = txs[i];
 
                         var txIndex = valueTransactions.indexOf(tx);
-                        shouldReattach = inclusionStates[txIndex] ? false : true;
-                    })
+                        var isConfirmed = inclusionStates[txIndex];
+                        shouldReattach = isConfirmed ? false : true;
+
+                        // if tx confirmed, break
+                        if (isConfirmed)
+                            break;
+                    }
+
 
                     return shouldReattach;
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "iota.lib.js",
-  "version": "0.3.7",
+  "version": "0.3.8",
   "description": "Javascript Library for IOTA",
   "main": "./lib/iota.js",
   "scripts": {