Merge pull request #266 from 0xPolygonHermez/feature/fix-tests

Feature/fix tests

contracts/v2/PolygonRollupManager.sol

@@ -327,7 +327,7 @@ contract PolygonRollupManager is
      */
     event RollbackBatches(
         uint32 indexed rollupID,
-        uint64 indexed batchToRollback,
+        uint64 indexed targetBatch,
         bytes32 accInputHashToRollback
     );
 
@@ -637,7 +637,7 @@ contract PolygonRollupManager is
             rollupAddressToID[address(rollupContract)]
         ];
 
-        // If rollupID does not exist (rollupID = 0), will revert afterwards
+        // Check all sequenced batches are verified
         if (rollup.lastBatchSequenced != rollup.lastVerifiedBatch) {
             revert AllSequencedMustBeVerified();
         }
@@ -732,11 +732,11 @@ contract PolygonRollupManager is
     /**
      * @notice Rollback batches of the target rollup
      * @param rollupContract Rollup consensus proxy address
-     * @param batchToRollback Batch to rollback
+     * @param targetBatch Batch to rollback up to but not including this batch
      */
     function rollbackBatches(
         IPolygonRollupBase rollupContract,
-        uint64 batchToRollback
+        uint64 targetBatch
     ) external {
         // Check msg.sender has _UPDATE_ROLLUP_ROLE rol or is the admin of the network
         if (
@@ -758,23 +758,23 @@ contract PolygonRollupManager is
 
         // Batch to rollback should be already sequenced
         if (
-            batchToRollback >= lastBatchSequenced ||
-            batchToRollback < rollup.lastVerifiedBatch
+            targetBatch >= lastBatchSequenced ||
+            targetBatch < rollup.lastVerifiedBatch
         ) {
             revert RollbackBatchIsNotValid();
         }
 
         uint64 currentBatch = lastBatchSequenced;
 
-        // delete sequence batches structs until the batchToRollback
-        while (currentBatch != batchToRollback) {
+        // delete sequence batches structs until the targetBatch
+        while (currentBatch != targetBatch) {
             // Load previous end of sequence batch
             uint64 previousBatch = rollup
                 .sequencedBatches[currentBatch]
                 .previousLastBatchSequenced;
 
             // Batch to rollback must be end of a sequence
-            if (previousBatch < batchToRollback) {
+            if (previousBatch < targetBatch) {
                 revert RollbackBatchIsNotEndOfSequence();
             }
 
@@ -786,21 +786,33 @@ contract PolygonRollupManager is
         }
 
         // Update last batch sequenced on rollup data
-        rollup.lastBatchSequenced = batchToRollback;
+        rollup.lastBatchSequenced = targetBatch;
 
         // Update totalSequencedBatches
-        totalSequencedBatches -= lastBatchSequenced - batchToRollback;
+        totalSequencedBatches -= lastBatchSequenced - targetBatch;
 
-        // Callback the consensus contract
+        // Check pending state
+        if (rollup.lastPendingState > 0) {
+            // update total verified batches
+            uint64 currentLastVerifiedBatch = _getLastVerifiedBatch(rollup);
+            totalVerifiedBatches -=
+                currentLastVerifiedBatch -
+                rollup.lastVerifiedBatch;
+
+            rollup.lastPendingState = 0;
+            rollup.lastPendingStateConsolidated = 0;
+        }
+
+        // Clean pending state if any
         rollupContract.rollbackBatches(
-            batchToRollback,
-            rollup.sequencedBatches[batchToRollback].accInputHash
+            targetBatch,
+            rollup.sequencedBatches[targetBatch].accInputHash
         );
 
         emit RollbackBatches(
             rollupID,
-            batchToRollback,
-            rollup.sequencedBatches[batchToRollback].accInputHash
+            targetBatch,
+            rollup.sequencedBatches[targetBatch].accInputHash
         );
     }
 

contracts/v2/interfaces/IPolygonRollupBase.sol

@@ -21,8 +21,7 @@ interface IPolygonRollupBase {
     function admin() external returns (address);
 
     function rollbackBatches(
-        uint64 batchToRollback,
+        uint64 targetBatch,
         bytes32 accInputHashToRollback
     ) external;
-
 }

contracts/v2/lib/PolygonRollupBaseEtrog.sol

@@ -239,7 +239,7 @@ abstract contract PolygonRollupBaseEtrog is
      * @dev Emitted when a aggregator verifies batches
      */
     event RollbackBatches(
-        uint64 indexed batchToRollback,
+        uint64 indexed targetBatch,
         bytes32 accInputHashToRollback
     );
 
@@ -583,17 +583,17 @@ abstract contract PolygonRollupBaseEtrog is
 
     /**
      * @notice Callback on rollback batches, can only be called by the rollup manager
-     * @param batchToRollback Batch to rollback
+     * @param targetBatch Batch to rollback up to but not including this batch
      * @param accInputHashToRollback Acc input hash to rollback
      */
     function rollbackBatches(
-        uint64 batchToRollback,
+        uint64 targetBatch,
         bytes32 accInputHashToRollback
     ) public virtual override onlyRollupManager {
         // Rollback the accumulated input hash
         lastAccInputHash = accInputHashToRollback;
 
-        emit RollbackBatches(batchToRollback, accInputHashToRollback);
+        emit RollbackBatches(targetBatch, accInputHashToRollback);
     }
 
     ////////////////////////////

contracts/v2/previousVersions/IPolygonRollupBasePrevious.sol

@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: AGPL-3.0
+
+pragma solidity ^0.8.20;
+
+interface IPolygonRollupBasePrevious {
+    function initialize(
+        address _admin,
+        address sequencer,
+        uint32 networkID,
+        address gasTokenAddress,
+        string memory sequencerURL,
+        string memory _networkName
+    ) external;
+
+    function onVerifyBatches(
+        uint64 lastVerifiedBatch,
+        bytes32 newStateRoot,
+        address aggregator
+    ) external;
+
+    function admin() external returns (address);
+}