@etherisc/gif-next 3.0.0-82728fa-320 → 3.0.0-83fcfa1-064

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)
@@ -77,6 +76,7 @@ abstract contract Oracle is
 
 
     function __Oracle_init(
+        address registry,
         NftId productNftId,
         IAuthorization authorization,
         address initialOwner,
@@ -87,6 +87,7 @@ abstract contract Oracle is
         onlyInitializing()
     {
         __InstanceLinkedComponent_init(
+            registry, 
             productNftId, 
             name, 
             ORACLE(), 
@@ -139,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,13 +29,14 @@ contract OracleService is
     )
         internal
         virtual override
-        onlyInitializing()
+        initializer()
     {
         (
-            address authority
-        ) = abi.decode(data, (address));
+            address authority,
+            address registry
+        ) = abi.decode(data, (address, address));
 
-        __Service_init(authority, owner);
+        __Service_init(authority, registry, owner);
         _registerInterface(type(IOracleService).interfaceId);
     }
 
@@ -48,24 +49,25 @@ contract OracleService is
         external 
         virtual 
         restricted()
+        onlyNftOfType(oracleNftId, ORACLE())
         returns (RequestId requestId) 
     {
         // checks
-        NftId requesterNftId; // component
-        IOracleComponent oracle;
+        // 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);
 
+        // 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,
@@ -79,7 +81,7 @@ contract OracleService is
             });
 
             // store request with instance
-            requestId = instance.getInstanceStore().createRequest(request);
+            requestId = IInstance(instance).getInstanceStore().createRequest(request);
         }
 
         emit LogOracleServiceRequestCreated(requestId, requesterNftId, oracleNftId, expiryAt);
@@ -106,11 +108,13 @@ contract OracleService is
         returns (bool success)
     {
         (
-            NftId oracleNftId,
-            IInstance instance
+            IRegistry.ObjectInfo memory info, 
+            address instanceAddress
         ) = ContractLib.getAndVerifyComponent(
-                msg.sender, ORACLE(), getRelease(), true);
+            getRegistry(), msg.sender, ORACLE(), true);
 
+        NftId oracleNftId = info.nftId;
+        IInstance instance = IInstance(instanceAddress);
         bool callerIsOracle = true;
         IOracle.RequestInfo memory request = _checkAndGetRequestInfo(instance, requestId, oracleNftId, callerIsOracle);
         request.responseData = responseData;
@@ -119,7 +123,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(
@@ -152,25 +156,24 @@ contract OracleService is
         restricted()
     {
         (
-            // !!! TODO requesterNftId is in request.requesterNftId
-            // here is responder nft id?
-            NftId requesterNftId, // component
-            IInstance instance
-        ) = ContractLib.getAndVerifyComponent(
-                msg.sender, COMPONENT(), getRelease(), true);
+            IRegistry.ObjectInfo memory info, 
+            address instanceAddress
+        ) = ContractLib.getAndVerifyAnyComponent(
+            getRegistry(), msg.sender, 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) = requester.call(
+        (bool success, bytes memory returnData) = info.objectAddress.call(
             abi.encodeWithSignature(
                 functionSignature, 
                 requestId,
@@ -181,8 +184,7 @@ contract OracleService is
             instance.getInstanceStore().updateRequestState(requestId, FULFILLED());
             emit LogOracleServiceResponseResent(requestId, requesterNftId);
         } else {
-            // TODO why requester address instead of nftId?
-            emit LogOracleServiceDeliveryFailed(requestId, requester, functionSignature);
+            emit LogOracleServiceDeliveryFailed(requestId, info.objectAddress, functionSignature);
         }
     }
 
@@ -193,11 +195,13 @@ contract OracleService is
         restricted()
     {
         (
-            NftId requesterNftId, // component
-            IInstance instance
-        ) = ContractLib.getAndVerifyComponent(
-                msg.sender, COMPONENT(), getRelease(), true);
+            IRegistry.ObjectInfo memory info, 
+            address instanceAddress
+        ) = ContractLib.getAndVerifyAnyComponent(
+            getRegistry(), msg.sender, 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);
@@ -207,7 +211,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);
@@ -215,13 +219,39 @@ 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 {IUpgradeable} from "../upgradeability/IUpgradeable.sol";
+import {IVersionable} from "../upgradeability/IVersionable.sol";
 import {ProxyManager} from "../upgradeability/ProxyManager.sol";
 import {OracleService} from "./OracleService.sol";
 
@@ -12,17 +12,19 @@ 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);
-        IUpgradeable upgradeable = initialize(
+        bytes memory data = abi.encode(authority, registry);
+        IVersionable versionable = initialize(
+            registry,
             address(svc), 
             data,
             salt);
 
-        _oracleService = OracleService(address(upgradeable));
+        _oracleService = OracleService(address(versionable));
     }
 
     //--- view functions ----------------------------------------------------//

package/contracts/pool/BasicPool.sol

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

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

@@ -12,11 +12,11 @@ import {InstanceStore} from "../instance/InstanceStore.sol";
 
 import {Amount, AmountLib} from "../type/Amount.sol";
 import {BundleSet} from "../instance/BundleSet.sol";
-import {ContractLib} from "../shared/ContractLib.sol";
 import {Fee} from "../type/Fee.sol";
 import {InstanceReader} from "../instance/InstanceReader.sol";
 import {NftId, NftIdLib} from "../type/NftId.sol";
 import {ObjectType, ACCOUNTING, COMPONENT, POOL, BUNDLE, POLICY, REGISTRY} from "../type/ObjectType.sol";
+import {PoolLib} from "./PoolLib.sol";
 import {Seconds} from "../type/Seconds.sol";
 import {Service} from "../shared/Service.sol";
 import {StateId, ACTIVE, PAUSED, CLOSED, KEEP_STATE} from "../type/StateId.sol";
@@ -41,13 +41,14 @@ contract BundleService is
     )
         internal
         virtual override
-        onlyInitializing()
+        initializer()
     {
         (
-            address authority
-        ) = abi.decode(data, (address));
+            address authority,
+            address registry
+        ) = abi.decode(data, (address, address));
 
-        __Service_init(authority, owner);
+        __Service_init(authority, registry, owner);
 
         _registryService = IRegistryService(_getServiceAddress(REGISTRY()));
         _accountingService = IAccountingService(_getServiceAddress(ACCOUNTING()));
@@ -65,12 +66,9 @@ contract BundleService is
         virtual
         restricted()
     {
-        (
-            NftId poolNftId, 
-            IInstance instance
-        ) = ContractLib.getAndVerifyPoolForBundle(
-            bundleNftId, getRelease());
+        _checkNftType(bundleNftId, BUNDLE());
 
+        (NftId poolNftId, IInstance instance) = PoolLib.getAndVerifyActivePool(getRegistry(), msg.sender);
         InstanceReader instanceReader = instance.getInstanceReader();
         IBundle.BundleInfo memory bundleInfo = instanceReader.getBundleInfo(bundleNftId);
         if(bundleInfo.poolNftId.eqz()) {
@@ -99,10 +97,7 @@ contract BundleService is
         restricted()
         returns(NftId bundleNftId)
     {
-        (
-            NftId poolNftId, 
-            IInstance instance
-        ) = ContractLib.getAndVerifyPool(getRelease());
+        (NftId poolNftId, IInstance instance) = PoolLib.getAndVerifyActivePool(getRegistry(), msg.sender);
 
         // register bundle with registry
         bundleNftId = _registryService.registerBundle(
@@ -110,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
@@ -196,8 +191,9 @@ contract BundleService is
         restricted()
     {
         // checks
-        (, IInstance instance) = ContractLib.getAndVerifyPoolForBundle(
-            bundleNftId, getRelease());
+        _checkNftType(bundleNftId, BUNDLE());
+
+        (, IInstance instance) = PoolLib.getAndVerifyActivePool(getRegistry(), msg.sender);
 
         // effects
         // update set of active bundles
@@ -335,12 +331,9 @@ contract BundleService is
         returns (Timestamp extendedExpiredAt) 
     {
         // checks
-        (
-            NftId poolNftId, 
-            IInstance instance
-        ) = ContractLib.getAndVerifyPoolForBundle(
-            bundleNftId, getRelease());
+        _checkNftType(bundleNftId, BUNDLE());
 
+        (NftId poolNftId, IInstance instance) = PoolLib.getAndVerifyActivePool(getRegistry(), msg.sender);
         IBundle.BundleInfo memory bundleInfo = instance.getInstanceReader().getBundleInfo(bundleNftId);
         StateId bundleState = instance.getInstanceReader().getBundleState(bundleNftId);
 
@@ -386,6 +379,7 @@ contract BundleService is
         emit LogBundleServiceCollateralReleased(bundleNftId, policyNftId, collateralAmount);
     }
 
+
     function _getDomain() internal pure override returns(ObjectType) {
         return BUNDLE();
     }

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";
 
@@ -11,18 +11,20 @@ contract BundleServiceManager is ProxyManager {
 
     /// @dev initializes proxy manager with pool service implementation 
     constructor(
-        address authority,
+        address authority, 
+        address registry,
         bytes32 salt
     ) 
     {
         BundleService svc = new BundleService{salt: salt}();
-        bytes memory data = abi.encode(authority);
-        IUpgradeable upgradeable = initialize(
+        bytes memory data = abi.encode(authority, registry);
+        IVersionable versionable = initialize(
+            registry,
             address(svc), 
             data,
             salt);
 
-        _bundleService = BundleService(address(upgradeable));
+        _bundleService = BundleService(address(versionable));
     }
 
     //--- view functions ----------------------------------------------------//

package/contracts/pool/IPoolService.sol

@@ -18,14 +18,15 @@ interface IPoolService is IService {
     event LogPoolServiceWalletFunded(NftId poolNftId, address poolOwner, Amount amount);
     event LogPoolServiceWalletDefunded(NftId poolNftId, address poolOwner, Amount amount);
 
-    event LogPoolServiceBundleClosed(NftId poolNftId, NftId bundleNftId);
+    event LogPoolServiceBundleCreated(NftId instanceNftId, NftId poolNftId, NftId bundleNftId);
+    event LogPoolServiceBundleClosed(NftId instanceNftId, NftId poolNftId, NftId bundleNftId);
 
-    event LogPoolServiceBundleStaked(NftId poolNftId, NftId bundleNftId, Amount amount, Amount netAmount);
-    event LogPoolServiceBundleUnstaked(NftId poolNftId, NftId bundleNftId, Amount amount, Amount netAmount);
+    event LogPoolServiceBundleStaked(NftId instanceNftId, NftId poolNftId, NftId bundleNftId, Amount amount, Amount netAmount);
+    event LogPoolServiceBundleUnstaked(NftId instanceNftId, NftId poolNftId, NftId bundleNftId, Amount amount, Amount netAmount);
 
-    event LogPoolServiceFeesWithdrawn(NftId poolNftId, NftId bundleNftId, address recipient, address tokenAddress, Amount amount);
+    event LogPoolServiceFeesWithdrawn(NftId bundleNftId, address recipient, address tokenAddress, Amount amount);
 
-    event LogPoolServiceProcessFundedClaim(NftId poolNftId, NftId policyNftId, ClaimId claimId, Amount availableAmount);
+    event LogPoolServiceProcessFundedClaim(NftId policyNftId, ClaimId claimId, Amount availableAmount);
 
     event LogPoolServiceApplicationVerified(NftId poolNftId, NftId bundleNftId, NftId applicationNftId, Amount totalCollateralAmount);
     event LogPoolServiceCollateralLocked(NftId poolNftId, NftId bundleNftId, NftId applicationNftId, Amount totalCollateralAmount, Amount lockedCollateralAmount);

package/contracts/pool/Pool.sol

@@ -35,7 +35,7 @@ abstract contract Pool is
 
 
     modifier onlyBundleOwner(NftId bundleNftId) {
-        if(msg.sender != _getRegistry().ownerOf(bundleNftId)) {
+        if(msg.sender != getRegistry().ownerOf(bundleNftId)) {
             revert ErrorPoolNotBundleOwner(bundleNftId, msg.sender);
         }
         _;
@@ -124,6 +124,7 @@ abstract contract Pool is
     // Internals
 
     function __Pool_init(
+        address registry,
         NftId productNftId,
         string memory name,
         IComponents.PoolInfo memory poolInfo,
@@ -135,6 +136,7 @@ abstract contract Pool is
         onlyInitializing()
     {
         __InstanceLinkedComponent_init(
+            registry, 
             productNftId,  
             name, 
             POOL(),