Live Version: [etherhub.io](http://etherhub.io)
-Follow the project progress at: [ETC Block Explorer Development](https://github.com/ethereumproject/explorer)
+Follow the project progress at: [ETC Block Explorer Development](https://github.com/ethereumclassic/explorer)
## Local installation
Clone the repo
-`git clone https://github.com/ethereumproject/explorer`
+`git clone https://github.com/ethereumclassic/explorer`
Download [Nodejs and npm](https://docs.npmjs.com/getting-started/installing-node "Nodejs install") if you don't have them
@@ -34,7 +36,7 @@ Basic settings:
```json
{
"nodeAddr": "localhost",
- "gethPort": 8545,
+ "wsPort": 8546,
"startBlock": 0,
"endBlock": "latest",
"quiet": true,
@@ -53,12 +55,12 @@ Basic settings:
"linkedin": "https://www.linkedin.com/company/ethereum-classic",
"github": "https://github.com/ethereumclassic",
"logo": "/img/explorer-logo.png",
- "customCss": "green-haze.min.css",
- "copyright": "2018 © Ethereum Classic.",
- "useEthFiat": false,
+ "copyright": "2019 © Ethereum Classic.",
"poweredbyCustom": false,
"poweredbyEtcImage": "/img/powered-by-etcexplorer-w.png",
"poweredbyEtc": true,
+ "useRichList": true,
+ "useFiat": true,
"miners": {
"0xdf7d7e053933b5cc24372f878c90e62dadad5d42": "EtherMine",
"0xc91716199ccde49dc4fafaeb68925127ac80443f": "F2Pool",
@@ -92,32 +94,105 @@ Basic settings:
```
-```nodeAddr``` Your node API RPC address.
+| Name | Explanation |
+|-------------|-----|
+| `nodeAddr` | Your node API RPC address. |
+| `wsPort` | Your node API WS (Websocket) port. (RPC HTTP port is deprecated on Web3 1.0 see https://web3js.readthedocs.io/en/1.0/web3.html#value) |
+| `startBlock` | This is the start block of the blockchain, should always be 0 if you want to sync the whole ETC blockchain. |
+| `endBlock` | This is usually the 'latest'/'newest' block in the blockchain, this value gets updated automatically, and will be used to patch missing blocks if the whole app goes down. |
+| `quiet` | Suppress some messages. (admittedly still not quiet) |
+| `syncAll` | If this is set to true at the start of the app, the sync will start syncing all blocks from lastSync, and if lastSync is 0 it will start from whatever the endBlock or latest block in the blockchain is. |
+| `patch` | If set to true and below value is set, sync will iterated through the # of blocks specified. |
+| `patchBlocks` | If `patch` is set to true, the amount of block specified will be check from the latest one. |
+| `useRichList` | If `useRichList` is set to true, explorer will update account balance for richlist page. |
+| `useFiat` | If `useFiat` is set to true, explorer will show price for account & tx page. ( Disable for testnets )|
+
+### Mongodb Auth setting.
+
+#### Configure MongoDB
+
+In view of system security, most of mongoDB Admin has setup security options, So, You need to setup mongodb auth informations.
+Switch to the built-in admin database:
+
+```
+$ mongo
+$ > use admin
+```
+
+1. Create an administrative user (if you have already admin or root of mongodb account, then skip it)
+
+```
+# make admin auth and role setup
+$ > db.createUser( { user: "admin", pwd: "
-
-
-
-
-
-
+
+
+
+
+
+
-
+
diff --git a/public/tpl/header.html b/public/tpl/header.html
index c0ebd436e..aae17b0fd 100755
--- a/public/tpl/header.html
+++ b/public/tpl/header.html
@@ -1,181 +1,136 @@
-
diff --git a/public/views/address.html b/public/views/address.html
index 3b2034342..91fdb7841 100644
--- a/public/views/address.html
+++ b/public/views/address.html
@@ -1,31 +1,24 @@
-
+
-
- Contract Overview
-
-
+
+
-
+
+
-
+
-
- {{ addr.balance | number: 10 }}
- - {{ settings.symbol }} Balance -
- -
+ - - {{ settings.symbol }} Balance -
- -
- {{ addr.mined }} Mined
-
-
- {{ addr.count }} Transactions
-
-
+
+ Contract Overview
+
+
+
+
-
+
+
-
+
+ {{ addr.balance | number: 4 }} {{ settings.symbol }}
+ + {{ settings.symbol }} Balance +
+
-
-
- + + {{ settings.symbol }} Balance +
+
+ {{ addr.balanceUSD | currency : "$" : 4 }} USD balance
+
+
+ {{ addr.mined }} Mined
-
@@ -48,89 +41,91 @@
+
+
+ Contract Creator
+ {{addr.owner.substr(0,24)}}... at txn + {{addr.creationTransaction.substr(0,24)}}... +
+
+ + {{addr.owner.substr(0,24)}}... at txn + {{addr.creationTransaction.substr(0,24)}}... +
-
-
diff --git a/public/views/block.html b/public/views/block.html
index 5f808091b..b8067f691 100644
--- a/public/views/block.html
+++ b/public/views/block.html
@@ -1,52 +1,64 @@
-
-
+
-
+
-
-
-
-
-
- | TxHash | -Block | -From | -To | -{{ settings.symbol }} | -gas | -Age | -
|---|
-
-
-
-
-
- | TxHash | -Block | -From | -To | -Amount | -gas | -call | -
|---|---|---|---|---|---|---|
| No more transactions | -- | |||||
| {{t.transactionHash}} | -{{t.blockNumber}} - | {{t.from}} | -{{t.to}} | -{{t.amount | number: 4}} {{t.tokenInfo.symbol}} | -{{t.gas}} | -{{t.type}} {{t.error}} | -
-
+
+
+
+
+
-
+
-
+
+
+
+
+
+
+ | TxHash | +Block | +From | +To | +{{ settings.symbol }} | +gas | +Age | +
|---|
+
+
+
+
+ | TxHash | +Block | +From | +To | +{{ settings.symbol }} | +gas | ++ |
|---|---|---|---|---|---|---|
| {{t.transactionHash}} | +{{t.blockNumber}} + | {{t.from}} | +{{t.to}} | +{{t.amount | number: 4}} {{t.tokenInfo.symbol}} | +{{t.gas}} | +{{t.type}} {{t.error}} | +
+
-
-
-
-
Verify And Publish Source Code. -
-
+
+
| height | <Prev {{block.number | number}} Next> | |||||
| Time | -{{block.datetime | date:'yyyy-MM-dd HH:mm:ss Z' }} ({{block.timestamp | timeDuration}} ago) | -|||||
| Hash | {{block.hash}} | |||||
| parentHash | {{block.parentHash}} | |||||
| sha3 Uncles | {{block.sha3Uncles}} | |||||
| Mined By | {{block.miner}} | |||||
| Difficulty | {{block.difficulty | totalDifficulty}} | |||||
| Total Difficulty | {{block.totalDifficulty | totalDifficulty}} | |||||
| Gas Limit | {{block.gasLimit | number}} | |||||
| Gas Used | {{block.gasUsed | number}} | |||||
| nonce | {{block.nonce}} | |||||
| Extra Data | {{block.extraData}} | |||||
| Uncles | {{block.uncles.length}} uncles
-
|
| Block Height | +<Prev {{block.number | number}} Next> | +|
| TimeStamp | +{{block.timestamp | timeDuration}} ago ({{block.datetime | date:'yyyy-MM-dd HH:mm:ss Z' }}) | +|
| Hash | +{{block.hash}} | +|
| Parent Hash | ++ + {{block.parentHash}} + | +|
| Sha3Uncles | {{block.sha3Uncles}} | |
| Mined by | {{block.miner}} | |
| Difficulty | {{block.difficulty | totalDifficulty}} | |
| Total Difficulty | {{block.totalDifficulty | totalDifficulty}} | |
| Gas Limit | {{block.gasLimit | number}} | |
| Gas Used | {{block.gasUsed | number}} | |
| Nonce | {{block.nonce}} | |
| Extra Data | {{block.extraData}} (Hex: {{block.extraDataHex}}) | |
| Uncles | {{block.uncles.length}} uncles
+
|
Verify And Publish Source Code. -
- Contract Source Code Verified + Contract Source Code Verified
-
+
Contract Name:
{{contract.contractName}}
-
-
+
+
Compiler Version:
{{contract.compilerVersion}}
-
-
+
+
Optimization Enabled:
{{contract.optimization}}
-
+
Contract Source Code
Contract ABI -
+
-
{{contract.sourceCode}}
Contract ABI -
{{contract.abi}}+
{{contract.abi}}
+
Contract Bytecode
-
\ No newline at end of file
+
diff --git a/public/views/contract.html b/public/views/contract.html
index 30650d682..2367a04bf 100644
--- a/public/views/contract.html
+++ b/public/views/contract.html
@@ -1,132 +1,117 @@
{{addr.bytecode}}
-
-
-
-
-
-
-
-
-
Verify and Publish Contract Source Code
-
- Enter Contract Source Code below.
- If the compiled bytecode matches the Creation Address bytecode, the contract is then Verified and will be published online.
+
- If the compiled bytecode matches the Creation Address bytecode, the contract is then Verified and will be published online.
+
+
+
+
+
+
+
diff --git a/public/views/dao.html b/public/views/dao.html
deleted file mode 100644
index 86abe1cad..000000000
--- a/public/views/dao.html
+++ /dev/null
@@ -1,99 +0,0 @@
-
-
+
+
diff --git a/public/views/created-tokens.html b/public/views/created-tokens.html
index 031a9cde9..e52a4a04a 100644
--- a/public/views/created-tokens.html
+++ b/public/views/created-tokens.html
@@ -1,33 +1,32 @@
-
+
+
+
+
+
+
+
+ Verify and Publish Contract Source Code
+
+ Enter Contract Source Code below.
+ If the compiled bytecode matches the Creation Address bytecode, the contract is then Verified and will be published online.
+
+ + If the compiled bytecode matches the Creation Address bytecode, the contract is then Verified and will be published online.
+
+
-
-
-
-
-
\ No newline at end of file
+ | TxHash | -Age | -Block | -To | -Amount | -- |
|---|---|---|---|---|---|
| {{t.transactionHash}} | -{{t.timestamp | timeDuration}} ago | -{{t.blockNumber}} | -{{t.to}} | -{{t.amount | number}} | -Created | -
| TxHash | +Age | +Block | +To | +Amount | ++ |
|---|---|---|---|---|---|
| {{t.transactionHash}} | +{{t.timestamp | timeDuration}} ago | +{{t.blockNumber}} | +{{t.to}} | +{{t.amount | number}} | +Created | +
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ dao.balance | number: 10 }}
- - TheDAO Balance -
-
- - - TheDAO Balance -
-
- {{ dao.extra_balance | number: 10 }} TheDAO Extra Balance
-
-
-
- {{ dao.total_supply | number:1 }} Total Tokens
-
-
- Token Holders
-
-
- {{ dao.count }} Transactions
-
-
-
-
-
-
-
-
- WATCH
- WATCHING
-
-
- {{ dao.follow_count }}0
- WATCHING
-
-
-
-
\ No newline at end of file
diff --git a/public/views/err_404.html b/public/views/err_404.html
index 6ae220f52..b559687af 100755
--- a/public/views/err_404.html
+++ b/public/views/err_404.html
@@ -1,13 +1,14 @@
-
-
-
-
-
-
-
-
-
- Get DAO-C Token Balance
-
-
-
-
-
-
-
- You have 0{{dao.tokens | number}} DAO-C tokens.
-
-
-
-
-
-
diff --git a/public/views/home.html b/public/views/home.html
index f69af5d78..60f6b7c88 100755
--- a/public/views/home.html
+++ b/public/views/home.html
@@ -1,78 +1,74 @@
-
-
+ 404
-
-
+ Oops! You're lost.
-We can not find the {{thing}} you are looking for. -
- If you believe your {{thing}} is correct,
- please report this error.
-
+
\ No newline at end of file
+ 404
+
+
-Oops! You're lost.
+We can not find the {{thing}} you are looking for. +
+
+ If you believe your {{thing}} is correct,
+ please report this error.
+
-
-
-
-
-
-
-
- Blocks
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
+
+
+
+
-
+
+ Blocks
+
+
+
+
+
-
+
-
-
-
-
-
- Transactions
-
-
-
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
-
+
-
-
-
- TX {{t.hash}}
-
- {{t.timestamp | timeDuration }} ago
-
+
+
-
diff --git a/public/views/simple-summary-stats.html b/public/views/simple-summary-stats.html
index 537ef48c7..9d25c6e80 100644
--- a/public/views/simple-summary-stats.html
+++ b/public/views/simple-summary-stats.html
@@ -1,63 +1,63 @@
+
+
+
+
+ Transactions
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+ TX {{t.hash}}
+ {{t.timestamp | timeDuration }} ago
+
-
-
-
-
+
-
-
-
-
- - # - {{stats.blockHeight | number: 0 }} -
- Block Height -
+
+
-
+
+
+
+
+ + # + {{stats.blockHeight | number: 0 }} +
+ Block Height +
-
-
+
-
+
-
-
-
-
- - {{stats.blockTime | number: 2}} s -
- Block Time -
+
+
-
+
+
+
+
+
+ + {{stats.blockTime | number: 2}} s +
+ Block Time
-
-
+
-
+
-
-
-
-
- - {{stats.hashrate | totalDifficulty}}/s -
- Network Hashrate -
+
+
-
+
+
+
+
+ + {{stats.hashrate | totalDifficulty}}/s +
+ Network Hashrate +
-
diff --git a/public/views/site-notes.html b/public/views/site-notes.html
index 808f569a2..34212195c 100644
--- a/public/views/site-notes.html
+++ b/public/views/site-notes.html
@@ -1,7 +1,7 @@
-
+
-
+
-
-
-
-
- - {{stats.difficulty | totalDifficulty}} -
- DIFFICULTY -
+
+
+
+
+
+
+
+
+ + {{stats.difficulty | totalDifficulty}} +
+ DIFFICULTY
-
-
diff --git a/public/views/stats/index.html b/public/views/stats/index.html
index 26a8ead76..c5d87d2ca 100644
--- a/public/views/stats/index.html
+++ b/public/views/stats/index.html
@@ -1,14 +1,13 @@
-
+ This Explorer is under construction
-
+
+
+ Welcome to ETC Explorer!
-
-
-
diff --git a/public/views/summary-stats.html b/public/views/summary-stats.html
deleted file mode 100644
index 78c1a1219..000000000
--- a/public/views/summary-stats.html
+++ /dev/null
@@ -1,105 +0,0 @@
-
-
+
-
-
+
+
+
+
+
-
\ No newline at end of file
diff --git a/public/views/token.html b/public/views/token.html
index 740c2cc8f..c82fcd833 100644
--- a/public/views/token.html
+++ b/public/views/token.html
@@ -1,144 +1,115 @@
-
-
-
-
-
-
-
- - $ - {{stats.usdEtc}} -
- ETC Price -
-
-
-
-
-
-
-
-
-
- ETC/ETH USD Price
- {{stats.usdEtcEth}}%
-
-
-
-
-
-
-
-
- - {{stats.etcHashrate | totalDifficulty}}/s -
- ETC Avg Hashrate -
-
-
-
-
-
-
- ETC/ETH Hashrate
- {{stats.etcEthHash}}%
-
-
-
-
-
-
-
-
- - {{stats.etcDiff | totalDifficulty}} -
- DIFFICULTY -
-
-
-
-
-
-
-
-
-
- ETC/ETH difficulty
- {{stats.etcEthDiff}}%
-
-
-
-
-
-
-
-
- - $ - {{stats.usdEth}} -
- ETH PRICE -
-
-
-
-
-
-
-
-
-
- change
- {{stats.ethChange}}%
-
-
-
-
-
- 1). Otherwise done
- // with this interval object (or not currently working on an interval)
- // -> so move onto the next thing in the blocks array.
- if(typeof blockHashOrNumber === 'object' &&
- (
- (typeof blockHashOrNumber['start'] === 'string' && blockData['hash'] !== blockHashOrNumber['start']) ||
- (typeof blockHashOrNumber['start'] === 'number' && blockData['number'] > blockHashOrNumber['start'])
- )
- ) {
- blockHashOrNumber['end'] = blockData['number'] - 1;
- grabBlock(config, web3, blockHashOrNumber);
- }
- else {
- grabBlock(config, web3, config.blocks.pop());
- }
- }
- else {
- console.log('Error: No hash or number was found for block: ' + blockHashOrNumber);
- process.exit(9);
- }
- }
- });
- }
- else {
- console.log('Error: Aborted due to web3 is not connected when trying to ' +
- 'get block ' + desiredBlockHashOrNumber);
- process.exit(9);
- }
-}
-
-var writeBlockToDB = function(config, blockData) {
- return new Block(blockData).save( function( err, block, count ){
- if ( typeof err !== 'undefined' && err ) {
- if (err.code == 11000) {
- console.log('Skip: Duplicate key ' +
- blockData.number.toString() + ': ' +
- err);
- } else {
- console.log('Error: Aborted due to error on ' +
- 'block number ' + blockData.number.toString() + ': ' +
- err);
- process.exit(9);
- }
- } else {
- if(!('quiet' in config && config.quiet === true)) {
- console.log('DB successfully written for block number ' +
- blockData.number.toString() );
- }
- }
- });
-}
-
-/**
- * Checks if the a record exists for the block number then ->
- * if record exists: abort
- * if record DNE: write a file for the block
- */
-var checkBlockDBExistsThenWrite = function(config, blockData) {
- Block.find({number: blockData.number}, function (err, b) {
- if (!b.length)
- writeBlockToDB(config, blockData);
- else {
- console.log('Aborting because block number: ' + blockData.number.toString() +
- ' already exists in DB.');
- process.exit(9);
- }
-
- })
-}
-
-/**
- Break transactions out of blocks and write to DB
-**/
-var writeTransactionsToDB = function(config, blockData) {
- var bulkOps = [];
- if (blockData.transactions.length > 0) {
- for (d in blockData.transactions) {
- var txData = blockData.transactions[d];
- txData.timestamp = blockData.timestamp;
- txData.value = etherUnits.toEther(new BigNumber(txData.value), 'wei');
- bulkOps.push(txData);
- }
- Transaction.collection.insert(bulkOps, function( err, tx ){
- if ( typeof err !== 'undefined' && err ) {
- if (err.code == 11000) {
- console.log('Skip: Duplicate key ' +
- err);
- } else {
- console.log('Error: Aborted due to error: ' +
- err);
- process.exit(9);
- }
- } else if(!('quiet' in config && config.quiet === true)) {
- console.log('DB successfully written for block ' +
- blockData.transactions.length.toString() );
- }
- });
- }
-}
-
-// load config.json
-var config = { nodeAddr: 'localhost', gethPort: 8545, bulkSize: 100 };
-try {
- var local = require('../config.json');
- _.extend(config, local);
- console.log('config.json found.');
-} catch (error) {
- if (error.code === 'MODULE_NOT_FOUND') {
- var local = require('../config.example.json');
- _.extend(config, local);
- console.log('No config file found. Using default configuration... (config.example.json)');
- } else {
- throw error;
- process.exit(1);
- }
-}
-
-console.log('Connecting ' + config.nodeAddr + ':' + config.gethPort + '...');
-
-var web3 = new Web3(new Web3.providers.HttpProvider('http://' + config.nodeAddr + ':' + config.gethPort.toString()));
-
-// set the default blocks if it's not provided
-if (!('blocks' in config) || !(Array.isArray(config.blocks))) {
- config.blocks = [];
- config.blocks.push({'start': 0, 'end': 'latest'});
-}
-
-console.log('Using configuration:');
-console.log(config);
-
-grabBlocks(config);
diff --git a/tools/richlist.js b/tools/richlist.js
index 7e3c34258..34d535468 100644
--- a/tools/richlist.js
+++ b/tools/richlist.js
@@ -3,21 +3,41 @@
* Tool for calculating richlist by hackyminer
*/
-var _ = require('lodash');
-var Web3 = require('web3');
-var async = require('async');
-var BigNumber = require('bignumber.js');
-var mongoose = require('mongoose');
+const _ = require('lodash');
+const Web3 = require('web3');
+const web3explorer = require('web3-explorer');
+const asyncL = require('async');
+const BigNumber = require('bignumber.js');
+const mongoose = require('mongoose');
-var Account = require('../db.js').Account;
-var Transaction = require('../db.js').Transaction;
-var Block = require('../db.js').Block;
+const { Account } = require('../db.js');
+const { Transaction } = require('../db.js');
+const { Block } = require('../db.js');
const ADDRESS_CACHE_MAX = 10000; // address cache threshold
+/**
+ * Start config for node connection and sync
+ */
+const config = { nodeAddr: 'localhost', 'wsPort': 8546 };
+// load the config.json file
+try {
+ const loaded = require('../config.json');
+ _.extend(config, loaded);
+ console.log('config.json found.');
+} catch (error) {
+ console.log('No config file found.');
+ throw error;
+ process.exit(1);
+}
+
+console.log(`Connecting ${config.nodeAddr}:${config.wsPort}...`);
+// Sets address for RPC WEB3 to connect to, usually your node IP address defaults ot localhost
+const web3 = new Web3(new Web3.providers.WebsocketProvider(`ws://${config.nodeAddr}:${config.wsPort.toString()}`));
+
// RichList for Geth Classic, Geth
function makeRichList(toBlock, blocks, updateCallback) {
- var self = makeRichList;
+ const self = makeRichList;
if (!self.cached) {
self.cached = {};
self.index = 0;
@@ -25,33 +45,35 @@ function makeRichList(toBlock, blocks, updateCallback) {
if (!self.accounts) {
self.accounts = {};
}
- var fromBlock = toBlock - blocks;
+ let fromBlock = toBlock - blocks;
if (fromBlock < 0) {
fromBlock = 0;
}
- console.log('Scan accounts from ' + fromBlock + ' to ' + toBlock + ' ...');
+ if (!('quiet' in config && config.quiet === true)) {
+ console.log(`Scan accounts from ${fromBlock} to ${toBlock} ...`);
+ }
- var ended = false;
+ let ended = false;
if (fromBlock == toBlock) {
ended = true;
}
- async.waterfall([
- function(callback) {
+ asyncL.waterfall([
+ function (callback) {
// Transaction.distinct("from", { blockNumber: { $lte: toBlock, $gt: fromBlock } }, function(err, docs) ...
// faster
// dictint("from")
Transaction.aggregate([
{ $match: { blockNumber: { $lte: toBlock, $gt: fromBlock } } },
- { $group: { _id: '$from' }},
- { $project: { "_id": 1 }}
- ]).exec(function(err, docs) {
+ { $group: { _id: '$from' } },
+ { $project: { '_id': 1 } },
+ ]).exec((err, docs) => {
if (err) {
console.log(err);
return;
}
- docs.forEach(function(doc) {
+ docs.forEach((doc) => {
// check address cache
if (!self.cached[doc._id]) {
self.accounts[doc._id] = { address: doc._id, type: 0 };
@@ -63,18 +85,18 @@ function makeRichList(toBlock, blocks, updateCallback) {
});
callback(null);
});
- }, function(callback) {
+ }, function (callback) {
// dictint("to")
Transaction.aggregate([
{ $match: { blockNumber: { $lte: toBlock, $gt: fromBlock } } },
- { $group: { _id: '$to' }},
- { $project: { "_id": 1 }}
- ]).exec(function(err, docs) {
+ { $group: { _id: '$to' } },
+ { $project: { '_id': 1 } },
+ ]).exec((err, docs) => {
if (err) {
- console.log(err);
- return;
+ console.log(err);
+ return;
}
- docs.forEach(function(doc) {
+ docs.forEach((doc) => {
// to == null case
if (!doc._id) {
return;
@@ -88,18 +110,18 @@ function makeRichList(toBlock, blocks, updateCallback) {
});
callback(null);
});
- }, function(callback) {
+ }, function (callback) {
// aggregate miner's addresses
Block.aggregate([
{ $match: { number: { $lte: toBlock, $gt: fromBlock } } },
- { $group: { _id: '$miner' }},
- { $project: { "_id": 1 }}
- ]).exec(function(err, docs) {
+ { $group: { _id: '$miner' } },
+ { $project: { '_id': 1 } },
+ ]).exec((err, docs) => {
if (err) {
- console.log(err);
- return;
+ console.log(err);
+ return;
}
- docs.forEach(function(doc) {
+ docs.forEach((doc) => {
if (!self.cached[doc._id]) {
self.accounts[doc._id] = { address: doc._id, type: 0 };
self.cached[doc._id] = 1;
@@ -109,92 +131,52 @@ function makeRichList(toBlock, blocks, updateCallback) {
});
callback(null);
});
- }, function(callback) {
- let len = Object.keys(self.accounts).length;
- console.info('* ' + len + ' / ' + (self.index + len) + ' total accounts.');
- if (updateCallback && (len >= 200 || ended)) {
+ }, function (callback) {
+ const len = Object.keys(self.accounts).length;
+ console.info(`* ${len} / ${self.index + len} total accounts.`);
+ if (updateCallback && (len >= 100 || ended)) {
self.index += len;
- console.log("* update " + len + " accounts ...");
+ if (!('quiet' in config && config.quiet === true)) {
+ console.log(`* update ${len} accounts ...`);
+ }
// split accounts into chunks to make proper sized json-rpc batch job.
- var accounts = Object.keys(self.accounts);
- var chunks = [];
+ const accounts = Object.keys(self.accounts);
+ const chunks = [];
// about ~1000 `eth_getBalance` json rpc calls are possible in one json-rpc batchjob.
- while (accounts.length > 800) {
- var chunk = accounts.splice(0, 500);
+ while (accounts.length > 200) {
+ const chunk = accounts.splice(0, 100);
chunks.push(chunk);
}
if (accounts.length > 0) {
chunks.push(accounts);
}
- async.eachSeries(chunks, function(chunk, outerCallback) {
- var data = {};
- // get account type + getBalance using json rpc batch job
- async.waterfall([
- function(innerCallback) {
- var batch = web3.createBatch();
-
- for (var i = 0; i < chunk.length; i++) {
- var account = chunk[i];
- batch.add(web3.eth.getCode.request(account));
- }
-
- batch.requestManager.sendBatch(batch.requests, function(err, results) {
+ asyncL.eachSeries(chunks, (chunk, outerCallback) => {
+ const data = {};
+ asyncL.eachSeries(chunk, (account, eachCallback) => {
+ web3.eth.getCode(account, (err, code) => {
if (err) {
- console.log("ERROR: fail to getCode batch job:", err);
- innerCallback(err);
- return;
+ return eachCallback(err);
}
- results = results || [];
- batch.requests.map(function (request, index) {
- return results[index] || {};
- }).forEach(function (result, i) {
- var code = batch.requests[i].format ? batch.requests[i].format(result.result) : result.result;
- var account = batch.requests[i].params[0];
- data[account] = { address: account };
- if (code.length > 2) {
- // 0: normal address, 1: contract
- data[account].type = 1; // contract case
- } else if (self.accounts[account]) {
- data[account].type = self.accounts[account].type;
- }
-
- });
- innerCallback(null, data);
- });
- }, function(data, innerCallback) {
- // batch rpc job
- var batch = web3.createBatch();
- for (var i = 0; i < chunk.length; i++) {
- var account = chunk[i];
- batch.add(web3.eth.getBalance.request(account));
- }
-
- batch.requestManager.sendBatch(batch.requests, function(err, results) {
- if (err) {
- console.log("ERROR: fail to getBalance batch job:", err);
- innerCallback(err);
- return;
+ data[account] = { address: account };
+ if (code.length > 2) {
+ data[account].type = 1; // contract type
+ } else if (self.accounts[account]) {
+ data[account].type = self.accounts[account].type;
}
- results = results || [];
- batch.requests.map(function (request, index) {
- return results[index] || {};
- }).forEach(function (result, i) {
- var balance = batch.requests[i].format ? batch.requests[i].format(result.result) : result.result;
-
- let ether;
- if (typeof balance === 'object') {
- ether = parseFloat(balance.div(1e18).toString());
- } else {
- ether = balance / 1e18;
+
+ web3.eth.getBalance(account, (err, balance) => {
+ if (err) {
+ return eachCallback(err);
}
- data[batch.requests[i].params[0]].balance = ether;
+
+ data[account].balance = parseFloat(web3.utils.fromWei(balance, 'ether'));
+ eachCallback();
});
- innerCallback(null, data);
});
- }], function(err) {
+ }, (err) => {
if (err) {
return outerCallback(err);
}
@@ -204,22 +186,21 @@ function makeRichList(toBlock, blocks, updateCallback) {
outerCallback();
});
- }, function(error) {
+ }, (error) => {
if (error) {
- console.log("WARN: fail to call getBalance() " + error);
+ console.log(`WARN: fail to call getBalance() ${error}`);
}
// reset accounts
self.accounts = {};
// check the size of the cached accounts
if (Object.keys(self.cached).length > ADDRESS_CACHE_MAX) {
- console.info("** reduce cached accounts ...");
- var sorted = Object.keys(self.cached).sort(function(a, b) {
- return self.cached[b] - self.cached[a]; // descend order
- });
- var newcached = {};
- var reduce = parseInt(ADDRESS_CACHE_MAX * 0.6);
- for (var j = 0; j < reduce; j++) {
+ console.info('** reduce cached accounts ...');
+ const sorted = Object.keys(self.cached).sort((a, b) => self.cached[b] - self.cached[a], // descend order
+ );
+ const newcached = {};
+ const reduce = parseInt(ADDRESS_CACHE_MAX * 0.6);
+ for (let j = 0; j < reduce; j++) {
newcached[sorted[j]] = self.cached[sorted[j]];
}
self.cached = newcached;
@@ -230,17 +211,17 @@ function makeRichList(toBlock, blocks, updateCallback) {
} else {
callback(null);
}
- }
- ], function(error) {
+ },
+ ], (error) => {
if (error) {
console.log(error);
return;
}
if (ended) {
- console.log("**DONE**");
+ console.log('**DONE**');
} else {
- setTimeout(function() {
+ setTimeout(() => {
makeRichList(fromBlock, blocks, updateCallback);
}, 300);
}
@@ -248,102 +229,65 @@ function makeRichList(toBlock, blocks, updateCallback) {
}
function makeParityRichList(number, offset, blockNumber, updateCallback) {
- var self = makeParityRichList;
+ const self = makeParityRichList;
if (!self.index) {
self.index = 0;
}
number = number || 100;
offset = offset || null;
- async.waterfall([
- function(callback) {
- web3.parity.listAccounts(number, offset, blockNumber, function(err, result) {
+ asyncL.waterfall([
+ function (callback) {
+ web3.parity.listAccounts(number, offset, blockNumber, (err, result) => {
callback(err, result);
});
- }, function(accounts, callback) {
+ }, function (accounts, callback) {
if (!accounts) {
return callback({
error: true,
- message: "No accounts found. Please restart Parity with --fat-db=on option to enable FatDB."
+ message: 'No accounts found. Please restart Parity with --fat-db=on option to enable FatDB.',
});
}
if (accounts.length === 0) {
return callback({
error: true,
- message: "No more accounts found."
+ message: 'No more accounts found.',
});
}
- var lastAccount = accounts[accounts.length - 1];
- var data = {};
-
- // get account type + getBalance using json rpc batch job
- async.waterfall([
- function(innerCallback) {
- var batch = web3.createBatch();
-
- for (var i = 0; i < accounts.length; i++) {
- var account = accounts[i];
- batch.add(web3.eth.getCode.request(account));
- }
+ const lastAccount = accounts[accounts.length - 1];
+ const data = {};
- batch.requestManager.sendBatch(batch.requests, function(err, results) {
+ // Please see https://github.com/gobitfly/etherchain-light by gobitfly
+ asyncL.eachSeries(accounts, (account, eachCallback) => {
+ web3.eth.getCode(account, (err, code) => {
if (err) {
- console.log("ERROR: fail to getCode batch job:", err);
- innerCallback(err);
- return;
+ console.log(`ERROR: fail to getCode(${account})`);
+ return eachCallback(err);
}
- results = results || [];
- batch.requests.map(function (request, index) {
- return results[index] || {};
- }).forEach(function (result, i) {
- var code = batch.requests[i].format ? batch.requests[i].format(result.result) : result.result;
- var account = batch.requests[i].params[0];
- data[account] = { address: account };
- if (code.length > 2) {
- // 0: normal address, 1: contract
- data[account].type = 1; // contract case
- }
-
- });
- innerCallback(null, data);
- });
- }, function(data, innerCallback) {
- // batch rpc job
- var batch = web3.createBatch();
- for (var i = 0; i < accounts.length; i++) {
- var account = accounts[i];
- batch.add(web3.eth.getBalance.request(account));
- }
-
- batch.requestManager.sendBatch(batch.requests, function(err, results) {
- if (err) {
- console.log("ERROR: fail to getBalance batch job:", err);
- innerCallback(err);
- return;
+ data[account] = {};
+ data[account].address = account;
+ if (code.length > 2) {
+ // 0: normal address, 1: contract
+ data[account].type = 1; //contract case
}
- results = results || [];
- batch.requests.map(function (request, index) {
- return results[index] || {};
- }).forEach(function (result, i) {
- var balance = batch.requests[i].format ? batch.requests[i].format(result.result) : result.result;
-
- let ether;
- if (typeof balance === 'object') {
- ether = parseFloat(balance.div(1e18).toString());
- } else {
- ether = balance / 1e18;
+
+ web3.eth.getBalance(account, (err, balance) => {
+ if (err) {
+ console.log(`ERROR: fail to getBalance(${account})`);
+ return eachCallback(err);
}
- data[batch.requests[i].params[0]].balance = ether;
+
+ data[account].balance = parseFloat(web3.utils.fromWei(balance, 'ether'));
+ eachCallback();
});
- innerCallback(null, data);
});
- }], function(err) {
+ }, (err) => {
callback(err, data, lastAccount);
});
- }
- ], function(error, accounts, lastAccount) {
+ },
+ ], (error, accounts, lastAccount) => {
if (error) {
console.log(error);
process.exit(9);
@@ -352,13 +296,15 @@ function makeParityRichList(number, offset, blockNumber, updateCallback) {
//console.log(JSON.stringify(accounts, null, 2));
offset = lastAccount;
- let j = Object.keys(accounts).length;
+ const j = Object.keys(accounts).length;
self.index += j;
- console.log(' * ' + j + ' / ' + self.index + ' accounts, offset = ' + offset);
+ if (!('quiet' in config && config.quiet === true)) {
+ console.log(` * ${j} / ${self.index} accounts, offset = ${offset}`);
+ }
if (updateCallback) {
updateCallback(accounts, blockNumber);
}
- setTimeout(function() {
+ setTimeout(() => {
makeParityRichList(number, lastAccount, blockNumber, updateCallback);
}, 300);
});
@@ -367,33 +313,33 @@ function makeParityRichList(number, offset, blockNumber, updateCallback) {
/**
* Write accounts to DB
*/
-var updateAccounts = function(accounts, blockNumber) {
+const updateAccounts = function (accounts, blockNumber) {
// prepare
- var bulk = Object.keys(accounts).map(function(j) {
- let account = accounts[j];
+ const bulk = Object.keys(accounts).map((j) => {
+ const account = accounts[j];
account.blockNumber = blockNumber;
return account;
});
bulkInsert(bulk);
-}
+};
-var bulkInsert = function(bulk) {
+var bulkInsert = function (bulk) {
if (!bulk.length) {
return;
}
- var localbulk;
+ let localbulk;
if (bulk.length > 300) {
localbulk = bulk.splice(0, 200);
} else {
localbulk = bulk.splice(0, 300);
}
- Account.collection.insert(localbulk, function(error, data) {
+ Account.collection.insert(localbulk, (error, data) => {
if (error) {
if (error.code == 11000) {
// For already exists case, try upsert method.
- async.eachSeries(localbulk, function(item, eachCallback) {
+ asyncL.eachSeries(localbulk, (item, eachCallback) => {
// upsert accounts
item._id = undefined;
delete item._id; // remove _id field
@@ -402,161 +348,133 @@ var bulkInsert = function(bulk) {
item.type = undefined;
delete item.type;
}
- Account.collection.update({ "address": item.address }, { $set: item }, { upsert: true }, function(err, updated) {
+ Account.collection.update({ 'address': item.address }, { $set: item }, { upsert: true }, (err, updated) => {
if (err) {
if (!config.quiet) {
- console.log('WARN: Duplicate DB key : ' + error);
- console.log('ERROR: Fail to update account: ' + err);
+ console.log(`WARN: Duplicate DB key : ${error}`);
+ console.log(`ERROR: Fail to update account: ${err}`);
}
return eachCallback(err);
}
eachCallback();
});
- }, function(err) {
+ }, (err) => {
if (err) {
if (err.code != 11000) {
- console.log('ERROR: Aborted due to error: ' + JSON.stringify(err, null, 2));
+ console.log(`ERROR: Aborted due to error: ${JSON.stringify(err, null, 2)}`);
process.exit(9);
return;
- } else {
- console.log('WARN: Fail to upsert (ignore) ' + err);
}
+ console.log(`WARN: Fail to upsert (ignore) ${err}`);
+
+ }
+ if (!('quiet' in config && config.quiet === true)) {
+ console.log(`* ${localbulk.length} accounts successfully updated.`);
}
- console.log('* ' + localbulk.length + ' accounts successfully updated.');
if (bulk.length > 0) {
- setTimeout(function() {
+ setTimeout(() => {
bulkInsert(bulk);
}, 200);
}
});
} else {
- console.log('Error: Aborted due to error on DB: ' + error);
+ console.log(`Error: Aborted due to error on DB: ${error}`);
process.exit(9);
}
} else {
- console.log('* ' + data.insertedCount + ' accounts successfully inserted.');
+ if (!('quiet' in config && config.quiet === true)) {
+ console.log(`* ${data.insertedCount} accounts successfully inserted.`);
+ }
if (bulk.length > 0) {
- setTimeout(function() {
+ setTimeout(() => {
bulkInsert(bulk);
}, 200);
}
}
});
-}
+};
function prepareJsonAddress(json, defaultType = 0) {
- var accounts = {};
+ const accounts = {};
if (json.accounts) {
// genesis.json style
- Object.keys(json.accounts).forEach(function(account) {
- var key = account.toLowerCase();
- key = '0x' + key.replace(/^0x/, '');
- accounts[key] = { address: key, type: type };
+ Object.keys(json.accounts).forEach((account) => {
+ let key = account.toLowerCase();
+ key = `0x${key.replace(/^0x/, '')}`;
+ accounts[key] = { address: key, type };
});
} else if (typeof json === 'object') {
- Object.keys(json).forEach(function(account) {
- var key = account.toLowerCase();
- key = '0x' + key.replace(/^0x/, '');
- var type = defaultType;
+ Object.keys(json).forEach((account) => {
+ let key = account.toLowerCase();
+ key = `0x${key.replace(/^0x/, '')}`;
+ let type = defaultType;
if (json[account].type) {
type = json[account].type;
}
- accounts[key] = { address: key, type: type };
+ accounts[key] = { address: key, type };
});
} else { // normal array
- json.forEach(function(account) {
- var key = account.toLowerCase();
- key = '0x' + key.replace(/^0x/, '');
- accounts[key] = { address: key, type: type };
+ json.forEach((account) => {
+ let key = account.toLowerCase();
+ key = `0x${key.replace(/^0x/, '')}`;
+ accounts[key] = { address: key, type };
});
}
return accounts;
}
function readJsonAccounts(json, blockNumber, callback, defaultType = 0) {
- var data = prepareJsonAddress(json, defaultType);
- var accounts = Object.keys(data);
- console.log("* update " + accounts.length + " genesis accounts...");
-
- // batch rpc job
- var batch = web3.createBatch();
- // normally, the request size of batch getBalance() of all accounts is not bigger than 128kB.
- // simply getBalance at once using rpc batch job.
- for (var i = 0; i < accounts.length; i++) {
- var account = accounts[i];
- batch.add(web3.eth.getBalance.request(account));
- }
+ const data = prepareJsonAddress(json, defaultType);
+ const accounts = Object.keys(data);
+ console.log(`* update ${accounts.length} genesis accounts...`);
+ async.eachSeries(accounts, (account, eachCallback) => {
+ web3.eth.getBalance(account, (err, balance) => {
+ if (err) {
+ console.log(`ERROR: fail to getBalance(${account})`);
+ return eachCallback(err);
+ }
- batch.requestManager.sendBatch(batch.requests, function(err, results) {
+ data[account].balance = parseFloat(web3.utils.fromWei(balance, 'ether'));
+ eachCallback();
+ });
+ }, (err) => {
if (err) {
- console.log("ERROR: fail to getBalance batch job:", err);
+ console.log(`ERROR: fail to getBalance()${err}`);
return;
}
- results = results || [];
- batch.requests.map(function (request, index) {
- return results[index] || {};
- }).forEach(function (result, i) {
- var balance = batch.requests[i].format ? batch.requests[i].format(result.result) : result.result;
-
- let ether;
- if (typeof balance === 'object') {
- ether = parseFloat(balance.div(1e18).toString());
- } else {
- ether = balance / 1e18;
- }
- data[batch.requests[i].params[0]].balance = ether;
- });
callback(data, blockNumber);
});
}
-/**
- * Start config for node connection and sync
- */
-var config = { nodeAddr: 'localhost', 'gethPort': 8545 };
-// load the config.json file
-try {
- var loaded = require('../config.json');
- _.extend(config, loaded);
- console.log('config.json found.');
-} catch (error) {
- console.log('No config file found.');
- throw error;
- process.exit(1);
-}
-
// temporary turn on some debug
//config.quiet = false;
//mongoose.set('debug', true);
-console.log('Connecting ' + config.nodeAddr + ':' + config.gethPort + '...');
+async function startSync() {
+ const latestBlock = await web3.eth.getBlockNumber();
+ const nodeInfo = await web3.eth.getNodeInfo();
-var web3 = new Web3(new Web3.providers.HttpProvider('http://' + config.nodeAddr + ':' + config.gethPort.toString()));
+ console.log(`Node version = ${nodeInfo}`);
-var useParity = false;
-if (!process.env.NOPARITY
- && web3.version.node.split('/')[0].toLowerCase().includes('parity')) {
- // load parity extension
- web3 = require("../lib/trace.js")(web3);
- useParity = true;
-}
-
-var latestBlock = web3.eth.blockNumber;
-
-// run
-console.log("* latestBlock = " + latestBlock);
-
-if (useParity) {
- makeParityRichList(500, null, latestBlock, updateAccounts);
-} else {
- // load genesis account
- if (config.settings && config.settings.genesisAddress) {
- try {
- var genesis = require('../' + config.settings.genesisAddress);
- readJsonAccounts(genesis, latestBlock, updateAccounts);
- } catch (e) {
- console.log("Error: Fail to load genesis address (ignore)");
+ if (nodeInfo.split('/')[0].toLowerCase().includes('parity')) {
+ console.log('Web3 has detected parity node configuration');
+ web3explorer(web3);
+ console.log(`* latestBlock = ${latestBlock}`);
+ makeParityRichList(500, null, latestBlock, updateAccounts);
+ } else {
+ // load genesis account
+ if (config.settings && config.settings.genesisAddress) {
+ try {
+ const genesis = require(`../${config.settings.genesisAddress}`);
+ readJsonAccounts(genesis, latestBlock, updateAccounts);
+ } catch (e) {
+ console.log('Error: Fail to load genesis address (ignore)');
+ }
+ }
+ if ('quiet' in config && config.quiet === true) {
+ console.log('Quiet mode enabled');
}
+ makeRichList(latestBlock, 500, updateAccounts);
}
- makeRichList(latestBlock, 500, updateAccounts);
}
+startSync();
diff --git a/tools/stats.js b/tools/stats.js
index 2c912ed25..d92344f17 100644
--- a/tools/stats.js
+++ b/tools/stats.js
@@ -2,120 +2,140 @@
Tool for calculating block stats
*/
-var _ = require('lodash');
-var Web3 = require('web3');
+const _ = require('lodash');
+const Web3 = require('web3');
-var mongoose = require( 'mongoose' );
-var BlockStat = require( '../db.js' ).BlockStat;
+const mongoose = require('mongoose');
+const { BlockStat } = require('../db.js');
-var updateStats = function(range, interval, rescan) {
- var latestBlock = web3.eth.blockNumber;
-
- interval = Math.abs(parseInt(interval));
- if (!range) {
- range = 1000;
- }
- range *= interval;
- if (interval >= 10) {
- latestBlock -= latestBlock % interval;
- }
- getStats(web3, latestBlock, null, latestBlock - range, interval, rescan);
+// load config.json
+const config = { nodeAddr: 'localhost', wsPort: 8546, bulkSize: 100 };
+try {
+ var local = require('../config.json');
+ _.extend(config, local);
+ console.log('config.json found.');
+} catch (error) {
+ if (error.code === 'MODULE_NOT_FOUND') {
+ var local = require('../config.example.json');
+ _.extend(config, local);
+ console.log('No config file found. Using default configuration... (config.example.json)');
+ } else {
+ throw error;
+ process.exit(1);
+ }
}
+console.log(`Connecting ${config.nodeAddr}:${config.wsPort}...`);
+// Sets address for RPC WEB3 to connect to, usually your node IP address defaults ot localhost
+const web3 = new Web3(new Web3.providers.WebsocketProvider(`ws://${config.nodeAddr}:${config.wsPort.toString()}`));
+if ('quiet' in config && config.quiet === true) {
+ console.log('Quiet mode enabled');
+}
-var getStats = function(web3, blockNumber, nextBlock, endNumber, interval, rescan) {
- if (endNumber < 0)
- endNumber = 0;
- if (blockNumber <= endNumber) {
- if (rescan) {
- process.exit(9);
- }
- return;
- }
-
- if(web3.isConnected()) {
-
- web3.eth.getBlock(blockNumber, true, function(error, blockData) {
- if(error) {
- console.log('Warning: error on getting block with hash/number: ' +
- blockNumber + ': ' + error);
- }
- else if(blockData == null) {
- console.log('Warning: null block data received from the block with hash/number: ' +
- blockNumber);
- }
- else {
- if (nextBlock)
- checkBlockDBExistsThenWrite(web3, blockData, nextBlock, endNumber, interval, rescan);
- else
- checkBlockDBExistsThenWrite(web3, blockData, null, endNumber, interval, rescan);
- }
- });
- } else {
- console.log('Error: Aborted due to web3 is not connected when trying to ' +
- 'get block ' + blockNumber);
- process.exit(9);
+const updateStats = async (range, interval, rescan) => {
+ let latestBlock = await web3.eth.getBlockNumber();
+
+ interval = Math.abs(parseInt(interval));
+ if (!range) {
+ range = 1000;
+ }
+ range *= interval;
+ if (interval >= 10) {
+ latestBlock -= latestBlock % interval;
+ }
+ getStats(web3, latestBlock, null, latestBlock - range, interval, rescan);
+};
+
+var getStats = function (web3, blockNumber, nextBlock, endNumber, interval, rescan) {
+ if (endNumber < 0) endNumber = 0;
+ if (blockNumber <= endNumber) {
+ if (rescan) {
+ process.exit(9);
}
-}
+ return;
+ }
+
+ if (web3.eth.net.isListening()) {
+
+ web3.eth.getBlock(blockNumber, true, (error, blockData) => {
+ if (error) {
+ console.log(`Warning: error on getting block with hash/number: ${
+ blockNumber}: ${error}`);
+ } else if (blockData == null) {
+ console.log(`Warning: null block data received from the block with hash/number: ${
+ blockNumber}`);
+ } else {
+ if (nextBlock) checkBlockDBExistsThenWrite(web3, blockData, nextBlock, endNumber, interval, rescan);
+ else checkBlockDBExistsThenWrite(web3, blockData, null, endNumber, interval, rescan);
+ }
+ });
+ } else {
+ console.log(`${'Error: Aborted due to web3 is not connected when trying to ' +
+ 'get block '}${blockNumber}`);
+ process.exit(9);
+ }
+};
/**
- * Checks if the a record exists for the block number
+ * Checks if the a record exists for the block number
* if record exists: abort
* if record DNE: write a file for the block
*/
-var checkBlockDBExistsThenWrite = function(web3, blockData, nextBlock, endNumber, interval, rescan) {
- BlockStat.find({number: blockData.number}, function (err, b) {
- if (!b.length && nextBlock) {
- // calc hashrate, txCount, blocktime, uncleCount
- var stat = {
- "number": blockData.number,
- "timestamp": blockData.timestamp,
- "difficulty": blockData.difficulty,
- "txCount": blockData.transactions.length,
- "gasUsed": blockData.gasUsed,
- "gasLimit": blockData.gasLimit,
- "miner": blockData.miner,
- "blockTime": (nextBlock.timestamp - blockData.timestamp) / (nextBlock.number - blockData.number),
- "uncleCount": blockData.uncles.length
- }
- new BlockStat(stat).save( function( err, s, count ){
- console.log(s)
- if ( typeof err !== 'undefined' && err ) {
- console.log('Error: Aborted due to error on ' +
- 'block number ' + blockData.number.toString() + ': ' +
- err);
- process.exit(9);
- } else {
- console.log('DB successfully written for block number ' +
- blockData.number.toString() );
- getStats(web3, blockData.number - interval, blockData, endNumber, interval, rescan);
- }
- });
+var checkBlockDBExistsThenWrite = function (web3, blockData, nextBlock, endNumber, interval, rescan) {
+ BlockStat.find({ number: blockData.number }, (err, b) => {
+ if (!b.length && nextBlock) {
+ // calc hashrate, txCount, blocktime, uncleCount
+ const stat = {
+ 'number': blockData.number,
+ 'timestamp': blockData.timestamp,
+ 'difficulty': blockData.difficulty,
+ 'txCount': blockData.transactions.length,
+ 'gasUsed': blockData.gasUsed,
+ 'gasLimit': blockData.gasLimit,
+ 'miner': blockData.miner,
+ 'blockTime': (nextBlock.timestamp - blockData.timestamp) / (nextBlock.number - blockData.number),
+ 'uncleCount': blockData.uncles.length,
+ };
+ new BlockStat(stat).save((err, s, count) => {
+ if (!('quiet' in config && config.quiet === true)) {
+ console.log(s);
+ }
+ if (typeof err !== 'undefined' && err) {
+ console.log(`${'Error: Aborted due to error on ' + 'block number '}${blockData.number.toString()}: ${
+ err}`);
+ process.exit(9);
} else {
- if (rescan || !nextBlock) {
- getStats(web3, blockData.number - interval, blockData, endNumber, interval, rescan);
- if (nextBlock) {
- console.log('WARN: block number: ' + blockData.number.toString() + ' already exists in DB.');
- }
- } else {
- console.error('Aborting because block number: ' + blockData.number.toString() +
- ' already exists in DB.');
- return;
- }
+ if (!('quiet' in config && config.quiet === true)) {
+ console.log(`DB successfully written for block number ${blockData.number.toString()}`);
+ }
+ getStats(web3, blockData.number - interval, blockData, endNumber, interval, rescan);
+ }
+ });
+ } else {
+ if (rescan || !nextBlock) {
+ getStats(web3, blockData.number - interval, blockData, endNumber, interval, rescan);
+ if (nextBlock) {
+ if (!('quiet' in config && config.quiet === true)) {
+ console.log(`WARN: block number: ${blockData.number.toString()} already exists in DB.`);
+ }
+ }
+ } else {
+ if (!('quiet' in config && config.quiet === true)) {
+ console.error(`Aborting because block number: ${blockData.number.toString()} already exists in DB.`);
}
- })
-}
+ }
+ }
-/** On Startup **/
-// geth --rpc --rpcaddr "localhost" --rpcport "8545" --rpcapi "eth,net,web3"
+ });
+};
-var minutes = 1;
+const minutes = 1;
statInterval = minutes * 60 * 1000;
-var rescan = false; /* rescan: true - rescan range */
-var range = 1000;
-var interval = 100;
+let rescan = false; /* rescan: true - rescan range */
+let range = 1000;
+let interval = 100;
/**
* RESCAN=1000:100000 means interval;range
@@ -124,50 +144,29 @@ var interval = 100;
* RESCAN=1000:100000 node tools/stats.js
*/
if (process.env.RESCAN) {
- var tmp = process.env.RESCAN.split(/:/);
- if (tmp.length > 1) {
- interval = Math.abs(parseInt(tmp[0]));
- if (tmp[1]) {
- range = Math.abs(parseInt(tmp[1]));
- }
- }
- var i = interval;
- var j = 0;
- for (var j = 0; i >= 10; j++) {
- i = parseInt(i / 10);
- }
- interval = Math.pow(10, j);
- console.log('Selected interval = ' + interval);
-
- rescan = true;
-}
-
-// load config.json
-var config = { nodeAddr: 'localhost', gethPort: 8545, bulkSize: 100 };
-try {
- var local = require('../config.json');
- _.extend(config, local);
- console.log('config.json found.');
-} catch (error) {
- if (error.code === 'MODULE_NOT_FOUND') {
- var local = require('../config.example.json');
- _.extend(config, local);
- console.log('No config file found. Using default configuration... (config.example.json)');
- } else {
- throw error;
- process.exit(1);
+ const tmp = process.env.RESCAN.split(/:/);
+ if (tmp.length > 1) {
+ interval = Math.abs(parseInt(tmp[0]));
+ if (tmp[1]) {
+ range = Math.abs(parseInt(tmp[1]));
}
+ }
+ let i = interval;
+ var j = 0;
+ for (var j = 0; i >= 10; j++) {
+ i = parseInt(i / 10);
+ }
+ interval = Math.pow(10, j);
+ console.log(`Selected interval = ${interval}`);
+
+ rescan = true;
}
-console.log('Connecting ' + config.nodeAddr + ':' + config.gethPort + '...');
-
-var web3 = new Web3(new Web3.providers.HttpProvider('http://' + config.nodeAddr + ':' + config.gethPort.toString()));
-
// run
updateStats(range, interval, rescan);
if (!rescan) {
- setInterval(function() {
- updateStats(range, interval);
- }, statInterval);
+ setInterval(() => {
+ updateStats(range, interval);
+ }, statInterval);
}
diff --git a/tools/sync.js b/tools/sync.js
index b4c5daa35..80f22d61c 100644
--- a/tools/sync.js
+++ b/tools/sync.js
@@ -4,18 +4,28 @@ Version: .0.0.2
This file will start syncing the blockchain from the node address you provide in the conf.json file.
Please read the README in the root directory that explains the parameters of this code
*/
-require( '../db.js' );
-var etherUnits = require("../lib/etherUnits.js");
-var BigNumber = require('bignumber.js');
-var _ = require('lodash');
+require('../db.js');
+const BigNumber = require('bignumber.js');
+const _ = require('lodash');
-var async = require('async');
-var Web3 = require('web3');
+const asyncL = require('async');
+const Web3 = require('web3');
-var mongoose = require( 'mongoose' );
-var Block = mongoose.model( 'Block' );
-var Transaction = mongoose.model( 'Transaction' );
-var Account = mongoose.model( 'Account' );
+const ERC20ABI = require('human-standard-token-abi');
+
+const fetch = require('node-fetch');
+
+const mongoose = require('mongoose');
+const etherUnits = require('../lib/etherUnits.js');
+const { Market } = require('../db.js');
+
+const Block = mongoose.model('Block');
+const Transaction = mongoose.model('Transaction');
+const Account = mongoose.model('Account');
+const Contract = mongoose.model('Contract');
+const TokenTransfer = mongoose.model('TokenTransfer');
+
+const ERC20_METHOD_DIC = { '0xa9059cbb': 'transfer', '0xa978501e': 'transferFrom' };
function normalizeTX(txData, blockData) {
var tx = {
@@ -54,137 +64,112 @@ function normalizeTX(txData, blockData) {
}
/**
- //Just listen for latest blocks and sync from the start of the app.
+ Start config for node connection and sync
**/
-var listenBlocks = function(config) {
- if (web3.eth.syncing) {
- console.log('Info: waiting until syncing finished... (currentBlock is #' + web3.eth.syncing.currentBlock + ')');
- setTimeout(function() { listenBlocks(config); }, 10000);
- return;
+/**
+ * nodeAddr: node address
+ * wsPort: rpc port
+ * bulkSize: size of array in block to use bulk operation
+ */
+// load config.json
+const config = { nodeAddr: 'localhost', wsPort: 8546, bulkSize: 100 };
+try {
+ var local = require('../config.json');
+ _.extend(config, local);
+ console.log('config.json found.');
+} catch (error) {
+ if (error.code === 'MODULE_NOT_FOUND') {
+ var local = require('../config.example.json');
+ _.extend(config, local);
+ console.log('No config file found. Using default configuration... (config.example.json)');
+ } else {
+ throw error;
+ process.exit(1);
}
- var newBlocks = web3.eth.filter("latest");
- newBlocks.watch(function (error,latestBlock) {
- if(error) {
- console.log('Error: ' + error);
- newBlocks.stopWatching();
- console.log('Retry to listen...');
- listenBlocks(config);
- } else if (latestBlock == null) {
- console.log('Warning: null block hash');
- } else {
- console.log('Found new block: ' + latestBlock);
- if(web3.isConnected()) {
- web3.eth.getBlock(latestBlock, true, function(error,blockData) {
- if(error) {
- console.log('Warning: error on getting block with hash/number: ' + latestBlock + ': ' + error);
- }else if(blockData == null) {
- console.log('Warning: null block data received from the block with hash/number: ' + latestBlock);
- }else{
- writeBlockToDB(config, blockData, true);
- writeTransactionsToDB(config, blockData, true);
- }
- });
- }else{
- console.log('Error: Web3 connection time out trying to get block ' + latestBlock + ' retrying connection now');
- listenBlocks(config);
- }
- }
- });
}
-/**
- If full sync is checked this function will start syncing the block chain from lastSynced param see README
-**/
-var syncChain = function(config, nextBlock){
- if(web3.isConnected()) {
- if (web3.eth.syncing) {
- console.log('Info: waiting until syncing finished... (currentBlock is #' + web3.eth.syncing.currentBlock + ')');
- setTimeout(function() { syncChain(config, nextBlock); }, 10000);
- return;
- }
- if (typeof nextBlock === 'undefined') {
- prepareSync(config, function(error, startBlock) {
- if(error) {
- console.log('ERROR: error: ' + error);
- return;
- }
- syncChain(config, startBlock);
- });
- return;
- }
+console.log(`Connecting ${config.nodeAddr}:${config.wsPort}...`);
+// Sets address for RPC WEB3 to connect to, usually your node IP address defaults ot localhost
+const web3 = new Web3(new Web3.providers.WebsocketProvider(`ws://${config.nodeAddr}:${config.wsPort.toString()}`));
- if( nextBlock == null ) {
- console.log('nextBlock is null');
- return;
- } else if( nextBlock < config.startBlock ) {
- writeBlockToDB(config, null, true);
- writeTransactionsToDB(config, null, true);
- console.log('*** Sync Finsihed ***');
- config.syncAll = false;
- return;
- }
+const normalizeTX = async (txData, receipt, blockData) => {
+ const tx = {
+ blockHash: txData.blockHash,
+ blockNumber: txData.blockNumber,
+ from: txData.from.toLowerCase(),
+ hash: txData.hash.toLowerCase(),
+ value: etherUnits.toEther(new BigNumber(txData.value), 'wei'),
+ nonce: txData.nonce,
+ r: txData.r,
+ s: txData.s,
+ v: txData.v,
+ gas: txData.gas,
+ gasUsed: receipt.gasUsed,
+ gasPrice: String(txData.gasPrice),
+ input: txData.input,
+ transactionIndex: txData.transactionIndex,
+ timestamp: blockData.timestamp,
+ };
- var count = config.bulkSize;
- while(nextBlock >= config.startBlock && count > 0) {
- web3.eth.getBlock(nextBlock, true, function(error,blockData) {
- if(error) {
- console.log('Warning: error on getting block with hash/number: ' + nextBlock + ': ' + error);
- }else if(blockData == null) {
- console.log('Warning: null block data received from the block with hash/number: ' + nextBlock);
- }else{
- writeBlockToDB(config, blockData);
- writeTransactionsToDB(config, blockData);
- }
- });
- nextBlock--;
- count--;
- }
+ if (receipt.status) {
+ tx.status = receipt.status;
+ }
- setTimeout(function() { syncChain(config, nextBlock); }, 500);
- }else{
- console.log('Error: Web3 connection time out trying to get block ' + nextBlock + ' retrying connection now');
- syncChain(config, nextBlock);
+ if (txData.to) {
+ tx.to = txData.to.toLowerCase();
+ return tx;
+ } else if (txData.creates) {
+ tx.creates = txData.creates.toLowerCase();
+ return tx;
+ } else {
+ tx.creates = receipt.contractAddress.toLowerCase();
+ return tx;
}
-}
+};
+
/**
Write the whole block object to DB
**/
-var writeBlockToDB = function(config, blockData, flush) {
- var self = writeBlockToDB;
+var writeBlockToDB = function (config, blockData, flush) {
+ const self = writeBlockToDB;
if (!self.bulkOps) {
self.bulkOps = [];
}
if (blockData && blockData.number >= 0) {
self.bulkOps.push(new Block(blockData));
- console.log('\t- block #' + blockData.number.toString() + ' inserted.');
+ if (!('quiet' in config && config.quiet === true)) {
+ console.log(`\t- block #${blockData.number.toString()} inserted.`);
+ }
}
- if(flush && self.bulkOps.length > 0 || self.bulkOps.length >= config.bulkSize) {
- var bulk = self.bulkOps;
+ if (flush && self.bulkOps.length > 0 || self.bulkOps.length >= config.bulkSize) {
+ const bulk = self.bulkOps;
self.bulkOps = [];
- if(bulk.length == 0) return;
+ if (bulk.length === 0) return;
- Block.collection.insert(bulk, function( err, blocks ){
- if ( typeof err !== 'undefined' && err ) {
- if (err.code == 11000) {
- if(!('quiet' in config && config.quiet === true)) {
- console.log('Skip: Duplicate DB key : ' +err);
+ Block.collection.insert(bulk, (err, blocks) => {
+ if (typeof err !== 'undefined' && err) {
+ if (err.code === 11000) {
+ if (!('quiet' in config && config.quiet === true)) {
+ console.log(`Skip: Duplicate DB key : ${err}`);
}
- }else{
- console.log('Error: Aborted due to error on DB: ' + err);
+ } else {
+ console.log(`Error: Aborted due to error on DB: ${err}`);
process.exit(9);
}
- }else{
- console.log('* ' + blocks.insertedCount + ' blocks successfully written.');
+ } else {
+ if (!('quiet' in config && config.quiet === true)) {
+ console.log(`* ${blocks.insertedCount} blocks successfully written.`);
+ }
}
});
}
-}
+};
/**
Break transactions out of blocks and write to DB
**/
-var writeTransactionsToDB = function(config, blockData, flush) {
- var self = writeTransactionsToDB;
+const writeTransactionsToDB = async (config, blockData, flush) => {
+ const self = writeTransactionsToDB;
if (!self.bulkOps) {
self.bulkOps = [];
self.blocks = 0;
@@ -198,25 +183,116 @@ var writeTransactionsToDB = function(config, blockData, flush) {
}
if (blockData && blockData.transactions.length > 0) {
for (d in blockData.transactions) {
- var txData = blockData.transactions[d];
-
- var tx = normalizeTX(txData, blockData);
+ const txData = blockData.transactions[d];
+ const receipt = await web3.eth.getTransactionReceipt(txData.hash);
+ const tx = await normalizeTX(txData, receipt, blockData);
+ // Contact creation tx, Event logs of internal transaction
+ if (txData.input && txData.input.length > 2) {
+ // Contact creation tx
+ if (txData.to === null) {
+ // Support Parity & Geth case
+ if (txData.creates) {
+ contractAddress = txData.creates.toLowerCase();
+ } else {
+ contractAddress = receipt.contractAddress.toLowerCase();
+ }
+ const contractdb = {};
+ let isTokenContract = true;
+ const Token = new web3.eth.Contract(ERC20ABI, contractAddress);
+ contractdb.owner = txData.from;
+ contractdb.blockNumber = blockData.number;
+ contractdb.creationTransaction = txData.hash;
+ try {
+ const call = await web3.eth.call({ to: contractAddress, data: web3.utils.sha3('totalSupply()') });
+ if (call === '0x') {
+ isTokenContract = false;
+ } else {
+ try {
+ // ERC20 & ERC223 Token Standard compatible format
+ contractdb.tokenName = await Token.methods.name().call();
+ contractdb.decimals = await Token.methods.decimals().call();
+ contractdb.symbol = await Token.methods.symbol().call();
+ contractdb.totalSupply = await Token.methods.totalSupply().call();
+ } catch (err) {
+ isTokenContract = false;
+ }
+ }
+ } catch (err) {
+ isTokenContract = false;
+ }
+ contractdb.byteCode = await web3.eth.getCode(contractAddress);
+ if (isTokenContract) {
+ contractdb.ERC = 2;
+ } else {
+ // Normal Contract
+ contractdb.ERC = 0;
+ }
+ // Write to db
+ Contract.update(
+ { address: contractAddress },
+ { $setOnInsert: contractdb },
+ { upsert: true },
+ (err, data) => {
+ if (err) {
+ console.log(err);
+ }
+ },
+ );
+ } else {
+ // Internal transaction . write to doc of InternalTx
+ const transfer = {
+ 'hash': '', 'blockNumber': 0, 'from': '', 'to': '', 'contract': '', 'value': 0, 'timestamp': 0,
+ };
+ const methodCode = txData.input.substr(0, 10);
+ if (ERC20_METHOD_DIC[methodCode] === 'transfer' || ERC20_METHOD_DIC[methodCode] === 'transferFrom') {
+ if (ERC20_METHOD_DIC[methodCode] === 'transfer') {
+ // Token transfer transaction
+ transfer.from = txData.from;
+ transfer.to = `0x${txData.input.substring(34, 74)}`;
+ transfer.value = Number(`0x${txData.input.substring(74)}`);
+ } else {
+ // transferFrom
+ transfer.from = `0x${txData.input.substring(34, 74)}`;
+ transfer.to = `0x${txData.input.substring(74, 114)}`;
+ transfer.value = Number(`0x${txData.input.substring(114)}`);
+ }
+ transfer.method = ERC20_METHOD_DIC[methodCode];
+ transfer.hash = txData.hash;
+ transfer.blockNumber = blockData.number;
+ transfer.contract = txData.to;
+ transfer.timestamp = blockData.timestamp;
+ // Write transfer transaction into db
+ TokenTransfer.update(
+ { hash: transfer.hash },
+ { $setOnInsert: transfer },
+ { upsert: true },
+ (err, data) => {
+ if (err) {
+ console.log(err);
+ }
+ },
+ );
+ }
+ }
+ }
self.bulkOps.push(tx);
}
- console.log('\t- block #' + blockData.number.toString() + ': ' + blockData.transactions.length.toString() + ' transactions recorded.');
+ if (!('quiet' in config && config.quiet === true)) {
+ console.log(`\t- block #${blockData.number.toString()}: ${blockData.transactions.length.toString()} transactions recorded.`);
+ }
}
self.blocks++;
if (flush && self.blocks > 0 || self.blocks >= config.bulkSize) {
- var bulk = self.bulkOps;
+ const bulk = self.bulkOps;
self.bulkOps = [];
self.blocks = 0;
- var miners = self.miners;
+ const { miners } = self;
self.miners = [];
// setup accounts
- var data = {};
- bulk.forEach(function(tx) {
+ const data = {};
+ bulk.forEach((tx) => {
data[tx.from] = { address: tx.from, blockNumber: tx.blockNumber, type: 0 };
if (tx.to) {
data[tx.to] = { address: tx.to, blockNumber: tx.blockNumber, type: 0 };
@@ -224,145 +300,180 @@ var writeTransactionsToDB = function(config, blockData, flush) {
});
// setup miners
- miners.forEach(function(miner) {
+ miners.forEach((miner) => {
data[miner.address] = miner;
});
- var accounts = Object.keys(data);
+ const accounts = Object.keys(data);
- if (bulk.length == 0 && accounts.length == 0) return;
+ if (bulk.length === 0 && accounts.length === 0) return;
// update balances
- if (config.useRichList && accounts.length > 0) {
- var n = 0;
- var chunks = [];
- while (accounts.length > 800) {
- var chunk = accounts.splice(0, 500);
- chunks.push(chunk);
- }
- if (accounts.length > 0) {
- chunks.push(accounts);
- }
- async.eachSeries(chunks, function(chunk, outerCallback) {
- async.waterfall([
- // get contract account type
- function(callback) {
- var batch = web3.createBatch();
-
- for (var i = 0; i < chunk.length; i++) {
- var account = chunk[i];
- batch.add(web3.eth.getCode.request(account));
- }
-
- batch.requestManager.sendBatch(batch.requests, function(err, results) {
- if (err) {
- console.log("ERROR: fail to getCode batch job:", err);
- callback(err);
- return;
- }
- results = results || [];
- batch.requests.map(function (request, index) {
- return results[index] || {};
- }).forEach(function (result, i) {
- var code = batch.requests[i].format ? batch.requests[i].format(result.result) : result.result;
- if (code.length > 2) {
- data[batch.requests[i].params[0]].type = 1; // contract type
- }
+ if (config.settings.useRichList && accounts.length > 0) {
+ asyncL.eachSeries(accounts, (account, eachCallback) => {
+ const { blockNumber } = data[account];
+ // get contract account type
+ web3.eth.getCode(account, (err, code) => {
+ if (err) {
+ console.log(`ERROR: fail to getCode(${account})`);
+ return eachCallback(err);
+ }
+ if (code.length > 2) {
+ data[account].type = 1; // contract type
+ }
- });
- callback(null);
- });
- }, function(callback) {
- // batch rpc job
- var batch = web3.createBatch();
- for (var i = 0; i < chunk.length; i++) {
- var account = chunk[i];
- if (account) {
- batch.add(web3.eth.getBalance.request(account));
- }
+ web3.eth.getBalance(account, blockNumber, (err, balance) => {
+ if (err) {
+ console.log(err);
+ console.log(`ERROR: fail to getBalance(${account})`);
+ return eachCallback(err);
}
- batch.requestManager.sendBatch(batch.requests, function(err, results) {
- if (err) {
- console.log("ERROR: fail to getBalance batch job:", err);
- callback(err);
- return;
- }
- results = results || [];
- batch.requests.map(function (request, index) {
- return results[index] || {};
- }).forEach(function (result, i) {
- var balance = batch.requests[i].format ? batch.requests[i].format(result.result) : result.result;
-
- let ether;
- if (typeof balance === 'object') {
- ether = parseFloat(balance.div(1e18).toString());
- } else {
- ether = balance / 1e18;
- }
- var account = batch.requests[i].params[0];
- data[account].balance = ether;
-
- if (n <= 5) {
- console.log(' - upsert ' + account + ' / balance = ' + data[account].balance);
- } else if (n == 6) {
- console.log(' (...) total ' + accounts.length + ' accounts updated.');
- }
- n++;
- // upsert account
- Account.collection.update({ address: account }, { $set: data[account] }, { upsert: true });
- });
- });
- callback(null);
- }], function(error) {
+ data[account].balance = parseFloat(web3.utils.fromWei(balance, 'ether'));
+ eachCallback();
+ });
+ });
+ }, (err) => {
+ let n = 0;
+ accounts.forEach((account) => {
+ n++;
+ if (!('quiet' in config && config.quiet === true)) {
+ if (n <= 5) {
+ console.log(` - upsert ${account} / balance = ${data[account].balance}`);
+ } else if (n === 6) {
+ console.log(` (...) total ${accounts.length} accounts updated.`);
+ }
+ }
+ // upsert account
+ Account.collection.update({ address: account }, { $set: data[account] }, { upsert: true });
});
- }, function(error) {
});
}
- if (bulk.length > 0)
- Transaction.collection.insert(bulk, function( err, tx ){
- if ( typeof err !== 'undefined' && err ) {
- if (err.code == 11000) {
- if(!('quiet' in config && config.quiet === true)) {
- console.log('Skip: Duplicate transaction key ' + err);
+ if (bulk.length > 0) {
+ Transaction.collection.insert(bulk, (err, tx) => {
+ if (typeof err !== 'undefined' && err) {
+ if (err.code === 11000) {
+ if (!('quiet' in config && config.quiet === true)) {
+ console.log(`Skip: Duplicate transaction key ${err}`);
+ }
+ } else {
+ console.log(`Error: Aborted due to error on Transaction: ${err}`);
+ process.exit(9);
+ }
+ } else {
+ if (!('quiet' in config && config.quiet === true)) {
+ console.log(`* ${tx.insertedCount} transactions successfully recorded.`);
}
- }else{
- console.log('Error: Aborted due to error on Transaction: ' + err);
- process.exit(9);
}
- }else{
- console.log('* ' + tx.insertedCount + ' transactions successfully recorded.');
+ });
+ }
+ }
+};
+/**
+ //Just listen for latest blocks and sync from the start of the app.
+**/
+const listenBlocks = function (config) {
+ const newBlocks = web3.eth.subscribe('newBlockHeaders', (error, result) => {
+ if (!error) {
+ return;
+ }
+
+ console.error(error);
+ });
+ newBlocks.on('data', (blockHeader) => {
+ web3.eth.getBlock(blockHeader.hash, true, (error, blockData) => {
+ if (blockHeader === null) {
+ console.log('Warning: null block hash');
+ } else {
+ writeBlockToDB(config, blockData, true);
+ writeTransactionsToDB(config, blockData, true);
}
});
+ });
+ newBlocks.on('error', console.error);
+};
+/**
+ If full sync is checked this function will start syncing the block chain from lastSynced param see README
+**/
+var syncChain = function (config, nextBlock) {
+ if (web3.eth.net.isListening()) {
+ if (typeof nextBlock === 'undefined') {
+ prepareSync(config, (error, startBlock) => {
+ if (error) {
+ console.log(`ERROR: error: ${error}`);
+ return;
+ }
+ syncChain(config, startBlock);
+ });
+ return;
+ }
+
+ if (nextBlock === null) {
+ console.log('nextBlock is null');
+ return;
+ } if (nextBlock < config.startBlock) {
+ writeBlockToDB(config, null, true);
+ writeTransactionsToDB(config, null, true);
+ console.log('*** Sync Finsihed ***');
+ config.syncAll = false;
+ return;
+ }
+
+ let count = config.bulkSize;
+ while (nextBlock >= config.startBlock && count > 0) {
+ web3.eth.getBlock(nextBlock, true, (error, blockData) => {
+ if (error) {
+ console.log(`Warning (syncChain): error on getting block with hash/number: ${nextBlock}: ${error}`);
+ } else if (blockData === null) {
+ console.log(`Warning: null block data received from the block with hash/number: ${nextBlock}`);
+ } else {
+ writeBlockToDB(config, blockData);
+ writeTransactionsToDB(config, blockData);
+ }
+ });
+ nextBlock--;
+ count--;
+ }
+
+ setTimeout(() => { syncChain(config, nextBlock); }, 500);
+ } else {
+ console.log(`Error: Web3 connection time out trying to get block ${nextBlock} retrying connection now`);
+ syncChain(config, nextBlock);
}
-}
+};
/**
//check oldest block or starting block then callback
**/
-var prepareSync = function(config, callback) {
- var blockNumber = null;
- var oldBlockFind = Block.find({}, "number").lean(true).sort('number').limit(1);
- oldBlockFind.exec(function (err, docs) {
- if(err || !docs || docs.length < 1) {
+const prepareSync = async (config, callback) => {
+ let blockNumber = null;
+ const oldBlockFind = Block.find({}, 'number').lean(true).sort('number').limit(1);
+ oldBlockFind.exec(async (err, docs) => {
+ if (err || !docs || docs.length < 1) {
// not found in db. sync from config.endBlock or 'latest'
- if(web3.isConnected()) {
- var currentBlock = web3.eth.blockNumber;
- var latestBlock = config.endBlock || currentBlock || 'latest';
- if(latestBlock === 'latest') {
- web3.eth.getBlock(latestBlock, true, function(error, blockData) {
- if(error) {
- console.log('Warning: error on getting block with hash/number: ' + latestBlock + ': ' + error);
- } else if(blockData == null) {
- console.log('Warning: null block data received from the block with hash/number: ' + latestBlock);
+ if (web3.eth.net.isListening()) {
+ const currentBlock = await web3.eth.getBlockNumber();
+ const latestBlock = config.endBlock || currentBlock || 'latest';
+ if (latestBlock === 'latest') {
+ web3.eth.getBlock(latestBlock, true, (error, blockData) => {
+ if (error) {
+ console.log(`Warning (prepareSync): error on getting block with hash/number: ${latestBlock}: ${error}`);
+ } else if (blockData === null) {
+ console.log(`Warning: null block data received from the block with hash/number: ${latestBlock}`);
} else {
- console.log('Starting block number = ' + blockData.number);
+ console.log(`Starting block number = ${blockData.number}`);
+ if ('quiet' in config && config.quiet === true) {
+ console.log('Quiet mode enabled');
+ }
blockNumber = blockData.number - 1;
callback(null, blockNumber);
}
});
} else {
- console.log('Starting block number = ' + latestBlock);
+ console.log(`Starting block number = ${latestBlock}`);
+ if ('quiet' in config && config.quiet === true) {
+ console.log('Quiet mode enabled');
+ }
blockNumber = latestBlock - 1;
callback(null, blockNumber);
}
@@ -370,56 +481,61 @@ var prepareSync = function(config, callback) {
console.log('Error: Web3 connection error');
callback(err, null);
}
- }else{
+ } else {
blockNumber = docs[0].number - 1;
- console.log('Old block found. Starting block number = ' + blockNumber);
+ console.log(`Old block found. Starting block number = ${blockNumber}`);
+ if ('quiet' in config && config.quiet === true) {
+ console.log('Quiet mode enabled');
+ }
callback(null, blockNumber);
}
});
-}
+};
/**
Block Patcher(experimental)
**/
-var runPatcher = function(config, startBlock, endBlock) {
- if(!web3 || !web3.isConnected()) {
+const runPatcher = async (config, startBlock, endBlock) => {
+ if (!web3 || !web3.eth.net.isListening()) {
console.log('Error: Web3 is not connected. Retrying connection shortly...');
- setTimeout(function() { runPatcher(config); }, 3000);
+ setTimeout(() => { runPatcher(config); }, 3000);
return;
}
- if(typeof startBlock === 'undefined' || typeof endBlock === 'undefined') {
+ if (typeof startBlock === 'undefined' || typeof endBlock === 'undefined') {
// get the last saved block
- var blockFind = Block.find({}, "number").lean(true).sort('-number').limit(1);
- blockFind.exec(function (err, docs) {
- if(err || !docs || docs.length < 1) {
+ const blockFind = Block.find({}, 'number').lean(true).sort('-number').limit(1);
+ blockFind.exec(async (err, docs) => {
+ if (err || !docs || docs.length < 1) {
// no blocks found. terminate runPatcher()
console.log('No need to patch blocks.');
return;
}
- var lastMissingBlock = docs[0].number + 1;
- var currentBlock = web3.eth.blockNumber;
+ const lastMissingBlock = docs[0].number + 1;
+ const currentBlock = await web3.eth.getBlockNumber();
runPatcher(config, lastMissingBlock, currentBlock - 1);
});
return;
}
- var missingBlocks = endBlock - startBlock + 1;
+ const missingBlocks = endBlock - startBlock + 1;
if (missingBlocks > 0) {
- console.log('Patching from #' + startBlock + ' to #' + endBlock);
- var patchBlock = startBlock;
- var count = 0;
- while(count < config.patchBlocks && patchBlock <= endBlock) {
- if(!('quiet' in config && config.quiet === true)) {
- console.log('Patching Block: ' + patchBlock)
+ if (!('quiet' in config && config.quiet === true)) {
+ console.log(`Patching from #${startBlock} to #${endBlock}`);
+ }
+ let patchBlock = startBlock;
+ let count = 0;
+ while (count < config.patchBlocks && patchBlock <= endBlock) {
+ if (!('quiet' in config && config.quiet === true)) {
+ console.log(`Patching Block: ${patchBlock}`);
}
- web3.eth.getBlock(patchBlock, true, function(error, patchData) {
- if(error) {
- console.log('Warning: error on getting block with hash/number: ' + patchBlock + ': ' + error);
- } else if(patchData == null) {
- console.log('Warning: null block data received from the block with hash/number: ' + patchBlock);
+ web3.eth.getBlock(patchBlock, true, (error, patchData) => {
+ if (error) {
+ console.log(`Warning: error on getting block with hash/number: ${patchBlock}: ${error}`);
+ } else if (patchData === null) {
+ console.log(`Warning: null block data received from the block with hash/number: ${patchBlock}`);
} else {
- checkBlockDBExistsThenWrite(config, patchData)
+ checkBlockDBExistsThenWrite(config, patchData);
}
});
patchBlock++;
@@ -429,7 +545,7 @@ var runPatcher = function(config, startBlock, endBlock) {
writeBlockToDB(config, null, true);
writeTransactionsToDB(config, null, true);
- setTimeout(function() { runPatcher(config, patchBlock, endBlock); }, 1000);
+ setTimeout(() => { runPatcher(config, patchBlock, endBlock); }, 1000);
} else {
// flush
writeBlockToDB(config, null, true);
@@ -437,52 +553,59 @@ var runPatcher = function(config, startBlock, endBlock) {
console.log('*** Block Patching Completed ***');
}
-}
+};
/**
This will be used for the patcher(experimental)
**/
-var checkBlockDBExistsThenWrite = function(config, patchData, flush) {
- Block.find({number: patchData.number}, function (err, b) {
- if (!b.length){
+var checkBlockDBExistsThenWrite = function (config, patchData, flush) {
+ Block.find({ number: patchData.number }, (err, b) => {
+ if (!b.length) {
writeBlockToDB(config, patchData, flush);
writeTransactionsToDB(config, patchData, flush);
- }else if(!('quiet' in config && config.quiet === true)) {
- console.log('Block number: ' +patchData.number.toString() + ' already exists in DB.');
+ } else if (!('quiet' in config && config.quiet === true)) {
+ console.log(`Block number: ${patchData.number.toString()} already exists in DB.`);
}
});
};
/**
- Start config for node connection and sync
+ Fetch market price from cryptocompare
**/
-/**
- * nodeAddr: node address
- * gethPort: geth port
- * bulkSize: size of array in block to use bulk operation
- */
-// load config.json
-var config = { nodeAddr: 'localhost', gethPort: 8545, bulkSize: 100 };
-try {
- var local = require('../config.json');
- _.extend(config, local);
- console.log('config.json found.');
-} catch (error) {
- if (error.code === 'MODULE_NOT_FOUND') {
- var local = require('../config.example.json');
- _.extend(config, local);
- console.log('No config file found. Using default configuration... (config.example.json)');
- } else {
- throw error;
- process.exit(1);
- }
-}
+// 10 minutes
+const quoteInterval = 10 * 60 * 1000;
-console.log('Connecting ' + config.nodeAddr + ':' + config.gethPort + '...');
+const getQuote = async () => {
+ const options = {
+ timeout: 10000,
+ };
+ const URL = `https://min-api.cryptocompare.com/data/price?fsym=${config.settings.symbol}&tsyms=USD`;
-// Sets address for RPC WEB3 to connect to, usually your node IP address defaults ot localhost
-var web3 = new Web3(new Web3.providers.HttpProvider('http://' + config.nodeAddr + ':' + config.gethPort.toString()));
+ try {
+ const requestUSD = await fetch(URL);
+ const quoteUSD = await requestUSD.json();
+
+ quoteObject = {
+ timestamp: Math.round(Date.now() / 1000),
+ quoteUSD: quoteUSD.USD,
+ };
+
+ new Market(quoteObject).save((err, market, count) => {
+ if (typeof err !== 'undefined' && err) {
+ process.exit(9);
+ } else {
+ if (!('quiet' in config && config.quiet === true)) {
+ console.log('DB successfully written for market quote.');
+ }
+ }
+ });
+ } catch (error) {
+ if (!('quiet' in config && config.quiet === true)) {
+ console.log(error);
+ }
+ }
+};
// patch missing blocks
-if (config.patch === true){
+if (config.patch === true) {
console.log('Checking for missing blocks');
runPatcher(config);
}
@@ -490,14 +613,23 @@ if (config.patch === true){
// check NORICHLIST env
// you can use it like as 'NORICHLIST=1 node tools/sync.js' to disable balance updater temporary.
if (process.env.NORICHLIST) {
- config.useRichList = false;
+ config.settings.useRichList = false;
}
// Start listening for latest blocks
listenBlocks(config);
// Starts full sync when set to true in config
-if (config.syncAll === true){
+if (config.syncAll === true) {
console.log('Starting Full Sync');
syncChain(config);
}
+
+// Start price sync on DB
+if (config.settings.useFiat) {
+ getQuote();
+
+ setInterval(() => {
+ getQuote();
+ }, quoteInterval);
+}
diff --git a/tools/tokens/daoTxns.js b/tools/tokens/daoTxns.js
deleted file mode 100644
index 3922fcbd6..000000000
--- a/tools/tokens/daoTxns.js
+++ /dev/null
@@ -1,254 +0,0 @@
-#!/usr/bin/env node
-
-/*
- Thing to get history of DAO transactions
-*/
-
-var Web3 = require("web3");
-var web3;
-var async = require('async');
-
-require( '../../db.js' );
-require( '../../db-dao.js' );
-require( '../../db-internal.js' );
-var mongoose = require( 'mongoose' );
-var Block = mongoose.model('Block');
-var DAOCreatedToken = mongoose.model('DAOCreatedToken');
-var DAOTransferToken = mongoose.model('DAOTransferToken');
-var InternalTx = mongoose.model( 'InternalTransaction' );
-
-// load config.json
-var config = { nodeAddr: 'localhost', gethPort: 8545 };
-try {
- var local = require('../../config.json');
- _.extend(config, local);
- console.log('config.json found.');
-} catch (error) {
- if (error.code === 'MODULE_NOT_FOUND') {
- var local = require('../../config.example.json');
- _.extend(config, local);
- console.log('No config file found. Using default configuration... (config.example.json)');
- } else {
- throw error;
- process.exit(1);
- }
-}
-
-console.log('Connecting ' + config.nodeAddr + ':' + config.gethPort + '...');
-
-if (typeof web3 !== "undefined") {
- web3 = new Web3(web3.currentProvider);
-} else {
- web3 = new Web3(new Web3.providers.HttpProvider('http://' + config.nodeAddr + ':' + config.gethPort.toString()));
-}
-
-if (web3.isConnected())
- console.log("Web3 connection established");
-else
- throw "No connection";
-
-
-var daoABI = [{"anonymous":false,"inputs":[{"indexed":true,"name":"_from","type":"address"},{"indexed":true,"name":"_to","type":"address"},{"indexed":false,"name":"_amount","type":"uint256"}],"name":"Transfer","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"_owner","type":"address"},{"indexed":true,"name":"_spender","type":"address"},{"indexed":false,"name":"_amount","type":"uint256"}],"name":"Approval","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"value","type":"uint256"}],"name":"FuelingToDate","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"to","type":"address"},{"indexed":false,"name":"amount","type":"uint256"}],"name":"CreatedToken","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"to","type":"address"},{"indexed":false,"name":"value","type":"uint256"}],"name":"Refund","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"proposalID","type":"uint256"},{"indexed":false,"name":"recipient","type":"address"},{"indexed":false,"name":"amount","type":"uint256"},{"indexed":false,"name":"newCurator","type":"bool"},{"indexed":false,"name":"description","type":"string"}],"name":"ProposalAdded","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"proposalID","type":"uint256"},{"indexed":false,"name":"position","type":"bool"},{"indexed":true,"name":"voter","type":"address"}],"name":"Voted","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"proposalID","type":"uint256"},{"indexed":false,"name":"result","type":"bool"},{"indexed":false,"name":"quorum","type":"uint256"}],"name":"ProposalTallied","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"_newCurator","type":"address"}],"name":"NewCurator","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"_recipient","type":"address"},{"indexed":false,"name":"_allowed","type":"bool"}],"name":"AllowedRecipientChanged","type":"event"}];
-var daoContract = web3.eth.contract(daoABI);
-var DAO = daoContract.at("0xbb9bc244d798123fde783fcc1c72d3bb8c189413");
-
-var creationBlock = 1428757;
-var creationEnd = 1599205;
-
-var populateCreatedTokens = function () {
- //total: 58713
-
- var event = DAO.CreatedToken;
- event({}, {fromBlock: creationBlock, toBlock: creationEnd}).get( function(err, log) {
- if (err) {
- console.error(err);
- process.exit(9);
- } else {
- for (var l in log) {
- try {
- var newToken = {
- "transactionHash": log[l].transactionHash,
- "blockNumber": log[l].blockNumber,
- "amount": log[l].args.amount,
- "to": log[l].args.to
- }
- } catch (e) {
- console.error(e);
- continue;
- }
-
- new DAOCreatedToken(newToken).save( function( err, token, count ){
- if ( typeof err !== 'undefined' && err ) {
- if (err.code == 11000) {
- console.log('Skip: Duplicate tx ' +
- log[l].transactionHash + ': ' +
- err);
- } else {
- console.log('Error: Aborted due to error on ' +
- 'block number ' + log[l].blockNumber.toString() + ': ' +
- err);
- process.exit(9);
- }
- } else
- console.log('DB successfully written for tx ' +
- token.transactionHash );
-
- });
- }
- }
-
- });
-}
-
-var populateTransferTokens = function () {
-
- var event = DAO.Transfer;
- event({}, {fromBlock: creationEnd, toBlock: "latest"}).get( function(err, log) {
- if (err) {
- console.error(err);
- process.exit(9);
- } else {
- for (var l in log) {
- try {
- var newToken = {
- "transactionHash": log[l].transactionHash,
- "blockNumber": log[l].blockNumber,
- "amount": log[l].args._amount,
- "to": log[l].args._to,
- "from": log[l].args._from
- }
- } catch (e) {
- console.error(e);
- continue;
- }
- try {
- var block = web3.eth.getBlock(log[l].blockNumber);
- newToken.timestamp = block.timestamp;
- } catch (e) {
- console.error(e);
- continue;
- }
- new DAOTransferToken(newToken).save( function( err, token, count ){
- if ( typeof err !== 'undefined' && err ) {
- if (err.code == 11000) {
- console.log('Skip: Duplicate tx ' +
- log[l].transactionHash + ': ' +
- err);
- return null;
- } else {
- console.log('Error: Aborted due to error on ' +
- 'block number ' + log[l].blockNumber.toString() + ': ' +
- err);
- process.exit(9);
- }
- } else
- console.log('DB successfully written for tx ' +
- log[l].transactionHash );
-
- });
- }
- }
-
- });
-}
-
-var bulkTimeUpdate = function(bulk, callback) {
- console.log("Bulk execution started");
- bulk.execute(function(err,result) {
- if (err)
- console.error(err);
- else
- console.log(result.toJSON());
- });
-}
-
-
-var patchTimestamps = function(collection) {
- mongoose.connection.on("open", function(err,conn) {
-
- var bulk = collection.initializeOrderedBulkOp();
-
- var bulkOps = [];
- var count = 0;
- var missingCount = 5200;
- collection.count({timestamp: null}, function(err, c) {
- missingCount = c;
- console.log("Missing: " + JSON.stringify(missingCount));
- });
-
- collection.find({timestamp: null}).forEach(function(doc) {
- setTimeout(function() {
- try {
- var block = web3.eth.getBlock(doc.blockNumber);
- } catch (e) {
- console.error(e); return;
- }
-
- bulk.find({ '_id': doc._id }).updateOne({
- '$set': { 'timestamp': block.timestamp }
- });
- count++;
- if(count % 100 === 0) {
- // Execute per 1000 operations and re-init
- bulkTimeUpdate(bulk);
- bulk = collection.initializeOrderedBulkOp();
- }
- if(count == missingCount) {
- // Clean up queues
- bulkTimeUpdate(bulk);
- }
- }, 1000);
- });
-
- })
-}
-
-const BATCH = 1000;
-
-var patchBlocks = function(max, min) {
-
- Block.find({"number": {$gt: min, $lt: max}}, "number timestamp").lean(true).exec(function(err, docs) {
- async.forEach(docs, function(doc, cb) {
- var q = { 'timestamp': null, 'blockNumber': doc.number };
- InternalTx.collection.update(q, { $set: { 'timestamp': doc.timestamp }},
- {multi: true, upsert: false}, function(err, tx) {
- if(err) console.error(err);
- console.log(tx)
- cb();
- });
- }, function() { return; });
- });
-
-}
-
-InternalTx.collection.count({timestamp: null}, function(err, c) {
- missingCount = c;
- console.log("Missing: " + JSON.stringify(missingCount));
-});
-
-var min;
-
-var max = web3.eth.blockNumber;
-
-setInterval(function() {
- InternalTx.findOne({"timestamp": null}, "blockNumber")
- .lean(true).sort('blockNumber')
- .exec(function(err, doc) {
- console.log(doc)
- if (doc)
- min = doc.blockNumber - 1;
- else
- min = max;
-
- var next = min + BATCH;
- if (next > max)
- process.exit(9)
-
- patchBlocks(next, min);
- });
-}, 20000);
-
-
-// patchTimestamps(InternalTx.collection)
-// populateCreatedTokens();
-// populateTransferTokens();
diff --git a/views/index.ejs b/views/index.ejs
index bab84257c..d209f5456 100644
--- a/views/index.ejs
+++ b/views/index.ejs
@@ -31,7 +31,7 @@
-
+
-
-
-
-
- {{ token.balance | number: 10 }}
- - {{ token.name }} Address Balance ({{ settings.symbol }}) -
-
- - - {{ token.name }} Address Balance ({{ settings.symbol }}) -
-
- {{ token.total_supply | number:1 }} Total {{ token.symbol }} Tokens
-
-
- Decimals {{ token.decimals }}
-
- {{ token.total_holders | number:1 }}
- Token Holders
-
-
- {{ token.count }} Transactions
-
-
-
diff --git a/public/views/tokenlist.html b/public/views/tokenlist.html
index 44cd5bbf5..29e8cf403 100755
--- a/public/views/tokenlist.html
+++ b/public/views/tokenlist.html
@@ -1,25 +1,24 @@
-
+
+
-
- WATCH
- WATCHING
-
+
- {{ token.follow_count }}0
- WATCHING
-
-
- Contract Creator
- {{token.creator.substr(0,24)}}... at txn - {{token.transaction.substr(0,24)}}... -
-
- - {{token.creator.substr(0,24)}}... at txn - {{token.transaction.substr(0,24)}}... -
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ token.balance | number: 10 }}
+ + {{ token.name }} Address Balance ({{ settings.symbol }}) +
+
+ + + {{ token.name }} Address Balance ({{ settings.symbol }}) +
+
+ {{ token.total_supply | number:1 }} Total {{ token.symbol }} Tokens
+
+ {{ token.total_holders | number:1 }}
+
+ Token Holders
+
+
+ {{ token.count }} Transactions
+
+
+
+
+ Contract Creator
+ {{token.owner.substr(0,24)}}... at txn + {{token.creationTransaction.substr(0,24)}}... +
+
+ + {{token.owner.substr(0,24)}}... at txn + {{token.creationTransaction.substr(0,24)}}... +
+
+
+
\ No newline at end of file
+
+
+
+
-
+
-
-
-
+
- Get {{ token.name }} Token Balance
+
+
+
+
+
+
+
+
-
-
+
-
- You have {{userTokens | number}} {{ token.symbol }} tokens.
-
-
-
-
+
+
-
-
+
-
+
-
- Get {{ token.name }} Token Balance
-
-
-
-
-
-
-
- You have {{userTokens | number}} {{ token.symbol }} tokens.
-
-
-
-
-
-
-
-
-
-
- | TxHash | -Block | -From | -To | -Amount | -gas | -call | -
|---|---|---|---|---|---|---|
| No more transactions | -||||||
| {{t.transactionHash}} | -{{t.blockNumber}} - | {{t.from}} | -{{t.to}} | -{{t.amount | number: 4}} | -{{t.gas}} | -{{t.type}} {{t.error}} | -
-
-
+
+
+
+
+
+
+
+
+
+ | TxHash | +Block | +From | +To | +{{ settings.symbol }} | +gas | +Age | +
|---|
+
-
diff --git a/public/views/transfer-tokens.html b/public/views/transfer-tokens.html
index ef3fb2751..22cc05f66 100644
--- a/public/views/transfer-tokens.html
+++ b/public/views/transfer-tokens.html
@@ -1,45 +1,44 @@
-
-
+
-
-
-
-
-
+ | # | -Token (Symbol) | -Address | -Decimals | -
|---|---|---|---|
| {{$index + 1}} | -{{t.name}} ({{t.symbol}}) | -{{t.address}} | -{{t.decimal}} | -
+
\ No newline at end of file
+
+
+
+
-| # | +Token (Symbol) | +Address | +Decimals | +
|---|---|---|---|
| {{$index + 1}} | +{{t.name}} ({{t.symbol}}) | +{{t.address}} | +{{t.decimal}} | +
-
-
-
+
+
+
| TxHash | -Age | -Block | -From | -To | -Amount ({{token.symbol}}) | -- |
|---|---|---|---|---|---|---|
| {{t.transactionHash}} | -{{t.timestamp | timeDuration}} ago | -{{t.blockNumber}} | -{{t.from}} | -{{t.to}} | -{{t.amount | number}} | -transfer {{t.error}} | -
| TxHash | +Age | +Block | +From | +To | +Amount ({{token.symbol}}) | ++ |
|---|---|---|---|---|---|---|
| {{t.transactionHash}} | +{{t.timestamp | timeDuration}} ago | +{{t.blockNumber}} | +{{t.from}} | +{{t.to}} | +{{t.amount | number}} | +transfer {{t.error}} | +
-
-
+
+
diff --git a/public/views/tx.html b/public/views/tx.html
index 13e0a33c3..3fca393a2 100644
--- a/public/views/tx.html
+++ b/public/views/tx.html
@@ -1,53 +1,84 @@
-
diff --git a/routes/compiler.js b/routes/compiler.js
index e9d1c8833..3111148c8 100644
--- a/routes/compiler.js
+++ b/routes/compiler.js
@@ -1,66 +1,58 @@
-var solc = require('solc');
+const solc = require('solc');
+const { eth } = require('./web3relay');
+const Contract = require('./contracts');
-// var eth = require('./web3dummy').eth;
-var eth = require('./web3relay').eth;
-
-var Contract = require('./contracts');
-
-/*
+/*
TODO: support other languages
*/
-module.exports = function(req, res) {
+module.exports = function (req, res) {
console.log(req.body);
- if (!("action" in req.body))
- res.status(400).send();
- if (req.body.action=="compile") {
+ if (!('action' in req.body)) res.status(400).send();
+ if (req.body.action == 'compile') {
compileSolc(req, res);
- } else if (req.body.action=="find") {
+ } else if (req.body.action == 'find') {
Contract.findContract(req.body.addr, res);
}
-}
-
+};
-var compileSolc = function(req, res) {
+var compileSolc = async (req, res) => {
// get bytecode at address
- var address = req.body.address;
- var version = req.body.version;
- var name = req.body.name;
- var input = req.body.code;
- var optimization = (req.body.optimization) ? true : false;
- var optimise = (optimization) ? 1 : 0;
-
- var bytecode = eth.getCode(address);
- if (bytecode.substring(0,2)=="0x")
- bytecode = bytecode.substring(2);
-
- var data = {
- "address": address,
- "creationTransaction": "", // deal with this later
- "compilerVersion": version,
- "optimization": optimization,
- "contractName": name,
- "sourceCode": input
- }
-
- console.log(version)
+ const { address } = req.body;
+ const { version } = req.body;
+ const { name } = req.body;
+ const input = req.body.code;
+ const optimization = !!(req.body.optimization);
+ const optimise = (optimization) ? 1 : 0;
+
+ let bytecode = await eth.getCode(address);
+ if (bytecode.substring(0, 2) == '0x') bytecode = bytecode.substring(2);
+
+ const data = {
+ 'address': address,
+ 'compilerVersion': version,
+ 'optimization': optimization,
+ 'contractName': name,
+ 'sourceCode': input,
+ };
+
+ console.log(version);
try {
// latest version doesn't need to be loaded remotely
- if (version == "latest") {
- var output = solc.compile(input, optimise);
- testValidCode(output, data, bytecode, res);
+ if (version == 'latest') {
+ const output = solc.compile(input, optimise);
+ testValidCode(output, data, bytecode, res);
} else {
- solc.loadRemoteVersion(version, function(err, solcV) {
+ solc.loadRemoteVersion(version, (err, solcV) => {
if (err) {
console.error(err);
- res.write(JSON.stringify({"valid": false}));
+ res.write(JSON.stringify({ 'valid': false }));
res.end();
- }
- else {
- var output = solcV.compile(input, optimise);
+ } else {
+ const output = solcV.compile(input, optimise);
testValidCode(output, data, bytecode, res);
}
});
@@ -70,30 +62,31 @@ var compileSolc = function(req, res) {
console.error(e.stack);
}
-}
+};
-var testValidCode = function(output, data, bytecode, response) {
- var verifiedContracts = [];
+var testValidCode = function (output, data, bytecode, response) {
+ const verifiedContracts = [];
for (var contractName in output.contracts) {
// code and ABI that are needed by web3
- console.log(contractName + ': ' + output.contracts[contractName].bytecode);
- verifiedContracts.push({"name": contractName,
- "abi": output.contracts[contractName].interface,
- "bytecode": output.contracts[contractName].bytecode});
+ console.log(`${contractName}: ${output.contracts[contractName].bytecode}`);
+ verifiedContracts.push({
+ 'name': contractName,
+ 'abi': output.contracts[contractName].interface,
+ 'bytecode': output.contracts[contractName].bytecode,
+ });
}
// Remove swarm hash
- var bytecodeClean = bytecode.replace(/a165627a7a72305820.{64}0029$/gi, "");
+ const bytecodeClean = bytecode.replace(/a165627a7a72305820.{64}0029$/gi, '');
- var contractName = ':' + data.contractName; // XXX
+ var contractName = `:${data.contractName}`; // XXX
// compare to bytecode at address
- if (!output.contracts || !output.contracts[contractName])
- data.valid = false;
- else if (output.contracts[contractName].bytecode.indexOf(bytecodeClean) > -1){
- var contractBytecodeClean = output.contracts[contractName].bytecode.replace(/a165627a7a72305820.{64}0029$/gi, "");
- constructorArgs = contractBytecodeClean.replace(bytecodeClean, "");
- contractBytecodeClean = contractBytecodeClean.replace(constructorArgs, "");
+ if (!output.contracts || !output.contracts[contractName]) data.valid = false;
+ else if (output.contracts[contractName].bytecode.indexOf(bytecodeClean) > -1) {
+ let contractBytecodeClean = output.contracts[contractName].bytecode.replace(/a165627a7a72305820.{64}0029$/gi, '');
+ constructorArgs = contractBytecodeClean.replace(bytecodeClean, '');
+ contractBytecodeClean = contractBytecodeClean.replace(constructorArgs, '');
if (contractBytecodeClean == bytecodeClean) {
data.valid = true;
@@ -104,10 +97,9 @@ var testValidCode = function(output, data, bytecode, response) {
} else {
data.valid = false;
}
- } else
- data.valid = false;
+ } else data.valid = false;
- data["verifiedContracts"] = verifiedContracts;
+ data['verifiedContracts'] = verifiedContracts;
response.write(JSON.stringify(data));
response.end();
-}
\ No newline at end of file
+};
diff --git a/routes/contracts.js b/routes/contracts.js
index a239386c1..ec6bf5e66 100644
--- a/routes/contracts.js
+++ b/routes/contracts.js
@@ -1,36 +1,37 @@
/*
- Stuff to deal with verified contracts in DB
+ Stuff to deal with verified contracts in DB
*/
-require( '../db.js' );
-var mongoose = require( 'mongoose' );
-var Contract = mongoose.model( 'Contract' );
+require('../db.js');
+const mongoose = require('mongoose');
-exports.addContract = function(contract) {
+const Contract = mongoose.model('Contract');
+
+exports.addContract = function (contract) {
Contract.update(
- {address: contract.address},
- {$setOnInsert: contract},
- {upsert: true},
- function (err, data) {
+ { address: contract.address },
+ { $setOnInsert: contract },
+ { upsert: true },
+ (err, data) => {
console.log(data);
- }
+ },
);
-}
+};
-exports.findContract = function(address, res) {
- var contractFind = Contract.findOne({ address : address}).lean(true);
- contractFind.exec(function(err, doc) {
+exports.findContract = function (address, res) {
+ const contractFind = Contract.findOne({ address }).lean(true);
+ contractFind.exec((err, doc) => {
if (err) {
- console.error("ContractFind error: " + err);
- console.error("bad address: " + address);
- res.write(JSON.stringify({"error": true, "valid": false}));
- } else if (!doc) {
- res.write(JSON.stringify({"valid": false}));
+ console.error(`ContractFind error: ${err}`);
+ console.error(`bad address: ${address}`);
+ res.write(JSON.stringify({ 'error': true, 'valid': false }));
+ } else if (!doc || !doc.sourceCode) {
+ res.write(JSON.stringify({ 'valid': false }));
} else {
- var data = doc;
+ const data = doc;
data.valid = true;
res.write(JSON.stringify(data));
}
res.end();
- })
-}
\ No newline at end of file
+ });
+};
diff --git a/routes/dao.js b/routes/dao.js
deleted file mode 100644
index 037ecbd4a..000000000
--- a/routes/dao.js
+++ /dev/null
@@ -1,97 +0,0 @@
-#!/usr/bin/env node
-
-/*
- Endpoint for client to talk to node about DAO stuff
-*/
-
-var eth = require('./web3relay').eth;
-require( '../db-dao' );
-
-var mongoose = require( 'mongoose' );
-var DAOCreatedToken = mongoose.model('DAOCreatedToken');
-var DAOTransferToken = mongoose.model('DAOTransferToken');
-
-var BigNumber = require('bignumber.js');
-var etherUnits = require(__lib + "etherUnits.js")
-
-var extraBalanceAddr = "0x807640a13483f8ac783c557fcdf27be11ea4ac7a";
-var daoABI = [{"constant":true,"inputs":[{"name":"","type":"uint256"}],"name":"proposals","outputs":[{"name":"recipient","type":"address"},{"name":"amount","type":"uint256"},{"name":"description","type":"string"},{"name":"votingDeadline","type":"uint256"},{"name":"open","type":"bool"},{"name":"proposalPassed","type":"bool"},{"name":"proposalHash","type":"bytes32"},{"name":"proposalDeposit","type":"uint256"},{"name":"newCurator","type":"bool"},{"name":"yea","type":"uint256"},{"name":"nay","type":"uint256"},{"name":"creator","type":"address"}],"type":"function"},{"constant":false,"inputs":[{"name":"_spender","type":"address"},{"name":"_amount","type":"uint256"}],"name":"approve","outputs":[{"name":"success","type":"bool"}],"type":"function"},{"constant":true,"inputs":[],"name":"minTokensToCreate","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[],"name":"rewardAccount","outputs":[{"name":"","type":"address"}],"type":"function"},{"constant":true,"inputs":[],"name":"daoCreator","outputs":[{"name":"","type":"address"}],"type":"function"},{"constant":true,"inputs":[],"name":"totalSupply","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[],"name":"divisor","outputs":[{"name":"divisor","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[],"name":"extraBalance","outputs":[{"name":"","type":"address"}],"type":"function"},{"constant":false,"inputs":[{"name":"_proposalID","type":"uint256"},{"name":"_transactionData","type":"bytes"}],"name":"executeProposal","outputs":[{"name":"_success","type":"bool"}],"type":"function"},{"constant":false,"inputs":[{"name":"_from","type":"address"},{"name":"_to","type":"address"},{"name":"_value","type":"uint256"}],"name":"transferFrom","outputs":[{"name":"success","type":"bool"}],"type":"function"},{"constant":false,"inputs":[],"name":"unblockMe","outputs":[{"name":"","type":"bool"}],"type":"function"},{"constant":true,"inputs":[],"name":"totalRewardToken","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[],"name":"actualBalance","outputs":[{"name":"_actualBalance","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[],"name":"closingTime","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[{"name":"","type":"address"}],"name":"allowedRecipients","outputs":[{"name":"","type":"bool"}],"type":"function"},{"constant":false,"inputs":[{"name":"_to","type":"address"},{"name":"_value","type":"uint256"}],"name":"transferWithoutReward","outputs":[{"name":"success","type":"bool"}],"type":"function"},{"constant":false,"inputs":[],"name":"refund","outputs":[],"type":"function"},{"constant":false,"inputs":[{"name":"_recipient","type":"address"},{"name":"_amount","type":"uint256"},{"name":"_description","type":"string"},{"name":"_transactionData","type":"bytes"},{"name":"_debatingPeriod","type":"uint256"},{"name":"_newCurator","type":"bool"}],"name":"newProposal","outputs":[{"name":"_proposalID","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[{"name":"","type":"address"}],"name":"DAOpaidOut","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[],"name":"minQuorumDivisor","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":false,"inputs":[{"name":"_newContract","type":"address"}],"name":"newContract","outputs":[],"type":"function"},{"constant":true,"inputs":[{"name":"_owner","type":"address"}],"name":"balanceOf","outputs":[{"name":"balance","type":"uint256"}],"type":"function"},{"constant":false,"inputs":[{"name":"_recipient","type":"address"},{"name":"_allowed","type":"bool"}],"name":"changeAllowedRecipients","outputs":[{"name":"_success","type":"bool"}],"type":"function"},{"constant":false,"inputs":[],"name":"halveMinQuorum","outputs":[{"name":"_success","type":"bool"}],"type":"function"},{"constant":true,"inputs":[{"name":"","type":"address"}],"name":"paidOut","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":false,"inputs":[{"name":"_proposalID","type":"uint256"},{"name":"_newCurator","type":"address"}],"name":"splitDAO","outputs":[{"name":"_success","type":"bool"}],"type":"function"},{"constant":true,"inputs":[],"name":"DAOrewardAccount","outputs":[{"name":"","type":"address"}],"type":"function"},{"constant":true,"inputs":[],"name":"proposalDeposit","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[],"name":"numberOfProposals","outputs":[{"name":"_numberOfProposals","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[],"name":"lastTimeMinQuorumMet","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":false,"inputs":[{"name":"_toMembers","type":"bool"}],"name":"retrieveDAOReward","outputs":[{"name":"_success","type":"bool"}],"type":"function"},{"constant":false,"inputs":[],"name":"receiveEther","outputs":[{"name":"","type":"bool"}],"type":"function"},{"constant":false,"inputs":[{"name":"_to","type":"address"},{"name":"_value","type":"uint256"}],"name":"transfer","outputs":[{"name":"success","type":"bool"}],"type":"function"},{"constant":true,"inputs":[],"name":"isFueled","outputs":[{"name":"","type":"bool"}],"type":"function"},{"constant":false,"inputs":[{"name":"_tokenHolder","type":"address"}],"name":"createTokenProxy","outputs":[{"name":"success","type":"bool"}],"type":"function"},{"constant":true,"inputs":[{"name":"_proposalID","type":"uint256"}],"name":"getNewDAOAddress","outputs":[{"name":"_newDAO","type":"address"}],"type":"function"},{"constant":false,"inputs":[{"name":"_proposalID","type":"uint256"},{"name":"_supportsProposal","type":"bool"}],"name":"vote","outputs":[{"name":"_voteID","type":"uint256"}],"type":"function"},{"constant":false,"inputs":[],"name":"getMyReward","outputs":[{"name":"_success","type":"bool"}],"type":"function"},{"constant":true,"inputs":[{"name":"","type":"address"}],"name":"rewardToken","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":false,"inputs":[{"name":"_from","type":"address"},{"name":"_to","type":"address"},{"name":"_value","type":"uint256"}],"name":"transferFromWithoutReward","outputs":[{"name":"success","type":"bool"}],"type":"function"},{"constant":true,"inputs":[{"name":"_owner","type":"address"},{"name":"_spender","type":"address"}],"name":"allowance","outputs":[{"name":"remaining","type":"uint256"}],"type":"function"},{"constant":false,"inputs":[{"name":"_proposalDeposit","type":"uint256"}],"name":"changeProposalDeposit","outputs":[],"type":"function"},{"constant":true,"inputs":[{"name":"","type":"address"}],"name":"blocked","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[],"name":"curator","outputs":[{"name":"","type":"address"}],"type":"function"},{"constant":true,"inputs":[{"name":"_proposalID","type":"uint256"},{"name":"_recipient","type":"address"},{"name":"_amount","type":"uint256"},{"name":"_transactionData","type":"bytes"}],"name":"checkProposalCode","outputs":[{"name":"_codeChecksOut","type":"bool"}],"type":"function"},{"constant":true,"inputs":[],"name":"privateCreation","outputs":[{"name":"","type":"address"}],"type":"function"},{"inputs":[{"name":"_curator","type":"address"},{"name":"_daoCreator","type":"address"},{"name":"_proposalDeposit","type":"uint256"},{"name":"_minTokensToCreate","type":"uint256"},{"name":"_closingTime","type":"uint256"},{"name":"_privateCreation","type":"address"}],"type":"constructor"},{"anonymous":false,"inputs":[{"indexed":true,"name":"_from","type":"address"},{"indexed":true,"name":"_to","type":"address"},{"indexed":false,"name":"_amount","type":"uint256"}],"name":"Transfer","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"_owner","type":"address"},{"indexed":true,"name":"_spender","type":"address"},{"indexed":false,"name":"_amount","type":"uint256"}],"name":"Approval","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"value","type":"uint256"}],"name":"FuelingToDate","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"to","type":"address"},{"indexed":false,"name":"amount","type":"uint256"}],"name":"CreatedToken","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"to","type":"address"},{"indexed":false,"name":"value","type":"uint256"}],"name":"Refund","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"proposalID","type":"uint256"},{"indexed":false,"name":"recipient","type":"address"},{"indexed":false,"name":"amount","type":"uint256"},{"indexed":false,"name":"newCurator","type":"bool"},{"indexed":false,"name":"description","type":"string"}],"name":"ProposalAdded","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"proposalID","type":"uint256"},{"indexed":false,"name":"position","type":"bool"},{"indexed":true,"name":"voter","type":"address"}],"name":"Voted","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"proposalID","type":"uint256"},{"indexed":false,"name":"result","type":"bool"},{"indexed":false,"name":"quorum","type":"uint256"}],"name":"ProposalTallied","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"_newCurator","type":"address"}],"name":"NewCurator","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"_recipient","type":"address"},{"indexed":false,"name":"_allowed","type":"bool"}],"name":"AllowedRecipientChanged","type":"event"}]
-var daoContract = eth.contract(daoABI);
-var DAO = daoContract.at("0xbb9bc244d798123fde783fcc1c72d3bb8c189413");
-
-module.exports = function(req, res){
- console.log(req.body)
-
- if (!("action" in req.body))
- res.status(400).send();
- else if (req.body.action=="info") {
- try {
- var actualBalance = DAO.actualBalance();
- actualBalance = etherUnits.toEther(actualBalance, 'wei');
- var extraBalance = eth.getBalance(extraBalanceAddr);
- extraBalance = etherUnits.toEther(extraBalance, 'wei');
- var totalSupply = DAO.totalSupply();
- totalSupply = etherUnits.toEther(totalSupply, 'wei')*100;
- var daoData = {
- "balance": actualBalance,
- "extra_balance": extraBalance,
- "total_supply": totalSupply
- }
- res.write(JSON.stringify(daoData));
- res.end();
- } catch (e) {
- console.error(e);
- }
- } else if (req.body.action=="balanceOf") {
- var addr = req.body.addr.toLowerCase();
- try {
- var tokens = DAO.balanceOf(addr);
- tokens = etherUnits.toEther(tokens, 'wei')*100;
- res.write(JSON.stringify({"tokens": tokens}));
- res.end();
- } catch (e) {
- console.error(e);
- }
- } else if (req.body.action=="createdTokens") {
- if (req.body.last_id)
- var options = {'_id': {$lt: req.body.last_id}};
- else
- var options = {};
- var ctFind = DAOCreatedToken.find(options).lean(true).sort('-blockNumber').limit(MAX_ENTRIES);
- ctFind.exec(function (err, docs) {
- if (!docs.length){
- res.write(JSON.stringify([]));
- } else {
- var formatDocs = docs.map( function(doc) {
- var d = doc;
- d.amount = etherUnits.toEther(d.amount, 'wei')*100;
- return d;
- });
- res.write(JSON.stringify(formatDocs));
- }
- res.end();
- });
- } else if (req.body.action=="transferTokens") {
- if (req.body.last_id)
- var options = {'_id': {$lt: req.body.last_id}};
- else
- var options = {};
- var ctFind = DAOTransferToken.find(options).lean(true).sort('-blockNumber').limit(MAX_ENTRIES);
- ctFind.exec(function (err, docs) {
- if (!docs.length){
- res.write(JSON.stringify([]));
- } else {
- var formatDocs = docs.map( function(doc) {
- var d = doc;
- d.amount = etherUnits.toEther(d.amount, 'wei')*100;
- return d;
- });
- res.write(JSON.stringify(formatDocs));
- }
- res.end();
- });
- }
-
-};
-
-const MAX_ENTRIES = 50;
\ No newline at end of file
diff --git a/routes/fiat.js b/routes/fiat.js
deleted file mode 100644
index 4ebf13a83..000000000
--- a/routes/fiat.js
+++ /dev/null
@@ -1,33 +0,0 @@
-var http = require('http');
-var etherUnits = require(__lib + "etherUnits.js")
-
-module.exports = function(req, res) {
- var addr = req.body.addr;
- if (typeof addr !== "undefined")
- addr = addr.toLowerCase();
- else
- res.sendStatus(400);
-
- var options = {
- host: 'api.blockcypher.com',
- port: '80',
- path: '/v1/eth/main/addrs/' + addr + '/balance',
- method: 'GET'
- };
-
- var balance = 0;
- http.request(options, function(bcRes) {
- bcRes.on('data', function (data) {
- try {
- balance = JSON.parse(data).balance;
- balance = etherUnits.toEther( balance, "wei");
- } catch (e) {
- console.error("BC err, probably invalid addr");
- }
- res.write(JSON.stringify({"balance": balance}));
- res.end();
- })
- }).end();
-
-}
-
diff --git a/routes/filters.js b/routes/filters.js
index 94c983746..dadc7f49b 100644
--- a/routes/filters.js
+++ b/routes/filters.js
@@ -1,127 +1,111 @@
'use strict';
-var etherUnits = require(__lib + "etherUnits.js")
-var BigNumber = require('bignumber.js');
-var RLP = require('rlp');
+
+const etherUnits = require(`${__lib}etherUnits.js`);
+const BigNumber = require('bignumber.js');
+const RLP = require('rlp');
/*
- Filter an array of TX
+ Filter an array of TX
*/
function filterTX(txs, value) {
- return txs.map(function(tx){
- return [tx.hash, tx.blockNumber, tx.from, tx.to, etherUnits.toEther(new BigNumber(tx.value), 'ether'), tx.gas, tx.timestamp, tx.creates];
- })
+ return txs.map(tx => [tx.hash, tx.blockNumber, tx.from, tx.to, etherUnits.toEther(new BigNumber(tx.value), 'ether'), tx.gas, tx.timestamp, tx.creates]);
}
function filterTrace(txs, value) {
- return txs.map(function(tx){
- var t = tx;
- if (t.type == "suicide") {
- if (t.action.address)
- t.from = t.action.address;
- if (t.action.balance)
- t.value = etherUnits.toEther( new BigNumber(t.action.balance), "wei");
- if (t.action.refundAddress)
- t.to = t.action.refundAddress;
+ return txs.map((tx) => {
+ const t = tx;
+ if (t.type == 'suicide') {
+ if (t.action.address) t.from = t.action.address;
+ if (t.action.balance) t.value = etherUnits.toEther(new BigNumber(t.action.balance), 'wei');
+ if (t.action.refundAddress) t.to = t.action.refundAddress;
} else {
- if (t.action.to)
- t.to = t.action.to;
- t.from = t.action.from;
- if (t.action.gas)
- t.gas = new BigNumber(t.action.gas).toNumber();
- if ((t.result) && (t.result.gasUsed))
- t.gasUsed = new BigNumber(t.result.gasUsed).toNumber();
- if ((t.result) && (t.result.address))
- t.to = t.result.address;
- t.value = etherUnits.toEther( new BigNumber(t.action.value), "wei");
+ if (t.action.to) t.to = t.action.to;
+ t.from = t.action.from;
+ if (t.action.gas) t.gas = new BigNumber(t.action.gas).toNumber();
+ if ((t.result) && (t.result.gasUsed)) t.gasUsed = new BigNumber(t.result.gasUsed).toNumber();
+ if ((t.result) && (t.result.address)) t.to = t.result.address;
+ t.value = etherUnits.toEther(new BigNumber(t.action.value), 'wei');
}
return t;
- })
+ });
}
function filterBlock(block, field, value) {
- var tx = block.transactions.filter(function(obj) {
- return obj[field]==value;
- });
+ let tx = block.transactions.filter(obj => obj[field] == value);
tx = tx[0];
- if (typeof tx !== "undefined")
- tx.timestamp = block.timestamp;
+ if (typeof tx !== 'undefined') tx.timestamp = block.timestamp;
return tx;
}
/* make blocks human readable */
function filterBlocks(blocks) {
if (blocks.constructor !== Array) {
- var b = blocks;
- var ascii = hex2ascii(blocks.extraData);
+ const b = blocks;
+ const ascii = hex2ascii(blocks.extraData);
b.extraDataHex = blocks.extraData;
b.extraData = ascii;
return b;
}
- return blocks.map(function(block) {
- var b = block;
- var ascii = hex2ascii(block.extraData);
+ return blocks.map((block) => {
+ const b = block;
+ const ascii = hex2ascii(block.extraData);
b.extraDataHex = block.extraData;
b.extraData = ascii;
return b;
- })
+ });
}
/* stupid datatable format */
function datatableTX(txs) {
- return txs.map(function(tx){
- return [tx.hash, tx.blockNumber, tx.from, tx.to,
- etherUnits.toEther(new BigNumber(tx.value), 'wei'), tx.gas, tx.timestamp]
- })
+ return txs.map(tx => [tx.hash, tx.blockNumber, tx.from, tx.to,
+ etherUnits.toEther(new BigNumber(tx.value), 'wei'), tx.gas, tx.timestamp]);
}
function internalTX(txs) {
- return txs.map(function(tx){
- return [tx.transactionHash, tx.blockNumber, tx.action.from, tx.action.to,
- etherUnits.toEther(new BigNumber(tx.action.value), 'wei'), tx.action.gas, tx.timestamp]
- })
+ return txs.map(tx => [tx.transactionHash, tx.blockNumber, tx.action.from, tx.action.to,
+ etherUnits.toEther(new BigNumber(tx.action.value), 'wei'), tx.action.gas, tx.timestamp]);
}
/* modified baToJSON() routine from rlp */
function baToString(ba) {
if (Buffer.isBuffer(ba)) {
return ba.toString('ascii');
- } else if (ba instanceof Array) {
- var array = [];
- for (var i = 0; i < ba.length; i++) {
+ } if (ba instanceof Array) {
+ const array = [];
+ for (let i = 0; i < ba.length; i++) {
array.push(baToString(ba[i]));
}
return array.join('/');
- } else {
- return ba;
}
+ return ba;
+
}
var hex2ascii = function (hexIn) {
- var hex = hexIn.toString();
- var str = '';
+ const hex = hexIn.toString();
+ let str = '';
try {
- var ba = RLP.decode(hex);
- var test = ba[1].toString('ascii');
+ const ba = RLP.decode(hex);
+ const test = ba[1].toString('ascii');
if (test == 'geth' || test == 'Parity') {
// FIXME
ba[0] = ba[0].toString('hex');
}
str = baToString(ba);
- } catch(e) {
- for (var i = 0; i < hex.length; i += 2)
- str += String.fromCharCode(parseInt(hex.substr(i, 2), 16));
+ } catch (e) {
+ for (let i = 0; i < hex.length; i += 2) str += String.fromCharCode(parseInt(hex.substr(i, 2), 16));
}
return str;
-}
+};
module.exports = {
- filterBlock: filterBlock,
- filterBlocks: filterBlocks,
- filterTX: filterTX,
- filterTrace: filterTrace,
- datatableTX: datatableTX,
- internalTX: internalTX
-}
+ filterBlock,
+ filterBlocks,
+ filterTX,
+ filterTrace,
+ datatableTX,
+ internalTX,
+};
diff --git a/routes/index.js b/routes/index.js
index 46c230147..31f13c6e2 100644
--- a/routes/index.js
+++ b/routes/index.js
@@ -1,25 +1,23 @@
-var mongoose = require( 'mongoose' );
+const mongoose = require('mongoose');
-var Block = mongoose.model( 'Block' );
-var Transaction = mongoose.model( 'Transaction' );
-var filters = require('./filters');
+const Block = mongoose.model('Block');
+const Transaction = mongoose.model('Transaction');
+const Account = mongoose.model('Account');
+const async = require('async');
+const filters = require('./filters');
-var async = require('async');
+module.exports = function (app) {
+ const web3relay = require('./web3relay');
-module.exports = function(app){
- var web3relay = require('./web3relay');
+ const Token = require('./token');
- var DAO = require('./dao');
- var Token = require('./token');
+ const compile = require('./compiler');
+ const stats = require('./stats');
+ const richList = require('./richlist');
- var compile = require('./compiler');
- var fiat = require('./fiat');
- var stats = require('./stats');
- var richList = require('./richlist');
-
- /*
+ /*
Local DB: data request format
- { "address": "0x1234blah", "txin": true }
+ { "address": "0x1234blah", "txin": true }
{ "tx": "0x1234blah" }
{ "block": "1234" }
*/
@@ -29,29 +27,30 @@ module.exports = function(app){
app.post('/tx', getTx);
app.post('/block', getBlock);
app.post('/data', getData);
+ app.get('/total', getTotal);
- app.post('/daorelay', DAO);
- app.post('/tokenrelay', Token);
+ app.post('/tokenrelay', Token);
app.post('/web3relay', web3relay.data);
app.post('/compile', compile);
- app.post('/fiat', fiat);
app.post('/stats', stats);
-}
+};
-var getAddr = function(req, res){
+const getAddr = async (req, res) => {
// TODO: validate addr and tx
- var addr = req.body.addr.toLowerCase();
- var count = parseInt(req.body.count);
+ const addr = req.body.addr.toLowerCase();
+ const count = parseInt(req.body.count);
- var limit = parseInt(req.body.length);
- var start = parseInt(req.body.start);
+ const limit = parseInt(req.body.length);
+ const start = parseInt(req.body.start);
- var data = { draw: parseInt(req.body.draw), recordsFiltered: count, recordsTotal: count, mined: 0 };
+ const data = {
+ draw: parseInt(req.body.draw), recordsFiltered: count, recordsTotal: count, mined: 0,
+ };
- var addrFind = Transaction.find( { $or: [{"to": addr}, {"from": addr}] })
+ const addrFind = Transaction.find({ $or: [{ 'to': addr }, { 'from': addr }] });
- var sortOrder = '-blockNumber';
+ let sortOrder = '-blockNumber';
if (req.body.order && req.body.order[0] && req.body.order[0].column) {
// date or blockNumber column
if (req.body.order[0].column == 1 || req.body.order[0].column == 6) {
@@ -61,79 +60,77 @@ var getAddr = function(req, res){
}
}
- addrFind.lean(true).sort(sortOrder).skip(start).limit(limit)
- .exec("find", function (err, docs) {
- if (docs)
- data.data = filters.filterTX(docs, addr);
- else
- data.data = [];
+ addrFind.lean(true).sort(sortOrder).skip(start).limit(limit)
+ .exec('find', (err, docs) => {
+ if (docs) data.data = filters.filterTX(docs, addr);
+ else data.data = [];
res.write(JSON.stringify(data));
res.end();
});
};
-var getAddrCounter = function(req, res) {
- var addr = req.body.addr.toLowerCase();
- var count = parseInt(req.body.count);
- var data = { recordsFiltered: count, recordsTotal: count, mined: 0 };
+var getAddrCounter = function (req, res) {
+ const addr = req.body.addr.toLowerCase();
+ const count = parseInt(req.body.count);
+ const data = { recordsFiltered: count, recordsTotal: count, mined: 0 };
async.waterfall([
- function(callback) {
+ function (callback) {
- Transaction.count({ $or: [{"to": addr}, {"from": addr}] }, function(err, count) {
- if (!err && count) {
- // fix recordsTotal
- data.recordsTotal = count;
- data.recordsFiltered = count;
- }
- callback(null);
- });
+ Transaction.count({ $or: [{ 'to': addr }, { 'from': addr }] }, (err, count) => {
+ if (!err && count) {
+ // fix recordsTotal
+ data.recordsTotal = count;
+ data.recordsFiltered = count;
+ }
+ callback(null);
+ });
- }, function(callback) {
+ }, function (callback) {
- Block.count({ "miner": addr }, function(err, count) {
- if (!err && count) {
- data.mined = count;
- }
- callback(null);
- });
+ Block.count({ 'miner': addr }, (err, count) => {
+ if (!err && count) {
+ data.mined = count;
+ }
+ callback(null);
+ });
- }], function (err) {
+ }], (err) => {
res.write(JSON.stringify(data));
res.end();
});
};
-var getBlock = function(req, res) {
+var getBlock = function (req, res) {
// TODO: support queries for block hash
- var txQuery = "number";
- var number = parseInt(req.body.block);
+ const txQuery = 'number';
+ const number = parseInt(req.body.block);
- var blockFind = Block.findOne( { number : number }).lean(true);
- blockFind.exec(function (err, doc) {
+ const blockFind = Block.findOne({ number }).lean(true);
+ blockFind.exec((err, doc) => {
if (err || !doc) {
- console.error("BlockFind error: " + err)
+ console.error(`BlockFind error: ${err}`);
console.error(req.body);
- res.write(JSON.stringify({"error": true}));
+ res.write(JSON.stringify({ 'error': true }));
} else {
- var block = filters.filterBlocks([doc]);
+ const block = filters.filterBlocks([doc]);
res.write(JSON.stringify(block[0]));
}
res.end();
});
};
-var getTx = function(req, res){
- var tx = req.body.tx.toLowerCase();
- var txFind = Block.findOne( { "transactions.hash" : tx }, "transactions timestamp")
- .lean(true);
- txFind.exec(function (err, doc) {
- if (!doc){
- console.log("missing: " +tx)
+var getTx = function (req, res) {
+ const tx = req.body.tx.toLowerCase();
+ const txFind = Block.findOne({ 'transactions.hash': tx }, 'transactions timestamp')
+ .lean(true);
+ txFind.exec((err, doc) => {
+ if (!doc) {
+ console.log(`missing: ${tx}`);
res.write(JSON.stringify({}));
res.end();
} else {
// filter transactions
- var txDocs = filters.filterBlock(doc, "hash", tx)
+ const txDocs = filters.filterBlock(doc, 'hash', tx);
res.write(JSON.stringify(txDocs));
res.end();
}
@@ -142,89 +139,101 @@ var getTx = function(req, res){
/*
Fetch data from DB
*/
-var getData = function(req, res){
+var getData = function (req, res) {
// TODO: error handling for invalid calls
- var action = req.body.action.toLowerCase();
- var limit = req.body.limit
+ const action = req.body.action.toLowerCase();
+ const { limit } = req.body;
if (action in DATA_ACTIONS) {
- if (isNaN(limit))
- var lim = MAX_ENTRIES;
- else
- var lim = parseInt(limit);
+ if (isNaN(limit)) var lim = MAX_ENTRIES;
+ else var lim = parseInt(limit);
DATA_ACTIONS[action](lim, res);
- } else {
- console.error("Invalid Request: " + action)
+ } else {
+ console.error(`Invalid Request: ${action}`);
res.status(400).send();
}
};
-/*
+/*
+ Total supply API code
+*/
+var getTotal = function (req, res) {
+ Account.aggregate([
+ { $group: { _id: null, totalSupply: { $sum: '$balance' } } },
+ ]).exec((err, docs) => {
+ if (err) {
+ res.write('Error getting total supply');
+ res.end();
+ }
+ res.write(docs[0].totalSupply.toString());
+ res.end();
+ });
+};
+
+/*
temporary blockstats here
*/
-var latestBlock = function(req, res) {
- var block = Block.findOne({}, "totalDifficulty")
- .lean(true).sort('-number');
- block.exec(function (err, doc) {
+const latestBlock = function (req, res) {
+ const block = Block.findOne({}, 'totalDifficulty')
+ .lean(true).sort('-number');
+ block.exec((err, doc) => {
res.write(JSON.stringify(doc));
res.end();
});
-}
-
+};
-var getLatest = function(lim, res, callback) {
- var blockFind = Block.find({}, "number transactions timestamp miner extraData")
- .lean(true).sort('-number').limit(lim);
- blockFind.exec(function (err, docs) {
+const getLatest = function (lim, res, callback) {
+ const blockFind = Block.find({}, 'number transactions timestamp miner extraData')
+ .lean(true).sort('-number').limit(lim);
+ blockFind.exec((err, docs) => {
callback(docs, res);
});
-}
+};
/* get blocks from db */
-var sendBlocks = function(lim, res) {
- var blockFind = Block.find({}, "number timestamp miner extraData")
- .lean(true).sort('-number').limit(lim);
- blockFind.exec(function (err, docs) {
- if(!err && docs) {
- var blockNumber = docs[docs.length - 1].number;
+const sendBlocks = function (lim, res) {
+ const blockFind = Block.find({}, 'number timestamp miner extraData')
+ .lean(true).sort('-number').limit(lim);
+ blockFind.exec((err, docs) => {
+ if (!err && docs) {
+ const blockNumber = docs[docs.length - 1].number;
// aggregate transaction counters
Transaction.aggregate([
- {$match: { blockNumber: { $gte: blockNumber } }},
- {$group: { _id: '$blockNumber', count: { $sum: 1 } }}
- ]).exec(function(err, results) {
- var txns = {};
+ { $match: { blockNumber: { $gte: blockNumber } } },
+ { $group: { _id: '$blockNumber', count: { $sum: 1 } } },
+ ]).exec((err, results) => {
+ const txns = {};
if (!err && results) {
// set transaction counters
- results.forEach(function(txn) {
+ results.forEach((txn) => {
txns[txn._id] = txn.count;
});
- docs.forEach(function(doc) {
+ docs.forEach((doc) => {
doc.txn = txns[doc.number] || 0;
});
}
- res.write(JSON.stringify({"blocks": filters.filterBlocks(docs)}));
+ res.write(JSON.stringify({ 'blocks': filters.filterBlocks(docs) }));
res.end();
});
} else {
- console.log("blockFind error:" + err);
- res.write(JSON.stringify({"error": true}));
+ console.log(`blockFind error:${err}`);
+ res.write(JSON.stringify({ 'error': true }));
res.end();
}
});
-}
+};
-var sendTxs = function(lim, res) {
+const sendTxs = function (lim, res) {
Transaction.find({}).lean(true).sort('-blockNumber').limit(lim)
- .exec(function (err, txs) {
- res.write(JSON.stringify({"txs": txs}));
- res.end();
- });
-}
+ .exec((err, txs) => {
+ res.write(JSON.stringify({ 'txs': txs }));
+ res.end();
+ });
+};
const MAX_ENTRIES = 10;
const DATA_ACTIONS = {
- "latest_blocks": sendBlocks,
- "latest_txs": sendTxs
-}
-
+ 'latest_blocks': sendBlocks,
+ 'latest_txs': sendTxs,
+};
diff --git a/routes/richlist.js b/routes/richlist.js
index 8516645c2..6772f1757 100644
--- a/routes/richlist.js
+++ b/routes/richlist.js
@@ -3,47 +3,48 @@
* Endpoint for richlist
*/
-var async = require('async');
-var mongoose = require('mongoose');
+const async = require('async');
+const mongoose = require('mongoose');
-require( '../db.js' );
-var Account = mongoose.model('Account');
+require('../db.js');
-var getAccounts = function(req, res) {
- var self = getAccounts;
+const Account = mongoose.model('Account');
+
+var getAccounts = function (req, res) {
+ const self = getAccounts;
if (!self.totalSupply) {
self.totalSupply = -1;
self.timestamp = 0;
}
// check cached totalSupply
- if (new Date() - self.timestamp > 30*60*1000) {
+ if (new Date() - self.timestamp > 30 * 60 * 1000) {
self.totalSupply = -1;
self.timestamp = 0;
}
// count accounts only once
- var count = req.body.recordsTotal || 0;
+ let count = req.body.recordsTotal || 0;
count = parseInt(count);
if (count < 0) {
count = 0;
}
// get totalSupply only once
- var queryTotalSupply = self.totalSupply || req.body.totalSupply || null;
+ const queryTotalSupply = self.totalSupply || req.body.totalSupply || null;
async.waterfall([
- function(callback) {
+ function (callback) {
if (queryTotalSupply < 0) {
Account.aggregate([
- { $group: { _id: null, totalSupply: { $sum: '$balance' } } }
- ]).exec(function(err, docs) {
+ { $group: { _id: null, totalSupply: { $sum: '$balance' } } },
+ ]).exec((err, docs) => {
if (err) {
callbck(err);
return;
}
- var totalSupply = docs[0].totalSupply;
+ const { totalSupply } = docs[0];
// update cache
self.timestamp = new Date();
self.totalSupply = totalSupply;
@@ -53,10 +54,10 @@ var getAccounts = function(req, res) {
callback(null, queryTotalSupply > 0 ? queryTotalSupply : null);
}
},
- function(totalSupply, callback) {
+ function (totalSupply, callback) {
if (!count) {
// get the number of all accounts
- Account.count({}, function(err, count) {
+ Account.count({}, (err, count) => {
if (err) {
callbck(err);
return;
@@ -68,16 +69,16 @@ var getAccounts = function(req, res) {
} else {
callback(null, totalSupply, count);
}
- }
- ], function(error, totalSupply, count) {
+ },
+ ], (error, totalSupply, count) => {
if (error) {
- res.write(JSON.stringify({"error": true}));
+ res.write(JSON.stringify({ 'error': true }));
res.end();
return;
}
// check sort order
- var sortOrder = { balance: -1 };
+ let sortOrder = { balance: -1 };
if (req.body.order && req.body.order[0] && req.body.order[0].column) {
// balance column
if (req.body.order[0].column == 3) {
@@ -94,30 +95,28 @@ var getAccounts = function(req, res) {
}
// set datatable params
- var limit = parseInt(req.body.length);
- var start = parseInt(req.body.start);
+ const limit = parseInt(req.body.length);
+ const start = parseInt(req.body.start);
- var data = { draw: parseInt(req.body.draw), recordsFiltered: count, recordsTotal: count };
+ const data = { draw: parseInt(req.body.draw), recordsFiltered: count, recordsTotal: count };
if (totalSupply > 0) {
data.totalSupply = totalSupply;
}
- Account.find({}).lean(true).sort(sortOrder).skip(start).limit(limit)
- .exec(function (err, accounts) {
+ Account.find({}).lean(true).sort(sortOrder).skip(start)
+ .limit(limit)
+ .exec((err, accounts) => {
if (err) {
- res.write(JSON.stringify({"error": true}));
+ res.write(JSON.stringify({ 'error': true }));
res.end();
return;
}
- data.data = accounts.map(function(account, i) {
- return [i + 1 + start, account.address, account.type, account.balance, account.blockNumber];
- });
+ data.data = accounts.map((account, i) => [i + 1 + start, account.address, account.type, account.balance, account.blockNumber]);
res.write(JSON.stringify(data));
res.end();
- }
- );
+ });
});
-}
+};
module.exports = getAccounts;
diff --git a/routes/stats.js b/routes/stats.js
index 68943f409..243ba5a8e 100644
--- a/routes/stats.js
+++ b/routes/stats.js
@@ -1,17 +1,18 @@
-var mongoose = require( 'mongoose' );
-var Block = mongoose.model( 'Block' );
-var BlockStat = mongoose.model( 'BlockStat' );
-var filters = require('./filters');
+const mongoose = require('mongoose');
-var https = require('https');
-var async = require('async');
+const Block = mongoose.model('Block');
+const BlockStat = mongoose.model('BlockStat');
-var etherUnits = require(__lib + "etherUnits.js")
+const https = require('https');
+const async = require('async');
+const filters = require('./filters');
-var config = {};
+const etherUnits = require(`${__lib}etherUnits.js`);
+
+let config = {};
try {
config = require('../config.json');
-} catch(e) {
+} catch (e) {
if (e.code == 'MODULE_NOT_FOUND') {
console.log('No config file found. Using default configuration... (config.example.json)');
config = require('../config.example.json');
@@ -21,26 +22,18 @@ try {
}
}
-module.exports = function(req, res) {
+module.exports = function (req, res) {
- if (!("action" in req.body))
- res.status(400).send();
-
- else if (req.body.action=="miners")
- getMinerStats(req, res)
-
- else if (req.body.action=="hashrate")
- getHashrate(res);
+ if (!('action' in req.body)) res.status(400).send();
- else if (req.body.action=="hashrates")
- getHashrates(req, res);
-
-}
+ else if (req.body.action == 'miners') { getMinerStats(req, res); } else if (req.body.action == 'hashrate') { getHashrate(res); } else if (req.body.action == 'hashrates') getHashrates(req, res);
+
+};
/**
Aggregate miner stats
**/
-var getMinerStats = function(req, res) {
- var range = 6*60*60; // 6 hours
+var getMinerStats = function (req, res) {
+ let range = 6 * 60 * 60; // 6 hours
// check validity of range
if (req.body.range && req.body.range < 60 * 60 * 24 * 7) {
range = parseInt(req.body.range);
@@ -49,31 +42,34 @@ var getMinerStats = function(req, res) {
}
}
- var timebefore = parseInt((new Date())/1000) - range;
- Block.find({ timestamp: { $lte: timebefore } }, "timestamp number")
- .lean(true).sort('-number').limit(1).exec(function (err, docs) {
- if (err || !docs) {
- console.error(err);
- res.status(500).send();
- res.end();
- return;
- }
- var blockNumber = docs[0].number;
- console.log('getMinerStats(): blockNumber = ' + blockNumber);
- Block.aggregate([
+ const timebefore = parseInt((new Date()) / 1000) - range;
+ Block.find({ timestamp: { $lte: timebefore } }, 'timestamp number')
+ .lean(true).sort('-number').limit(1)
+ .exec((err, docs) => {
+ if (err || !docs) {
+ console.error(err);
+ res.status(500).send();
+ res.end();
+ return;
+ }
+ const blockNumber = docs[0].number;
+ console.log(`getMinerStats(): blockNumber = ${blockNumber}`);
+ Block.aggregate([
{ $match: { number: { $gte: blockNumber } } },
- { $group: {
- _id: '$miner',
- timestamp: {$min: '$timestamp' },
- count: {$sum: 1} }
- }
- ], function (err, result) {
+ {
+ $group: {
+ _id: '$miner',
+ timestamp: { $min: '$timestamp' },
+ count: { $sum: 1 },
+ },
+ },
+ ], (err, result) => {
if (err) {
console.error(err);
res.status(500).send();
} else {
if (config.settings.miners) {
- result.forEach(function(m) {
+ result.forEach((m) => {
if (config.settings.miners[m._id]) {
m._id = config.settings.miners[m._id];
}
@@ -82,22 +78,22 @@ var getMinerStats = function(req, res) {
res.write(JSON.stringify(result));
res.end();
}
+ });
});
- });
-}
+};
/**
Aggregate network hashrates
**/
-var getHashrates = function(req, res) {
+var getHashrates = function (req, res) {
// setup default range
//var range = 7 * 24 * 60 * 60; /* 7 days */
//var range = 14 * 24 * 60 * 60; /* 14 days */
//var range = 30 * 24 * 60 * 60; /* 1 months */
//var range = 2 * 30 * 24 * 60 * 60; /* 2 months */
- var range = 6 * 30 * 24 * 60 * 60; /* 6 months */
+ let range = 6 * 30 * 24 * 60 * 60; /* 6 months */
if (req.body.days && req.body.days <= 365) {
- var days = parseInt(req.body.days);
+ let days = parseInt(req.body.days);
if (days <= 1) {
days = 1;
}
@@ -110,131 +106,133 @@ var getHashrates = function(req, res) {
}
// select mod
- var rngs = [ 30*60, 60*60, 2*60*60, 4*60*60, 6*60*60,
- 12*60*60, 24*60*60, 7*24*60*60, 14*24*60*60, 30*24*60*60
- ];
- var mods = [ 1, 1, 2, 10, 10,
- 15, 30, 15*60, 30*60, 30*60,
- 60*60
- ];
- var i = 0;
- rngs.forEach(function(r) {
+ const rngs = [30 * 60, 60 * 60, 2 * 60 * 60, 4 * 60 * 60, 6 * 60 * 60,
+ 12 * 60 * 60, 24 * 60 * 60, 7 * 24 * 60 * 60, 14 * 24 * 60 * 60, 30 * 24 * 60 * 60,
+ ];
+ const mods = [1, 1, 2, 10, 10,
+ 15, 30, 15 * 60, 30 * 60, 30 * 60,
+ 60 * 60,
+ ];
+ let i = 0;
+ rngs.forEach((r) => {
if (range > r) {
i++;
}
- return;
+
});
- var mod = mods[i];
+ const mod = mods[i];
- var timestamp = parseInt((new Date())/1000) - range;
+ const timestamp = parseInt((new Date()) / 1000) - range;
BlockStat.aggregate([
{ $match: { timestamp: { $gte: timestamp } } },
- { $group: {
- _id: {
+ {
+ $group: {
+ _id: {
timestamp: {
- $subtract: [ '$timestamp', { $mod: [ '$timestamp', mod ] } ]
- }
+ $subtract: ['$timestamp', { $mod: ['$timestamp', mod] }],
+ },
+ },
+ blockTime: { $avg: '$blockTime' },
+ difficulty: { $max: '$difficulty' },
+ count: { $sum: 1 },
},
- blockTime: { $avg: '$blockTime' },
- difficulty: { $max: '$difficulty' },
- count: { $sum: 1 }
- }},
- { $project: {
- "_id": 0,
- "timestamp": '$_id.timestamp',
- "blockTime": 1,
- "difficulty": 1,
- "count": 1,
- }
- }]).sort('timestamp').exec(function(err, docs) {
- var hashrates = [];
- docs.forEach(function(doc) {
+ },
+ {
+ $project: {
+ '_id': 0,
+ 'timestamp': '$_id.timestamp',
+ 'blockTime': 1,
+ 'difficulty': 1,
+ 'count': 1,
+ },
+ }]).sort('timestamp').exec((err, docs) => {
+ const hashrates = [];
+ docs.forEach((doc) => {
doc.instantHashrate = doc.difficulty / doc.blockTime;
doc.unixtime = doc.timestamp; /* FIXME */
doc.timestamp = doc.timestamp;
});
- res.write(JSON.stringify({"hashrates": docs}));
+ res.write(JSON.stringify({ 'hashrates': docs }));
res.end();
});
-}
+};
/**
Get hashrate Diff stuff
**/
-var getHashrate = function(res) {
- var blockFind = Block.find({}, "difficulty timestamp number")
- .lean(true).sort('-number').limit(100);
- blockFind.exec(function (err, docs) {
- var blockTime = (docs[0].timestamp - docs[99].timestamp)/100;
- var hashrate = docs[0].difficulty / blockTime;
+var getHashrate = function (res) {
+ const blockFind = Block.find({}, 'difficulty timestamp number')
+ .lean(true).sort('-number').limit(100);
+ blockFind.exec((err, docs) => {
+ const blockTime = (docs[0].timestamp - docs[99].timestamp) / 100;
+ const hashrate = docs[0].difficulty / blockTime;
res.write(JSON.stringify({
- "blocks": docs,
- "hashrate": hashrate,
- "blockTime": blockTime,
- "blockHeight": docs[0].number,
- "difficulty": docs[0].difficulty
+ 'blocks': docs,
+ 'hashrate': hashrate,
+ 'blockTime': blockTime,
+ 'blockHeight': docs[0].number,
+ 'difficulty': docs[0].difficulty,
}));
res.end();
});
-}
+};
/**
OLD CODE DON'T USE
Swipe ETC ETH data
**/
-var getEtcEth = function(res) {
- var options = [{
+const getEtcEth = function (res) {
+ const options = [{
host: 'api.minergate.com',
path: '/1.0/etc/status',
method: 'GET',
- data: 'etc'
- },{
+ data: 'etc',
+ }, {
host: 'api.minergate.com',
path: '/1.0/eth/status',
method: 'GET',
- data: 'eth'
+ data: 'eth',
}];
-
- async.map(options, function(opt, callback) {
-
- https.request(opt, function(mg) {
- mg.on('data', function (data) {
+
+ async.map(options, (opt, callback) => {
+
+ https.request(opt, (mg) => {
+ mg.on('data', (data) => {
try {
- var result = JSON.parse(data.toString());
+ const result = JSON.parse(data.toString());
result.chain = opt.data;
callback(null, result);
} catch (e) {
callback(e);
}
- })
+ });
}).end();
- }, function(err, results) {
+ }, (err, results) => {
if (err) {
console.error(err);
res.status(500).send();
} else {
- if (results.length < 2)
- res.status(500).send();
+ if (results.length < 2) res.status(500).send();
else {
- var c = ((results[0].chain == "etc") ? 0 : 1);
- var h = 1 - c;
- var etcHashrate = parseInt(results[c].instantHashrate);
- var ethHashrate = parseInt(results[h].instantHashrate);
- var etcDiff = results[c].difficulty.toFixed(2);
- var ethDiff = results[h].difficulty.toFixed(2);
- var etcEthHash = parseInt(100*etcHashrate/ethHashrate);
- var etcEthDiff = parseInt(100*etcDiff/ethDiff);
+ const c = ((results[0].chain == 'etc') ? 0 : 1);
+ const h = 1 - c;
+ const etcHashrate = parseInt(results[c].instantHashrate);
+ const ethHashrate = parseInt(results[h].instantHashrate);
+ const etcDiff = results[c].difficulty.toFixed(2);
+ const ethDiff = results[h].difficulty.toFixed(2);
+ const etcEthHash = parseInt(100 * etcHashrate / ethHashrate);
+ const etcEthDiff = parseInt(100 * etcDiff / ethDiff);
res.write(JSON.stringify({
- "etcHashrate": etcHashrate,
- "ethHashrate": ethHashrate,
- "etcDiff": etcDiff,
- "ethDiff": ethDiff,
- "etcEthHash": etcEthHash,
- "etcEthDiff": etcEthDiff
+ 'etcHashrate': etcHashrate,
+ 'ethHashrate': ethHashrate,
+ 'etcDiff': etcDiff,
+ 'ethDiff': ethDiff,
+ 'etcEthHash': etcEthHash,
+ 'etcEthDiff': etcEthDiff,
}));
res.end();
- }
+ }
}
});
-}
+};
diff --git a/routes/token.js b/routes/token.js
index 5ef57629a..716d21dff 100644
--- a/routes/token.js
+++ b/routes/token.js
@@ -4,6 +4,35 @@
Endpoint for client interface with ERC-20 tokens
*/
+<<<<<<< HEAD
+const { eth } = require('./web3relay');
+
+const BigNumber = require('bignumber.js');
+
+const etherUnits = require(`${__lib}etherUnits.js`);
+
+const ABI = [{
+ 'constant': true, 'inputs': [], 'name': 'name', 'outputs': [{ 'name': '', 'type': 'string' }], 'payable': false, 'type': 'function',
+}, {
+ 'constant': true, 'inputs': [], 'name': 'totalSupply', 'outputs': [{ 'name': '', 'type': 'uint256' }], 'payable': false, 'type': 'function',
+}, {
+ 'constant': true, 'inputs': [], 'name': 'decimals', 'outputs': [{ 'name': '', 'type': 'uint8' }], 'payable': false, 'type': 'function',
+}, {
+ 'constant': true, 'inputs': [{ 'name': '', 'type': 'address' }], 'name': 'balanceOf', 'outputs': [{ 'name': '', 'type': 'uint256' }], 'payable': false, 'type': 'function',
+}, {
+ 'constant': true, 'inputs': [], 'name': 'symbol', 'outputs': [{ 'name': '', 'type': 'string' }], 'payable': false, 'type': 'function',
+}];
+
+module.exports = async (req, res) => {
+ console.log(req.body);
+
+ const contractAddress = req.body.address;
+
+ const Token = new eth.Contract(ABI, contractAddress);
+
+ if (!('action' in req.body)) res.status(400).send();
+ else if (req.body.action == 'info') {
+=======
require( '../db.js' );
var mongoose = require( 'mongoose' );
@@ -92,9 +121,25 @@ module.exports = function(req, res){
} catch (e) {
decimals = 0;
}
+>>>>>>> 0b8c4c3885e581183f3777ca1993136c3386be4e
try {
- var actualBalance = eth.getBalance(contractAddress);
+ let actualBalance = await eth.getBalance(contractAddress);
actualBalance = etherUnits.toEther(actualBalance, 'wei');
+<<<<<<< HEAD
+ const totalSupply = await Token.methods.totalSupply().call();
+ const name = await Token.methods.name().call();
+ const symbol = await Token.methods.symbol().call();
+ const count = await eth.getTransactionCount(contractAddress);
+
+ const tokenData = {
+ 'balance': actualBalance,
+ 'total_supply': totalSupply,
+ 'count': count,
+ 'name': name,
+ 'symbol': symbol,
+ 'bytecode': await eth.getCode(contractAddress),
+ };
+=======
var totalSupply = token.totalSupply();
var name = token.name();
var symbol = token.symbol();
@@ -117,11 +162,19 @@ module.exports = function(req, res){
"decimals": decimals,
"bytecode": eth.getCode(contractAddress)
}
+>>>>>>> 0b8c4c3885e581183f3777ca1993136c3386be4e
res.write(JSON.stringify(tokenData));
res.end();
} catch (e) {
console.error(e);
}
+<<<<<<< HEAD
+ } else if (req.body.action == 'balanceOf') {
+ const addr = req.body.user.toLowerCase();
+ try {
+ const tokens = await Token.methods.balanceOf(addr).call();
+ res.write(JSON.stringify({ 'tokens': tokens }));
+=======
} else if (req.body.action=="balanceOf") {
var addr = req.body.user.toLowerCase();
var decimals = 0;
@@ -136,6 +189,7 @@ module.exports = function(req, res){
var divisor = new BigNumber(10).pow(decimalsBN);
tokens = tokens.dividedBy(divisor);
res.write(JSON.stringify({"tokens": tokens}));
+>>>>>>> 0b8c4c3885e581183f3777ca1993136c3386be4e
res.end();
} catch (e) {
var tokens = token.balanceOf(addr);
@@ -164,6 +218,11 @@ module.exports = function(req, res){
} catch (e) {
decimals = 0;
}
+<<<<<<< HEAD
+ }
+
+};
+=======
var decimalsBN = new BigNumber(decimals);
var divisor = new BigNumber(10).pow(decimalsBN);
@@ -325,4 +384,5 @@ module.exports = function(req, res){
};
-const MAX_ENTRIES = 20;
\ No newline at end of file
+const MAX_ENTRIES = 20;
+>>>>>>> 0b8c4c3885e581183f3777ca1993136c3386be4e
diff --git a/routes/web3dummy.js b/routes/web3dummy.js
deleted file mode 100644
index 9cc7a56ae..000000000
--- a/routes/web3dummy.js
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/usr/bin/env node
-
-/*
- Stand-in for local testing of web3 calls
-*/
-var BigNumber = require('bignumber.js');
-var etherUnits = require(__lib + "etherUnits.js")
-
-exports.data = function(req, res){
- console.log(req.body)
-
- if ("addr" in req.body) {
- var addr = req.body.addr.toLowerCase();
- var options = req.body.options;
- var web3Tasks = [];
-
- var addrData = {};
-
- if (options.indexOf("balance") > -1) {
- addrData["balance"] = new BigNumber(75380000001024);
- addrData["balance"] = etherUnits.toEther(addrData["balance"], 'wei');
- }
- if (options.indexOf("count") > -1) {
- addrData["count"] = 139;
- }
- if (options.indexOf("bytecode") > -1) {
- addrData["isContract"] = true;
- addrData["bytecode"] = "0x606060405273da4a4626d3e16e094de3225a751aab7128e96526600060006101000a81548173ffffffffffffffffffffffffffffffffffffffff02191690830217905550610462806100516000396000f360606040526000357c0100000000000000000000000000000000000000000000000000000000900480632e6e504a1461005a5780633ccfd60b14610069578063eedcf50a14610078578063fdf97cb2146100b157610058565b005b61006760048050506100ea565b005b6100766004805050610277565b005b6100856004805050610424565b604051808273ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b6100be600480505061043c565b604051808273ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b600060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16600073bb9bc244d798123fde783fcc1c72d3bb8c18941373ffffffffffffffffffffffffffffffffffffffff166318160ddd604051817c01000000000000000000000000000000000000000000000000000000000281526004018090506020604051808303816000876161da5a03f115610002575050506040518051906020015073bb9bc244d798123fde783fcc1c72d3bb8c18941373ffffffffffffffffffffffffffffffffffffffff166370a0823130604051827c0100000000000000000000000000000000000000000000000000000000028152600401808273ffffffffffffffffffffffffffffffffffffffff1681526020019150506020604051808303816000876161da5a03f11561000257505050604051805190602001503073ffffffffffffffffffffffffffffffffffffffff16310103604051809050600060405180830381858888f19350505050505b565b600073bb9bc244d798123fde783fcc1c72d3bb8c18941373ffffffffffffffffffffffffffffffffffffffff166370a0823133604051827c0100000000000000000000000000000000000000000000000000000000028152600401808273ffffffffffffffffffffffffffffffffffffffff1681526020019150506020604051808303816000876161da5a03f1156100025750505060405180519060200150905073bb9bc244d798123fde783fcc1c72d3bb8c18941373ffffffffffffffffffffffffffffffffffffffff166323b872dd333084604051847c0100000000000000000000000000000000000000000000000000000000028152600401808473ffffffffffffffffffffffffffffffffffffffff1681526020018373ffffffffffffffffffffffffffffffffffffffff16815260200182815260200193505050506020604051808303816000876161da5a03f1156100025750505060405180519060200150158061041657503373ffffffffffffffffffffffffffffffffffffffff16600082604051809050600060405180830381858888f19350505050155b1561042057610002565b5b50565b73bb9bc244d798123fde783fcc1c72d3bb8c18941381565b600060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff168156";
- }
-
- res.write(JSON.stringify(addrData));
- res.end();
-
-
- } else if ("tx" in req.body) {
- var tx = {
- blockHash: "0x59fee9b288d1201841ca59569026a93fa0e32f350224019747145cc52d2877ba",
- blockNumber: 2004907,
- from: "0xf9436cd1bc93805bd54326dbb8857e15e9e5ef4a",
- gas: 90000,
- gasPrice: 20000000000,
- hash: "0x3868a24286d737841f42c55384b5593111defccfcec4a2d0b38115d67b10af6c",
- input: "0x",
- nonce: 3042,
- to: "0x7172e090ef7aad8fb5b58052040587aaf248d7be",
- transactionIndex: 5,
- value: etherUnits.toEther( new BigNumber("400000000000000000000"), "wei")
- }
-
- res.write(JSON.stringify(tx));
- res.end();
-
- } else {
-
- console.error("Invalid Request: " + action)
- res.status(400).send();
- }
-
-};
-
-exports.eth = new function() {
- this.getCode = function(addr) {
- return "0x606060405273da4a4626d3e16e094de3225a751aab7128e96526600060006101000a81548173ffffffffffffffffffffffffffffffffffffffff02191690830217905550610462806100516000396000f360606040526000357c0100000000000000000000000000000000000000000000000000000000900480632e6e504a1461005a5780633ccfd60b14610069578063eedcf50a14610078578063fdf97cb2146100b157610058565b005b61006760048050506100ea565b005b6100766004805050610277565b005b6100856004805050610424565b604051808273ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b6100be600480505061043c565b604051808273ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b600060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16600073bb9bc244d798123fde783fcc1c72d3bb8c18941373ffffffffffffffffffffffffffffffffffffffff166318160ddd604051817c01000000000000000000000000000000000000000000000000000000000281526004018090506020604051808303816000876161da5a03f115610002575050506040518051906020015073bb9bc244d798123fde783fcc1c72d3bb8c18941373ffffffffffffffffffffffffffffffffffffffff166370a0823130604051827c0100000000000000000000000000000000000000000000000000000000028152600401808273ffffffffffffffffffffffffffffffffffffffff1681526020019150506020604051808303816000876161da5a03f11561000257505050604051805190602001503073ffffffffffffffffffffffffffffffffffffffff16310103604051809050600060405180830381858888f19350505050505b565b600073bb9bc244d798123fde783fcc1c72d3bb8c18941373ffffffffffffffffffffffffffffffffffffffff166370a0823133604051827c0100000000000000000000000000000000000000000000000000000000028152600401808273ffffffffffffffffffffffffffffffffffffffff1681526020019150506020604051808303816000876161da5a03f1156100025750505060405180519060200150905073bb9bc244d798123fde783fcc1c72d3bb8c18941373ffffffffffffffffffffffffffffffffffffffff166323b872dd333084604051847c0100000000000000000000000000000000000000000000000000000000028152600401808473ffffffffffffffffffffffffffffffffffffffff1681526020018373ffffffffffffffffffffffffffffffffffffffff16815260200182815260200193505050506020604051808303816000876161da5a03f1156100025750505060405180519060200150158061041657503373ffffffffffffffffffffffffffffffffffffffff16600082604051809050600060405180830381858888f19350505050155b1561042057610002565b5b50565b73bb9bc244d798123fde783fcc1c72d3bb8c18941381565b600060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff168156";
- }
-}
diff --git a/routes/web3relay.js b/routes/web3relay.js
index 88d66a4f9..f53fa699c 100644
--- a/routes/web3relay.js
+++ b/routes/web3relay.js
@@ -4,9 +4,10 @@
Endpoint for client to talk to etc node
*/
-var Web3 = require("web3");
-var web3;
+const Web3 = require('web3');
+const web3explorer = require('web3-explorer');
+let web3;
var _ = require('lodash');
var BigNumber = require('bignumber.js');
var etherUnits = require(__lib + "etherUnits.js")
@@ -18,9 +19,21 @@ var mongoose = require( 'mongoose' );
var Contract = mongoose.model( 'Contract' );
var Transaction = mongoose.model( 'Transaction' );
-var getLatestBlocks = require('./index').getLatestBlocks;
-var filterBlocks = require('./filters').filterBlocks;
-var filterTrace = require('./filters').filterTrace;
+const _ = require('lodash');
+const BigNumber = require('bignumber.js');
+
+const etherUnits = require(`${__lib}etherUnits.js`);
+
+require('../db.js');
+const mongoose = require('mongoose');
+
+const Block = mongoose.model('Block');
+const Transaction = mongoose.model('Transaction');
+const Market = mongoose.model('Market');
+
+const { getLatestBlocks } = require('./index');
+const { filterBlocks } = require('./filters');
+const { filterTrace } = require('./filters');
const ERC20ABI = [{"constant":true,"inputs":[],"name":"name","outputs":[{"name":"","type":"string"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"spender","type":"address"},{"name":"tokens","type":"uint256"}],"name":"approve","outputs":[{"name":"success","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"totalSupply","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"from","type":"address"},{"name":"to","type":"address"},{"name":"tokens","type":"uint256"}],"name":"transferFrom","outputs":[{"name":"success","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"decimals","outputs":[{"name":"","type":"uint8"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"_totalSupply","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"tokenOwner","type":"address"}],"name":"balanceOf","outputs":[{"name":"balance","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[],"name":"acceptOwnership","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"owner","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"symbol","outputs":[{"name":"","type":"string"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"to","type":"address"},{"name":"tokens","type":"uint256"}],"name":"transfer","outputs":[{"name":"success","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"spender","type":"address"},{"name":"tokens","type":"uint256"},{"name":"data","type":"bytes"}],"name":"approveAndCall","outputs":[{"name":"success","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"newOwner","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"tokenAddress","type":"address"},{"name":"tokens","type":"uint256"}],"name":"transferAnyERC20Token","outputs":[{"name":"success","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"name":"tokenOwner","type":"address"},{"name":"spender","type":"address"}],"name":"allowance","outputs":[{"name":"remaining","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_newOwner","type":"address"}],"name":"transferOwnership","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"inputs":[],"payable":false,"stateMutability":"nonpayable","type":"constructor"},{"payable":true,"stateMutability":"payable","type":"fallback"},{"anonymous":false,"inputs":[{"indexed":true,"name":"_from","type":"address"},{"indexed":true,"name":"_to","type":"address"}],"name":"OwnershipTransferred","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"from","type":"address"},{"indexed":true,"name":"to","type":"address"},{"indexed":false,"name":"tokens","type":"uint256"}],"name":"Transfer","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"tokenOwner","type":"address"},{"indexed":true,"name":"spender","type":"address"},{"indexed":false,"name":"tokens","type":"uint256"}],"name":"Approval","type":"event"}];
@@ -33,20 +46,20 @@ const KnownMethodIDs = {
/*Start config for node connection and sync*/
// load config.json
-var config = { nodeAddr: 'localhost', gethPort: 8545 };
+const config = { nodeAddr: 'localhost', wsPort: 8546 };
try {
- var local = require('../config.json');
- _.extend(config, local);
- console.log('config.json found.');
+ var local = require('../config.json');
+ _.extend(config, local);
+ console.log('config.json found.');
} catch (error) {
- if (error.code === 'MODULE_NOT_FOUND') {
- var local = require('../config.example.json');
- _.extend(config, local);
- console.log('No config file found. Using default configuration... (config.example.json)');
- } else {
- throw error;
- process.exit(1);
- }
+ if (error.code === 'MODULE_NOT_FOUND') {
+ var local = require('../config.example.json');
+ _.extend(config, local);
+ console.log('No config file found. Using default configuration... (config.example.json)');
+ } else {
+ throw error;
+ process.exit(1);
+ }
}
// load token list
@@ -64,67 +77,103 @@ const KnownTokens = KnownTokenList.map((token)=> {
});
//Create Web3 connection
-console.log('Connecting ' + config.nodeAddr + ':' + config.gethPort + '...');
-if (typeof web3 !== "undefined") {
- web3 = new Web3(web3.currentProvider);
-} else {
- web3 = new Web3(new Web3.providers.HttpProvider('http://'+config.nodeAddr+':'+config.gethPort));
-}
+console.log(`Connecting ${config.nodeAddr}:${config.wsPort}...`);
+web3 = new Web3(new Web3.providers.WebsocketProvider(`ws://${config.nodeAddr}:${config.wsPort}`));
-if (web3.isConnected())
- console.log("Web3 connection established");
-else
- throw "No connection, please specify web3host in conf.json";
+if (web3.eth.net.isListening()) console.log('Web3 connection established');
+else throw 'No connection, please specify web3host in conf.json';
-if (web3.version.node.split('/')[0].toLowerCase().includes('parity')) {
- // parity extension
- web3 = require("../lib/trace.js")(web3);
-}
+async function detectNode() {
+ const nodeInfo = await web3.eth.getNodeInfo();
-var newBlocks = web3.eth.filter("latest");
-var newTxs = web3.eth.filter("pending");
+ if (nodeInfo.split('/')[0].toLowerCase().includes('parity')) {
+ console.log('Web3 has detected parity node configuration');
+ web3explorer(web3);
+ }
+ console.log(`Node version = ${nodeInfo}`);
+}
+detectNode();
-exports.data = function(req, res){
- console.log(req.body)
+exports.data = async (req, res) => {
+ console.log(req.body);
- if ("tx" in req.body) {
+ if ('tx' in req.body) {
var txHash = req.body.tx.toLowerCase();
- web3.eth.getTransaction(txHash, function(err, tx) {
- if(err || !tx) {
- console.error("TxWeb3 error :" + err)
- if (!tx) {
- web3.eth.getBlock(txHash, function(err, block) {
- if(err || !block) {
- console.error("BlockWeb3 error :" + err)
- res.write(JSON.stringify({"error": true}));
+ Transaction.findOne({ hash: txHash }).lean(true).exec(async (err, doc) => {
+ if (err || !doc) {
+ web3.eth.getTransaction(txHash, (err, tx) => {
+ if (err || !tx) {
+ console.error(`TxWeb3 error :${err}`);
+ if (!tx) {
+ web3.eth.getBlock(txHash, (err, block) => {
+ if (err || !block) {
+ console.error(`BlockWeb3 error :${err}`);
+ res.write(JSON.stringify({ 'error': true }));
+ } else {
+ console.log(`BlockWeb3 found: ${txHash}`);
+ res.write(JSON.stringify({ 'error': true, 'isBlock': true }));
+ }
+ res.end();
+ });
} else {
- console.log("BlockWeb3 found: " + txHash)
- res.write(JSON.stringify({"error": true, "isBlock": true}));
+ res.write(JSON.stringify({ 'error': true }));
+ res.end();
}
- res.end();
- });
- } else {
- res.write(JSON.stringify({"error": true}));
- res.end();
- }
- } else {
- var ttx = tx;
- ttx.value = etherUnits.toEther( new BigNumber(tx.value), "wei");
- //get timestamp from block
- var block = web3.eth.getBlock(tx.blockNumber, function(err, block) {
- if (!err && block)
- ttx.timestamp = block.timestamp;
- ttx.isTrace = (ttx.input != "0x");
- res.write(JSON.stringify(ttx));
- res.end();
+ } else {
+ const ttx = tx;
+ ttx.value = etherUnits.toEther(new BigNumber(tx.value), 'wei');
+ //get TxReceipt status & gasUsed
+ web3.eth.getTransactionReceipt(txHash, (err, receipt) => {
+ if (err) {
+ console.error(err);
+ return;
+ }
+ ttx.gasUsed = receipt.gasUsed;
+ if (receipt.status) {
+ ttx.status = receipt.status;
+ }
+ if (!tx.to && !tx.creates) {
+ if (receipt && receipt.contractAddress) {
+ ttx.creates = receipt.contractAddress;
+ }
+ }
+ });
+ //get timestamp from block
+ const block = web3.eth.getBlock(tx.blockNumber, (err, block) => {
+ if (!err && block) ttx.timestamp = block.timestamp;
+ ttx.isTrace = (ttx.input != '0x');
+ txResponse = ttx;
+ });
+ }
});
+ } else {
+ txResponse = doc;
}
+
+ const latestBlock = await web3.eth.getBlockNumber() + 1;
+
+ txResponse.confirmations = latestBlock - txResponse.blockNumber;
+
+ if (txResponse.confirmations === latestBlock) {
+ txResponse.confirmation = 0;
+ }
+ txResponse.gasPriceGwei = etherUnits.toGwei(new BigNumber(txResponse.gasPrice), 'wei');
+ txResponse.gasPriceEther = etherUnits.toEther(new BigNumber(txResponse.gasPrice), 'wei');
+ txResponse.txFee = txResponse.gasPriceEther * txResponse.gasUsed;
+
+ if (config.settings.useFiat) {
+ const latestPrice = await Market.findOne().sort({ timestamp: -1 });
+ txResponse.txFeeUSD = txResponse.txFee * latestPrice.quoteUSD;
+ txResponse.valueUSD = txResponse.value * latestPrice.quoteUSD;
+ }
+
+ res.write(JSON.stringify(txResponse));
+ res.end();
});
- } else if ("tx_trace" in req.body) {
+ } else if ('tx_trace' in req.body) {
var txHash = req.body.tx_trace.toLowerCase();
-
async.waterfall([
function(callback) {
web3.eth.getTransaction(txHash, function(err, tx) {
@@ -244,7 +293,7 @@ exports.data = function(req, res){
}
res.end();
});
- } else if ("addr_trace" in req.body) {
+ } else if ('addr_trace' in req.body) {
var addr = req.body.addr_trace.toLowerCase();
// need to filter both to and from
// from block to end block, paging "toAddress":[addr],
@@ -511,37 +560,35 @@ exports.data = function(req, res){
});
} else if ("addr" in req.body) {
var addr = req.body.addr.toLowerCase();
- var options = req.body.options;
+ const { options } = req.body;
- var addrData = {};
+ let addrData = {};
- if (options.indexOf("balance") > -1) {
+ if (options.indexOf('balance') > -1) {
try {
- addrData["balance"] = web3.eth.getBalance(addr);
- addrData["balance"] = etherUnits.toEther(addrData["balance"], 'wei');
- } catch(err) {
- console.error("AddrWeb3 error :" + err);
- addrData = {"error": true};
+ addrData['balance'] = await web3.eth.getBalance(addr);
+ addrData['balance'] = etherUnits.toEther(addrData['balance'], 'wei');
+ } catch (err) {
+ console.error(`AddrWeb3 error :${err}`);
+ addrData = { 'error': true };
}
}
- if (options.indexOf("count") > -1) {
+ if (options.indexOf('count') > -1) {
try {
- addrData["count"] = web3.eth.getTransactionCount(addr);
+ addrData['count'] = await web3.eth.getTransactionCount(addr);
} catch (err) {
- console.error("AddrWeb3 error :" + err);
- addrData = {"error": true};
+ console.error(`AddrWeb3 error :${err}`);
+ addrData = { 'error': true };
}
}
- if (options.indexOf("bytecode") > -1) {
+ if (options.indexOf('bytecode') > -1) {
try {
- addrData["bytecode"] = web3.eth.getCode(addr);
- if (addrData["bytecode"].length > 2)
- addrData["isContract"] = true;
- else
- addrData["isContract"] = false;
+ addrData['bytecode'] = await web3.eth.getCode(addr);
+ if (addrData['bytecode'].length > 2) addrData['isContract'] = true;
+ else addrData['isContract'] = false;
} catch (err) {
- console.error("AddrWeb3 error :" + err);
- addrData = {"error": true};
+ console.error(`AddrWeb3 error :${err}`);
+ addrData = { 'error': true };
}
// is it a ERC20 compatible token?
@@ -559,96 +606,113 @@ exports.data = function(req, res){
}
}
}
-
- res.write(JSON.stringify(addrData));
- res.end();
+ if (config.settings.useFiat) {
+ const latestPrice = await Market.findOne().sort({ timestamp: -1 });
+ addrData['balanceUSD'] = addrData.balance * latestPrice.quoteUSD;
+ }
- } else if ("block" in req.body) {
+ res.write(JSON.stringify(addrData));
+ res.end();
+ } else if ('block' in req.body) {
var blockNumOrHash;
if (/^(0x)?[0-9a-f]{64}$/i.test(req.body.block.trim())) {
- blockNumOrHash = req.body.block.toLowerCase();
+ blockNumOrHash = req.body.block.toLowerCase();
} else {
- blockNumOrHash = parseInt(req.body.block);
+ blockNumOrHash = parseInt(req.body.block);
}
- web3.eth.getBlock(blockNumOrHash, function(err, block) {
- if(err || !block) {
- console.error("BlockWeb3 error :" + err)
- res.write(JSON.stringify({"error": true}));
+ Block.findOne({ $or: [{ hash: blockNumOrHash }, { number: blockNumOrHash }] },
+ { '_id': 0 }).lean(true).exec('findOne', (err, doc) => {
+ if (err || !doc) {
+ web3.eth.getBlock(blockNumOrHash, (err, block) => {
+ if (err || !block) {
+ console.error(`BlockWeb3 error :${err}`);
+ res.write(JSON.stringify({ 'error': true }));
+ } else {
+ res.write(JSON.stringify(filterBlocks(block)));
+ }
+ res.end();
+ });
} else {
- res.write(JSON.stringify(filterBlocks(block)));
+ Transaction.find({ blockNumber: doc.number }).distinct('hash', (err, txs) => {
+ doc['transactions'] = txs;
+ res.write(JSON.stringify(filterBlocks(doc)));
+ res.end();
+ });
}
- res.end();
});
- /*
+ /*
/ TODO: Refactor, "block" / "uncle" determinations should likely come later
/ Can parse out the request once and then determine the path.
*/
- } else if ("uncle" in req.body) {
- var uncle = req.body.uncle.trim();
- var arr = uncle.split('/');
+ } else if ('uncle' in req.body) {
+ const uncle = req.body.uncle.trim();
+ const arr = uncle.split('/');
var blockNumOrHash; // Ugly, does the same as blockNumOrHash above
- var uncleIdx = parseInt(arr[1]) || 0;
+ const uncleIdx = parseInt(arr[1]) || 0;
if (/^(?:0x)?[0-9a-f]{64}$/i.test(arr[0])) {
blockNumOrHash = arr[0].toLowerCase();
- console.log(blockNumOrHash)
+ console.log(blockNumOrHash);
} else {
blockNumOrHash = parseInt(arr[0]);
}
- if (typeof blockNumOrHash == 'undefined') {
- console.error("UncleWeb3 error :" + err);
- res.write(JSON.stringify({"error": true}));
+ if (typeof blockNumOrHash === 'undefined') {
+ console.error(`UncleWeb3 error :${err}`);
+ res.write(JSON.stringify({ 'error': true }));
res.end();
return;
}
- web3.eth.getUncle(blockNumOrHash, uncleIdx, function(err, uncle) {
- if(err || !uncle) {
- console.error("UncleWeb3 error :" + err)
- res.write(JSON.stringify({"error": true}));
+ web3.eth.getBlock(blockNumOrHash, uncleIdx, (err, uncle) => {
+ if (err || !uncle) {
+ console.error(`UncleWeb3 error :${err}`);
+ res.write(JSON.stringify({ 'error': true }));
} else {
res.write(JSON.stringify(filterBlocks(uncle)));
}
res.end();
});
- } else if ("action" in req.body) {
+ } else if ('action' in req.body) {
if (req.body.action == 'hashrate') {
- web3.eth.getBlock('latest', function(err, latest) {
- if(err || !latest) {
- console.error("StatsWeb3 error :" + err);
- res.write(JSON.stringify({"error": true}));
+ web3.eth.getBlock('latest', (err, latest) => {
+ if (err || !latest) {
+ console.error(`StatsWeb3 error :${err}`);
+ res.write(JSON.stringify({ 'error': true }));
res.end();
} else {
- console.log("StatsWeb3: latest block: " + latest.number);
- var checknum = latest.number - 100;
- if(checknum < 0)
- checknum = 0;
- var nblock = latest.number - checknum;
- web3.eth.getBlock(checknum, function(err, block) {
- if(err || !block) {
- console.error("StatsWeb3 error :" + err);
- res.write(JSON.stringify({"blockHeight": latest.number, "difficulty": latest.difficulty, "blockTime": 0, "hashrate": 0 }));
+ console.log(`StatsWeb3: latest block: ${latest.number}`);
+ let checknum = latest.number - 100;
+ if (checknum < 0) checknum = 0;
+ const nblock = latest.number - checknum;
+ web3.eth.getBlock(checknum, (err, block) => {
+ if (err || !block) {
+ console.error(`StatsWeb3 error :${err}`);
+ res.write(JSON.stringify({
+ 'blockHeight': latest.number, 'difficulty': latest.difficulty, 'blockTime': 0, 'hashrate': 0,
+ }));
} else {
- console.log("StatsWeb3: check block: " + block.number);
- var blocktime = (latest.timestamp - block.timestamp) / nblock;
- var hashrate = latest.difficulty / blocktime;
- res.write(JSON.stringify({"blockHeight": latest.number, "difficulty": latest.difficulty, "blockTime": blocktime, "hashrate": hashrate }));
+ console.log(`StatsWeb3: check block: ${block.number}`);
+ const blocktime = (latest.timestamp - block.timestamp) / nblock;
+ const hashrate = latest.difficulty / blocktime;
+ res.write(JSON.stringify({
+ 'blockHeight': latest.number, 'difficulty': latest.difficulty, 'blockTime': blocktime, 'hashrate': hashrate,
+ }));
}
res.end();
});
}
});
} else {
- console.error("Invalid Request: " + action)
+ console.error(`Invalid Request: ${action}`);
res.status(400).send();
}
} else {
- console.error("Invalid Request: " + action)
+ console.error(`Invalid Request: ${action}`);
res.status(400).send();
}
diff --git a/test/index.js b/test/index.js
index f10b66ce1..83522bc4f 100644
--- a/test/index.js
+++ b/test/index.js
@@ -1,14 +1,13 @@
-var assert = require('assert');
-
+const assert = require('assert');
//* load unit tests *//
-var app = require('./units/apps');
+const app = require('./units/apps');
//* end unit tests *//
/* tests to run (add tests here) */
-describe('Global functions', function() {
- app
+describe('Global functions', () => {
+ app;
});
diff --git a/test/units/apps.js b/test/units/apps.js
index 61b7fc7a7..2efae94e8 100644
--- a/test/units/apps.js
+++ b/test/units/apps.js
@@ -1,10 +1,10 @@
-var assert = require('assert');
-var expect = require('chai').expect;
-var request = require('request');
+const assert = require('assert');
+const { expect } = require('chai');
+const request = require('request');
//* unit under test *//
-var app = require('../../app.js');
+const app = require('../../app.js');
/* Description:
* tests that the express server is basically functional
@@ -12,24 +12,24 @@ var app = require('../../app.js');
module.exports =
-describe("Classic Explorer Server Tests", function() {
+describe('Classic Explorer Server Tests', () => {
- //ping the index page to ensure it is running
+ //ping the index page to ensure it is running
- describe("Test index page", function() {
- var url = "http://localhost:3000/";
- it("returns status 200", function(done) {
- request(url, function(error, response, body) {
+ describe('Test index page', () => {
+ const url = 'http://localhost:3000/';
+ it('returns status 200', (done) => {
+ request(url, (error, response, body) => {
expect(response.statusCode).to.equal(200);
done();
});
});
- // return the 404 on a bad page request
+ // return the 404 on a bad page request
- var badurl = "http://localhost:3000/ethereum_classic_is_best_classic";
- it("bad pages go to index", function(done) {
- request(badurl, function(error, response, body) {
+ const badurl = 'http://localhost:3000/ethereum_classic_is_best_classic';
+ it('bad pages go to index', (done) => {
+ request(badurl, (error, response, body) => {
expect(response.statusCode).to.equal(200);
done();
});
diff --git a/tools/blockHelper.js b/tools/blockHelper.js
deleted file mode 100644
index 9cb243757..000000000
--- a/tools/blockHelper.js
+++ /dev/null
@@ -1,207 +0,0 @@
-require( '../db.js' );
-var etherUnits = require("../lib/etherUnits.js");
-var BigNumber = require('bignumber.js');
-
-var Web3 = require('web3');
-
-var mongoose = require( 'mongoose' );
-var Block = mongoose.model( 'Block' );
-var Transaction = mongoose.model( 'Transaction' );
-
-var grabBlocks = function(config) {
- if('listenOnly' in config && config.listenOnly === true)
- listenBlocks(config, web3);
- else
- setTimeout(function() {
- grabBlock(config, web3, config.blocks.pop());
- }, 2000);
-}
-
-var listenBlocks = function(config, web3) {
- var newBlocks = web3.eth.filter("latest");
- newBlocks.watch(function (error, log) {
- if(error) {
- console.log('Error: ' + error);
- } else if (log == null) {
- console.log('Warning: null block hash');
- } else {
- grabBlock(config, web3, log);
- }
- });
-}
-
-var grabBlock = function(config, web3, blockHashOrNumber) {
- var desiredBlockHashOrNumber;
- // check if done
- if(blockHashOrNumber == undefined) {
- return;
- }
- if (typeof blockHashOrNumber === 'object') {
- if('start' in blockHashOrNumber && 'end' in blockHashOrNumber) {
- desiredBlockHashOrNumber = blockHashOrNumber.end;
- }
- else {
- console.log('Error: Aborted becasue found a interval in blocks ' +
- 'array that doesn\'t have both a start and end.');
- process.exit(9);
- }
- }
- else {
- desiredBlockHashOrNumber = blockHashOrNumber;
- }
- if(web3.isConnected()) {
- web3.eth.getBlock(desiredBlockHashOrNumber, true, function(error, blockData) {
- if(error) {
- console.log('Warning: error on getting block with hash/number: ' +
- desiredBlockHashOrNumber + ': ' + error);
- }
- else if(blockData == null) {
- console.log('Warning: null block data received from the block with hash/number: ' +
- desiredBlockHashOrNumber);
- }
- else {
- if('terminateAtExistingDB' in config && config.terminateAtExistingDB === true) {
- checkBlockDBExistsThenWrite(config, blockData);
- }
- else {
- writeBlockToDB(config, blockData);
- }
- if (!('skipTransactions' in config && config.skipTransactions === true))
- writeTransactionsToDB(config, blockData);
- if('listenOnly' in config && config.listenOnly === true)
- return;
-
- if('hash' in blockData && 'number' in blockData) {
- // If currently working on an interval (typeof blockHashOrNumber === 'object') and
- // the block number or block hash just grabbed isn't equal to the start yet:
- // then grab the parent block number (
-
-
-
-
-
-
-
-
+
| hash | {{tx.hash}} |
| blockNumber | -{{tx.blockNumber}} | -
| Time | -{{tx.datetime | date:'yyyy-MM-dd HH:mm:ss Z' }} ({{tx.timestamp | timeDuration}} ago) | -
| from | -{{tx.from}} |
| to | -Contract {{tx.to}} |
| creates | -{{tx.creates}} |
| value | {{tx.value}} {{ settings.symbol }} |
| gas Provided | {{tx.gas | number}} |
| gasPrice | {{tx.gasPrice | number}} |
| nonce | {{tx.nonce}} |
| Input Data | {{tx.input}} |
| From | -To | -Amount | -Gas | -GasUsed | -- |
|---|---|---|---|---|---|
| {{t.from}} | -{{t.to}} | -{{t.value}} {{settings.symbol}}{{t.amount | number}} | -{{t.gas}} | -{{t.gasUsed}} | -{{t.type}} {{t.error}} | -
+
+
-
| Transaction Hash: | +{{tx.hash}} | +
| Status: | ++ Failed (Error encountered during transaction !) + Success + | +
| Block: | +
+ {{tx.blockNumber | number}}
+
+ |
+
| TimeStamp: | +{{tx.timestamp | timeDuration}} ago ({{tx.datetime | date:'yyyy-MM-dd HH:mm:ss Z' }}) | +
| From: | ++ {{tx.from}} + {{tx.tokenFrom}} + | +
| To: | ++ {{tx.to}} + {{tx.tokenTo}} + | +
| Creates: | +{{tx.creates}} | +
| Value: | +  {{tx.value | number: 8}} {{ settings.symbol }} => {{ tx.valueUSD | currency : "USD $" : 4 }} |
+
| Token Value: | +{{tx.tokenValue | number: 8}} {{ tx.tokenSymbol }} | +
| Transaction fee: | +{{tx.txFee | number : 6}} {{ settings.symbol }} => {{ tx.txFeeUSD | currency : "USD $" : 10 }} | +
| Gas Limit: | +{{tx.gas | number}} | +
| Gas Used by Transaction: | +{{tx.gasUsed | number}} | +
| Gas Price: | +{{tx.gasPriceEther | number:9}} {{ settings.symbol }} ({{tx.gasPriceGwei | number}} Gwei) | +
| Nonce: | +{{tx.nonce}} | +
| Input Data | +
+ {{tx.input}}
+ |
+