Merge pull request #27 from Adamant-im/dev

Dev

Author: martiliones

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "adamant-api",
-	"version": "1.6.0",
+	"version": "1.7.0",
 	"description": "REST API for ADAMANT Blockchain",
 	"main": "src/index.js",
 	"scripts": {
@@ -13,18 +13,20 @@
 	"license": "GPL-3.0",
 	"dependencies": {
 		"@liskhq/lisk-cryptography": "3.2.1",
-		"axios": "^1.1.3",
-		"bignumber.js": "^9.1.0",
-		"bitcoinjs-lib": "^5.2.0",
+		"axios": "^1.2.1",
+		"bignumber.js": "^9.1.1",
+		"bitcoinjs-lib": "^6.1.0",
 		"bitcore-mnemonic": "^8.25.40",
 		"bytebuffer": "^5.0.1",
 		"coininfo": "^5.2.1",
+		"ecpair": "^2.1.0",
 		"ed2curve": "^0.3.0",
 		"ethereumjs-util": "^7.1.5",
 		"hdkey": "^2.0.1",
 		"pbkdf2": "^3.1.2",
-		"socket.io-client": "^4.5.3",
-		"sodium-browserify-tweetnacl": "^0.2.6"
+		"socket.io-client": "^4.5.4",
+		"sodium-browserify-tweetnacl": "^0.2.6",
+		"tiny-secp256k1": "^2.2.1"
 	},
 	"publishConfig": {
 		"access": "public"
@@ -63,11 +65,11 @@
 	},
 	"homepage": "https://github.com/Adamant-im/adamant-api-jsclient#readme",
 	"devDependencies": {
-		"@commitlint/cli": "^17.2.0",
-		"@commitlint/config-conventional": "^17.2.0",
-		"eslint": "^8.27.0",
+		"@commitlint/cli": "^17.3.0",
+		"@commitlint/config-conventional": "^17.3.0",
+		"eslint": "^8.30.0",
 		"eslint-config-google": "^0.14.0",
-		"eslint-plugin-jest": "^27.1.5",
+		"eslint-plugin-jest": "^27.1.7",
 		"husky": "^8.0.2",
 		"jest": "^29.3.1"
 	}

src/groups/btc.js

@@ -1,17 +1,21 @@
 const bitcoin = require('bitcoinjs-lib');
+const {ECPairFactory} = require('ecpair');
+const tinysecp = require('tiny-secp256k1');
+
 const coinNetworks = require('./coinNetworks');
-const btc = { };
+const btc = {};
 
 /**
  * Generates a BTC account from the passphrase specified.
  * @param {string} passphrase ADAMANT account passphrase
- * @returns {object} network info, keyPair, privateKey, privateKeyWIF
+ * @return {object} network info, keyPair, privateKey, privateKeyWIF
  */
-
 btc.keys = (passphrase) => {
   const network = coinNetworks.BTC;
   const pwHash = bitcoin.crypto.sha256(Buffer.from(passphrase));
-  const keyPair = bitcoin.ECPair.fromPrivateKey(pwHash, {network});
+
+  const ECPairAPI = new ECPairFactory(tinysecp);
+  const keyPair = ECPairAPI.fromPrivateKey(pwHash, {network});
 
   return {
     network,

src/groups/dash.js

@@ -1,17 +1,21 @@
 const bitcoin = require('bitcoinjs-lib');
+const {ECPairFactory} = require('ecpair');
+const tinysecp = require('tiny-secp256k1');
+
 const coinNetworks = require('./coinNetworks');
 const dash = { };
 
 /**
  * Generates a DASH account from the passphrase specified.
  * @param {string} passphrase ADAMANT account passphrase
- * @returns {object} network info, keyPair, privateKey, privateKeyWIF
+ * @return {object} network info, keyPair, privateKey, privateKeyWIF
  */
-
 dash.keys = (passphrase) => {
   const network = coinNetworks.DASH;
   const pwHash = bitcoin.crypto.sha256(Buffer.from(passphrase));
-  const keyPair = bitcoin.ECPair.fromPrivateKey(pwHash, {network});
+
+  const ECPairAPI = new ECPairFactory(tinysecp);
+  const keyPair = ECPairAPI.fromPrivateKey(pwHash, {network});
 
   return {
     network,

src/groups/doge.js

@@ -1,17 +1,21 @@
 const bitcoin = require('bitcoinjs-lib');
+const {ECPairFactory} = require('ecpair');
+const tinysecp = require('tiny-secp256k1');
+
 const coinNetworks = require('./coinNetworks');
-const doge = { };
+const doge = {};
 
 /**
  * Generates a DOGE account from the passphrase specified.
  * @param {string} passphrase ADAMANT account passphrase
- * @returns {object} network info, keyPair, privateKey, privateKeyWIF
+ * @return {object} network info, keyPair, privateKey, privateKeyWIF
  */
-
 doge.keys = (passphrase) => {
   const network = coinNetworks.DOGE;
   const pwHash = bitcoin.crypto.sha256(Buffer.from(passphrase));
-  const keyPair = bitcoin.ECPair.fromPrivateKey(pwHash, {network});
+
+  const ECPairAPI = new ECPairFactory(tinysecp);
+  const keyPair = ECPairAPI.fromPrivateKey(pwHash, {network});
 
   return {
     network,

src/helpers/healthCheck.js

@@ -10,7 +10,7 @@ const {RE_IP, RE_HTTP_URL} = require('./constants');
 const CHECK_NODES_INTERVAL = 60 * 5 * 1000; // Update active nodes every 5 minutes
 const HEIGHT_EPSILON = 5; // Used to group nodes by height and choose synced
 
-module.exports = (nodes, checkHealthAtStartup = true) => {
+module.exports = (nodes, checkHealthAtStartup = true, checkHealthAtStartupCallback) => {
   const nodesList = nodes;
   let isCheckingNodes = false;
 
@@ -37,8 +37,9 @@ module.exports = (nodes, checkHealthAtStartup = true) => {
   /**
     * Requests every ADAMANT node for its status, makes a list of live nodes, and chooses one active
     * @param {boolean} forceChangeActiveNode
+    * @param {function?} checkNodesCallback
     */
-  async function checkNodes(forceChangeActiveNode) {
+  async function checkNodes(forceChangeActiveNode, checkNodesCallback) {
     isCheckingNodes = true;
 
     const liveNodes = [];
@@ -163,15 +164,18 @@ module.exports = (nodes, checkHealthAtStartup = true) => {
     }
 
     isCheckingNodes = false;
+    checkNodesCallback?.();
   }
 
   if (checkHealthAtStartup) {
-    changeNodes(true);
+    changeNodes(true, checkHealthAtStartupCallback);
 
     setInterval(
         () => changeNodes(true),
         CHECK_NODES_INTERVAL,
     );
+  } else {
+    checkHealthAtStartupCallback?.();
   }
 
   return {

src/index.js

@@ -22,12 +22,24 @@ const constants = require('./helpers/constants.js');
 const transactionFormer = require('./helpers/transactionFormer');
 const keys = require('./helpers/keys');
 
-module.exports = (params, customLogger) => {
+/**
+ * Create new API instance
+ * @param {{ node: string, checkHealthAtStartup: boolean, logLevel: string}} params
+ * @param {{ error: function, warn: function, info: function, log: function }?} customLogger
+ * @param {function?} checkHealthAtStartupCallback callback which is called after the first health check or
+ * just at startup when params.checkHealthAtStartup is passed
+ * @return {object} API methods and helpers
+ */
+module.exports = (params, customLogger, checkHealthAtStartupCallback) => {
   const log = customLogger || console;
 
   logger.initLogger(params.logLevel, log);
 
-  const nodeManager = healthCheck(params.node, params.checkHealthAtStartup);
+  const nodeManager = healthCheck(
+      params.node,
+      params.checkHealthAtStartup,
+      checkHealthAtStartupCallback,
+  );
 
   return {
     get: get(nodeManager),