Merge pull request #346 from 0xPolygonHermez/feature/rebase-main-to-d…

…evelop

Import main commits to Develop

.githooks/pre-commit

@@ -17,12 +17,12 @@ if npm run lint; then
     cp artifacts/contracts/mocks/PolygonZkEVMMock.sol/PolygonZkEVMMock.json compiled-contracts/
     cp artifacts/contracts/mocks/VerifierRollupHelperMock.sol/VerifierRollupHelperMock.json compiled-contracts/
     cp artifacts/contracts/PolygonZkEVM.sol/PolygonZkEVM.json compiled-contracts/
-    cp artifacts/contracts/verifiers/FflonkVerifier.sol/FflonkVerifier.json compiled-contracts/
+    cp artifacts/contracts/verifiers/FflonkVerifier_10.sol/FflonkVerifier_10.json compiled-contracts/FflonkVerifier.json
     cp artifacts/@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol/ProxyAdmin.json compiled-contracts/
     cp artifacts/@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol/TransparentUpgradeableProxy.json compiled-contracts/
     cp artifacts/contracts/deployment/PolygonZkEVMDeployer.sol/PolygonZkEVMDeployer.json compiled-contracts/
     cp artifacts/contracts/PolygonZkEVMTimelock.sol/PolygonZkEVMTimelock.json compiled-contracts/
-    
+
     cp artifacts/contracts/v2/PolygonRollupManager.sol/PolygonRollupManager.json compiled-contracts/
     cp artifacts/contracts/v2/mocks/PolygonRollupManagerMock.sol/PolygonRollupManagerMock.json compiled-contracts/
     cp artifacts/contracts/v2/mocks/PolygonRollupManagerMockInternalTest.sol/PolygonRollupManagerMockInternalTest.json compiled-contracts/

docs/v2/consensus/validium/PolygonValidiumEtrog.md

@@ -31,7 +31,7 @@ It is advised to use timelocks for the admin address in case of Validium since i
 ```solidity
   function sequenceBatchesValidium(
     struct PolygonValidiumEtrog.ValidiumBatchData[] batches,
-    uint32 indexL1InfoRoot,
+    uint32 l1InfoTreeLeafCount,
     uint64 maxSequenceTimestamp,
     bytes32 expectedFinalAccInputHash,
     address l2Coinbase,
@@ -45,7 +45,7 @@ Allows a sequencer to send multiple batches
 | Name | Type | Description                                                          |
 | :--- | :--- | :------------------------------------------------------------------- |
 |`batches` | struct PolygonValidiumEtrog.ValidiumBatchData[] | Struct array which holds the necessary data to append new batches to the sequence
-|`indexL1InfoRoot` | uint32 | Index of the L1InfoRoot that will be used in this sequence
+|`l1InfoTreeLeafCount` | uint32 | leaf count of the L1InfoRoot that will be used in this sequence
 |`maxSequenceTimestamp` | uint64 | Max timestamp of the sequence. This timestamp must be inside a safety range (actual + 36 seconds).
 This timestamp should be equal or higher of the last block inside the sequence, otherwise this batch will be invalidated by circuit.
 |`expectedFinalAccInputHash` | bytes32 | This parameter must match the acc input hash after hash all the batch data
@@ -60,7 +60,7 @@ note Pol is not a reentrant token
 ```solidity
   function sequenceBatches(
     struct PolygonRollupBaseEtrog.BatchData[] batches,
-    uint32 indexL1InfoRoot,
+    uint32 l1InfoTreeLeafCount,
     uint64 maxSequenceTimestamp,
     bytes32 expectedFinalAccInputHash,
     address l2Coinbase
@@ -73,7 +73,7 @@ Allows a sequencer to send multiple batches
 | Name | Type | Description                                                          |
 | :--- | :--- | :------------------------------------------------------------------- |
 |`batches` | struct PolygonRollupBaseEtrog.BatchData[] | Struct array which holds the necessary data to append new batches to the sequence
-|`indexL1InfoRoot` | uint32 | Index of the L1InfoRoot that will be used in this sequence
+|`l1InfoTreeLeafCount` | uint32 | Index of the L1InfoRoot that will be used in this sequence
 |`maxSequenceTimestamp` | uint64 | Max timestamp of the sequence. This timestamp must be inside a safety range (actual + 36 seconds).
 This timestamp should be equal or higher of the last block inside the sequence, otherwise this batch will be invalidated by circuit.
 |`expectedFinalAccInputHash` | bytes32 | This parameter must match the acc input hash after hash all the batch data

docs/v2/lib/PolygonRollupBaseEtrog.md

@@ -54,7 +54,7 @@ Note if a wrapped token of the bridge is used, the original network and address
 ```solidity
   function sequenceBatches(
     struct PolygonRollupBaseEtrog.BatchData[] batches,
-    uint32 indexL1InfoRoot,
+    uint32 l1InfoTreeLeafCount,
     uint64 maxSequenceTimestamp,
     bytes32 expectedFinalAccInputHash,
     address l2Coinbase
@@ -67,7 +67,7 @@ Allows a sequencer to send multiple batches
 | Name | Type | Description                                                          |
 | :--- | :--- | :------------------------------------------------------------------- |
 |`batches` | struct PolygonRollupBaseEtrog.BatchData[] | Struct array which holds the necessary data to append new batches to the sequence
-|`indexL1InfoRoot` | uint32 | Index of the L1InfoRoot that will be used in this sequence
+|`l1InfoTreeLeafCount` | uint32 | Index of the L1InfoRoot that will be used in this sequence
 |`maxSequenceTimestamp` | uint64 | Max timestamp of the sequence. This timestamp must be inside a safety range (actual + 36 seconds).
 This timestamp should be equal or higher of the last block inside the sequence, otherwise this batch will be invalidated by circuit.
 |`expectedFinalAccInputHash` | bytes32 | This parameter must match the acc input hash after hash all the batch data

tools/addRollupType/addRollupMainnet5/add-rollup-type-output-2024-09-20T08:37:40.231Z.json

@@ -0,0 +1,24 @@
+{
+ "genesis": "0xe3a7d8bae497945ba8ddc51c69564f60ad4c1a990b9c7bdbd27f7929bfa8f272",
+ "verifierAddress": "0xc521580cd8586Cc688A7430F9DcE0f6A803F2883",
+ "consensusContract": "PolygonZkEVMEtrog",
+ "scheduleData": "0x01d5062a0000000000000000000000005132a183e9f3cb7c848b0aac5ae0c4f0491b7ab2000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000d2f000000000000000000000000000000000000000000000000000000000000000164f34eb8eb0000000000000000000000002650a9a4fc64f63f573ef0f405064ef54bc46f71000000000000000000000000c521580cd8586cc688a7430f9dce0f6a803f2883000000000000000000000000000000000000000000000000000000000000000b0000000000000000000000000000000000000000000000000000000000000000e3a7d8bae497945ba8ddc51c69564f60ad4c1a990b9c7bdbd27f7929bfa8f27200000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000063547970653a207a6b45564d2c2056657273696f6e3a206567676672756974204e3d3235202c2067656e657369733a202f697066732f516d55586e526f5062556d5a75455a43477969486a45736f4e6346567533684c74537668706e664253326d415955000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "executeData": "0x134008d30000000000000000000000005132a183e9f3cb7c848b0aac5ae0c4f0491b7ab2000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000164f34eb8eb0000000000000000000000002650a9a4fc64f63f573ef0f405064ef54bc46f71000000000000000000000000c521580cd8586cc688a7430f9dce0f6a803f2883000000000000000000000000000000000000000000000000000000000000000b0000000000000000000000000000000000000000000000000000000000000000e3a7d8bae497945ba8ddc51c69564f60ad4c1a990b9c7bdbd27f7929bfa8f27200000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000063547970653a207a6b45564d2c2056657273696f6e3a206567676672756974204e3d3235202c2067656e657369733a202f697066732f516d55586e526f5062556d5a75455a43477969486a45736f4e6346567533684c74537668706e664253326d415955000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "id": "0xfef25085de41c62daf3dda2495c5f313fdd26e24fbfcf609ac3c9a3533f81771",
+ "decodedScheduleData": {
+  "target": "0x5132A183E9F3CB7C848b0AAC5Ae0c4f0491B7aB2",
+  "value": "0",
+  "data": "0xf34eb8eb0000000000000000000000002650a9a4fc64f63f573ef0f405064ef54bc46f71000000000000000000000000c521580cd8586cc688a7430f9dce0f6a803f2883000000000000000000000000000000000000000000000000000000000000000b0000000000000000000000000000000000000000000000000000000000000000e3a7d8bae497945ba8ddc51c69564f60ad4c1a990b9c7bdbd27f7929bfa8f27200000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000063547970653a207a6b45564d2c2056657273696f6e3a206567676672756974204e3d3235202c2067656e657369733a202f697066732f516d55586e526f5062556d5a75455a43477969486a45736f4e6346567533684c74537668706e664253326d4159550000000000000000000000000000000000000000000000000000000000",
+  "decodedData": {
+   "consensusImplementation": "0x2650a9a4fC64f63F573EF0F405064EF54BC46f71",
+   "verifier": "0xc521580cd8586Cc688A7430F9DcE0f6A803F2883",
+   "forkID": "11",
+   "rollupCompatibilityID": "0",
+   "genesis": "0xe3a7d8bae497945ba8ddc51c69564f60ad4c1a990b9c7bdbd27f7929bfa8f272",
+   "description": "Type: zkEVM, Version: eggfruit N=25 , genesis: /ipfs/QmUXnRoPbUmZuEZCGyiHjEsoNcFVu3hLtSvhpnfBS2mAYU"
+  },
+  "predecessor": "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "salt": "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "delay": "864000"
+ }
+}

tools/addRollupType/addRollupMainnet5/add-rollup-type.json

@@ -0,0 +1,16 @@
+{
+    "consensusContract": "PolygonZkEVMEtrog",
+    "polygonconsensusContract": "0x2650a9a4fC64f63F573EF0F405064EF54BC46f71",
+    "polygonRollupManagerAddress": "0x5132A183E9F3CB7C848b0AAC5Ae0c4f0491B7aB2",
+    "verifierAddress": "0xc521580cd8586Cc688A7430F9DcE0f6A803F2883",
+    "description": "Type: zkEVM, Version: eggfruit N=25 , genesis: /ipfs/QmUXnRoPbUmZuEZCGyiHjEsoNcFVu3hLtSvhpnfBS2mAYU",
+    "forkID": 11,
+    "rollupCompatibilityID": 0,
+    "timelockDelay": 864000,
+    "timelockSalt": "",
+    "deployerPvtKey": "",
+    "maxFeePerGas":"",
+    "maxPriorityFeePerGas":"",
+    "multiplierGas": "",
+    "genesisRoot": "0xe3a7d8bae497945ba8ddc51c69564f60ad4c1a990b9c7bdbd27f7929bfa8f272"
+}