Fixed bug with multisigs

Author: domschiener

bower.json

@@ -1,6 +1,6 @@
 {
     "name": "iota.lib.js",
-    "version": "0.2.5",
+    "version": "0.2.6",
     "description": "Javascript Library for IOTA",
     "main": "./dist/iota.js",
     "authors": [

examples/multisig.js

@@ -1,14 +1,13 @@
 var IOTA = require('../lib/iota');
 
 var iota = new IOTA({
-    'host': 'http://localhost',
+    'host': 'http://85.93.93.110',
     'port': 14265
 });
 
 // First co-signer uses index 0 and security level 3
+// We initiate the multisig address generation by absorbing the key address digest
 var digestOne = iota.multisig.getDigest('ABCDFG', 0, 3);
-
-// We initiate the multisig address generation by absorbing the key digest
 var initiatedMultisigAddress = iota.multisig.addAddressDigest(digestOne);
 
 // Second cosigner also uses index 0 and security level 3 for the private key
@@ -25,7 +24,7 @@ console.log("MULTISIG ADDRESS: ", address);
 // Simple validation if the multisig was created correctly
 // Can be called by each cosigner independently
 var isValid = iota.multisig.validateAddress(address, [digestOne, digestTwo]);
-console.log("IS VALID MULTISIG:", isValid);
+console.log("IS VALID MULTISIG ADDRESS:", isValid);
 
 //  SIGNING EXAMPLE
 //
@@ -38,22 +37,20 @@ iota.multisig.initiateTransfer(6, address, "NZRALDYNVGJWUVLKDWFKJVNYLWQGCWYCURJI
 
     if (e) {
         console.log(e);
-    } else {
-
+    }
 
-        iota.multisig.addSignature(initiatedBundle, address, iota.multisig.getKey('ABCDFG', 0, 3), function(e,firstSignedBundle) {
+    iota.multisig.addSignature(initiatedBundle, address, iota.multisig.getKey('ABCDFG', 0, 3), function(e,firstSignedBundle) {
 
-            if (e) {
-                console.log(e);
-            } else {
+        if (e) {
+            console.log(e);
+        }
 
-                iota.multisig.addSignature(firstSignedBundle, address, iota.multisig.getKey('FDSAG', 0, 3), function(e,finalBundle) {
+        iota.multisig.addSignature(firstSignedBundle, address, iota.multisig.getKey('FDSAG', 0, 3), function(e,finalBundle) {
 
-                    if (!e) {
-                        console.log("IS VALID SIGNATURE: ", iota.utils.validateSignatures(finalBundle, address));
-                    }
-                });
+            if (!e) {
+                console.log("IS VALID SIGNATURE: ", iota.utils.validateSignatures(finalBundle, address));
             }
         });
-    }
+    });
+
 })

lib/api/api.js

@@ -1,7 +1,6 @@
 var apiCommands = require('./apiCommands')
 var errors = require('../errors/inputErrors');
 var inputValidator = require('../utils/inputValidator');
-var Curl = require("../crypto/curl");
 var Converter = require("../crypto/converter");
 var Signing = require("../crypto/signing");
 var Bundle = require("../crypto/bundle");

lib/multisig/multisig.js

@@ -55,7 +55,7 @@ Multisig.prototype.addAddressDigest = function(digestTrytes, curlStateTrytes) {
 
     // If curlStateTrytes is provided, convert into trits
     // else use empty state and initiate the creation of a new address
-    var curlState = curlStateTrytes ? Converter.trits(curlStateTrytes) : [];
+    var curlState = curlStateTrytes ? Converter.trits(curlStateTrytes) : null;
 
     var curl = new Curl();
 
@@ -148,7 +148,7 @@ Multisig.prototype.initiateTransfer = function(securitySum, inputAddress, remain
     }
 
     // check if int
-    if (!inputValidator.isInt(securitySum)) {
+    if (!inputValidator.isValue(securitySum)) {
         return callback(errors.invalidInputs());
     }
 
@@ -244,6 +244,7 @@ Multisig.prototype.initiateTransfer = function(securitySum, inputAddress, remain
 
         self._makeRequest.send(command, function(e, balances) {
 
+            if (e) return callback(e);
 
             var totalBalance = parseInt(balances.balances[0]);
 

package.json

@@ -1,51 +1,51 @@
 {
-  "name": "iota.lib.js",
-  "version": "0.2.5",
-  "description": "Javascript Library for IOTA",
-  "main": "./lib/iota.js",
-  "scripts": {
-    "build": "gulp",
-    "test": "mocha"
-  },
-  "author": {
-    "name": "Dominik Schiener (IOTA Foundation)",
-    "website": "https://iota.org"
-  },
-  "keywords": [
-    "iota",
-    "tangle",
-    "library",
-    "browser",
-    "javascript",
-    "nodejs",
-    "API"
-  ],
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/iotaledger/iota.lib.js/issues"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/iotaledger/iota.lib.js.git"
-  },
-  "dependencies": {
-    "async": "^2.1.2",
-    "xmlhttprequest": "^1.8.0"
-  },
-  "devDependencies": {
-    "bower": "^1.8.0",
-    "browserify": "^14.1.0",
-    "chai": "^3.5.0",
-    "del": "^2.2.2",
-    "gulp": "^3.9.1",
-    "gulp-jshint": "^2.0.2",
-    "gulp-nsp": "^2.4.2",
-    "gulp-rename": "^1.2.2",
-    "gulp-replace": "^0.5.4",
-    "gulp-uglify": "^2.1.2",
-    "jshint": "^2.9.4",
-    "mocha": "^3.2.0",
-    "vinyl-buffer": "^1.0.0",
-    "vinyl-source-stream": "^1.1.0"
-  }
+    "name": "iota.lib.js",
+    "version": "0.2.6",
+    "description": "Javascript Library for IOTA",
+    "main": "./lib/iota.js",
+    "scripts": {
+        "build": "gulp",
+        "test": "mocha"
+    },
+    "author": {
+        "name": "Dominik Schiener (IOTA Foundation)",
+        "website": "https://iota.org"
+    },
+    "keywords": [
+        "iota",
+        "tangle",
+        "library",
+        "browser",
+        "javascript",
+        "nodejs",
+        "API"
+    ],
+    "license": "MIT",
+    "bugs": {
+        "url": "https://github.com/iotaledger/iota.lib.js/issues"
+    },
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/iotaledger/iota.lib.js.git"
+    },
+    "dependencies": {
+        "async": "^2.1.2",
+        "xmlhttprequest": "^1.8.0"
+    },
+    "devDependencies": {
+        "bower": "^1.8.0",
+        "browserify": "^14.1.0",
+        "chai": "^3.5.0",
+        "del": "^2.2.2",
+        "gulp": "^3.9.1",
+        "gulp-jshint": "^2.0.2",
+        "gulp-nsp": "^2.4.2",
+        "gulp-rename": "^1.2.2",
+        "gulp-replace": "^0.5.4",
+        "gulp-uglify": "^2.1.2",
+        "jshint": "^2.9.4",
+        "mocha": "^3.2.0",
+        "vinyl-buffer": "^1.0.0",
+        "vinyl-source-stream": "^1.1.0"
+    }
 }