Merge pull request #61 from ostdotcom/develop

Merging develop to release

Author: kedarchandrayan

CHANGELOG.md

@@ -1,2 +1,6 @@
+## ost-block-scanner v1.0.1
+- Upgraded node version to 10.x
+- Version bump for dependencies.
+
 ## ost-block-scanner v1.0.0
 - OST Block Scanner 1.0.0 is the first release of ost-block-scanner. It scans chain and stores blocks, transactions and transfers data in AWS DynamoDB.

VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

config.json.example

@@ -98,6 +98,9 @@
       ]
     }
   ],
+  "nonDDBDataSource": {
+    "transactionDetails": "chain"
+  },
   "extraStorageColumns": {
     "chains": {
       "chainName": {

config/coreConstants.js

@@ -51,6 +51,15 @@ class CoreConstants {
   get icNameSpace() {
     return 'ost-block-scanner';
   }
+
+  /**
+   * Return zero address.
+   *
+   * @return {String}
+   */
+  get zeroAddress() {
+    return '0x0000000000000000000000000000000000000000';
+  }
 }
 
 module.exports = new CoreConstants();

helpers/basic.js

@@ -419,6 +419,23 @@ class BasicHelperKlass {
       throw 'Transaction Status is not supported (' + status + ')';
     }
   }
+
+  /**
+   * Checks whether the object is empty or not.
+   *
+   * @param {object} obj
+   *
+   * @return {boolean}
+   */
+  isEmptyObject(obj) {
+    for (const property in obj) {
+      if (Object.prototype.hasOwnProperty.call(obj, property)) {
+        return false;
+      }
+    }
+
+    return true;
+  }
 }
 
 module.exports = new BasicHelperKlass();

index.js

@@ -23,6 +23,7 @@ require(rootPrefix + '/lib/models/shared/ShardByTransaction');
 require(rootPrefix + '/lib/models/sharded/byEconomyAddress/EconomyAddressTransfer');
 require(rootPrefix + '/lib/models/shared/ChainCronData');
 require(rootPrefix + '/lib/models/sharded/byChainId/PendingTransaction');
+require(rootPrefix + '/lib/models/shared/LatestPricePoint');
 
 // Model services
 require(rootPrefix + '/services/AddChain');
@@ -71,6 +72,7 @@ require(rootPrefix + '/lib/cacheMultiManagement/shared/shardIdentifier/ByEconomy
 require(rootPrefix + '/lib/cacheManagement/chainSpecific/EconomyAddressTransfer');
 require(rootPrefix + '/lib/cacheMultiManagement/chainSpecific/PendingTransactionByHash');
 require(rootPrefix + '/lib/cacheMultiManagement/chainSpecific/PendingTransactionByUuid');
+require(rootPrefix + '/lib/cacheManagement/shared/LatestPricePoints');
 
 require(rootPrefix + '/services/economy/Create');
 require(rootPrefix + '/services/economy/Aggregator');
@@ -116,6 +118,7 @@ class OSTBlockScanner {
       coreConstants.icNameSpace,
       'PendingTransactionModel'
     );
+    model.LatestPricePoint = instanceComposer.getShadowedClassFor(coreConstants.icNameSpace, 'LatestPricePointModel');
 
     const service = (oThis.service = {});
     // Add services here
@@ -201,6 +204,8 @@ class OSTBlockScanner {
       coreConstants.icNameSpace,
       'PendingTransactionByUuidCache'
     );
+
+    cache.LatestPricePoint = instanceComposer.getShadowedClassFor(coreConstants.icNameSpace, 'LatestPricePointsCache');
   }
 }
 

lib/block/CheckIfProcessable.js

@@ -48,6 +48,8 @@ class CheckIfProcessable {
   async perform() {
     const oThis = this;
 
+    logger.log('======Before calling getHighestBlockFromChain');
+
     // get the highest block from the chain nodes
     await oThis.getHighestBlockFromChain();
 
@@ -76,6 +78,7 @@ class CheckIfProcessable {
       result['nodesWithBlock'] = oThis.nodesWithBlock;
     }
 
+    logger.log('======returning from check if processable====');
     return responseHelper.successWithData(result);
   }
 
@@ -95,6 +98,8 @@ class CheckIfProcessable {
       let provider = providers[i];
       await oThis.refreshHighestBlock(provider);
     }
+
+    logger.log('====Highest block fetched===');
   }
 
   /**

lib/block/DistributeTransactions.js

@@ -4,15 +4,16 @@
  * Class file for handling transaction parser and token transfer parser calls for a block
  */
 
+const OSTBase = require('@ostdotcom/base');
+
 const rootPrefix = '../..',
-  OSTBase = require('@ostdotcom/base'),
-  logger = require(rootPrefix + '/lib/logger/customConsoleLogger'),
-  coreConstants = require(rootPrefix + '/config/coreConstants'),
-  responseHelper = require(rootPrefix + '/lib/formatter/response'),
   basicHelper = require(rootPrefix + '/helpers/basic'),
-  errorConfig = basicHelper.getErrorConfig();
+  coreConstants = require(rootPrefix + '/config/coreConstants'),
+  logger = require(rootPrefix + '/lib/logger/customConsoleLogger'),
+  responseHelper = require(rootPrefix + '/lib/formatter/response');
 
-const InstanceComposer = OSTBase.InstanceComposer;
+const errorConfig = basicHelper.getErrorConfig(),
+  InstanceComposer = OSTBase.InstanceComposer;
 
 require(rootPrefix + '/services/transaction/Parser');
 require(rootPrefix + '/services/transfer/Parser');
@@ -31,6 +32,8 @@ class DistributeTransactions {
     oThis.chainId = params.chainId;
     oThis.rawCurrentBlock = params.rawCurrentBlock;
     oThis.nodesWithBlock = params.nodesWithBlock;
+
+    oThis.transactionReceiptMap = {};
   }
 
   /**
@@ -105,55 +108,58 @@ class DistributeTransactions {
 
       promiseArray.push(
         new Promise(function(onResolve, onReject) {
-          transactionParser
-            .perform()
-            .then(function(txParserResponse) {
-              // If transaction parser was successful then only token transfer parser would work.
-              if (txParserResponse.isSuccess()) {
-                let transactionReceiptMap = txParserResponse.data.transactionReceiptMap || {},
-                  unprocessedItems = txParserResponse.data.unprocessedTransactions || [],
-                  processedReceipts = {};
-
-                let unprocessedItemsMap = {},
-                  tokenParserNeeded = false;
-
-                for (let i = 0; i < unprocessedItems.length; i++) {
-                  unprocessedItemsMap[unprocessedItems[i]] = 1;
-                }
-
-                for (let txHash in transactionReceiptMap) {
-                  if (!unprocessedItemsMap[txHash] && transactionReceiptMap[txHash]) {
-                    processedReceipts[txHash] = transactionReceiptMap[txHash];
-                    tokenParserNeeded = true;
-                  }
-                }
-
-                if (tokenParserNeeded) {
-                  new oThis.TokenTransferParser(
-                    oThis.chainId,
-                    oThis.rawCurrentBlock,
-                    processedReceipts,
-                    oThis.nodesWithBlock
-                  )
-                    .perform()
-                    .then(function(ttpResp) {
-                      onResolve();
-                    })
-                    .catch(function(ttpErr) {
-                      onResolve();
-                    });
-                } else {
-                  onResolve();
-                }
-              } else {
-                logger.error('Transaction Parser returns error: ', txParserResponse.toHash());
-                onResolve();
+          transactionParser.perform().then(function(txParserResponse) {
+            // If transaction parser was successful then only token transfer parser would work.
+            if (txParserResponse.isSuccess()) {
+              let transactionReceiptMap = txParserResponse.data.transactionReceiptMap || {},
+                unprocessedItems = txParserResponse.data.unprocessedTransactions || [];
+
+              if (unprocessedItems.length > 0) {
+                logger.error('Transaction parser returned unprocessed items: ', unprocessedItems);
+                return onReject(
+                  responseHelper.error({
+                    internal_error_identifier: 'l_b_dt_2',
+                    api_error_identifier: 'something_went_wrong',
+                    debug_options: 'Transaction parser returned unprocessed items.'
+                  })
+                );
               }
-            })
-            .catch(function(err) {
-              logger.error(' Transaction Parser failed ');
-              onResolve();
-            });
+              // Merge all receipts in global map
+              Object.assign(oThis.transactionReceiptMap, transactionReceiptMap);
+
+              // Start with transfer parser as Transaction parser completed its work.
+              new oThis.TokenTransferParser(
+                oThis.chainId,
+                oThis.rawCurrentBlock,
+                transactionReceiptMap,
+                oThis.nodesWithBlock
+              )
+                .perform()
+                .then(function(ttpResp) {
+                  if (ttpResp.isSuccess()) {
+                    const injectionFailedTransactionHashes = ttpResp.data.injectionFailedTransactionHashes || [];
+
+                    if (injectionFailedTransactionHashes.length > 0) {
+                      logger.error(
+                        'Token transfer parser returned injectionFailedTransactionHashes: ',
+                        injectionFailedTransactionHashes
+                      );
+                      return onReject(ttpResp);
+                    }
+                    onResolve(ttpResp);
+                  } else {
+                    logger.error('Token Transfer Parser returns error: ', ttpResp.toHash());
+                    onReject(ttpResp);
+                  }
+                })
+                .catch(function(ttpErr) {
+                  onReject(ttpErr);
+                });
+            } else {
+              logger.error('Transaction Parser returns error: ', txParserResponse.toHash());
+              onReject(txParserResponse);
+            }
+          });
         })
       );
 
@@ -169,7 +175,7 @@ class DistributeTransactions {
       await Promise.all(promiseArray);
     }
 
-    return responseHelper.successWithData({});
+    return responseHelper.successWithData({ transactionReceiptMap: oThis.transactionReceiptMap });
   }
 }