@etherisc/gif-next 3.0.0-ab0fcb2-112 → 3.0.0-bd6db59-832

package/contracts/examples/unpermissioned/SimpleProduct.sol

@@ -34,6 +34,7 @@ contract SimpleProduct is
     IOracleService private _oracleService;
 
     constructor(
+        address registry,
         NftId instanceNftId,
         string memory name,
         IComponents.ProductInfo memory productInfo,
@@ -43,6 +44,7 @@ contract SimpleProduct is
     )
     {
         initialize(
+            registry,
             instanceNftId,
             name,
             productInfo,
@@ -53,6 +55,7 @@ contract SimpleProduct is
 
 
     function initialize(
+        address registry,
         NftId instanceNftid,
         string memory name,
         IComponents.ProductInfo memory productInfo,
@@ -65,6 +68,7 @@ contract SimpleProduct is
         initializer()
     {
         _initializeBasicProduct(
+            registry,
             instanceNftid,
             name,
             productInfo,

package/contracts/instance/Instance.sol

@@ -26,6 +26,8 @@ contract Instance is
     IInstance,
     Registerable
 {
+    bool private _initialized;
+
     IComponentService internal _componentService;
     IInstanceService internal _instanceService;
 
@@ -57,6 +59,8 @@ contract Instance is
 
     function initialize(
         InstanceContracts memory instanceContracts,
+        IRegistry registry, 
+        VersionPart release,
         address initialOwner,
         bool tokenRegistryDisabled // only disable for testing
     ) 
@@ -70,9 +74,9 @@ contract Instance is
         _instanceAdmin = instanceContracts.instanceAdmin;
 
         // setup instance object info
-        IRegistry registry = _getRegistry();
         __Registerable_init({
             authority: instanceContracts.instanceAdmin.authority(),
+            registry: address(registry), 
             parentNftId: registry.getNftId(), 
             objectType: INSTANCE(), 
             isInterceptor: false, 
@@ -89,19 +93,19 @@ contract Instance is
         // initialize instance supporting contracts
         _instanceStore.initialize();
         _productStore.initialize();
-        _bundleSet.initialize(instanceContracts.instanceAdmin.authority());
-        _riskSet.initialize(instanceContracts.instanceAdmin.authority());
+        _bundleSet.initialize(instanceContracts.instanceAdmin.authority(), address(registry));
+        _riskSet.initialize(instanceContracts.instanceAdmin.authority(), address(registry));
         _instanceReader.initialize();
 
         _componentService = IComponentService(
-            registry.getServiceAddress(
+            getRegistry().getServiceAddress(
                 COMPONENT(), 
-                getRelease()));
+                release));
 
         _instanceService = IInstanceService(
-            registry.getServiceAddress(
+            getRegistry().getServiceAddress(
                 INSTANCE(), 
-                getRelease()));
+                release));
 
         _tokenRegistryDisabled = tokenRegistryDisabled;
 

package/contracts/instance/InstanceAdmin.sol

@@ -11,10 +11,9 @@ 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 {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 {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";
 
 
 contract InstanceAdmin is
@@ -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");
     }
 
 
@@ -52,23 +51,32 @@ contract InstanceAdmin is
     /// Important: Initialization of instance admin is only complete after calling this function. 
     /// Important: The instance MUST be registered and all instance supporting contracts must be wired to this instance.
     function completeSetup(
+        address registry,
         address authorization,
+        VersionPart release,
         address instance
     )
         external
+        reinitializer(uint64(release.toInt()))
     {
         // checks
-        AccessAdminLib.checkIsRegistered(instance, INSTANCE(), getRelease());
+        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
 
+        _registry = IRegistry(registry);
         _instance = IInstance(instance);
         _authorization = IAuthorization(authorization);
         _customRoleIdNext = 0;
@@ -97,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,
@@ -122,13 +130,11 @@ 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(
         address componentAddress,
-        ObjectType expectedType,
-        VersionPart expectedRelease
+        ObjectType expectedType
     )
         external
         restricted()

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

@@ -28,7 +28,6 @@ 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";
@@ -41,19 +40,14 @@ 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 is
-    RegistryLinked
-{
+contract InstanceReader {
 
     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;
 
@@ -84,24 +78,27 @@ contract InstanceReader is
         _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(
-            _getRegistry().getServiceAddress(DISTRIBUTION(), _instance.getRelease()));
+        _distributionService = IDistributionService(_registry.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 _getRegistry().getNftIdForAddress(address(_instance));
+        return _registry.getNftIdForAddress(address(_instance));
     }
 
 
@@ -438,7 +435,7 @@ contract InstanceReader is
         return _store.getReferralInfo(referralId);
     }
 
-    // TODO reader dependce on service os wrong?
+
     function getDiscountPercentage(ReferralId referralId)
         public
         view
@@ -447,7 +444,10 @@ contract InstanceReader is
             ReferralStatus status
         )
     {
-        return _distributionService.getDiscountPercentage(
+        return IDistributionService(
+            _registry.getServiceAddress(
+                DISTRIBUTION(),
+                _instance.getRelease())).getDiscountPercentage(
                     this, // instance reader
                     referralId);
     }
@@ -466,6 +466,12 @@ contract InstanceReader is
     }
 
 
+    /// @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) {

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(),