From 5f18bc578bfc066375c26b6b4bd9e47c894ff253 Mon Sep 17 00:00:00 2001 From: Chris Troutner Date: Sat, 29 Aug 2020 13:24:22 -0700 Subject: [PATCH] fix(electrum-cash): Upgrading to electrum-cash v2.0.2 --- package-lock.json | 31 +++++++++++++++++++++++++++---- package.json | 2 +- src/routes/v3/electrumx.js | 2 +- 3 files changed, 29 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0bd55b3..9b2c98f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -872,6 +872,14 @@ "resolved": "https://registry.npmjs.org/@types/tus-js-client/-/tus-js-client-1.8.0.tgz", "integrity": "sha512-lWxu5+6qfyfwsW99GzUeJ9y9JeOSSLduKxgYMvaYM7sGTDKZsrIIHTUbHI2P016xhXtu9NxmUM3GrB4i14ie4A==" }, + "@types/ws": { + "version": "7.2.6", + "resolved": "https://registry.npmjs.org/@types/ws/-/ws-7.2.6.tgz", + "integrity": "sha512-Q07IrQUSNpr+cXU4E4LtkSIBPie5GLZyyMC1QtQYRLWz701+XcoVygGUZgvLqElq1nU4ICldMYPnexlBsg3dqQ==", + "requires": { + "@types/node": "*" + } + }, "@uppy/companion-client": { "version": "1.4.5", "resolved": "https://registry.npmjs.org/@uppy/companion-client/-/companion-client-1.4.5.tgz", @@ -4439,12 +4447,22 @@ "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" }, "electrum-cash": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/electrum-cash/-/electrum-cash-1.2.0.tgz", - "integrity": "sha512-NZarCF2U+6uXYd697GYAuP3qdDaFUx+6zWcO8SzyeNyRCNZaUm/rscUAm7+QCgNpUnj8tEGdLj5LG2mchaZRSQ==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/electrum-cash/-/electrum-cash-2.0.2.tgz", + "integrity": "sha512-b/mLctjwnmfp4cuvJbl9wgCxf4GWWiKPYZXEtekoyGPviZwOe2bnMC7LGOxAMpOW0YyU4W12kK6rbqskQc6EkA==", "requires": { + "@types/ws": "^7.2.6", "async-mutex": "^0.2.4", - "debug": "^4.1.1" + "debug": "^4.1.1", + "isomorphic-ws": "^4.0.1", + "ws": "^7.3.1" + }, + "dependencies": { + "ws": { + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.3.1.tgz", + "integrity": "sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA==" + } } }, "elliptic": { @@ -7567,6 +7585,11 @@ "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", "dev": true }, + "isomorphic-ws": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/isomorphic-ws/-/isomorphic-ws-4.0.1.tgz", + "integrity": "sha512-BhBvN2MBpWTaSHdWRb/bwdZJ1WaehQ2L1KngkCkfLUGF0mAWAT1sQUQacEmQ0jXkFw/czDXPNQSL5u2/Krsz1w==" + }, "isstream": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", diff --git a/package.json b/package.json index 287051b..aa87993 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "cors": "^2.8.3", "debug": "~4.1.1", "dotenv": "^8.0.0", - "electrum-cash": "^1.2.0", + "electrum-cash": "^2.0.2", "express": "^4.15.5", "express-basic-auth": "^1.1.3", "express-rate-limit": "^5.0.0", diff --git a/src/routes/v3/electrumx.js b/src/routes/v3/electrumx.js index 7636b05..6df8b3c 100644 --- a/src/routes/v3/electrumx.js +++ b/src/routes/v3/electrumx.js @@ -10,7 +10,7 @@ const axios = require('axios') const util = require('util') const bitcore = require('bitcore-lib-cash') -const ElectrumCash = require('electrum-cash').Client +const ElectrumCash = require('electrum-cash').ElectrumClient // const ElectrumCash = require('/home/trout/work/personal/electrum-cash/electrum.js').Client // eslint-disable-line const wlogger = require('../../util/winston-logging')