Skip to content

Commit e00e8bb

Browse files
emiliorizzoemiliorizzo
committed
Build 1.1.4
1 parent dd708ca commit e00e8bb

14 files changed

+50
-20
lines changed

‎CHANGELOG.md

+8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# Changelog
22

3+
## [1.1.4] - 2020-08-06
4+
5+
### Updated
6+
7+
- Db.createCollection to the new mongodb driver behavior
8+
- blocks checker service, delay before start.
9+
- config: disable services in config
10+
311
## [1.1.3] - 2020-08-04
412

513
This release requires the regeneration of the DB follow the instructions in [UPDATES.md](UPDATES.md) before starting.

‎dist/dbPatches/tokenAccountBalances.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
var _dataSource = _interopRequireDefault(require("../lib/dataSource.js"));
33
var _nod3Connect = _interopRequireDefault(require("../lib/nod3Connect"));
44
var _rskContractParser = _interopRequireDefault(require("rsk-contract-parser"));
5-
var _rskUtils = require("rsk-utils");function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}
5+
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 });
88

‎dist/lib/Db.js

+10-5
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,10 @@ class Db {
5454
try {
5555
const db = await this.db();
5656
if (!collectionName) throw new Error('Invalid collection name');
57-
let collection = await db.createCollection(collectionName, options);
57+
let list = await db.listCollections({}, { nameOnly: true }).toArray();
58+
let exists = list.find(c => c.name === collectionName);
59+
if (!exists) await db.createCollection(collectionName, options);
60+
let collection = db.collection(collectionName);
5861
if (dropIndexes) {
5962
this.log.info(`Removing indexes from ${collectionName}`);
6063
await collection.dropIndexes();
@@ -63,16 +66,18 @@ class Db {
6366
this.log.info(`Creating indexes to ${collectionName}`);
6467
await collection.createIndexes(indexes);
6568
}
66-
if (validate) {
67-
this.log.info(`Validating collection: ${collectionName}`);
68-
await db.admin().validateCollection(collectionName);
69-
}
69+
if (validate) await this.validateCollection(db, collectionName);
7070
return collection;
7171
} catch (err) {
7272
return Promise.reject(err);
7373
}
7474
}
7575

76+
validateCollection(db, collectionName) {
77+
this.log.info(`Validating collection: ${collectionName}`);
78+
return db.admin().validateCollection(collectionName);
79+
}
80+
7681
createCollections(collections, creationOptions = {}) {
7782
let queue = [];
7883
let names = creationOptions.names || {};

‎dist/lib/config.js

+7
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,13 @@ function makeConfig(config = {}) {
3232
config.api.modules[module] = config.api.modules[module] !== false;
3333
}
3434

35+
// defaults services
36+
const services = config.blocks.services || {};
37+
for (let s in _defaultConfig.default.blocks.services) {
38+
services[s] = config.blocks.services[s] !== false;
39+
}
40+
services.ROUTER = true;
41+
config.blocks.services = services;
3542
// defaults servers/ports
3643
config.source = nodeSources(config.source);
3744
config.blocks.source = config.source;

‎dist/lib/defaultConfig.js

+12-5
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,16 @@
33

44

55
var _types = require("./types");
6-
var _delayedFields = _interopRequireDefault(require("./delayedFields"));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };} /**
7-
* This file provides default values,
8-
* use /config.json, to overwrite settings
9-
*/const setAllModules = (status) => Object.keys(_types.MODULES).
6+
var _delayedFields = _interopRequireDefault(require("./delayedFields"));
7+
var _servicesConfig = require("../services/servicesConfig");function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };} /**
8+
* This file provides default values,
9+
* use /config.json, to overwrite settings
10+
*/const services = Object.assign({}, _servicesConfig.servicesNames);for (let s in services) {
11+
services[s] = true;
12+
}
13+
14+
const setAllModules = (status) =>
15+
Object.keys(_types.MODULES).
1016
reduce((a, v, i) => {
1117
a[v] = status;
1218
return a;
@@ -56,7 +62,8 @@ reduce((a, v, i) => {
5662
debug: false,
5763
updateTokenBalances: true, // Update token accounts balances on next block
5864
ports: [3010], // list of services ports, if the list runs out, the services will try to take the next ports starting from the last
59-
address: '127.0.0.1' },
65+
address: '127.0.0.1',
66+
services },
6067

6168
collectionsNames: {
6269
Config: 'config',

‎dist/lib/utils.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"use strict";Object.defineProperty(exports, "__esModule", { value: true });var _exportNames = { bigNumberDoc: true, isBigNumber: true, serializeBigNumber: true, isSerializedBigNumber: true, unSerializeBigNumber: true, bigNumberToSring: true, bigNumberSum: true, bigNumberDifference: true, newBigNumber: true, isObj: true, serialize: true, checkBlockHash: true, isBlockHash: true, blockQuery: true, getBestBlock: true, applyDecimals: true, isValidBlockNumber: true, isBlockObject: true, toAscii: true, quantityMarks: true, chunkArray: true, hash: true };exports.hash = exports.chunkArray = exports.quantityMarks = exports.toAscii = exports.isBlockObject = exports.isValidBlockNumber = exports.applyDecimals = exports.getBestBlock = exports.blockQuery = exports.isBlockHash = exports.checkBlockHash = exports.serialize = exports.isObj = exports.newBigNumber = exports.bigNumberDifference = exports.bigNumberSum = exports.bigNumberToSring = exports.unSerializeBigNumber = exports.isSerializedBigNumber = exports.serializeBigNumber = exports.isBigNumber = exports.bigNumberDoc = void 0;var _bignumber = require("bignumber.js");
22
var _types = require("./types");
33
var _mongodb = require("mongodb");
4-
var _rskUtils = require("rsk-utils");
4+
var _rskUtils = require("@rsksmart/rsk-utils");
55

66
Object.keys(_rskUtils).forEach(function (key) {if (key === "default" || key === "__esModule") return;if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;Object.defineProperty(exports, key, { enumerable: true, get: function () {return _rskUtils[key];} });});var _crypto = _interopRequireDefault(require("crypto"));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}
77

‎dist/services/blocks.config.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
"use strict";Object.defineProperty(exports, "__esModule", { value: true });exports.apps = exports.paths = void 0;
22
var _config = _interopRequireDefault(require("../lib/config"));
33
var _servicesConfig = require("./servicesConfig");function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}
4+
const { services } = _config.default.blocks;
45

5-
const scripts = Object.values(_servicesConfig.servicesNames);
6+
const scripts = Object.entries(_servicesConfig.servicesNames).
7+
filter(([service]) => services[service]).
8+
map(([service, name]) => name);
69

710
const scriptName = name => `${name}.js`;
811

‎dist/services/blocks/blocksChecker.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ async function main() {
2222
const { startService, service } = await (0, _serviceFactory.createService)(serviceConfig, executor, { log });
2323
const { emit } = service;
2424
await startService();
25-
checker.start(emit);
25+
setTimeout(() => checker.start(emit), 5000);
2626
} catch (err) {
2727
console.error(err);
2828
process.exit(9);

‎dist/services/classes/Address.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ var _Contract = _interopRequireDefault(require("./Contract"));
55
var _rskContractParser = require("rsk-contract-parser");
66
var _Tx = require("./Tx");
77
var _InternalTx = require("./InternalTx");
8-
var _rskUtils = require("rsk-utils");function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}
8+
var _rskUtils = require("@rsksmart/rsk-utils");function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}
99

1010
class Address extends _BcThing.BcThing {
1111
constructor(address, { nod3, initConfig, collections, tx, block, log } = {}) {

‎dist/services/classes/TokenAddress.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.default = exports.TokenAddress = void 0;var _BcThing = require("./BcThing");
22
var _Contract = _interopRequireDefault(require("./Contract"));
33
var _utils = require("../../lib/utils");
4-
var _rskUtils = require("rsk-utils");function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}
4+
var _rskUtils = require("@rsksmart/rsk-utils");function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}
55

66
class TokenAddress extends _BcThing.BcThing {
77
constructor(address, contract) {

‎dist/services/classes/UpdateTokenAccountBalances.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.updateTokenAccountBalances = updateTokenAccountBalances;
2-
var _rskUtils = require("rsk-utils");
2+
var _rskUtils = require("@rsksmart/rsk-utils");
33
var _rskContractParser = _interopRequireDefault(require("rsk-contract-parser"));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}
44

55
async function updateTokenAccountBalances(block, { nod3, collections, log }) {

‎package-lock.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "rsk-explorer-api",
3-
"version": "1.1.3",
3+
"version": "1.1.4",
44
"description": "",
55
"main": "index.js",
66
"scripts": {

‎public/swagger.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"info": {
33
"title": "rsk-explorer-api",
4-
"version": "1.1.3",
4+
"version": "1.1.4",
55
"description": "explorer API Documentation"
66
},
77
"swagger": "2.0",

0 commit comments

Comments
 (0)