From 1e6318c63ff92bea84400df0ba8786cd4d6226d8 Mon Sep 17 00:00:00 2001
From: invocamanman <jesus.ligero@yahoo.es>
Date: Sun, 24 Mar 2024 10:28:21 +0100
Subject: [PATCH] rename

---
 contracts/v2/PolygonRollupManager.sol                      | 7 +++----
 .../PolygonRollupBaseFeijoa.sol}                           | 2 +-
 .../{frijoa => feijoa}/zkEVM/PolygonZkEVMFrijoa.sol        | 6 +++---
 contracts/v2/lib/PolygonRollupBaseFrijoa.sol               | 2 +-
 4 files changed, 8 insertions(+), 9 deletions(-)
 rename contracts/v2/consensus/{frijoa/PolygonRollupBaseFrijoa.sol => feijoa/PolygonRollupBaseFeijoa.sol} (99%)
 rename contracts/v2/consensus/{frijoa => feijoa}/zkEVM/PolygonZkEVMFrijoa.sol (90%)

diff --git a/contracts/v2/PolygonRollupManager.sol b/contracts/v2/PolygonRollupManager.sol
index 8edf6e436..877e0f9ff 100644
--- a/contracts/v2/PolygonRollupManager.sol
+++ b/contracts/v2/PolygonRollupManager.sol
@@ -284,7 +284,6 @@ contract PolygonRollupManager is
     uint64 public _legacyTotalVerifiedBatches;
 
     // Last timestamp when an aggregation happen
-
     uint64 public lastAggregationTimestamp;
 
     // Trusted aggregator timeout, if a sequence is not verified in this time frame,
@@ -315,10 +314,10 @@ contract PolygonRollupManager is
     mapping(uint32 rollupID => RollupDataV2) public rollupIDToRollupData;
 
     // Total sequenced zkGasLimit across all rollups
-    uint64 public totalZkGasLimit;
+    uint128 public totalZkGasLimit;
 
     // Total verified zkGasLimit across all rollups
-    uint64 public totalVerifiedZkGasLimit;
+    uint128 public totalVerifiedZkGasLimit;
 
     /**
      * @dev Emitted when a new rollup type is added
@@ -857,7 +856,7 @@ contract PolygonRollupManager is
         RollupData storage rollup = rollupIDToRollupData[rollupID];
 
         // Update total sequence parameters
-        totalZkGasLimit += uint256(zkGasLimit);
+        totalZkGasLimit += uint128(zkGasLimit);
 
         // Update sequenced batches of the current rollup
         uint64 currentSequenceNum = rollup.lastSequenceNum;
diff --git a/contracts/v2/consensus/frijoa/PolygonRollupBaseFrijoa.sol b/contracts/v2/consensus/feijoa/PolygonRollupBaseFeijoa.sol
similarity index 99%
rename from contracts/v2/consensus/frijoa/PolygonRollupBaseFrijoa.sol
rename to contracts/v2/consensus/feijoa/PolygonRollupBaseFeijoa.sol
index 80288508e..a96a1bae2 100644
--- a/contracts/v2/consensus/frijoa/PolygonRollupBaseFrijoa.sol
+++ b/contracts/v2/consensus/feijoa/PolygonRollupBaseFeijoa.sol
@@ -20,7 +20,7 @@ import "../../lib/PolygonConstantsBase.sol";
  * The aggregators will be able to verify the sequenced state with zkProofs and therefore make available the withdrawals from L2 network.
  * To enter and exit of the L2 network will be used a PolygonZkEVMBridge smart contract that will be deployed in both networks.
  */
-abstract contract PolygonRollupBaseFrijoa is
+abstract contract PolygonRollupBaseFeijoa is
     Initializable,
     PolygonConstantsBase,
     IPolygonZkEVMVEtrogErrors,
diff --git a/contracts/v2/consensus/frijoa/zkEVM/PolygonZkEVMFrijoa.sol b/contracts/v2/consensus/feijoa/zkEVM/PolygonZkEVMFrijoa.sol
similarity index 90%
rename from contracts/v2/consensus/frijoa/zkEVM/PolygonZkEVMFrijoa.sol
rename to contracts/v2/consensus/feijoa/zkEVM/PolygonZkEVMFrijoa.sol
index a742ab256..722a80a44 100644
--- a/contracts/v2/consensus/frijoa/zkEVM/PolygonZkEVMFrijoa.sol
+++ b/contracts/v2/consensus/feijoa/zkEVM/PolygonZkEVMFrijoa.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: AGPL-3.0
 pragma solidity 0.8.24;
 
-import "../PolygonRollupBaseFrijoa.sol";
+import "../PolygonRollupBaseFeijoa.sol";
 
 /**
  * Contract responsible for managing the states and the updates of L2 network.
@@ -11,7 +11,7 @@ import "../PolygonRollupBaseFrijoa.sol";
  * The aggregators will be able to verify the sequenced state with zkProofs and therefore make available the withdrawals from L2 network.
  * To enter and exit of the L2 network will be used a PolygonZkEVMBridge smart contract that will be deployed in both networks.
  */
-contract PolygonZkEVMFrijoa is PolygonRollupBaseFrijoa {
+contract PolygonZkEVMFeijoa is PolygonRollupBaseFeijoa {
     /**
      * @param _globalExitRootManager Global exit root manager address
      * @param _pol POL token address
@@ -24,7 +24,7 @@ contract PolygonZkEVMFrijoa is PolygonRollupBaseFrijoa {
         IPolygonZkEVMBridgeV2 _bridgeAddress,
         PolygonRollupManager _rollupManager
     )
-        PolygonRollupBaseFrijoa(
+        PolygonRollupBasefeijoa(
             _globalExitRootManager,
             _pol,
             _bridgeAddress,
diff --git a/contracts/v2/lib/PolygonRollupBaseFrijoa.sol b/contracts/v2/lib/PolygonRollupBaseFrijoa.sol
index edd02cd3a..0485027f5 100644
--- a/contracts/v2/lib/PolygonRollupBaseFrijoa.sol
+++ b/contracts/v2/lib/PolygonRollupBaseFrijoa.sol
@@ -20,7 +20,7 @@ import "./PolygonConstantsBase.sol";
  * The aggregators will be able to verify the sequenced state with zkProofs and therefore make available the withdrawals from L2 network.
  * To enter and exit of the L2 network will be used a PolygonZkEVMBridge smart contract that will be deployed in both networks.
  */
-abstract contract PolygonRollupBaseFrijoa is
+abstract contract PolygonRollupBaseFeijoa is
     Initializable,
     PolygonConstantsBase,
     IPolygonZkEVMVEtrogErrors,