@etherisc/gif-next 0.0.2-9e6b423-414 → 0.0.2-9f51324-299

package/contracts/instance/IInstance.sol

@@ -1,15 +1,13 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {IAccess} from "../authorization/IAccess.sol";
-import {IRegisterable} from "../shared/IRegisterable.sol";
-
 import {Amount} from "../type/Amount.sol";
 import {BundleSet} from "./BundleSet.sol";
 import {RiskSet} from "./RiskSet.sol";
 import {InstanceAdmin} from "./InstanceAdmin.sol";
 import {InstanceReader} from "./InstanceReader.sol";
 import {InstanceStore} from "./InstanceStore.sol";
+import {IRegisterable} from "../shared/IRegisterable.sol";
 import {NftId} from "../type/NftId.sol";
 import {RoleId} from "../type/RoleId.sol";
 import {Seconds} from "../type/Seconds.sol";
@@ -19,21 +17,6 @@ import {UFixed} from "../type/UFixed.sol";
 interface IInstance is 
     IRegisterable
 {
-    // role handling
-    event LogInstanceCustomRoleCreated(RoleId roleId, string roleName, RoleId adminRoleId, uint32 maxMemberCount);
-    event LogInstanceCustomRoleActiveSet(RoleId roleId, bool active, address caller);
-    event LogInstanceCustomRoleGranted(RoleId roleId, address account, address caller);
-    event LogInstanceCustomRoleRevoked(RoleId roleId, address account, address caller);
-
-    // target handling
-    event LogInstanceCustomTargetCreated(address target, RoleId targetRoleId, string name);
-    event LogInstanceTargetLocked(address target, bool locked);
-    event LogInstanceCustomTargetFunctionRoleSet(address target, bytes4[] selectors, RoleId roleId);
-
-    // modifier is onlyRoleAdmin
-    error ErrorInstanceNotCustomRole(RoleId roleId);
-    error ErrorInstanceNotRoleAdmin(RoleId roleId, address account);
-
     error ErrorInstanceInstanceAdminZero();
     error ErrorInstanceInstanceAdminAlreadySet(address instanceAdmin);
     error ErrorInstanceInstanceAdminAuthorityMismatch(address instanceAuthority);
@@ -94,34 +77,12 @@ interface IInstance is
 
     ///--- authz ------------------------------------------------------------//
 
-    /// @dev Creates a new custom role for the calling instance.
-    /// Custom roles are intended to be used for access control of custom components and its helper contracts.
-    /// Custom roles are not intended to be used as target roles for custom contracts.
-    function createRole(string memory roleName, RoleId adminRoleId, uint32 maxMemberCount) external returns (RoleId roleId);
-
-    /// @dev Activates/deactivates the specified role.
-    /// Only instance owner or account with role admin role can call this function.
-    function setRoleActive(RoleId roleId, bool active) external;
-
-    /// @dev Grants the specified role to the account.
-    /// Only active roles can be granted.
-    /// Only instance owner or account with role admin role can call this function.
+    function createRole(string memory roleName, string memory adminName) external returns (RoleId roleId, RoleId admin);
     function grantRole(RoleId roleId, address account) external;
-
-    /// @dev Revokes the specified role from the account.
-    /// Only instance owner or account with role admin role can call this function.
     function revokeRole(RoleId roleId, address account) external;
 
-    /// @dev Creates a new custom target.
-    /// Custom targets are intended to be used for access control helper contracts of components.
-    /// Custom targets are not intended to be used for components.
-    function createTarget(address target, string memory name) external returns (RoleId contractRoleId);
-
-    /// @dev Authorizes the specified functions for the target and provided role.
-    function authorizeFunctions(address target, RoleId roleId, IAccess.FunctionInfo[] memory functions) external;
-
-    /// @dev Removes any role authorization for the specified functions.
-    function unauthorizeFunctions(address target, IAccess.FunctionInfo[] memory functions) external;
+    function createTarget(address target, string memory name) external;
+    function setTargetFunctionRole(string memory targetName, bytes4[] calldata selectors, RoleId roleId) external;
 
     //--- getters -----------------------------------------------------------//
 

package/contracts/instance/IInstanceService.sol

@@ -1,14 +1,11 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {IAccess} from "../authorization/IAccess.sol";
+import {Amount} from "../type/Amount.sol";
 import {IInstance} from "./IInstance.sol";
 import {IService} from "../shared/IService.sol";
-
-import {Amount} from "../type/Amount.sol";
 import {NftId} from "../type/NftId.sol";
 import {ObjectType} from "../type/ObjectType.sol";
-import {RoleId} from "../type/RoleId.sol";
 import {Seconds} from "../type/Seconds.sol";
 import {UFixed} from "../type/UFixed.sol";
 import {VersionPart} from "../type/Version.sol";
@@ -56,34 +53,12 @@ interface IInstanceService is IService {
     
     event LogInstanceCloned(NftId instanceNftId, address instance);
 
-    /// @dev Creates a new custom role for the calling instance.
-    function createRole(string memory roleName, RoleId adminRoleId, uint32 maxMemberCount) external returns (RoleId roleId);
-
-    /// @dev Sets the specified custom role as active or inactive for the calling instance.
-    function setRoleActive(RoleId roleId, bool active) external;
-
-    /// @dev Grants the specified custom role to the specified account for the calling instance.
-    function grantRole(RoleId roleId, address account) external; 
-
-    /// @dev Revokes the specified custom role from the specified account for the calling instance.
-    function revokeRole(RoleId roleId, address account) external; 
-
-    /// @dev Creates a new custom target for the calling instance.
-    /// All custom trargets are created with a corresponding contract role.
-    function createTarget(address target, string memory name) external returns (RoleId contractRoleId);
-
-    /// @dev Authorizes the specified functions for the specified target.
-    function authorizeFunctions(address target, RoleId roleId, IAccess.FunctionInfo[] memory functions) external; 
-
-    /// @dev Removes any role authorization for the specified functions.
-    function unauthorizeFunctions(address target, IAccess.FunctionInfo[] memory functions) external;
+    /// @dev Locks the complete instance, including all its components.
+    function setInstanceLocked(bool locked) external;
 
     /// @dev Locks/unlocks the specified target constrolled by the corresponding instance admin.
     function setTargetLocked(address target, bool locked) external;
 
-    /// @dev Locks the complete instance, including all its components.
-    function setInstanceLocked(bool locked) external;
-
     /// @dev Creates a new instance.
     /// The caller becomes the owner of the new instance.
     /// Creation of a new instance is achieved by this service through the creation and registration 

package/contracts/instance/Instance.sol

@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {IAccess} from "../authorization/IAccess.sol";
 import {IInstance} from "./IInstance.sol";
 import {IComponentService} from "../shared/IComponentService.sol";
 import {IInstanceService} from "./IInstanceService.sol";
@@ -38,23 +37,13 @@ contract Instance is
     NftId [] internal _products;
     bool internal _tokenRegistryDisabled;
 
-
-    modifier onlyCustomRoleAdmin(RoleId roleId) {
-        if (!_instanceAdmin.isRoleCustom(roleId)) {
-            revert ErrorInstanceNotCustomRole(roleId);
-        }
-
-        // instance owner can always act as role admin
-        address account = msg.sender;
-        if (account != getOwner()) {
-            if (!_instanceAdmin.isRoleAdmin(roleId, account)) {
-                revert ErrorInstanceNotRoleAdmin(roleId, account);
-            }
+    modifier onlyChainNft() {
+        if(msg.sender != getRegistry().getChainNftAddress()) {
+            revert();
         }
         _;
     }
 
-
     function initialize(
         InstanceAdmin instanceAdmin, 
         InstanceStore instanceStore,
@@ -76,14 +65,14 @@ contract Instance is
         _instanceAdmin = instanceAdmin;
 
         // setup instance object info
-        __Registerable_init({
-            authority: instanceAdmin.authority(),
-            registry: address(registry), 
-            parentNftId: registry.getNftId(), 
-            objectType: INSTANCE(), 
-            isInterceptor: false, 
-            initialOwner: initialOwner, 
-            data: ""});
+        __Registerable_init(
+            instanceAdmin.authority(),
+            address(registry), 
+            registry.getNftId(), 
+            INSTANCE(), 
+            true, 
+            initialOwner, 
+            "");
 
         // store instance supporting contracts
         _instanceStore = instanceStore;
@@ -188,103 +177,71 @@ contract Instance is
 
     //--- Roles ------------------------------------------------------------//
 
-    /// @inheritdoc IInstance
-    function createRole(
-        string memory roleName, 
-        RoleId adminRoleId,
-        uint32 maxMemberCount
-    )
+    function createRole(string memory roleName, string memory adminName)
         external
         restricted()
         onlyOwner()
-        returns (RoleId roleId)
+        returns (RoleId roleId, RoleId admin)
     {
-        roleId = _instanceService.createRole(roleName, adminRoleId, maxMemberCount);
-        emit LogInstanceCustomRoleCreated(roleId, roleName, adminRoleId, maxMemberCount);
+        // TODO refactor
+        // (roleId, admin) = _instanceAdmin.createRole(roleName, adminName);
     }
 
-
-    /// @inheritdoc IInstance
-    function setRoleActive(RoleId roleId, bool active)
-        external 
-        restricted()
-        onlyCustomRoleAdmin(roleId)
-    {
-        _instanceService.setRoleActive(roleId, active);
-        emit LogInstanceCustomRoleActiveSet(roleId, active, msg.sender);
-    }
-
-
-    /// @inheritdoc IInstance
     function grantRole(RoleId roleId, address account) 
         external 
         restricted()
-        onlyCustomRoleAdmin(roleId)
+        onlyOwner()
     {
-        _instanceService.grantRole(roleId, account);
-        emit LogInstanceCustomRoleGranted(roleId, account, msg.sender);
+        _instanceAdmin.grantRole(roleId, account);
     }
 
-
-    /// @inheritdoc IInstance
     function revokeRole(RoleId roleId, address account) 
         external 
         restricted()
-        onlyCustomRoleAdmin(roleId)
+        onlyOwner()
     {
-        _instanceService.revokeRole(roleId, account);
-        emit LogInstanceCustomRoleRevoked(roleId, account, msg.sender);
+        // TODO refactor
+        // AccessManagerExtendedInitializeable(authority()).revokeRole(roleId.toInt(), account);
     }
 
     //--- Targets ------------------------------------------------------------//
 
-    /// @inheritdoc IInstance
-    function createTarget(address target, string memory name) 
-        external 
-        restricted()
-        onlyOwner()
-        returns (RoleId targetRoleId)
-    {
-        targetRoleId = _instanceService.createTarget(target, name);
-        emit LogInstanceCustomTargetCreated(target, targetRoleId, name);
-    }
-
 
-    /// @inheritdoc IInstance
     function setTargetLocked(address target, bool locked)
         external 
         // not restricted(): instance owner may need to be able to unlock targets on an locked instance
         onlyOwner()
     {
         _instanceService.setTargetLocked(target, locked);
-        emit LogInstanceTargetLocked(target, locked);
     }
 
-
-    /// @inheritdoc IInstance
-    function authorizeFunctions(
-        address target, 
-        RoleId roleId, 
-        IAccess.FunctionInfo[] memory functions
-    )
+    function createTarget(address target, string memory name) 
         external 
         restricted()
         onlyOwner()
     {
-        _instanceService.authorizeFunctions(target, roleId, functions);
+        // TODO refactor
+        // _instanceAdmin.createTarget(target, name);
     }
 
-
-    /// @inheritdoc IInstance
-    function unauthorizeFunctions(
-        address target, 
-        IAccess.FunctionInfo[] memory functions
-    )
+    function setTargetFunctionRole(
+        string memory targetName,
+        bytes4[] calldata selectors,
+        RoleId roleId
+    ) 
         external 
         restricted()
         onlyOwner()
     {
-        _instanceService.unauthorizeFunctions(target, functions);
+        // TODO refactor
+        // _instanceAdmin.setTargetFunctionRoleByInstance(targetName, selectors, roleId);
+    }
+
+    //--- ITransferInterceptor ----------------------------------------------//
+
+    function nftTransferFrom(address from, address to, uint256 tokenId, address operator) external onlyChainNft {
+        // TODO refactor
+        // _instanceAdmin.transferInstanceOwnerRole(from, to);
     }
 
     //--- initial setup functions -------------------------------------------//
@@ -342,4 +299,6 @@ contract Instance is
     function isTokenRegistryDisabled() external view returns (bool) {
         return _tokenRegistryDisabled;
     }
+
+    //--- internal view/pure functions --------------------------------------//
 }