fix

Author: wanwiset25

deployment-generator/src/gen.env

@@ -1,12 +1,11 @@
 
-NETWORK_NAME=x
-NUM_SUBNET=4
+NETWORK_NAME=gg
+NUM_SUBNET=3
 PARENTNET=testnet
-PARENTNET_WALLET_PK=0x7a75e19af1ca86ba47c8a4b05fc660786dc58ab5a278f115be33f927a7a64544
+PARENTNET_WALLET_PK=0x4da0711c4780696f725dc6ad44751b6a9e15a80a0bcb41eca6bf4510de64172f
 RELAYER_MODE=full
 
-MAIN_IP=1.1.1.1
-PUBLIC_IP=2.2.2.2
-NUM_MACHINE=2
+MAIN_IP=127.0.0.1
+NUM_MACHINE=1
 
 

deployment-generator/src/gen.js

@@ -65,7 +65,7 @@ subnetconf = [];
 for (let i = 1; i <= config.num_subnet; i++) {
   subnetconf.push(gen_env.genSubnetConfig(i, keys, ip_record));
 }
-deployconf = gen_env.genContractDeployEnv();
+deployconf = gen_env.genContractDeployEnv(ip_record);
 
 const compose_content = yaml.dump(doc, {});
 

deployment-generator/src/gen_compose.js

@@ -151,9 +151,5 @@ function injectNetworkConfig(compose_object) {
 
   compose_object["networks"] = network;
 
-  if (config.num_machines == 1){    //inject docker_net IP instead of machine IP if single machine deployment
-    config.ip_1 = record_services_ip["bootnode"]
-  }
-
   return compose_object, record_services_ip;
 }

deployment-generator/src/gen_env.js

@@ -7,23 +7,25 @@ module.exports = {
   genContractDeployEnv,
 };
 
-function genSubnetConfig(subnet_id, key) {
+function genSubnetConfig(subnet_id, key, ip_record) {
   const key_name = `key${subnet_id}`;
   let private_key = key[key_name]["PrivateKey"];
   private_key = private_key.slice(2, private_key.length); // remove 0x for subnet conf
   const port = 20303 + subnet_id - 1;
   const rpcport = 8545 + subnet_id - 1;
   const wsport = 9555 + subnet_id - 1;
+  const bootnode_ip = config.num_machines === 1 ? ip_record["bootnode"] : config.ip_1;
+  const stats_ip = config.num_machines === 1 ? ip_record["stats"] : config.ip_1
   const config_env = `
 INSTANCE_NAME=subnet${subnet_id}
 PRIVATE_KEY=${private_key}
 BOOTNODES=enode://cc566d1033f21c7eb0eb9f403bb651f3949b5f63b40683917\
 765c343f9c0c596e9cd021e2e8416908cbc3ab7d6f6671a83c85f7b121c1872f8be\
-50a591723a5d@${config.ip_1}:20301
+50a591723a5d@${bootnode_ip}:20301
 NETWORK_ID=${config.network_id}
 SYNC_MODE=full
 RPC_API=db,eth,debug,miner,net,shh,txpool,personal,web3,XDPoS
-STATS_SERVICE_ADDRESS=${config.ip_1}:5213
+STATS_SERVICE_ADDRESS=${stats_ip}:5213
 STATS_SECRET=${config.secret_string}
 PORT=${port}
 RPCPORT=${rpcport}
@@ -37,15 +39,17 @@ LOG_LEVEL=2
 
 function genServicesConfig() {
   const url = config.parentnet.url;
+  const bootnode_ip = config.num_machines === 1 ? ip_record["bootnode"] : config.ip_1;
+  const subnet_ip = config.num_machines === 1 ? ip_record["subnet1"] : config.ip_1;
   let config_env = `
 # Bootnode
-EXTIP=${config.ip_1}
+EXTIP=${bootnode_ip}
 BOOTNODE_PORT=20301
 
 # Stats and relayer
 PARENTNET_URL=${url}
 PARENTNET_WALLET=${config.parentnet.pubkey}
-SUBNET_URL=http://${config.ip_1}:8545
+SUBNET_URL=http://${subnet_ip}:8545
 RELAYER_MODE=${config.relayer_mode}
 SLACK_WEBHOOK=https://hooks.slack.com/services/T00000000/B00000000/XXXXXXXXXXXXXXXXXXXXXXXX
 CORS_ALLOW_ORIGIN=*
@@ -91,10 +95,11 @@ if (config.zero.zero_mode == 'one-directional'){
 }
 
 
-function genContractDeployEnv() {
+function genContractDeployEnv(ip_record) {
+  const subnet_ip = config.num_machines === 1 ? ip_record["subnet1"] : config.ip_1
   const config_deploy = `
 PARENTNET_URL=${config.parentnet.url}
-SUBNET_URL=http://${config.ip_1}:8545
+SUBNET_URL=http://${subnet_ip}:8545
 
 
 PARENTNET_PK=${config.parentnet.privatekey}