Merge pull request #1218 from ainblockchain/bugfix/platfowner/bugfix

Fix newly found issues due to latest changes

Author: platfowner

common/common-util.js

@@ -751,8 +751,7 @@ class CommonUtil {
    * @param {Object} gasAmount gas amount
    * @returns
    */
-  static getTotalGasCost(gasPrice, gasAmount, gasPriceUnit, blockNumber = 2) {
-    const { isEnabledTimerFlag } = require('../common/constants');
+  static getTotalGasCost(gasPrice, gasAmount, gasPriceUnit, enableGasCostFlooring = true) {
     if (!CommonUtil.isNumber(gasPrice)) {
       gasPrice = 0; // Default gas price = 0 microain
     }
@@ -761,18 +760,18 @@ class CommonUtil {
     }
     let cost = gasPrice * gasPriceUnit * gasAmount;
     // NOTE(platfowner): Apply gas cost flooring up-to 6 decimals.
-    if (isEnabledTimerFlag('allow_up_to_6_decimal_transfer_value_only', blockNumber)) {
+    if (enableGasCostFlooring) {
       cost = Math.floor(cost * 1000000) / 1000000;  // gas cost flooring
     }
     return cost;
   }
 
-  static getServiceGasCostTotalFromTxList(txList, resList, gasPriceUnit, blockNumber = 2) {
+  static getServiceGasCostTotalFromTxList(txList, resList, gasPriceUnit, enableGasCostFlooring = true) {
     return resList.reduce((acc, cur, index) => {
       const tx = txList[index];
       return CommonUtil.mergeNumericJsObjects(acc, {
         gasAmountTotal: cur.gas_amount_charged,
-        gasCostTotal: CommonUtil.getTotalGasCost(tx.tx_body.gas_price, cur.gas_amount_charged, gasPriceUnit, blockNumber)
+        gasCostTotal: CommonUtil.getTotalGasCost(tx.tx_body.gas_price, cur.gas_amount_charged, gasPriceUnit, enableGasCostFlooring)
       });
     }, { gasAmountTotal: 0, gasCostTotal: 0 });
   }

consensus/index.js

@@ -18,6 +18,7 @@ const {
   StateVersions,
   ValueChangedEventSources,
   TransactionStates,
+  isEnabledTimerFlag,
 } = require('../common/constants');
 const { ConsensusErrorCode } = require('../common/result-code');
 const {
@@ -713,8 +714,9 @@ class Consensus {
       });
     }
     const gasPriceUnit = node.getBlockchainParam('resource/gas_price_unit', number, db.stateVersion);
+    const enableGasCostFlooring = isEnabledTimerFlag('allow_up_to_6_decimal_transfer_value_only', number);
     const { gasAmountTotal, gasCostTotal } =
-        CommonUtil.getServiceGasCostTotalFromTxList(transactions, txsRes, gasPriceUnit, number);
+        CommonUtil.getServiceGasCostTotalFromTxList(transactions, txsRes, gasPriceUnit, enableGasCostFlooring);
     if (gasAmountTotal !== expectedGasAmountTotal) {
       throw new ConsensusError({
         code: ConsensusErrorCode.INVALID_GAS_AMOUNT_TOTAL,

db/index.js

@@ -1702,6 +1702,7 @@ class DB {
       auth, tx, timestamp, blockNumber, blockTime, executionResult, eventSource, isDryrun) {
     const gasPriceUnit =
         DB.getBlockchainParam('resource/gas_price_unit', blockNumber, this.stateRoot);
+    const enableGasCostFlooring = isEnabledTimerFlag('allow_up_to_6_decimal_transfer_value_only', blockNumber);
     const gasPrice = tx.tx_body.gas_price;
     // Use only the service gas amount total
     const serviceBandwidthGasAmount = _.get(tx, 'extra.gas.bandwidth.service', 0);
@@ -1711,7 +1712,7 @@ class DB {
     if (gasAmountChargedByTransfer <= 0 || gasPrice === 0) { // No fees to collect
       executionResult.gas_amount_charged = gasAmountChargedByTransfer;
       executionResult.gas_cost_total =
-          CommonUtil.getTotalGasCost(gasPrice, gasAmountChargedByTransfer, gasPriceUnit, blockNumber);
+          CommonUtil.getTotalGasCost(gasPrice, gasAmountChargedByTransfer, gasPriceUnit, enableGasCostFlooring);
       return;
     }
     const billing = tx.tx_body.billing;
@@ -1724,7 +1725,7 @@ class DB {
       }
     }
     let balance = this.getBalance(billedTo);
-    const gasCost = CommonUtil.getTotalGasCost(gasPrice, gasAmountChargedByTransfer, gasPriceUnit, blockNumber);
+    const gasCost = CommonUtil.getTotalGasCost(gasPrice, gasAmountChargedByTransfer, gasPriceUnit, enableGasCostFlooring);
     if (!isDryrun && balance < gasCost) {
       Object.assign(executionResult, {
         code: TxResultCode.FEE_BALANCE_TOO_LOW,
@@ -1736,7 +1737,7 @@ class DB {
     }
     executionResult.gas_amount_charged = gasAmountChargedByTransfer;
     executionResult.gas_cost_total =
-        CommonUtil.getTotalGasCost(gasPrice, executionResult.gas_amount_charged, gasPriceUnit, blockNumber);
+        CommonUtil.getTotalGasCost(gasPrice, executionResult.gas_amount_charged, gasPriceUnit, enableGasCostFlooring);
     if (isDryrun || executionResult.gas_cost_total <= 0) {
       return;
     }

node/index.js

@@ -23,6 +23,7 @@ const {
   TrafficEventTypes,
   trafficStatsManager,
   ValueChangedEventSources,
+  isEnabledTimerFlag,
 } = require('../common/constants');
 const { TxResultCode } = require('../common/result-code');
 const { ValidatorOffenseTypes } = require('../consensus/constants');
@@ -949,8 +950,9 @@ class BlockchainNode {
     }
     const gasPriceUnit =
         this.getBlockchainParam('resource/gas_price_unit', blockNumber, baseDb.stateVersion);
+    const enableGasCostFlooring = isEnabledTimerFlag('allow_up_to_6_decimal_transfer_value_only', blockNumber);
     const { gasAmountTotal, gasCostTotal } =
-        CommonUtil.getServiceGasCostTotalFromTxList(transactions, resList, gasPriceUnit, blockNumber);
+        CommonUtil.getServiceGasCostTotalFromTxList(transactions, resList, gasPriceUnit, enableGasCostFlooring);
     const receipts = CommonUtil.txResultsToReceipts(resList);
     return { transactions, receipts, gasAmountTotal, gasCostTotal };
   }

start_node_genesis_gcp.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
 
 # NOTE(minsulee2): Since exit really exits terminals, those are replaced to return 1.
-if [[ $# -lt 4 ]] || [[ $# -gt 12 ]]; then
-    printf "Usage: bash start_node_genesis_gcp.sh [dev|staging|sandbox|exp|spring|summer|mainnet] <GCP Username> <Shard Index> <Node Index> [--keystore|--mnemonic|--private-key] [--keep-code|--no-keep-code] [--keep-data|--no-keep-data] [--full-sync|--fast-sync] [--chown-data|--no-chown-data] [--json-rpc] [--update-front-db] [--rest-func]\n"
+if [[ $# -lt 4 ]] || [[ $# -gt 13 ]]; then
+    printf "Usage: bash start_node_genesis_gcp.sh [dev|staging|sandbox|exp|spring|summer|mainnet] <GCP Username> <Shard Index> <Node Index> [--keystore|--mnemonic|--private-key] [--keep-code|--no-keep-code] [--keep-data|--no-keep-data] [--full-sync|--fast-sync] [--chown-data|--no-chown-data] [--json-rpc] [--update-front-db] [--rest-func] [--event-handler]\n"
     printf "Example: bash start_node_genesis_gcp.sh spring gcp_user 0 0 --keystore --no-keep-code --full-sync --no-chown-data\n"
     printf "\n"
     return 1

start_node_incremental_gcp.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-if [[ $# -lt 4 ]] || [[ $# -gt 12 ]]; then
-    printf "Usage: bash start_node_incremental_gcp.sh [dev|staging|sandbox|exp|spring|summer|mainnet] <GCP Username> <Shard Index> <Node Index> [--keystore|--mnemonic|--private-key] [--keep-code|--no-keep-code] [--keep-data|--no-keep-data] [--full-sync|--fast-sync] [--chown-data|--no-chown-data] [--json-rpc] [--update-front-db] [--rest-func]\n"
+if [[ $# -lt 4 ]] || [[ $# -gt 13 ]]; then
+    printf "Usage: bash start_node_incremental_gcp.sh [dev|staging|sandbox|exp|spring|summer|mainnet] <GCP Username> <Shard Index> <Node Index> [--keystore|--mnemonic|--private-key] [--keep-code|--no-keep-code] [--keep-data|--no-keep-data] [--full-sync|--fast-sync] [--chown-data|--no-chown-data] [--json-rpc] [--update-front-db] [--rest-func] [--event-handler]\n"
     printf "Example: bash start_node_incremental_gcp.sh spring gcp_user 0 0 --keystore --no-keep-code --full-sync --no-chown-data\n"
     printf "\n"
     exit

tools/genesis-file/createGenesisBlock.js

@@ -14,6 +14,7 @@ const {
   getBlockchainConfig,
   buildOwnerPermissions,
   BlockchainParams,
+  isEnabledTimerFlag,
 } = require('../../common/constants');
 const CommonUtil = require('../../common/common-util');
 const FileUtil = require('../../common/file-util');
@@ -400,8 +401,9 @@ function executeGenesisTxsAndGetData(genesisTxs) {
     }
     resList.push(res);
   }
+  const enableGasCostFlooring = isEnabledTimerFlag('allow_up_to_6_decimal_transfer_value_only', 0);
   const { gasAmountTotal, gasCostTotal } = CommonUtil.getServiceGasCostTotalFromTxList(
-      genesisTxs, resList, BlockchainParams.resource.gas_price_unit, 0);
+      genesisTxs, resList, BlockchainParams.resource.gas_price_unit, enableGasCostFlooring);
   return {
     stateProofHash: tempGenesisDb.getProofHash('/'),
     gasAmountTotal,