Skip to content

Commit 45b8efa

Browse files
committed
Build 1.1.6
1 parent d97f206 commit 45b8efa

File tree

7 files changed

+68
-7
lines changed

7 files changed

+68
-7
lines changed

dist/dbPatches/tokenData.js

+43
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
"use strict";
2+
var _dataSource = _interopRequireDefault(require("../lib/dataSource.js"));
3+
var _Block = require("../services/classes/Block");
4+
var _BlocksBase = _interopRequireDefault(require("../lib/BlocksBase"));
5+
var _BlockSummary = require("../services/classes/BlockSummary");function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}
6+
7+
update().then(addresses => {
8+
if (addresses.length) {
9+
console.log('Addresses:');
10+
console.log(JSON.stringify(addresses, null, 2));
11+
} else {
12+
console.log('There are not invalid token data');
13+
}
14+
process.exit(0);
15+
});
16+
17+
async function update() {
18+
try {
19+
const addresses = {};
20+
const { collections, db, initConfig } = await (0, _dataSource.default)();
21+
const collection = collections.Addrs;
22+
const q = { $type: 'object' };
23+
const cursor = collection.find({ $or: [{ decimals: q }, { totalSupply: q }] }).project({ address: 1, name: 1, blockNumber: 1 });
24+
while (await cursor.hasNext()) {
25+
let { address, name, blockNumber } = await cursor.next();
26+
addresses[address] = { address, name };
27+
console.log(`Address: ${address}, name:${name}`);
28+
let summaries = await (0, _BlockSummary.getBlockSummariesByNumber)(blockNumber, collections);
29+
summaries = summaries.map(({ hash }) => hash);
30+
console.log(`Removing block summaries for block ${blockNumber}`);
31+
await Promise.all([...summaries.map(hash => (0, _BlockSummary.deleteBlockSummaryFromDb)(hash, collections))]);
32+
console.log(`Deleting block ${blockNumber} from db`);
33+
await Promise.all([...summaries.map(hash => (0, _Block.deleteBlockDataFromDb)(hash, blockNumber, collections))]);
34+
console.log(`Getting block ${blockNumber}`);
35+
let block = new _Block.Block(blockNumber, new _BlocksBase.default(db, { initConfig }));
36+
await block.save();
37+
}
38+
return Object.values(addresses);
39+
} catch (err) {
40+
console.error(err);
41+
process.exit(9);
42+
}
43+
}

dist/services/classes/Address.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ class Address extends _BcThing.BcThing {
4545

4646
async getBalance(blockNumber = 'latest') {
4747
try {
48-
if (this.isZeroAddress) return '0x0';
4948
let { nod3, address } = this;
5049
let balance = await nod3.eth.getBalance(address, blockNumber);
5150
return balance;
@@ -62,6 +61,7 @@ class Address extends _BcThing.BcThing {
6261
}
6362
let { nod3, address, blockNumber, blockCode } = this;
6463
if (blockCode !== undefined) return blockCode;
64+
6565
blockCode = await nod3.eth.getCode(address, blockNumber);
6666
blockCode = (0, _utils.isNullData)(blockCode) ? null : blockCode;
6767
this.blockCode = blockCode;

dist/services/classes/Addresses.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class Addresses {
3232
for (let address of addresses) {
3333
await address.fetch(forceFetch);
3434
}
35-
return addresses.map(a => a.getData());
35+
return addresses.map(a => a.getData(true));
3636
} catch (err) {
3737
return Promise.reject(err);
3838
}

dist/services/classes/BlockSummary.js

+20-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ var _Tx = _interopRequireDefault(require("./Tx"));
33
var _BlockTrace = _interopRequireDefault(require("./BlockTrace"));
44
var _BlockAddresses = require("./BlockAddresses");
55
var _ids = require("../../lib/ids");
6-
var _utils = require("../../lib/utils");function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}
6+
var _utils = require("../../lib/utils");
7+
var _addresses = require("@rsksmart/rsk-utils/dist/addresses");function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}
78

89
const BlocksSummaryCollection = 'BlocksSummary';exports.BlocksSummaryCollection = BlocksSummaryCollection;
910

@@ -108,7 +109,12 @@ class BlockSummary extends _BcThing.BcThing {
108109
let blockData = await this.getBlockData();
109110
Addresses = new _BlockAddresses.BlockAddresses(blockData, { nod3, initConfig, collections });
110111
let { miner } = blockData;
111-
Addresses.add(miner, { block: blockData });
112+
let options = { block: blockData };
113+
Addresses.add(miner, options);
114+
let summariesAddresses = await this.getSummariesAddresses();
115+
for (let address of summariesAddresses) {
116+
if ((0, _addresses.isAddress)(address)) Addresses.add(address, options);
117+
}
112118
this.Addresses = Addresses;
113119
}
114120
return Addresses;
@@ -117,6 +123,18 @@ class BlockSummary extends _BcThing.BcThing {
117123
}
118124
}
119125

126+
async getSummariesAddresses() {
127+
try {
128+
const { collections } = this;
129+
const { number } = await this.getBlockData();
130+
const summaries = await getBlockSummariesByNumber(number, collections);
131+
const addresses = [...new Set([].concat(...summaries.map(({ addresses }) => addresses)))];
132+
return addresses;
133+
} catch (err) {
134+
return Promise.reject(err);
135+
}
136+
}
137+
120138
async save() {
121139
try {
122140
let data = await this.fetch();

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.5",
3+
"version": "1.1.6",
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.5",
4+
"version": "1.1.6",
55
"description": "explorer API Documentation"
66
},
77
"swagger": "2.0",

0 commit comments

Comments
 (0)