@etherisc/gif-next 0.0.2-edd8f00-238 → 0.0.2-ee0f913-209

package/contracts/registry/ReleaseManager.sol

@@ -14,7 +14,7 @@ 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, PAUSED, CLOSED} from "../type/StateId.sol";
+import {StateId, INITIAL, SCHEDULED, DEPLOYING, ACTIVE} from "../type/StateId.sol";
 import {Version, VersionLib, VersionPart, VersionPartLib} from "../type/Version.sol";
 
 import {IService} from "../shared/IService.sol";
@@ -31,12 +31,11 @@ import {IAccessAdmin} from "../shared/IAccessAdmin.sol";
 import {RegistryAdmin} from "./RegistryAdmin.sol";
 import {Registry} from "./Registry.sol";
 import {TokenRegistry} from "./TokenRegistry.sol";
-import {ReleaseLifecycle} from "./ReleaseLifecycle.sol";
 
 
 contract ReleaseManager is 
-    AccessManaged,
-    ReleaseLifecycle, 
+    AccessManaged, 
+    ILifecycle, 
     IRegistryLinked
 {
     using ObjectTypeLib for ObjectType;
@@ -45,31 +44,31 @@ contract ReleaseManager is
 
     event LogReleaseCreation(VersionPart version, bytes32 salt, address authority); 
     event LogReleaseActivation(VersionPart version);
-    event LogReleaseDisabled(VersionPart version);
-    event LogReleaseEnabled(VersionPart version);
-    event LogReleaseClosed(VersionPart version);
 
     // constructor
     error ErrorReleaseManagerNotRegistry(Registry registry);
 
     // createNextRelease
-    error ErrorReleaseManagerReleaseCreationDisallowed(VersionPart version, StateId currentStateId);
+    error ErrorReleaseManagerReleaseCreationDisallowed(StateId currentStateId);
 
     // prepareRelease
-    error ErrorReleaseManagerReleasePreparationDisallowed(VersionPart version, StateId currentStateId);
-    error ErrorReleaseManagerReleaseAlreadyPrepared(VersionPart version, StateId currentStateId);
-    error ErrorReleaseManagerVersionMismatch(VersionPart expected, VersionPart actual);
+    error ErrorReleaseManagerReleasePreparationDisallowed(StateId currentStateId);
+    error ErrorReleaseManagerReleaseAlreadyPrepared(VersionPart version);
+    error ErrorReleaseManagerVersionMismatch(VersionPart expectedVersion, VersionPart providedVersion);
     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(address notService);
-    error ErrorReleaseManagerServiceAddressMismatch(address expected, address actual);
+    error ErrorReleaseManagerNotService(IService service);
+    error ErrorReleaseManagerServiceAddressInvalid(IService given, address expected);
 
     // activateNextRelease
-    error ErrorReleaseManagerReleaseActivationDisallowed(VersionPart releaseVersion, StateId currentStateId);
+    error ErrorReleaseManagerReleaseActivationDisallowed(StateId currentStateId);
     error ErrorReleaseManagerReleaseNotCreated(VersionPart releaseVersion);
     error ErrorReleaseManagerReleaseRegistrationNotFinished(VersionPart releaseVersion, uint awaitingRegistration);
     error ErrorReleaseManagerReleaseAlreadyActivated(VersionPart releaseVersion);
@@ -92,9 +91,11 @@ contract ReleaseManager is
 
     Seconds public constant MIN_DISABLE_DELAY = Seconds.wrap(60 * 24 * 365); // 1 year
 
-    RegistryAdmin private _admin;
-    address public _releaseAccessManagerCodeAddress;
-    Registry private _registry;
+    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;
@@ -103,14 +104,15 @@ contract ReleaseManager is
 
     mapping(VersionPart version => IServiceAuthorization authz) internal _serviceAuthorization;
 
-    VersionPart private _initial;// first active version    
+    VersionPart immutable internal _initial;// first active version    
     VersionPart internal _latest; // latest active version
     VersionPart internal _next; // version to create and activate 
-    mapping(VersionPart verson => StateId releaseState) private _state;
+    StateId internal _state; // current state of release manager
 
     uint256 internal _registeredServices;
     uint256 internal _servicesToRegister;
 
+    // deployer of this contract must be gif admin
     constructor(Registry registry)
         AccessManaged(msg.sender)
     {
@@ -119,31 +121,35 @@ 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);
-
-        //AccessManagerExtendedWithDisableInitializeable masterReleaseAccessManager = new AccessManagerExtendedWithDisableInitializeable();
-        //masterReleaseAccessManager.initialize(address(this));
-          //masterReleaseAccessManager.disable();
-        //_releaseAccessManagerCodeAddress = address(masterReleaseAccessManager);
+        _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 next release into state SCHEDULED
+    /// sets release manager 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[_next] = getInitialState(RELEASE());
+        _state = SCHEDULED();
 
         return _next;
     }
@@ -160,6 +166,8 @@ 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
@@ -175,99 +183,87 @@ contract ReleaseManager is
             revert ErrorReleaseManagerNoDomains(_next);
         }
 
-        version = _next;
-        StateId state = _state[version];
-        StateId newState = DEPLOYING();
-
-        // verify release in state SCHEDULED
-        if (!isValidTransition(RELEASE(), state, newState)) {
-            revert ErrorReleaseManagerReleasePreparationDisallowed(version, state);
+        // verify release manager is in proper state to start deploying a next release
+        if (!isValidTransition(RELEASE(), _state, DEPLOYING())) {
+            revert ErrorReleaseManagerReleasePreparationDisallowed(_state);
         }
 
         // verify prepareNextRelease is only called once per release
         if(_servicesToRegister > 0) {
-            revert ErrorReleaseManagerReleaseAlreadyPrepared(version, state);
+            revert ErrorReleaseManagerReleaseAlreadyPrepared(version);
         }
 
+        // store release specific service authorization
+        _serviceAuthorization[_next] = serviceAuthorization;
+
         // 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));
 
         authority = _admin.authority();
-        _serviceAuthorization[_next] = serviceAuthorization;
+
         _releaseAccessManager[_next] = authority;
         _servicesToRegister = serviceDomainsCount;
-        _state[version] = newState;
+
+        _state = DEPLOYING();
 
         emit LogReleaseCreation(version, releaseSalt, authority);
     }
 
-    // TODO this function can have 0 args -> use stored addresses from prepareNextRelease()
+
     function registerService(IService service) 
         external
         restricted // GIF_MANAGER_ROLE
         returns(NftId nftId)
     {
-        VersionPart releaseVersion = _next;
-        StateId state = _state[releaseVersion];
-        StateId newState = DEPLOYING();
-
-        // verify release in state DEPLOYING
-        if (!isValidTransition(RELEASE(), state, newState)) {
-            // TOOD name must represent failed state transition
-            revert ErrorReleaseManagerServiceRegistrationDisallowed(state);
+        // TODO is it usefull to check transition from A to A?
+        if (!isValidTransition(RELEASE(), _state, DEPLOYING())) {
+            revert ErrorReleaseManagerServiceRegistrationDisallowed(_state);
         }
 
-        // not all services are registered
         if (_servicesToRegister == _registeredServices) {
             revert ErrorReleaseManagerNoServiceRegistrationExpected();
         }
 
-        // service can work with release manager
         (
             IRegistry.ObjectInfo memory info,
-            ObjectType serviceDomain,
-            VersionPart serviceVersion
+            ObjectType domain,
+            VersionPart version
         ) = _verifyService(service);
 
-        // service domain matches defined in release config
-        ObjectType expectedDomain = _serviceAuthorization[releaseVersion].getServiceDomain(_registeredServices);
-        if (serviceDomain != expectedDomain) {
-            revert ErrorReleaseManagerServiceDomainMismatch(expectedDomain, serviceDomain);
+        ObjectType expectedDomain = _serviceAuthorization[version].getServiceDomains()[_registeredServices];
+        if (service.getDomain() != expectedDomain) {
+            revert ErrorReleaseManagerServiceDomainMismatch(expectedDomain, service.getDomain());
         }
 
-        // TODO uncomment when release addresses calculations are ready
-        // service address matches defined in release config
-        /*address expectedAddress = _serviceAuthorization[releaseVersion].getServiceAddress(expectedDomain);
-        if(address(service) != expectedAddress) {
-            //revert ErrorReleaseManagerServiceAddressMismatch(expectedAddress, address(service));
-        }*/
-
         // checked in registry
-        _releaseInfo[releaseVersion].domains.push(serviceDomain);
+        _releaseInfo[version].domains.push(domain);
 
-        _state[releaseVersion] = newState;
+        // register service with registry
+        nftId = _registry.registerService(info, version, domain);
         _registeredServices++;
 
+        service.linkToRegisteredNftId();
+
         // setup service authorization
         _admin.authorizeService(
-            _serviceAuthorization[releaseVersion], 
+            _serviceAuthorization[version], 
             service);
 
         // TODO consider to extend this to REGISTRY
         // special roles for registry/staking/pool service
-        if (serviceDomain == STAKING() || serviceDomain == POOL()) {
+        if (domain == STAKING() || domain == POOL()) {
             // TODO rename to grantServiceDomainRole()
-            _admin.grantServiceRoleForAllVersions(service, serviceDomain);
+            _admin.grantServiceRoleForAllVersions(service, domain);
         }
 
-        // register service with registry
-        nftId = _registry.registerService(info, serviceVersion, serviceDomain);
-        service.linkToRegisteredNftId();
+        if (_registeredServices < _servicesToRegister) {
+            _state = DEPLOYING();
+        } else {
+            // TODO end state depends on (_awaitingRegistration == 0)
+        }
     }
 
 
@@ -275,16 +271,12 @@ contract ReleaseManager is
         external 
         restricted // GIF_ADMIN_ROLE
     {
-        VersionPart version = _next;
-        StateId state = _state[version];
-        StateId newState = ACTIVE();
-
-        // verify release in state DEPLOYING
-        if (!isValidTransition(RELEASE(), state, newState)) {
-            revert ErrorReleaseManagerReleaseActivationDisallowed(version, state);
+        if (!isValidTransition(RELEASE(), _state, ACTIVE())) {
+            revert ErrorReleaseManagerReleaseActivationDisallowed(_state);
         }
 
         // release fully deployed
+        VersionPart version = _next;
         if(_registeredServices < _servicesToRegister) {
             revert ErrorReleaseManagerReleaseRegistrationNotFinished(version, _servicesToRegister - _registeredServices);
         }
@@ -295,8 +287,13 @@ contract ReleaseManager is
             revert ErrorReleaseManagerReleaseNotCreated(version);
         }
 
+        // release is not activated
+        if(_releaseInfo[version].activatedAt.gtz()) {
+            revert ErrorReleaseManagerReleaseAlreadyActivated(version);
+        }
+
         _latest = version;
-        _state[version] = newState;
+        _state = ACTIVE();
 
         _releaseVersionByAddress[service] = version;
         _releaseInfo[version].activatedAt = TimestampLib.blockTimestamp();
@@ -304,66 +301,43 @@ contract ReleaseManager is
         emit LogReleaseActivation(version);
     }
 
-    /// @dev stop all operations with release services
-    function pauseRelease(VersionPart version)
+    // release becomes disabled after delay expiration (can be reenabled before that)
+    function disableRelease(VersionPart version, Seconds disableDelay)
         external
         restricted // GIF_ADMIN_ROLE
     {
-        StateId state = _state[version];
-        StateId newState = PAUSED();
+        // release was activated
+        if(_releaseInfo[version].activatedAt.eqz()) {
+            revert ErrorReleaseManagerReleaseNotActivated(version);
+        }
 
-        // verify release in state ACTIVE
-        if (!isValidTransition(RELEASE(), state, newState)) {
-            revert ErrorReleaseManagerReleaseActivationDisallowed(version, state);
+        // release not disabled already
+        if(_releaseInfo[version].disabledAt.gtz()) {
+            revert ErrorReleaseManagerReleaseAlreadyDisabled(version);
         }
 
-        // TODO come up with a substitute
-        //_releaseAccessManager[version].disable();
+        disableDelay = SecondsLib.toSeconds(Math.max(disableDelay.toInt(), MIN_DISABLE_DELAY.toInt()));
 
-        _state[version] = newState;
-        _releaseInfo[version].disabledAt = TimestampLib.blockTimestamp();
+        // TODO come up with a substitute
+        // _releaseAccessManager[version].disable(disableDelay);
 
-        emit LogReleaseDisabled(version);
+        _releaseInfo[version].disabledAt = TimestampLib.blockTimestamp().addSeconds(disableDelay);
     }
-
-    // TODO consider revert if some delay is expired -> becomes disabled automatically
-    /// @dev resume operations with release services
-    function unpauseRelease(VersionPart version)
+    
+    function enableRelease(VersionPart version)
         external
         restricted // GIF_ADMIN_ROLE
     {
-        StateId state = _state[version];
-        StateId newState = ACTIVE();
-
-        // verify release in state PAUSED
-        if (!isValidTransition(RELEASE(), state, newState)) {
-            revert ErrorReleaseManagerReleaseActivationDisallowed(version, state);
-        }
+        // release was disabled
+        //if(_releaseInfo[version].disabledAt.eqz()) {
+        //    revert ErrorReleaseManagerReleaseAlreadyEnabled(version);
+        //}
 
+        // reverts if disable delay expired
         // TODO come up with a substitute
         // _releaseAccessManager[version].enable();
         
-        _state[version] = newState;
         _releaseInfo[version].disabledAt = zeroTimestamp();
-
-        emit LogReleaseEnabled(version);
-    }
-    /// @dev permanently disable release
-    function closeRelease(VersionPart version) 
-        external
-        restricted // GIF_ADMIN_ROLE
-    {
-        StateId state = _state[version];
-        StateId newState = CLOSED();
-
-        // verify release in state PAUSED
-        if (!isValidTransition(RELEASE(), state, newState)) {
-            revert ErrorReleaseManagerReleaseActivationDisallowed(version, state);
-        }
-
-        _state[version] = newState;
-
-        emit LogReleaseClosed(version);
     }
 
     //--- view functions ----------------------------------------------------//
@@ -401,8 +375,8 @@ contract ReleaseManager is
         return _initial;
     }
 
-    function getState(VersionPart version) external view returns (StateId stateId) {
-        return _state[version];
+    function getState() external view returns (StateId stateId) {
+        return _state;
     }
 
     function getRemainingServicesToRegister() external view returns (uint256 services) {
@@ -425,6 +399,37 @@ 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)
@@ -437,7 +442,7 @@ contract ReleaseManager is
         )
     {
         if(!service.supportsInterface(type(IService).interfaceId)) {
-            revert ErrorReleaseManagerNotService(address(service));
+            revert ErrorReleaseManagerNotService(service);
         }
 
         address owner = msg.sender;
@@ -448,7 +453,7 @@ contract ReleaseManager is
 
         _verifyServiceInfo(service, serviceInfo, owner);
 
-        VersionPart releaseVersion = _next; // never 0
+        VersionPart releaseVersion = getNextVersion(); // never 0
         address releaseAuthority = address(_releaseAccessManager[releaseVersion]); // can be zero if registering service when release is not created
 
         // IMPORTANT: can not guarantee service access is actually controlled by authority
@@ -484,7 +489,7 @@ contract ReleaseManager is
             revert ErrorReleaseManagerServiceInfoInterceptorInvalid(service, info.isInterceptor);
         }
 
-        if(info.objectType != SERVICE()) {
+        if(info.objectType != SERVICE()) {// type is checked in registry anyway...but service logic may depend on expected value
             revert ErrorReleaseManagerServiceInfoTypeInvalid(service, SERVICE(), info.objectType);
         }
 
@@ -520,4 +525,3 @@ contract ReleaseManager is
         return true;
     }
 }
-

package/contracts/registry/ServiceAuthorization.sol

@@ -42,10 +42,6 @@ contract ServiceAuthorization
           return _serviceDomains;
      }
 
-     function getServiceDomain(uint idx) external view returns(ObjectType serviceDomain) {
-          return _serviceDomains[idx];
-     }
-
      function getServiceAddress(ObjectType serviceDomain) external view returns(address service) {
           return _serviceAddress[serviceDomain];
      }

package/contracts/shared/ComponentService.sol

@@ -490,16 +490,13 @@ contract ComponentService is
 
         component.linkToRegisteredNftId();
 
-
-        // TODO second part, may be done in different tx....
-
         // save amended component info with instance
         instanceReader = instance.getInstanceReader();
         instanceStore = instance.getInstanceStore();
 
         IComponents.ComponentInfo memory componentInfo = component.getComponentInfo();
         componentInfo.tokenHandler = new TokenHandler(address(componentInfo.token));
-        instanceStore.createComponent(componentNftId, componentInfo);
+        instanceStore.createComponent(component.getNftId(), componentInfo);
 
         // configure instance authorization
         _instanceService.createComponentTarget(

package/contracts/shared/IKeyValueStore.sol

@@ -13,7 +13,6 @@ interface IKeyValueStore is ILifecycle {
 
     error ErrorKeyValueStoreTypeUndefined(ObjectType objectType);
     error ErrorKeyValueStoreAlreadyCreated(Key32 key, ObjectType objectType);
-    error ErrorKeyValueStoreNoLifecycle(ObjectType objectType);
     error ErrorKeyValueStoreStateZero(Key32 key);
     error ErrorKeyValueStoreNotExisting(Key32 key);
 

package/contracts/shared/ILifecycle.sol

@@ -1,12 +1,13 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
+import {NftId} from "../type/NftId.sol";
 import {ObjectType} from "../type/ObjectType.sol";
 import {StateId} from "../type/StateId.sol";
 
 interface ILifecycle {
 
-    error ErrorNoLifecycle(ObjectType objectType);
+    error ErrorNoLifecycle(NftId nftId, ObjectType objectType);
     error ErrorInvalidStateTransition(
         ObjectType objectType,
         StateId fromStateId,

package/contracts/shared/KeyValueStore.sol

@@ -34,12 +34,8 @@ contract KeyValueStore is
             revert ErrorKeyValueStoreAlreadyCreated(key32, objectType);
         }
 
-        if(!hasLifecycle(objectType)) {
-            revert ErrorKeyValueStoreNoLifecycle(objectType);
-        }
-
         Blocknumber blocknumber = blockBlocknumber();
-        StateId initialState = getInitialState(objectType);
+        StateId initialState = hasLifecycle(objectType) ? getInitialState(objectType) : ACTIVE();
 
         // set metadata
         metadata.objectType = objectType;

package/contracts/shared/Lifecycle.sol

@@ -8,18 +8,27 @@ import {ObjectType, COMPONENT, BUNDLE, POLICY, REQUEST, RISK, CLAIM, PAYOUT} fro
 import {StateId, ACTIVE, PAUSED, ARCHIVED, CLOSED, APPLIED, COLLATERALIZED, REVOKED, SUBMITTED, CONFIRMED, DECLINED, EXPECTED, PAID, FULFILLED, FAILED, CANCELLED} from "../type/StateId.sol";
 import {ILifecycle} from "./ILifecycle.sol";
 
-abstract contract Lifecycle is
+contract Lifecycle is
     Initializable,
     ILifecycle
 {
-    // TODO make private
     mapping(ObjectType objectType => StateId initialState)
-        internal _initialState;
+        private _initialState;
 
     mapping(ObjectType objectType => mapping(StateId stateFrom => mapping(StateId stateTo => bool isValid)))
-        internal _isValidTransition;
+        private _isValidTransition;
 
-    //function _initializeLifecycle() internal virtual;
+    function initializeLifecycle()
+        public
+        onlyInitializing
+    {
+        _setupBundleLifecycle();
+        _setupComponentLifecycle();
+        _setupPolicyLifecycle();
+        _setupClaimAndPayoutLifecycle();
+        _setupRiskLifecycle();
+        _setupRequestLifecycle();
+    }
 
     function hasLifecycle(
         ObjectType objectType
@@ -50,9 +59,9 @@ abstract contract Lifecycle is
         public
         view
     {
-        // revert if no life cycle support
+        // return if no life cycle support
         if (_initialState[objectType].eqz()) {
-            revert ErrorNoLifecycle(objectType);
+            return;
         }
 
         // enforce valid state transition
@@ -68,4 +77,54 @@ abstract contract Lifecycle is
     ) public view returns (bool) {
         return _isValidTransition[objectType][fromId][toId];
     }
+
+    function _setupComponentLifecycle() internal {
+        _initialState[COMPONENT()] = ACTIVE();
+        _isValidTransition[COMPONENT()][ACTIVE()][PAUSED()] = true;
+        _isValidTransition[COMPONENT()][PAUSED()][ACTIVE()] = true;
+        _isValidTransition[COMPONENT()][PAUSED()][ARCHIVED()] = true;
+    }
+
+    function _setupBundleLifecycle() internal {
+        _initialState[BUNDLE()] = ACTIVE();
+        _isValidTransition[BUNDLE()][ACTIVE()][PAUSED()] = true;
+        _isValidTransition[BUNDLE()][ACTIVE()][CLOSED()] = true;
+        _isValidTransition[BUNDLE()][PAUSED()][ACTIVE()] = true;
+        _isValidTransition[BUNDLE()][PAUSED()][CLOSED()] = true;
+    }
+
+    function _setupPolicyLifecycle() internal {
+        _initialState[POLICY()] = APPLIED();
+        _isValidTransition[POLICY()][APPLIED()][REVOKED()] = true;
+        _isValidTransition[POLICY()][APPLIED()][DECLINED()] = true;
+        _isValidTransition[POLICY()][APPLIED()][COLLATERALIZED()] = true;
+        _isValidTransition[POLICY()][APPLIED()][ACTIVE()] = true;
+        _isValidTransition[POLICY()][COLLATERALIZED()][ACTIVE()] = true;
+        _isValidTransition[POLICY()][ACTIVE()][CLOSED()] = true;
+    }
+
+    function _setupClaimAndPayoutLifecycle() internal {
+        _initialState[CLAIM()] = SUBMITTED();
+        _isValidTransition[CLAIM()][SUBMITTED()][CONFIRMED()] = true;
+        _isValidTransition[CLAIM()][SUBMITTED()][DECLINED()] = true;
+        _isValidTransition[CLAIM()][CONFIRMED()][CLOSED()] = true;
+
+        _initialState[PAYOUT()] = EXPECTED();
+        _isValidTransition[PAYOUT()][EXPECTED()][PAID()] = true;
+    }
+
+    function _setupRiskLifecycle() internal {
+        _initialState[RISK()] = ACTIVE();
+        _isValidTransition[RISK()][ACTIVE()][PAUSED()] = true;
+        _isValidTransition[RISK()][PAUSED()][ACTIVE()] = true;
+        _isValidTransition[RISK()][PAUSED()][ARCHIVED()] = true;
+    }
+
+    function _setupRequestLifecycle() internal {
+        _initialState[REQUEST()] = ACTIVE();
+        _isValidTransition[REQUEST()][ACTIVE()][FULFILLED()] = true;
+        _isValidTransition[REQUEST()][ACTIVE()][FAILED()] = true;
+        _isValidTransition[REQUEST()][FAILED()][FULFILLED()] = true;
+        _isValidTransition[REQUEST()][ACTIVE()][CANCELLED()] = true;
+    }
 }

package/contracts/staking/StakingStore.sol

@@ -28,13 +28,11 @@ import {Version, VersionLib} from "../type/Version.sol";
 import {Versionable} from "../shared/Versionable.sol";
 
 import {RegistryAdmin} from "../registry/RegistryAdmin.sol";
-import {StakingLifecycle} from "./StakingLifecycle.sol";
 
 
 contract StakingStore is 
     AccessManaged,
-    KeyValueStore,
-    StakingLifecycle
+    KeyValueStore
 {
 
     event LogStakingStoreReserveBalanceIncreased(NftId targetNftId, Amount dipAmount, Amount reserveBalance, Blocknumber lastUpdatedIn);