npm - @dashevo/dapi-client - Versions diffs - 0.21.0 → 0.21.4 - Mend

@dashevo/dapi-client 0.21.0 → 0.21.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (9) hide show

package/lib/DAPIClient.js CHANGED Viewed

@@ -47,7 +47,8 @@ class DAPIClient {
  * @typedef {DAPIClientOptions} DAPIClientOptions
  * @property {DAPIAddressProvider} [dapiAddressProvider]
  * @property {Array<RawDAPIAddress|DAPIAddress|string>} [dapiAddresses]
- * @property {string[]|RawDAPIAddress[]} [seeds]
+ * @property {Array<RawDAPIAddress|DAPIAddress|string>} [seeds]
+ * @property {Array<RawDAPIAddress|DAPIAddress|string>} [dapiAddressesWhiteList]
  * @property {string|Network} [network=testnet]
  * @property {number} [timeout=2000]
  * @property {number} [retries=3]

package/lib/dapiAddressProvider/ListDAPIAddressProvider.js CHANGED Viewed

@@ -18,13 +18,17 @@ class ListDAPIAddressProvider {
   /**
    * Get random address
    *
-   * @returns {Promise<DAPIAddress>}
+   * @returns {Promise<DAPIAddress|undefined>}
    */
   async getLiveAddress() {
     const liveAddresses = this.getLiveAddresses();
     const liveAddress = sample(liveAddresses);
+    if (liveAddress === undefined) {
+      return liveAddress;
+    }
     // This is a temporary fix for a localhost masternode.
     // On mac os, internal docker IP is used to register masternode, and it's
     // not really possible to bind to that address, so that workaround is introduced.

package/lib/dapiAddressProvider/SimplifiedMasternodeListDAPIAddressProvider.js CHANGED Viewed

@@ -2,13 +2,14 @@ const DAPIAddress = require('./DAPIAddress');
 class SimplifiedMasternodeListDAPIAddressProvider {
   /**
-   *
    * @param {SimplifiedMasternodeListProvider} smlProvider
    * @param {ListDAPIAddressProvider} listDAPIAddressProvider
+   * @param {DAPIAddress[]} addressWhiteList
    */
-  constructor(smlProvider, listDAPIAddressProvider) {
+  constructor(smlProvider, listDAPIAddressProvider, addressWhiteList) {
     this.smlProvider = smlProvider;
     this.listDAPIAddressProvider = listDAPIAddressProvider;
+    this.addressWhiteStrings = addressWhiteList.map((dapiAddress) => dapiAddress.toString());
   }
   /**
@@ -44,7 +45,14 @@ class SimplifiedMasternodeListDAPIAddressProvider {
       return address;
     });
-    this.listDAPIAddressProvider.setAddresses(updatedAddresses);
+    let filteredAddresses = updatedAddresses;
+    if (this.addressWhiteStrings.length > 0) {
+      filteredAddresses = updatedAddresses.filter((dapiAddress) => (
+        this.addressWhiteStrings.includes(dapiAddress.toString())
+      ));
+    }
+    this.listDAPIAddressProvider.setAddresses(filteredAddresses);
     return this.listDAPIAddressProvider.getLiveAddress();
   }

package/lib/dapiAddressProvider/createDAPIAddressProviderFromOptions.js CHANGED Viewed

@@ -39,6 +39,10 @@ function createDAPIAddressProviderFromOptions(options) {
       throw new DAPIClientError("Can't use 'seeds' with 'dapiAddressProvider' option");
     }
+    if (options.dapiAddressesWhiteList) {
+      throw new DAPIClientError("Can't use 'dapiAddressesWhiteList' with 'dapiAddressProvider' option");
+    }
     return options.dapiAddressProvider;
   }
@@ -47,6 +51,10 @@ function createDAPIAddressProviderFromOptions(options) {
       throw new DAPIClientError("Can't use 'seeds' with 'dapiAddresses' option");
     }
+    if (options.dapiAddressesWhiteList) {
+      throw new DAPIClientError("Can't use 'dapiAddressesWhiteList' with 'dapiAddresses' option");
+    }
     return new ListDAPIAddressProvider(
       options.dapiAddresses.map((rawAddress) => new DAPIAddress(rawAddress)),
       options,
@@ -54,6 +62,21 @@ function createDAPIAddressProviderFromOptions(options) {
   }
   if (options.seeds) {
+    let dapiAddressesWhiteList = options.dapiAddressesWhiteList || [];
+    // Since we don't have PoSe atm, 3rd party masternodes sometimes provide wrong data
+    // that breaks test suite and application logic. Temporary solution is to hardcode
+    // reliable DCG testnet masternodes to connect. Should be removed when PoSe is introduced.
+    const network = networks.get(options.network);
+    let isRegtest = false;
+    if (network) {
+      isRegtest = network.regtestEnabled;
+    }
+    if (options.network === 'testnet' && dapiAddressesWhiteList.length === 0 && !isRegtest) {
+      dapiAddressesWhiteList = networkConfigs.testnet.dapiAddressesWhiteList;
+    }
     const listDAPIAddressProvider = new ListDAPIAddressProvider(
       options.seeds.map((rawAddress) => new DAPIAddress(rawAddress)),
       options,
@@ -72,7 +95,11 @@ function createDAPIAddressProviderFromOptions(options) {
       { network: options.network },
     );
-    return new SimplifiedMasternodeListDAPIAddressProvider(smlProvider, listDAPIAddressProvider);
+    return new SimplifiedMasternodeListDAPIAddressProvider(
+      smlProvider,
+      listDAPIAddressProvider,
+      dapiAddressesWhiteList.map((rawAddress) => new DAPIAddress(rawAddress)),
+    );
   }
   if (options.network) {

package/lib/networkConfigs.js CHANGED Viewed

@@ -8,6 +8,161 @@ module.exports = {
       'seed-5.testnet.networks.dash.org',
     ],
     network: 'testnet',
+    // Since we don't have PoSe atm, 3rd party masternodes sometimes provide wrong data
+    // that breaks test suite and application logic. Temporary solution is to hardcode
+    // reliable DCG testnet masternodes to connect. Should be removed when PoSe is introduced.
+    dapiAddressesWhiteList: [
+      '52.11.85.154',
+      '52.38.248.133',
+      '34.212.231.240',
+      '54.185.249.226',
+      '34.215.57.86',
+      '54.190.73.116',
+      '34.214.2.219',
+      '54.212.84.164',
+      '35.164.96.124',
+      '34.219.81.129',
+      '34.221.42.205',
+      '34.208.88.128',
+      '54.189.162.193',
+      '34.220.124.90',
+      '54.201.242.241',
+      '54.68.10.46',
+      '34.210.81.39',
+      '18.237.47.243',
+      '54.187.229.6',
+      '34.214.102.160',
+      '34.219.93.145',
+      '35.165.37.186',
+      '54.202.157.120',
+      '34.215.144.176',
+      '52.13.119.69',
+      '34.220.12.188',
+      '18.237.5.33',
+      '54.191.32.70',
+      '54.213.219.155',
+      '35.167.25.157',
+      '54.213.89.75',
+      '52.32.232.156',
+      '34.212.226.44',
+      '35.160.140.37',
+      '52.11.133.244',
+      '54.201.189.185',
+      '34.216.200.22',
+      '34.220.144.226',
+      '34.216.195.19',
+      '54.185.1.69',
+      '35.166.29.155',
+      '18.237.147.160',
+      '34.220.228.214',
+      '54.212.75.8',
+      '35.163.152.74',
+      '18.236.78.191',
+      '54.148.106.179',
+      '34.211.46.222',
+      '35.160.13.25',
+      '34.220.17.107',
+      '34.212.65.137',
+      '54.185.249.172',
+      '54.70.65.199',
+      '54.69.210.42',
+      '18.236.160.247',
+      '54.245.197.173',
+      '54.187.11.213',
+      '54.218.70.46',
+      '35.165.207.13',
+      '34.211.49.3',
+      '34.219.36.94',
+      '34.222.127.158',
+      '34.222.242.228',
+      '52.26.220.40',
+      '52.36.244.225',
+      '34.222.225.76',
+      '18.236.169.114',
+      '54.201.236.212',
+      '54.203.241.214',
+      '34.221.254.29',
+      '54.187.50.120',
+      '54.184.140.221',
+      '34.215.192.133',
+      '35.164.180.39',
+      '54.184.183.20',
+      '52.43.197.215',
+      '54.201.42.245',
+      '54.218.113.88',
+      '54.244.141.192',
+      '34.217.98.54',
+      '34.222.168.33',
+      '52.32.143.49',
+      '54.187.224.80',
+      '54.189.87.145',
+      '52.39.164.105',
+      '54.70.55.164',
+      '54.214.68.206',
+      '54.201.239.109',
+      '34.215.146.162',
+      '18.236.233.120',
+      '54.190.217.178',
+      '34.220.41.134',
+      '34.212.178.215',
+      '34.219.169.55',
+      '54.218.251.43',
+      '18.236.216.191',
+      '54.188.17.60',
+      '54.191.227.118',
+      '34.213.5.102',
+      '35.166.79.235',
+      '54.71.107.225',
+      '54.201.162.86',
+      '52.34.141.75',
+      '34.217.43.189',
+      '52.38.77.105',
+      '52.11.252.174',
+      '54.191.221.246',
+      '54.218.107.83',
+      '54.212.18.218',
+      '34.220.53.77',
+      '54.244.41.15',
+      '34.222.135.203',
+      '54.191.110.152',
+      '34.208.190.130',
+      '34.222.6.55',
+      '54.184.7.184',
+      '52.12.47.86',
+      '34.217.28.248',
+      '54.149.252.146',
+      '54.149.80.193',
+      '34.215.55.0',
+      '34.220.74.48',
+      '34.209.124.112',
+      '34.217.23.70',
+      '34.222.102.137',
+      '34.209.166.42',
+      '18.236.128.49',
+      '35.163.99.20',
+      '34.215.67.224',
+      '34.211.244.117',
+      '18.236.199.232',
+      '54.191.237.52',
+      '34.223.226.224',
+      '54.149.133.143',
+      '52.41.198.242',
+      '54.148.215.161',
+      '54.188.193.70',
+      '54.218.104.194',
+      '34.209.73.208',
+      '34.220.88.70',
+      '52.40.101.104',
+      '18.236.68.153',
+      '34.218.76.179',
+      '34.219.94.178',
+      '54.218.127.128',
+      '52.27.198.246',
+      '18.237.204.153',
+      '35.166.57.113',
+      '54.191.15.3',
+      '18.237.128.46',
+    ],
   },
   evonet: {
     seeds: [

package/lib/transport/JsonRpcTransport/createJsonTransportError.js CHANGED Viewed

@@ -13,7 +13,7 @@ const RetriableResponseError = require('../errors/response/RetriableResponseErro
 function createJsonTransportError(error, dapiAddress) {
   if (error instanceof WrongHttpCodeError) {
     return new ServerError(
-      error.statusCode,
+      error.getCode(),
       error.message,
       {},
       dapiAddress,

package/lib/transport/JsonRpcTransport/errors/WrongHttpCodeError.js CHANGED Viewed

@@ -16,7 +16,7 @@ class WrongHttpCodeError extends DAPIClientError {
     super(`DAPI JSON RPC wrong http code: ${statusMessage}`);
     this.requestInfo = requestInfo;
-    this.statusCode = statusCode;
+    this.code = statusCode;
   }
   /**
@@ -30,8 +30,8 @@ class WrongHttpCodeError extends DAPIClientError {
    *
    * @returns {number}
    */
-  getStatusCode() {
-    return this.statusCode;
+  getCode() {
+    return this.code;
   }
 }

package/lib/transport/JsonRpcTransport/requestJsonRpc.js CHANGED Viewed

@@ -29,12 +29,6 @@ async function requestJsonRpc(host, port, method, params, options = {}) {
     postOptions.timeout = options.timeout;
   }
-  const response = await axios.post(
-    url,
-    payload,
-    { timeout: options.timeout },
-  );
   const requestInfo = {
     host,
     port,
@@ -43,6 +37,22 @@ async function requestJsonRpc(host, port, method, params, options = {}) {
     options,
   };
+  let response;
+  try {
+    response = await axios.post(
+      url,
+      payload,
+      { timeout: options.timeout },
+    );
+  } catch (error) {
+    if (error.response && error.response.status >= 500) {
+      throw new WrongHttpCodeError(requestInfo, error.response.status, error.response.statusText);
+    }
+    throw error;
+  }
   if (response.status !== 200) {
     throw new WrongHttpCodeError(requestInfo, response.status, response.statusMessage);
   }

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@dashevo/dapi-client",
-  "version": "0.21.0",
+  "version": "0.21.4",
   "description": "Client library used to access Dash DAPI endpoints",
   "main": "lib/DAPIClient.js",
   "contributors": [
@@ -26,30 +26,31 @@
     }
   ],
   "dependencies": {
-    "@dashevo/dapi-grpc": "~0.21.0",
-    "@dashevo/dashcore-lib": "~0.19.26",
-    "@dashevo/dpp": "~0.21.0-dev.5",
-    "@dashevo/grpc-common": "~0.5.4",
+    "@dashevo/dapi-grpc": "~0.21.4",
+    "@dashevo/dashcore-lib": "~0.19.27",
+    "@dashevo/dpp": "~0.21.4",
+    "@dashevo/grpc-common": "~0.21.4",
     "@grpc/grpc-js": "^1.3.7",
     "axios": "^0.21.1",
     "bs58": "^4.0.1",
-    "cbor": "^7.0.5",
+    "cbor": "^8.0.0",
     "lodash.sample": "^4.2.1",
-    "node-inspect-extracted": "^1.0.7"
+    "node-inspect-extracted": "^1.0.8"
   },
   "devDependencies": {
-    "@babel/core": "^7.10.2",
+    "@babel/core": "^7.15.5",
     "assert-browserify": "^2.0.0",
-    "babel-loader": "^8.0.6",
+    "babel-loader": "^8.2.2",
     "buffer": "^6.0.3",
-    "chai": "^4.2.0",
+    "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
-    "core-js": "^3.6.4",
+    "comment-parser": "^0.7.6",
+    "core-js": "^3.17.2",
     "crypto-browserify": "^3.12.0",
     "dirty-chai": "^2.0.1",
-    "eslint": "^6.8.0",
-    "eslint-config-airbnb-base": "^14.1.0",
-    "eslint-plugin-import": "^2.20.2",
+    "eslint": "^7.32.0",
+    "eslint-config-airbnb-base": "^14.2.1",
+    "eslint-plugin-import": "^2.24.2",
     "eslint-plugin-jsdoc": "^27.0.0",
     "karma": "^6.3.4",
     "karma-chai": "^0.1.0",
@@ -58,7 +59,7 @@
     "karma-mocha": "^2.0.1",
     "karma-mocha-reporter": "^2.2.5",
     "karma-webpack": "^5.0.0",
-    "mocha": "^9.1.1",
+    "mocha": "^9.1.2",
     "nyc": "^15.1.0",
     "path-browserify": "^1.0.1",
     "process": "^0.11.10",
@@ -66,15 +67,15 @@
     "sinon-chai": "^3.7.0",
     "stream-browserify": "^3.0.0",
     "url": "^0.11.0",
-    "webpack": "^5.52.1",
-    "webpack-cli": "^4.8.0"
+    "webpack": "^5.59.1",
+    "webpack-cli": "^4.9.1"
   },
   "files": [
     "docs",
     "lib"
   ],
   "scripts": {
-    "build": "webpack",
+    "build:web": "webpack",
     "lint": "eslint .",
     "test": "npm run test:coverage && npm run test:browsers",
     "test:unit": "mocha './test/unit/**/*.spec.js'",
@@ -82,7 +83,12 @@
     "test:node": "NODE_ENV=test mocha",
     "test:browsers": "karma start ./karma.conf.js --single-run",
     "test:coverage": "NODE_ENV=test nyc --check-coverage --stmts=98 --branch=98 --funcs=98 --lines=95 mocha 'test/unit/**/*.spec.js' 'test/integration/**/*.spec.js'",
-    "prepublishOnly": "npm run build"
+    "prepublishOnly": "npm run build:web"
+  },
+  "ultra": {
+    "concurrent": [
+      "clean"
+    ]
   },
   "license": "MIT"
 }