mini thingds

0xPolygonHermez · Aug 5, 2024 · 996b75e · 996b75e
1 parent 8942b02
commit 996b75e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/contracts/v2/PolygonRollupManager.sol b/contracts/v2/PolygonRollupManager.sol
@@ -46,6 +46,7 @@ contract PolygonRollupManager is
         address consensusImplementation;
         address verifier;
         uint64 forkID;
+        /// @custom:oz-renamed-from rollupCompatibilityID
         /// @custom:oz-retyped-from uint8
         VerifierType rollupVerifierType;
         bool obsolete;
@@ -92,6 +93,7 @@ contract PolygonRollupManager is
         uint64 _legacyLastPendingStateConsolidated;
         uint64 lastVerifiedBatchBeforeUpgrade;
         uint64 rollupTypeID;
+        /// @custom:oz-renamed-from rollupCompatibilityID
         /// @custom:oz-retyped-from uint8
         VerifierType rollupVerifierType;
         bytes32 lastPessimisticRoot;
@@ -242,14 +244,14 @@ contract PolygonRollupManager is
     uint32 public rollupTypeCount;
 
     // Rollup type mapping
-    // @custom:oz-retyped-from PolygonRollupManagerPrevious.RollupType
+    /// @custom:oz-retyped-from PolygonRollupManagerPrevious.RollupType
     mapping(uint32 rollupTypeID => RollupType) public rollupTypeMap;
 
     // Number of rollups added, every new rollup will be assigned sequencially a new ID
     uint32 public rollupCount;
 
     // Rollups ID mapping
-    /// @custom:oz-renamed-from rollupIDToRollupData
+    /// @custom:oz-retyped-from PolygonRollupManagerPrevious.RollupData
     mapping(uint32 rollupID => RollupData) internal _rollupIDToRollupData;
 
     // Rollups address mapping

diff --git a/...previousVersions/PolygonRollupManager.sol → ...Versions/PolygonRollupManagerPrevious.sol b/...previousVersions/PolygonRollupManager.sol → ...Versions/PolygonRollupManagerPrevious.sol
diff --git a/test/contractsv2/PolygonRollupManagerUpgrade.test.ts b/test/contractsv2/PolygonRollupManagerUpgrade.test.ts
@@ -227,7 +227,6 @@ describe("Polygon Rollup manager upgraded", () => {
             ],
             unsafeAllow: ["constructor", "state-variable-immutable"],
             unsafeAllowRenames: true,
-            unsafeSkipStorageCheck: true,
             call: {
                 fn: "initialize",
                 args: [