@etherisc/gif-next 3.0.0-0fefe0d-162 → 3.0.0-1664e67-168

package/contracts/instance/InstanceAuthorizationV3.sol

@@ -13,7 +13,9 @@ 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 {RiskSet} from "../instance/RiskSet.sol"; 
+import {GIF_INITIAL_RELEASE} from "../registry/Registry.sol";
+import {RiskSet} from "../instance/RiskSet.sol";
+import {VersionPartLib} from "../type/Version.sol";
 
 
 contract InstanceAuthorizationV3
@@ -27,7 +29,7 @@ contract InstanceAuthorizationV3
           Authorization(
                INSTANCE_TARGET_NAME, 
                INSTANCE(), 
-               3, 
+               GIF_INITIAL_RELEASE(), 
                COMMIT_HASH,
                TargetType.Instance, 
                false)

package/contracts/instance/InstanceReader.sol

@@ -28,6 +28,7 @@ import {NftId} from "../type/NftId.sol";
 import {PayoutId, PayoutIdLib} from "../type/PayoutId.sol";
 import {PolicyServiceLib} from "../product/PolicyServiceLib.sol";
 import {ProductStore} from "./ProductStore.sol";
+import {RegistryLinked} from "../shared/RegistryLinked.sol";
 import {ReferralId, ReferralStatus, ReferralLib} from "../type/Referral.sol";
 import {RequestId} from "../type/RequestId.sol";
 import {RiskId} from "../type/RiskId.sol";
@@ -40,14 +41,19 @@ import {UFixed, UFixedLib} from "../type/UFixed.sol";
 
 /// @dev Central reader contract for a specific instance.
 /// Provides reading functions for all instance data and related component data.
-contract InstanceReader {
+contract InstanceReader is
+    RegistryLinked
+{
 
     error ErrorInstanceReaderAlreadyInitialized();
     error ErrorInstanceReaderInstanceAddressZero();
-
+    // TODO make state immutable:
+    // 1. instance receives reader through setInstanceReader()
+    // 2. this way instance initialization is not depends on reader
+    // 3. and reader is simple contract with constructor
+    // 4. no _initialized in storage, the rest is immutable
     bool private _initialized = false;
 
-    IRegistry internal _registry;
     IInstance internal _instance;
     InstanceAdmin internal _instanceAdmin;
 
@@ -78,27 +84,24 @@ contract InstanceReader {
         _initialized = true;
         _instance = IInstance(instanceAddress);
         _instanceAdmin = _instance.getInstanceAdmin();
-        _registry = _instance.getRegistry();
 
         _store = _instance.getInstanceStore();
         _productStore = _instance.getProductStore();
         _bundleSet = _instance.getBundleSet();
         _riskSet = _instance.getRiskSet();
-        _distributionService = IDistributionService(_registry.getServiceAddress(DISTRIBUTION(), _instance.getRelease()));
+
+        _distributionService = IDistributionService(
+            _getRegistry().getServiceAddress(DISTRIBUTION(), _instance.getRelease()));
     }
 
 
     //--- instance functions ---------------------------------------------------------//
 
-    /// @dev Returns the registry this instance is registered in.
-    function getRegistry() public view returns (IRegistry registry) {
-        return _registry;
-    }
 
 
     /// @dev Returns the instance NFT ID.
     function getInstanceNftId() public view returns (NftId instanceNftid) {
-        return _registry.getNftIdForAddress(address(_instance));
+        return _getRegistry().getNftIdForAddress(address(_instance));
     }
 
 
@@ -435,7 +438,7 @@ contract InstanceReader {
         return _store.getReferralInfo(referralId);
     }
 
-
+    // TODO reader dependce on service os wrong?
     function getDiscountPercentage(ReferralId referralId)
         public
         view
@@ -444,10 +447,7 @@ contract InstanceReader {
             ReferralStatus status
         )
     {
-        return IDistributionService(
-            _registry.getServiceAddress(
-                DISTRIBUTION(),
-                _instance.getRelease())).getDiscountPercentage(
+        return _distributionService.getDiscountPercentage(
                     this, // instance reader
                     referralId);
     }

package/contracts/instance/InstanceService.sol

@@ -175,7 +175,7 @@ contract InstanceService is
         IInstance(instanceAddress).getInstanceAdmin().setInstanceLocked(locked);
 
         emit LogInstanceServiceInstanceLocked(
-            getRegistry().getNftIdForAddress(instanceAddress),
+            _getRegistry().getNftIdForAddress(instanceAddress),
             locked);
     }
 
@@ -204,13 +204,11 @@ contract InstanceService is
         // MUST be set after instance is set up and registered
         IAuthorization instanceAuthorization = InstanceAdmin(_masterInstanceAdmin).getInstanceAuthorization();
         instanceAdmin.completeSetup(
-            address(getRegistry()),
             address(instanceAuthorization),
-            getRelease(),
             address(instance));
 
         // hard checks for newly cloned instance
-        assert(address(instance.getRegistry()) == address(getRegistry()));
+        //assert(address(instance._getRegistry()) == address(_getRegistry()));// consider deleting this
         assert(instance.getRelease() == getRelease());
 
         // register cloned instance as staking target
@@ -231,7 +229,7 @@ contract InstanceService is
         restricted()
         onlyInstance()
     {
-        NftId instanceNftId = getRegistry().getNftIdForAddress(msg.sender);
+        NftId instanceNftId = _getRegistry().getNftIdForAddress(msg.sender);
         _stakingService.setInstanceLockingPeriod(
             instanceNftId,
             stakeLockingPeriod);
@@ -244,7 +242,7 @@ contract InstanceService is
         restricted()
         onlyInstance()
     {
-        NftId instanceNftId = getRegistry().getNftIdForAddress(msg.sender);
+        NftId instanceNftId = _getRegistry().getNftIdForAddress(msg.sender);
         _stakingService.setInstanceRewardRate(
             instanceNftId,
             rewardRate);
@@ -256,7 +254,7 @@ contract InstanceService is
         restricted()
         onlyInstance()
     {
-        NftId instanceNftId = getRegistry().getNftIdForAddress(msg.sender);
+        NftId instanceNftId = _getRegistry().getNftIdForAddress(msg.sender);
         _stakingService.setInstanceMaxStakedAmount(
             instanceNftId,
             maxStakedAmount);
@@ -270,7 +268,7 @@ contract InstanceService is
         onlyInstance()
         returns (Amount newBalance)
     {
-        NftId instanceNftId = getRegistry().getNftIdForAddress(msg.sender);
+        NftId instanceNftId = _getRegistry().getNftIdForAddress(msg.sender);
         newBalance = _stakingService.refillInstanceRewardReserves(
             instanceNftId,
             rewardProvider,
@@ -285,7 +283,7 @@ contract InstanceService is
         onlyInstance()
         returns (Amount newBalance)
     {
-        NftId instanceNftId = getRegistry().getNftIdForAddress(msg.sender);
+        NftId instanceNftId = _getRegistry().getNftIdForAddress(msg.sender);
         newBalance = _stakingService.withdrawInstanceRewardReserves(
             instanceNftId,
             dipAmount);
@@ -308,7 +306,7 @@ contract InstanceService is
         instance.setInstanceReader(upgradedInstanceReaderClone);
 
         emit LogInstanceServiceInstanceReaderUpgraded(
-            getRegistry().getNftIdForAddress(instanceAddress),
+            _getRegistry().getNftIdForAddress(instanceAddress),
             address(upgradedInstanceReaderClone));
     }
 
@@ -349,6 +347,7 @@ 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(); }
@@ -391,7 +390,7 @@ contract InstanceService is
         _masterInstanceReader = instanceReaderAddress;
 
         emit LogInstanceServiceMasterInstanceReaderUpgraded(
-            getRegistry().getNftIdForAddress(_masterInstance),
+            _getRegistry().getNftIdForAddress(_masterInstance),
             instanceReaderAddress);
     }
 
@@ -419,7 +418,8 @@ contract InstanceService is
 
         clonedAdmin.initialize(
             address(clonedAccessManager),
-            "InstanceAdmin");
+            "InstanceAdmin",
+            getRelease());
     }
 
 
@@ -445,8 +445,6 @@ contract InstanceService is
                 riskSet: RiskSet(Clones.clone(_masterInstanceRiskSet)),
                 instanceReader: InstanceReader(Clones.clone(address(_masterInstanceReader)))
             }),
-            getRegistry(),
-            getRelease(),
             instanceOwner,
             allowAnyToken);
 
@@ -461,14 +459,13 @@ contract InstanceService is
     )
         internal
         virtual override
-        initializer()
+        onlyInitializing()
     {
         (
-            address authority,
-            address registry
-        ) = abi.decode(data, (address, address));
+            address authority
+        ) = abi.decode(data, (address));
 
-        __Service_init(authority, registry, owner);
+        __Service_init(authority, owner);
 
         _registryService = IRegistryService(_getServiceAddress(REGISTRY()));
         _stakingService = IStakingService(_getServiceAddress(STAKING()));
@@ -486,7 +483,8 @@ contract InstanceService is
         virtual
         view
     {
-        IRegistry registry = getRegistry();
+        // TODO use ContractLib to verify registration, type and release
+        IRegistry registry = _getRegistry();
 
         NftId instanceNftId = registry.getNftIdForAddress(instanceAddress);
         if (instanceNftId.eqz()) {

package/contracts/instance/InstanceServiceManager.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {IVersionable} from "../upgradeability/IVersionable.sol";
+import {IUpgradeable} from "../upgradeability/IUpgradeable.sol";
 import {ProxyManager} from "../upgradeability/ProxyManager.sol";
 import {InstanceService} from "./InstanceService.sol";
 
@@ -12,19 +12,17 @@ contract InstanceServiceManager is ProxyManager {
     /// @dev initializes proxy manager with instance service implementation
     constructor(
         address authority, 
-        address registry,
         bytes32 salt
     ) 
     {
         InstanceService svc = new InstanceService{salt: salt}();
-        bytes memory data = abi.encode(authority, registry);
-        IVersionable versionable = initialize(
-            registry,
+        bytes memory data = abi.encode(authority);
+        IUpgradeable upgradeable = initialize(
             address(svc), 
             data,
             salt);
 
-        _instanceService = InstanceService(address(versionable));
+        _instanceService = InstanceService(address(upgradeable));
     }
 
     //--- view functions ----------------------------------------------------//

package/contracts/instance/base/Cloneable.sol

@@ -4,25 +4,19 @@ pragma solidity ^0.8.20;
 import {AccessManagedUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";
 
 import {IRegistry} from "../../registry/IRegistry.sol";
+import {RegistryLinked} from "../../shared/RegistryLinked.sol";
 
 abstract contract Cloneable is 
-    AccessManagedUpgradeable
+    AccessManagedUpgradeable,
+    RegistryLinked
 {
-    IRegistry internal _registry;
-
     /// @dev call to initialize MUST be made in the same transaction as cloning of the contract
     function __Cloneable_init(
-        address authority,
-        address registry
+        address authority
     )
         internal 
         onlyInitializing
     {
         __AccessManaged_init(authority);
-        _registry = IRegistry(registry);
-    }
-
-    function getRegistry() external view returns (IRegistry) {
-        return _registry;
     }
 }

package/contracts/instance/base/ObjectSet.sol

@@ -21,12 +21,12 @@ contract ObjectSet is
     address internal _instanceAddress;
 
     /// @dev This initializer needs to be called from the instance itself.
-    function initialize(address authority, address registry) 
+    function initialize(address authority) 
         external
         initializer()
     {
         _instanceAddress = msg.sender;
-        __Cloneable_init(authority, registry);
+        __Cloneable_init(authority);
         
         emit LogObjectSetInitialized(address(_instanceAddress));
     }

package/contracts/oracle/BasicOracle.sol

@@ -23,7 +23,6 @@ contract BasicOracle is
     }
 
     function _initializeBasicOracle(
-        address registry,
         NftId instanceNftId,
         IAuthorization authorization,
         address initialOwner,
@@ -35,7 +34,6 @@ contract BasicOracle is
     {
 
         __Oracle_init(
-            registry,
             instanceNftId,
             authorization,
             initialOwner,

package/contracts/oracle/BasicOracleAuthorization.sol

@@ -8,6 +8,8 @@ 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
@@ -21,7 +23,7 @@ contract BasicOracleAuthorization
           Authorization(
                componentName, 
                ORACLE(), 
-               3, 
+               GIF_INITIAL_RELEASE(),
                commitHash, 
                TargetType.Component, 
                false)

package/contracts/oracle/IOracleService.sol

@@ -18,13 +18,9 @@ interface IOracleService is IService {
     event LogOracleServiceRequestCancelled(RequestId requestId, NftId requesterNftId);
 
     // create request
-    error ErrorOracleServiceProductMismatch(ObjectType callerObjectType, NftId productNft, NftId oracleParentNftId);
     error ErrorOracleServiceExpiryInThePast(Timestamp blockTimestamp, Timestamp expiryAt);
     error ErrorOracleServiceCallbackMethodNameEmpty();
 
-    // respond
-    error ErrorOracleServiceNotResponsibleOracle(RequestId requestId, NftId expectedOracleNftId, NftId oracleNftId);
-
     // get request info
     error ErrorOracleServiceRequestStateNotActive(RequestId requestId, StateId state);
     error ErrorOracleServiceCallerNotResponsibleOracle(RequestId requestId, NftId oracleNftId, NftId callerNftId);

package/contracts/oracle/Oracle.sol

@@ -5,10 +5,11 @@ 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 {IInstanceLinkedComponent} from "../shared/IInstanceLinkedComponent.sol";
+import {IComponent} from "../shared/IComponent.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";
@@ -66,7 +67,7 @@ abstract contract Oracle is
     function withdrawFees(Amount amount)
         external
         virtual
-        override(IInstanceLinkedComponent, InstanceLinkedComponent)
+        override(IComponent, Component)
         onlyOwner()
         restricted()
         returns (Amount)
@@ -76,7 +77,6 @@ abstract contract Oracle is
 
 
     function __Oracle_init(
-        address registry,
         NftId productNftId,
         IAuthorization authorization,
         address initialOwner,
@@ -87,7 +87,6 @@ abstract contract Oracle is
         onlyInitializing()
     {
         __InstanceLinkedComponent_init(
-            registry, 
             productNftId, 
             name, 
             ORACLE(), 

package/contracts/oracle/OracleService.sol

@@ -29,14 +29,13 @@ contract OracleService is
     )
         internal
         virtual override
-        initializer()
+        onlyInitializing()
     {
         (
-            address authority,
-            address registry
-        ) = abi.decode(data, (address, address));
+            address authority
+        ) = abi.decode(data, (address));
 
-        __Service_init(authority, registry, owner);
+        __Service_init(authority, owner);
         _registerInterface(type(IOracleService).interfaceId);
     }
 
@@ -49,25 +48,24 @@ contract OracleService is
         external 
         virtual 
         restricted()
-        onlyNftOfType(oracleNftId, ORACLE())
         returns (RequestId requestId) 
     {
         // checks
-        // get and check active caller
-        (
-            IRegistry.ObjectInfo memory requesterInfo, 
-            address instance
-        ) = ContractLib.getAndVerifyAnyComponent(
-            getRegistry(), msg.sender, true);
-
-        (
-            NftId requesterNftId,
-            IOracleComponent oracle
-        ) = _checkRequestParams(
-            getRegistry(), oracleNftId, requesterInfo, expiryAt, callbackMethodName);
+        NftId requesterNftId; // component
+        IOracleComponent oracle;
 
-        // effects
         {
+            IInstance instance;
+            (
+                requesterNftId, 
+                oracle, 
+                instance
+            ) = ContractLib.getAndVerifyComponentAndOracle(
+                oracleNftId, getRelease());
+            
+            _checkRequestParams(expiryAt, callbackMethodName);
+
+            // effects
             // create request info
             IOracle.RequestInfo memory request = IOracle.RequestInfo({
                 requesterNftId: requesterNftId,
@@ -81,7 +79,7 @@ contract OracleService is
             });
 
             // store request with instance
-            requestId = IInstance(instance).getInstanceStore().createRequest(request);
+            requestId = instance.getInstanceStore().createRequest(request);
         }
 
         emit LogOracleServiceRequestCreated(requestId, requesterNftId, oracleNftId, expiryAt);
@@ -108,13 +106,11 @@ contract OracleService is
         returns (bool success)
     {
         (
-            IRegistry.ObjectInfo memory info, 
-            address instanceAddress
+            NftId oracleNftId,
+            IInstance instance
         ) = ContractLib.getAndVerifyComponent(
-            getRegistry(), msg.sender, ORACLE(), true);
+                msg.sender, ORACLE(), getRelease(), true);
 
-        NftId oracleNftId = info.nftId;
-        IInstance instance = IInstance(instanceAddress);
         bool callerIsOracle = true;
         IOracle.RequestInfo memory request = _checkAndGetRequestInfo(instance, requestId, oracleNftId, callerIsOracle);
         request.responseData = responseData;
@@ -123,7 +119,7 @@ contract OracleService is
         instance.getInstanceStore().updateRequest(
             requestId, request, KEEP_STATE());
 
-        IRegistry.ObjectInfo memory requesterInfo = getRegistry().getObjectInfo(
+        IRegistry.ObjectInfo memory requesterInfo = _getRegistry().getObjectInfo(
             request.requesterNftId);
 
         string memory functionSignature = string(
@@ -156,24 +152,25 @@ contract OracleService is
         restricted()
     {
         (
-            IRegistry.ObjectInfo memory info, 
-            address instanceAddress
-        ) = ContractLib.getAndVerifyAnyComponent(
-            getRegistry(), msg.sender, true);
+            // !!! TODO requesterNftId is in request.requesterNftId
+            // here is responder nft id?
+            NftId requesterNftId, // component
+            IInstance instance
+        ) = ContractLib.getAndVerifyComponent(
+                msg.sender, COMPONENT(), getRelease(), true);
 
-        NftId requesterNftId = info.nftId;
-        IInstance instance = IInstance(instanceAddress);
         bool callerIsOracle = false;
         IOracle.RequestInfo memory request = _checkAndGetRequestInfo(instance, requestId, requesterNftId, callerIsOracle);
 
         // attempt to deliver response to requester
+        address requester = msg.sender;
         string memory functionSignature = string(
             abi.encodePacked(
                 request.callbackMethodName,
                 "(uint64,bytes)"
             ));
 
-        (bool success, bytes memory returnData) = info.objectAddress.call(
+        (bool success, bytes memory returnData) = requester.call(
             abi.encodeWithSignature(
                 functionSignature, 
                 requestId,
@@ -184,7 +181,8 @@ contract OracleService is
             instance.getInstanceStore().updateRequestState(requestId, FULFILLED());
             emit LogOracleServiceResponseResent(requestId, requesterNftId);
         } else {
-            emit LogOracleServiceDeliveryFailed(requestId, info.objectAddress, functionSignature);
+            // TODO why requester address instead of nftId?
+            emit LogOracleServiceDeliveryFailed(requestId, requester, functionSignature);
         }
     }
 
@@ -195,13 +193,11 @@ contract OracleService is
         restricted()
     {
         (
-            IRegistry.ObjectInfo memory info, 
-            address instanceAddress
-        ) = ContractLib.getAndVerifyAnyComponent(
-            getRegistry(), msg.sender, true);
+            NftId requesterNftId, // component
+            IInstance instance
+        ) = ContractLib.getAndVerifyComponent(
+                msg.sender, COMPONENT(), getRelease(), true);
 
-        NftId requesterNftId = info.nftId;
-        IInstance instance = IInstance(instanceAddress);
         bool callerIsOracle = false;
         // TODO property isCancelled and state update to CANCELLED are redundant, get rid of isCancelled
         IOracle.RequestInfo memory request = _checkAndGetRequestInfo(instance, requestId, requesterNftId, callerIsOracle);
@@ -211,7 +207,7 @@ contract OracleService is
 
         // call oracle component
         // TODO add check that oracle is active?
-        address oracleAddress = getRegistry().getObjectAddress(request.oracleNftId);
+        address oracleAddress = _getRegistry().getObjectAddress(request.oracleNftId);
         IOracleComponent(oracleAddress).cancel(requestId);
 
         emit LogOracleServiceRequestCancelled(requestId, requesterNftId);
@@ -219,39 +215,13 @@ contract OracleService is
 
 
     function _checkRequestParams(
-        IRegistry registry,
-        NftId oracleNftId,
-        IRegistry.ObjectInfo memory requesterInfo,
         Timestamp expiryAt,
         string memory callbackMethodName
     )
         internal
         virtual
         view
-        returns (
-            NftId requesterNftId,
-            IOracleComponent oracle
-        )
     {
-        // get oracle info
-        (IRegistry.ObjectInfo memory oracleInfo,) = ContractLib.getInfoAndInstance(
-            registry, oracleNftId, true);
-
-        // obtain return values
-        requesterNftId = requesterInfo.nftId;
-        oracle = IOracleComponent(oracleInfo.objectAddress);
-
-        // check that requester and oracle share same product cluster
-        if (requesterInfo.objectType == PRODUCT()) {
-            if (oracleInfo.parentNftId != requesterNftId) {
-                revert ErrorOracleServiceProductMismatch(requesterInfo.objectType, requesterNftId, oracleInfo.parentNftId);
-            }
-        } else {
-            if (oracleInfo.parentNftId != requesterInfo.parentNftId) {
-                revert ErrorOracleServiceProductMismatch(requesterInfo.objectType, requesterInfo.parentNftId, oracleInfo.parentNftId);
-            }
-        }
-
         // check expiriyAt >= now
         if (expiryAt < TimestampLib.current()) {
             revert ErrorOracleServiceExpiryInThePast(TimestampLib.current(), expiryAt);

package/contracts/oracle/OracleServiceManager.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {IVersionable} from "../upgradeability/IVersionable.sol";
+import {IUpgradeable} from "../upgradeability/IUpgradeable.sol";
 import {ProxyManager} from "../upgradeability/ProxyManager.sol";
 import {OracleService} from "./OracleService.sol";
 
@@ -12,19 +12,17 @@ contract OracleServiceManager is ProxyManager {
     /// @dev initializes proxy manager with service implementation and deploys instance
     constructor(
         address authority, 
-        address registry,
         bytes32 salt
     ) 
     {
         OracleService svc = new OracleService{salt: salt}();
-        bytes memory data = abi.encode(authority, registry);
-        IVersionable versionable = initialize(
-            registry,
+        bytes memory data = abi.encode(authority);
+        IUpgradeable upgradeable = initialize(
             address(svc), 
             data,
             salt);
 
-        _oracleService = OracleService(address(versionable));
+        _oracleService = OracleService(address(upgradeable));
     }
 
     //--- view functions ----------------------------------------------------//

package/contracts/pool/BasicPool.sol

@@ -18,7 +18,6 @@ abstract contract BasicPool is
 {
 
     function _initializeBasicPool(
-        address registry,
         NftId productNftId,
         string memory name,
         IComponents.PoolInfo memory poolInfo,
@@ -30,7 +29,6 @@ abstract contract BasicPool is
         onlyInitializing()
     {
         __Pool_init(
-            registry, 
             productNftId, 
             name, 
             poolInfo, 
@@ -45,8 +43,8 @@ abstract contract BasicPool is
         public
         virtual
         restricted()
-        onlyBundleOwner(bundleNftId)
-        onlyNftOfType(bundleNftId, BUNDLE())
+        onlyBundleOwner(bundleNftId) // TODO single modifier to check everything about given arbitrary nftId
+        onlyNftOfType(bundleNftId, BUNDLE()) // TODO service will check this
     {
         _stake(bundleNftId, amount);
     }