Merge pull request #170 from ainblockchain/develop

Release v0.5.1

Author: minsulee2

blockchain/block.js

@@ -3,7 +3,7 @@ const zipper = require('zip-local');
 const sizeof = require('object-sizeof');
 const ainUtil = require('@ainblockchain/ain-util');
 const logger = require('../logger')('BLOCK');
-const ChainUtil = require('../chain-util');
+const ChainUtil = require('../common/chain-util');
 const Transaction = require('../tx-pool/transaction');
 const StateNode = require('../db/state-node');
 const DB = require('../db');
@@ -18,7 +18,7 @@ const {
   AccountProperties,
   ProofProperties,
   StateVersions,
-} = require('../constants');
+} = require('../common/constants');
 const BlockFilePatterns = require('./block-file-patterns');
 
 class Block {

blockchain/index.js

@@ -7,7 +7,7 @@ const naturalSort = require('node-natural-sort');
 const logger = require('../logger')('BLOCKCHAIN');
 const {Block} = require('./block');
 const BlockFilePatterns = require('./block-file-patterns');
-const {BLOCKCHAINS_DIR} = require('../constants');
+const {BLOCKCHAINS_DIR} = require('../common/constants');
 const CHAIN_SUBSECT_LENGTH = 20;
 const ON_MEM_CHAIN_LENGTH = 20;
 
@@ -16,7 +16,6 @@ class Blockchain {
     // Finalized chain
     this.chain = [];
     this.blockchainDir = blockchainDir;
-    this.syncedAfterStartup = false;
   }
 
   init(isFirstNode) {
@@ -175,13 +174,13 @@ class Blockchain {
       return false;
     }
     // TODO (lia): Check if the tx nonces are correct.
-    return Blockchain.isValidChainSubsection(chain);
+    return Blockchain.isValidChainSegment(chain);
   }
 
-  static isValidChainSubsection(chainSubSection) {
-    for (let i = 1; i < chainSubSection.length; i++) {
-      const block = chainSubSection[i];
-      const lastBlock = Block.parse(chainSubSection[i - 1]);
+  static isValidChainSegment(chainSegment) {
+    for (let i = 1; i < chainSegment.length; i++) {
+      const block = chainSegment[i];
+      const lastBlock = Block.parse(chainSegment[i - 1]);
       if (block.last_hash !== lastBlock.hash || !Block.validateHashes(block)) {
         return false;
       }
@@ -253,43 +252,19 @@ class Blockchain {
       return [this.lastBlock()];
     }
 
-    const chainSubSection = [];
+    const chainSegment = [];
     blockFiles.forEach((blockFile) => {
-      chainSubSection.push(Block.loadBlock(blockFile));
+      chainSegment.push(Block.loadBlock(blockFile));
     });
-    return chainSubSection.length > 0 ? chainSubSection : [];
+    return chainSegment.length > 0 ? chainSegment : [];
   }
 
-  merge(chainSubSection, db) {
-    // Call to shift here is important as it removes the first element from the list !!
+  merge(chainSegment, db) {
     logger.info(`Last block number before merge: ${this.lastBlockNumber()}`);
-    if (!chainSubSection || chainSubSection.length === 0) {
-      logger.info(`Empty chain sub section`);
-      if (!this.syncedAfterStartup) {
-        // Regard this situation as if you're synced.
-        // TODO (lia): ask the tracker server for another peer.
-        this.syncedAfterStartup = true;
-      }
-      return false;
-    }
-    if (chainSubSection[chainSubSection.length - 1].number < this.lastBlockNumber()) {
-      logger.info(`Received chain is of lower block number than current last block number`);
-      return false;
-    }
-    if (chainSubSection[chainSubSection.length - 1].number === this.lastBlockNumber()) {
-      logger.info(`Received chain is at the same block number`);
-      if (!this.syncedAfterStartup) {
-        // Regard this situation as if you're synced.
-        // TODO (lia): ask the tracker server for another peer.
-        this.syncedAfterStartup = true;
-      }
-      return false;
-    }
-
-    const firstBlock = Block.parse(chainSubSection[0]);
+    const firstBlock = Block.parse(chainSegment[0]);
     const lastBlockHash = this.lastBlockNumber() >= 0 ? this.lastBlock().hash : null;
     const overlap = lastBlockHash ?
-        chainSubSection.filter((block) => block.number === this.lastBlockNumber()) : null;
+        chainSegment.filter((block) => block.number === this.lastBlockNumber()) : null;
     const overlappingBlock = overlap ? overlap[0] : null;
     if (lastBlockHash) {
       // Case 1: Not a cold start.
@@ -306,12 +281,12 @@ class Blockchain {
         return false;
       }
     }
-    if (!Blockchain.isValidChainSubsection(chainSubSection)) {
-      logger.error(`Invalid chain subsection`);
+    if (!Blockchain.isValidChainSegment(chainSegment)) {
+      logger.error(`Invalid chain segment`);
       return false;
     }
-    for (let i = 0; i < chainSubSection.length; i++) {
-      const block = chainSubSection[i];
+    for (let i = 0; i < chainSegment.length; i++) {
+      const block = chainSegment[i];
 
       if (block.number <= this.lastBlockNumber()) {
         continue;

client/index.js

@@ -8,8 +8,13 @@ const jayson = require('jayson');
 const logger = require('../logger')('CLIENT');
 const BlockchainNode = require('../node');
 const P2pServer = require('../server');
-const ChainUtil = require('../chain-util');
-const {PORT, PROTOCOL_VERSIONS, WriteDbOperations, TransactionStatus} = require('../constants');
+const ChainUtil = require('../common/chain-util');
+const {
+  PORT,
+  PROTOCOL_VERSIONS,
+  WriteDbOperations,
+  TransactionStatus
+} = require('../common/constants');
 const {ConsensusStatus} = require('../consensus/constants');
 const CURRENT_PROTOCOL_VERSION = require('../package.json').version;
 
@@ -244,6 +249,14 @@ app.post('/batch', (req, res, next) => {
     .end();
 });
 
+app.get('/node_status', (req, res, next) => {
+  const result = node.status;
+  res.status(200)
+    .set('Content-Type', 'application/json')
+    .send({code: 0, result})
+    .end();
+});
+
 app.get('/blocks', (req, res, next) => {
   const blockEnd = node.bc.lastBlockNumber() + 1;
   const blockBegin = Math.max(blockEnd - MAX_BLOCKS, 0);
@@ -316,7 +329,7 @@ app.get('/protocol_versions', (req, res) => {
 app.get('/state_versions', (req, res) => {
   const result = {
     version_list: node.stateManager.getVersionList(),
-    finalized_version: node.stateManager.getFinalizedVersion(),
+    final_version: node.stateManager.getFinalVersion(),
   };
   res.status(200)
     .set('Content-Type', 'application/json')
@@ -325,8 +338,8 @@ app.get('/state_versions', (req, res) => {
 });
 
 // TODO(seo): Support for subtree dumping (i.e. with ref path).
-app.get('/dump_finalized_version', (req, res) => {
-  const result = node.dumpFinalizedVersion(true);
+app.get('/dump_final_version', (req, res) => {
+  const result = node.dumpFinalVersion(true);
   res.status(200)
     .set('Content-Type', 'application/json')
     .send({code: 0, result})
@@ -464,10 +477,7 @@ function createAndExecuteTransaction(txBody, isNoncedTransaction) {
       result: false,
     };
   }
-  return {
-    tx_hash: tx.hash,
-    result: p2pServer.executeAndBroadcastTransaction(tx)
-  };
+  return p2pServer.executeAndBroadcastTransaction(tx);
 }
 
 function checkIfTransactionShouldBeNonced(input) {

client/protocol_versions.json

@@ -13,5 +13,8 @@
   },
   "0.5.0": {
     "min": "0.5.0"
+  },
+  "0.5.1": {
+    "min": "0.5.0"
   }
 }

chain-util.js common/chain-util.jschain-util.js renamed to common/chain-util.js

@@ -2,7 +2,7 @@ const EC = require('elliptic').ec;
 const ec = new EC('secp256k1');
 const stringify = require('fast-json-stable-stringify');
 const ainUtil = require('@ainblockchain/ain-util');
-const RuleUtil = require('./db/rule-util');
+const RuleUtil = require('../db/rule-util');
 const ruleUtil = new RuleUtil();
 const PRIVATE_KEY = process.env.PRIVATE_KEY || null;
 
@@ -107,6 +107,20 @@ class ChainUtil {
     }
   }
 
+  static parseJsonOrNull(str) {
+    let parsed = null;
+    try {
+      parsed = JSON.parse(str);
+    } catch (e) {
+      // parsed is not set
+    }
+    return parsed;
+  }
+
+  static isJson(str) {
+    return ChainUtil.parseJsonOrNull(str) !== null;
+  }
+
   static parsePath(path) {
     if (!path) {
       return [];
@@ -179,18 +193,41 @@ class ChainUtil {
 
   static transactionFailed(response) {
     if (Array.isArray(response)) {
-      response.forEach((res) => {
-        if (ChainUtil.checkForTransactionErrorCode(res)) {
+      for (const result of response) {
+        if (ChainUtil.checkForTransactionErrorCode(result)) {
           return true;
         }
-      });
+      }
       return false;
     }
     return ChainUtil.checkForTransactionErrorCode(response);
   }
 
-  static checkForTransactionErrorCode(response) {
-    return response === null || (response.code !== undefined && response.code !== 0);
+  static checkForTransactionErrorCode(result) {
+    return result === null || (result.code !== undefined && result.code !== 0);
+  }
+
+  static returnError(code, message) {
+    return { code, error_message: message };
+  }
+
+  /**
+   * Logs and returns error.
+   * 
+   * @param {*} logger logger to log with
+   * @param {*} code error code
+   * @param {*} message error message
+   * @param {*} level level to log with
+   */
+  static logAndReturnError(logger, code, message, level = 1) {
+    if (level === 0) {
+      logger.error(message);
+    } else if (level === 1) {
+      logger.info(message);
+    } else {
+      logger.debug(message);
+    }
+    return ChainUtil.returnError(code, message);
   }
 }