pull current validators (#45)

pull current validators

README.md

@@ -33,7 +33,6 @@ We recommend setting up the contract in a Python virtual environment since it ut
    Complete the fields in `deployment.config.json`:
 
    - `subnet`: subnet deploy config :
-     - `validators`: List of initial validator addresses
      - `gap`: GAP block number on the public chain
      - `epoch`: Blocks per epoch on the public chain
      - `gsbn`: gap start block number, gap block required

deployment.config.json.example

@@ -1,12 +1,6 @@
 {
   "subnet": {
-    "validators": [
-      "0x57fA1EB91134F4440782C08b0AAE2A13410A5F40",
-      "0x45a4c6B05484C5284dD84eCeFF909f48D43D361d",
-      "0x11DACEFFA12E31F8014589dA4F6452C7a61F453d",
-      "0x15fdac2F7fb67F306FC3264a84881Afb5844EdF9",
-      "0xc07e9FBeB9695c89748594AB0e410ba11f75DE11"
-    ],
+
     "gap": 450,
     "epoch": 900,
     "gsbn": 451

scripts/FullCheckpointDeploy.js

@@ -11,6 +11,11 @@ async function main() {
     subnetDeploy.gsbn
   );
 
+  const validators = await subnet.validators(
+    network.xdcsubnet,
+    subnetDeploy.gsbn
+  );
+
   // We get the contract to deploy
   const checkpointFactory = await hre.ethers.getContractFactory(
     "FullCheckpoint"
@@ -29,7 +34,7 @@ async function main() {
   await full.deployed();
 
   const tx = await full.init(
-    subnetDeploy["validators"],
+    validators,
     data0Encoded,
     subnetDeploy["gap"],
     subnetDeploy["epoch"],

scripts/LiteCheckpointDeploy.js

@@ -5,6 +5,7 @@ const network = require("../network.config.json");
 
 async function main() {
   const { data0Encoded } = await subnet.data(network.xdcsubnet, 1);
+  const validators = await subnet.validators(network.xdcsubnet, 1);
   const subnetDeploy = deploy["subnet"];
   // We get the contract to deploy
   const checkpointFactory = await hre.ethers.getContractFactory(
@@ -23,7 +24,7 @@ async function main() {
 
   await lite.deployed();
   const tx = await lite.init(
-    subnetDeploy["validators"],
+    validators,
     data0Encoded,
     subnetDeploy["gap"],
     subnetDeploy["epoch"]

scripts/utils/xdcnet.js

@@ -14,6 +14,24 @@ function base64ToHex(base64String) {
   return hexString;
 }
 
+async function validators(url, number) {
+  const block0 = {
+    jsonrpc: "2.0",
+    method: "XDPoS_getMasternodesByNumber",
+    params: ["0x" + Number(number).toString(16)],
+    id: 1,
+  };
+
+  const data0 = await send(url, block0);
+
+  if (!data0["result"]["Masternodes"]) {
+    console.error("remote node block " + number + " no validators");
+    return;
+  }
+
+  return data0["result"]["Masternodes"];
+}
+
 async function data(url, number) {
   const block0 = {
     jsonrpc: "2.0",
@@ -22,28 +40,33 @@ async function data(url, number) {
     id: 1,
   };
 
-  let data0;
+  const data0 = await send(url, block0);
+
+  if (!data0["result"]["Committed"]) {
+    console.error("remote node block " + number + " is not committed");
+    return;
+  }
+  const data0Encoded = "0x" + base64ToHex(data0["result"]["EncodedRLP"]);
+
+  return { data0Encoded };
+}
+
+async function send(url, body) {
+  let data;
   try {
     console.error("connecting to network at url:", url);
     const block0res = await fetch(url, {
       method: "POST",
-      body: JSON.stringify(block0),
+      body: JSON.stringify(body),
       headers: { "Content-Type": "application/json" },
     });
 
-    data0 = await block0res.json();
+    data = await block0res.json();
   } catch (e) {
     console.error(e, "\n");
     throw Error("Fetch remote node data error , pls check the node status");
   }
-
-  if (!data0["result"]["Committed"]) {
-    console.error("remote node block " + number + " is not committed");
-    return;
-  }
-  const data0Encoded = "0x" + base64ToHex(data0["result"]["EncodedRLP"]);
-
-  return { data0Encoded };
+  return data;
 }
 
-module.exports = { data };
+module.exports = { data, validators };