@etherisc/gif-next 0.0.2-7c8d286-020 → 0.0.2-7d488b3-675

package/contracts/instance/InstanceAdmin.sol

@@ -10,7 +10,7 @@ import {IInstance} from "./IInstance.sol";
 import {AccessAdmin} from "../authorization/AccessAdmin.sol";
 import {AccessManagerCloneable} from "../authorization/AccessManagerCloneable.sol";
 import {NftId} from "../type/NftId.sol";
-import {ObjectType, INSTANCE, ORACLE} from "../type/ObjectType.sol";
+import {ObjectType} from "../type/ObjectType.sol";
 import {RoleId, RoleIdLib} from "../type/RoleId.sol";
 import {Str, StrLib} from "../type/String.sol";
 import {TokenHandler} from "../shared/TokenHandler.sol";
@@ -21,19 +21,18 @@ contract InstanceAdmin is
     AccessAdmin
 {
     string public constant INSTANCE_TARGET_NAME = "Instance";
-    string public constant INSTANCE_ADMIN_TARGET_NAME = "InstanceAdmin";
     string public constant INSTANCE_STORE_TARGET_NAME = "InstanceStore";
+    string public constant INSTANCE_ADMIN_TARGET_NAME = "InstanceAdmin";
     string public constant BUNDLE_SET_TARGET_NAME = "BundleSet";
-    string public constant RISK_SET_TARGET_NAME = "RiskSet";
+    string public constant RISK_SET_TAGET_NAME = "RiskSet";
 
     uint64 public constant CUSTOM_ROLE_ID_MIN = 10000; // MUST be even
 
-    error ErrorInstanceAdminNotInstanceService(address caller);
-
-    error ErrorInstanceAdminNotRegistered(address instance);
-    error ErrorInstanceAdminNotInstance(address instance);
-    error ErrorInstanceAdminAlreadyAuthorized(address instance);
+    error ErrorInstanceAdminCallerNotInstanceOwner(address caller);
+    error ErrorInstanceAdminInstanceAlreadyLocked();
+    error ErrorInstanceAdminNotRegistered(address target);
 
+    error ErrorInstanceAdminAlreadyAuthorized(address target);
     error ErrorInstanceAdminNotComponentRole(RoleId roleId);
     error ErrorInstanceAdminRoleAlreadyExists(RoleId roleId);
     error ErrorInstanceAdminRoleTypeNotContract(RoleId roleId, IAccess.RoleType roleType);
@@ -43,134 +42,119 @@ contract InstanceAdmin is
 
     IInstance internal _instance;
     IRegistry internal _registry;
-    VersionPart internal _release;
     uint64 internal _customIdNext;
 
     mapping(address target => RoleId roleId) internal _targetRoleId;
     uint64 internal _components;
 
-    modifier onlyInstanceService() {
-        if (msg.sender != _registry.getServiceAddress(INSTANCE(), getRelease())) {
-            revert ErrorInstanceAdminNotInstanceService(msg.sender);
+    IAuthorization internal _instanceAuthorization;
+
+
+    modifier onlyInstanceOwner() {        
+        if(msg.sender != _registry.ownerOf(address(_instance))) {
+            revert ErrorInstanceAdminCallerNotInstanceOwner(msg.sender);
         }
         _;
     }
 
     /// @dev Only used for master instance admin.
-    constructor(address accessManager) {
-        initialize(
-            accessManager,
-            "MasterInstanceAdmin");
+    /// Contracts created via constructor come with disabled initializers.
+    constructor(
+        address instanceAuthorization
+    ) {
+        initialize(new AccessManagerCloneable());
+
+        _instanceAuthorization = IAuthorization(instanceAuthorization);
+
+        _disableInitializers();
     }
 
 
+    function initialize(
+        AccessManagerCloneable clonedAccessManager,
+        IRegistry registry,
+        VersionPart release
+    )
+        external
+        initializer()
+    {
+        __AccessAdmin_init(clonedAccessManager);
+
+        clonedAccessManager.completeSetup(
+            address(registry), 
+            release); 
+
+        _registry = registry;
+    }
+
     /// @dev Completes the initialization of this instance admin using the provided instance, registry and version.
     /// 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 instance,
-        address authorization,
-        VersionPart release
+        address authorization
     )
         external
-        reinitializer(uint64(release.toInt()))
+        reinitializer(uint64(getRelease().toInt()))
         onlyDeployer()
     {
-        // checks
-        _checkRegistry(registry);
-        _checkIsRegistered(registry, instance, INSTANCE());
-
-        AccessManagerCloneable(
-            authority()).completeSetup(
-                registry, 
-                release); 
-
-        _checkAuthorization(authorization, INSTANCE(), release, true);
-
-        // effects
-        _registry = IRegistry(registry);
-        _release = release;
-
-        _instance = IInstance(instance);
-        _authorization = IAuthorization(authorization);
         _components = 0;
         _customIdNext = CUSTOM_ROLE_ID_MIN;
+        _instance = IInstance(instance);
+        _instanceAuthorization = IAuthorization(authorization);
+
+        _checkTargetIsReadyForAuthorization(instance);
 
-        // link nft ownability to instance
-        _linkToNftOwnable(instance);
+        // check matching releases
+        if (_instanceAuthorization.getRelease() != getRelease()) {
+            revert ErrorInstanceAdminReleaseMismatch();
+        }
 
         // create instance role and target
         _setupInstance(instance);
 
         // add instance authorization
-        _createRoles(_authorization);
-        // _createTargets(_authorization);
-        _setupInstanceHelperTargetsWithRoles();
-        _createTargetAuthorizations(_authorization);
-    }
-
+        _createRoles(_instanceAuthorization);
 
-    function _createTargets(IAuthorization authorization)
-        internal
-    {
-        _createTargetWithRole(address(this), INSTANCE_ADMIN_TARGET_NAME, authorization.getTargetRole(StrLib.toStr(INSTANCE_ADMIN_TARGET_NAME)));
-        _createTargetWithRole(address(_instance.getInstanceStore()), INSTANCE_STORE_TARGET_NAME, authorization.getTargetRole(StrLib.toStr(INSTANCE_STORE_TARGET_NAME)));
-        _createTargetWithRole(address(_instance.getBundleSet()), BUNDLE_SET_TARGET_NAME, authorization.getTargetRole(StrLib.toStr(BUNDLE_SET_TARGET_NAME)));
-        _createTargetWithRole(address(_instance.getRiskSet()), RISK_SET_TARGET_NAME, authorization.getTargetRole(StrLib.toStr(RISK_SET_TARGET_NAME)));
+        _setupInstanceHelperTargetsWithRoles();
+        _createTargetAuthorizations(_instanceAuthorization);
     }
 
 
     /// @dev Initializes the authorization for the specified component.
     /// Important: The component MUST be registered.
     function initializeComponentAuthorization(
-        address componentAddress,
-        ObjectType expectedType
+        IInstanceLinkedComponent component
     )
         external
         restricted()
     {
         // checks
-        _checkIsRegistered(address(getRegistry()), componentAddress, expectedType);
-
-        IInstanceLinkedComponent component = IInstanceLinkedComponent(componentAddress);
-        IAuthorization authorization = component.getAuthorization();
-        _checkAuthorization(address(authorization), expectedType, getRelease(), false);
+        _checkTargetIsReadyForAuthorization(address(component));
 
-        // effects
-        // setup target and role for component (including token handler if applicable)
-        _setupComponentAndTokenHandler(component, expectedType);
+        // setup target and role for component (including token handler)
+        _setupComponentAndTokenHandler(component);
 
-        // create other roles and function authorizations
-        _createRoles(authorization);
+        // create other roles
+        IAuthorization authorization = component.getAuthorization();
+        _createRoles(authorization);        
         _createTargetAuthorizations(authorization);
     }
 
-    function getRelease()
-        public
-        view
-        override
-        returns (VersionPart release)
-    {
-        return _release;
-    }
-
-
     // create instance role and target
     function _setupInstance(address instance) internal {
-
         // create instance role
-        RoleId instanceRoleId = _authorization.getTargetRole(
-            _authorization.getMainTarget());
+        RoleId instanceRoleId = _instanceAuthorization.getTargetRole(
+            _instanceAuthorization.getMainTarget());
 
         _createRole(
             instanceRoleId,
-            _authorization.getRoleInfo(instanceRoleId));
+            _instanceAuthorization.getRoleInfo(instanceRoleId));
 
         // create instance target
         _createTarget(
             instance, 
-            _authorization.getMainTargetName(), 
+            _instanceAuthorization.getMainTargetName(), 
             true, // checkAuthority
             false); // custom
 
@@ -202,28 +186,21 @@ contract InstanceAdmin is
 
     function setInstanceLocked(bool locked)
         external
-        // not restricted(): need to operate on locked instances to unlock instance
-        onlyInstanceService()
+        onlyInstanceOwner()
     {
         AccessManagerCloneable accessManager = AccessManagerCloneable(authority());
+
+        if(accessManager.isLocked() == locked) {
+            revert ErrorInstanceAdminInstanceAlreadyLocked();
+        }
         accessManager.setLocked(locked);
     }
 
-
     function setTargetLocked(address target, bool locked) 
-        external 
-        // not restricted(): might need to operate on targets while instance is locked
-        onlyInstanceService()
-    {
-        _setTargetLocked(target, locked);
-    }
-
-
-    function setComponentLocked(address target, bool locked) 
         external 
         restricted()
     {
-        _setTargetLocked(target, locked);
+        _setTargetClosed(target, locked);
     }
 
     /// @dev Returns the number of components that have been registered with this instance.   
@@ -241,15 +218,12 @@ contract InstanceAdmin is
         view
         returns (IAuthorization instanceAuthorizaion)
     {
-        return _authorization;
+        return _instanceAuthorization;
     }
 
     // ------------------- Internal functions ------------------- //
 
-    function _setupComponentAndTokenHandler(
-        IInstanceLinkedComponent component,
-        ObjectType componentType
-    )
+    function _setupComponentAndTokenHandler(IInstanceLinkedComponent component)
         internal
     {
 
@@ -266,27 +240,25 @@ contract InstanceAdmin is
             true, // checkAuthority
             false); // custom
 
-        // create component's token handler target if app
-        if (componentType != ORACLE()) {
-            NftId componentNftId = _registry.getNftIdForAddress(address(component));
-            address tokenHandler = address(
-                _instance.getInstanceReader().getComponentInfo(
-                    componentNftId).tokenHandler);
-
-            _createTarget(
-                tokenHandler, 
-                authorization.getTokenHandlerName(), 
-                true, 
-                false);
-
-            // token handler does not require its own role
-            // token handler is not calling other components
-        }
+        // create component's token handler target
+        NftId componentNftId = _registry.getNftIdForAddress(address(component));
+        address tokenHandler = address(
+            _instance.getInstanceReader().getComponentInfo(
+                componentNftId).tokenHandler);
+
+        _createTarget(
+            tokenHandler, 
+            authorization.getTokenHandlerName(), 
+            true, 
+            false);
 
         // assign component role to component
         _grantRoleToAccount(
             componentRoleId, 
             address(component));
+
+        // token handler does not require its own role
+        // token handler is not calling other components
     }
 
 
@@ -340,6 +312,20 @@ contract InstanceAdmin is
     }
 
 
+    function _checkTargetIsReadyForAuthorization(address target)
+        internal
+        view
+    {
+        if (!_registry.isRegistered(target)) {
+            revert ErrorInstanceAdminNotRegistered(target);
+        }
+
+        if (targetExists(target)) {
+            revert ErrorInstanceAdminAlreadyAuthorized(target);
+        }
+    }
+
+
     function _createRoles(IAuthorization authorization)
         internal
     {
@@ -406,7 +392,7 @@ contract InstanceAdmin is
     {
         // check that target name is defined in authorization specification
         Str name = StrLib.toStr(targetName);
-        if (!_authorization.targetExists(name)) {
+        if (!_instanceAuthorization.targetExists(name)) {
             revert ErrorInstanceAdminExpectedTargetMissing(targetName);
         }
 
@@ -418,7 +404,7 @@ contract InstanceAdmin is
             false);
 
         // assign target role if defined
-        RoleId targetRoleId = _authorization.getTargetRole(name);
+        RoleId targetRoleId = _instanceAuthorization.getTargetRole(name);
         if (targetRoleId != RoleIdLib.zero()) {
             _grantRoleToAccount(targetRoleId, target);
         }
@@ -427,16 +413,17 @@ contract InstanceAdmin is
     function _setupInstanceHelperTargetsWithRoles()
         internal
     {
+        // _checkAndCreateTargetWithRole(address(_instance), INSTANCE_TARGET_NAME);
 
         // create module targets
         _checkAndCreateTargetWithRole(address(_instance.getInstanceStore()), INSTANCE_STORE_TARGET_NAME);
         _checkAndCreateTargetWithRole(address(_instance.getInstanceAdmin()), INSTANCE_ADMIN_TARGET_NAME);
         _checkAndCreateTargetWithRole(address(_instance.getBundleSet()), BUNDLE_SET_TARGET_NAME);
-        _checkAndCreateTargetWithRole(address(_instance.getRiskSet()), RISK_SET_TARGET_NAME);
+        _checkAndCreateTargetWithRole(address(_instance.getRiskSet()), RISK_SET_TAGET_NAME);
 
-        // create targets for services that need to access the instance targets
-        ObjectType[] memory serviceDomains = _authorization.getServiceDomains();
-        VersionPart release = _authorization.getRelease();
+        // create targets for services that need to access the module targets
+        ObjectType[] memory serviceDomains = _instanceAuthorization.getServiceDomains();
+        VersionPart release = _instanceAuthorization.getRelease();
         ObjectType serviceDomain;
 
         for (uint256 i = 0; i < serviceDomains.length; i++) {
@@ -444,7 +431,7 @@ contract InstanceAdmin is
 
             _checkAndCreateTargetWithRole(
                 _registry.getServiceAddress(serviceDomain, release),
-                _authorization.getServiceTarget(serviceDomain).toString());
+                _instanceAuthorization.getServiceTarget(serviceDomain).toString());
         }
     }
 }

package/contracts/instance/InstanceAuthorizationV3.sol

@@ -1,16 +1,17 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {IAccess} from "../authorization/IAccess.sol";
+import {
+     ACCOUNTING, ORACLE, POOL, INSTANCE, COMPONENT, DISTRIBUTION, APPLICATION, POLICY, CLAIM, BUNDLE, RISK
+} from "../../contracts/type/ObjectType.sol";
 
-import {Authorization} from "../authorization/Authorization.sol";
-import {ACCOUNTING, ORACLE, POOL, INSTANCE, COMPONENT, DISTRIBUTION, APPLICATION, POLICY, CLAIM, BUNDLE, RISK} from "../../contracts/type/ObjectType.sol";
 import {BundleSet} from "../instance/BundleSet.sol";
+import {RiskSet} from "../instance/RiskSet.sol"; 
+import {IAccess} from "../authorization/IAccess.sol";
 import {Instance} from "../instance/Instance.sol";
 import {InstanceAdmin} from "../instance/InstanceAdmin.sol";
 import {InstanceStore} from "../instance/InstanceStore.sol";
-import {PUBLIC_ROLE} from "../type/RoleId.sol";
-import {RiskSet} from "../instance/RiskSet.sol"; 
+import {Authorization} from "../authorization/Authorization.sol";
 
 
 contract InstanceAuthorizationV3
@@ -26,10 +27,19 @@ contract InstanceAuthorizationV3
      string public constant RISK_SET_TARGET_NAME = "RiskSet";
 
      constructor()
-          Authorization(INSTANCE_TARGET_NAME, INSTANCE(), false, false)
+          Authorization(INSTANCE_TARGET_NAME, INSTANCE())
      { }
 
-     function _setupServiceTargets() internal virtual override {
+     function _setupTargets()
+          internal
+          override
+     {
+          // instance supporting targets
+          _addTarget(INSTANCE_STORE_TARGET_NAME);
+          _addTarget(INSTANCE_ADMIN_TARGET_NAME);
+          _addTarget(BUNDLE_SET_TARGET_NAME);
+          _addTarget(RISK_SET_TARGET_NAME);
+
           // service targets relevant to instance
           _addServiceTargetWithRole(INSTANCE());
           _addServiceTargetWithRole(ACCOUNTING());
@@ -44,19 +54,6 @@ contract InstanceAuthorizationV3
           _addServiceTargetWithRole(CLAIM());
      }
 
-     function _setupTargets()
-          internal
-          override
-     {
-          // instance supporting targets
-          // _addGifContractTarget(INSTANCE_ADMIN_TARGET_NAME);
-          _addTarget(INSTANCE_ADMIN_TARGET_NAME);
-          _addTarget(INSTANCE_STORE_TARGET_NAME);
-          _addTarget(BUNDLE_SET_TARGET_NAME);
-          _addTarget(RISK_SET_TARGET_NAME);
-
-     }
-
 
      function _setupTargetAuthorizations()
           internal
@@ -110,24 +107,6 @@ contract InstanceAuthorizationV3
      {
           IAccess.FunctionInfo[] storage functions;
 
-          // authorize instance service role
-          functions = _authorizeForTarget(INSTANCE_TARGET_NAME, PUBLIC_ROLE());
-          _authorize(functions, Instance.registerProduct.selector, "registerProduct");
-          _authorize(functions, Instance.upgradeInstanceReader.selector, "upgradeInstanceReader");
-
-          // staking
-          _authorize(functions, Instance.setStakingLockingPeriod.selector, "setStakingLockingPeriod");
-          _authorize(functions, Instance.setStakingRewardRate.selector, "setStakingRewardRate");
-          _authorize(functions, Instance.refillStakingRewardReserves.selector, "refillStakingRewardReserves");
-          _authorize(functions, Instance.withdrawStakingRewardReserves.selector, "withdrawStakingRewardReserves");
-
-          // custom authz
-          _authorize(functions, Instance.createRole.selector, "createRole");
-          _authorize(functions, Instance.grantRole.selector, "grantRole");
-          _authorize(functions, Instance.revokeRole.selector, "revokeRole");
-          _authorize(functions, Instance.createTarget.selector, "createTarget");
-          _authorize(functions, Instance.setTargetFunctionRole.selector, "setTargetFunctionRole");
-
           // authorize instance service role
           functions = _authorizeForTarget(INSTANCE_TARGET_NAME, getServiceRole(INSTANCE()));
           _authorize(functions, Instance.setInstanceReader.selector, "setInstanceReader");
@@ -139,15 +118,14 @@ contract InstanceAuthorizationV3
      {
           IAccess.FunctionInfo[] storage functions;
 
-          // authorize component service role
-          functions = _authorizeForTarget(INSTANCE_ADMIN_TARGET_NAME, getServiceRole(INSTANCE()));
-          _authorize(functions, InstanceAdmin.setInstanceLocked.selector, "setInstanceLocked");
-          _authorize(functions, InstanceAdmin.setTargetLocked.selector, "setTargetLocked");
+          // authorize instance role
+          functions = _authorizeForTarget(INSTANCE_ADMIN_TARGET_NAME, getComponentRole(INSTANCE()));
+          _authorize(functions, InstanceAdmin.grantRole.selector, "grantRole");
 
           // authorize component service role
           functions = _authorizeForTarget(INSTANCE_ADMIN_TARGET_NAME, getServiceRole(COMPONENT()));
           _authorize(functions, InstanceAdmin.initializeComponentAuthorization.selector, "initializeComponentAuthoriz");
-          _authorize(functions, InstanceAdmin.setComponentLocked.selector, "setComponentLocked");
+          _authorize(functions, InstanceAdmin.setTargetLocked.selector, "setTargetLocked");
      }
 
 

package/contracts/instance/InstanceReader.sol

@@ -489,7 +489,7 @@ contract InstanceReader {
     }
 
     function isReferralValid(NftId distributionNftId, ReferralId referralId)
-        external
+        public
         view
         returns (bool isValid)
     {