Skip to content

Commit b1eb117

Browse files
emiliorizzoemiliorizzo
committed
Build 1.1.8
1 parent 2030d02 commit b1eb117

19 files changed

+357
-280
lines changed

‎CHANGELOG.md

+7
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
11
# Changelog
2+
## [1.1.8] - 2021-01-28
3+
#### Changed
4+
5+
- Dependencies: nod3 to @rsksmart/nod3
6+
- Dependencies: rsk-contract-parser to @rsksmart/rsk-contract-parser
7+
- Replace: lib/cli with @rsksmart/rsk-js-cli
8+
29
## [1.1.7] - 2021-01-07
310

411
### Fixed

‎dist/dbPatches/tokenAccountBalances.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"use strict";
22
var _dataSource = _interopRequireDefault(require("../lib/dataSource.js"));
33
var _nod3Connect = _interopRequireDefault(require("../lib/nod3Connect"));
4-
var _rskContractParser = _interopRequireDefault(require("rsk-contract-parser"));
4+
var _rskContractParser = _interopRequireDefault(require("@rsksmart/rsk-contract-parser"));
55
var _rskUtils = require("@rsksmart/rsk-utils");function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}
66

77
const parser = new _rskContractParser.default({ nod3: _nod3Connect.default });

‎dist/lib/cli.js

-38
This file was deleted.

‎dist/lib/nod3Connect.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
"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");
1+
"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");
22
var _config = _interopRequireDefault(require("./config"));
33
var _utils = require("../lib/utils");function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}
44

‎dist/services/classes/Address.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
var _utils = require("../../lib/utils");
33
var _types = require("../../lib/types");
44
var _Contract = _interopRequireDefault(require("./Contract"));
5-
var _rskContractParser = require("rsk-contract-parser");
5+
var _rskContractParser = require("@rsksmart/rsk-contract-parser");
66
var _Tx = require("./Tx");
77
var _InternalTx = require("./InternalTx");
88
var _rskUtils = require("@rsksmart/rsk-utils");function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}

‎dist/services/classes/BcStats.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"use strict";Object.defineProperty(exports, "__esModule", { value: true });exports.BcStats = void 0;var _BlocksBase = require("../../lib/BlocksBase");
22
var _getCirculatingSupply = _interopRequireDefault(require("../../api/lib/getCirculatingSupply"));
33
var _getActiveAccounts = _interopRequireDefault(require("../../api/lib/getActiveAccounts"));
4-
var _rskContractParser = require("rsk-contract-parser");
4+
var _rskContractParser = require("@rsksmart/rsk-contract-parser");
55
var _utils = require("../../lib/utils");function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}
66

77
class BcStats extends _BlocksBase.BlocksBase {

‎dist/services/classes/Contract.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
"use strict";Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var _BcThing = require("./BcThing");
2-
var _rskContractParser = _interopRequireDefault(require("rsk-contract-parser"));
2+
var _rskContractParser = _interopRequireDefault(require("@rsksmart/rsk-contract-parser"));
33
var _types = require("../../lib/types");
44
var _TokenAddress = _interopRequireDefault(require("./TokenAddress"));
55
var _utils = require("../../lib/utils");function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}

‎dist/services/classes/UpdateTokenAccountBalances.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"use strict";Object.defineProperty(exports, "__esModule", { value: true });exports.updateTokenAccountBalances = updateTokenAccountBalances;
22
var _rskUtils = require("@rsksmart/rsk-utils");
3-
var _rskContractParser = _interopRequireDefault(require("rsk-contract-parser"));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}
3+
var _rskContractParser = _interopRequireDefault(require("@rsksmart/rsk-contract-parser"));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}
44

55
async function updateTokenAccountBalances(block, { nod3, collections, log }) {
66
const parser = new _rskContractParser.default({ nod3 });

‎dist/tools/cacheBlocksTraces.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
var _dataSource = require("../lib/dataSource");
33
var _config = _interopRequireDefault(require("../lib/config"));
44
var _nod3Connect = require(".././lib/nod3Connect");
5-
var _nod = require("nod3");
5+
var _nod = require("@rsksmart/nod3");
66
var _BlockTrace = _interopRequireDefault(require("../services/classes/BlockTrace"));
77
var _Logger = require("../lib/Logger");function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}
88

‎dist/tools/deleteBlocks.js

+8-8
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
var _Block = require("../services/classes/Block");
33
var _BlockSummary = require("../services/classes/BlockSummary");
44
var _BlocksBase = require("../lib/BlocksBase");
5-
var _cli = require("../lib/cli");function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}
5+
var _rskJsCli = require("@rsksmart/rsk-js-cli");function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}
66

77
(0, _dataSource.default)({ skipCheck: true }).then(async ({ db }) => {
88
const options = new _BlocksBase.BlocksBase(db);
99
const { collections } = options;
1010
const p = path => path.split('/').pop();
1111
const help = () => {
1212
const myName = p(process.argv[1]);
13-
(0, _cli.info)(`Use: ${p(process.argv[0])} ${myName} [blockNumber] | [fromBlock-toBlock]`);
14-
(0, _cli.info)(`e.g. ${_cli.orange} ${myName} 400`);
15-
(0, _cli.info)(`e.g. ${_cli.orange} ${myName} 400-456`);
13+
_rskJsCli.log.info(`Use: ${p(process.argv[0])} ${myName} [blockNumber] | [fromBlock-toBlock]`);
14+
_rskJsCli.log.info(`e.g. ${_rskJsCli.orange} ${myName} 400`);
15+
_rskJsCli.log.info(`e.g. ${_rskJsCli.orange} ${myName} 400-456`);
1616
process.exit(0);
1717
};
1818

@@ -31,17 +31,17 @@ var _cli = require("../lib/cli");function _interopRequireDefault(obj) {return ob
3131
let Q = [];
3232
while (t >= f) {
3333
let b = await (0, _Block.getBlockFromDb)(t, collections.Blocks);
34-
let color = (0, _cli.ansiCode)(Number(t.toString().split('').pop()) + 30);
34+
let color = (0, _rskJsCli.ansiCode)(Number(t.toString().split('').pop()) + 30);
3535
if (b) {
3636
let { hash, number } = b;
37-
console.log(`${_cli.reset} ${color} ● ● ● Removing block ${number} ${hash}`);
37+
console.log(`${_rskJsCli.reset} ${color} ● ● ● Removing block ${number} ${hash}`);
3838
Q.push((0, _Block.deleteBlockDataFromDb)(b.hash, number, collections));
3939
}
4040
if (deleteSummary) {
4141
if (b) {
4242
Q.push((0, _BlockSummary.deleteBlockSummaryFromDb)(b.hash, options.collections));
4343
} else {
44-
console.log(`${_cli.reset} ${color} ● ● ● Removing ALL summaries for blockNumber: ${t}`);
44+
console.log(`${_rskJsCli.reset} ${color} ● ● ● Removing ALL summaries for blockNumber: ${t}`);
4545
let summaries = await (0, _BlockSummary.getBlockSummariesByNumber)(t, collections);
4646
if (summaries.length) {
4747
for (let summary of summaries) {
@@ -54,6 +54,6 @@ var _cli = require("../lib/cli");function _interopRequireDefault(obj) {return ob
5454
}
5555
Promise.all(Q).then(() => process.exit());
5656
} catch (err) {
57-
(0, _cli.error)(err);
57+
(0, _rskJsCli.error)(err);
5858
}
5959
});

‎dist/tools/getBlock.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"use strict";var _dataSource = _interopRequireDefault(require("../lib/dataSource.js"));
22
var _Block = _interopRequireDefault(require("../services/classes/Block"));
33
var _BlocksBase = _interopRequireDefault(require("../lib/BlocksBase"));
4-
var _cli = require("../lib/cli");
4+
var _rskJsCli = require("@rsksmart/rsk-js-cli");
55
var _util = _interopRequireDefault(require("util"));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}
66

77
const hashOrNumber = process.argv[2];
@@ -10,14 +10,14 @@ const save = opt === '--save';
1010
const json = opt === '--json';
1111
if (!hashOrNumber) help();
1212
(0, _dataSource.default)().then(({ db, initConfig }) => {
13-
if (!json) (0, _cli.info)(`Getting block ${hashOrNumber}`);
13+
if (!json) _rskJsCli.log.info(`Getting block ${hashOrNumber}`);
1414
getBlock(hashOrNumber, { db, initConfig }).then(block => {
1515
if (json) console.log(JSON.stringify(block));else
1616
{
1717
console.log(_util.default.inspect(block, { showHidden: false, depth: null, colors: true }));
1818
console.log('');
19-
(0, _cli.info)(` Get time: ${block.time}ms`);
20-
if (save) (0, _cli.info)(` Save time: ${block.saved}ms`);
19+
_rskJsCli.log.info(` Get time: ${block.time}ms`);
20+
if (save) _rskJsCli.log.info(` Save time: ${block.saved}ms`);
2121
}
2222
process.exit(0);
2323
});
@@ -47,7 +47,7 @@ async function getBlock(hashOrNumber, { db, initConfig }) {
4747

4848
function help() {
4949
const myName = process.argv[1].split('/').pop();
50-
(0, _cli.info)(`Usage: ${process.argv[0]} ${myName} number|hash|latest [--json | --save ]`);
50+
_rskJsCli.log.info(`Usage: ${process.argv[0]} ${myName} number|hash|latest [--json | --save ]`);
5151
process.exit(0);
5252
}
5353

‎dist/tools/statusClient.js

+17-17
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
"use strict";var _socket = _interopRequireDefault(require("socket.io-client"));
22
var _config = _interopRequireDefault(require("../lib/config"));
3-
var _cli = require("../lib/cli");function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}
3+
var _rskJsCli = require("@rsksmart/rsk-js-cli");function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}
44

55
const url = process.env.URL || `ws://localhost:${_config.default.api.port}`;
66
const socket = _socket.default.connect(url, { reconnect: true });
77
let blocksPerSecond;
88
let stats = { time: 0, blocks: 0 };
99
let mark = '●';
1010

11-
(0, _cli.info)(`Waiting for: ${url}`);
11+
_rskJsCli.log.info(`Waiting for: ${url}`);
1212

1313
socket.emit('subscribe', { to: 'status' });
1414

1515
socket.on('connect', socket => {
16-
(0, _cli.ok)('Connected! ✌');
16+
_rskJsCli.log.ok('Connected! ✌');
1717
});
1818

1919
socket.on('disconnect', socket => {
20-
(0, _cli.warn)('Disconnected ☹');
20+
_rskJsCli.log.warn('Disconnected ☹');
2121
});
2222

2323
socket.on('data', data => {
@@ -35,33 +35,33 @@ socket.on('data', data => {
3535
let { dbMissingBlocks, nodeDown, requestingBlocks, dbHighBlock, dbBlocks } = status;
3636
console.clear();
3737
console.log();
38-
(0, _cli.info)(url);
38+
_rskJsCli.log.info(url);
3939
console.log();
40-
console.log(` Api ${socket.connected ? _cli.green : _cli.red} ${mark} ${_cli.reset}`);
41-
console.log(` Node ${!nodeDown ? _cli.green : _cli.red} ${mark} ${_cli.reset}`);
42-
console.log(` Db ${dbMissingBlocks > 0 ? _cli.red : requestingBlocks > 5 ? _cli.orange : _cli.green} ${mark} ${_cli.reset}`);
40+
console.log(` Api ${socket.connected ? _rskJsCli.green : _rskJsCli.red} ${mark} ${_rskJsCli.reset}`);
41+
console.log(` Node ${!nodeDown ? _rskJsCli.green : _rskJsCli.red} ${mark} ${_rskJsCli.reset}`);
42+
console.log(` Db ${dbMissingBlocks > 0 ? _rskJsCli.red : requestingBlocks > 5 ? _rskJsCli.orange : _rskJsCli.green} ${mark} ${_rskJsCli.reset}`);
4343
console.log();
4444
console.dir(status, { colors: true });
4545
if (blocksPerSecond) {
46-
let color = blocksPerSecond < 10 ? _cli.red : blocksPerSecond < 20 ? _cli.orange : _cli.green;
46+
let color = blocksPerSecond < 10 ? _rskJsCli.red : blocksPerSecond < 20 ? _rskJsCli.orange : _rskJsCli.green;
4747
let endTime = Math.floor(dbMissingBlocks / blocksPerSecond);
4848
let end = new Date(Date.now() + endTime * 1000);
4949
console.log();
50-
console.log(`${color} ≈ ${blocksPerSecond} B/s${_cli.reset}`);
51-
console.log(`${color} ≈ ${parseInt(blocksPerSecond * 3600)} B/h${_cli.reset}`);
52-
console.log(`${_cli.blue} ≈ Remaining Time:${_cli.reset} ${Math.round(endTime / 3600)} H${_cli.reset}`);
53-
console.log(`${_cli.blue} ≈ End:${_cli.reset} ${end.toUTCString()}${_cli.reset}`);
50+
console.log(`${color} ≈ ${blocksPerSecond} B/s${_rskJsCli.reset}`);
51+
console.log(`${color} ≈ ${parseInt(blocksPerSecond * 3600)} B/h${_rskJsCli.reset}`);
52+
console.log(`${_rskJsCli.blue} ≈ Remaining Time:${_rskJsCli.reset} ${Math.round(endTime / 3600)} H${_rskJsCli.reset}`);
53+
console.log(`${_rskJsCli.blue} ≈ End:${_rskJsCli.reset} ${end.toUTCString()}${_rskJsCli.reset}`);
5454
}
55-
if (nodeDown) (0, _cli.error)('The node is down... ☹ ');
55+
if (nodeDown) _rskJsCli.log.error('The node is down... ☹ ');
5656
// show progress bar
5757
if (dbMissingBlocks > 1) {
58-
let bar = (0, _cli.progressBar)(dbHighBlock, dbBlocks, { steps: 30 });
58+
let bar = (0, _rskJsCli.progressBar)(dbHighBlock, dbBlocks, { steps: 30 });
5959
console.log();
60-
console.log(` ${_cli.blue}${bar}${_cli.reset}`);
60+
console.log(` ${_rskJsCli.blue}${bar}${_rskJsCli.reset}`);
6161
}
6262
}
6363
});
6464

6565
socket.on('error', err => {
66-
(0, _cli.error)(err);
66+
_rskJsCli.log.error(err);
6767
});

‎dist/tools/txStats.js

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
var _blocksCollections = require("../lib/blocksCollections");
33
var _utils = require("../lib/utils");function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}
44

5-
// import { info, orange, reset, error, ansiCode } from '../lib/cli'
65
const fromBlock = parseInt(process.argv[2]);
76
const toBlock = parseInt(process.argv[3]);
87
if (!fromBlock || !toBlock) help();

‎dist/tools/updateBalances.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"use strict";var _dataSource = _interopRequireDefault(require("../lib/dataSource.js"));
22
var _Address = require("../services/classes/Address");
33
var _nod3Connect = require("../lib/nod3Connect");
4-
var _cli = require("../lib/cli");function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}
4+
var _rskJsCli = require("@rsksmart/rsk-js-cli");function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}
55

66
const save = process.argv[2] === '--save';
77
main().then(res => {
@@ -31,10 +31,10 @@ async function main() {
3131

3232
let { address, balance } = await cursor.next();
3333
checked++;
34-
_cli.log.info(`${address} -- ${checked} / ${addresses}`);
34+
_rskJsCli.log.info(`${address} -- ${checked} / ${addresses}`);
3535
let newBalance = await _nod3Connect.nod3.eth.getBalance(address, 'latest');
3636
if (newBalance === balance) {
37-
_cli.log.ok(`${logTime()} The balance for ${address} is up to date`);
37+
_rskJsCli.log.ok(`${logTime()} The balance for ${address} is up to date`);
3838
} else {
3939
outdated++;
4040
if (save) {
@@ -43,12 +43,12 @@ async function main() {
4343
if (parseInt(blockNumber) < parseInt(lastBlock.number)) {
4444
throw new Error(`Invalid block number ${blockNumber}`);
4545
}
46-
_cli.log.info(`${logTime()} Updating balance of: ${address} to ${newBalance}`);
46+
_rskJsCli.log.info(`${logTime()} Updating balance of: ${address} to ${newBalance}`);
4747
let result = await (0, _Address.saveAddressToDb)({ address, blockNumber, balance: newBalance }, collection);
4848
if (!result.ok) throw new Error(`Error updating balance for ${address}`);
4949
updated++;
5050
} else {
51-
_cli.log.warn(`${logTime()} The balance of ${address} is outdated, balance:${balance} newBalance:${newBalance}`);
51+
_rskJsCli.log.warn(`${logTime()} The balance of ${address} is outdated, balance:${balance} newBalance:${newBalance}`);
5252
}
5353
}
5454
}

‎dist/tools/wsChannel.js

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
"use strict";var _socket = _interopRequireDefault(require("socket.io-client"));
2-
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 };}
2+
var _rskJsCli = require("@rsksmart/rsk-js-cli");function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}
33

44
const url = process.argv[2];
55
let channel = process.argv[3];
@@ -8,37 +8,37 @@ if (!url || !channel) help();
88

99
const socket = _socket.default.connect(url, { reconnect: true });
1010

11-
c.info(`Waiting for WS on ${url}`);
11+
_rskJsCli.log.info(`Waiting for WS on ${url}`);
1212

1313
socket.on('connect', data => {
14-
c.ok('Connected! ✌');
15-
c.info(`subscribing to channel: ${channel}`);
14+
_rskJsCli.log.ok('Connected! ✌');
15+
_rskJsCli.log.info(`subscribing to channel: ${channel}`);
1616
socket.emit('subscribe', { to: channel });
1717
});
1818

1919
socket.on('subscription', data => {
2020
if (channel === data.channel) {
21-
c.info(`subscribed to channel: ${channel}`);
21+
_rskJsCli.log.info(`subscribed to channel: ${channel}`);
2222
}
2323
});
2424

2525
socket.on('disconnect', socket => {
26-
c.warn('Disconnected ☹');
26+
_rskJsCli.log.warn('Disconnected ☹');
2727
});
2828

2929
socket.on('data', async res => {
3030
try {
3131
console.log(res);
3232
} catch (err) {
33-
c.error(err);
33+
_rskJsCli.log.error(err);
3434
process.exit(9);
3535
}
3636
});
3737

3838
socket.on('Error', err => {
3939
let error = err.error || '';
40-
c.error(`ERROR: ${error}`);
41-
c.warn(err);
40+
_rskJsCli.log.error(`ERROR: ${error}`);
41+
_rskJsCli.log.warn(err);
4242
});
4343

4444
process.on('unhandledRejection', err => {
@@ -47,6 +47,6 @@ process.on('unhandledRejection', err => {
4747
});
4848

4949
function help() {
50-
c.info(`Usage: ${process.argv[0]} ${process.argv[1]} [url] [channel]`);
50+
_rskJsCli.log.info(`Usage: ${process.argv[0]} ${process.argv[1]} [url] [channel]`);
5151
process.exit(0);
5252
}

0 commit comments

Comments
 (0)