Merge pull request #1153 from ainblockchain/release/v1.0.13

platfowner · web-flow · commit 9ca9812fd463 · 2023-04-20T15:30:54.000+09:00
Release/v1.0.13
diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
@@ -18,7 +18,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]
-        node-version: [ '14.x', '16.x' ]
+        node-version: [ '18.x' ]
     runs-on: ${{ matrix.os }}
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
diff --git a/README.md b/README.md
@@ -173,9 +173,9 @@ You can use some environment variables, and these have the following options.
 ```
 After the node is executed, you should inject your account into the node.
 ```
-node inject_account_gcp.js <NODE_ENDPOINT_URL> --private-key
-node inject_account_gcp.js <NODE_ENDPOINT_URL> --keystore
-node inject_account_gcp.js <NODE_ENDPOINT_URL> --mnemonic
+node inject_node_account.js <NODE_ENDPOINT_URL> --private-key
+node inject_node_account.js <NODE_ENDPOINT_URL> --keystore
+node inject_node_account.js <NODE_ENDPOINT_URL> --mnemonic
 ```
 If you want to inject your account automatically, add one of these environment variables before running the node.
 ```
diff --git a/client/protocol_versions.json b/client/protocol_versions.json
@@ -113,5 +113,8 @@
   },
   "1.0.12": {
     "min": "1.0.0"
+  },
+  "1.0.13": {
+    "min": "1.0.0"
   }
 }
diff --git a/deploy_blockchain_genesis_gcp.sh b/deploy_blockchain_genesis_gcp.sh
@@ -2,7 +2,9 @@
 
 if [[ $# -lt 2 ]] || [[ $# -gt 8 ]]; then
     printf "Usage: bash deploy_blockchain_genesis_gcp.sh [dev|staging|sandbox|exp|spring|summer|mainnet] <# of Shards> [--setup] [--keystore|--mnemonic|--private-key] [--keep-code|--no-keep-code] [--keep-data|--no-keep-data] [--full-sync|--fast-sync] [--chown-data|--no-chown-data] [--kill-only|--skip-kill]\n"
-    printf "Example: bash deploy_blockchain_genesis_gcp.sh dev 0 --setup --keystore --no-keep-code --no-chown-data\n"
+    printf "Example: bash deploy_blockchain_genesis_gcp.sh dev 0 --keystore --no-keep-code --keep-data\n"
+    printf "Example: bash deploy_blockchain_genesis_gcp.sh dev 0 --keystore --keep-code --keep-data\n"
+    printf "Example: bash deploy_blockchain_genesis_gcp.sh dev 0 --setup --keystore --no-keep-code\n"
     printf "\n"
     exit
 fi
@@ -158,7 +160,7 @@ function inject_account() {
             echo $KEYSTORE_FILE_PATH
             sleep 1
             echo $PASSWORD
-        } | node inject_account_gcp.js $node_ip_addr $ACCOUNT_INJECTION_OPTION
+        } | node inject_node_account.js $node_ip_addr $ACCOUNT_INJECTION_OPTION
     elif [[ "$ACCOUNT_INJECTION_OPTION" = "--mnemonic" ]]; then
         local MNEMONIC=${MNEMONIC_LIST[${node_index}]}
         printf "\n* >> Injecting an account for node $node_index ********************\n\n"
@@ -167,7 +169,7 @@ function inject_account() {
             echo $MNEMONIC
             sleep 1
             echo 0
-        } | node inject_account_gcp.js $node_ip_addr $ACCOUNT_INJECTION_OPTION
+        } | node inject_node_account.js $node_ip_addr $ACCOUNT_INJECTION_OPTION
     else
         printf "\n* >> Injecting an account for node $node_index ********************\n\n"
         printf "node_ip_addr='$node_ip_addr'\n"
@@ -176,7 +178,7 @@ function inject_account() {
             GENESIS_ACCOUNTS_PATH="blockchain-configs/testnet-prod/genesis_accounts.json"
         fi
         PRIVATE_KEY=$(cat $GENESIS_ACCOUNTS_PATH | jq -r '.others['$node_index'].private_key')
-        echo $PRIVATE_KEY | node inject_account_gcp.js $node_ip_addr $ACCOUNT_INJECTION_OPTION
+        echo $PRIVATE_KEY | node inject_node_account.js $node_ip_addr $ACCOUNT_INJECTION_OPTION
     fi
 }
 
diff --git a/deploy_blockchain_incremental_gcp.sh b/deploy_blockchain_incremental_gcp.sh
@@ -2,7 +2,10 @@
 
 if [[ $# -lt 4 ]] || [[ $# -gt 11 ]]; then
     printf "Usage: bash deploy_blockchain_incremental_gcp.sh [dev|staging|sandbox|exp|spring|summer|mainnet] <# of Shards> <Begin Parent Node Index> <End Parent Node Index> [--setup] [--keystore|--mnemonic|--private-key] [--keep-code|--no-keep-code] [--keep-data|--no-keep-data] [--full-sync|--fast-sync] [--chown-data|--no-chown-data]\n"
-    printf "Example: bash deploy_blockchain_incremental_gcp.sh dev 0 -1 1 --setup --keystore --no-keep-code --full-sync --no-chown-data\n"
+    printf "Example: bash deploy_blockchain_incremental_gcp.sh dev 0 -1 9 --keystore --no-keep-code --keep-data\n"
+    printf "Example: bash deploy_blockchain_incremental_gcp.sh dev 0 0 0 --keystore --keep-code --keep-data\n"
+    printf "Example: bash deploy_blockchain_incremental_gcp.sh dev 0 0 0 --setup --keystore --no-keep-code --keep-data\n"
+    printf "Example: bash deploy_blockchain_incremental_gcp.sh dev 0 -1 -1 --setup --keystore --no-keep-code\n"
     printf "Note: <Begin Parent Node Index> = -1 is for tracker\n"
     printf "Note: <End Parent Node Index> is inclusive\n"
     printf "\n"
@@ -266,7 +269,7 @@ function deploy_node() {
             echo $KEYSTORE_FILE_PATH
             sleep 1
             echo $PASSWORD
-        } | node inject_account_gcp.js $node_ip_addr $ACCOUNT_INJECTION_OPTION
+        } | node inject_node_account.js $node_ip_addr $ACCOUNT_INJECTION_OPTION
     elif [[ $ACCOUNT_INJECTION_OPTION = "--mnemonic" ]]; then
         local node_ip_addr=${IP_ADDR_LIST[${node_index}]}
         local MNEMONIC=${MNEMONIC_LIST[${node_index}]}
@@ -277,7 +280,7 @@ function deploy_node() {
             echo $MNEMONIC
             sleep 1
             echo 0
-        } | node inject_account_gcp.js $node_ip_addr $ACCOUNT_INJECTION_OPTION
+        } | node inject_node_account.js $node_ip_addr $ACCOUNT_INJECTION_OPTION
     else
         local node_ip_addr=${IP_ADDR_LIST[${node_index}]}
         printf "\n* >> Injecting an account for node $node_index ($node_target_addr) ********************\n\n"
@@ -287,7 +290,7 @@ function deploy_node() {
             GENESIS_ACCOUNTS_PATH="blockchain-configs/testnet-prod/genesis_accounts.json"
         fi
         PRIVATE_KEY=$(cat $GENESIS_ACCOUNTS_PATH | jq -r '.others['$node_index'].private_key')
-        echo $PRIVATE_KEY | node inject_account_gcp.js $node_ip_addr $ACCOUNT_INJECTION_OPTION
+        echo $PRIVATE_KEY | node inject_node_account.js $node_ip_addr $ACCOUNT_INJECTION_OPTION
     fi
 
     # 5. Wait until node is synced
diff --git a/deploy_blockchain_sandbox_gcp.sh b/deploy_blockchain_sandbox_gcp.sh
@@ -100,7 +100,7 @@ function inject_account() {
     printf "\n* >> Injecting an account for node $node_index ********************\n\n"
     printf "node_ip_addr='$node_ip_addr'\n"
     PRIVATE_KEY=$(cat $GENESIS_ACCOUNTS_PATH | jq -r '.others['$node_index'].private_key')
-    echo $PRIVATE_KEY | node inject_account_gcp.js $node_ip_addr $ACCOUNT_INJECTION_OPTION
+    echo $PRIVATE_KEY | node inject_node_account.js $node_ip_addr $ACCOUNT_INJECTION_OPTION
 }
 
 # GCP node address
diff --git a/deploy_monitoring_gcp.sh b/deploy_monitoring_gcp.sh
@@ -1,8 +1,9 @@
 #!/bin/bash
 
-if [[ "$#" -lt 2 ]]; then
-    printf "Usage: bash deploy_monitoring_gcp.sh [dev|staging|sandbox|exp|spring|summer|mainnet] <GCP Username>  [--setup]\n"
-    printf "Example: bash deploy_monitoring_gcp.sh dev gcp_user \n"
+if [[ "$#" -lt 1 ]]; then
+    printf "Usage: bash deploy_monitoring_gcp.sh [dev|staging|sandbox|exp|spring|summer|mainnet] [--setup]\n"
+    printf "Example: bash deploy_monitoring_gcp.sh dev --setup\n"
+    printf "Example: bash deploy_monitoring_gcp.sh dev\n"
     printf "\n"
     exit
 fi
@@ -24,10 +25,10 @@ fi
 printf "SEASON=$SEASON\n"
 printf "PROJECT_ID=$PROJECT_ID\n"
 
-GCP_USER="$2"
+GCP_USER="runner"
 printf "GCP_USER=$GCP_USER\n"
 
-OPTIONS="$3"
+OPTIONS="$2"
 printf "OPTIONS=$OPTIONS\n"
 
 # Get confirmation.
diff --git a/inject_node_account.js b/inject_node_account.js
@@ -142,7 +142,7 @@ async function processArguments() {
 }
 
 function usage() {
-  console.log('\nExample commandlines:\n  node inject_account_gcp.js <ENDPOINT_URL> <ACCOUNT_INJECTION_OPTION>\n');
+  console.log('\nExample commandlines:\n  node inject_node_account.js <ENDPOINT_URL> <ACCOUNT_INJECTION_OPTION>\n');
   process.exit(0);
 }
 
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "ain-blockchain",
   "description": "AI Network Blockchain",
-  "version": "1.0.12",
+  "version": "1.0.13",
   "private": true,
   "license": "MIT",
   "author": "dev@ainetwork.ai",
@@ -10,7 +10,7 @@
     "url": "https://github.com/ainblockchain/ain-blockchain"
   },
   "engines": {
-    "node": ">=14"
+    "node": ">=18"
   },
   "scripts": {
     "client": "UNSAFE_PRIVATE_KEY=b22c95ffc4a5c096f7d7d0487ba963ce6ac945bdc91c79b64ce209de289bec96 DEBUG=true node ./client/index.js",
diff --git a/setup_blockchain_ubuntu.sh b/setup_blockchain_ubuntu.sh
@@ -2,16 +2,21 @@
 
 printf "\n[[[[[ setup_blockchain_ubuntu.sh ]]]]]\n\n"
 
-printf 'Upgrading apt..\n'
+printf '\n[[ Upgrading apt.. ]]\n'
 sudo apt update
 # skip prompting (see https://serverfault.com/questions/527789/how-to-automate-changed-config-files-during-apt-get-upgrade-in-ubuntu-12)
-apt-get --yes --force-yes -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" upgrade
+sudo apt-get --yes -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" upgrade
 
-printf 'Installing NodeJS..\n'
+printf '\n[[ Uninstalling NodeJS.. ]]\n'
+sudo apt-get -y purge nodejs
+sudo apt-get -y autoremove
+
+printf '\n[[ Installing NodeJS.. ]]\n'
 sudo apt update
 sudo apt -y install curl dirmngr apt-transport-https lsb-release ca-certificates
-curl -sL https://deb.nodesource.com/setup_16.x | sudo -E bash -
-sudo apt -y install nodejs
+curl -sL https://deb.nodesource.com/setup_18.x | sudo -E bash -
+# skip prompting for daemon restart (see https://askubuntu.com/questions/1367139/apt-get-upgrade-auto-restart-services)
+sudo NEEDRESTART_MODE=a apt -y install nodejs
 
 printf 'node -v\n'
 node -v
@@ -20,29 +25,30 @@ printf 'npm --version\n'
 npm --version
 
 
-printf 'Installing yarn..\n'
+printf '\n[[ Installing yarn.. ]]\n'
 sudo npm install -g yarn
 
 printf 'yarn --version\n'
 sudo yarn --version
 
 
-printf 'Installing make..\n'
+printf '\n[[ Installing make.. ]]\n'
 sudo apt update
-sudo apt-get install -y build-essential
+# skip prompting for daemon restart (see https://askubuntu.com/questions/1367139/apt-get-upgrade-auto-restart-services)
+sudo NEEDRESTART_MODE=a apt-get install -y build-essential
 
 printf 'make --version\n'
 make --version
 
 
-printf 'Installing vim..\n'
+printf '\n[[ Installing vim.. ]]\n'
 sudo apt update
 sudo apt install -y vim
 
 printf 'vim --version\n'
 vim --version
 
-printf 'Installing jq..\n'
+printf '\n[[ Installing jq.. ]]\n'
 sudo apt update
 sudo apt install -y jq
 
diff --git a/setup_monitoring_ubuntu.sh b/setup_monitoring_ubuntu.sh
@@ -4,7 +4,7 @@ printf "\n[[[[[ setup_monitoring_ubuntu.sh ]]]]]\n\n"
 
 printf 'Installing NodeJS..\n'
 sudo apt update
-curl -sL https://deb.nodesource.com/setup_12.x | sudo -E bash -
+curl -sL https://deb.nodesource.com/setup_18.x | sudo -E bash -
 sudo apt install -y nodejs
 
 printf 'node -v\n'
@@ -54,4 +54,5 @@ wget -q -O - https://packages.grafana.com/gpg.key | sudo apt-key add -
 echo "deb https://packages.grafana.com/oss/deb stable main" | sudo tee -a /etc/apt/sources.list.d/grafana.list
 
 sudo apt-get update
-sudo apt-get install -y grafana
+# NOTE(platfowner): Fix grafana version to 8.5.13 for compatibility.
+sudo apt-get install -y grafana=8.5.13
diff --git a/start_node_docker.sh b/start_node_docker.sh
@@ -31,7 +31,7 @@ elif [[ $ACCOUNT_INJECTION_OPTION = "private_key" ]]; then
     if [[ -z "$PRIVATE_KEY" ]]; then
         printf 'You should manually inject your account into this node.\n'
     else
-        echo $PRIVATE_KEY | node inject_account_gcp.js $NODE_ENDPOINT --private-key
+        echo $PRIVATE_KEY | node inject_node_account.js $NODE_ENDPOINT --private-key
         unset PRIVATE_KEY
     fi
 elif [[ $ACCOUNT_INJECTION_OPTION = "keystore" ]]; then
@@ -42,7 +42,7 @@ elif [[ $ACCOUNT_INJECTION_OPTION = "keystore" ]]; then
             echo $KEYSTORE_FILE_PATH
             sleep 1
             echo $PASSWORD
-        } | node inject_account_gcp.js $NODE_ENDPOINT --keystore
+        } | node inject_node_account.js $NODE_ENDPOINT --keystore
     fi
 elif [[ $ACCOUNT_INJECTION_OPTION = "mnemonic" ]]; then
     if [[ -z "$MNEMONIC" ]]; then
@@ -52,7 +52,7 @@ elif [[ $ACCOUNT_INJECTION_OPTION = "mnemonic" ]]; then
             echo $MNEMONIC
             sleep 1
             echo 0
-        } | node inject_account_gcp.js $NODE_ENDPOINT --mnemonic
+        } | node inject_node_account.js $NODE_ENDPOINT --mnemonic
         unset MNEMONIC
     fi
 else

Original file line number	Diff line number	Diff line change
`@@ -113,5 +113,8 @@`
`113`	`113`	`},`
`114`	`114`	`"1.0.12": {`
`115`	`115`	`"min": "1.0.0"`
	`116`	`+ },`
	`117`	`+ "1.0.13": {`
	`118`	`+ "min": "1.0.0"`
`116`	`119`	`}`
`117`	`120`	`}`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ function inject_account() {`
`100`	`100`	`printf "\n* >> Injecting an account for node $node_index ********************\n\n"`
`101`	`101`	`printf "node_ip_addr='$node_ip_addr'\n"`
`102`	`102`	`PRIVATE_KEY=$(cat $GENESIS_ACCOUNTS_PATH \| jq -r '.others['$node_index'].private_key')`
`103`		`- echo $PRIVATE_KEY \| node inject_account_gcp.js $node_ip_addr $ACCOUNT_INJECTION_OPTION`
	`103`	`+ echo $PRIVATE_KEY \| node inject_node_account.js $node_ip_addr $ACCOUNT_INJECTION_OPTION`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`# GCP node address`
Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ async function processArguments() {`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`function usage() {`
`145`		`- console.log('\nExample commandlines:\n node inject_account_gcp.js <ENDPOINT_URL> <ACCOUNT_INJECTION_OPTION>\n');`
	`145`	`+ console.log('\nExample commandlines:\n node inject_node_account.js <ENDPOINT_URL> <ACCOUNT_INJECTION_OPTION>\n');`
`146`	`146`	`process.exit(0);`
`147`	`147`	`}`
`148`	`148`