Merge pull request #1157 from ainblockchain/feature/platfowner/feature

Set chain id properly in blockchain node param config scripts
ainblockchain · Apr 25, 2023 · 738ece4 · 738ece4
2 parents 81c0c43 + ddd50a0
commit 738ece4
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/config_client_api_ip_whitelist.sh b/config_client_api_ip_whitelist.sh
@@ -72,10 +72,13 @@ printf "Enter password: "
 read -s PASSWORD
 printf "\n\n"
 if [[ $SEASON = "mainnet" ]]; then
+ CHAIN_ID="1"
  KEYSTORE_DIR="mainnet_prod_keys"
 elif [[ $SEASON = "spring" ]] || [[ $SEASON = "summer" ]]; then
+ CHAIN_ID="0"
  KEYSTORE_DIR="testnet_prod_keys"
 else
+ CHAIN_ID="0"
  KEYSTORE_DIR="testnet_dev_staging_keys"
 fi
 
@@ -87,14 +90,18 @@ else
  COMMAND_NODE_JS_FILE="getDevClientApiIpWhitelist.js"
 fi
 
+printf "CHAIN_ID=$CHAIN_ID\n"
+printf "KEYSTORE_DIR=$KEYSTORE_DIR\n"
+printf "COMMAND_NODE_JS_FILE=$COMMAND_NODE_JS_FILE\n"
+
 function config_node() {
  local node_index="$1"
  local node_ip_addr=${IP_ADDR_LIST[${node_index}]}
 
  printf "\n\n<<< Configuring ip whitelist of node $node_index ($node_ip_addr) >>>\n\n"
 
  KEYSTORE_FILE_PATH="$KEYSTORE_DIR/keystore_node_$node_index.json"
- CONFIG_NODE_CMD="node tools/api-access/$COMMAND_NODE_JS_FILE $node_ip_addr 0 keystore $KEYSTORE_FILE_PATH"
+ CONFIG_NODE_CMD="node tools/api-access/$COMMAND_NODE_JS_FILE $node_ip_addr $CHAIN_ID keystore $KEYSTORE_FILE_PATH"
  if [[ ! $COMMAND = "get" ]]; then
  CONFIG_NODE_CMD="$CONFIG_NODE_CMD '$IP_ADDR'"
  fi

diff --git a/config_node_param.sh b/config_node_param.sh
@@ -8,6 +8,7 @@ function usage() {
  printf "Example: bash config_node_param.sh dev add DEV_CLIENT_API_IP_WHITELIST '*'\n"
  printf "Example: bash config_node_param.sh dev remove DEV_CLIENT_API_IP_WHITELIST 32.190.239.181\n"
  printf "Example: bash config_node_param.sh dev set DEV_CLIENT_API_IP_WHITELIST '*'\n"
+ printf "Example: bash config_node_param.sh dev get CORS_WHITELIST\n"
  printf "\n"
  exit
 }
@@ -80,10 +81,13 @@ printf "Enter password: "
 read -s PASSWORD
 printf "\n\n"
 if [[ $SEASON = "mainnet" ]]; then
+ CHAIN_ID="1"
  KEYSTORE_DIR="mainnet_prod_keys"
 elif [[ $SEASON = "spring" ]] || [[ $SEASON = "summer" ]]; then
+ CHAIN_ID="0"
  KEYSTORE_DIR="testnet_prod_keys"
 else
+ CHAIN_ID="0"
  KEYSTORE_DIR="testnet_dev_staging_keys"
 fi
 
@@ -97,14 +101,18 @@ else
  COMMAND_NODE_JS_FILE="getNodeParam.js"
 fi
 
+printf "CHAIN_ID=$CHAIN_ID\n"
+printf "KEYSTORE_DIR=$KEYSTORE_DIR\n"
+printf "COMMAND_NODE_JS_FILE=$COMMAND_NODE_JS_FILE\n"
+
 function config_node() {
  local node_index="$1"
  local node_ip_addr=${IP_ADDR_LIST[${node_index}]}
 
  printf "\n\n<<< Configuring ip whitelist of node $node_index ($node_ip_addr) >>>\n\n"
 
  KEYSTORE_FILE_PATH="$KEYSTORE_DIR/keystore_node_$node_index.json"
- CONFIG_NODE_CMD="node tools/api-access/$COMMAND_NODE_JS_FILE $node_ip_addr 0 keystore $KEYSTORE_FILE_PATH $PARAM"
+ CONFIG_NODE_CMD="node tools/api-access/$COMMAND_NODE_JS_FILE $node_ip_addr $CHAIN_ID keystore $KEYSTORE_FILE_PATH $PARAM"
  if [[ ! $COMMAND = "get" ]]; then
  CONFIG_NODE_CMD="$CONFIG_NODE_CMD '$VALUE'"
  fi