Bug fixes

Author: dominiek

CHANGELOG.md

@@ -1,6 +1,11 @@
 
 # 0.1.10 -- Bugfixes
 
+- Fix for `eth-query` dependency mismatch
+- Fix for big numbers on block numbers on new events
+
+# 0.1.10 -- Bugfixes
+
 - Ensuring transaction information is properly serialized
 
 # 0.1.9 -- Bugfixes

package.json

@@ -1,6 +1,6 @@
 {
   "name": "eth-indexer",
-  "version": "0.1.10",
+  "version": "0.1.11",
   "description": "High performance Ethereum smart contract event indexing for fast local retrieval",
   "author": "Dominiek Ter Heide <[email protected]>",
   "license": "MIT",
@@ -31,7 +31,7 @@
     "elasticsearch": "^14.0.0",
     "ethjs": "^0.3.3",
     "ethjs-abi": "^0.2.1",
-    "ethjs-query": "^0.3.3",
+    "ethjs-query": "^0.2.6",
     "ethjs-rpc": "^0.1.8",
     "ethjs-schema": "^0.2.0",
     "leveldown": "^2.1.1",

src/ethereum.js

@@ -4,6 +4,7 @@ import EthQuery from 'ethjs-query';
 import EthAbi from 'ethjs-abi';
 import Web3 from 'web3';
 import logger from './logger';
+import BigNumber from 'bignumber.js';
 
 const sleep = timeout => new Promise(accept => setTimeout(() => accept(), timeout));
 
@@ -18,6 +19,20 @@ const chunk = (arr, len) => {
   return chunks;
 };
 
+const normalizeEvent = (event) => {
+  const normalizedEvent = Object.assign({}, event);
+  if (typeof normalizeEvent.blockNumber === 'number') {
+    normalizeEvent.blockNumber = new BigNumber(normalizeEvent.blockNumber);
+  }
+  if (typeof normalizeEvent.transactionIndex === 'number') {
+    normalizeEvent.transactionIndex = new BigNumber(normalizeEvent.transactionIndex);
+  }
+  if (typeof normalizeEvent.logIndex === 'number') {
+    normalizeEvent.logIndex = new BigNumber(normalizeEvent.logIndex);
+  }
+  return normalizedEvent;
+};
+
 export default class Ethereum {
   constructor(abi, contractAddress, readProviderUrl = 'http://127.0.0.1:8545') {
     this.readProviderUrl = readProviderUrl;
@@ -58,11 +73,11 @@ export default class Ethereum {
     const options = { fromBlock, toBlock: 'latest' };
     const filter = this.readWeb3Contract.allEvents({}, options);
     filter.watch((error, event) => {
-      // console.log('watch', error, event);
+      const normalizedEvent = normalizeEvent(event);
       if (error) {
         logger.log('warn', `Got error while reading realtime events from contract: ${error.message}`);
       } else {
-        fn(event).then(() => {});
+        fn(normalizedEvent).then(() => {});
       }
     });
   }