Skip to content

Commit f0a8252

Browse files
wanwiset25wanwiset25
committed
update
1 parent be50b49 commit f0a8252

File tree

6 files changed

+65
-56
lines changed

6 files changed

+65
-56
lines changed

‎container-manager/src/gen/config_gen.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,11 @@ const config = {
5555
output_path: `${__dirname}/../../mount/generated/`,
5656
},
5757
xdpos: {
58-
xdposnode: process.env.VERSION_NODE || "v2.6.4-beta",
58+
xdposnode: process.env.VERSION_NODE_IMAGE || "xinfinorg/xdposchain:v2.6.4-beta",
5959
stake_threshold: parseInt(process.env.MASTERNODE_MINIMUM_STAKE) || "",
6060
reward_yield: parseInt(process.env.REWARDS_YIELD) || "",
61-
foundation_address: process.env.FOUNDATION_ADDRESS || ""
61+
foundation_addr: "",
62+
foundation_pk: process.env.FOUNDATION_PK || ""
6263
}
6364
};
6465

‎container-manager/src/gen/gen_compose.js‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,25 +12,18 @@ module.exports = {
1212
genExplorer,
1313
};
1414

15-
function genSubnetNodes(machine_id, num, start_num = 1, isXdpos = false) {
15+
function genSubnetNodes(machine_id, num, start_num = 1) {
1616
let subnet_nodes = {};
1717
for (let i = start_num; i < start_num + num; i++) {
1818
const node_name = "subnet" + i.toString();
1919
const volume = "${HOSTPWD}/xdcchain" + i.toString() + ":/work/xdcchain";
20+
const config_path = "subnet" + i.toString() + ".env";
2021
const compose_profile = "machine" + machine_id.toString();
2122
const port = 20302 + i;
2223
const rpcport = 8544 + i;
2324
const wsport = 9554 + i;
24-
25-
imageName = `xinfinorg/xdcsubnets:${config.version.subnet}`;
26-
config_path = "subnet" + i.toString() + ".env";
27-
if (isXdpos) {
28-
imageName = `xinfinorg/xdposchain:${config.xdpos.xdposnode}`;
29-
config_path = "masternode" + i.toString() + ".env";
30-
}
31-
3225
subnet_nodes[node_name] = {
33-
image: imageName,
26+
image: `xinfinorg/xdcsubnets:${config.version.subnet}`,
3427
volumes: [volume, "${HOSTPWD}/genesis.json:/work/genesis.json"],
3528
restart: "always",
3629
network_mode: "host",

‎container-manager/src/gen/gen_other.js‎

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -4,40 +4,10 @@ Object.freeze(config);
44

55
module.exports = {
66
genSubnetKeys,
7-
genXdposKeys,
87
genDeploymentJson,
98
genCommands,
109
genGenesisInputFile,
1110
};
12-
function genXdposKeys() {
13-
const keys = {};
14-
console.log("genXdposKeys called");
15-
console.log(config.keys)
16-
// const num = config.keys.subnets_addr.length
17-
for (let i = 0; i < config.keys.subnets_addr.length; i++) {
18-
const key = `key${i + 1}`;
19-
const private_key = config.keys.subnets_pk[i];
20-
const address = config.keys.subnets_addr[i];
21-
keys[key] = {
22-
PrivateKey: private_key,
23-
"0x": address,
24-
short: address.replace(/^0x/i, ""),
25-
};
26-
}
27-
keys["Owner"] = {
28-
PrivateKey: config.keys.grandmaster_pk,
29-
"0x": config.keys.grandmaster_addr,
30-
short: config.keys.grandmaster_addr.replace(/^0x/i, ""),
31-
};
32-
if (Object.keys(keys).length !== config.num_subnet + 1) {
33-
// sanity check
34-
console.log("bad case, key length not equal number of subnets");
35-
console.log(Object.keys(keys).length, config.num_subnet + 1);
36-
console.log(keys);
37-
process.exit();
38-
}
39-
return keys;
40-
}
4111

4212
function genSubnetKeys() {
4313
const keys = {};

‎container-manager/src/gen/gen_xdpos.js‎

Lines changed: 48 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Object.freeze(config);
1616
console.log("config", config);
1717

1818
let bootnode = "";
19-
const keys = gen_other.genXdposKeys();
19+
const keys = genXdposKeys();
2020
const num_per_machine = Array(config.num_machines);
2121
// integer division
2222
for (let i = 0; i < config.num_machines; i++) {
@@ -212,6 +212,21 @@ function initConfig(config) {
212212
validatePK(privatekey);
213213
}
214214

215+
if (config.xdpos.foundation_pk !== "") {
216+
try {
217+
[config.xdpos.foundation_addr, config.keys.foundation_pk] = validatePK(
218+
config.keys.foundation_pk
219+
);
220+
} catch {
221+
console.log("Invalid FOUNDATION_PK");
222+
process.exit(1);
223+
}
224+
} else {
225+
const privatekey = crypto.randomBytes(32).toString("hex");
226+
[config.xdpos.foundation_addr, config.xdpos.foundation_pk] =
227+
validatePK(privatekey);
228+
}
229+
215230
if (config.keys.subnets_pk !== "") {
216231
try {
217232
let output_pk = [];
@@ -341,7 +356,7 @@ function genXdposCompose(machine_id, num, start_num = 1) {
341356
const rpcport = 8544 + i;
342357
const wsport = 9554 + i;
343358

344-
imageName = `xinfinorg/xdposchain:${config.xdpos.xdposnode}`;
359+
imageName = `${config.xdpos.xdposnode}`;
345360
config_path = "masternode" + i.toString() + ".env";
346361

347362
nodes[node_name] = {
@@ -362,4 +377,34 @@ function genXdposCompose(machine_id, num, start_num = 1) {
362377
};
363378
}
364379
return nodes;
365-
}
380+
}
381+
382+
function genXdposKeys() {
383+
const keys = {};
384+
console.log("genXdposKeys called");
385+
console.log(config.keys)
386+
// const num = config.keys.subnets_addr.length
387+
for (let i = 0; i < config.keys.subnets_addr.length; i++) {
388+
const key = `key${i + 1}`;
389+
const private_key = config.keys.subnets_pk[i];
390+
const address = config.keys.subnets_addr[i];
391+
keys[key] = {
392+
PrivateKey: private_key,
393+
"0x": address,
394+
short: address.replace(/^0x/i, ""),
395+
};
396+
}
397+
keys["Owner"] = {
398+
PrivateKey: config.keys.grandmaster_pk,
399+
"0x": config.keys.grandmaster_addr,
400+
short: config.keys.grandmaster_addr.replace(/^0x/i, ""),
401+
};
402+
if (Object.keys(keys).length !== config.num_subnet + 1) {
403+
// sanity check
404+
console.log("bad case, key length not equal number of subnets");
405+
console.log(Object.keys(keys).length, config.num_subnet + 1);
406+
console.log(keys);
407+
process.exit();
408+
}
409+
return keys;
410+
}

‎container-manager/src/libs/exec.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -353,8 +353,8 @@ function genGenXdposEnv(input){
353353
}
354354

355355
let content_custom_key = "";
356-
if ("customowner-checkbox" in input && input["customowner-checkbox"] != "") {
357-
content_custom_key += `\nGRANDMASTER_PK=${input["customowner-subnet"]}`;
356+
if ("customowner-checkbox" in input && input["customowner-checkbox"] != "" && "customowner-pk" in input && input["customowner-pk"] != "") {
357+
content_custom_key += `\nGRANDMASTER_PK=${input["customowner-pk"]}`;
358358
}
359359
if ("customkeys-checkbox" in input && input["customkeys-checkbox"] != "") {
360360
let subnet_keys = [];
@@ -371,8 +371,8 @@ function genGenXdposEnv(input){
371371
}
372372

373373
let content_version = "";
374-
if ("customversion-checkbox" in input && input["customversion-checkbox"] != "") {
375-
content_version += `\nVERSION_NODE=${input["customversion-subnet"]}`;
374+
if ("customversion-checkbox" in input && input["customversion-checkbox"] != "" && "customversion-xdpos-node-fullname" in input && input["customversion-xdpos-node-fullname"] != "") {
375+
content_version += `\nVERSION_NODE_IMAGE=${input["customversion-xdpos-node-fullname"]}`;
376376
}
377377

378378
let content_rewards = "";
@@ -383,8 +383,8 @@ function genGenXdposEnv(input){
383383
if("customrewards-text-apy" in input && input["customrewards-text-apy"] != ""){
384384
content_rewards += `\nREWARDS_YIELD=${input["customrewards-text-apy"]}`;
385385
}
386-
if("customrewards-text-foundation-address" in input && input["customrewards-text-foundation-address"] != ""){
387-
content_rewards += `\nFOUNDATION_ADDRESS=${input["customrewards-text-foundation-address"]}`;
386+
if("customrewards-text-foundation-pk" in input && input["customrewards-text-foundation-pk"] != ""){
387+
content_rewards += `\nFOUNDATION_PK=${input["customrewards-text-foundation-pk"]}`;
388388
}
389389
}
390390

‎container-manager/src/views/xdpos_generator/index.pug‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ body
5959
center
6060
.pure-control-group
6161
label() Masternodes Owner
62-
input#customowner-subnet.pure-input-2-3(type='text' placeholder='0x1111111111111111111111111111111111111111111111111111111111111111' name="customowner-subnet")
62+
input#customowner-pk.pure-input-2-3(type='text' placeholder='0x1111111111111111111111111111111111111111111111111111111111111111' name="customowner-pk")
6363

6464
.pure-control-group
6565
.info-container
@@ -81,8 +81,8 @@ body
8181
#customversion.content
8282
center
8383
.pure-control-group
84-
label() Node Version
85-
input#customversion-subnet.pure-input(type='text' placeholder='v2.6.4-beta' name="customversion-subnet")
84+
label() Full Node Version
85+
input#customversion-xdpos-node-fullname.pure-input(type='text' placeholder='xinfinorg/xdposchain:v2.6.4-beta' name="customversion-xdpos-node-fullname")
8686
.pure-control-group
8787
label() Full Genesis Version
8888
input#customversion-xdpos-genesis-fullname.pure-input(type='text' placeholder='xinfinorg/xdposchain:v2.6.4-beta' name="customversion-xdpos-genesis-fullname")
@@ -102,8 +102,8 @@ body
102102
label() Masternode Rewards APY
103103
input#customrewards-text-apy(type='text' placeholder='10' name="customrewards-text-apy")
104104
.pure-control-group
105-
label() Foundation Address (Address to receive 10% of all rewards)
106-
input#customrewards-text-foundation-address.pure-input-2-3(type='text' placeholder='0x0000000000000000000000000000000000000068' name="customrewards-text-foundation-address")
105+
label() Foundation Wallet PK (Address to receive 10% of all rewards)
106+
input#customrewards-text-foundation-pk.pure-input-2-3(type='text' placeholder='0x1111111111111111111111111111111111111111111111111111111111111111' name="customrewards-text-foundation-address")
107107

108108
center
109109
#incomplete-required-warning

0 commit comments

Comments
 (0)