mini thingds

0xPolygonHermez · Aug 5, 2024 · 8f06eb7 · 8f06eb7
1 parent 8942b02
commit 8f06eb7
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 27 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/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -35,7 +35,7 @@
         "@openzeppelin/contracts": "4.8.2",
         "@openzeppelin/contracts-upgradeable": "4.8.2",
         "@openzeppelin/contracts5": "npm:@openzeppelin/contracts@^5.0.0",
-        "@openzeppelin/hardhat-upgrades": "2.5.0",
+        "@openzeppelin/hardhat-upgrades": "^2.5.1",
         "@types/yargs": "^17.0.28",
         "circomlibjs": "0.1.1",
         "dotenv": "^8.6.0",
@@ -111,4 +111,4 @@
         "verify:upgradeV2:mainnet": "npx hardhat run upgrade/upgradeToV2/verifyContracts.ts --network mainnet",
         "saveUpgradeV2:mainnet": "mkdir -p upgrade/upgradeToV2/mainnet_$(date +%s) && cp -r upgrade/upgradeToV2/upgrade_*.json upgrade/upgradeToV2/mainnet_$(date +%s) && cp -r upgrade/upgradeToV2/deploy_*.json upgrade/upgradeToV2/mainnet_$(date +%s) && cp .openzeppelin/mainnet.json upgrade/upgradeToV2/mainnet_$(date +%s)"
     }
-}
+}
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: [