Merge pull request #118 from ainblockchain/develop

Release v0.3.1

Author: minsulee2

blockchain/afan_shard/genesis_sharding.json

@@ -2,5 +2,7 @@
   "sharding_protocol": "POA",
   "sharding_path": "/apps/afan",
   "parent_chain_poc": "http://127.0.0.1:8081",
-  "reporting_period": 5
+  "reporting_period": 5,
+  "token_exchange_scheme": "FIXED",
+  "token_exchange_rate": 10
 }

blockchain/block.js

@@ -241,7 +241,7 @@ class Block {
   }
 
   static getGenesisStateProofHash() {
-    const tempGenesisState = new DB(null, -1);
+    const tempGenesisState = new DB(null, null, false, -1);
     const genesisTransactions = Block.getGenesisBlockData(GenesisAccounts[AccountProperties.TIMESTAMP]);
     for (const tx of genesisTransactions) {
       const res = tempGenesisState.executeTransaction(tx);
@@ -267,7 +267,7 @@ class Block {
     const proposer = ownerAddress;
     const validators = GenesisWhitelist;
     const stateProofHash = Block.getGenesisStateProofHash();
-    return new this(lastHash, lastVotes, transactions, number, epoch, genesisTime,
+    return new Block(lastHash, lastVotes, transactions, number, epoch, genesisTime,
       stateProofHash, proposer, validators);
   }
 }

blockchain/genesis_functions.json

@@ -1,4 +1,26 @@
 {
+  "checkin": {
+    "$user_addr": {
+      "$checkin_id": {
+        "request": {
+          ".function": {
+            "function_type": "NATIVE",
+            "function_id": "_openCheckin"
+          }
+        },
+        "parent_finalize": {
+          "$tx_hash": {
+            "result": {
+              ".function": {
+                "function_type": "NATIVE",
+                "function_id": "_closeCheckin"
+              }
+            }
+          }
+        }
+      }
+    }
+  },
   "deposit": {
     "$service": {
       "$user_addr": {

blockchain/genesis_rules.json

@@ -11,6 +11,22 @@
       ".write": true
     }
   },
+  "checkin": {
+    "$user_addr": {
+      "$checkin_id": {
+        "request": {
+          ".write": "data === null && auth === $user_addr && util.isDict(newData)"
+        },
+        "parent_finalize": {
+          "$tx_hash": {
+            "result": {
+              ".write": "auth === getValue('/sharding/config/shard_owner') && util.isBool(newData)"
+            }
+          }
+        }
+      }
+    }
+  },
   "consensus": {
     "number": {
       "$number": {

blockchain/genesis_sharding.json

@@ -2,5 +2,7 @@
   "sharding_protocol": "NONE",
   "sharding_path": "/",
   "parent_chain_poc": "",
-  "reporting_period": 0
+  "reporting_period": 0,
+  "token_exchange_scheme": "NONE",
+  "token_exchange_rate": 0
 }

blockchain/index.js

@@ -141,24 +141,24 @@ class Blockchain {
     return lastBlock.timestamp;
   }
 
-  addNewBlock(newBlock) {
+  addNewBlockToChain(newBlock) {
     if (!newBlock) {
-      logger.error(`[blockchain.addNewBlock] Block is null`);
+      logger.error(`[blockchain.addNewBlockToChain] Block is null`);
       return false;
     }
     if (newBlock.number != this.lastBlockNumber() + 1) {
-      logger.error(`[blockchain.addNewBlock] Invalid blockchain number: ${newBlock.number}`);
+      logger.error(`[blockchain.addNewBlockToChain] Invalid blockchain number: ${newBlock.number}`);
       return false;
     }
     if (!(newBlock instanceof Block)) {
       newBlock = Block.parse(newBlock);
     }
     if (!this.backupDb.executeTransactionList(newBlock.last_votes)) {
-      logger.error(`[blockchain.addNewBlock] Failed to execute last_votes of block ${JSON.stringify(newBlock, null, 2)}`);
+      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.addNewBlock] Failed to execute transactions of block ${JSON.stringify(newBlock, null, 2)}`);
+      logger.error(`[blockchain.addNewBlockToChain] Failed to execute transactions of block ${JSON.stringify(newBlock, null, 2)}`);
       return false;
     }
     this.chain.push(newBlock);
@@ -321,7 +321,7 @@ class Blockchain {
         continue;
       }
       // TODO(lia): validate the state proof of each block
-      if (!this.addNewBlock(block)) {
+      if (!this.addNewBlockToChain(block)) {
         logger.error(`[${LOG_PREFIX}] Failed to add block ` + block);
         return false;
       }

chain-util.js

@@ -17,6 +17,13 @@ class ChainUtil {
     return hash.substring(0,6) + '...' + hash.substring(hash.length - 4, hash.length);
   }
 
+  static hashSignature(sig) {
+    const sigBuffer = ainUtil.toBuffer(sig);
+    const lenHash = sigBuffer.length - 65;
+    const hashedData = sigBuffer.slice(0, lenHash);
+    return '0x' + hashedData.toString('hex');
+  }
+
   // TODO (lia): remove this function
   static genKeyPair() {
     let keyPair;

client/index.js

@@ -30,13 +30,21 @@ process.on('SIGINT', _ => {
 if (!fs.existsSync(PROTOCOL_VERSIONS)) {
   throw Error('Missing protocol versions file: ' + PROTOCOL_VERSIONS);
 }
+if (!semver.valid(CURRENT_PROTOCOL_VERSION)) {
+  throw Error("Wrong version format is specified in package.json");
+}
 const VERSION_LIST = JSON.parse(fs.readFileSync(PROTOCOL_VERSIONS));
-if (!VERSION_LIST[CURRENT_PROTOCOL_VERSION]) {
+const MAJOR_MINOR_VERSION =
+    `${semver.major(CURRENT_PROTOCOL_VERSION)}.${semver.minor(CURRENT_PROTOCOL_VERSION)}`;
+if (!semver.valid(semver.coerce(MAJOR_MINOR_VERSION))) {
+  throw Error("Given major and minor version does not correctly setup");
+}
+if (!VERSION_LIST[MAJOR_MINOR_VERSION]) {
   throw Error("Current protocol version doesn't exist in the protocol versions file");
 }
 const minProtocolVersion =
-    VERSION_LIST[CURRENT_PROTOCOL_VERSION].min || CURRENT_PROTOCOL_VERSION;
-const maxProtocolVersion = VERSION_LIST[CURRENT_PROTOCOL_VERSION].max;
+    VERSION_LIST[MAJOR_MINOR_VERSION].min || CURRENT_PROTOCOL_VERSION;
+const maxProtocolVersion = VERSION_LIST[MAJOR_MINOR_VERSION].max;
 
 const app = express();
 app.use(express.json()); // support json encoded bodies
@@ -293,21 +301,20 @@ app.get('/pending_nonce_tracker', (req, res, next) => {
 
 app.get('/get_transaction', (req, res, next) => {
   const transactionInfo = node.tp.transactionTracker[req.query.hash];
-  let result = {};
   if (transactionInfo) {
     if (transactionInfo.status === TransactionStatus.BLOCK_STATUS) {
       const block = node.bc.getBlockByNumber(transactionInfo.number);
       const index = transactionInfo.index;
-      Object.assign(result, block.transactions[index], { is_confirmed: true });
+      transactionInfo.transaction = block.transactions[index];
     } else if (transactionInfo.status === TransactionStatus.POOL_STATUS) {
       const address = transactionInfo.address;
       const index = transactionInfo.index;
-      Object.assign(result, node.tp.transactions[address][index], { is_confirmed: false });
+      transactionInfo.transaction = node.tp.transactions[address][index];
     }
   }
   res.status(200)
     .set('Content-Type', 'application/json')
-    .send({code: 0, result})
+    .send({code: 0, result: transactionInfo})
     .end();
 });
 

client/protocol_versions.json

@@ -1,6 +1,6 @@
 {
-    "0.1.0": {
-        "min": "0.1.0",
-        "max": "0.1.0"
+    "0.3": {
+        "min": "0.3.1",
+        "max": "0.3.1"
     }
 }