Merge pull request #344 from ainblockchain/release/v0.7.0

Release/v0.7.0

Author: minsulee2

.gitignore

@@ -1,13 +1,14 @@
 # XXX: Project Related
-blockchain/blockchains
+chains
 logs
 log1.txt
 log2.txt
 load1.txt
 load2.txt
 blocks1.txt
 blocks2.txt
-blockchain/shard_*
+shard-configs
+*_on_prem.sh
 
 # XXX: .dockerignore
 .git

README.md

@@ -32,11 +32,11 @@ You can override default port numbering system by setting `PORT` and `P2P_PORT`
   Set <NUMBER_OF_SHARDS> to 0 if you only want to run a parent chain, or set it to the specific number of shard chains you want to run in addition to the parent chain.
 ```
 gcloud init
-sh deploy_gcp.sh {dev|spring|summer} <YOUR_GCP_USER_NAME> <NUMBER_OF_SHARDS>
+sh deploy_blockchain_gcp.sh {dev|spring|summer} <YOUR_GCP_USER_NAME> <NUMBER_OF_SHARDS>
 ```
 - Set up Ubuntu machine (if it's on a new VM)
 ```
-sh setup_ubuntu.sh
+sh setup_blockchain_ubuntu.sh
 ```
 - Copy files to a sharable folder & install npm packages
 ```
@@ -66,7 +66,7 @@ docker run --network="host" -d ainblockchain/tracker-server:latest
 ```
 -->
 
-### Client APIs for development and debugging
+### Client API for development and debugging
 
 #### Tracker health check
 
@@ -92,20 +92,20 @@ yarn install
 ```
 - Run blockchain nodes
 ```
-ACCOUNT_INDEX=0 DEBUG=false STAKE=250 node client/index.js
-ACCOUNT_INDEX=1 DEBUG=false STAKE=250 node client/index.js 
-ACCOUNT_INDEX=2 DEBUG=false STAKE=250 node client/index.js
+MIN_NUM_VALIDATORS=3 ACCOUNT_INDEX=0 DEBUG=false STAKE=250 CONSOLE_LOG=true ENABLE_DEV_CLIENT_API=true node client/index.js
+MIN_NUM_VALIDATORS=3 ACCOUNT_INDEX=1 DEBUG=false STAKE=250 CONSOLE_LOG=true ENABLE_DEV_CLIENT_API=true node client/index.js 
+MIN_NUM_VALIDATORS=3 ACCOUNT_INDEX=2 DEBUG=false STAKE=250 CONSOLE_LOG=true ENABLE_DEV_CLIENT_API=true node client/index.js
 ```
 You can override default port numbering system by setting `PORT` and `P2P_PORT` environment variables.
 Before starting node jobs, remove existing blockchain files and logs if necessary:
 ```
-rm -rf blockchain/blockchains logger/logs
+rm -rf chains logs
 ```
 The default minimum size of the validator whitelist is 3. Change MIN_NUM_VALIDATORS parameter in 
 the genesis-configs/base/genesis.json to change this value. You may also need to modify the GENESIS_WHITELIST and GENESIS_VALIDATORS accordingly.
 The genesis configs directory used is `genesis-configs/base` by default and it can be altered using `GENESIS_CONFIGS_DIR` env variable. For example, afan shard cluster can use the following command line:
 ```
-GENESIS_CONFIGS_DIR=genesis-configs/afan-shard ACCOUNT_INDEX=0 DEBUG=false STAKE=250 node client/index.js
+GENESIS_CONFIGS_DIR=genesis-configs/afan-shard MIN_NUM_VALIDATORS=1 ACCOUNT_INDEX=0 DEBUG=false STAKE=250 CONSOLE_LOG=true ENABLE_DEV_CLIENT_API=true node client/index.js
 ```
 
 ### How to run tests
@@ -124,11 +124,11 @@ npm run test_integration
   Set <NUMBER_OF_SHARDS> to 0 if you only want to run a parent chain, or set it to the specific number of shard chains you want to run in addition to the parent chain.
 ```
 gcloud init
-sh deploy_gcp.sh {dev|spring|summer} <YOUR_GCP_USER_NAME> <NUMBER_OF_SHARDS>
+sh deploy_blockchain_gcp.sh {dev|spring|summer} <YOUR_GCP_USER_NAME> <NUMBER_OF_SHARDS>
 ```
 - Set up Ubuntu machine (if it's on a new VM)
 ```
-sh setup_ubuntu.sh
+sh setup_blockchain_ubuntu.sh
 ```
 - Copy files to a sharable folder & install npm packages
 ```
@@ -178,7 +178,7 @@ npm run test_smoke
 npm run test_integration
 ```
 
-### Client APIs for development and debugging
+### Client API for development and debugging
 
 #### Node health check
 

afan_client/index.js

@@ -1,18 +1,17 @@
 
 const RequestManager = require('./request_manager');
 const ProfitManager = require('./profit_manager');
-const errors = require('request-promise/errors');
 
 const INVEST_FEE = 0.1;
-const APP_NAME = 'afan';
+const APP_PATH = '/apps/afan';
 
 class AfanClient {
   constructor(endpoint) {
     this.endpoint = endpoint;
   }
 
   tx_invest(from, to, value) {
-    const requestManager = new RequestManager(this.endpoint, APP_NAME);
+    const requestManager = new RequestManager(this.endpoint, APP_PATH);
     requestManager.increaseBalance(from, -value);
     requestManager.increaseInvestorBalance(to, from, value);
     requestManager.increaseInvestTotal(to, value);
@@ -30,11 +29,8 @@ class AfanClient {
       const investorsResponse = await requestManager.getInvestors(to);
       investors = investorsResponse.result;
     } catch (err) {
-      if (err instanceof errors.StatusCodeError) {
-        investors = null;
-      } else {
-        throw err
-      }
+      console.log(err);
+      throw err;
     }
 
     requestManager.increaseBalance(from, -value);
@@ -43,32 +39,31 @@ class AfanClient {
   }
 
   async tx_crushOnPost(from, to, pid, value) {
-    const requestManager = new RequestManager(this.endpoint, APP_NAME);
+    const requestManager = new RequestManager(this.endpoint, APP_PATH);
     await this.shareProfit(requestManager, from, to, value);
     requestManager.increasePostCrushOn(to, pid, from, value);
 
     return requestManager.send();
   }
 
   async tx_crushOnReply(from, to, pid, rid, value) {
-    const requestManager = new RequestManager(this.endpoint, APP_NAME);
+    const requestManager = new RequestManager(this.endpoint, APP_PATH);
     await this.shareProfit(requestManager, from, to, value);
     requestManager.increaseReplyCrushOn(pid, rid, from, value);
 
     return requestManager.send();
   }
 
   async tx_adpropose(from, to, value, intermed) {
-    const requestManager = new RequestManager(this.endpoint, APP_NAME);
+    const requestManager = new RequestManager(this.endpoint, APP_PATH);
     try {
       const state = await requestManager.getAdState(from, to);
       if (state.result && state.result !== 3) {
         return {code: -4, message: 'Already proposed'};
       }
     } catch (err) {
-      if (!(err instanceof errors.StatusCodeError)) {
-        throw err
-      }
+      console.log(err);
+      throw err;
     }
     requestManager.increaseBalance(from, -value);
     requestManager.increaseBalance(intermed, value);

afan_client/request_manager.js

@@ -1,6 +1,6 @@
-
+const _ = require('lodash');
 const Ref = require('./ref');
-const rp = require('request-promise');
+const axios = require('axios');
 
 class RequestManager {
   constructor(endpoint, root) {
@@ -10,28 +10,23 @@ class RequestManager {
   }
 
   send() {
-    const options = {
-      method: 'POST',
-      uri: this.endpoint + '/set',
-      body: {op_list: this.updates},
-      json: true, // Automatically stringifies the body to JSON
-    };
-
-    return rp(options).then(function(parsedBody) {
-      // POST succeeded
-      return parsedBody;
-    }).catch(function(err) {
-      // POST failed
+    return axios.post(this.endpoint + '/set', { op_list: this.updates })
+    .then((resp) => {
+      return _.get(resp, 'data', null);
+    }).catch((err) => {
       console.log(err);
+      return null;
     });
   }
 
   getRef(ref) {
-    const options = {
-      uri: this.endpoint + `/get_value?ref=${this.root}/${ref}`,
-      json: true,
-    };
-    return rp(options);
+    return axios.get(this.endpoint + `/get_value?ref=${this.root}/${ref}`)
+    .then((resp) => {
+      return _.get(resp, 'data', null);
+    }).catch((err) => {
+      console.log(err);
+      return null;
+    });
   }
 
   getInvestors(uid) {

blockchain/block-file-patterns.js

@@ -0,0 +1,109 @@
+const fs = require('fs');
+const glob = require('glob');
+const path = require('path');
+const {compare} = require('natural-orderby');
+const zlib = require('zlib');
+const {CHAINS_N2B_DIR_NAME, CHAINS_H2N_DIR_NAME} = require('../common/constants');
+const ChainUtil = require('../common/chain-util');
+const FILE_NAME_SUFFIX = 'json.gz';
+const logger = require('../logger')('BLOCK-FILE-UTIL');
+
+class BlockFileUtil {
+  static getBlockPath(chainPath, blockNumber) {
+    return path.join(chainPath, CHAINS_N2B_DIR_NAME, this.getBlockFilenameByNumber(blockNumber));
+  }
+
+  static getHashToNumberPath(chainPath, blockHash) {
+    return path.join(chainPath, CHAINS_H2N_DIR_NAME, blockHash);
+  }
+
+  static getBlockFilenameByNumber(blockNumber) {
+    return `${blockNumber}.${FILE_NAME_SUFFIX}`;
+  }
+
+  static getBlockFilename(block) {
+    return this.getBlockFilenameByNumber(block.number);
+  }
+
+  // TODO(csh): Don't use glob?
+  static getAllBlockPaths(chainPath) {
+    const allBlockFilesPattern = `${chainPath}/${CHAINS_N2B_DIR_NAME}/*.${FILE_NAME_SUFFIX}`;
+    return glob.sync(allBlockFilesPattern).sort(compare());
+  }
+
+  static getBlockPaths(chainPath, from, to) {
+    const blockPaths = [];
+    for (let number = from; number < to; number++) {
+      const blockFile = this.getBlockPath(chainPath, number);
+      if (fs.existsSync(blockFile)) {
+        blockPaths.push(blockFile);
+      }
+    }
+    return blockPaths;
+  }
+
+  static createBlockchainDir(chainPath) {
+    const n2bPath = path.join(chainPath, CHAINS_N2B_DIR_NAME);
+    const h2nPath = path.join(chainPath, CHAINS_H2N_DIR_NAME);
+    let isBlockEmpty = true;
+
+    if (!fs.existsSync(chainPath)) {
+      fs.mkdirSync(chainPath, {recursive: true});
+    }
+
+    if (!fs.existsSync(n2bPath)) {
+      fs.mkdirSync(n2bPath);
+    }
+
+    if (!fs.existsSync(h2nPath)) {
+      fs.mkdirSync(h2nPath);
+    }
+
+    if (fs.readdirSync(n2bPath).length > 0) {
+      isBlockEmpty = false;
+    }
+    return isBlockEmpty;
+  }
+
+  // TODO(csh): Change to asynchronous
+  static readBlock(blockPath) {
+    const zippedFs = fs.readFileSync(blockPath);
+    return JSON.parse(zlib.gunzipSync(zippedFs).toString());
+  }
+
+  static readBlockByNumber(chainPath, blockNumber) {
+    const blockPath = this.getBlockPath(chainPath, blockNumber);
+    return this.readBlock(blockPath);
+  }
+
+  // TODO(csh): Change to asynchronous
+  static writeBlock(chainPath, block) {
+    const blockPath = this.getBlockPath(chainPath, block.number);
+    if (!fs.existsSync(blockPath)) {
+      const compressed = zlib.gzipSync(Buffer.from(JSON.stringify(block)));
+      fs.writeFileSync(blockPath, compressed);
+    } else {
+      logger.debug(`${blockPath} file already exists!`);
+    }
+  }
+
+  static writeHashToNumber(chainPath, blockHash, blockNumber) {
+    if (!blockHash || !ChainUtil.isNumber(blockNumber) || blockNumber < 0) {
+      logger.error(`Invalid writeHashToNumber parameters (${blockHash}, ${blockNumber})`);
+      return;
+    }
+    const hashToNumberPath = this.getHashToNumberPath(chainPath, blockHash);
+    if (!fs.existsSync(hashToNumberPath)) {
+      fs.writeFileSync(hashToNumberPath, blockNumber);
+    } else {
+      logger.debug(`${hashToNumberPath} file already exists!`);
+    }
+  }
+
+  static readHashToNumber(chainPath, blockHash) {
+    const hashToNumberPath = this.getHashToNumberPath(chainPath, blockHash);
+    return Number(fs.readFileSync(hashToNumberPath).toString());
+  }
+}
+
+module.exports = BlockFileUtil;