fix addRollupType tool

tools/addRollupType/.gitignore

@@ -1,2 +1,3 @@
-add_rollup_type_output.json
+add_rollup_type_output-*.json
+add_rollup_type.json
 genesis.json

tools/addRollupType/addRollupType.ts

@@ -31,7 +31,7 @@ async function main() {
         "polygonRollupManagerAddress",
         "verifierAddress",
         "rollupCompatibilityID",
-        "genesisRoot"
+        "genesisRoot",
     ];
 
     for (const parameterName of mandatoryDeploymentParameters) {
@@ -47,7 +47,7 @@ async function main() {
         consensusContract,
         polygonRollupManagerAddress,
         verifierAddress,
-        genesisRoot
+        genesisRoot,
     } = addRollupParameters;
 
     const supportedConensus = ["PolygonZkEVMEtrog", "PolygonValidiumEtrog"];
@@ -117,21 +117,19 @@ async function main() {
 
     // Sanity checks genesisRoot
     if (genesisRoot !== genesis.root) {
-        throw new Error(
-            `Genesis root in the 'add_rollup_type.json' does not match the root in the 'genesis.json'`
-        );
+        throw new Error(`Genesis root in the 'add_rollup_type.json' does not match the root in the 'genesis.json'`);
     }
 
     // get bridge address in genesis file
-    let genesisBridgeAddress = ethers.constants.AddresZero;
-    for (let i = 0; i < genesis.genesis.lenght; i++) {
-        if (genesis.genesis[i].contractName === 'PolygonZkEVMBridge proxy') {
+    let genesisBridgeAddress = ethers.ZeroAddress;
+    for (let i = 0; i < genesis.genesis.length; i++) {
+        if (genesis.genesis[i].contractName === "PolygonZkEVMBridge proxy") {
             genesisBridgeAddress = genesis.genesis[i].address;
             break;
         }
     }
 
-    if (polygonZkEVMBridgeAddress.toLowerCase() !== genesisBridgeAddress ) {
+    if (polygonZkEVMBridgeAddress.toLowerCase() !== genesisBridgeAddress.toLowerCase()) {
         throw new Error(
             `'PolygonZkEVMBridge proxy' root in the 'genesis.json' does not match 'bridgeAddress' in the 'PolygonRollupManager'`
         );
@@ -155,7 +153,10 @@ async function main() {
     // Create consensus implementation if needed
     let polygonConsensusContractAddress;
 
-    if (typeof addRollupParameters.polygonconsensusContract !== 'undefined' && ethers.isAddress(addRollupParameters.polygonconsensusContract)) {
+    if (
+        typeof addRollupParameters.polygonconsensusContract !== "undefined" &&
+        ethers.isAddress(addRollupParameters.polygonconsensusContract)
+    ) {
         polygonConsensusContractAddress = addRollupParameters.polygonconsensusContract;
     } else {
         const PolygonconsensusFactory = (await ethers.getContractFactory(consensusContract, deployer)) as any;

tools/addRollupType/addRollupTypeTimelock.ts

@@ -31,7 +31,7 @@ async function main() {
         "verifierAddress",
         "rollupCompatibilityID",
         "timelockDelay",
-        "genesisRoot"
+        "genesisRoot",
     ];
 
     for (const parameterName of mandatoryDeploymentParameters) {
@@ -48,7 +48,7 @@ async function main() {
         polygonRollupManagerAddress,
         verifierAddress,
         timelockDelay,
-        genesisRoot
+        genesisRoot,
     } = addRollupParameters;
 
     const salt = addRollupParameters.timelockSalt || ethers.ZeroHash;
@@ -121,21 +121,19 @@ async function main() {
 
     // Sanity checks genesisRoot
     if (genesisRoot !== genesis.root) {
-        throw new Error(
-            `Genesis root in the 'add_rollup_type.json' does not match the root in the 'genesis.json'`
-        );
+        throw new Error(`Genesis root in the 'add_rollup_type.json' does not match the root in the 'genesis.json'`);
     }
 
     // get bridge address in genesis file
-    let genesisBridgeAddress = ethers.constants.AddresZero;
-    for (let i = 0; i < genesis.genesis.lenght; i++) {
-        if (genesis.genesis[i].contractName === 'PolygonZkEVMBridge proxy') {
+    let genesisBridgeAddress = ethers.ZeroAddress;
+    for (let i = 0; i < genesis.genesis.length; i++) {
+        if (genesis.genesis[i].contractName === "PolygonZkEVMBridge proxy") {
             genesisBridgeAddress = genesis.genesis[i].address;
             break;
         }
     }
 
-    if (polygonZkEVMBridgeAddress.toLowerCase() !== genesisBridgeAddress ) {
+    if (polygonZkEVMBridgeAddress.toLowerCase() !== genesisBridgeAddress.toLowerCase()) {
         throw new Error(
             `'PolygonZkEVMBridge proxy' root in the 'genesis.json' does not match 'bridgeAddress' in the 'PolygonRollupManager'`
         );

tools/addRollupType/add_rollup_type.json.example

@@ -1,5 +1,6 @@
 {
     "consensusContract": "PolygonValidiumEtrog",
+    "polygonconsensusContract": "",
     "polygonRollupManagerAddress": "0x5132A183E9F3CB7C848b0AAC5Ae0c4f0491B7aB2",
     "verifierAddress": "0x1C3A3da552b8662CD69538356b1E7c2E9CC1EBD8",
     "description": "Type: Validium, Version: etrog, genesis: /ipfs/QmUXnRoPbUmZuEZCGyiHjEsoNcFVu3hLtSvhpnfBS2mAYU",

tools/deployVerifier/README.md

@@ -16,7 +16,7 @@ npm i
   - `maxPriorityFeePerGas`: set custom gas
   - `multiplierGas`: set custom gas
 - A network should be selected when running the script
-  - examples: `-- sepolia` or `--mainnet`
+  - examples: `--network sepolia` or `--network mainnet`
   - This uses variables set in `hardhat.config.ts`
   - Which uses some environment variables that should be set in `.env`
 > All paths are from root repository
@@ -32,5 +32,5 @@ cp ./tools/deployVerifier/deploy_verifier_parameters.example ./tools/deployVerif
 - Set your parameters
 - Run tool:
 ```
-npx hardhat run ./tools/deployVerifier/deployVerififer.ts --network sepolia
+npx hardhat run ./tools/deployVerifier/deployVerifier.ts --network sepolia
 ```