Transpile fb2aec6

Author: github-actions[bot]

.changeset/dull-ghosts-sip.md

@@ -0,0 +1,6 @@
+---
+'openzeppelin-solidity': patch
+---
+
+`AccessManager`, `AccessManaged`, `GovernorTimelockAccess`: Ensure that calldata shorter than 4 bytes is not padded to 4 bytes.
+pr: #4624

.changeset/grumpy-poets-rush.md

@@ -0,0 +1,5 @@
+---
+'openzeppelin-solidity': major
+---
+
+Upgradeable Contracts: No longer transpile interfaces, libraries, and stateless contracts.

.changeset/purple-squids-attend.md

@@ -0,0 +1,6 @@
+---
+'openzeppelin-solidity': patch
+---
+
+`AccessManager`: Use named return parameters in functions that return multiple values.
+pr: #4624

.github/actions/setup/action.yml

@@ -15,5 +15,3 @@ runs:
       run: npm ci
       shell: bash
       if: steps.cache.outputs.cache-hit != 'true'
-      env:
-        SKIP_COMPILE: true

.github/workflows/checks.yml

@@ -56,6 +56,9 @@ jobs:
           fetch-depth: 0 # Include history so patch conflicts are resolved automatically
       - name: Set up environment
         uses: ./.github/actions/setup
+      - name: Copy non-upgradeable contracts as dependency
+        run:
+          cp -rnT contracts node_modules/@openzeppelin/contracts
       - name: Transpile to upgradeable
         run: bash scripts/upgradeable/transpile.sh
       - name: Run tests

.github/workflows/upgradeable.yml

@@ -18,10 +18,12 @@ jobs:
           token: ${{ secrets.GH_TOKEN_UPGRADEABLE }}
       - name: Fetch current non-upgradeable branch
         run: |
-          git fetch "https://github.com/${{ github.repository }}.git" "$REF"
+          git fetch "$REMOTE" master # Fetch default branch first for patch to apply cleanly
+          git fetch "$REMOTE" "$REF"
           git checkout FETCH_HEAD
         env:
           REF: ${{ github.ref }}
+          REMOTE: https://github.com/${{ github.repository }}.git
       - name: Set up environment
         uses: ./.github/actions/setup
       - run: bash scripts/git-user-config.sh

contracts/access/AccessControlUpgradeable.sol

@@ -3,9 +3,9 @@
 
 pragma solidity ^0.8.20;
 
-import {IAccessControlUpgradeable} from "./IAccessControlUpgradeable.sol";
-import {ContextUpgradeable} from "../utils/ContextUpgradeable.sol";
-import {ERC165Upgradeable} from "../utils/introspection/ERC165Upgradeable.sol";
+import {IAccessControl} from "@openzeppelin/contracts/access/IAccessControl.sol";
+import {Context} from "@openzeppelin/contracts/utils/Context.sol";
+import {ERC165} from "@openzeppelin/contracts/utils/introspection/ERC165.sol";
 import {Initializable} from "../proxy/utils/Initializable.sol";
 
 /**
@@ -47,7 +47,7 @@ import {Initializable} from "../proxy/utils/Initializable.sol";
  * accounts that have been granted it. We recommend using {AccessControlDefaultAdminRules}
  * to enforce additional security measures for this role.
  */
-abstract contract AccessControlUpgradeable is Initializable, ContextUpgradeable, IAccessControlUpgradeable, ERC165Upgradeable {
+abstract contract AccessControlUpgradeable is Initializable, Context, IAccessControl, ERC165 {
     struct RoleData {
         mapping(address account => bool) hasRole;
         bytes32 adminRole;
@@ -88,7 +88,7 @@ abstract contract AccessControlUpgradeable is Initializable, ContextUpgradeable,
      * @dev See {IERC165-supportsInterface}.
      */
     function supportsInterface(bytes4 interfaceId) public view virtual override returns (bool) {
-        return interfaceId == type(IAccessControlUpgradeable).interfaceId || super.supportsInterface(interfaceId);
+        return interfaceId == type(IAccessControl).interfaceId || super.supportsInterface(interfaceId);
     }
 
     /**

contracts/access/IAccessControlUpgradeable.sol

@@ -3,7 +3,7 @@
 
 pragma solidity ^0.8.20;
 
-import {ContextUpgradeable} from "../utils/ContextUpgradeable.sol";
+import {Context} from "@openzeppelin/contracts/utils/Context.sol";
 import {Initializable} from "../proxy/utils/Initializable.sol";
 
 /**
@@ -18,7 +18,7 @@ import {Initializable} from "../proxy/utils/Initializable.sol";
  * `onlyOwner`, which can be applied to your functions to restrict their use to
  * the owner.
  */
-abstract contract OwnableUpgradeable is Initializable, ContextUpgradeable {
+abstract contract OwnableUpgradeable is Initializable, Context {
     /// @custom:storage-location erc7201:openzeppelin.storage.Ownable
     struct OwnableStorage {
         address _owner;

contracts/access/OwnableUpgradeable.sol

@@ -3,11 +3,12 @@
 
 pragma solidity ^0.8.20;
 
-import {IAccessControlDefaultAdminRulesUpgradeable} from "./IAccessControlDefaultAdminRulesUpgradeable.sol";
-import {AccessControlUpgradeable, IAccessControlUpgradeable} from "../AccessControlUpgradeable.sol";
-import {SafeCastUpgradeable} from "../../utils/math/SafeCastUpgradeable.sol";
-import {MathUpgradeable} from "../../utils/math/MathUpgradeable.sol";
-import {IERC5313Upgradeable} from "../../interfaces/IERC5313Upgradeable.sol";
+import {IAccessControlDefaultAdminRules} from "@openzeppelin/contracts/access/extensions/IAccessControlDefaultAdminRules.sol";
+import {AccessControlUpgradeable} from "../AccessControlUpgradeable.sol";
+import {IAccessControl} from "@openzeppelin/contracts/access/IAccessControl.sol";
+import {SafeCast} from "@openzeppelin/contracts/utils/math/SafeCast.sol";
+import {Math} from "@openzeppelin/contracts/utils/math/Math.sol";
+import {IERC5313} from "@openzeppelin/contracts/interfaces/IERC5313.sol";
 import {Initializable} from "../../proxy/utils/Initializable.sol";
 
 /**
@@ -37,7 +38,7 @@ import {Initializable} from "../../proxy/utils/Initializable.sol";
  * }
  * ```
  */
-abstract contract AccessControlDefaultAdminRulesUpgradeable is Initializable, IAccessControlDefaultAdminRulesUpgradeable, IERC5313Upgradeable, AccessControlUpgradeable {
+abstract contract AccessControlDefaultAdminRulesUpgradeable is Initializable, IAccessControlDefaultAdminRules, IERC5313, AccessControlUpgradeable {
     /// @custom:storage-location erc7201:openzeppelin.storage.AccessControlDefaultAdminRules
     struct AccessControlDefaultAdminRulesStorage {
         // pending admin pair read/written together frequently
@@ -81,7 +82,7 @@ abstract contract AccessControlDefaultAdminRulesUpgradeable is Initializable, IA
      * @dev See {IERC165-supportsInterface}.
      */
     function supportsInterface(bytes4 interfaceId) public view virtual override returns (bool) {
-        return interfaceId == type(IAccessControlDefaultAdminRulesUpgradeable).interfaceId || super.supportsInterface(interfaceId);
+        return interfaceId == type(IAccessControlDefaultAdminRules).interfaceId || super.supportsInterface(interfaceId);
     }
 
     /**
@@ -98,7 +99,7 @@ abstract contract AccessControlDefaultAdminRulesUpgradeable is Initializable, IA
     /**
      * @dev See {AccessControl-grantRole}. Reverts for `DEFAULT_ADMIN_ROLE`.
      */
-    function grantRole(bytes32 role, address account) public virtual override(AccessControlUpgradeable, IAccessControlUpgradeable) {
+    function grantRole(bytes32 role, address account) public virtual override(AccessControlUpgradeable, IAccessControl) {
         if (role == DEFAULT_ADMIN_ROLE) {
             revert AccessControlEnforcedDefaultAdminRules();
         }
@@ -108,7 +109,7 @@ abstract contract AccessControlDefaultAdminRulesUpgradeable is Initializable, IA
     /**
      * @dev See {AccessControl-revokeRole}. Reverts for `DEFAULT_ADMIN_ROLE`.
      */
-    function revokeRole(bytes32 role, address account) public virtual override(AccessControlUpgradeable, IAccessControlUpgradeable) {
+    function revokeRole(bytes32 role, address account) public virtual override(AccessControlUpgradeable, IAccessControl) {
         if (role == DEFAULT_ADMIN_ROLE) {
             revert AccessControlEnforcedDefaultAdminRules();
         }
@@ -128,7 +129,7 @@ abstract contract AccessControlDefaultAdminRulesUpgradeable is Initializable, IA
      * thereby disabling any functionality that is only available for it, and the possibility of reassigning a
      * non-administrated role.
      */
-    function renounceRole(bytes32 role, address account) public virtual override(AccessControlUpgradeable, IAccessControlUpgradeable) {
+    function renounceRole(bytes32 role, address account) public virtual override(AccessControlUpgradeable, IAccessControl) {
         AccessControlDefaultAdminRulesStorage storage $ = _getAccessControlDefaultAdminRulesStorage();
         if (role == DEFAULT_ADMIN_ROLE && account == defaultAdmin()) {
             (address newDefaultAdmin, uint48 schedule) = pendingDefaultAdmin();
@@ -186,23 +187,23 @@ abstract contract AccessControlDefaultAdminRulesUpgradeable is Initializable, IA
     ///
 
     /**
-     * @inheritdoc IAccessControlDefaultAdminRulesUpgradeable
+     * @inheritdoc IAccessControlDefaultAdminRules
      */
     function defaultAdmin() public view virtual returns (address) {
         AccessControlDefaultAdminRulesStorage storage $ = _getAccessControlDefaultAdminRulesStorage();
         return $._currentDefaultAdmin;
     }
 
     /**
-     * @inheritdoc IAccessControlDefaultAdminRulesUpgradeable
+     * @inheritdoc IAccessControlDefaultAdminRules
      */
     function pendingDefaultAdmin() public view virtual returns (address newAdmin, uint48 schedule) {
         AccessControlDefaultAdminRulesStorage storage $ = _getAccessControlDefaultAdminRulesStorage();
         return ($._pendingDefaultAdmin, $._pendingDefaultAdminSchedule);
     }
 
     /**
-     * @inheritdoc IAccessControlDefaultAdminRulesUpgradeable
+     * @inheritdoc IAccessControlDefaultAdminRules
      */
     function defaultAdminDelay() public view virtual returns (uint48) {
         AccessControlDefaultAdminRulesStorage storage $ = _getAccessControlDefaultAdminRulesStorage();
@@ -211,7 +212,7 @@ abstract contract AccessControlDefaultAdminRulesUpgradeable is Initializable, IA
     }
 
     /**
-     * @inheritdoc IAccessControlDefaultAdminRulesUpgradeable
+     * @inheritdoc IAccessControlDefaultAdminRules
      */
     function pendingDefaultAdminDelay() public view virtual returns (uint48 newDelay, uint48 schedule) {
         AccessControlDefaultAdminRulesStorage storage $ = _getAccessControlDefaultAdminRulesStorage();
@@ -220,7 +221,7 @@ abstract contract AccessControlDefaultAdminRulesUpgradeable is Initializable, IA
     }
 
     /**
-     * @inheritdoc IAccessControlDefaultAdminRulesUpgradeable
+     * @inheritdoc IAccessControlDefaultAdminRules
      */
     function defaultAdminDelayIncreaseWait() public view virtual returns (uint48) {
         return 5 days;
@@ -231,7 +232,7 @@ abstract contract AccessControlDefaultAdminRulesUpgradeable is Initializable, IA
     ///
 
     /**
-     * @inheritdoc IAccessControlDefaultAdminRulesUpgradeable
+     * @inheritdoc IAccessControlDefaultAdminRules
      */
     function beginDefaultAdminTransfer(address newAdmin) public virtual onlyRole(DEFAULT_ADMIN_ROLE) {
         _beginDefaultAdminTransfer(newAdmin);
@@ -243,13 +244,13 @@ abstract contract AccessControlDefaultAdminRulesUpgradeable is Initializable, IA
      * Internal function without access restriction.
      */
     function _beginDefaultAdminTransfer(address newAdmin) internal virtual {
-        uint48 newSchedule = SafeCastUpgradeable.toUint48(block.timestamp) + defaultAdminDelay();
+        uint48 newSchedule = SafeCast.toUint48(block.timestamp) + defaultAdminDelay();
         _setPendingDefaultAdmin(newAdmin, newSchedule);
         emit DefaultAdminTransferScheduled(newAdmin, newSchedule);
     }
 
     /**
-     * @inheritdoc IAccessControlDefaultAdminRulesUpgradeable
+     * @inheritdoc IAccessControlDefaultAdminRules
      */
     function cancelDefaultAdminTransfer() public virtual onlyRole(DEFAULT_ADMIN_ROLE) {
         _cancelDefaultAdminTransfer();
@@ -265,7 +266,7 @@ abstract contract AccessControlDefaultAdminRulesUpgradeable is Initializable, IA
     }
 
     /**
-     * @inheritdoc IAccessControlDefaultAdminRulesUpgradeable
+     * @inheritdoc IAccessControlDefaultAdminRules
      */
     function acceptDefaultAdminTransfer() public virtual {
         (address newDefaultAdmin, ) = pendingDefaultAdmin();
@@ -298,7 +299,7 @@ abstract contract AccessControlDefaultAdminRulesUpgradeable is Initializable, IA
     ///
 
     /**
-     * @inheritdoc IAccessControlDefaultAdminRulesUpgradeable
+     * @inheritdoc IAccessControlDefaultAdminRules
      */
     function changeDefaultAdminDelay(uint48 newDelay) public virtual onlyRole(DEFAULT_ADMIN_ROLE) {
         _changeDefaultAdminDelay(newDelay);
@@ -310,13 +311,13 @@ abstract contract AccessControlDefaultAdminRulesUpgradeable is Initializable, IA
      * Internal function without access restriction.
      */
     function _changeDefaultAdminDelay(uint48 newDelay) internal virtual {
-        uint48 newSchedule = SafeCastUpgradeable.toUint48(block.timestamp) + _delayChangeWait(newDelay);
+        uint48 newSchedule = SafeCast.toUint48(block.timestamp) + _delayChangeWait(newDelay);
         _setPendingDelay(newDelay, newSchedule);
         emit DefaultAdminDelayChangeScheduled(newDelay, newSchedule);
     }
 
     /**
-     * @inheritdoc IAccessControlDefaultAdminRulesUpgradeable
+     * @inheritdoc IAccessControlDefaultAdminRules
      */
     function rollbackDefaultAdminDelay() public virtual onlyRole(DEFAULT_ADMIN_ROLE) {
         _rollbackDefaultAdminDelay();
@@ -354,7 +355,7 @@ abstract contract AccessControlDefaultAdminRulesUpgradeable is Initializable, IA
         // For example, if decreasing from 10 days to 3 days, the new delay will come into effect after 7 days.
         return
             newDelay > currentDelay
-                ? uint48(MathUpgradeable.min(newDelay, defaultAdminDelayIncreaseWait())) // no need to safecast, both inputs are uint48
+                ? uint48(Math.min(newDelay, defaultAdminDelayIncreaseWait())) // no need to safecast, both inputs are uint48
                 : currentDelay - newDelay;
     }