fix

Author: wanwiset25

container-manager/src/gen/gen_xdpos.js

@@ -15,8 +15,8 @@ initConfig(config);
 Object.freeze(config);
 console.log("config", config);
 
+let bootnode = "";
 const keys = gen_other.genXdposKeys();
-
 const num_per_machine = Array(config.num_machines);
 // integer division
 for (let i = 0; i < config.num_machines; i++) {
@@ -36,14 +36,13 @@ let doc = {
 
 let start_num = 1;
 for (let i = 1; i <= config.num_machines; i++) {
-  const subnet_nodes = gen_compose.genSubnetNodes(
+  const nodes = genXdposCompose(
     (machine_id = i),
     (num = num_per_machine[i - 1]),
     (start_num = start_num),
-    (isXdpos = true)
   );
   start_num += num_per_machine[i - 1];
-  Object.entries(subnet_nodes).forEach((entry) => {
+  Object.entries(nodes).forEach((entry) => {
     const [key, value] = entry;
     doc["services"][key] = value;
   });
@@ -84,6 +83,13 @@ function writeGenerated(output_dir) {
     }
   });
 
+  fs.writeFileSync(`${output_dir}/bootnodes.list`, bootnode, (err) => {
+    if (err) {
+      console.error(err);
+      exit();
+    }
+  });
+
   fs.writeFileSync(
     `${output_dir}/docker-compose.yml`,
     compose_content,
@@ -144,16 +150,12 @@ function copyScripts(output_dir) {
     `${output_dir}/scripts/check-peer.sh`
   );
   fs.copyFileSync(
-    `${__dirname}/scripts/faucet.sh`,
-    `${output_dir}/scripts/faucet.sh`
+    `${__dirname}/scripts/docker-up.sh`,
+    `${output_dir}/scripts/docker-up.sh`
   );
   fs.copyFileSync(
-    `${__dirname}/scripts/faucet-server.sh`,
-    `${output_dir}/scripts/faucet-server.sh`
-  );
-  fs.copyFileSync(
-    `${__dirname}/scripts/add-node.sh`,
-    `${output_dir}/scripts/add-node.sh`
+    `${__dirname}/scripts/docker-down.sh`,
+    `${output_dir}/scripts/docker-down.sh`
   );
 }
 
@@ -296,13 +298,14 @@ function genXdposNodeConfig(subnet_id, key, ip_record) {
   const wsport = 9555 + subnet_id - 1;
   const bootnode_ip =
     config.num_machines === 1 ? ip_record["bootnode"] : config.ip_1;
+  bootnode = `enode://cc566d1033f21c7eb0eb9f403bb651f3949b5f63b40683917\
+765c343f9c0c596e9cd021e2e8416908cbc3ab7d6f6671a83c85f7b121c1872f8be\
+50a591723a5d@${bootnode_ip}:20301`;
   const stats_ip = config.num_machines === 1 ? ip_record["stats"] : config.ip_1;
   const config_env = `
 INSTANCE_NAME=Masternode${subnet_id}
 PRIVATE_KEY=${private_key}
-BOOTNODES=enode://cc566d1033f21c7eb0eb9f403bb651f3949b5f63b40683917\
-765c343f9c0c596e9cd021e2e8416908cbc3ab7d6f6671a83c85f7b121c1872f8be\
-50a591723a5d@${bootnode_ip}:20301
+BOOTNODES=${bootnode}
 NETWORK=local
 NETWORK_ID=${config.network_id}
 RPC_API=db,eth,debug,miner,net,shh,txpool,personal,web3,XDPoS
@@ -314,3 +317,37 @@ LOG_LEVEL=2
 
   return config_env;
 }
+
+
+function genXdposCompose(machine_id, num, start_num = 1) {
+  let nodes = {};
+  for (let i = start_num; i < start_num + num; i++) {
+    const node_name = "masternode" + i.toString();
+    const volume = "./xdcchain" + i.toString() + ":/work/xdcchain";
+    const compose_profile = "machine" + machine_id.toString();
+    const port = 20302 + i;
+    const rpcport = 8544 + i;
+    const wsport = 9554 + i;
+
+    imageName = `xinfinorg/xdposchain:${config.xdpos.xdposnode}`;
+    config_path = "masternode" + i.toString() + ".env";
+    
+    nodes[node_name] = {
+      image: imageName,
+      volumes: [volume, "./genesis.json:/work/genesis.json", "./bootnodes.list:/work/bootnodes.list"],
+      restart: "always",
+      network_mode: "host",
+      env_file: [config_path],
+      profiles: [compose_profile],
+      ports: [
+        `${port}:${port}/tcp`,
+        `${port}:${port}/udp`,
+        `${rpcport}:${rpcport}/tcp`,
+        `${rpcport}:${rpcport}/udp`,
+        `${wsport}:${wsport}/tcp`,
+        `${wsport}:${wsport}/udp`,
+      ],
+    };
+  }
+  return nodes;
+}