Merge pull request #1193 from ainblockchain/release/v1.1.0

Release/v1.1.0

Author: platfowner

blockchain-configs/base/timer_flags.json

@@ -47,5 +47,13 @@
   "update_min_gc_num_siblings_deleted": {
     "enabled_block": 2,
     "has_bandage": true
+  },
+  "update_min_gc_num_siblings_deleted2": {
+    "enabled_block": 2,
+    "has_bandage": true
+  },
+  "tweak_transfer_gc_rule": {
+    "enabled_block": 2,
+    "has_bandage": true
   }
 }

blockchain-configs/mainnet-prod/timer_flags.json

@@ -46,5 +46,13 @@
   "update_min_gc_num_siblings_deleted": {
     "enabled_block": 1414800,
     "has_bandage": true
+  },
+  "update_min_gc_num_siblings_deleted2": {
+    "enabled_block": 2430100,
+    "has_bandage": true
+  },
+  "tweak_transfer_gc_rule": {
+    "enabled_block": 2430100,
+    "has_bandage": true
   }
 }

blockchain-configs/testnet-dev/timer_flags.json

@@ -50,5 +50,13 @@
   "update_min_gc_num_siblings_deleted": {
     "enabled_block": 1411300,
     "has_bandage": true
+  },
+  "update_min_gc_num_siblings_deleted2": {
+    "enabled_block": 2429500,
+    "has_bandage": true
+  },
+  "tweak_transfer_gc_rule": {
+    "enabled_block": 2429500,
+    "has_bandage": true
   }
 }

blockchain-configs/testnet-prod/timer_flags.json

@@ -673,7 +673,8 @@ app.get('/get_config', (req, res) => {
 /**
  * Dev Client SET APIs (available to whitelisted IPs, if ENABLE_DEV_CLIENT_SET_API == true)
  */
-
+// TODO(platfowner): Deprecate Dev Client SET APIs once the related test cases are migrated to
+// json rpc APIs.
 if (NodeConfigs.ENABLE_DEV_CLIENT_SET_API) {
   app.post('/set_value', (req, res, next) => {
     const beginTime = Date.now();

client/index.js

@@ -122,5 +122,8 @@
   },
   "1.0.15": {
     "min": "1.0.0"
+  },
+  "1.1.0": {
+    "min": "1.0.0"
   }
 }

client/protocol_versions.json

@@ -551,7 +551,7 @@ class CommonUtil {
   // TODO(platfowner): Consider some code (e.g. IN_LOCKUP_PERIOD, INSUFFICIENT_BALANCE) no failure
   // so that their transactions are not reverted.
   static isFailedFuncResultCode(code) {
-    return code !== FunctionResultCode.SUCCESS;
+    return code !== FunctionResultCode.SUCCESS && code !== FunctionResultCode.SKIP;
   }
 
   static isAppPath(parsedPath) {
@@ -1057,15 +1057,19 @@ class CommonUtil {
   static createTimerFlagEnabledBandageMap(timerFlags) {
     const LOG_HEADER = 'createTimerFlagEnabledBandageMap';
     const map = new Map();
-    console.log(`[${LOG_HEADER}] Registering bandage files:`);
+    if (process.env.LOG_BANDAGE_INFO) {
+      console.log(`[${LOG_HEADER}] Registering bandage files:`);
+    }
     const flagNameList = Object.keys(timerFlags);
     for (let i = 0; i < flagNameList.length; i++) {
       const flagName = flagNameList[i];
       const flag = timerFlags[flagName];
       const enabledBlockNumber = CommonUtil.getEnabledBlockNumberFromTimerFlag(flag);
       if (CommonUtil.isNumber(enabledBlockNumber) && flag['has_bandage'] === true) {
         const bandageFilePath = path.resolve(__dirname, '../db/bandage-files', `${flagName}.js`);
-        console.log(`[${LOG_HEADER}] [${i}] Registering ${bandageFilePath}`);
+        if (process.env.LOG_BANDAGE_INFO) {
+          console.log(`[${LOG_HEADER}] [${i}] Registering ${bandageFilePath}`);
+        }
         if (!fs.existsSync(bandageFilePath)) {
           throw Error(`Missing bandage file: ${bandageFilePath}`);
         }
@@ -1074,7 +1078,9 @@ class CommonUtil {
         }
         map.get(enabledBlockNumber).push(flagName);
       } else {
-        console.log(`[${LOG_HEADER}] [${i}] Skipping for timer flag: ${flagName}`);
+        if (process.env.LOG_BANDAGE_INFO) {
+          console.log(`[${LOG_HEADER}] [${i}] Skipping for timer flag: ${flagName}`);
+        }
       }
     }
     return map;

common/common-util.js

@@ -116,17 +116,18 @@ function setNodeConfigs() {
       NodeConfigs[param] = valFromNodeParams;
     }
   }
-  if (!fs.existsSync(NodeConfigs.BLOCKCHAIN_DATA_DIR)) {
+  const blockchainDataDirPath = path.resolve(__dirname, '..', NodeConfigs.BLOCKCHAIN_DATA_DIR);
+  if (!fs.existsSync(blockchainDataDirPath)) {
     try {
-      fs.mkdirSync(NodeConfigs.BLOCKCHAIN_DATA_DIR, { recursive: true });
+      fs.mkdirSync(blockchainDataDirPath, { recursive: true });
     } catch (e) {
       console.log(e)
     }
   }
-  NodeConfigs.LOGS_DIR = path.resolve(NodeConfigs.BLOCKCHAIN_DATA_DIR, 'logs');
-  NodeConfigs.CHAINS_DIR = path.resolve(NodeConfigs.BLOCKCHAIN_DATA_DIR, 'chains');
-  NodeConfigs.SNAPSHOTS_ROOT_DIR = path.resolve(NodeConfigs.BLOCKCHAIN_DATA_DIR, 'snapshots');
-  NodeConfigs.KEYS_ROOT_DIR = path.resolve(NodeConfigs.BLOCKCHAIN_DATA_DIR, 'keys');
+  NodeConfigs.LOGS_DIR = path.resolve(blockchainDataDirPath, 'logs');
+  NodeConfigs.CHAINS_DIR = path.resolve(blockchainDataDirPath, 'chains');
+  NodeConfigs.SNAPSHOTS_ROOT_DIR = path.resolve(blockchainDataDirPath, 'snapshots');
+  NodeConfigs.KEYS_ROOT_DIR = path.resolve(blockchainDataDirPath, 'keys');
 }
 setNodeConfigs();
 

common/constants.js

@@ -126,6 +126,7 @@ const FailedTxPrecheckCodeSet = new Set([
 // If they are altered and deployed, the full sync of the blockchain nodes can fail.
 const FunctionResultCode = {
   SUCCESS: 0,
+  SKIP: 20000,  // Normal skip
   FAILURE: 20001,  // Normal failure
   INTERNAL_ERROR: 20002,  // Something went wrong but don't know why
   // Transfer

common/result-code.js

@@ -7,7 +7,7 @@ module.exports = {
           "write": "(auth.addr === $from || auth.fid === '_stake' || auth.fid === '_unstake' || auth.fid === '_pay' || auth.fid === '_claim' || auth.fid === '_hold' || auth.fid === '_release' || auth.fid === '_collectFee' || auth.fid === '_claimReward' || auth.fid === '_openCheckout' || auth.fid === '_closeCheckout' || auth.fid === '_closeCheckin') && !getValue('transfer/' + $from + '/' + $to + '/' + $key) && (util.isServAcntName($from, blockNumber) || util.isCksumAddr($from)) && (util.isServAcntName($to, blockNumber) || util.isCksumAddr($to)) && $from !== $to && util.isNumber(newData) && newData > 0 && util.getBalance($from, getValue) >= newData"
         }
       },
-      // From allow_lower_case_app_names_only bandage file.
+      // From allow_lower_case_app_names_only.js bandage file.
       prevValue: {
         ".rule": {
           "write": "(auth.addr === $from || auth.fid === '_stake' || auth.fid === '_unstake' || auth.fid === '_pay' || auth.fid === '_claim' || auth.fid === '_hold' || auth.fid === '_release' || auth.fid === '_collectFee' || auth.fid === '_claimReward' || auth.fid === '_openCheckout' || auth.fid === '_closeCheckout' || auth.fid === '_closeCheckin') && !getValue('transfer/' + $from + '/' + $to + '/' + $key) && (util.isServAcntName($from, blockNumber) || util.isCksumAddr($from)) && (util.isServAcntName($to, blockNumber) || util.isCksumAddr($to)) && $from !== $to && util.isNumber(newData) && util.getBalance($from, getValue) >= newData"