update scripts

0xPolygonHermez · Feb 8, 2024 · c379383 · c379383
1 parent 6a9951c
commit c379383
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 5 deletions.
diff --git a/tools/addRollupType/addRollupType.ts b/tools/addRollupType/addRollupType.ts
@@ -24,6 +24,7 @@ async function main() {
      * Check that every necessary parameter is fullfilled
      */
     const mandatoryDeploymentParameters = [
+        "description",
         "forkID",
         "consensusContract",
         "polygonRollupManagerAddress",
@@ -41,6 +42,7 @@ async function main() {
     }
 
     const {
+        description,
         rollupCompatibilityID,
         forkID,
         consensusContract,
@@ -103,6 +105,8 @@ async function main() {
         [deployer] = await ethers.getSigners();
     }
 
+    console.log("Using with: ", deployer.address);
+
     // Load Rollup manager
     const PolgonRollupManagerFactory = await ethers.getContractFactory("PolygonRollupManager", deployer);
     const rollupManagerContract = PolgonRollupManagerFactory.attach(
@@ -135,6 +139,20 @@ async function main() {
     );
     await PolygonconsensusContract.waitForDeployment();
 
+    console.log("#######################\n");
+    console.log(`new PolygonconsensusContract impl: ${PolygonconsensusContract.target}`);
+
+    console.log("you can verify the new impl address with:");
+    console.log(
+        `npx hardhat verify --constructor-args upgrade/arguments.js ${PolygonconsensusContract.target} --network ${process.env.HARDHAT_NETWORK}\n`
+    );
+    console.log("Copy the following constructor arguments on: upgrade/arguments.js \n", [
+        polygonZkEVMGlobalExitRootAddress,
+        polTokenAddress,
+        polygonZkEVMBridgeAddress,
+        polygonRollupManagerAddress,
+    ]);
+
     // Add a new rollup type with timelock
     console.log(
         await (
@@ -144,7 +162,7 @@ async function main() {
                 forkID,
                 rollupCompatibilityID,
                 genesis.root,
-                JSON.stringify(genesis)
+                description
             )
         ).wait()
     );

diff --git a/tools/addRollupType/addRollupTypeTimelock.ts b/tools/addRollupType/addRollupTypeTimelock.ts
@@ -22,6 +22,7 @@ async function main() {
      * Check that every necessary parameter is fullfilled
      */
     const mandatoryDeploymentParameters = [
+        "description",
         "forkID",
         "consensusContract",
         "polygonRollupManagerAddress",
@@ -40,6 +41,7 @@ async function main() {
     }
 
     const {
+        description,
         rollupCompatibilityID,
         forkID,
         consensusContract,
@@ -105,6 +107,8 @@ async function main() {
         [deployer] = await ethers.getSigners();
     }
 
+    console.log("Using with: ", deployer.address);
+
     // Load Rollup manager
     const PolgonRollupManagerFactory = await ethers.getContractFactory("PolygonRollupManager", deployer);
 
@@ -120,6 +124,20 @@ async function main() {
     );
     await PolygonconsensusContract.waitForDeployment();
 
+    console.log("#######################\n");
+    console.log(`new PolygonconsensusContract impl: ${PolygonconsensusContract.target}`);
+
+    console.log("you can verify the new impl address with:");
+    console.log(
+        `npx hardhat verify --constructor-args upgrade/arguments.js ${PolygonconsensusContract.target} --network ${process.env.HARDHAT_NETWORK}\n`
+    );
+    console.log("Copy the following constructor arguments on: upgrade/arguments.js \n", [
+        polygonZkEVMGlobalExitRootAddress,
+        polTokenAddress,
+        polygonZkEVMBridgeAddress,
+        polygonRollupManagerAddress,
+    ]);
+
     // load timelock
     const timelockContractFactory = await ethers.getContractFactory("PolygonZkEVMTimelock", deployer);
 
@@ -132,7 +150,7 @@ async function main() {
             forkID,
             rollupCompatibilityID,
             genesis.root,
-            JSON.stringify(genesis),
+            description,
         ]),
         ethers.ZeroHash, // predecesoor
         salt // salt

diff --git a/tools/addRollupType/add_rollup_type.json b/tools/addRollupType/add_rollup_type.json
@@ -5,10 +5,10 @@
     "polygonZkEVMGlobalExitRootAddress": "0x580bda1e7A0CFAe92Fa7F6c20A3794F169CE3CFb",
     "polTokenAddress": "0x455e53CBB86018Ac2B8092FdCd39d8444aFFC3F6",
     "verifierAddress": "0x1C3A3da552b8662CD69538356b1E7c2E9CC1EBD8",
-    "description": "0.0.1",
+    "description": "Type: Validium, Version: etrog, genesis: /ipfs/QmUXnRoPbUmZuEZCGyiHjEsoNcFVu3hLtSvhpnfBS2mAYU",
     "forkID": 7,
     "rollupCompatibilityID": 0,
-    "timelockDelay": 0,
+    "timelockDelay": 864000,
     "timelockSalt": "",
     "gasTokenAddress":"",
     "deployerPvtKey": "",

diff --git a/tools/addRollupType/add_rollup_type.json.example b/tools/addRollupType/add_rollup_type.json.example
@@ -5,7 +5,7 @@
     "polygonZkEVMGlobalExitRootAddress": "0x580bda1e7A0CFAe92Fa7F6c20A3794F169CE3CFb",
     "polTokenAddress": "0x455e53CBB86018Ac2B8092FdCd39d8444aFFC3F6",
     "verifierAddress": "0x1C3A3da552b8662CD69538356b1E7c2E9CC1EBD8",
-    "description": "Type: zkEVM, Version: etrog",
+    "description": "Type: zkEVM, Version: etrog, genesis: /ipfs/QmUXnRoPbUmZuEZCGyiHjEsoNcFVu3hLtSvhpnfBS2mAYU",
     "forkID": 7,
     "rollupCompatibilityID": 0,
     "timelockDelay": 0,