Merge pull request #152 from ainblockchain/develop

Release 0.4.0

Author: minsulee2

blockchain/block.js

@@ -5,6 +5,7 @@ const ainUtil = require('@ainblockchain/ain-util');
 const logger = require('../logger')('BLOCK');
 const ChainUtil = require('../chain-util');
 const Transaction = require('../tx-pool/transaction');
+const StateNode = require('../db/state-node');
 const DB = require('../db');
 const {
   PredefinedDbPaths,
@@ -16,6 +17,7 @@ const {
   GenesisOwners,
   AccountProperties,
   ProofProperties,
+  StateVersions,
 } = require('../constants');
 const BlockFilePatterns = require('./block-file-patterns');
 
@@ -243,18 +245,20 @@ class Block {
   }
 
   static getGenesisStateProofHash() {
-    const tempGenesisState = new DB(null, null, false, -1);
+    const tempGenesisDb =
+        new DB(new StateNode(StateVersions.EMPTY), StateVersions.EMPTY, null, null, false, -1);
+    tempGenesisDb.initDbStates();
     const genesisTransactions = Block.getGenesisBlockData(
         GenesisAccounts[AccountProperties.TIMESTAMP]);
     for (const tx of genesisTransactions) {
-      const res = tempGenesisState.executeTransaction(tx);
+      const res = tempGenesisDb.executeTransaction(tx);
       if (ChainUtil.transactionFailed(res)) {
         logger.error(`Genesis transaction failed:\n${JSON.stringify(tx, null, 2)}` +
             `\nRESULT: ${JSON.stringify(res)}`)
         return null;
       }
     }
-    return tempGenesisState.getProof('/')[ProofProperties.PROOF_HASH];
+    return tempGenesisDb.getProof('/')[ProofProperties.PROOF_HASH];
   }
 
   static genesis() {

blockchain/index.js

@@ -16,7 +16,6 @@ class Blockchain {
     // Finalized chain
     this.chain = [];
     this.blockchainDir = blockchainDir;
-    this.backupDb = null;
     this.syncedAfterStartup = false;
   }
 
@@ -101,13 +100,6 @@ class Blockchain {
     }
   }
 
-  setBackupDb(backupDb) {
-    if (this.backupDb !== null) {
-      throw Error('Already set backupdb');
-    }
-    this.backupDb = backupDb;
-  }
-
   lastBlock() {
     if (this.chain.length === 0) {
       return null;
@@ -139,7 +131,7 @@ class Blockchain {
     return lastBlock.timestamp;
   }
 
-  addNewBlockToChain(newBlock) {
+  addNewBlockToChain(newBlock, db) {
     if (!newBlock) {
       logger.error('[blockchain.addNewBlockToChain] Block is null');
       return false;
@@ -151,15 +143,17 @@ class Blockchain {
     if (!(newBlock instanceof Block)) {
       newBlock = Block.parse(newBlock);
     }
-    if (!this.backupDb.executeTransactionList(newBlock.last_votes)) {
-      logger.error('[blockchain.addNewBlockToChain] Failed to execute last_votes of block' +
-          `${JSON.stringify(newBlock, null, 2)}`);
-      return false;
-    }
-    if (!this.backupDb.executeTransactionList(newBlock.transactions)) {
-      logger.error('[blockchain.addNewBlockToChain] Failed to execute transactions of block' +
-          `${JSON.stringify(newBlock, null, 2)}`);
-      return false;
+    if (db) {
+      if (!db.executeTransactionList(newBlock.last_votes)) {
+        logger.error('[blockchain.addNewBlockToChain] Failed to execute last_votes of block' +
+            `${JSON.stringify(newBlock, null, 2)}`);
+        return false;
+      }
+      if (!db.executeTransactionList(newBlock.transactions)) {
+        logger.error('[blockchain.addNewBlockToChain] Failed to execute transactions of block' +
+            `${JSON.stringify(newBlock, null, 2)}`);
+        return false;
+      }
     }
     this.chain.push(newBlock);
     this.writeChain();
@@ -266,7 +260,7 @@ class Blockchain {
     return chainSubSection.length > 0 ? chainSubSection : [];
   }
 
-  merge(chainSubSection) {
+  merge(chainSubSection, db) {
     // Call to shift here is important as it removes the first element from the list !!
     logger.info(`Last block number before merge: ${this.lastBlockNumber()}`);
     if (!chainSubSection || chainSubSection.length === 0) {
@@ -323,7 +317,7 @@ class Blockchain {
         continue;
       }
       // TODO(lia): validate the state proof of each block
-      if (!this.addNewBlockToChain(block)) {
+      if (!this.addNewBlockToChain(block, db)) {
         logger.error(`Failed to add block ` + block);
         return false;
       }

chain-util.js

@@ -56,8 +56,8 @@ class ChainUtil {
     return ruleUtil.isDict(value);
   }
 
-  static isEmptyNode(value) {
-    return ruleUtil.isEmptyNode(value);
+  static isEmpty(value) {
+    return ruleUtil.isEmpty(value);
   }
 
   static isValAddr(value) {

client/index.js

@@ -290,6 +290,17 @@ app.get('/pending_nonce_tracker', (req, res, next) => {
     .end();
 });
 
+app.get('/state_versions', (req, res) => {
+  const result = {
+    version_list: node.stateManager.getVersionList(),
+    finalized_version: node.stateManager.getFinalizedVersion(),
+  };
+  res.status(200)
+    .set('Content-Type', 'application/json')
+    .send({code: 0, result})
+    .end();
+});
+
 app.get('/get_transaction', (req, res, next) => {
   const transactionInfo = node.tp.transactionTracker[req.query.hash];
   if (transactionInfo) {

client/protocol_versions.json

@@ -4,5 +4,8 @@
   },
   "0.3.3": {
     "min": "0.3.2"
+  },
+  "0.4.0": {
+    "min": "0.3.2"
   }
 }

consensus/block-pool.js

@@ -13,7 +13,7 @@ class BlockPool {
     // e.g. { block_hash: { block, proposal, votes: { address: stake } } }
     this.hashToBlockInfo = {};
     // Mapping of a block hash to the new db state
-    this.hashToState = new Map();
+    this.hashToDb = new Map();
     // Mapping of a block hash to a set of block hashes that extend the block.
     // e.g. { block_hash: Set<block_hash> }
     this.hashToNextBlockSet = {};
@@ -240,7 +240,7 @@ class BlockPool {
       this.hashToBlockInfo[blockHash] = {};
     }
     const blockInfo = this.hashToBlockInfo[blockHash];
-    if (ChainUtil.isEmptyNode(blockInfo.block)) {
+    if (ChainUtil.isEmpty(blockInfo.block)) {
       this.hashToBlockInfo[blockHash].block = block;
       this.hashToBlockInfo[blockHash].proposal = proposalTx;
       // We might have received some votes before the block itself
@@ -372,7 +372,11 @@ class BlockPool {
         delete this.hashToBlockInfo[blockHash];
         delete this.numberToBlock[number];
         delete this.hashToNextBlockSet[blockHash];
-        this.hashToState.delete(blockHash);
+        if (this.hashToDb.has(blockHash)) {
+          const db = this.hashToDb.get(blockHash);
+          this.node.destroyDb(db);
+          this.hashToDb.delete(blockHash);
+        }
       }
     });
     Object.keys(this.numberToBlock).forEach((key) => {