Merge pull request #329 from 0xPolygonHermez/feature/cherry-pick-main

Feature/cherry pick main
0xPolygonHermez · Sep 16, 2024 · a1ab154 · a1ab154
2 parents 0b27044 + d78c801
commit a1ab154
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 21 deletions.
diff --git a/tools/addRollupType/addRollupTypeTimelock.ts b/tools/addRollupType/addRollupTypeTimelock.ts
@@ -27,7 +27,6 @@ async function main() {
         "description",
         "forkID",
         "consensusContract",
-        "polTokenAddress",
         "verifierAddress",
         "rollupCompatibilityID",
         "timelockDelay",

diff --git a/tools/addRollupType/add_rollup_type.json b/tools/addRollupType/add_rollup_type.json
diff --git a/tools/addRollupType/add_rollup_type.json.example b/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",

diff --git a/tools/deployClaimCompressor/deployClaimCompressor.ts b/tools/deployClaimCompressor/deployClaimCompressor.ts
@@ -69,7 +69,7 @@ async function main() {
     await ClaimCompressorContract.waitForDeployment();
 
     console.log("#######################\n");
-    console.log("Verifier deployed to:", ClaimCompressorContract.target);
+    console.log("Claim Compressor deployed to:", ClaimCompressorContract.target);
     console.log("#######################\n");
 
     console.log("you can verify the contract address with:");

diff --git a/tools/deployVerifier/README.md b/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
 ```