optimize deploy scripts

XinFinOrg · Nov 16, 2023 · e37cb89 · e37cb89
1 parent e3585e4
commit e37cb89
Show file tree

Hide file tree

Showing 7 changed files with 72 additions and 64 deletions.
diff --git a/deployment.config.json.example b/deployment.config.json.example
@@ -8,6 +8,4 @@
   ],
   "gap": 450,
   "epoch": 900
-  "xdcparentnet": "https://devnetstats.apothem.network/devnet",
-  "xdcsubnet": "https://devnetstats.apothem.network/subnet"
 }
diff --git a/docker/deploy_csc.sh b/docker/deploy_csc.sh
@@ -29,29 +29,30 @@ if [[ ${PRIVATE_KEY::2} == "0x"  ]]; then
 fi
 echo "PRIVATE_KEY=${PRIVATE_KEY}" > .env 
 
-if [[ -z "$PARENTCHAIN" ]]; then
-  echo 'PARENTCHAIN is not set, default to devnet'
-  DEPLOY_NET=xdcdevnet
+if [[ -z "$PARENTCHAIN_URL" ]]; then
+  echo "PARENTCHAIN_URL not specified"
+  exit 1
 else
-  echo "PARENTCHAIN=$PARENTCHAIN"
-  if [[ $PARENTCHAIN == 'devnet' || $PARENTCHAIN == 'xdcdevnet' ]]; then
-      DEPLOY_NET='xdcdevnet'
-  fi
-  if [[ $PARENTCHAIN == 'testnet' || $PARENTCHAIN == 'xdctestnet' ]]; then
-      DEPLOY_NET='xdctestnet'
-  fi
-  echo "Deploying to $DEPLOY_NET"
+  cat network.config.json | sed -e "s/\"xdcparentnet\".*/\"xdcparentnet\": \"$PARENTCHAIN_URL\",/" > temp.json
+  mv temp.json network.config.json
 fi
 
+if [[ -z "$SUBNET_URL" ]]; then
+  echo "SUBNET_URL not specified" 
+  exit 1
+else
+  cat network.config.json | sed -e "s/\"xdcsubnet\".*/\"xdcsubnet\": \"$SUBNET_URL\",/" > temp.json
+  mv temp.json network.config.json
+fi
 
 if [[ $RELAYER_MODE == 'full' ]]
 then
   echo "Deploying full CSC"
-  npx hardhat run scripts/FullCheckpointDeploy.js --network $DEPLOY_NET 2>&1 | tee csc.log
+  npx hardhat run scripts/FullCheckpointDeploy.js --network xdcparentnet 2>&1 | tee csc.log
 elif [[ $RELAYER_MODE == 'lite' ]]
 then
   echo "Deploying lite CSC"
-  npx hardhat run scripts/LiteCheckpointDeploy.js --network $DEPLOY_NET 2>&1 | tee csc.log
+  npx hardhat run scripts/LiteCheckpointDeploy.js --network xdcparentnet 2>&1 | tee csc.log
 else
   echo "Unknown RELAYER_MODE"
   exit 1

diff --git a/docker/deploy_proxy.sh b/docker/deploy_proxy.sh
@@ -31,38 +31,40 @@ if [[ ${PRIVATE_KEY::2} == "0x"  ]]; then
 fi
 echo "PRIVATE_KEY=${PRIVATE_KEY}" > .env 
 
-if [[ -z "$PARENTCHAIN" ]]; then
-  echo 'PARENTCHAIN is not set, default to devnet'
-  DEPLOY_NET=xdcdevnet
+if [[ -z "$PARENTCHAIN_URL" ]]; then
+  echo "PARENTCHAIN_URL not specified"
+  exit 1
 else
-  echo "PARENTCHAIN=$PARENTCHAIN"
-  if [[ $PARENTCHAIN == 'devnet' || $PARENTCHAIN == 'xdcdevnet' ]]; then
-      DEPLOY_NET='xdcdevnet'
-  fi
-  if [[ $PARENTCHAIN == 'testnet' || $PARENTCHAIN == 'xdctestnet' ]]; then
-      DEPLOY_NET='xdctestnet'
-  fi
-  echo "Deploying to $DEPLOY_NET"
+  cat network.config.json | sed -e "s/\"xdcparentnet\".*/\"xdcparentnet\": \"$PARENTCHAIN_URL\",/" > temp.json
+  mv temp.json network.config.json
 fi
 
-DEPLOY=$(npx hardhat run scripts/proxy/ProxyGatewayDeploy.js --network $DEPLOY_NET)
+if [[ -z "$SUBNET_URL" ]]; then
+  echo "SUBNET_URL not specified" 
+  exit 1
+else
+  cat network.config.json | sed -e "s/\"xdcsubnet\".*/\"xdcsubnet\": \"$SUBNET_URL\",/" > temp.json
+  mv temp.json network.config.json
+fi
+
+DEPLOY=$(npx hardhat run scripts/proxy/ProxyGatewayDeploy.js --network xdcparentnet)
 PROXY=$(echo $DEPLOY | awk '{print $NF}')
 echo "Proxy Gateway Deployed: $PROXY"
 JSON="{\"proxyGateway\": \"$PROXY\"}"
 echo $JSON > upgrade.config.json
-sleep 10
+echo "PROXY_GATEWAY=$PROXY" >> config/common.env || echo 'config not mounted'
+
+
+UPGRADE=$(npx hardhat run scripts/proxy/UpgradeCSC.js --network xdcparentnet | awk '{print $NF}')
+FULL_CSC=$(echo $UPGRADE | cut -d' ' -f4)
+FULL_CSC="FULL_CSC=$FULL_CSC"
+echo $FULL_CSC >> config/common.env || echo 'config not mounted'
 
-UPGRADE=$(npx hardhat run scripts/proxy/UpgradeCSC.js --network $DEPLOY_NET | awk '{print $NF}')
-FULL=$(echo $UPGRADE | cut -d' ' -f4)
-FULL="FULL=$FULL"
-echo $FULL > csc.env
 
-LITE=$(echo $UPGRADE | cut -d' ' -f5)
-LITE="LITE=$LITE"
-echo $LITE >> csc.env
+LITE_CSC=$(echo $UPGRADE | cut -d' ' -f5)
+LITE_CSC="LITE_CSC=$LITE_CSC"
+echo $LITE_CSC >> config/common.env || echo 'config not mounted'
 echo "Upgraded Proxy Gateway with CSC"
-echo "$FULL"
-echo "$LITE"
+echo "$FULL_CSC"
+echo "$LITE_CSC"
 
-cp upgrade.config.json config/upgrade.config.json || echo 'config not mounted'
-cp csc.env config/csc.env || echo 'config not mounted'
diff --git a/docker/upgrade_csc.sh b/docker/upgrade_csc.sh
@@ -26,18 +26,28 @@ if [[ ${PRIVATE_KEY::2} == "0x"  ]]; then
 fi
 echo "PRIVATE_KEY=${PRIVATE_KEY}" > .env 
 
-if [[ -z "$PARENTCHAIN" ]]; then
-  echo 'PARENTCHAIN is not set, default to devnet'
-  DEPLOY_NET=xdcdevnet
+if [[ -z "$PARENTCHAIN_URL" ]]; then
+  echo "PARENTCHAIN_URL not specified"
+  exit 1
 else
-  echo "PARENTCHAIN=$PARENTCHAIN"
-  if [[ $PARENTCHAIN == 'devnet' || $PARENTCHAIN == 'xdcdevnet' ]]; then
-      DEPLOY_NET='xdcdevnet'
-  fi
-  if [[ $PARENTCHAIN == 'testnet' || $PARENTCHAIN == 'xdctestnet' ]]; then
-      DEPLOY_NET='xdctestnet'
-  fi
-  echo "Deploying to $DEPLOY_NET"
+  cat network.config.json | sed -e "s/\"xdcparentnet\".*/\"xdcparentnet\": \"$PARENTCHAIN_URL\",/" > temp.json
+  mv temp.json network.config.json
+fi
+
+if [[ -z "$SUBNET_URL" ]]; then
+  echo "SUBNET_URL not specified" 
+  exit 1
+else
+  cat network.config.json | sed -e "s/\"xdcsubnet\".*/\"xdcsubnet\": \"$SUBNET_URL\",/" > temp.json
+  mv temp.json network.config.json
+fi
+
+if [[ -z "$PROXY_GATEWAY" ]]; then
+  echo "PROXY_GATEWAY not specified"
+  exit 1
+else
+  JSON="{\"proxyGateway\": \"$PROXY_GATEWAY\"}"
+  echo $JSON > upgrade.config.json
 fi
 
 # UPGRADE=$(npx hardhat run scripts/proxy/UpgradeCSC.js --network xdcparentnet | awk '{print $NF}')
@@ -49,5 +59,5 @@ fi
 # echo "$FULL"
 # echo "$LITE"
 
-npx hardhat run scripts/proxy/UpgradeCSC.js --network $DEPLOY_NET
+npx hardhat run scripts/proxy/UpgradeCSC.js --network xdcparentnet
 # echo "Upgraded Proxy Gateway with CSC"
diff --git a/hardhat.config.js b/hardhat.config.js
@@ -3,16 +3,7 @@ const { VoidSigner } = require("ethers");
 require("@nomiclabs/hardhat-waffle");
 require("hardhat-gas-reporter");
 require("dotenv").config();
-
-try {
-  var network = require("./deployment.config.json");
- }
- catch (e) {
-  var network = {
-      "xdcparentnet": "https://devnetstats.apothem.network/devnet",
-      "xdcsubnet": "https://devnetstats.apothem.network/subnet"
-    }
- }
+const network = require("./network.config.json");
 
 /**
  * @type import('hardhat/config').HardhatUserConfig
@@ -44,14 +35,14 @@ module.exports = {
       ],
     },
     xdcdevnet: {
-      url: "https://devnetstats.apothem.network/devnet",
+      url: network["xdcdevnet"],
       accounts: [
         process.env.PRIVATE_KEY ||
           "1234567890123456789012345678901234567890123456789012345678901234",
       ],
     },
     xdctestnet: {
-      url: "https://erpc.apothem.network/",
+      url: network["xdctestnet"],
       accounts: [
         process.env.PRIVATE_KEY ||
           "1234567890123456789012345678901234567890123456789012345678901234",

diff --git a/network.config.json b/network.config.json
@@ -0,0 +1,6 @@
+{
+  "xdcparentnet": "https://devnetstats.apothem.network/devnet",
+  "xdcsubnet": "https://devnetstats.apothem.network/subnet",
+  "xdcdevnet": "https://devnetstats.apothem.network/devnet",
+  "xdctestnet": "https://erpc.apothem.network/"
+}
diff --git a/scripts/utils/subnet.js b/scripts/utils/subnet.js
@@ -1,5 +1,5 @@
 const fetch = require("node-fetch").default;
-const network = require("../../deployment.config.json");
+const network = require("../../network.config.json");
 async function data() {
   const block0 = {
     jsonrpc: "2.0",