@etherisc/gif-next 3.0.0-1b49bd6-565 → 3.0.0-1bd1936-188

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,11 +204,13 @@ 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()));// consider deleting this
+        assert(address(instance.getRegistry()) == address(getRegistry()));
         assert(instance.getRelease() == getRelease());
 
         // register cloned instance as staking target
@@ -229,7 +231,7 @@ contract InstanceService is
         restricted()
         onlyInstance()
     {
-        NftId instanceNftId = _getRegistry().getNftIdForAddress(msg.sender);
+        NftId instanceNftId = getRegistry().getNftIdForAddress(msg.sender);
         _stakingService.setInstanceLockingPeriod(
             instanceNftId,
             stakeLockingPeriod);
@@ -242,7 +244,7 @@ contract InstanceService is
         restricted()
         onlyInstance()
     {
-        NftId instanceNftId = _getRegistry().getNftIdForAddress(msg.sender);
+        NftId instanceNftId = getRegistry().getNftIdForAddress(msg.sender);
         _stakingService.setInstanceRewardRate(
             instanceNftId,
             rewardRate);
@@ -254,7 +256,7 @@ contract InstanceService is
         restricted()
         onlyInstance()
     {
-        NftId instanceNftId = _getRegistry().getNftIdForAddress(msg.sender);
+        NftId instanceNftId = getRegistry().getNftIdForAddress(msg.sender);
         _stakingService.setInstanceMaxStakedAmount(
             instanceNftId,
             maxStakedAmount);
@@ -268,7 +270,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,
@@ -283,7 +285,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);
@@ -306,7 +308,7 @@ contract InstanceService is
         instance.setInstanceReader(upgradedInstanceReaderClone);
 
         emit LogInstanceServiceInstanceReaderUpgraded(
-            _getRegistry().getNftIdForAddress(instanceAddress),
+            getRegistry().getNftIdForAddress(instanceAddress),
             address(upgradedInstanceReaderClone));
     }
 
@@ -347,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(); }
@@ -390,7 +391,7 @@ contract InstanceService is
         _masterInstanceReader = instanceReaderAddress;
 
         emit LogInstanceServiceMasterInstanceReaderUpgraded(
-            _getRegistry().getNftIdForAddress(_masterInstance),
+            getRegistry().getNftIdForAddress(_masterInstance),
             instanceReaderAddress);
     }
 
@@ -418,8 +419,7 @@ contract InstanceService is
 
         clonedAdmin.initialize(
             address(clonedAccessManager),
-            "InstanceAdmin",
-            getRelease());
+            "InstanceAdmin");
     }
 
 
@@ -445,6 +445,8 @@ contract InstanceService is
                 riskSet: RiskSet(Clones.clone(_masterInstanceRiskSet)),
                 instanceReader: InstanceReader(Clones.clone(address(_masterInstanceReader)))
             }),
+            getRegistry(),
+            getRelease(),
             instanceOwner,
             allowAnyToken);
 
@@ -459,13 +461,14 @@ contract InstanceService 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()));
         _stakingService = IStakingService(_getServiceAddress(STAKING()));
@@ -483,8 +486,7 @@ contract InstanceService is
         virtual
         view
     {
-        // TODO use ContractLib to verify registration, type and release
-        IRegistry registry = _getRegistry();
+        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 {IUpgradeable} from "../upgradeability/IUpgradeable.sol";
+import {IVersionable} from "../upgradeability/IVersionable.sol";
 import {ProxyManager} from "../upgradeability/ProxyManager.sol";
 import {InstanceService} from "./InstanceService.sol";
 
@@ -12,17 +12,19 @@ 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);
-        IUpgradeable upgradeable = initialize(
+        bytes memory data = abi.encode(authority, registry);
+        IVersionable versionable = initialize(
+            registry,
             address(svc), 
             data,
             salt);
 
-        _instanceService = InstanceService(address(upgradeable));
+        _instanceService = InstanceService(address(versionable));
     }
 
     //--- view functions ----------------------------------------------------//

package/contracts/instance/base/Cloneable.sol

@@ -4,19 +4,25 @@ 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,
-    RegistryLinked
+    AccessManagedUpgradeable
 {
+    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 authority,
+        address registry
     )
         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) 
+    function initialize(address authority, address registry) 
         external
         initializer()
     {
         _instanceAddress = msg.sender;
-        __Cloneable_init(authority);
+        __Cloneable_init(authority, registry);
         
         emit LogObjectSetInitialized(address(_instanceAddress));
     }

package/contracts/oracle/BasicOracle.sol

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

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

@@ -18,9 +18,13 @@ 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,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(), 

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/IComponent.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