@etherisc/gif-next 3.0.0-a511887-523 → 3.0.0-ab05e7d-681

package/contracts/instance/InstanceAdmin.sol

@@ -11,9 +11,8 @@ import {AccessAdminLib} from "../authorization/AccessAdminLib.sol";
 import {AccessManagerCloneable} from "../authorization/AccessManagerCloneable.sol";
 import {ObjectType, INSTANCE} from "../type/ObjectType.sol";
 import {RoleId, ADMIN_ROLE} from "../type/RoleId.sol";
-import {GIF_INITIAL_RELEASE} from "../registry/Registry.sol";
 import {Str} from "../type/String.sol";
-import {VersionPartLib, VersionPart} from "../type/Version.sol";
+import {VersionPart} from "../type/Version.sol";
 import {INSTANCE_TARGET_NAME, INSTANCE_ADMIN_TARGET_NAME, INSTANCE_STORE_TARGET_NAME, PRODUCT_STORE_TARGET_NAME, BUNDLE_SET_TARGET_NAME, RISK_SET_TARGET_NAME} from "./TargetNames.sol";
 
 
@@ -27,12 +26,13 @@ contract InstanceAdmin is
     error ErrorInstanceAdminNotComponentOrCustomTarget(address target);
 
     IInstance internal _instance;
+    IRegistry internal _registry;
 
     uint64 internal _customRoleIdNext;
 
 
     modifier onlyInstanceService() {
-        if (msg.sender != getRegistry().getServiceAddress(INSTANCE(), getRelease())) {
+        if (msg.sender != _registry.getServiceAddress(INSTANCE(), getRelease())) {
             revert ErrorInstanceAdminNotInstanceService(msg.sender);
         }
         _;
@@ -43,8 +43,7 @@ contract InstanceAdmin is
     constructor(address accessManager) {
         initialize(
             accessManager,
-            "MasterInstanceAdmin",
-            GIF_INITIAL_RELEASE());
+            "MasterInstanceAdmin");
     }
 
 
@@ -54,24 +53,30 @@ contract InstanceAdmin is
     function completeSetup(
         address registry,
         address authorization,
+        VersionPart release,
         address instance
     )
         external
+        reinitializer(uint64(release.toInt()))
     {
         // checks
         AccessAdminLib.checkIsRegistered(registry, instance, INSTANCE());
 
         // effects
+        AccessManagerCloneable(
+            authority()).completeSetup(
+                registry, 
+                release); 
+
         AccessAdminLib.checkAuthorization(
             address(_authorization), 
             authorization, 
             INSTANCE(), // expectedDomain
-            getRelease(), // expectedRelease
+            release, // expectedRelease
             false, // expectServiceAuthorization
             true); // checkAlreadyInitialized
 
-        __RegistryLinked_init(registry);
-
+        _registry = IRegistry(registry);
         _instance = IInstance(instance);
         _authorization = IAuthorization(authorization);
         _customRoleIdNext = 0;
@@ -100,7 +105,7 @@ contract InstanceAdmin is
         for(uint256 i = 0; i < serviceDomains.length; i++) {
             ObjectType serviceDomain = serviceDomains[i];
             RoleId serviceRoleId = authorization.getServiceRole(serviceDomain);
-            address service = getRegistry().getServiceAddress(serviceDomain, getRelease());
+            address service = _registry.getServiceAddress(serviceDomain, getRelease());
 
             _grantRoleToAccount(
                 serviceRoleId,
@@ -125,7 +130,6 @@ contract InstanceAdmin is
         _createTarget(target, name, TargetType.Instance, true); 
     }
 
-
     /// @dev Initializes the authorization for the specified component.
     /// Important: The component MUST be registered.
     function initializeComponentAuthorization(

package/contracts/instance/InstanceAuthorizationV3.sol

@@ -13,9 +13,7 @@ import {InstanceStore} from "../instance/InstanceStore.sol";
 import {INSTANCE_TARGET_NAME, INSTANCE_ADMIN_TARGET_NAME, INSTANCE_STORE_TARGET_NAME, PRODUCT_STORE_TARGET_NAME, BUNDLE_SET_TARGET_NAME, RISK_SET_TARGET_NAME} from "./TargetNames.sol";
 import {ProductStore} from "../instance/ProductStore.sol";
 import {ADMIN_ROLE, INSTANCE_OWNER_ROLE, PUBLIC_ROLE} from "../type/RoleId.sol";
-import {GIF_INITIAL_RELEASE} from "../registry/Registry.sol";
-import {RiskSet} from "../instance/RiskSet.sol";
-import {VersionPartLib} from "../type/Version.sol";
+import {RiskSet} from "../instance/RiskSet.sol"; 
 
 
 contract InstanceAuthorizationV3
@@ -29,7 +27,7 @@ contract InstanceAuthorizationV3
           Authorization(
                INSTANCE_TARGET_NAME, 
                INSTANCE(), 
-               GIF_INITIAL_RELEASE(), 
+               3, 
                COMMIT_HASH,
                TargetType.Instance, 
                false)

package/contracts/instance/InstanceReader.sol

@@ -34,6 +34,7 @@ import {RiskId} from "../type/RiskId.sol";
 import {RiskSet} from "./RiskSet.sol";
 import {RoleId, INSTANCE_OWNER_ROLE} from "../type/RoleId.sol";
 import {StateId} from "../type/StateId.sol";
+import {Str, StrLib} from "../type/String.sol";
 import {TokenHandler} from "../shared/TokenHandler.sol";
 import {UFixed, UFixedLib} from "../type/UFixed.sol";
 
@@ -177,8 +178,8 @@ contract InstanceReader {
 
 
     /// @dev Returns th product NFT ID for the given index.
-    function getProductNftId(uint256 idx) public view returns (NftId productNftId) {
-        return _instance.getProductNftId(idx);
+    function getProduct(uint256 idx) public view returns (NftId productNftId) {
+        return _instance.getProduct(idx);
     }
 
 
@@ -219,6 +220,12 @@ contract InstanceReader {
     }
 
 
+    /// @dev Returns true if the specified risk exists for the given product NFT ID.
+    function isProductRisk(NftId productNftId, RiskId riskId) public view returns (bool exists) {
+        return _riskSet.hasRisk(productNftId, riskId);
+    }
+
+
     /// @dev Returns the risk info for the given risk ID.
     function getRiskInfo(RiskId riskId) public view returns (IRisk.RiskInfo memory info) {
         return _productStore.getRiskInfo(riskId);
@@ -240,10 +247,21 @@ contract InstanceReader {
 
 
     /// @dev Returns the linked policy NFT ID for the given risk ID and index.
-    function getPolicyNftIdForRisk(RiskId riskId, uint256 idx) public view returns (NftId linkedPolicyNftId) {
+    function getPolicyForRisk(RiskId riskId, uint256 idx) public view returns (NftId linkedPolicyNftId) {
         return _riskSet.getLinkedPolicyNftId(riskId, idx);
     }
 
+    /// @dev Returns the number of linked policies for the given bundle NFT ID.
+    function policiesForBundle(NftId bundleNftId) public view returns (uint256 linkedPolicies) {
+        return _bundleSet.activePolicies(bundleNftId);
+    }
+
+
+    /// @dev Returns the linked policy NFT ID for the given risk ID and index.
+    function getPolicyForBundle(NftId bundleNftId, uint256 idx) public view returns (NftId linkedPolicyNftId) {
+        return _bundleSet.getActivePolicy(bundleNftId, idx);
+    }
+
 
     /// @dev Returns the info for the given policy NFT ID.
     function getPolicyInfo(NftId policyNftId) public view returns (IPolicy.PolicyInfo memory info) {
@@ -341,6 +359,11 @@ contract InstanceReader {
         return _store.getRequestInfo(requestId);
     }
 
+    /// @dev Returns the request info for the given oracle request ID.
+    function getRequestState(RequestId requestId) public view returns (StateId state) {
+        return getState(requestId.toKey32());
+    }
+
     //--- pool functions -----------------------------------------------------------//
 
     /// @dev Returns the pool info for the given pool NFT ID.
@@ -444,6 +467,12 @@ contract InstanceReader {
     }
 
 
+    /// @dev Returns the role ID for the given index.
+    function getRoleForName(string memory name) public view returns (RoleId roleId, bool exists) {
+        return _instanceAdmin.getRoleForName(name);
+    }
+
+
     /// @dev Returns the role ID for the instance owner role.
     /// This role may be used as a "root" admin role for other custom roles defined for this instance.
     function getInstanceOwnerRole() public pure returns (RoleId roleId) {
@@ -573,13 +602,18 @@ contract InstanceReader {
     }
 
 
-    function toUFixed(uint256 value, int8 exp) public pure returns (UFixed) {
-        return UFixedLib.toUFixed(value, exp);
+    function toInt(UFixed value) public pure returns (uint256) {
+        return UFixedLib.toInt(value);
     }
 
 
-    function toInt(UFixed value) public pure returns (uint256) {
-        return UFixedLib.toInt(value);
+    function toString(Str str) public pure returns (string memory) {
+        return StrLib.toString(str);
+    }
+
+
+    function toUFixed(uint256 value, int8 exp) public pure returns (UFixed) {
+        return UFixedLib.toUFixed(value, exp);
     }
 
     //--- internal functions ----------------------------------------------------//

package/contracts/instance/InstanceService.sol

@@ -206,6 +206,7 @@ contract InstanceService is
         instanceAdmin.completeSetup(
             address(getRegistry()),
             address(instanceAuthorization),
+            getRelease(),
             address(instance));
 
         // hard checks for newly cloned instance
@@ -348,7 +349,6 @@ contract InstanceService is
             if(instanceStoreAddress == address(0)) { revert ErrorInstanceServiceInstanceStoreZero(); }
             if(productStoreAddress == address(0)) { revert ErrorInstanceServiceProductStoreZero(); } // TODO: rename exception
             
-            // TODO check instance cluster release
             if(instance.authority() != instanceAdmin.authority()) { revert ErrorInstanceServiceInstanceAuthorityMismatch(); }
             if(bundleSet.authority() != instanceAdmin.authority()) { revert ErrorInstanceServiceBundleSetAuthorityMismatch(); }
             if(riskSet.authority() != instanceAdmin.authority()) { revert ErrorInstanceServiceRiskSetAuthorityMismatch(); }
@@ -372,6 +372,10 @@ contract InstanceService is
             IInstance masterInstance = IInstance(_masterInstance);
             IRegistry.ObjectInfo memory info = _registryService.registerInstance(masterInstance, getOwner());
             masterInstanceNftId = info.nftId;
+            
+            emit LogInstanceServiceMasterInstanceRegistered(
+                masterInstanceNftId, _masterInstance, _masterInstanceAdmin, _masterAccessManager, 
+                _masterInstanceReader, _masterInstanceBundleSet, _masterInstanceRiskSet, _masterInstanceStore, _masterProductStore);
         }
     }
 
@@ -419,8 +423,7 @@ contract InstanceService is
 
         clonedAdmin.initialize(
             address(clonedAccessManager),
-            "InstanceAdmin",
-            getRelease());
+            "InstanceAdmin");
     }
 
 
@@ -447,6 +450,7 @@ contract InstanceService is
                 instanceReader: InstanceReader(Clones.clone(address(_masterInstanceReader)))
             }),
             getRegistry(),
+            getRelease(),
             instanceOwner,
             allowAnyToken);
 
@@ -461,7 +465,7 @@ contract InstanceService is
     )
         internal
         virtual override
-        onlyInitializing()
+        initializer()
     {
         (
             address authority,

package/contracts/instance/InstanceServiceManager.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {IUpgradeable} from "../upgradeability/IUpgradeable.sol";
+import {IVersionable} from "../upgradeability/IVersionable.sol";
 import {ProxyManager} from "../upgradeability/ProxyManager.sol";
 import {InstanceService} from "./InstanceService.sol";
 
@@ -18,13 +18,13 @@ contract InstanceServiceManager is ProxyManager {
     {
         InstanceService svc = new InstanceService{salt: salt}();
         bytes memory data = abi.encode(authority, registry);
-        IUpgradeable upgradeable = initialize(
+        IVersionable versionable = initialize(
             registry,
             address(svc), 
             data,
             salt);
 
-        _instanceService = InstanceService(address(upgradeable));
+        _instanceService = InstanceService(address(versionable));
     }
 
     //--- view functions ----------------------------------------------------//

package/contracts/oracle/BasicOracle.sol

@@ -22,6 +22,7 @@ contract BasicOracle is
         _respond(requestId, responseData);
     }
 
+
     function _initializeBasicOracle(
         address registry,
         NftId instanceNftId,

package/contracts/oracle/BasicOracleAuthorization.sol

@@ -8,8 +8,6 @@ import {IAccess} from "../authorization/IAccess.sol";
 import {IOracle} from "./IOracle.sol"; 
 import {PUBLIC_ROLE} from "../../contracts/type/RoleId.sol";
 import {RoleId} from "../type/RoleId.sol";
-import {GIF_INITIAL_RELEASE} from "../registry/Registry.sol";
-import {VersionPartLib} from "../type/Version.sol";
 
 
 contract BasicOracleAuthorization
@@ -23,7 +21,7 @@ contract BasicOracleAuthorization
           Authorization(
                componentName, 
                ORACLE(), 
-               GIF_INITIAL_RELEASE(),
+               3, 
                commitHash, 
                TargetType.Component, 
                false)

package/contracts/oracle/IOracleService.sol

@@ -41,26 +41,26 @@ interface IOracleService is IService {
         string calldata callbackMethodName
     ) external returns (RequestId requestId);
 
-    /// @dev respond to oracle request by oracle compnent.
-    /// the response data is amende in the request info stored with the instance.
-    /// the request state changes to FULFILLED (when calling the callback method of the requester is successful)
+    /// @dev Respond to oracle request by oracle compnent.
+    /// The response data is amended in the request info stored with the instance.
+    /// The request state changes to FULFILLED (when calling the callback method of the requester is successful)
     /// or to FAILED when calling the requester is not succesful.
-    /// the function returns true iff the state changes to FULFILLED.
-    /// permissioned: only the oracle component linked to the request id may call this method
+    /// The function returns true iff the state changes to FULFILLED.
+    /// Permissioned: only the receiving oracle component may call this method
     function respond(
         RequestId requestId,
         bytes calldata responseData
     ) external returns (bool success);
 
-    /// @dev re send a failed response to the requester.
-    /// only requests in state FAILED may be re sent.
-    /// the request state changes to FULFILLED when calling the callback method of the requester is successful.
-    /// permissioned: only the requester may resend a request
+    /// @dev Resend a failed response to the requester.
+    /// Only requests in state FAILED may be resent.
+    /// The request state changes to FULFILLED when calling the callback method of the requester is successful.
+    /// Permissioned: only the receiving oracle may resend a request
     function resend(RequestId requestId) external;
 
-    /// @dev notify the oracle component that the specified request has become invalid.
-    /// only requests in state ACTIVE may be cancelled.
-    /// permissioned: only the requester may cancel a request
+    /// @dev Notify the oracle component that the specified request has become invalid.
+    /// Only requests in state ACTIVE may be cancelled.
+    /// Permissioned: only the requester may cancel a request
     function cancel(RequestId requestId) external;
 
 }

package/contracts/oracle/Oracle.sol

@@ -5,11 +5,10 @@ import {Amount} from "../type/Amount.sol";
 import {COMPONENT, PRODUCT, ORACLE} from "../type/ObjectType.sol";
 import {IAuthorization} from "../authorization/IAuthorization.sol";
 import {IComponentService} from "../shared/IComponentService.sol";
-import {IComponent} from "../shared/IComponent.sol";
+import {IInstanceLinkedComponent} from "../shared/IInstanceLinkedComponent.sol";
 import {IOracleComponent} from "./IOracleComponent.sol";
 import {IOracleService} from "./IOracleService.sol";
 import {NftId} from "../type/NftId.sol";
-import {Component} from "../shared/Component.sol";
 import {InstanceLinkedComponent} from "../shared/InstanceLinkedComponent.sol";
 import {RequestId} from "../type/RequestId.sol";
 import {Timestamp} from "../type/Timestamp.sol";
@@ -67,7 +66,7 @@ abstract contract Oracle is
     function withdrawFees(Amount amount)
         external
         virtual
-        override(IComponent, Component)
+        override(IInstanceLinkedComponent, InstanceLinkedComponent)
         onlyOwner()
         restricted()
         returns (Amount)
@@ -141,10 +140,10 @@ abstract contract Oracle is
         internal
         virtual
     {
-        _getOracleStorage()._oracleService.respond(
-            requestId, responseData);
+        _getOracleStorage()._oracleService.respond(requestId, responseData);
     }
 
+
     function _getOracleStorage() private pure returns (OracleStorage storage $) {
         assembly {
             $.slot := ORACLE_STORAGE_LOCATION_V1

package/contracts/oracle/OracleService.sol

@@ -29,7 +29,7 @@ contract OracleService is
     )
         internal
         virtual override
-        onlyInitializing()
+        initializer()
     {
         (
             address authority,

package/contracts/oracle/OracleServiceManager.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {IUpgradeable} from "../upgradeability/IUpgradeable.sol";
+import {IVersionable} from "../upgradeability/IVersionable.sol";
 import {ProxyManager} from "../upgradeability/ProxyManager.sol";
 import {OracleService} from "./OracleService.sol";
 
@@ -18,13 +18,13 @@ contract OracleServiceManager is ProxyManager {
     {
         OracleService svc = new OracleService{salt: salt}();
         bytes memory data = abi.encode(authority, registry);
-        IUpgradeable upgradeable = initialize(
+        IVersionable versionable = initialize(
             registry,
             address(svc), 
             data,
             salt);
 
-        _oracleService = OracleService(address(upgradeable));
+        _oracleService = OracleService(address(versionable));
     }
 
     //--- view functions ----------------------------------------------------//

package/contracts/pool/BasicPoolAuthorization.sol

@@ -2,7 +2,7 @@
 pragma solidity ^0.8.20;
 
 import {IAccess} from "../authorization/IAccess.sol";
-import {IComponent} from "../shared/IInstanceLinkedComponent.sol";
+import {IInstanceLinkedComponent} from "../shared/IInstanceLinkedComponent.sol";
 import {IPoolComponent} from "./IPoolComponent.sol";
 
 import {Authorization} from "../authorization/Authorization.sol";
@@ -10,9 +10,8 @@ import {BasicPool} from "./BasicPool.sol";
 import {COMPONENT, POOL} from "../type/ObjectType.sol";
 import {PUBLIC_ROLE} from "../../contracts/type/RoleId.sol";
 import {RoleId} from "../type/RoleId.sol";
-import {GIF_INITIAL_RELEASE} from "../registry/Registry.sol";
 import {TokenHandler} from "../shared/TokenHandler.sol";
-import {VersionPartLib} from "../type/Version.sol";
+
 
 contract BasicPoolAuthorization
      is Authorization
@@ -22,7 +21,7 @@ contract BasicPoolAuthorization
           Authorization(
                poolName, 
                POOL(), 
-               GIF_INITIAL_RELEASE(),
+               3,
                COMMIT_HASH,
                TargetType.Component, 
                true)
@@ -71,7 +70,7 @@ contract BasicPoolAuthorization
           _authorize(functions, BasicPool.unstake.selector, "unstake");
           _authorize(functions, BasicPool.extend.selector, "extend");
 
-          _authorize(functions, IComponent.withdrawFees.selector, "withdrawFees");
+          _authorize(functions, IInstanceLinkedComponent.withdrawFees.selector, "withdrawFees");
           _authorize(functions, BasicPool.withdrawBundleFees.selector, "withdrawBundleFees");
 
           // authorize pool service

package/contracts/pool/BundleService.sol

@@ -41,7 +41,7 @@ contract BundleService is
     )
         internal
         virtual override
-        onlyInitializing()
+        initializer()
     {
         (
             address authority,
@@ -105,11 +105,11 @@ contract BundleService is
                 NftIdLib.zero(), 
                 poolNftId,
                 BUNDLE(),
-                getRelease(),
                 false, // intercepting property for bundles is defined on pool
-                address(0)),
-            owner,
-            "" // bundle data to be stored in registry
+                address(0),
+                owner,
+                "" // bundle data to be stored in registry
+            )
         );
 
         // create bundle info in instance
@@ -130,7 +130,7 @@ contract BundleService is
         BundleSet bundleManager = instance.getBundleSet();
         bundleManager.add(bundleNftId);
 
-        emit LogBundleServiceBundleCreated(bundleNftId, poolNftId, lifetime);
+        emit LogBundleServiceBundleCreated(bundleNftId, poolNftId, lifetime, bundleFee.fixedFee, bundleFee.fractionalFee);
     }
 
 

package/contracts/pool/BundleServiceManager.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {IUpgradeable} from "../upgradeability/IUpgradeable.sol";
+import {IVersionable} from "../upgradeability/IVersionable.sol";
 import {ProxyManager} from "../upgradeability/ProxyManager.sol";
 import {BundleService} from "./BundleService.sol";
 
@@ -18,13 +18,13 @@ contract BundleServiceManager is ProxyManager {
     {
         BundleService svc = new BundleService{salt: salt}();
         bytes memory data = abi.encode(authority, registry);
-        IUpgradeable upgradeable = initialize(
+        IVersionable versionable = initialize(
             registry,
             address(svc), 
             data,
             salt);
 
-        _bundleService = BundleService(address(upgradeable));
+        _bundleService = BundleService(address(versionable));
     }
 
     //--- view functions ----------------------------------------------------//

package/contracts/pool/IBundleService.sol

@@ -30,7 +30,7 @@ interface IBundleService is IService {
 
     error ErrorBundleServiceExtensionLifetimeIsZero();
 
-    event LogBundleServiceBundleCreated(NftId bundleNftId, NftId poolNftId, Seconds lifetime);
+    event LogBundleServiceBundleCreated(NftId bundleNftId, NftId poolNftId, Seconds lifetime, Amount fixedFee, UFixed fractionalFee);
     event LogBundleServiceBundleClosed(NftId bundleNftId);
     event LogBundleServiceBundleLocked(NftId bundleNftId);
     event LogBundleServiceBundleUnlocked(NftId bundleNftId);

package/contracts/pool/IPoolService.sol

@@ -19,7 +19,7 @@ interface IPoolService is IService {
     event LogPoolServiceWalletDefunded(NftId poolNftId, address poolOwner, Amount amount);
 
     event LogPoolServiceBundleCreated(NftId instanceNftId, NftId poolNftId, NftId bundleNftId);
-    event LogPoolServiceBundleClosed(NftId instanceNftId, NftId poolNftId, NftId bundleNftId);
+    event LogPoolServiceBundleClosed(NftId instanceNftId, NftId poolNftId, NftId bundleNftId, Amount balanceAmount, Amount feeAmount);
 
     event LogPoolServiceBundleStaked(NftId instanceNftId, NftId poolNftId, NftId bundleNftId, Amount amount, Amount netAmount);
     event LogPoolServiceBundleUnstaked(NftId instanceNftId, NftId poolNftId, NftId bundleNftId, Amount amount, Amount netAmount);

package/contracts/pool/PoolLib.sol

@@ -18,7 +18,6 @@ import {ObjectType, BUNDLE, POOL} from "../type/ObjectType.sol";
 import {PayoutId} from "../type/PayoutId.sol";
 import {TokenHandler} from "../shared/TokenHandler.sol";
 import {UFixed} from "../type/UFixed.sol";
-import {VersionPart} from "../type/Version.sol";
 
 library PoolLib {
 
@@ -156,8 +155,7 @@ library PoolLib {
     function checkAndGetPoolInfo(
         IRegistry registry,
         address sender,
-        NftId bundleNftId,
-        VersionPart release
+        NftId bundleNftId
     )
         public
         view
@@ -169,7 +167,7 @@ library PoolLib {
             IComponents.PoolInfo memory poolInfo
         )
     {
-        checkNftType(registry, bundleNftId, BUNDLE(), release);
+        checkNftType(registry, bundleNftId, BUNDLE());
 
         IInstance instance;
         (poolNftId, instance) = getAndVerifyActivePool(registry, sender);
@@ -237,10 +235,9 @@ library PoolLib {
     function checkNftType(
         IRegistry registry, 
         NftId nftId, 
-        ObjectType expectedObjectType,
-        VersionPart expectedRelease
+        ObjectType expectedObjectType
     ) internal view {
-        if(!registry.isObjectType(nftId, expectedObjectType, expectedRelease)) {
+        if(!registry.isObjectType(nftId, expectedObjectType)) {
             revert INftOwnable.ErrorNftOwnableInvalidType(nftId, expectedObjectType);
         }
     }

package/contracts/pool/PoolService.sol

@@ -42,7 +42,7 @@ contract PoolService is
     )
         internal
         virtual override
-        onlyInitializing()
+        initializer()
     {
         (
             address authority,
@@ -98,7 +98,7 @@ contract PoolService is
             unstakedAmount +  feeAmount, 
             AmountLib.zero());
         
-        emit LogPoolServiceBundleClosed(instance.getNftId(), poolNftId, bundleNftId);
+        emit LogPoolServiceBundleClosed(instance.getNftId(), poolNftId, bundleNftId, unstakedAmount, feeAmount);
 
         if ((unstakedAmount + feeAmount).gtz()){
             IComponents.ComponentInfo memory poolComponentInfo = instance.getInstanceReader().getComponentInfo(poolNftId);
@@ -184,7 +184,7 @@ contract PoolService is
             NftId instanceNftId,
             NftId poolNftId,
             IComponents.PoolInfo memory poolInfo
-        ) = PoolLib.checkAndGetPoolInfo(getRegistry(), msg.sender, bundleNftId, getRelease());
+        ) = PoolLib.checkAndGetPoolInfo(getRegistry(), msg.sender, bundleNftId);
 
         {
             Amount currentPoolBalance = instanceReader.getBalanceAmount(poolNftId);
@@ -241,7 +241,7 @@ contract PoolService is
             InstanceStore instanceStore,
             NftId instanceNftId,
             NftId poolNftId,
-        ) = PoolLib.checkAndGetPoolInfo(getRegistry(), msg.sender, bundleNftId, getRelease());
+        ) = PoolLib.checkAndGetPoolInfo(getRegistry(), msg.sender, bundleNftId);
 
         // call bundle service for bookkeeping and additional checks
         Amount unstakedAmount = _bundleService.unstake(instanceStore, bundleNftId, amount);

package/contracts/pool/PoolServiceManager.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {IUpgradeable} from "../upgradeability/IUpgradeable.sol";
+import {IVersionable} from "../upgradeability/IVersionable.sol";
 import {ProxyManager} from "../upgradeability/ProxyManager.sol";
 import {PoolService} from "./PoolService.sol";
 
@@ -18,13 +18,13 @@ contract PoolServiceManager is ProxyManager {
     {
         PoolService poolSrv = new PoolService{salt: salt}();
         bytes memory data = abi.encode(authority, registry);
-        IUpgradeable upgradeable = initialize(
+        IVersionable versionable = initialize(
             registry,
             address(poolSrv), 
             data,
             salt);
 
-        _poolService = PoolService(address(upgradeable));
+        _poolService = PoolService(address(versionable));
     }
 
     //--- view functions ----------------------------------------------------//