From b1eb117e2627489b4151090e63b98eccc918da01 Mon Sep 17 00:00:00 2001 From: emi Date: Thu, 28 Jan 2021 17:54:53 -0700 Subject: [PATCH] Build 1.1.8 --- CHANGELOG.md | 7 + dist/dbPatches/tokenAccountBalances.js | 2 +- dist/lib/cli.js | 38 -- dist/lib/nod3Connect.js | 2 +- dist/services/classes/Address.js | 2 +- dist/services/classes/BcStats.js | 2 +- dist/services/classes/Contract.js | 2 +- .../classes/UpdateTokenAccountBalances.js | 2 +- dist/tools/cacheBlocksTraces.js | 2 +- dist/tools/deleteBlocks.js | 16 +- dist/tools/getBlock.js | 10 +- dist/tools/statusClient.js | 34 +- dist/tools/txStats.js | 1 - dist/tools/updateBalances.js | 10 +- dist/tools/wsChannel.js | 20 +- dist/tools/wsGet.js | 90 ++-- package-lock.json | 393 +++++++++++------- package.json | 2 +- public/swagger.json | 2 +- 19 files changed, 357 insertions(+), 280 deletions(-) delete mode 100644 dist/lib/cli.js diff --git a/CHANGELOG.md b/CHANGELOG.md index a64ad104..36e7508f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,11 @@ # Changelog +## [1.1.8] - 2021-01-28 +#### Changed + +- Dependencies: nod3 to @rsksmart/nod3 +- Dependencies: rsk-contract-parser to @rsksmart/rsk-contract-parser +- Replace: lib/cli with @rsksmart/rsk-js-cli + ## [1.1.7] - 2021-01-07 ### Fixed diff --git a/dist/dbPatches/tokenAccountBalances.js b/dist/dbPatches/tokenAccountBalances.js index dedfcf6e..701a8344 100644 --- a/dist/dbPatches/tokenAccountBalances.js +++ b/dist/dbPatches/tokenAccountBalances.js @@ -1,7 +1,7 @@ "use strict"; var _dataSource = _interopRequireDefault(require("../lib/dataSource.js")); var _nod3Connect = _interopRequireDefault(require("../lib/nod3Connect")); -var _rskContractParser = _interopRequireDefault(require("rsk-contract-parser")); +var _rskContractParser = _interopRequireDefault(require("@rsksmart/rsk-contract-parser")); var _rskUtils = require("@rsksmart/rsk-utils");function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };} const parser = new _rskContractParser.default({ nod3: _nod3Connect.default }); diff --git a/dist/lib/cli.js b/dist/lib/cli.js deleted file mode 100644 index c026140e..00000000 --- a/dist/lib/cli.js +++ /dev/null @@ -1,38 +0,0 @@ -"use strict";Object.defineProperty(exports, "__esModule", { value: true });exports.progressBar = exports.randomColor = exports.ansiCode = exports.log = exports.label = exports.example = exports.ok = exports.debug = exports.info = exports.warn = exports.error = exports.grey = exports.yellow = exports.orange = exports.green = exports.blue = exports.red = exports.reset = void 0;const reset = '\x1b[0m';exports.reset = reset; -const red = '\x1b[31m';exports.red = red; -const blue = '\x1b[36m';exports.blue = blue; -const green = '\x1b[32m';exports.green = green; -const orange = '\x1b[33m';exports.orange = orange; -const yellow = '\x1b[93m';exports.yellow = yellow; -const grey = '\x1b[90m';exports.grey = grey; - -const error = l => console.log(red, l, reset);exports.error = error; -const warn = l => console.log(orange, l, reset);exports.warn = warn; -const info = l => console.log(blue, l, reset);exports.info = info; -const debug = l => console.log(yellow, l, reset);exports.debug = debug; -const ok = l => console.log(green, l, reset);exports.ok = ok; -const example = l => console.log(grey, l, reset);exports.example = example; -const label = l => console.log(green, l, reset);exports.label = label; -const logMethods = { error, warn, debug, info, label }; - -const log = new Proxy({}, { - get(t, p) { - return logMethods[p] || console.log; - } });exports.log = log; - - -const ansiCode = number => `\x1b[${parseInt(number)}m`;exports.ansiCode = ansiCode; - -const randomColor = () => ansiCode(Math.floor(Math.random() * (40 - 30 + 1)) + 30);exports.randomColor = randomColor; - -const progressBar = (total, value, options = {}) => { - let steps = options.steps || 10; - let char = options.char || '■'; - let empty = options.empty || ' '; - let close = options.close || '|'; - let percent = Math.floor(value * 100 / total); - let bars = [...new Array(steps + 1)]. - map((v, i) => i * (100 / steps) < percent ? char : empty); - bars.splice(Math.floor(bars.length / 2), 0, ` ${percent}% `); - return `${close}${bars.join('')}${close}`; -};exports.progressBar = progressBar; \ No newline at end of file diff --git a/dist/lib/nod3Connect.js b/dist/lib/nod3Connect.js index 24918ee0..4d0e5740 100644 --- a/dist/lib/nod3Connect.js +++ b/dist/lib/nod3Connect.js @@ -1,4 +1,4 @@ -"use strict";Object.defineProperty(exports, "__esModule", { value: true });exports.default = exports.nod3Router = exports.nod3 = exports.nod3Log = exports.nod3Instance = exports.createNod3Router = exports.nod3BySource = exports.nod3Connect = void 0;var _nod = require("nod3"); +"use strict";Object.defineProperty(exports, "__esModule", { value: true });exports.default = exports.nod3Router = exports.nod3 = exports.nod3Log = exports.nod3Instance = exports.createNod3Router = exports.nod3BySource = exports.nod3Connect = void 0;var _nod = require("@rsksmart/nod3"); var _config = _interopRequireDefault(require("./config")); var _utils = require("../lib/utils");function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };} diff --git a/dist/services/classes/Address.js b/dist/services/classes/Address.js index 069c86e9..c850afc8 100644 --- a/dist/services/classes/Address.js +++ b/dist/services/classes/Address.js @@ -2,7 +2,7 @@ var _utils = require("../../lib/utils"); var _types = require("../../lib/types"); var _Contract = _interopRequireDefault(require("./Contract")); -var _rskContractParser = require("rsk-contract-parser"); +var _rskContractParser = require("@rsksmart/rsk-contract-parser"); var _Tx = require("./Tx"); var _InternalTx = require("./InternalTx"); var _rskUtils = require("@rsksmart/rsk-utils");function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };} diff --git a/dist/services/classes/BcStats.js b/dist/services/classes/BcStats.js index 033e874e..86aa4e6f 100644 --- a/dist/services/classes/BcStats.js +++ b/dist/services/classes/BcStats.js @@ -1,7 +1,7 @@ "use strict";Object.defineProperty(exports, "__esModule", { value: true });exports.BcStats = void 0;var _BlocksBase = require("../../lib/BlocksBase"); var _getCirculatingSupply = _interopRequireDefault(require("../../api/lib/getCirculatingSupply")); var _getActiveAccounts = _interopRequireDefault(require("../../api/lib/getActiveAccounts")); -var _rskContractParser = require("rsk-contract-parser"); +var _rskContractParser = require("@rsksmart/rsk-contract-parser"); var _utils = require("../../lib/utils");function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };} class BcStats extends _BlocksBase.BlocksBase { diff --git a/dist/services/classes/Contract.js b/dist/services/classes/Contract.js index d41de2c2..3fd6172c 100644 --- a/dist/services/classes/Contract.js +++ b/dist/services/classes/Contract.js @@ -1,5 +1,5 @@ "use strict";Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var _BcThing = require("./BcThing"); -var _rskContractParser = _interopRequireDefault(require("rsk-contract-parser")); +var _rskContractParser = _interopRequireDefault(require("@rsksmart/rsk-contract-parser")); var _types = require("../../lib/types"); var _TokenAddress = _interopRequireDefault(require("./TokenAddress")); var _utils = require("../../lib/utils");function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };} diff --git a/dist/services/classes/UpdateTokenAccountBalances.js b/dist/services/classes/UpdateTokenAccountBalances.js index 477c0493..96d8f83d 100644 --- a/dist/services/classes/UpdateTokenAccountBalances.js +++ b/dist/services/classes/UpdateTokenAccountBalances.js @@ -1,6 +1,6 @@ "use strict";Object.defineProperty(exports, "__esModule", { value: true });exports.updateTokenAccountBalances = updateTokenAccountBalances; var _rskUtils = require("@rsksmart/rsk-utils"); -var _rskContractParser = _interopRequireDefault(require("rsk-contract-parser"));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };} +var _rskContractParser = _interopRequireDefault(require("@rsksmart/rsk-contract-parser"));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };} async function updateTokenAccountBalances(block, { nod3, collections, log }) { const parser = new _rskContractParser.default({ nod3 }); diff --git a/dist/tools/cacheBlocksTraces.js b/dist/tools/cacheBlocksTraces.js index 8b00fe2e..01aaa351 100644 --- a/dist/tools/cacheBlocksTraces.js +++ b/dist/tools/cacheBlocksTraces.js @@ -2,7 +2,7 @@ var _dataSource = require("../lib/dataSource"); var _config = _interopRequireDefault(require("../lib/config")); var _nod3Connect = require(".././lib/nod3Connect"); -var _nod = require("nod3"); +var _nod = require("@rsksmart/nod3"); var _BlockTrace = _interopRequireDefault(require("../services/classes/BlockTrace")); var _Logger = require("../lib/Logger");function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };} diff --git a/dist/tools/deleteBlocks.js b/dist/tools/deleteBlocks.js index 80d18c91..a6643708 100644 --- a/dist/tools/deleteBlocks.js +++ b/dist/tools/deleteBlocks.js @@ -2,7 +2,7 @@ var _Block = require("../services/classes/Block"); var _BlockSummary = require("../services/classes/BlockSummary"); var _BlocksBase = require("../lib/BlocksBase"); -var _cli = require("../lib/cli");function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };} +var _rskJsCli = require("@rsksmart/rsk-js-cli");function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };} (0, _dataSource.default)({ skipCheck: true }).then(async ({ db }) => { const options = new _BlocksBase.BlocksBase(db); @@ -10,9 +10,9 @@ var _cli = require("../lib/cli");function _interopRequireDefault(obj) {return ob const p = path => path.split('/').pop(); const help = () => { const myName = p(process.argv[1]); - (0, _cli.info)(`Use: ${p(process.argv[0])} ${myName} [blockNumber] | [fromBlock-toBlock]`); - (0, _cli.info)(`e.g. ${_cli.orange} ${myName} 400`); - (0, _cli.info)(`e.g. ${_cli.orange} ${myName} 400-456`); + _rskJsCli.log.info(`Use: ${p(process.argv[0])} ${myName} [blockNumber] | [fromBlock-toBlock]`); + _rskJsCli.log.info(`e.g. ${_rskJsCli.orange} ${myName} 400`); + _rskJsCli.log.info(`e.g. ${_rskJsCli.orange} ${myName} 400-456`); process.exit(0); }; @@ -31,17 +31,17 @@ var _cli = require("../lib/cli");function _interopRequireDefault(obj) {return ob let Q = []; while (t >= f) { let b = await (0, _Block.getBlockFromDb)(t, collections.Blocks); - let color = (0, _cli.ansiCode)(Number(t.toString().split('').pop()) + 30); + let color = (0, _rskJsCli.ansiCode)(Number(t.toString().split('').pop()) + 30); if (b) { let { hash, number } = b; - console.log(`${_cli.reset} ${color} ● ● ● Removing block ${number} ${hash}`); + console.log(`${_rskJsCli.reset} ${color} ● ● ● Removing block ${number} ${hash}`); Q.push((0, _Block.deleteBlockDataFromDb)(b.hash, number, collections)); } if (deleteSummary) { if (b) { Q.push((0, _BlockSummary.deleteBlockSummaryFromDb)(b.hash, options.collections)); } else { - console.log(`${_cli.reset} ${color} ● ● ● Removing ALL summaries for blockNumber: ${t}`); + console.log(`${_rskJsCli.reset} ${color} ● ● ● Removing ALL summaries for blockNumber: ${t}`); let summaries = await (0, _BlockSummary.getBlockSummariesByNumber)(t, collections); if (summaries.length) { for (let summary of summaries) { @@ -54,6 +54,6 @@ var _cli = require("../lib/cli");function _interopRequireDefault(obj) {return ob } Promise.all(Q).then(() => process.exit()); } catch (err) { - (0, _cli.error)(err); + (0, _rskJsCli.error)(err); } }); \ No newline at end of file diff --git a/dist/tools/getBlock.js b/dist/tools/getBlock.js index f497e6b1..d9605308 100644 --- a/dist/tools/getBlock.js +++ b/dist/tools/getBlock.js @@ -1,7 +1,7 @@ "use strict";var _dataSource = _interopRequireDefault(require("../lib/dataSource.js")); var _Block = _interopRequireDefault(require("../services/classes/Block")); var _BlocksBase = _interopRequireDefault(require("../lib/BlocksBase")); -var _cli = require("../lib/cli"); +var _rskJsCli = require("@rsksmart/rsk-js-cli"); var _util = _interopRequireDefault(require("util"));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };} const hashOrNumber = process.argv[2]; @@ -10,14 +10,14 @@ const save = opt === '--save'; const json = opt === '--json'; if (!hashOrNumber) help(); (0, _dataSource.default)().then(({ db, initConfig }) => { - if (!json) (0, _cli.info)(`Getting block ${hashOrNumber}`); + if (!json) _rskJsCli.log.info(`Getting block ${hashOrNumber}`); getBlock(hashOrNumber, { db, initConfig }).then(block => { if (json) console.log(JSON.stringify(block));else { console.log(_util.default.inspect(block, { showHidden: false, depth: null, colors: true })); console.log(''); - (0, _cli.info)(` Get time: ${block.time}ms`); - if (save) (0, _cli.info)(` Save time: ${block.saved}ms`); + _rskJsCli.log.info(` Get time: ${block.time}ms`); + if (save) _rskJsCli.log.info(` Save time: ${block.saved}ms`); } process.exit(0); }); @@ -47,7 +47,7 @@ async function getBlock(hashOrNumber, { db, initConfig }) { function help() { const myName = process.argv[1].split('/').pop(); - (0, _cli.info)(`Usage: ${process.argv[0]} ${myName} number|hash|latest [--json | --save ]`); + _rskJsCli.log.info(`Usage: ${process.argv[0]} ${myName} number|hash|latest [--json | --save ]`); process.exit(0); } diff --git a/dist/tools/statusClient.js b/dist/tools/statusClient.js index 2f5bc55e..d67bcb1e 100644 --- a/dist/tools/statusClient.js +++ b/dist/tools/statusClient.js @@ -1,6 +1,6 @@ "use strict";var _socket = _interopRequireDefault(require("socket.io-client")); var _config = _interopRequireDefault(require("../lib/config")); -var _cli = require("../lib/cli");function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };} +var _rskJsCli = require("@rsksmart/rsk-js-cli");function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };} const url = process.env.URL || `ws://localhost:${_config.default.api.port}`; const socket = _socket.default.connect(url, { reconnect: true }); @@ -8,16 +8,16 @@ let blocksPerSecond; let stats = { time: 0, blocks: 0 }; let mark = '●'; -(0, _cli.info)(`Waiting for: ${url}`); +_rskJsCli.log.info(`Waiting for: ${url}`); socket.emit('subscribe', { to: 'status' }); socket.on('connect', socket => { - (0, _cli.ok)('Connected! ✌'); + _rskJsCli.log.ok('Connected! ✌'); }); socket.on('disconnect', socket => { - (0, _cli.warn)('Disconnected ☹'); + _rskJsCli.log.warn('Disconnected ☹'); }); socket.on('data', data => { @@ -35,33 +35,33 @@ socket.on('data', data => { let { dbMissingBlocks, nodeDown, requestingBlocks, dbHighBlock, dbBlocks } = status; console.clear(); console.log(); - (0, _cli.info)(url); + _rskJsCli.log.info(url); console.log(); - console.log(` Api ${socket.connected ? _cli.green : _cli.red} ${mark} ${_cli.reset}`); - console.log(` Node ${!nodeDown ? _cli.green : _cli.red} ${mark} ${_cli.reset}`); - console.log(` Db ${dbMissingBlocks > 0 ? _cli.red : requestingBlocks > 5 ? _cli.orange : _cli.green} ${mark} ${_cli.reset}`); + console.log(` Api ${socket.connected ? _rskJsCli.green : _rskJsCli.red} ${mark} ${_rskJsCli.reset}`); + console.log(` Node ${!nodeDown ? _rskJsCli.green : _rskJsCli.red} ${mark} ${_rskJsCli.reset}`); + console.log(` Db ${dbMissingBlocks > 0 ? _rskJsCli.red : requestingBlocks > 5 ? _rskJsCli.orange : _rskJsCli.green} ${mark} ${_rskJsCli.reset}`); console.log(); console.dir(status, { colors: true }); if (blocksPerSecond) { - let color = blocksPerSecond < 10 ? _cli.red : blocksPerSecond < 20 ? _cli.orange : _cli.green; + let color = blocksPerSecond < 10 ? _rskJsCli.red : blocksPerSecond < 20 ? _rskJsCli.orange : _rskJsCli.green; let endTime = Math.floor(dbMissingBlocks / blocksPerSecond); let end = new Date(Date.now() + endTime * 1000); console.log(); - console.log(`${color} ≈ ${blocksPerSecond} B/s${_cli.reset}`); - console.log(`${color} ≈ ${parseInt(blocksPerSecond * 3600)} B/h${_cli.reset}`); - console.log(`${_cli.blue} ≈ Remaining Time:${_cli.reset} ${Math.round(endTime / 3600)} H${_cli.reset}`); - console.log(`${_cli.blue} ≈ End:${_cli.reset} ${end.toUTCString()}${_cli.reset}`); + console.log(`${color} ≈ ${blocksPerSecond} B/s${_rskJsCli.reset}`); + console.log(`${color} ≈ ${parseInt(blocksPerSecond * 3600)} B/h${_rskJsCli.reset}`); + console.log(`${_rskJsCli.blue} ≈ Remaining Time:${_rskJsCli.reset} ${Math.round(endTime / 3600)} H${_rskJsCli.reset}`); + console.log(`${_rskJsCli.blue} ≈ End:${_rskJsCli.reset} ${end.toUTCString()}${_rskJsCli.reset}`); } - if (nodeDown) (0, _cli.error)('The node is down... ☹ '); + if (nodeDown) _rskJsCli.log.error('The node is down... ☹ '); // show progress bar if (dbMissingBlocks > 1) { - let bar = (0, _cli.progressBar)(dbHighBlock, dbBlocks, { steps: 30 }); + let bar = (0, _rskJsCli.progressBar)(dbHighBlock, dbBlocks, { steps: 30 }); console.log(); - console.log(` ${_cli.blue}${bar}${_cli.reset}`); + console.log(` ${_rskJsCli.blue}${bar}${_rskJsCli.reset}`); } } }); socket.on('error', err => { - (0, _cli.error)(err); + _rskJsCli.log.error(err); }); \ No newline at end of file diff --git a/dist/tools/txStats.js b/dist/tools/txStats.js index ea9db2cb..30e9fe8f 100644 --- a/dist/tools/txStats.js +++ b/dist/tools/txStats.js @@ -2,7 +2,6 @@ var _blocksCollections = require("../lib/blocksCollections"); var _utils = require("../lib/utils");function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };} -// import { info, orange, reset, error, ansiCode } from '../lib/cli' const fromBlock = parseInt(process.argv[2]); const toBlock = parseInt(process.argv[3]); if (!fromBlock || !toBlock) help(); diff --git a/dist/tools/updateBalances.js b/dist/tools/updateBalances.js index 898cfb5a..acb29736 100644 --- a/dist/tools/updateBalances.js +++ b/dist/tools/updateBalances.js @@ -1,7 +1,7 @@ "use strict";var _dataSource = _interopRequireDefault(require("../lib/dataSource.js")); var _Address = require("../services/classes/Address"); var _nod3Connect = require("../lib/nod3Connect"); -var _cli = require("../lib/cli");function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };} +var _rskJsCli = require("@rsksmart/rsk-js-cli");function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };} const save = process.argv[2] === '--save'; main().then(res => { @@ -31,10 +31,10 @@ async function main() { let { address, balance } = await cursor.next(); checked++; - _cli.log.info(`${address} -- ${checked} / ${addresses}`); + _rskJsCli.log.info(`${address} -- ${checked} / ${addresses}`); let newBalance = await _nod3Connect.nod3.eth.getBalance(address, 'latest'); if (newBalance === balance) { - _cli.log.ok(`${logTime()} The balance for ${address} is up to date`); + _rskJsCli.log.ok(`${logTime()} The balance for ${address} is up to date`); } else { outdated++; if (save) { @@ -43,12 +43,12 @@ async function main() { if (parseInt(blockNumber) < parseInt(lastBlock.number)) { throw new Error(`Invalid block number ${blockNumber}`); } - _cli.log.info(`${logTime()} Updating balance of: ${address} to ${newBalance}`); + _rskJsCli.log.info(`${logTime()} Updating balance of: ${address} to ${newBalance}`); let result = await (0, _Address.saveAddressToDb)({ address, blockNumber, balance: newBalance }, collection); if (!result.ok) throw new Error(`Error updating balance for ${address}`); updated++; } else { - _cli.log.warn(`${logTime()} The balance of ${address} is outdated, balance:${balance} newBalance:${newBalance}`); + _rskJsCli.log.warn(`${logTime()} The balance of ${address} is outdated, balance:${balance} newBalance:${newBalance}`); } } } diff --git a/dist/tools/wsChannel.js b/dist/tools/wsChannel.js index 3fffe757..fa65f6f2 100644 --- a/dist/tools/wsChannel.js +++ b/dist/tools/wsChannel.js @@ -1,5 +1,5 @@ "use strict";var _socket = _interopRequireDefault(require("socket.io-client")); -var c = _interopRequireWildcard(require("../lib/cli"));function _getRequireWildcardCache() {if (typeof WeakMap !== "function") return null;var cache = new WeakMap();_getRequireWildcardCache = function () {return cache;};return cache;}function _interopRequireWildcard(obj) {if (obj && obj.__esModule) {return obj;}if (obj === null || typeof obj !== "object" && typeof obj !== "function") {return { default: obj };}var cache = _getRequireWildcardCache();if (cache && cache.has(obj)) {return cache.get(obj);}var newObj = {};var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;for (var key in obj) {if (Object.prototype.hasOwnProperty.call(obj, key)) {var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;if (desc && (desc.get || desc.set)) {Object.defineProperty(newObj, key, desc);} else {newObj[key] = obj[key];}}}newObj.default = obj;if (cache) {cache.set(obj, newObj);}return newObj;}function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };} +var _rskJsCli = require("@rsksmart/rsk-js-cli");function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };} const url = process.argv[2]; let channel = process.argv[3]; @@ -8,37 +8,37 @@ if (!url || !channel) help(); const socket = _socket.default.connect(url, { reconnect: true }); -c.info(`Waiting for WS on ${url}`); +_rskJsCli.log.info(`Waiting for WS on ${url}`); socket.on('connect', data => { - c.ok('Connected! ✌'); - c.info(`subscribing to channel: ${channel}`); + _rskJsCli.log.ok('Connected! ✌'); + _rskJsCli.log.info(`subscribing to channel: ${channel}`); socket.emit('subscribe', { to: channel }); }); socket.on('subscription', data => { if (channel === data.channel) { - c.info(`subscribed to channel: ${channel}`); + _rskJsCli.log.info(`subscribed to channel: ${channel}`); } }); socket.on('disconnect', socket => { - c.warn('Disconnected ☹'); + _rskJsCli.log.warn('Disconnected ☹'); }); socket.on('data', async res => { try { console.log(res); } catch (err) { - c.error(err); + _rskJsCli.log.error(err); process.exit(9); } }); socket.on('Error', err => { let error = err.error || ''; - c.error(`ERROR: ${error}`); - c.warn(err); + _rskJsCli.log.error(`ERROR: ${error}`); + _rskJsCli.log.warn(err); }); process.on('unhandledRejection', err => { @@ -47,6 +47,6 @@ process.on('unhandledRejection', err => { }); function help() { - c.info(`Usage: ${process.argv[0]} ${process.argv[1]} [url] [channel]`); + _rskJsCli.log.info(`Usage: ${process.argv[0]} ${process.argv[1]} [url] [channel]`); process.exit(0); } \ No newline at end of file diff --git a/dist/tools/wsGet.js b/dist/tools/wsGet.js index 8fb921f0..6e298b35 100644 --- a/dist/tools/wsGet.js +++ b/dist/tools/wsGet.js @@ -1,5 +1,5 @@ "use strict";var _socket = _interopRequireDefault(require("socket.io-client")); -var c = _interopRequireWildcard(require("../lib/cli")); +var _rskJsCli = require("@rsksmart/rsk-js-cli"); var _fs = _interopRequireDefault(require("fs")); var _crypto = _interopRequireDefault(require("crypto")); var URL = _interopRequireWildcard(require("url")); @@ -23,32 +23,32 @@ let results = 0; const key = createRequestKey(payload); payload.key = key; -c.info(`Waiting for WS on ${url}`); +_rskJsCli.log.info(`Waiting for WS on ${url}`); socket.on('connect', data => { - c.ok('Connected! ✌'); - c.info(`sending payload`); + _rskJsCli.log.ok('Connected! ✌'); + _rskJsCli.log.info(`sending payload`); getPage(socket, payload); }); socket.on('disconnect', socket => { - c.warn('Disconnected ☹'); + _rskJsCli.log.warn('Disconnected ☹'); }); socket.on('data', async res => { try { let { data, error, req } = res; if (error) { - c.error(error); + _rskJsCli.log.error(error); process.exit(); } if (!error && req && key === req.key) { // multiple results if (res.pages) { let { prev, next, total, limit } = res.pages; - if (!prev) c.info(`Total ${total}`); + if (!prev) _rskJsCli.log.info(`Total ${total}`); - c.info(`Adding ${data.length}`); + _rskJsCli.log.info(`Adding ${data.length}`); // send data to file stream await addDataToFile(data); @@ -61,21 +61,21 @@ socket.on('data', async res => { await closeFileAndExit(); } } else {// single result - c.ok('Saving to file'); + _rskJsCli.log.ok('Saving to file'); await addDataToFile(data); await closeFileAndExit(); } } } catch (err) { - c.error(err); + _rskJsCli.log.error(err); process.exit(9); } }); socket.on('Error', err => { let error = err.error || ''; - c.error(`ERROR: ${error}`); - c.warn(err); + _rskJsCli.log.error(`ERROR: ${error}`); + _rskJsCli.log.warn(err); }); process.on('unhandledRejection', err => { @@ -105,11 +105,11 @@ async function addDataToFile(data) { async function closeFileAndExit() { try { await file.close(); - c.ok(`Done: ${results} results`); - c.info(`File saved: ${destinationFile}`); + _rskJsCli.log.ok(`Done: ${results} results`); + _rskJsCli.log.info(`File saved: ${destinationFile}`); process.exit(0); } catch (err) { - c.error(err); + _rskJsCli.log.error(err); process.exit(9); } } @@ -122,9 +122,9 @@ function getPage(socket, payload, next) { if (!next) { count = true; if (params.next) next = params.next; - c.ok(`Getting first ${limit} items`); + _rskJsCli.log.ok(`Getting first ${limit} items`); } else { - c.ok(`Getting next ${limit} items: ${next}`); + _rskJsCli.log.ok(`Getting next ${limit} items: ${next}`); } payload = Object.assign({}, payload); payload.params = payload.params || {}; @@ -135,33 +135,33 @@ function getPage(socket, payload, next) { function help() { let { name } = _package.default; - if (!isValidURL(url)) c.warn(`Invalid URL: ${url}`); - // if (!payload) c.warn(`Set environment variable payload, e.g. payload='{"module":"blocks","action":"getBlock","params":{"hashOrNumber":200}}'`) - c.ok(''); - c.ok(`Usage:`); - c.info(''); - c.info('All parameters must be provided as environment variables'); - - c.info(''); - c.info('Required parameters:'); - c.info(''); - c.example(` url: ${name} instance URL`); - c.example(` payload: ${name} payload`); - c.info(''); - c.info('Optionals parameters:'); - c.info(''); - c.example(` outDir: destination folder`); - c.info(''); - c.ok('Examples:'); - c.example(''); - c.info('Get block'); - c.example(` export url=wss://backend.explorer.rsk.co`); - c.example(` export payload='{"module":"blocks","action":"getBlock","params":{"hashOrNumber":200}}'`); - c.example(''); - c.info('Get blocks'); - c.example(` export url=wss://backend.explorer.rsk.co`); - c.example(` export payload='{"module":"blocks","action":"getBlocks","params":{"next":200,"sort":{"number":-1}}}'`); - c.example(''); + if (!isValidURL(url)) _rskJsCli.log.warn(`Invalid URL: ${url}`); + // if (!payload) log.warn(`Set environment variable payload, e.g. payload='{"module":"blocks","action":"getBlock","params":{"hashOrNumber":200}}'`) + _rskJsCli.log.ok(''); + _rskJsCli.log.ok(`Usage:`); + _rskJsCli.log.info(''); + _rskJsCli.log.info('All parameters must be provided as environment variables'); + + _rskJsCli.log.info(''); + _rskJsCli.log.info('Required parameters:'); + _rskJsCli.log.info(''); + _rskJsCli.log.example(` url: ${name} instance URL`); + _rskJsCli.log.example(` payload: ${name} payload`); + _rskJsCli.log.info(''); + _rskJsCli.log.info('Optionals parameters:'); + _rskJsCli.log.info(''); + _rskJsCli.log.example(` outDir: destination folder`); + _rskJsCli.log.info(''); + _rskJsCli.log.ok('Examples:'); + _rskJsCli.log.example(''); + _rskJsCli.log.info('Get block'); + _rskJsCli.log.example(` export url=wss://backend.explorer.rsk.co`); + _rskJsCli.log.example(` export payload='{"module":"blocks","action":"getBlock","params":{"hashOrNumber":200}}'`); + _rskJsCli.log.example(''); + _rskJsCli.log.info('Get blocks'); + _rskJsCli.log.example(` export url=wss://backend.explorer.rsk.co`); + _rskJsCli.log.example(` export payload='{"module":"blocks","action":"getBlocks","params":{"next":200,"sort":{"number":-1}}}'`); + _rskJsCli.log.example(''); process.exit(0); } @@ -210,7 +210,7 @@ function isValidURL(url) { let { protocol } = URL.parse(url); return /^ws/.test(protocol); } catch (err) { - c.error(err); + _rskJsCli.log.error(err); return false; } } \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 3e2057e7..63626b62 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "rsk-explorer-api", - "version": "1.1.7", + "version": "1.1.8", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -407,9 +407,9 @@ }, "dependencies": { "core-js": { - "version": "3.8.2", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.8.2.tgz", - "integrity": "sha512-FfApuSRgrR6G5s58casCBd9M2k+4ikuu4wbW6pJyYU7bd9zvFc9qf7vr5xmrZOhT9nn+8uwlH1oRR9jTnFoA3A==", + "version": "3.8.3", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.8.3.tgz", + "integrity": "sha512-KPYXeVZYemC2TkNEkX/01I+7yd+nX3KddKwZ1Ww7SKWdI2wQprSgLmrTddT8nw92AjEklTsPBoSdQBhbI1bQ6Q==", "dev": true } } @@ -1274,9 +1274,9 @@ "integrity": "sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w==" }, "@types/node": { - "version": "14.14.20", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.20.tgz", - "integrity": "sha512-Y93R97Ouif9JEOWPIUyU+eyIdyRqQR0I8Ez1dzku4hDx34NWh4HbtIc3WNzwB1Y9ULvNGeu5B8h8bVL5cAk4/A==" + "version": "14.14.22", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.22.tgz", + "integrity": "sha512-g+f/qj/cNcqKkc3tFqlXOYjrmZA+jNBiDzbP3kH+B+otKFqAdPgVTGP1IeKRdMml/aE69as5S4FqtxAbl+LaMw==" }, "@types/pbkdf2": { "version": "3.1.0", @@ -1463,6 +1463,35 @@ "requires": { "delegates": "^1.0.0", "readable-stream": "^2.0.6" + }, + "dependencies": { + "readable-stream": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "requires": { + "safe-buffer": "~5.1.0" + } + } } }, "argparse": { @@ -1791,6 +1820,44 @@ "requires": { "readable-stream": "^2.3.5", "safe-buffer": "^5.1.1" + }, + "dependencies": { + "readable-stream": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + }, + "dependencies": { + "safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + } + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "requires": { + "safe-buffer": "~5.1.0" + }, + "dependencies": { + "safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + } + } + } } }, "blakejs": { @@ -2062,9 +2129,9 @@ "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=" }, "bunyan": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/bunyan/-/bunyan-2.0.4.tgz", - "integrity": "sha512-wJWl1J0aO+AJV+mEXh5jr2jiSUo+JJHQZ/P2z0JSFJidFAWuJPafD+IhE8BeQNMBZyldA9Y3GDR1U15zAAaJHA==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/bunyan/-/bunyan-2.0.5.tgz", + "integrity": "sha512-Jvl74TdxCN6rSP9W1I6+UOUtwslTDqsSFkDqZlFb/ilaSvQ+bZAnXT/GT97IZ5L+Vph0joPZPhxUyn6FLNmFAA==", "requires": { "dtrace-provider": "~0.8", "exeunt": "1.1.0", @@ -2137,13 +2204,13 @@ } }, "call-bind": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.0.tgz", - "integrity": "sha512-AEXsYIyyDY3MCzbwdhzG3Jx1R0J2wetQyUynn6dYHAO+bg8l1k7jwZtRv4ryryFs7EP+NDlikJlVe59jr0cM2w==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", + "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", "dev": true, "requires": { "function-bind": "^1.1.1", - "get-intrinsic": "^1.0.0" + "get-intrinsic": "^1.0.2" } }, "call-me-maybe": { @@ -2173,9 +2240,9 @@ "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=" }, "caniuse-lite": { - "version": "1.0.30001173", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001173.tgz", - "integrity": "sha512-R3aqmjrICdGCTAnSXtNyvWYMK3YtV5jwudbq0T7nN9k4kmE4CBuwPqyJ+KBzepSTh0huivV2gLbSMEzTTmfeYw==", + "version": "1.0.30001180", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001180.tgz", + "integrity": "sha512-n8JVqXuZMVSPKiPiypjFtDTXc4jWIdjxull0f92WLo7e1MSi3uJ3NvveakSh/aCl1QKFAvIz3vIj0v+0K+FrXw==", "dev": true }, "chai": { @@ -2231,9 +2298,9 @@ "dev": true }, "chokidar": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.0.tgz", - "integrity": "sha512-JgQM9JS92ZbFR4P90EvmzNpSGhpPBGBSj10PILeDyYFwp4h2/D9OM03wsJ4zW1fEp4ka2DGrnUeD7FuvQ2aZ2Q==", + "version": "3.5.1", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz", + "integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==", "dev": true, "requires": { "anymatch": "~3.1.1", @@ -2257,9 +2324,9 @@ } }, "binary-extensions": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz", - "integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", + "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", "dev": true }, "braces": { @@ -2534,6 +2601,38 @@ "inherits": "^2.0.3", "readable-stream": "^2.2.2", "typedarray": "^0.0.6" + }, + "dependencies": { + "readable-stream": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "dev": true + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } } }, "configstore": { @@ -2646,12 +2745,12 @@ "integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=" }, "core-js-compat": { - "version": "3.8.2", - "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.8.2.tgz", - "integrity": "sha512-LO8uL9lOIyRRrQmZxHZFl1RV+ZbcsAkFWTktn5SmH40WgLtSNYN4m4W2v9ONT147PxBY/XrRhrWq8TlvObyUjQ==", + "version": "3.8.3", + "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.8.3.tgz", + "integrity": "sha512-1sCb0wBXnBIL16pfFG1Gkvei6UzvKyTNYpiC41yrdjEv0UoJoq9E/abTMzyYJ6JpTkAj15dLjbqifIzEBDVvog==", "dev": true, "requires": { - "browserslist": "^4.16.0", + "browserslist": "^4.16.1", "semver": "7.0.0" }, "dependencies": { @@ -2664,9 +2763,9 @@ } }, "core-js-pure": { - "version": "3.8.2", - "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.8.2.tgz", - "integrity": "sha512-v6zfIQqL/pzTVAbZvYUozsxNfxcFb6Ks3ZfEbuneJl3FW9Jb8F6vLWB6f+qTmAu72msUdyb84V8d/yBFf7FNnw==" + "version": "3.8.3", + "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.8.3.tgz", + "integrity": "sha512-V5qQZVAr9K0xu7jXg1M7qTEwuxUgqr7dUOezGaNa7i+Xn9oXAU/d1fzqD9ObuwpVQOaorO5s70ckyi1woP9lVA==" }, "core-util-is": { "version": "1.0.2", @@ -2958,9 +3057,9 @@ "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" }, "electron-to-chromium": { - "version": "1.3.634", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.634.tgz", - "integrity": "sha512-QPrWNYeE/A0xRvl/QP3E0nkaEvYUvH3gM04ZWYtIa6QlSpEetRlRI1xvQ7hiMIySHHEV+mwDSX8Kj4YZY6ZQAw==", + "version": "1.3.648", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.648.tgz", + "integrity": "sha512-4POzwyQ80tkDiBwkxn7IpfzioimrjRSFX1sCQ3pLZsYJ5ERYmwzdq0hZZ3nFP7Z6GtmnSn3xwWDm8FPlMeOoEQ==", "dev": true }, "elliptic": { @@ -3109,23 +3208,25 @@ } }, "es-abstract": { - "version": "1.18.0-next.1", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz", - "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==", + "version": "1.18.0-next.2", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.2.tgz", + "integrity": "sha512-Ih4ZMFHEtZupnUh6497zEL4y2+w8+1ljnCyaTa+adcoafI1GOvMwFlDjBLfWR7y9VLfrjRJe9ocuHY1PSR9jjw==", "dev": true, "requires": { + "call-bind": "^1.0.2", "es-to-primitive": "^1.2.1", "function-bind": "^1.1.1", + "get-intrinsic": "^1.0.2", "has": "^1.0.3", "has-symbols": "^1.0.1", "is-callable": "^1.2.2", - "is-negative-zero": "^2.0.0", + "is-negative-zero": "^2.0.1", "is-regex": "^1.1.1", - "object-inspect": "^1.8.0", + "object-inspect": "^1.9.0", "object-keys": "^1.1.1", - "object.assign": "^4.1.1", - "string.prototype.trimend": "^1.0.1", - "string.prototype.trimstart": "^1.0.1" + "object.assign": "^4.1.2", + "string.prototype.trimend": "^1.0.3", + "string.prototype.trimstart": "^1.0.3" } }, "es-to-primitive": { @@ -4125,9 +4226,9 @@ "dev": true }, "get-intrinsic": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.0.2.tgz", - "integrity": "sha512-aeX0vrFm21ILl3+JpFFRNe9aUvp6VFZb2/CTbgLb8j75kOhvoNYjt9d8KA/tJG4gSo8nzEDedRl0h7vDmBYRVg==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.0.tgz", + "integrity": "sha512-M11rgtQp5GZMZzDL7jLTNxbDfurpzuau5uqRWDPvlHjfvg3TdScAZo96GLvhMjImrmR8uAt0FS2RLoMrfWGKlg==", "dev": true, "requires": { "function-bind": "^1.1.1", @@ -4424,18 +4525,6 @@ "inherits": "^2.0.4", "readable-stream": "^3.6.0", "safe-buffer": "^5.2.0" - }, - "dependencies": { - "readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", - "requires": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - } - } } }, "hash.js": { @@ -5369,18 +5458,18 @@ "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=" }, "memoizee": { - "version": "0.4.14", - "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.4.14.tgz", - "integrity": "sha512-/SWFvWegAIYAO4NQMpcX+gcra0yEZu4OntmUdrBaWrJncxOqAziGFlHxc7yjKVK2uu3lpPW27P27wkR82wA8mg==", + "version": "0.4.15", + "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.4.15.tgz", + "integrity": "sha512-UBWmJpLZd5STPm7PMUlOw/TSy972M+z8gcyQ5veOnSDRREz/0bmpyTfKt3/51DhEBqCZQn1udM/5flcSPYhkdQ==", "requires": { - "d": "1", - "es5-ext": "^0.10.45", - "es6-weak-map": "^2.0.2", + "d": "^1.0.1", + "es5-ext": "^0.10.53", + "es6-weak-map": "^2.0.3", "event-emitter": "^0.3.5", - "is-promise": "^2.1", - "lru-queue": "0.1", - "next-tick": "1", - "timers-ext": "^0.1.5" + "is-promise": "^2.2.2", + "lru-queue": "^0.1.0", + "next-tick": "^1.1.0", + "timers-ext": "^0.1.7" } }, "memory-pager": { @@ -5571,9 +5660,9 @@ } }, "binary-extensions": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz", - "integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", + "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", "dev": true }, "braces": { @@ -5872,9 +5961,9 @@ "optional": true }, "needle": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/needle/-/needle-2.5.2.tgz", - "integrity": "sha512-LbRIwS9BfkPvNwNHlsA41Q29kL2L/6VaOJ0qisM5lLWsTV3nP15abO5ITL6L81zqFhzjRKDAYjpcBcwM0AVvLQ==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/needle/-/needle-2.6.0.tgz", + "integrity": "sha512-KKYdza4heMsEfSWD7VPUIz3zX2XDwOyX2d+geb4vrERZMT5RMU6ujjaD+I5Yr54uZxQ2w6XRTAhHBbSCyovZBg==", "requires": { "debug": "^3.2.6", "iconv-lite": "^0.4.4", @@ -5982,9 +6071,9 @@ } }, "node-releases": { - "version": "1.1.69", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.69.tgz", - "integrity": "sha512-DGIjo79VDEyAnRlfSqYTsy+yoHd2IOjJiKUozD2MV2D85Vso6Bug56mb9tT/fY5Urt0iqk01H7x+llAruDR2zA==", + "version": "1.1.70", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.70.tgz", + "integrity": "sha512-Slf2s69+2/uAD79pVVQo8uSiC34+g8GWY8UH2Qtqv34ZfhYrxpYpfzs9Js9d6O0mbDmALuxaTlplnBTnSELcrw==", "dev": true }, "nodemon": { @@ -6442,9 +6531,9 @@ } }, "pathval": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.0.tgz", - "integrity": "sha1-uULm1L3mUwBe9rcTYd74cn0GReA=", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz", + "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==", "dev": true }, "pbkdf2": { @@ -6724,9 +6813,9 @@ } }, "react-copy-to-clipboard": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/react-copy-to-clipboard/-/react-copy-to-clipboard-5.0.1.tgz", - "integrity": "sha512-ELKq31/E3zjFs5rDWNCfFL4NvNFQvGRoJdAKReD/rUPA+xxiLPQmZBZBvy2vgH7V0GE9isIQpT9WXbwIVErYdA==", + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/react-copy-to-clipboard/-/react-copy-to-clipboard-5.0.3.tgz", + "integrity": "sha512-9S3j+m+UxDZOM0Qb8mhnT/rMR0NGSrj9A/073yz2DSxPMYhmYFBMYIdI2X4o8AjOjyFsSNxDRnCX6s/gRxpriw==", "requires": { "copy-to-clipboard": "^3", "prop-types": "^15.5.8" @@ -6753,9 +6842,12 @@ } }, "react-immutable-proptypes": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/react-immutable-proptypes/-/react-immutable-proptypes-2.1.0.tgz", - "integrity": "sha1-Aj1vObsVyXwHHp5g0A0TbqxfoLQ=" + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/react-immutable-proptypes/-/react-immutable-proptypes-2.2.0.tgz", + "integrity": "sha512-Vf4gBsePlwdGvSZoLSBfd4HAP93HDauMY4fDjXhreg/vg6F3Fj/MXDNyTbltPC/xZKmZc+cjLu3598DdYK6sgQ==", + "requires": { + "invariant": "^2.2.2" + } }, "react-immutable-pure-component": { "version": "1.2.4", @@ -6879,24 +6971,13 @@ } }, "readable-stream": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", - "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - }, - "dependencies": { - "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" - } + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" } }, "readdirp": { @@ -6909,6 +6990,41 @@ "graceful-fs": "^4.1.11", "micromatch": "^3.1.10", "readable-stream": "^2.0.2" + }, + "dependencies": { + "readable-stream": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "dev": true, + "optional": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "dev": true, + "optional": true + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "optional": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } } }, "redux": { @@ -6931,9 +7047,9 @@ } }, "refractor": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/refractor/-/refractor-3.3.0.tgz", - "integrity": "sha512-c/jEhQjk1NDyTF3hMgtu8PigaqkWUv+c5+mBffZCTnjyrNSJkG+0eoTOJV/u0XCTuPfaFzJyj6MM4HnF0Wr27Q==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/refractor/-/refractor-3.3.1.tgz", + "integrity": "sha512-vaN6R56kLMuBszHSWlwTpcZ8KTMG6aUCok4GrxYDT20UIOXxOc5o6oDc8tNTzSlH3m2sI+Eu9Jo2kVdDcUTWYw==", "requires": { "hastscript": "^6.0.0", "parse-entities": "^2.0.0", @@ -7025,9 +7141,9 @@ "dev": true }, "regjsparser": { - "version": "0.6.4", - "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.4.tgz", - "integrity": "sha512-64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw==", + "version": "0.6.6", + "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.6.tgz", + "integrity": "sha512-jjyuCp+IEMIm3N1H1LLTJW1EISEJV9+5oHdEyrt43Pg9cDSb6rrLZei2cVWpl0xTjmmlpec/lEQGYgM7xfpGCQ==", "dev": true, "requires": { "jsesc": "~0.5.0" @@ -7625,9 +7741,9 @@ "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=" }, "socket.io-parser": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.3.1.tgz", - "integrity": "sha512-1QLvVAe8dTz+mKmZ07Swxt+LAo4Y1ff50rlyoEx00TQmDFVQYPfcqGvIDJLGaBdhdNCecXtyKpD+EgKGcmmbuQ==", + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.3.2.tgz", + "integrity": "sha512-FJvDBuOALxdCI9qwRrO/Rfp9yfndRtc1jSgVgV8FDraihmSP/MLGD5PEuJrNfjALvcQ+vMDM/33AWOYP/JSjDg==", "requires": { "component-emitter": "~1.3.0", "debug": "~3.1.0", @@ -7844,18 +7960,11 @@ } }, "string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", + "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", "requires": { - "safe-buffer": "~5.1.0" - }, - "dependencies": { - "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" - } + "safe-buffer": "~5.2.0" } }, "strip-ansi": { @@ -7895,9 +8004,9 @@ } }, "swagger-client": { - "version": "3.12.1", - "resolved": "https://registry.npmjs.org/swagger-client/-/swagger-client-3.12.1.tgz", - "integrity": "sha512-jxhf7yvMq1SIlaMBlL0S+2mk5eovdYNzVAn1Ewrpe1pkby2pm5PnnP8XiSImCuX7d+BxUfVFkOgCTeK38+fBlA==", + "version": "3.12.2", + "resolved": "https://registry.npmjs.org/swagger-client/-/swagger-client-3.12.2.tgz", + "integrity": "sha512-l4aAty0VNmHaOEEvOI7Tc6xtUZLNxtFEOZzansjxHjbV9o2ZsiFPMdomIGj14n/Zb0S2eN83cEJYHJ3SENUYPw==", "requires": { "@babel/runtime-corejs3": "^7.11.2", "btoa": "^1.2.1", @@ -7921,9 +8030,9 @@ "integrity": "sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==" }, "qs": { - "version": "6.9.4", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.4.tgz", - "integrity": "sha512-A1kFqHekCTM7cz0udomYUoYNWjBebHm/5wzU/XqrBRBNWectVH0QIiN+NEcZ0Dte5hvzHwbr8+XQmguPhJ6WdQ==" + "version": "6.9.6", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.6.tgz", + "integrity": "sha512-TIRk4aqYLNoJUbd+g2lEdz5kLWIuTMRagAXxl78Q0RiVjAOugHmeKNGdd3cwo/ktpf9aL9epCfFqWDEKysUlLQ==" } } }, @@ -8026,32 +8135,32 @@ } }, "swagger-ui": { - "version": "3.38.0", - "resolved": "https://registry.npmjs.org/swagger-ui/-/swagger-ui-3.38.0.tgz", - "integrity": "sha512-Q8aUFioTogGQXvGcgFW8J3LuhV6boh7vdveTYvZTYb4KHuII6jnZrgcN7CR8Ux1+8TUeju5yxyRHP1IAms2O3A==", + "version": "3.41.1", + "resolved": "https://registry.npmjs.org/swagger-ui/-/swagger-ui-3.41.1.tgz", + "integrity": "sha512-W8eU/MdKCO+aZSyIEAIYsXYrGSolIiJGK9YuvWqLNzD/vATcgn14qjfYrrV9OUtCVdglDOQO7svJ7XCJUxdpZQ==", "requires": { - "@babel/runtime-corejs3": "^7.11.2", + "@babel/runtime-corejs3": "^7.12.5", "@braintree/sanitize-url": "^5.0.0", "@kyleshockey/object-assign-deep": "^0.4.2", "@kyleshockey/xml": "^1.0.2", - "base64-js": "^1.2.0", + "base64-js": "^1.5.1", "classnames": "^2.2.6", "css.escape": "1.5.1", "deep-extend": "0.6.0", - "dompurify": "^2.2.3", - "ieee754": "^1.1.13", + "dompurify": "^2.2.6", + "ieee754": "^1.2.1", "immutable": "^3.x.x", - "js-file-download": "^0.4.1", + "js-file-download": "^0.4.12", "js-yaml": "^3.13.1", - "lodash": "^4.17.19", - "memoizee": "^0.4.12", + "lodash": "^4.17.20", + "memoizee": "^0.4.15", "prop-types": "^15.7.2", "randombytes": "^2.1.0", "react": "=15.7.0", - "react-copy-to-clipboard": "5.0.1", - "react-debounce-input": "^3.2.0", + "react-copy-to-clipboard": "5.0.3", + "react-debounce-input": "^3.2.3", "react-dom": "=15.7.0", - "react-immutable-proptypes": "2.1.0", + "react-immutable-proptypes": "2.2.0", "react-immutable-pure-component": "^1.1.1", "react-inspector": "^2.3.0", "react-motion": "^0.5.2", @@ -8063,7 +8172,7 @@ "reselect": "^4.0.0", "serialize-error": "^2.1.0", "sha.js": "^2.4.11", - "swagger-client": "^3.12.1", + "swagger-client": "^3.12.2", "url-parse": "^1.4.7", "xml-but-prettier": "^1.0.1", "zenscroll": "^4.0.2" diff --git a/package.json b/package.json index 9dd5f727..b8fbb712 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rsk-explorer-api", - "version": "1.1.7", + "version": "1.1.8", "description": "", "main": "index.js", "scripts": { diff --git a/public/swagger.json b/public/swagger.json index 1374e61d..8186d25e 100644 --- a/public/swagger.json +++ b/public/swagger.json @@ -1,7 +1,7 @@ { "info": { "title": "rsk-explorer-api", - "version": "1.1.7", + "version": "1.1.8", "description": "explorer API Documentation" }, "swagger": "2.0",