@etherisc/gif-next 0.0.2-9b434da-265 → 0.0.2-9bfd86b-310

package/contracts/{instance/AccessManagerSimple.sol → shared/AccessManagerCustom.sol}

@@ -1,19 +1,34 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
 pragma solidity ^0.8.20;
 
-import {Context} from "@openzeppelin5/contracts/utils/Context.sol";
-import {IAccessManaged} from "@openzeppelin5/contracts/access/manager/IAccessManaged.sol";
+import {IAccessManager} from "@openzeppelin/contracts/access/manager/IAccessManager.sol";
+import {IAccessManaged} from "@openzeppelin/contracts/access/manager/IAccessManaged.sol";
+import {Address} from "@openzeppelin/contracts/utils/Address.sol";
+import {ContextUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol";
+import {MulticallUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/MulticallUpgradeable.sol";
+import {Math} from "@openzeppelin/contracts/utils/math/Math.sol";
+import {Time} from "@openzeppelin/contracts/utils/types/Time.sol";
+import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
+
+/*
+ * copy of @openzeppelin/contract-upgradeable/access/manager/AccessManagerUpgradeable.sol" except:
+    1. abstract
+    2. renamed to AccessManagerCustom
+    2. _getAdminRestrictions() private view -> internal virtual view
+    3. _checkSelector() private pure -> internal pure
+*/
+abstract contract AccessManagerCustom is
+    Initializable, 
+    ContextUpgradeable, 
+    MulticallUpgradeable, 
+    IAccessManager
+{
+    using Time for *;
 
-import {IAccessManagerSimple} from "./IAccessManagerSimple.sol";
-
-type Delay is uint112;
-
-// @dev as oz5 AccessManager but without multicall and without timing logic
-contract AccessManagerSimple is Context, IAccessManagerSimple {
     // Structure that stores the details for a target contract.
     struct TargetConfig {
         mapping(bytes4 selector => uint64 roleId) allowedRoles;
-        uint112 adminDelay;
+        Time.Delay adminDelay;
         bool closed;
     }
 
@@ -23,7 +38,7 @@ contract AccessManagerSimple is Context, IAccessManagerSimple {
         // If this is either 0 or in the future, then the role permission is not available.
         uint48 since;
         // Delay for execution. Only applies to restricted() / execute() calls.
-        Delay delay;
+        Time.Delay delay;
     }
 
     // Structure that stores the details of a role.
@@ -35,7 +50,7 @@ contract AccessManagerSimple is Context, IAccessManagerSimple {
         // Guardian who can cancel operations targeting functions that need this role.
         uint64 guardian;
         // Delay in which the role takes effect after being granted.
-        Delay grantDelay;
+        Time.Delay grantDelay;
     }
 
     // Structure that stores the details for a scheduled operation. This structure fits into a single slot.
@@ -49,13 +64,26 @@ contract AccessManagerSimple is Context, IAccessManagerSimple {
     uint64 public constant ADMIN_ROLE = type(uint64).min; // 0
     uint64 public constant PUBLIC_ROLE = type(uint64).max; // 2**64-1
 
-    mapping(address target => TargetConfig mode) private _targets;
-    mapping(uint64 roleId => Role) private _roles;
-    mapping(bytes32 operationId => Schedule) private _schedules;
+    /// @custom:storage-location erc7201:openzeppelin.storage.AccessManagerCustom
+    struct AccessManagerStorage {
+        mapping(address target => TargetConfig mode) _targets;
+        mapping(uint64 roleId => Role) _roles;
+        mapping(bytes32 operationId => Schedule) _schedules;
+
+        // Used to identify operations that are currently being executed via {execute}.
+        // This should be transient storage when supported by the EVM.
+        bytes32 _executionId;
+    }
+
+    // TODO compute address
+    // keccak256(abi.encode(uint256(keccak256("etherisc.storage.AccessManagerCustom")) - 1)) & ~bytes32(uint256(0xff))
+    bytes32 private constant AccessManagerCustomStorageLocation = 0x77301bc69e8248c80abb894217605b71fa89ea6a9e8bdf359d9e8aa1dd62bf00;
 
-    // Used to identify operations that are currently being executed via {execute}.
-    // This should be transient storage when supported by the EVM.
-    bytes32 private _executionId;
+    function _getAccessManagerCustomStorage() private pure returns (AccessManagerStorage storage $) {
+        assembly {
+            $.slot := AccessManagerCustomStorageLocation
+        }
+    }
 
     /**
      * @dev Check that the caller is authorized to perform the operation, following the restrictions encoded in
@@ -66,7 +94,11 @@ contract AccessManagerSimple is Context, IAccessManagerSimple {
         _;
     }
 
-    constructor(address initialAdmin) {
+    function __AccessManagerCustom_init(address initialAdmin) internal onlyInitializing {
+        __AccessManagerCustom_init_unchained(initialAdmin);
+    }
+
+    function __AccessManagerCustom_init_unchained(address initialAdmin) internal onlyInitializing {
         if (initialAdmin == address(0)) {
             revert AccessManagerInvalidInitialAdmin(address(0));
         }
@@ -76,7 +108,7 @@ contract AccessManagerSimple is Context, IAccessManagerSimple {
     }
 
     // =================================================== GETTERS ====================================================
-    /// @inheritdoc IAccessManagerSimple
+    /// @inheritdoc IAccessManager
     function canCall(
         address caller,
         address target,
@@ -84,10 +116,10 @@ contract AccessManagerSimple is Context, IAccessManagerSimple {
     ) public view virtual returns (bool immediate, uint32 delay) {
         if (isTargetClosed(target)) {
             return (false, 0);
-        // } else if (caller == address(this)) {
-        //     // Caller is AccessManager, this means the call was sent through {execute} and it already checked
-        //     // permissions. We verify that the call "identifier", which is set during {execute}, is correct.
-        //     return (_isExecuting(target, selector), 0);
+        } else if (caller == address(this)) {
+            // Caller is AccessManager, this means the call was sent through {execute} and it already checked
+            // permissions. We verify that the call "identifier", which is set during {execute}, is correct.
+            return (_isExecuting(target, selector), 0);
         } else {
             uint64 roleId = getTargetFunctionRole(target, selector);
             (bool isMember, uint32 currentDelay) = hasRole(roleId, caller);
@@ -95,60 +127,67 @@ contract AccessManagerSimple is Context, IAccessManagerSimple {
         }
     }
 
-    /// @inheritdoc IAccessManagerSimple
+    /// @inheritdoc IAccessManager
     function expiration() public view virtual returns (uint32) {
         return 1 weeks;
     }
 
-    /// @inheritdoc IAccessManagerSimple
+    /// @inheritdoc IAccessManager
     function minSetback() public view virtual returns (uint32) {
         return 5 days;
     }
 
-    /// @inheritdoc IAccessManagerSimple
+    /// @inheritdoc IAccessManager
     function isTargetClosed(address target) public view virtual returns (bool) {
-        return _targets[target].closed;
+        AccessManagerStorage storage $ = _getAccessManagerCustomStorage();
+        return $._targets[target].closed;
     }
 
-    /// @inheritdoc IAccessManagerSimple
+    /// @inheritdoc IAccessManager
     function getTargetFunctionRole(address target, bytes4 selector) public view virtual returns (uint64) {
-        return _targets[target].allowedRoles[selector];
+        AccessManagerStorage storage $ = _getAccessManagerCustomStorage();
+        return $._targets[target].allowedRoles[selector];
     }
 
-    /// @inheritdoc IAccessManagerSimple
+    /// @inheritdoc IAccessManager
     function getTargetAdminDelay(address target) public view virtual returns (uint32) {
-        // return _targets[target].adminDelay.get();
+        AccessManagerStorage storage $ = _getAccessManagerCustomStorage();
+        return $._targets[target].adminDelay.get();
     }
 
-    /// @inheritdoc IAccessManagerSimple
+    /// @inheritdoc IAccessManager
     function getRoleAdmin(uint64 roleId) public view virtual returns (uint64) {
-        return _roles[roleId].admin;
+        AccessManagerStorage storage $ = _getAccessManagerCustomStorage();
+        return $._roles[roleId].admin;
     }
 
-    /// @inheritdoc IAccessManagerSimple
+    /// @inheritdoc IAccessManager
     function getRoleGuardian(uint64 roleId) public view virtual returns (uint64) {
-        return _roles[roleId].guardian;
+        AccessManagerStorage storage $ = _getAccessManagerCustomStorage();
+        return $._roles[roleId].guardian;
     }
 
-    /// @inheritdoc IAccessManagerSimple
+    /// @inheritdoc IAccessManager
     function getRoleGrantDelay(uint64 roleId) public view virtual returns (uint32) {
-        // return _roles[roleId].grantDelay.get();
+        AccessManagerStorage storage $ = _getAccessManagerCustomStorage();
+        return $._roles[roleId].grantDelay.get();
     }
 
-    /// @inheritdoc IAccessManagerSimple
+    /// @inheritdoc IAccessManager
     function getAccess(
         uint64 roleId,
         address account
     ) public view virtual returns (uint48 since, uint32 currentDelay, uint32 pendingDelay, uint48 effect) {
-        Access storage access = _roles[roleId].members[account];
+        AccessManagerStorage storage $ = _getAccessManagerCustomStorage();
+        Access storage access = $._roles[roleId].members[account];
 
         since = access.since;
-        // (currentDelay, pendingDelay, effect) = access.delay.getFull();
+        (currentDelay, pendingDelay, effect) = access.delay.getFull();
 
         return (since, currentDelay, pendingDelay, effect);
     }
 
-    /// @inheritdoc IAccessManagerSimple
+    /// @inheritdoc IAccessManager
     function hasRole(
         uint64 roleId,
         address account
@@ -157,13 +196,12 @@ contract AccessManagerSimple is Context, IAccessManagerSimple {
             return (true, 0);
         } else {
             (uint48 hasRoleSince, uint32 currentDelay, , ) = getAccess(roleId, account);
-            // return (hasRoleSince != 0 && hasRoleSince <= Time.timestamp(), currentDelay);
-            return (hasRoleSince != 0 && hasRoleSince <= uint48(block.timestamp), currentDelay);
+            return (hasRoleSince != 0 && hasRoleSince <= Time.timestamp(), currentDelay);
         }
     }
 
     // =============================================== ROLE MANAGEMENT ===============================================
-    /// @inheritdoc IAccessManagerSimple
+    /// @inheritdoc IAccessManager
     function labelRole(uint64 roleId, string calldata label) public virtual onlyAuthorized {
         if (roleId == ADMIN_ROLE || roleId == PUBLIC_ROLE) {
             revert AccessManagerLockedRole(roleId);
@@ -171,17 +209,17 @@ contract AccessManagerSimple is Context, IAccessManagerSimple {
         emit RoleLabel(roleId, label);
     }
 
-    /// @inheritdoc IAccessManagerSimple
+    /// @inheritdoc IAccessManager
     function grantRole(uint64 roleId, address account, uint32 executionDelay) public virtual onlyAuthorized {
         _grantRole(roleId, account, getRoleGrantDelay(roleId), executionDelay);
     }
 
-    /// @inheritdoc IAccessManagerSimple
+    /// @inheritdoc IAccessManager
     function revokeRole(uint64 roleId, address account) public virtual onlyAuthorized {
         _revokeRole(roleId, account);
     }
 
-    /// @inheritdoc IAccessManagerSimple
+    /// @inheritdoc IAccessManager
     function renounceRole(uint64 roleId, address callerConfirmation) public virtual {
         if (callerConfirmation != _msgSender()) {
             revert AccessManagerBadConfirmation();
@@ -189,19 +227,19 @@ contract AccessManagerSimple is Context, IAccessManagerSimple {
         _revokeRole(roleId, callerConfirmation);
     }
 
-    /// @inheritdoc IAccessManagerSimple
+    /// @inheritdoc IAccessManager
     function setRoleAdmin(uint64 roleId, uint64 admin) public virtual onlyAuthorized {
         _setRoleAdmin(roleId, admin);
     }
 
-    /// @inheritdoc IAccessManagerSimple
+    /// @inheritdoc IAccessManager
     function setRoleGuardian(uint64 roleId, uint64 guardian) public virtual onlyAuthorized {
         _setRoleGuardian(roleId, guardian);
     }
 
-    /// @inheritdoc IAccessManagerSimple
+    /// @inheritdoc IAccessManager
     function setGrantDelay(uint64 roleId, uint32 newDelay) public virtual onlyAuthorized {
-        // _setGrantDelay(roleId, newDelay);
+        _setGrantDelay(roleId, newDelay);
     }
 
     /**
@@ -215,25 +253,25 @@ contract AccessManagerSimple is Context, IAccessManagerSimple {
         uint32 grantDelay,
         uint32 executionDelay
     ) internal virtual returns (bool) {
+        AccessManagerStorage storage $ = _getAccessManagerCustomStorage();
         if (roleId == PUBLIC_ROLE) {
             revert AccessManagerLockedRole(roleId);
         }
 
-        bool newMember = _roles[roleId].members[account].since == 0;
+        bool newMember = $._roles[roleId].members[account].since == 0;
         uint48 since;
 
         if (newMember) {
-            since = uint48(block.timestamp); // Time.timestamp() + grantDelay;
-            _roles[roleId].members[account] = Access({since: since, delay: Delay.wrap(0)});
-        }
-        // else {
-        //     // No setback here. Value can be reset by doing revoke + grant, effectively allowing the admin to perform
-        //     // any change to the execution delay within the duration of the role admin delay.
-        //     (_roles[roleId].members[account].delay, since) = _roles[roleId].members[account].delay.withUpdate(
-        //         executionDelay,
-        //         0
-        //     );
-        // }
+            since = Time.timestamp() + grantDelay;
+            $._roles[roleId].members[account] = Access({since: since, delay: executionDelay.toDelay()});
+        } else {
+            // No setback here. Value can be reset by doing revoke + grant, effectively allowing the admin to perform
+            // any change to the execution delay within the duration of the role admin delay.
+            ($._roles[roleId].members[account].delay, since) = $._roles[roleId].members[account].delay.withUpdate(
+                executionDelay,
+                0
+            );
+        }
 
         emit RoleGranted(roleId, account, executionDelay, since, newMember);
         return newMember;
@@ -246,15 +284,16 @@ contract AccessManagerSimple is Context, IAccessManagerSimple {
      * Emits a {RoleRevoked} event if the account had the role.
      */
     function _revokeRole(uint64 roleId, address account) internal virtual returns (bool) {
+        AccessManagerStorage storage $ = _getAccessManagerCustomStorage();
         if (roleId == PUBLIC_ROLE) {
             revert AccessManagerLockedRole(roleId);
         }
 
-        if (_roles[roleId].members[account].since == 0) {
+        if ($._roles[roleId].members[account].since == 0) {
             return false;
         }
 
-        delete _roles[roleId].members[account];
+        delete $._roles[roleId].members[account];
 
         emit RoleRevoked(roleId, account);
         return true;
@@ -269,11 +308,12 @@ contract AccessManagerSimple is Context, IAccessManagerSimple {
      * anyone to set grant or revoke such role.
      */
     function _setRoleAdmin(uint64 roleId, uint64 admin) internal virtual {
+        AccessManagerStorage storage $ = _getAccessManagerCustomStorage();
         if (roleId == ADMIN_ROLE || roleId == PUBLIC_ROLE) {
             revert AccessManagerLockedRole(roleId);
         }
 
-        _roles[roleId].admin = admin;
+        $._roles[roleId].admin = admin;
 
         emit RoleAdminChanged(roleId, admin);
     }
@@ -287,11 +327,12 @@ contract AccessManagerSimple is Context, IAccessManagerSimple {
      * anyone to cancel any scheduled operation for such role.
      */
     function _setRoleGuardian(uint64 roleId, uint64 guardian) internal virtual {
+        AccessManagerStorage storage $ = _getAccessManagerCustomStorage();
         if (roleId == ADMIN_ROLE || roleId == PUBLIC_ROLE) {
             revert AccessManagerLockedRole(roleId);
         }
 
-        _roles[roleId].guardian = guardian;
+        $._roles[roleId].guardian = guardian;
 
         emit RoleGuardianChanged(roleId, guardian);
     }
@@ -301,19 +342,20 @@ contract AccessManagerSimple is Context, IAccessManagerSimple {
      *
      * Emits a {RoleGrantDelayChanged} event.
      */
-    // function _setGrantDelay(uint64 roleId, uint32 newDelay) internal virtual {
-    //     if (roleId == PUBLIC_ROLE) {
-    //         revert AccessManagerLockedRole(roleId);
-    //     }
+    function _setGrantDelay(uint64 roleId, uint32 newDelay) internal virtual {
+        AccessManagerStorage storage $ = _getAccessManagerCustomStorage();
+        if (roleId == PUBLIC_ROLE) {
+            revert AccessManagerLockedRole(roleId);
+        }
 
-    //     uint48 effect;
-    //     (_roles[roleId].grantDelay, effect) = _roles[roleId].grantDelay.withUpdate(newDelay, minSetback());
+        uint48 effect;
+        ($._roles[roleId].grantDelay, effect) = $._roles[roleId].grantDelay.withUpdate(newDelay, minSetback());
 
-    //     emit RoleGrantDelayChanged(roleId, newDelay, effect);
-    // }
+        emit RoleGrantDelayChanged(roleId, newDelay, effect);
+    }
 
     // ============================================= FUNCTION MANAGEMENT ==============================================
-    /// @inheritdoc IAccessManagerSimple
+    /// @inheritdoc IAccessManager
     function setTargetFunctionRole(
         address target,
         bytes4[] calldata selectors,
@@ -330,13 +372,14 @@ contract AccessManagerSimple is Context, IAccessManagerSimple {
      * Emits a {TargetFunctionRoleUpdated} event.
      */
     function _setTargetFunctionRole(address target, bytes4 selector, uint64 roleId) internal virtual {
-        _targets[target].allowedRoles[selector] = roleId;
+        AccessManagerStorage storage $ = _getAccessManagerCustomStorage();
+        $._targets[target].allowedRoles[selector] = roleId;
         emit TargetFunctionRoleUpdated(target, selector, roleId);
     }
 
-    /// @inheritdoc IAccessManagerSimple
+    /// @inheritdoc IAccessManager
     function setTargetAdminDelay(address target, uint32 newDelay) public virtual onlyAuthorized {
-        // _setTargetAdminDelay(target, newDelay);
+        _setTargetAdminDelay(target, newDelay);
     }
 
     /**
@@ -344,15 +387,15 @@ contract AccessManagerSimple is Context, IAccessManagerSimple {
      *
      * Emits a {TargetAdminDelayUpdated} event.
      */
-    // function _setTargetAdminDelay(address target, uint32 newDelay) internal virtual {
-    //     uint48 effect;
-    //     (_targets[target].adminDelay, effect) = _targets[target].adminDelay.withUpdate(newDelay, minSetback());
-
-    //     emit TargetAdminDelayUpdated(target, newDelay, effect);
-    // }
+    function _setTargetAdminDelay(address target, uint32 newDelay) internal virtual {
+        AccessManagerStorage storage $ = _getAccessManagerCustomStorage();
+        uint48 effect;
+        ($._targets[target].adminDelay, effect) = $._targets[target].adminDelay.withUpdate(newDelay, minSetback());
+        emit TargetAdminDelayUpdated(target, newDelay, effect);
+    }
 
     // =============================================== MODE MANAGEMENT ================================================
-    /// @inheritdoc IAccessManagerSimple
+    /// @inheritdoc IAccessManager
     function setTargetClosed(address target, bool closed) public virtual onlyAuthorized {
         _setTargetClosed(target, closed);
     }
@@ -363,173 +406,181 @@ contract AccessManagerSimple is Context, IAccessManagerSimple {
      * Emits a {TargetClosed} event.
      */
     function _setTargetClosed(address target, bool closed) internal virtual {
+        AccessManagerStorage storage $ = _getAccessManagerCustomStorage();
         if (target == address(this)) {
             revert AccessManagerLockedAccount(target);
         }
-        _targets[target].closed = closed;
+        $._targets[target].closed = closed;
         emit TargetClosed(target, closed);
     }
 
     // ============================================== DELAYED OPERATIONS ==============================================
-    /// @inheritdoc IAccessManagerSimple
+    /// @inheritdoc IAccessManager
     function getSchedule(bytes32 id) public view virtual returns (uint48) {
-        // uint48 timepoint = _schedules[id].timepoint;
-        // return _isExpired(timepoint) ? 0 : timepoint;
+        AccessManagerStorage storage $ = _getAccessManagerCustomStorage();
+        uint48 timepoint = $._schedules[id].timepoint;
+        return _isExpired(timepoint) ? 0 : timepoint;
     }
 
-    /// @inheritdoc IAccessManagerSimple
+    /// @inheritdoc IAccessManager
     function getNonce(bytes32 id) public view virtual returns (uint32) {
-        // return _schedules[id].nonce;
+        AccessManagerStorage storage $ = _getAccessManagerCustomStorage();
+        return $._schedules[id].nonce;
     }
 
-    /// @inheritdoc IAccessManagerSimple
+    /// @inheritdoc IAccessManager
     function schedule(
         address target,
         bytes calldata data,
         uint48 when
     ) public virtual returns (bytes32 operationId, uint32 nonce) {
-        // address caller = _msgSender();
+        AccessManagerStorage storage $ = _getAccessManagerCustomStorage();
+        address caller = _msgSender();
 
-        // // Fetch restrictions that apply to the caller on the targeted function
-        // (, uint32 setback) = _canCallExtended(caller, target, data);
+        // Fetch restrictions that apply to the caller on the targeted function
+        (, uint32 setback) = _canCallExtended(caller, target, data);
 
-        // uint48 minWhen = Time.timestamp() + setback;
+        uint48 minWhen = Time.timestamp() + setback;
 
-        // // if call with delay is not authorized, or if requested timing is too soon
-        // if (setback == 0 || (when > 0 && when < minWhen)) {
-        //     revert AccessManagerUnauthorizedCall(caller, target, _checkSelector(data));
-        // }
+        // if call with delay is not authorized, or if requested timing is too soon
+        if (setback == 0 || (when > 0 && when < minWhen)) {
+            revert AccessManagerUnauthorizedCall(caller, target, _checkSelector(data));
+        }
 
-        // // Reuse variable due to stack too deep
-        // when = uint48(Math.max(when, minWhen)); // cast is safe: both inputs are uint48
+        // Reuse variable due to stack too deep
+        when = uint48(Math.max(when, minWhen)); // cast is safe: both inputs are uint48
 
-        // // If caller is authorised, schedule operation
-        // operationId = hashOperation(caller, target, data);
+        // If caller is authorised, schedule operation
+        operationId = hashOperation(caller, target, data);
 
-        // _checkNotScheduled(operationId);
+        _checkNotScheduled(operationId);
 
-        // unchecked {
-        //     // It's not feasible to overflow the nonce in less than 1000 years
-        //     nonce = _schedules[operationId].nonce + 1;
-        // }
-        // _schedules[operationId].timepoint = when;
-        // _schedules[operationId].nonce = nonce;
-        // emit OperationScheduled(operationId, nonce, when, caller, target, data);
+        unchecked {
+            // It's not feasible to overflow the nonce in less than 1000 years
+            nonce = $._schedules[operationId].nonce + 1;
+        }
+        $._schedules[operationId].timepoint = when;
+        $._schedules[operationId].nonce = nonce;
+        emit OperationScheduled(operationId, nonce, when, caller, target, data);
 
-        // // Using named return values because otherwise we get stack too deep
+        // Using named return values because otherwise we get stack too deep
     }
 
     /**
      * @dev Reverts if the operation is currently scheduled and has not expired.
      * (Note: This function was introduced due to stack too deep errors in schedule.)
      */
-    // function _checkNotScheduled(bytes32 operationId) private view {
-    //     uint48 prevTimepoint = _schedules[operationId].timepoint;
-    //     if (prevTimepoint != 0 && !_isExpired(prevTimepoint)) {
-    //         revert AccessManagerAlreadyScheduled(operationId);
-    //     }
-    // }
-
-    /// @inheritdoc IAccessManagerSimple
+    function _checkNotScheduled(bytes32 operationId) private view {
+        AccessManagerStorage storage $ = _getAccessManagerCustomStorage();
+        uint48 prevTimepoint = $._schedules[operationId].timepoint;
+        if (prevTimepoint != 0 && !_isExpired(prevTimepoint)) {
+            revert AccessManagerAlreadyScheduled(operationId);
+        }
+    }
+
+    /// @inheritdoc IAccessManager
     // Reentrancy is not an issue because permissions are checked on msg.sender. Additionally,
     // _consumeScheduledOp guarantees a scheduled operation is only executed once.
     // slither-disable-next-line reentrancy-no-eth
     function execute(address target, bytes calldata data) public payable virtual returns (uint32) {
-        // address caller = _msgSender();
+        AccessManagerStorage storage $ = _getAccessManagerCustomStorage();
+        address caller = _msgSender();
 
-        // // Fetch restrictions that apply to the caller on the targeted function
-        // (bool immediate, uint32 setback) = _canCallExtended(caller, target, data);
+        // Fetch restrictions that apply to the caller on the targeted function
+        (bool immediate, uint32 setback) = _canCallExtended(caller, target, data);
 
-        // // If caller is not authorised, revert
-        // if (!immediate && setback == 0) {
-        //     revert AccessManagerUnauthorizedCall(caller, target, _checkSelector(data));
-        // }
+        // If caller is not authorised, revert
+        if (!immediate && setback == 0) {
+            revert AccessManagerUnauthorizedCall(caller, target, _checkSelector(data));
+        }
 
-        // bytes32 operationId = hashOperation(caller, target, data);
-        // uint32 nonce;
+        bytes32 operationId = hashOperation(caller, target, data);
+        uint32 nonce;
 
-        // // If caller is authorised, check operation was scheduled early enough
-        // // Consume an available schedule even if there is no currently enforced delay
-        // if (setback != 0 || getSchedule(operationId) != 0) {
-        //     nonce = _consumeScheduledOp(operationId);
-        // }
+        // If caller is authorised, check operation was scheduled early enough
+        // Consume an available schedule even if there is no currently enforced delay
+        if (setback != 0 || getSchedule(operationId) != 0) {
+            nonce = _consumeScheduledOp(operationId);
+        }
 
-        // // Mark the target and selector as authorised
-        // bytes32 executionIdBefore = _executionId;
-        // _executionId = _hashExecutionId(target, _checkSelector(data));
+        // Mark the target and selector as authorised
+        bytes32 executionIdBefore = $._executionId;
+        $._executionId = _hashExecutionId(target, _checkSelector(data));
 
-        // // Perform call
-        // Address.functionCallWithValue(target, data, msg.value);
+        // Perform call
+        Address.functionCallWithValue(target, data, msg.value);
 
-        // // Reset execute identifier
-        // _executionId = executionIdBefore;
+        // Reset execute identifier
+        $._executionId = executionIdBefore;
 
-        // return nonce;
+        return nonce;
     }
 
-    /// @inheritdoc IAccessManagerSimple
+    /// @inheritdoc IAccessManager
     function cancel(address caller, address target, bytes calldata data) public virtual returns (uint32) {
-        // address msgsender = _msgSender();
-        // bytes4 selector = _checkSelector(data);
+        AccessManagerStorage storage $ = _getAccessManagerCustomStorage();
+        address msgsender = _msgSender();
+        bytes4 selector = _checkSelector(data);
 
-        // bytes32 operationId = hashOperation(caller, target, data);
-        // if (_schedules[operationId].timepoint == 0) {
-        //     revert AccessManagerNotScheduled(operationId);
-        // } else if (caller != msgsender) {
-        //     // calls can only be canceled by the account that scheduled them, a global admin, or by a guardian of the required role.
-        //     (bool isAdmin, ) = hasRole(ADMIN_ROLE, msgsender);
-        //     (bool isGuardian, ) = hasRole(getRoleGuardian(getTargetFunctionRole(target, selector)), msgsender);
-        //     if (!isAdmin && !isGuardian) {
-        //         revert AccessManagerUnauthorizedCancel(msgsender, caller, target, selector);
-        //     }
-        // }
+        bytes32 operationId = hashOperation(caller, target, data);
+        if ($._schedules[operationId].timepoint == 0) {
+            revert AccessManagerNotScheduled(operationId);
+        } else if (caller != msgsender) {
+            // calls can only be canceled by the account that scheduled them, a global admin, or by a guardian of the required role.
+            (bool isAdmin, ) = hasRole(ADMIN_ROLE, msgsender);
+            (bool isGuardian, ) = hasRole(getRoleGuardian(getTargetFunctionRole(target, selector)), msgsender);
+            if (!isAdmin && !isGuardian) {
+                revert AccessManagerUnauthorizedCancel(msgsender, caller, target, selector);
+            }
+        }
 
-        // delete _schedules[operationId].timepoint; // reset the timepoint, keep the nonce
-        // uint32 nonce = _schedules[operationId].nonce;
-        // emit OperationCanceled(operationId, nonce);
+        delete $._schedules[operationId].timepoint; // reset the timepoint, keep the nonce
+        uint32 nonce = $._schedules[operationId].nonce;
+        emit OperationCanceled(operationId, nonce);
 
-        // return nonce;
+        return nonce;
     }
 
-    /// @inheritdoc IAccessManagerSimple
+    /// @inheritdoc IAccessManager
     function consumeScheduledOp(address caller, bytes calldata data) public virtual {
-        // address target = _msgSender();
-        // if (IAccessManaged(target).isConsumingScheduledOp() != IAccessManaged.isConsumingScheduledOp.selector) {
-        //     revert AccessManagerUnauthorizedConsume(target);
-        // }
-        // _consumeScheduledOp(hashOperation(caller, target, data));
-    }
-
-    // /**
-    //  * @dev Internal variant of {consumeScheduledOp} that operates on bytes32 operationId.
-    //  *
-    //  * Returns the nonce of the scheduled operation that is consumed.
-    //  */
-    // function _consumeScheduledOp(bytes32 operationId) internal virtual returns (uint32) {
-    //     uint48 timepoint = _schedules[operationId].timepoint;
-    //     uint32 nonce = _schedules[operationId].nonce;
-
-    //     if (timepoint == 0) {
-    //         revert AccessManagerNotScheduled(operationId);
-    //     } else if (timepoint > Time.timestamp()) {
-    //         revert AccessManagerNotReady(operationId);
-    //     } else if (_isExpired(timepoint)) {
-    //         revert AccessManagerExpired(operationId);
-    //     }
-
-    //     delete _schedules[operationId].timepoint; // reset the timepoint, keep the nonce
-    //     emit OperationExecuted(operationId, nonce);
-
-    //     return nonce;
-    // }
-
-    /// @inheritdoc IAccessManagerSimple
+        address target = _msgSender();
+        if (IAccessManaged(target).isConsumingScheduledOp() != IAccessManaged.isConsumingScheduledOp.selector) {
+            revert AccessManagerUnauthorizedConsume(target);
+        }
+        _consumeScheduledOp(hashOperation(caller, target, data));
+    }
+
+    /**
+     * @dev Internal variant of {consumeScheduledOp} that operates on bytes32 operationId.
+     *
+     * Returns the nonce of the scheduled operation that is consumed.
+     */
+    function _consumeScheduledOp(bytes32 operationId) internal virtual returns (uint32) {
+        AccessManagerStorage storage $ = _getAccessManagerCustomStorage();
+        uint48 timepoint = $._schedules[operationId].timepoint;
+        uint32 nonce = $._schedules[operationId].nonce;
+
+        if (timepoint == 0) {
+            revert AccessManagerNotScheduled(operationId);
+        } else if (timepoint > Time.timestamp()) {
+            revert AccessManagerNotReady(operationId);
+        } else if (_isExpired(timepoint)) {
+            revert AccessManagerExpired(operationId);
+        }
+
+        delete $._schedules[operationId].timepoint; // reset the timepoint, keep the nonce
+        emit OperationExecuted(operationId, nonce);
+
+        return nonce;
+    }
+
+    /// @inheritdoc IAccessManager
     function hashOperation(address caller, address target, bytes calldata data) public view virtual returns (bytes32) {
         return keccak256(abi.encode(caller, target, data));
     }
 
     // ==================================================== OTHERS ====================================================
-    /// @inheritdoc IAccessManagerSimple
+    /// @inheritdoc IAccessManager
     function updateAuthority(address target, address newAuthority) public virtual onlyAuthorized {
         IAccessManaged(target).setAuthority(newAuthority);
     }
@@ -539,19 +590,26 @@ contract AccessManagerSimple is Context, IAccessManagerSimple {
      * @dev Check if the current call is authorized according to admin logic.
      */
     function _checkAuthorized() private {
-        address caller = _msgSender();
+        address caller = msg.sender;//_msgSender();
         (bool immediate, uint32 delay) = _canCallSelf(caller, _msgData());
         if (!immediate) {
             if (delay == 0) {
                 (, uint64 requiredRole, ) = _getAdminRestrictions(_msgData());
                 revert AccessManagerUnauthorizedAccount(caller, requiredRole);
+            } else {
+                _consumeScheduledOp(hashOperation(caller, address(this), _msgData()));
             }
-            // else {
-            //     _consumeScheduledOp(hashOperation(caller, address(this), _msgData()));
-            // }
         }
     }
 
+    /**
+     * @dev Get the admin restrictions of a given function call based on the function and arguments involved.
+     *
+     * Returns:
+     * - bool restricted: does this data match a restricted operation
+     * - uint64: which role is this operation restricted to
+     * - uint32: minimum delay to enforce for that operation (max between operation's delay and admin's execution delay)
+     */
     /**
      * @dev Get the admin restrictions of a given function call based on the function and arguments involved.
      *
@@ -562,7 +620,7 @@ contract AccessManagerSimple is Context, IAccessManagerSimple {
      */
     function _getAdminRestrictions(
         bytes calldata data
-    ) private view returns (bool restricted, uint64 roleAdminId, uint32 executionDelay) {
+    ) internal virtual view returns (bool restricted, uint64 roleAdminId, uint32 executionDelay) {
         if (data.length < 4) {
             return (false, 0, 0);
         }
@@ -587,7 +645,7 @@ contract AccessManagerSimple is Context, IAccessManagerSimple {
             selector == this.setTargetFunctionRole.selector
         ) {
             // First argument is a target.
-            address target = abi.decode(data[0x04:0x24], (address));
+            address target = abi.decode(data[0x04:0x24], (address));// who is target???
             uint32 delay = getTargetAdminDelay(target);
             return (true, ADMIN_ROLE, delay);
         }
@@ -631,11 +689,11 @@ contract AccessManagerSimple is Context, IAccessManagerSimple {
             return (false, 0);
         }
 
-        // if (caller == address(this)) {
-        //     // Caller is AccessManager, this means the call was sent through {execute} and it already checked
-        //     // permissions. We verify that the call "identifier", which is set during {execute}, is correct.
-        //     return (_isExecuting(address(this), _checkSelector(data)), 0);
-        // }
+        if (caller == address(this)) {
+            // Caller is AccessManager, this means the call was sent through {execute} and it already checked
+            // permissions. We verify that the call "identifier", which is set during {execute}, is correct.
+            return (_isExecuting(address(this), _checkSelector(data)), 0);
+        }
 
         (bool enabled, uint64 roleId, uint32 operationDelay) = _getAdminRestrictions(data);
         if (!enabled) {
@@ -648,35 +706,36 @@ contract AccessManagerSimple is Context, IAccessManagerSimple {
         }
 
         // downcast is safe because both options are uint32
-        delay = 0; // uint32(Math.max(operationDelay, executionDelay));
+        delay = uint32(Math.max(operationDelay, executionDelay));
         return (delay == 0, delay);
     }
 
-    // /**
-    //  * @dev Returns true if a call with `target` and `selector` is being executed via {executed}.
-    //  */
-    // function _isExecuting(address target, bytes4 selector) private view returns (bool) {
-    //     return _executionId == _hashExecutionId(target, selector);
-    // }
+    /**
+     * @dev Returns true if a call with `target` and `selector` is being executed via {executed}.
+     */
+    function _isExecuting(address target, bytes4 selector) private view returns (bool) {
+        AccessManagerStorage storage $ = _getAccessManagerCustomStorage();
+        return $._executionId == _hashExecutionId(target, selector);
+    }
 
-    // /**
-    //  * @dev Returns true if a schedule timepoint is past its expiration deadline.
-    //  */
-    // function _isExpired(uint48 timepoint) private view returns (bool) {
-    //     return timepoint + expiration() <= Time.timestamp();
-    // }
+    /**
+     * @dev Returns true if a schedule timepoint is past its expiration deadline.
+     */
+    function _isExpired(uint48 timepoint) private view returns (bool) {
+        return timepoint + expiration() <= Time.timestamp();
+    }
 
     /**
      * @dev Extracts the selector from calldata. Panics if data is not at least 4 bytes
      */
-    function _checkSelector(bytes calldata data) private pure returns (bytes4) {
+    function _checkSelector(bytes calldata data) internal pure returns (bytes4) {
         return bytes4(data[0:4]);
     }
 
     /**
      * @dev Hashing function for execute protection
      */
-    // function _hashExecutionId(address target, bytes4 selector) private pure returns (bytes32) {
-    //     return keccak256(abi.encode(target, selector));
-    // }
+    function _hashExecutionId(address target, bytes4 selector) private pure returns (bytes32) {
+        return keccak256(abi.encode(target, selector));
+    }
 }