add optional public_ip config and frontend rpc config

Author: wanwiset25

subnet/deployment-generator/script/docker.env.example

@@ -1,20 +1,23 @@
-
 #subnet config
 NETWORK_NAME=localsubnet
 NUM_MACHINE=1
 NUM_SUBNET=3
 MAIN_IP=192.168.1.1
+# optional
+# PUBLIC_IP
 
 #parentchain config
-PARENTNET=devnet
+PARENTNET=testnet
 PARENTNET_WALLET_PK=0x1111111111111111111111111111111111111111111111111111111111111111
 
 
-# OS=mac
 
-#docker image versions, default to stable
+
+#OS=mac
+
+# docker image versions, default to stable
 # VERSION_SUBNET
 # VERSION_BOOTNODE
 # VERSION_RELAYER
 # VERSION_STATS
-# VERSION_FRONTEND
+# VERSION_FRONTEND

subnet/deployment-generator/script/generate.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
-VERSION_GENERATOR="latest"
+VERSION_GENERATOR="v0.3.0"
 VERSION_CSC="v0.1.1"
-VERSION_SUBNET="v0.2.2"
+VERSION_GENESIS="v0.2.2"
 
 current_dir="$(cd "$(dirname "$0")" && pwd)"
 echo 'checking for docker.env'
@@ -23,8 +23,8 @@ fi
 if [[ -z "$(docker images -q xinfinorg/csc:$VERSION_CSC)" ]]; then # || echo "doesn't exist"
   docker pull xinfinorg/csc:$VERSION_CSC
 fi
-if [[ -z "$(docker images -q xinfinorg/xdcsubnets:$VERSION_SUBNET)" ]]; then # || echo "doesn't exist"
-  docker pull xinfinorg/xdcsubnets:$VERSION_SUBNET
+if [[ -z "$(docker images -q xinfinorg/xdcsubnets:$VERSION_GENESIS)" ]]; then # || echo "doesn't exist"
+  docker pull xinfinorg/xdcsubnets:$VERSION_GENESIS
 fi
 
 echo ''
@@ -37,7 +37,7 @@ if [[ $gen_success == false ]]; then
 fi
 
 echo 'generating genesis.json'
-docker run -v $current_dir/generated/:/app/generated/ --entrypoint 'bash' xinfinorg/xdcsubnets:$VERSION_SUBNET /work/puppeth.sh || pup_success=false
+docker run -v $current_dir/generated/:/app/generated/ --entrypoint 'bash' xinfinorg/xdcsubnets:$VERSION_GENESIS /work/puppeth.sh || pup_success=false
 if [[ $pup_success == false ]]; then
   echo 'genesis.json generation failed'
   exit 1

subnet/deployment-generator/src/config_gen.js

@@ -10,24 +10,25 @@ const config = {
   num_machines:  parseInt(process.env.NUM_MACHINE),
   num_subnet:         parseInt(process.env.NUM_SUBNET),
   ip_1:               (process.env.MAIN_IP                || ''),
+  public_ip:          (process.env.PUBLIC_IP ||  ''),
   network_name:       (process.env.NETWORK_NAME),
   network_id:         parseInt(process.env.NETWORK_ID     || Math.floor(Math.random() * (65536 - 1) + 1)),
   secret_string:      (process.env.SERVICES_SECRET        || crypto.randomBytes(10).toString('hex')),
   relayer_mode:       (process.env.RELAYER_MODE           || 'full'), //full or lite //in upgradable csc both are deployed
   docker_image_name:  (process.env.IMAGE_NAME             || 'xinfinorg/subnet-generator:latest'),
   operating_system:   (process.env.OS                     || 'linux'),
   version: {
-    subnet:   (process.env.VERSION_SUBNET   || 'v0.2.1'),
+    subnet:   (process.env.VERSION_SUBNET   || 'v0.2.1'),   
     bootnode: (process.env.VERSION_BOOTNODE || 'v0.2.1'),
     // observer: (process.env.VERSION_OBSERVER || 'latest'),
     relayer:  (process.env.VERSION_RELAYER  || 'v0.2.2'),
-    stats:    (process.env.VERSION_STATS    || 'v0.1.8'),
-    frontend: (process.env.VERSION_FRONTEND || 'v0.1.8'),
+    stats:    (process.env.VERSION_STATS    || 'v0.1.8'),   
+    frontend: (process.env.VERSION_FRONTEND || 'v0.1.9'),   
     csc:      (process.env.VERSION_CSC      || 'v0.1.1'),
     // zero:     (process.env.VERSION_ZERO     || 'v0.1.1')
   },
   parentnet:{
-    network:    (process.env.PARENTNET              || 'devnet'),
+    network:    (process.env.PARENTNET              || 'testnet'),
     url:        '',
     pubkey:     ''                                                ,
     privatekey: (process.env.PARENTNET_WALLET_PK    || ''),
@@ -92,16 +93,14 @@ function configSanityCheck (config) {
   }
 
   if (config.parentnet.network === 'devnet'  || 
-      config.parentnet.network === 'testnet' || 
-      config.parentnet.network === 'mainnet' ){
+      config.parentnet.network === 'testnet'  ){
     let official_urls = {
       'devnet':'https://devnetstats.apothem.network/devnet'  ,
       'testnet':'https://erpc.apothem.network/' ,
-      'mainnet': 'https://devnetstats.apothem.network/mainnet' //confirm url
     }
     config.parentnet.url = official_urls[config.parentnet.network]
   } else {
-    console.log('PARENTNET must be devnet, testnet, or mainnet ')
+    console.log('PARENTNET must be devnet or testnet')
     process.exit(1)
   }
 

subnet/deployment-generator/src/gen_env.js

@@ -79,8 +79,9 @@ CHECKPOINT_CONTRACT=0x0000000000000000000000000000000000000000
 SLACK_WEBHOOK=https://hooks.slack.com/services/T00000000/B00000000/XXXXXXXXXXXXXXXXXXXXXXXX
 CORS_ALLOW_ORIGIN=*
 
-# Frontend
-VITE_SUBNET_URL=http://${config.ip_1}:3000
+# Frontend 
+VITE_SUBNET_URL=http://${config.public_ip}:3000
+VITE_SUBNET_RPC=http://${config.public_ip}:8545
 
 # Share Variable
 STATS_SECRET=${config.secret_string}
@@ -110,6 +111,7 @@ CORS_ALLOW_ORIGIN=*
 
 # Frontend
 VITE_SUBNET_URL=http://127.0.0.1:3000
+VITE_SUBNET_RPC=http://127.0.0.1:8545
 
 # Share Variable
 STATS_SECRET=${config.secret_string}