@toruslabs/torus.js - npm Package Compare versions

Comparing version 1.0.6 to 1.0.7

dist/some.js

@@ -8,6 +8,2 @@ "use strict";
 
-var _loglevel = _interopRequireDefault(require("loglevel"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
 var Some = function Some(promises, predicate) {
@@ -21,5 +17,3 @@ return new Promise(function (resolve, reject) {
         resultArr[index] = resp;
-      })["catch"](function (err) {
-        return _loglevel["default"].debug('some result', err);
-      })["finally"](function () {
+      })["catch"](function (_) {})["finally"](function () {
         if (resolved) return;
@@ -29,7 +23,3 @@ predicate(resultArr.slice(0)).then(function (data) {
           resolve(data);
-        })["catch"](function (err) {
-          return _loglevel["default"].debug('predicate', err);
-        })["finally"](function (_) {
-          _loglevel["default"].debug('finally');
-
+        })["catch"](function (_) {})["finally"](function (_) {
           finishedCount++;
@@ -36,0 +26,0 @@

dist/torus.d.ts

@@ -8,5 +8,9 @@ import BN from 'bn.js'
     generateAddressFromPrivKey(privateKey: BN): String;
-    getPublicAddress(endpoints: String[], torusNodePubs: TorusNodePub[], verifierArgs: VerifierArgs): String;
+    getPublicAddress(endpoints: String[], torusNodePubs: TorusNodePub[], verifierArgs: VerifierArgs, isExtended: Boolean): String | TorusPublicKey;
 }
 
+interface TorusPublicKey extends TorusNodePub {
+  address: String;
+}
+
 interface TorusNodePub {
@@ -13,0 +17,0 @@ X: String;

dist/torus.js

@@ -165,3 +165,3 @@ "use strict";
             regeneratorRuntime.mark(function _callee(shareResponses) {
-              var completedRequests, thresholdPublicKey, sharePromises, nodeIndex, i, metadata, sharesResolved, decryptedShares, allCombis, privateKey, _loop, j, _ret, ethAddress;
+              var completedRequests, thresholdPublicKey, sharePromises, nodeIndex, _i3, metadata, sharesResolved, decryptedShares, allCombis, privateKey, _loop, j, _ret, ethAddress;
 
@@ -206,17 +206,17 @@ return regeneratorRuntime.wrap(function _callee$(_context) {
 
-                      for (i = 0; i < shareResponses.length; i++) {
-                        if (shareResponses[i] && shareResponses[i].result && shareResponses[i].result.keys && shareResponses[i].result.keys.length > 0) {
-                          shareResponses[i].result.keys.sort(function (a, b) {
+                      for (_i3 = 0; _i3 < shareResponses.length; _i3++) {
+                        if (shareResponses[_i3] && shareResponses[_i3].result && shareResponses[_i3].result.keys && shareResponses[_i3].result.keys.length > 0) {
+                          shareResponses[_i3].result.keys.sort(function (a, b) {
                             return new _bn["default"](a.Index, 16).cmp(new _bn["default"](b.Index, 16));
                           });
 
-                          if (shareResponses[i].result.keys[0].Metadata) {
+                          if (shareResponses[_i3].result.keys[0].Metadata) {
                             metadata = {
-                              ephemPublicKey: Buffer.from(shareResponses[i].result.keys[0].Metadata.ephemPublicKey, 'hex'),
-                              iv: Buffer.from(shareResponses[i].result.keys[0].Metadata.iv, 'hex'),
-                              mac: Buffer.from(shareResponses[i].result.keys[0].Metadata.mac, 'hex'),
-                              mode: Buffer.from(shareResponses[i].result.keys[0].Metadata.mode, 'hex')
+                              ephemPublicKey: Buffer.from(shareResponses[_i3].result.keys[0].Metadata.ephemPublicKey, 'hex'),
+                              iv: Buffer.from(shareResponses[_i3].result.keys[0].Metadata.iv, 'hex'),
+                              mac: Buffer.from(shareResponses[_i3].result.keys[0].Metadata.mac, 'hex'),
+                              mode: Buffer.from(shareResponses[_i3].result.keys[0].Metadata.mode, 'hex')
                             };
                             sharePromises.push(_eccrypto["default"].decrypt(tmpKey, _objectSpread({}, metadata, {
-                              ciphertext: Buffer.from(atob(shareResponses[i].result.keys[0].Share).padStart(64, '0'), 'hex')
+                              ciphertext: Buffer.from(atob(shareResponses[_i3].result.keys[0].Share).padStart(64, '0'), 'hex')
                             }))["catch"](function (err) {
@@ -226,3 +226,3 @@ return _loglevel["default"].debug('share decryption', err);
                           } else {
-                            sharePromises.push(Promise.resolve(Buffer.from(shareResponses[i].result.keys[0].Share.padStart(64, '0'), 'hex')));
+                            sharePromises.push(Promise.resolve(Buffer.from(shareResponses[_i3].result.keys[0].Share.padStart(64, '0'), 'hex')));
                           }
@@ -233,3 +233,3 @@ } else {
 
-                        nodeIndex.push(new _bn["default"](indexes[i], 16));
+                        nodeIndex.push(new _bn["default"](indexes[_i3], 16));
                       }
@@ -373,4 +373,3 @@
       var ethAddressLower = '0x' + (0, _web3Utils.keccak256)(Buffer.from(publicKey, 'hex')).slice(64 - 38);
-      var ethAddress = (0, _web3Utils.toChecksumAddress)(ethAddressLower);
-      return ethAddress;
+      return (0, _web3Utils.toChecksumAddress)(ethAddressLower);
     }
@@ -382,2 +381,3 @@ }, {
           verifierId = _ref3.verifierId;
+      var isExtended = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
       return new Promise(function (resolve, reject) {
@@ -407,4 +407,11 @@ (0, _utils.keyLookup)(endpoints, verifier, verifierId).then(function () {
           if (keyResult) {
-            var ethAddress = keyResult.keys[0].address;
-            resolve(ethAddress);
+            var _keyResult$keys$ = keyResult.keys[0],
+                address = _keyResult$keys$.address,
+                X = _keyResult$keys$.pub_key_X,
+                Y = _keyResult$keys$.pub_key_Y;
+            if (!isExtended) resolve(address);else resolve({
+              address: address,
+              X: X,
+              Y: Y
+            });
           } else {
@@ -411,0 +418,0 @@ reject(new Error('node results do not match'));

package.json

 {
   "name": "@toruslabs/torus.js",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "description": "Handle communication with torus nodes",
@@ -18,17 +18,17 @@ "main": "index.js",
     "json-stable-stringify": "^1.0.1",
-    "loglevel": "^1.6.6",
-    "web3-utils": "^1.2.5"
+    "loglevel": "^1.6.7",
+    "web3-utils": "^1.2.6"
   },
   "devDependencies": {
-    "@babel/cli": "^7.8.3",
-    "@babel/core": "^7.8.3",
+    "@babel/cli": "^7.8.4",
+    "@babel/core": "^7.8.4",
     "@babel/plugin-proposal-object-rest-spread": "^7.8.3",
-    "@babel/preset-env": "^7.8.3",
+    "@babel/preset-env": "^7.8.4",
     "eslint": "^6.8.0",
     "eslint-config-airbnb-base": "^14.0.0",
-    "eslint-config-prettier": "^6.9.0",
+    "eslint-config-prettier": "^6.10.0",
     "eslint-config-standard": "^14.1.0",
     "eslint-plugin-flowtype": "^4.6.0",
     "eslint-plugin-html": "^6.0.0",
-    "eslint-plugin-import": "^2.20.0",
+    "eslint-plugin-import": "^2.20.1",
     "eslint-plugin-mocha": "^6.2.2",
@@ -39,4 +39,4 @@ "eslint-plugin-node": "^11.0.0",
     "eslint-plugin-standard": "^4.0.1",
-    "husky": "^4.2.1",
-    "lint-staged": "^10.0.3",
+    "husky": "^4.2.3",
+    "lint-staged": "^10.0.7",
     "prettier": "^1.19.1"
@@ -43,0 +43,0 @@ },

No alert changes

Improved metrics

Total package byte prevSize

32501

increased by0.34%

Lines of code

580

increased by0.52%

Dependency changes

• Updatedloglevel@^1.6.7

• Updatedweb3-utils@^1.2.6