@etherisc/gif-next 0.0.2-7340474-070 → 0.0.2-742eda3-807

package/contracts/registry/ReleaseManager.sol

@@ -14,11 +14,10 @@ import {ObjectType, ObjectTypeLib, POOL, RELEASE, REGISTRY, SERVICE, STAKING} fr
 import {Version, VersionLib, VersionPart, VersionPartLib} from "../type/Version.sol";
 import {Timestamp, TimestampLib, zeroTimestamp, ltTimestamp} from "../type/Timestamp.sol";
 import {Seconds, SecondsLib} from "../type/Seconds.sol";
-import {StateId, INITIAL, SCHEDULED, DEPLOYING, ACTIVE} from "../type/StateId.sol";
+import {StateId, INITIAL, SCHEDULED, DEPLOYING, ACTIVE, PAUSED, CLOSED} from "../type/StateId.sol";
 import {Version, VersionLib, VersionPart, VersionPartLib} from "../type/Version.sol";
 
 import {IService} from "../shared/IService.sol";
-import {AccessManagerExtendedWithDisableInitializeable} from "../shared/AccessManagerExtendedWithDisableInitializeable.sol";
 import {ILifecycle} from "../shared/ILifecycle.sol";
 import {INftOwnable} from "../shared/INftOwnable.sol";
 import {IRegisterable} from "../shared/IRegisterable.sol";
@@ -26,49 +25,50 @@ import {IRegisterable} from "../shared/IRegisterable.sol";
 import {IRegistry} from "./IRegistry.sol";
 import {IRegistryLinked} from "../shared/IRegistryLinked.sol";
 import {IRegistryService} from "./IRegistryService.sol";
-import {IServiceAuthorization} from "./IServiceAuthorization.sol";
-import {IAccessAdmin} from "../shared/IAccessAdmin.sol";
+import {IServiceAuthorization} from "../authorization/IServiceAuthorization.sol";
+import {IAccessAdmin} from "../authorization/IAccessAdmin.sol";
 import {RegistryAdmin} from "./RegistryAdmin.sol";
 import {Registry} from "./Registry.sol";
 import {TokenRegistry} from "./TokenRegistry.sol";
+import {ReleaseLifecycle} from "./ReleaseLifecycle.sol";
 
-
+// TODO rename to something that does not end with 'Manager' 
+// everywhere else *Manager points to an upgradeable contract
 contract ReleaseManager is 
-    AccessManaged, 
-    ILifecycle, 
+    AccessManaged,
+    ReleaseLifecycle, 
     IRegistryLinked
 {
     using ObjectTypeLib for ObjectType;
 
     uint256 public constant INITIAL_GIF_VERSION = 3;
 
-    event LogReleaseCreation(VersionPart version, bytes32 salt, address authority); 
+    event LogReleaseCreation(VersionPart version, bytes32 salt); 
     event LogReleaseActivation(VersionPart version);
+    event LogReleaseDisabled(VersionPart version);
+    event LogReleaseEnabled(VersionPart version);
 
     // constructor
     error ErrorReleaseManagerNotRegistry(Registry registry);
 
     // createNextRelease
-    error ErrorReleaseManagerReleaseCreationDisallowed(StateId currentStateId);
+    error ErrorReleaseManagerReleaseCreationDisallowed(VersionPart version, StateId currentStateId);
 
     // prepareRelease
-    error ErrorReleaseManagerReleasePreparationDisallowed(StateId currentStateId);
-    error ErrorReleaseManagerReleaseAlreadyPrepared(VersionPart version);
-    error ErrorReleaseManagerVersionMismatch(VersionPart expectedVersion, VersionPart providedVersion);
+    error ErrorReleaseManagerReleasePreparationDisallowed(VersionPart version, StateId currentStateId);
+    error ErrorReleaseManagerReleaseAlreadyPrepared(VersionPart version, StateId currentStateId);
+    error ErrorReleaseManagerVersionMismatch(VersionPart expected, VersionPart actual);
     error ErrorReleaseManagerNoDomains(VersionPart version);
 
-    // register staking
-    //error ErrorReleaseManagerStakingAlreadySet(address stakingAddress);
-
     // registerService
     error ErrorReleaseManagerNoServiceRegistrationExpected();
     error ErrorReleaseManagerServiceRegistrationDisallowed(StateId currentStateId);
     error ErrorReleaseManagerServiceDomainMismatch(ObjectType expectedDomain, ObjectType actualDomain);
-    error ErrorReleaseManagerNotService(IService service);
-    error ErrorReleaseManagerServiceAddressInvalid(IService given, address expected);
+    error ErrorReleaseManagerNotService(address notService);
+    error ErrorReleaseManagerServiceAddressMismatch(address expected, address actual);
 
     // activateNextRelease
-    error ErrorReleaseManagerReleaseActivationDisallowed(StateId currentStateId);
+    error ErrorReleaseManagerReleaseActivationDisallowed(VersionPart releaseVersion, StateId currentStateId);
     error ErrorReleaseManagerReleaseNotCreated(VersionPart releaseVersion);
     error ErrorReleaseManagerReleaseRegistrationNotFinished(VersionPart releaseVersion, uint awaitingRegistration);
     error ErrorReleaseManagerReleaseAlreadyActivated(VersionPart releaseVersion);
@@ -92,27 +92,24 @@ contract ReleaseManager is
     Seconds public constant MIN_DISABLE_DELAY = Seconds.wrap(60 * 24 * 365); // 1 year
 
     RegistryAdmin public immutable _admin;
-    address public immutable _releaseAccessManagerCodeAddress;
     Registry public immutable _registry;
     IRegisterable private _staking;
     address private _stakingOwner;
 
-    // TODO remove once it's clear that release authority will always be registry authority
-    mapping(VersionPart version => address authority) internal _releaseAccessManager;
     mapping(VersionPart version => IRegistry.ReleaseInfo info) internal _releaseInfo;
-    mapping(address registryService => VersionPart version) _releaseVersionByAddress;
-
     mapping(VersionPart version => IServiceAuthorization authz) internal _serviceAuthorization;
 
-    VersionPart immutable internal _initial;// first active version    
+    // TODO check where/why this is used
+    mapping(address registryService => VersionPart version) _releaseVersionByAddress;
+
+    VersionPart private _initial;// first active version    
     VersionPart internal _latest; // latest active version
     VersionPart internal _next; // version to create and activate 
-    StateId internal _state; // current state of release manager
+    mapping(VersionPart verson => StateId releaseState) private _state;
 
     uint256 internal _registeredServices;
     uint256 internal _servicesToRegister;
 
-    // deployer of this contract must be gif admin
     constructor(Registry registry)
         AccessManaged(msg.sender)
     {
@@ -121,35 +118,26 @@ contract ReleaseManager is
             revert ErrorReleaseManagerNotRegistry(registry);
         }
 
+        setAuthority(registry.getAuthority());
+
         _registry = registry;
-        setAuthority(_registry.getAuthority());
         _admin = RegistryAdmin(_registry.getRegistryAdminAddress());
 
         _initial = VersionPartLib.toVersionPart(INITIAL_GIF_VERSION);
         _next = VersionPartLib.toVersionPart(INITIAL_GIF_VERSION - 1);
-        _state = getInitialState(RELEASE());
-        
-        AccessManagerExtendedWithDisableInitializeable masterReleaseAccessManager = new AccessManagerExtendedWithDisableInitializeable();
-        masterReleaseAccessManager.initialize(_registry.NFT_LOCK_ADDRESS(), VersionLib.toVersionPart(0));
-        //masterReleaseAccessManager.disable();
-        _releaseAccessManagerCodeAddress = address(masterReleaseAccessManager);
     }
 
     /// @dev skips previous release if was not activated
-    /// sets release manager into state SCHEDULED
+    /// sets next release into state SCHEDULED
     function createNextRelease()
         external
         restricted() // GIF_ADMIN_ROLE
         returns(VersionPart)
     {
-        if (!isValidTransition(RELEASE(), _state, SCHEDULED())) {
-            revert ErrorReleaseManagerReleaseCreationDisallowed(_state);
-        }
-
         _next = VersionPartLib.toVersionPart(_next.toInt() + 1);
         _servicesToRegister = 0;
         _registeredServices = 0;
-        _state = SCHEDULED();
+        _state[_next] = getInitialState(RELEASE());
 
         return _next;
     }
@@ -166,103 +154,98 @@ contract ReleaseManager is
             bytes32 releaseSalt
         )
     {
-        // TODO Any call to serviceAuthorization contract must be treated as a call to an external malicious contract
-        // How can wrong authorizations tamper the core, releases or instances?
-        (
-            VersionPart releaseVersion,
-            uint serviceDomainsCount
-        ) = serviceAuthorization.getRelease();
+        authority = _admin.authority();
+        version = _next;
+
+        // ensures unique salt
+        // TODO CreateX have clones capability also
+        // what would releaseSalt look like if used with CreateX in pemissioned mode?
+        releaseSalt = keccak256(
+            bytes.concat(
+                bytes32(version.toInt()),
+                salt));
+
+        // verify release in state SCHEDULED
+        if (!isValidTransition(RELEASE(), _state[version], DEPLOYING())) {
+            revert ErrorReleaseManagerReleasePreparationDisallowed(version, _state[version]);
+        }
+
+        _state[version] = DEPLOYING();
 
         // verify authorizaion contract release matches with expected version
-        if (releaseVersion != _next) {
-            revert ErrorReleaseManagerVersionMismatch(_next, releaseVersion);
+        VersionPart releaseVersion = serviceAuthorization.getRelease();
+        if (releaseVersion != version) {
+            revert ErrorReleaseManagerVersionMismatch(version, releaseVersion);
         }
 
+
         // sanity check to ensure service domain list is not empty
+        uint256 serviceDomainsCount = serviceAuthorization.getServiceDomains().length;
         if (serviceDomainsCount == 0) {
-            revert ErrorReleaseManagerNoDomains(_next);
-        }
-
-        // verify release manager is in proper state to start deploying a next release
-        if (!isValidTransition(RELEASE(), _state, DEPLOYING())) {
-            revert ErrorReleaseManagerReleasePreparationDisallowed(_state);
+            revert ErrorReleaseManagerNoDomains(version);
         }
 
         // verify prepareNextRelease is only called once per release
         if(_servicesToRegister > 0) {
-            revert ErrorReleaseManagerReleaseAlreadyPrepared(version);
+            revert ErrorReleaseManagerReleaseAlreadyPrepared(version, _state[version]);
         }
 
-        // store release specific service authorization
-        _serviceAuthorization[_next] = serviceAuthorization;
-
-        // ensures unique salt
-        releaseSalt = keccak256(
-            bytes.concat(
-                bytes32(version.toInt()),
-                salt));
-
-        authority = _admin.authority();
-
-        _releaseAccessManager[_next] = authority;
         _servicesToRegister = serviceDomainsCount;
+        _serviceAuthorization[version] = serviceAuthorization;
 
-        _state = DEPLOYING();
-
-        emit LogReleaseCreation(version, releaseSalt, authority);
+        emit LogReleaseCreation(version, releaseSalt);
     }
 
-
+    // TODO this function can have 0 args -> use stored addresses from prepareNextRelease()
     function registerService(IService service) 
         external
         restricted // GIF_MANAGER_ROLE
         returns(NftId nftId)
     {
-        // TODO is it usefull to check transition from A to A?
-        if (!isValidTransition(RELEASE(), _state, DEPLOYING())) {
-            revert ErrorReleaseManagerServiceRegistrationDisallowed(_state);
+        VersionPart releaseVersion = _next;
+        StateId state = _state[releaseVersion];
+
+        // verify release in state DEPLOYING
+        if (!isValidTransition(RELEASE(), state, DEPLOYING())) {
+            // TOOD name must represent failed state transition
+            revert ErrorReleaseManagerServiceRegistrationDisallowed(state);
         }
 
+        _state[releaseVersion] = DEPLOYING();
+
+        // not all services are registered
         if (_servicesToRegister == _registeredServices) {
             revert ErrorReleaseManagerNoServiceRegistrationExpected();
         }
 
+        // service can work with release manager
         (
             IRegistry.ObjectInfo memory info,
-            ObjectType domain,
-            VersionPart version
+            ObjectType serviceDomain,
+            VersionPart serviceVersion
         ) = _verifyService(service);
 
-        ObjectType expectedDomain = _serviceAuthorization[version].getServiceDomains()[_registeredServices];
-        if (service.getDomain() != expectedDomain) {
-            revert ErrorReleaseManagerServiceDomainMismatch(expectedDomain, service.getDomain());
+        // service domain matches defined in release config
+        ObjectType expectedDomain = _serviceAuthorization[releaseVersion].getServiceDomain(_registeredServices);
+        if (serviceDomain != expectedDomain) {
+            revert ErrorReleaseManagerServiceDomainMismatch(expectedDomain, serviceDomain);
         }
 
-        // checked in registry
-        _releaseInfo[version].domains.push(domain);
-
         // register service with registry
-        nftId = _registry.registerService(info, version, domain);
-        _registeredServices++;
-
+        nftId = _registry.registerService(info, serviceVersion, serviceDomain);
         service.linkToRegisteredNftId();
+        _registeredServices++;
 
         // setup service authorization
         _admin.authorizeService(
-            _serviceAuthorization[version], 
+            _serviceAuthorization[releaseVersion], 
             service);
 
         // TODO consider to extend this to REGISTRY
         // special roles for registry/staking/pool service
-        if (domain == STAKING() || domain == POOL()) {
+        if (serviceDomain == STAKING() || serviceDomain == POOL()) {
             // TODO rename to grantServiceDomainRole()
-            _admin.grantServiceRoleForAllVersions(service, domain);
-        }
-
-        if (_registeredServices < _servicesToRegister) {
-            _state = DEPLOYING();
-        } else {
-            // TODO end state depends on (_awaitingRegistration == 0)
+            _admin.grantServiceRoleForAllVersions(service, serviceDomain);
         }
     }
 
@@ -271,12 +254,16 @@ contract ReleaseManager is
         external 
         restricted // GIF_ADMIN_ROLE
     {
-        if (!isValidTransition(RELEASE(), _state, ACTIVE())) {
-            revert ErrorReleaseManagerReleaseActivationDisallowed(_state);
+        VersionPart version = _next;
+        StateId state = _state[version];
+        StateId newState = ACTIVE();
+
+        // verify release in state DEPLOYING
+        if (!isValidTransition(RELEASE(), state, newState)) {
+            revert ErrorReleaseManagerReleaseActivationDisallowed(version, state);
         }
 
         // release fully deployed
-        VersionPart version = _next;
         if(_registeredServices < _servicesToRegister) {
             revert ErrorReleaseManagerReleaseRegistrationNotFinished(version, _servicesToRegister - _registeredServices);
         }
@@ -287,13 +274,8 @@ contract ReleaseManager is
             revert ErrorReleaseManagerReleaseNotCreated(version);
         }
 
-        // release is not activated
-        if(_releaseInfo[version].activatedAt.gtz()) {
-            revert ErrorReleaseManagerReleaseAlreadyActivated(version);
-        }
-
         _latest = version;
-        _state = ACTIVE();
+        _state[version] = newState;
 
         _releaseVersionByAddress[service] = version;
         _releaseInfo[version].activatedAt = TimestampLib.blockTimestamp();
@@ -301,43 +283,49 @@ contract ReleaseManager is
         emit LogReleaseActivation(version);
     }
 
-    // release becomes disabled after delay expiration (can be reenabled before that)
-    function disableRelease(VersionPart version, Seconds disableDelay)
+    /// @dev stop all operations with release services
+    function pauseRelease(VersionPart version)
         external
         restricted // GIF_ADMIN_ROLE
     {
-        // release was activated
-        if(_releaseInfo[version].activatedAt.eqz()) {
-            revert ErrorReleaseManagerReleaseNotActivated(version);
-        }
+        StateId state = _state[version];
+        StateId newState = PAUSED();
 
-        // release not disabled already
-        if(_releaseInfo[version].disabledAt.gtz()) {
-            revert ErrorReleaseManagerReleaseAlreadyDisabled(version);
+        // verify release in state ACTIVE
+        if (!isValidTransition(RELEASE(), state, newState)) {
+            revert ErrorReleaseManagerReleaseActivationDisallowed(version, state);
         }
 
-        disableDelay = SecondsLib.toSeconds(Math.max(disableDelay.toInt(), MIN_DISABLE_DELAY.toInt()));
-
         // TODO come up with a substitute
-        // _releaseAccessManager[version].disable(disableDelay);
+        //_releaseAccessManager[version].disable();
+
+        _state[version] = newState;
+        _releaseInfo[version].disabledAt = TimestampLib.blockTimestamp();
 
-        _releaseInfo[version].disabledAt = TimestampLib.blockTimestamp().addSeconds(disableDelay);
+        emit LogReleaseDisabled(version);
     }
-    
-    function enableRelease(VersionPart version)
+
+    // TODO consider revert if some delay is expired -> becomes disabled automatically
+    /// @dev resume operations with release services
+    function unpauseRelease(VersionPart version)
         external
         restricted // GIF_ADMIN_ROLE
     {
-        // release was disabled
-        //if(_releaseInfo[version].disabledAt.eqz()) {
-        //    revert ErrorReleaseManagerReleaseAlreadyEnabled(version);
-        //}
+        StateId state = _state[version];
+        StateId newState = ACTIVE();
+
+        // verify release in state PAUSED
+        if (!isValidTransition(RELEASE(), state, newState)) {
+            revert ErrorReleaseManagerReleaseActivationDisallowed(version, state);
+        }
 
-        // reverts if disable delay expired
         // TODO come up with a substitute
         // _releaseAccessManager[version].enable();
         
+        _state[version] = newState;
         _releaseInfo[version].disabledAt = zeroTimestamp();
+
+        emit LogReleaseEnabled(version);
     }
 
     //--- view functions ----------------------------------------------------//
@@ -356,7 +344,7 @@ contract ReleaseManager is
     }
 
     function isActiveRelease(VersionPart version) public view returns(bool) {
-        return _releaseInfo[version].activatedAt.gtz();
+        return _state[version] == ACTIVE();
     }
 
     function getReleaseInfo(VersionPart version) external view returns(IRegistry.ReleaseInfo memory) {
@@ -375,20 +363,22 @@ contract ReleaseManager is
         return _initial;
     }
 
-    function getState() external view returns (StateId stateId) {
-        return _state;
+    function getState(VersionPart version) external view returns (StateId stateId) {
+        return _state[version];
     }
 
     function getRemainingServicesToRegister() external view returns (uint256 services) {
         return _servicesToRegister - _registeredServices;
     }
 
-    // TODO cleanup
-    function getReleaseAccessManager(VersionPart version) external view returns(AccessManagerExtendedWithDisableInitializeable) {
-        // return _releaseAccessManager[version];
+    function getServiceAuthorization(VersionPart version)
+        external
+        view
+        returns (IServiceAuthorization serviceAuthorization)
+    {
+        return _serviceAuthorization[version];
     }
 
-    // TODO token registry knows nothing about adfmin, only registry
     function getRegistryAdmin() external view returns (address) {
         return address(_admin);
     }
@@ -399,37 +389,6 @@ contract ReleaseManager is
         return _registry;
     }
 
-    //--- ILifecycle -----------------------------------------------------------//
-
-    function hasLifecycle(ObjectType objectType) external pure returns (bool) { return objectType == RELEASE(); }
-
-    function getInitialState(ObjectType objectType) public pure returns (StateId stateId) { 
-        if (objectType == RELEASE()) {
-            stateId = INITIAL();
-        }
-    }
-
-    function isValidTransition(
-        ObjectType objectType,
-        StateId fromId,
-        StateId toId
-    )
-        public 
-        pure 
-        returns (bool isValid)
-    {
-        if (objectType != RELEASE()) { return false; }
-
-        if (fromId == INITIAL() && toId == SCHEDULED()) { return true; }
-        if (fromId == SCHEDULED() && toId == DEPLOYING()) { return true; }
-        if (fromId == DEPLOYING() && toId == SCHEDULED()) { return true; }
-        if (fromId == DEPLOYING() && toId == DEPLOYING()) { return true; }
-        if (fromId == DEPLOYING() && toId == ACTIVE()) { return true; }
-        // TODO active -> scheduled missing, add tests to cover this and more scenarios (#358)
-
-        return false;
-    }
-
     //--- private functions ----------------------------------------------------//
 
     function _verifyService(IService service)
@@ -442,7 +401,7 @@ contract ReleaseManager is
         )
     {
         if(!service.supportsInterface(type(IService).interfaceId)) {
-            revert ErrorReleaseManagerNotService(service);
+            revert ErrorReleaseManagerNotService(address(service));
         }
 
         address owner = msg.sender;
@@ -453,15 +412,15 @@ contract ReleaseManager is
 
         _verifyServiceInfo(service, serviceInfo, owner);
 
-        VersionPart releaseVersion = getNextVersion(); // never 0
-        address releaseAuthority = address(_releaseAccessManager[releaseVersion]); // can be zero if registering service when release is not created
+        VersionPart releaseVersion = _next; // never 0
+        address expectedAuthority = _admin.authority(); // can be zero if registering service when release is not created
 
         // IMPORTANT: can not guarantee service access is actually controlled by authority
-        if(serviceAuthority != releaseAuthority) {
+        if(serviceAuthority != expectedAuthority) {
             revert ErrorReleaseManagerServiceReleaseAuthorityMismatch(
                 service,
                 serviceAuthority,
-                releaseAuthority);
+                expectedAuthority);
         }
 
         if(serviceVersion != releaseVersion) {
@@ -489,7 +448,7 @@ contract ReleaseManager is
             revert ErrorReleaseManagerServiceInfoInterceptorInvalid(service, info.isInterceptor);
         }
 
-        if(info.objectType != SERVICE()) {// type is checked in registry anyway...but service logic may depend on expected value
+        if(info.objectType != SERVICE()) {
             revert ErrorReleaseManagerServiceInfoTypeInvalid(service, SERVICE(), info.objectType);
         }
 
@@ -516,7 +475,7 @@ contract ReleaseManager is
             return false;
         }
         // TODO try catch and return false in case of revert
-        // a just panic
+        // or just panic
         // check if contract returns a zero nft id for its own address
         if (IRegistry(registryAddress).getNftId(registryAddress).eqz()) {
             return false;
@@ -525,3 +484,4 @@ contract ReleaseManager is
         return true;
     }
 }
+

package/contracts/registry/ServiceAuthorizationV3.sol

@@ -6,7 +6,7 @@ import {
 } from "../../contracts/type/ObjectType.sol";
 
 import {ComponentService} from "../shared/ComponentService.sol";
-import {IAccessAdmin} from "../shared/IAccessAdmin.sol";
+import {IAccess} from "../authorization/IAccess.sol";
 import {IBundleService} from "../pool/IBundleService.sol";
 import {IDistributionService} from "../distribution/IDistributionService.sol";
 import {InstanceService} from "../instance/InstanceService.sol";
@@ -14,7 +14,7 @@ import {IInstanceService} from "../instance/IInstanceService.sol";
 import {IPoolService} from "../pool/IPoolService.sol";
 import {IStakingService} from "../staking/IStakingService.sol";
 import {IRegistryService} from "./IRegistryService.sol";
-import {ServiceAuthorization} from "./ServiceAuthorization.sol";
+import {ServiceAuthorization} from "../authorization/ServiceAuthorization.sol";
 
 
 contract ServiceAuthorizationV3
@@ -64,7 +64,7 @@ contract ServiceAuthorizationV3
      function _setupIRegistryServiceAuthorization()
           internal
      {
-          IAccessAdmin.Function[] storage functions;
+          IAccess.FunctionInfo[] storage functions;
 
           functions = _authorizeForService(REGISTRY(), APPLICATION());
           _authorize(functions, IRegistryService.registerPolicy.selector, "registerPolicy");
@@ -98,7 +98,7 @@ contract ServiceAuthorizationV3
      function _setupStakingServiceAuthorization()
           internal
      {
-          IAccessAdmin.Function[] storage functions;
+          IAccess.FunctionInfo[] storage functions;
 
           functions = _authorizeForService(STAKING(), INSTANCE());
           _authorize(functions, IStakingService.createInstanceTarget.selector, "createInstanceTarget");
@@ -121,10 +121,10 @@ contract ServiceAuthorizationV3
      function _setupInstanceServiceAuthorization()
           internal
      {
-          IAccessAdmin.Function[] storage functions;
+          IAccess.FunctionInfo[] storage functions;
 
           functions = _authorizeForService(INSTANCE(), COMPONENT());
-          _authorize(functions, IInstanceService.createComponentTarget.selector, "createComponentTarget");
+          _authorize(functions, IInstanceService.initializeAuthorization.selector, "initializeAuthorization");
      }
 
 
@@ -159,7 +159,7 @@ contract ServiceAuthorizationV3
      function _setupDistributionServiceAuthorization()
           internal
      {
-          IAccessAdmin.Function[] storage functions;
+          IAccess.FunctionInfo[] storage functions;
 
           functions = _authorizeForService(DISTRIBUTION(), POLICY());
           _authorize(functions, IDistributionService.processSale.selector, "processSale");
@@ -170,7 +170,7 @@ contract ServiceAuthorizationV3
      function _setupPoolServiceAuthorization()
           internal
      {
-          IAccessAdmin.Function[] storage functions;
+          IAccess.FunctionInfo[] storage functions;
 
           functions = _authorizeForService(POOL(), POLICY());
           _authorize(functions, IPoolService.lockCollateral.selector, "lockCollateral");
@@ -187,7 +187,7 @@ contract ServiceAuthorizationV3
      function _setupBundleServiceAuthorization()
           internal
      {
-          IAccessAdmin.Function[] storage functions;
+          IAccess.FunctionInfo[] storage functions;
 
           functions = _authorizeForService(BUNDLE(), POOL());
           _authorize(functions, IBundleService.create.selector, "create");