@etherisc/gif-next 0.0.2-d288ca9-933 → 0.0.2-d3207d2-901

package/contracts/instance/InstanceService.sol

@@ -8,16 +8,18 @@ import {InstanceAccessManager} from "./InstanceAccessManager.sol";
 import {Instance} from "./Instance.sol";
 import {IInstanceService} from "./IInstanceService.sol";
 import {InstanceReader} from "./InstanceReader.sol";
-import {ServiceBase} from "../../contracts/instance/base/ServiceBase.sol";
 import {IRegistry} from "../registry/IRegistry.sol";
 import {Registry} from "../registry/Registry.sol";
 import {RegistryService} from "../registry/RegistryService.sol";
-import {IService} from "../../contracts/instance/base/IService.sol";
+import {Service} from "../../contracts/shared/Service.sol";
+import {IService} from "../shared/IService.sol";
 import {ContractDeployerLib} from "../shared/ContractDeployerLib.sol";
 import {NftId, NftIdLib, zeroNftId} from "../../contracts/types/NftId.sol";
+import {RoleId} from "../types/RoleId.sol";
 import {VersionLib} from "../types/Version.sol";
+import {ADMIN_ROLE, INSTANCE_SERVICE_ROLE, DISTRIBUTION_SERVICE_ROLE, POOL_SERVICE_ROLE} from "../types/RoleId.sol";
 
-contract InstanceService is ServiceBase, IInstanceService {
+contract InstanceService is Service, IInstanceService {
 
     address internal _registryAddress;
     address internal _accessManagerMaster;
@@ -37,21 +39,61 @@ contract InstanceService is ServiceBase, IInstanceService {
             InstanceReader clonedInstanceReader
         )
     {
+        address instanceOwner = msg.sender;
         Registry registry = Registry(_registryAddress);
         NftId registryNftId = registry.getNftId(_registryAddress);
         address registryServiceAddress = registry.getServiceAddress("RegistryService", VersionLib.toVersion(3, 0, 0).toMajorPart());
         RegistryService registryService = RegistryService(registryServiceAddress);
 
+        // initially set the authority of the access managar to this (being the instance service). 
+        // This will allow the instance service to bootstrap the authorizations of the instance
+        // and then transfer the ownership of the access manager to the instance owner once everything is setup
         clonedAccessManager = AccessManagerSimple(Clones.clone(_accessManagerMaster));
-        clonedAccessManager.initialize(msg.sender);
+        clonedAccessManager.initialize(address(this));
 
         clonedInstance = Instance(Clones.clone(_instanceMaster));
-        clonedInstance.initialize(address(clonedAccessManager), _registryAddress, registryNftId);
+        clonedInstance.initialize(address(clonedAccessManager), _registryAddress, registryNftId, msg.sender);
         ( IRegistry.ObjectInfo memory info, ) = registryService.registerInstance(clonedInstance);
         instanceNftId = info.nftId;
         
         clonedInstanceReader = InstanceReader(Clones.clone(address(_instanceReaderMaster)));
         clonedInstanceReader.initialize(_registryAddress, instanceNftId);
+
+        _grantInitialAuthorizations(clonedAccessManager, clonedInstance);
+
+        clonedInstance.setInstanceReader(clonedInstanceReader);
+        
+        // to complete setup switch instance ownership to the instance owner
+        // TODO: use a role less powerful than admin, maybe INSTANCE_ADMIN (does not exist yet)
+        clonedAccessManager.grantRole(ADMIN_ROLE().toInt(), instanceOwner, 0);
+        clonedAccessManager.revokeRole(ADMIN_ROLE().toInt(), address(this));
+
+        emit LogInstanceCloned(address(clonedAccessManager), address(clonedInstance), address(clonedInstanceReader), instanceNftId);
+    }
+
+    function _grantInitialAuthorizations(AccessManagerSimple clonedAccessManager, Instance clonedInstance) internal {
+        address distributionServiceAddress = _registry.getServiceAddress("DistributionService", VersionLib.toVersion(3, 0, 0).toMajorPart());
+        clonedAccessManager.grantRole(DISTRIBUTION_SERVICE_ROLE().toInt(), distributionServiceAddress, 0);
+        bytes4[] memory instanceDistributionServiceSelectors = new bytes4[](2);
+        instanceDistributionServiceSelectors[0] = clonedInstance.createDistributionSetup.selector;
+        instanceDistributionServiceSelectors[1] = clonedInstance.updateDistributionSetup.selector;
+        clonedAccessManager.setTargetFunctionRole(
+            address(clonedInstance),
+            instanceDistributionServiceSelectors, 
+            DISTRIBUTION_SERVICE_ROLE().toInt());
+
+        address poolServiceAddress = _registry.getServiceAddress("PoolService", VersionLib.toVersion(3, 0, 0).toMajorPart());
+        clonedAccessManager.grantRole(POOL_SERVICE_ROLE().toInt(), address(poolServiceAddress), 0);
+        bytes4[] memory instancePoolServiceSelectors = new bytes4[](4);
+        instancePoolServiceSelectors[0] = clonedInstance.createPoolSetup.selector;
+        instancePoolServiceSelectors[1] = clonedInstance.updatePoolSetup.selector;
+        instancePoolServiceSelectors[2] = clonedInstance.createBundle.selector;
+        instancePoolServiceSelectors[3] = clonedInstance.updateBundle.selector;
+        clonedAccessManager.setTargetFunctionRole(
+            address(clonedInstance),
+            instancePoolServiceSelectors, 
+            POOL_SERVICE_ROLE().toInt());
+
     }
 
     function setAccessManagerMaster(address accessManagerMaster) external {
@@ -88,7 +130,7 @@ contract InstanceService is ServiceBase, IInstanceService {
     }
 
     // From IService
-    function getName() public pure override(IService, ServiceBase) returns(string memory) {
+    function getName() public pure override(IService, Service) returns(string memory) {
         return NAME;
     }
     
@@ -118,19 +160,24 @@ contract InstanceService is ServiceBase, IInstanceService {
 
         address initialOwner = address(0);
         (_registryAddress, initialOwner) = abi.decode(data, (address, address));
-
-        // // TODO register instance in registry  
-        IRegistry registry = IRegistry(_registryAddress);
-        NftId registryNftId = registry.getNftId(_registryAddress);
-
-        _initializeServiceBase(_registryAddress, registryNftId, initialOwner);
+        // TODO while InstanceService is not deployed in InstanceServiceManager constructor
+        //      owner is InstanceServiceManager deployer
+        _initializeService(_registryAddress, owner);
         
         _registerInterface(type(IService).interfaceId);
         _registerInterface(type(IInstanceService).interfaceId);
     }
 
-    function getInstance() external view returns (Instance) {
-        return Instance(address(this));
+    function hasRole(address account, RoleId role, NftId instanceNftId) external view returns (bool) {
+        IRegistry.ObjectInfo memory instanceObjectInfo = getRegistry().getObjectInfo(instanceNftId);
+        address instanceAddress = instanceObjectInfo.objectAddress;
+        Instance instance = Instance(instanceAddress);
+        AccessManagerSimple accessManager = AccessManagerSimple(instance.authority());
+        (bool isMember, uint32 executionDelay) = accessManager.hasRole(role.toInt(), account);
+        if (executionDelay > 0) {
+            return false;
+        } 
+        return isMember;
     }
 }
 

package/contracts/instance/InstanceServiceManager.sol

@@ -31,14 +31,15 @@ contract InstanceServiceManager is ProxyManager {
         Registry registry = Registry(registryAddress);
         address registryServiceAddress = registry.getServiceAddress("RegistryService", VersionLib.toVersion(3, 0, 0).toMajorPart());
         RegistryService registryService = RegistryService(registryServiceAddress);
-
-        registryService.registerService(_instanceService);
+        // TODO this must have a role or own nft to register service
+        //registryService.registerService(_instanceService);
         // RegistryService registryService = _instanceService.getRegistryService();
 
+        // TODO no nft to link yet
         // link ownership of instance service manager ot nft owner of instance service
-        _linkToNftOwnable(
-            address(registryAddress),
-            address(_instanceService));
+        //_linkToNftOwnable(
+        //    address(registryAddress),
+        //    address(_instanceService));
 
         // implies that after this constructor call only upgrade functionality is available
         _isDeployed = true;

package/contracts/instance/base/ComponentServiceBase.sol

@@ -4,23 +4,98 @@ pragma solidity ^0.8.19;
 import {IRegistry} from "../../registry/IRegistry.sol";
 import {IRegistryService} from "../../registry/IRegistryService.sol";
 import {IInstance} from "../../instance/IInstance.sol";
-import {ObjectType, INSTANCE, PRODUCT, POOL} from "../../types/ObjectType.sol";
+import {ObjectType, INSTANCE, PRODUCT, POOL, DISTRIBUTION, ORACLE} from "../../types/ObjectType.sol";
 import {NftId, NftIdLib} from "../../types/NftId.sol";
+import {RoleId, PRODUCT_OWNER_ROLE, POOL_OWNER_ROLE, DISTRIBUTION_OWNER_ROLE, ORACLE_OWNER_ROLE} from "../../types/RoleId.sol";
 
-import {ServiceBase} from "./ServiceBase.sol";
+import {BaseComponent} from "../../components/BaseComponent.sol";
+import {INftOwnable} from "../../shared/INftOwnable.sol";
+import {Service} from "../../shared/Service.sol";
+import {InstanceService} from "../InstanceService.sol";
 import {Version, VersionPart, VersionLib} from "../../types/Version.sol";
 
-abstract contract ComponentServiceBase is ServiceBase {
+abstract contract ComponentServiceBase is Service {
 
-    constructor(
-        address registry,
-        NftId registryNftId,
+    error ExpectedRoleMissing(RoleId expected, address caller);
+    error ComponentTypeInvalid(ObjectType componentType);
+
+    mapping (ObjectType => RoleId) internal _objectTypeToExpectedRole;
+
+    /// @dev modifier to check if caller has a role on the instance the component is registered in
+    modifier onlyComponentOwnerRole(address componentAddress) {
+        BaseComponent component = BaseComponent(componentAddress);
+        ObjectType objectType = _getObjectType(component);
+        RoleId expectedRole = _objectTypeToExpectedRole[objectType];
+
+        address componentOwner = msg.sender;
+        INftOwnable nftOwnable = INftOwnable(address(component.getInstance()));
+        if(! getInstanceService().hasRole(componentOwner, expectedRole, nftOwnable.getNftId())) {
+            revert ExpectedRoleMissing(expectedRole, componentOwner);
+        }
+        _;
+    }
+
+    function _initializeService(
+        address registry, 
         address initialOwner
     )
+        internal
+        override
     {
-        _initializeServiceBase(registry, registryNftId, initialOwner);
+        super._initializeService(registry, initialOwner);
+        _objectTypeToExpectedRole[PRODUCT()] = PRODUCT_OWNER_ROLE();
+        _objectTypeToExpectedRole[POOL()] = POOL_OWNER_ROLE();
+        _objectTypeToExpectedRole[DISTRIBUTION()] = DISTRIBUTION_OWNER_ROLE();
+        _objectTypeToExpectedRole[ORACLE()] = ORACLE_OWNER_ROLE();
+    }
+
+    function getInstanceService() public view returns (InstanceService) {
+        return InstanceService(getRegistry().getServiceAddress("InstanceService", getMajorVersion()));
     }
 
+    function register(address componentAddress) 
+        external 
+        onlyComponentOwnerRole(componentAddress)
+        returns (NftId componentNftId)
+    {
+        address componentOwner = msg.sender;
+        BaseComponent component = BaseComponent(componentAddress);
+        ObjectType objectType = _getObjectType(component);
+        IRegistryService registryService = getRegistryService();
+
+        IRegistry.ObjectInfo memory objInfo;
+        bytes memory initialObjData;
+
+        if (objectType == DISTRIBUTION()) {
+            (objInfo, initialObjData) = registryService.registerDistribution(component, componentOwner);
+        } else if (objectType == PRODUCT()) {
+            (objInfo, initialObjData) = registryService.registerProduct(component, componentOwner);
+        } else if (objectType == POOL()) {
+            (objInfo, initialObjData) = registryService.registerPool(component, componentOwner);
+        // TODO: implement this for oracle - currently missing in registry
+        // } else if (objectType == ORACLE()) {
+        //     (objInfo, initialObjData) = registryService.registerOracle(component, componentOwner);
+        } else {
+            revert ComponentTypeInvalid(objectType);
+        }
+
+        componentNftId = objInfo.nftId;
+        IInstance instance = _getInstance(objInfo);
+        _finalizeComponentRegistration(componentNftId, initialObjData, instance);
+    }
+
+    function _finalizeComponentRegistration(NftId componentNftId, bytes memory initialObjData, IInstance instance) internal virtual;
+
+    function _getObjectType(BaseComponent component) internal view returns (ObjectType) {
+        (IRegistry.ObjectInfo memory compInitialInfo, )  = component.getInitialInfo();
+        return compInitialInfo.objectType;
+    }
+    
+    function _getInstance(IRegistry.ObjectInfo memory compObjInfo) internal view returns (IInstance) {
+        IRegistry registry = getRegistry();
+        IRegistry.ObjectInfo memory instanceInfo = registry.getObjectInfo(compObjInfo.parentNftId);
+        return IInstance(instanceInfo.objectAddress);
+    }
 
     function _getAndVerifyComponentInfoAndInstance(
         ObjectType objectType
@@ -32,7 +107,7 @@ abstract contract ComponentServiceBase is ServiceBase {
             IInstance instance
         )
     {
-        NftId componentNftId = getRegistry().getNftId(msg.sender);
+        NftId componentNftId = _registry.getNftId(msg.sender);
         require(componentNftId.gtz(), "ERROR_COMPONENT_UNKNOWN");
 
         info = getRegistry().getObjectInfo(componentNftId);

package/contracts/instance/module/IBundle.sol

@@ -13,6 +13,7 @@ interface IBundle {
         uint256 capitalAmount; // net investment capital + net premiums - payouts
         uint256 lockedAmount; // capital amount linked to collateralizaion of non-closed policies (<= balance)
         uint256 balanceAmount; // total amount of funds: capitalAmount + fees (balance >= captial)
+        uint256 lifetime;
         Timestamp expiredAt; // no new policies
         Timestamp closedAt; // no open policies, locked amount = 0
     }

package/contracts/instance/module/ISetup.sol

@@ -5,6 +5,7 @@ import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IER
 
 import {Fee} from "../../types/Fee.sol";
 import {NftId} from "../../types/NftId.sol";
+import {LibNftIdSet} from "../../types/NftIdSet.sol";
 import {UFixed} from "../../types/UFixed.sol";
 import {TokenHandler} from "../../shared/TokenHandler.sol";
 

package/contracts/instance/service/ComponentOwnerService.sol

@@ -27,15 +27,15 @@ import {UFixed, UFixedLib} from "../../types/UFixed.sol";
 import {IDistributionComponent} from "../../components/IDistributionComponent.sol";
 import {IPoolComponent} from "../../components/IPoolComponent.sol";
 import {IProductComponent} from "../../components/IProductComponent.sol";
-import {IService} from "../base/IService.sol";
+import {IService} from "../../shared/IService.sol";
 import {IComponentOwnerService} from "./IComponentOwnerService.sol";
-import {ServiceBase} from "../base/ServiceBase.sol";
+import {Service} from "../../shared/Service.sol";
 // import {IPool, IPoolModule} from "../module/IPoolModule.sol";
 
 import {IRegistryService} from "../../registry/IRegistryService.sol";
 
 contract ComponentOwnerService is
-    ServiceBase,
+    Service,
     IComponentOwnerService
 {
     using NftIdLib for NftId;
@@ -64,11 +64,11 @@ contract ComponentOwnerService is
         address initialOwner
     )
     {
-        _initializeServiceBase(registry, registryNftId, initialOwner);
+        _initializeService(registry, initialOwner);
         _registerInterface(type(IComponentOwnerService).interfaceId);
     }
 
-    function getName() public pure override(IService, ServiceBase) returns(string memory name) {
+    function getName() public pure override(IService, Service) returns(string memory name) {
         return NAME;
     }
 

package/contracts/instance/service/DistributionService.sol

@@ -0,0 +1,88 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.19;
+
+import {IRegistry} from "../../registry/IRegistry.sol";
+import {IRegistryService} from "../../registry/IRegistryService.sol";
+import {IInstance} from "../../instance/IInstance.sol";
+import {InstanceReader} from "../../instance/InstanceReader.sol";
+import {ISetup} from "../../instance/module/ISetup.sol";
+import {ITreasury} from "../../instance/module/ITreasury.sol";
+
+import {NftId, NftIdLib} from "../../types/NftId.sol";
+import {Fee} from "../../types/Fee.sol";
+import {DISTRIBUTION_OWNER_ROLE} from "../../types/RoleId.sol";
+import {KEEP_STATE} from "../../types/StateId.sol";
+import {DISTRIBUTION} from "../../types/ObjectType.sol";
+import {Version, VersionLib} from "../../types/Version.sol";
+
+import {IVersionable} from "../../shared/IVersionable.sol";
+import {Versionable} from "../../shared/Versionable.sol";
+
+import {IService} from "../../shared/IService.sol";
+import {Service} from "../../shared/Service.sol";
+import {ComponentServiceBase} from "../base/ComponentServiceBase.sol";
+import {IDistributionService} from "./IDistributionService.sol";
+import {Distribution} from "../../components/Distribution.sol";
+import {InstanceService} from "../InstanceService.sol";
+import {Instance} from "../Instance.sol";
+import {INftOwnable} from "../../shared/INftOwnable.sol";
+
+string constant DISTRIBUTION_SERVICE_NAME = "DistributionService";
+
+contract DistributionService is
+    ComponentServiceBase,
+    IDistributionService
+{
+    using NftIdLib for NftId;
+
+    string public constant NAME = "DistributionService";
+
+    address internal _registryAddress;
+    
+    function _initialize(
+        address owner, 
+        bytes memory data
+    )
+        internal
+        initializer
+        virtual override
+    {
+        address initialOwner = address(0);
+        (_registryAddress, initialOwner) = abi.decode(data, (address, address));
+        // TODO while DistributionService is not deployed in DistributionServiceManager constructor
+        //      owner is DistributionServiceManager deployer
+        _initializeService(_registryAddress, owner);
+
+        _registerInterface(type(IService).interfaceId);
+        _registerInterface(type(IDistributionService).interfaceId);
+    }
+
+
+    function getName() public pure override(IService, Service) returns(string memory name) {
+        return NAME;
+    }
+
+    function _finalizeComponentRegistration(NftId componentNftId, bytes memory initialObjData, IInstance instance) internal override {
+        ISetup.DistributionSetupInfo memory initialSetup = abi.decode(
+            initialObjData,
+            (ISetup.DistributionSetupInfo)
+        );
+        instance.createDistributionSetup(componentNftId, initialSetup);
+    }
+
+    function setFees(
+        Fee memory distributionFee
+    )
+        external
+        override
+    {
+        (IRegistry.ObjectInfo memory info , IInstance instance) = _getAndVerifyComponentInfoAndInstance(DISTRIBUTION());
+        InstanceReader instanceReader = instance.getInstanceReader();
+        NftId distributionNftId = info.nftId;
+
+        ISetup.DistributionSetupInfo memory distSetupInfo = instanceReader.getDistributionSetupInfo(distributionNftId);
+        distSetupInfo.distributionFee = distributionFee;
+        
+        instance.updateDistributionSetup(distributionNftId, distSetupInfo, KEEP_STATE());
+    }
+}

package/contracts/instance/service/DistributionServiceManager.sol

@@ -0,0 +1,54 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.20;
+
+import {IVersionable} from "../../shared/IVersionable.sol";
+import {ProxyManager} from "../../shared/ProxyManager.sol";
+import {DistributionService} from "./DistributionService.sol";
+import {Registry} from "../../registry/Registry.sol";
+import {RegistryService} from "../../registry/RegistryService.sol";
+import {VersionLib} from "../../types/Version.sol";
+
+contract DistributionServiceManager is ProxyManager {
+
+    DistributionService private _distributionService;
+
+    /// @dev initializes proxy manager with distribution service implementation and deploys instance
+    constructor(
+        address registryAddress
+    )
+        ProxyManager()
+    {
+        DistributionService distSrv = new DistributionService();
+        bytes memory data = abi.encode(registryAddress, address(this));
+        IVersionable versionable = deploy(
+            address(distSrv), 
+            data);
+
+        _distributionService = DistributionService(address(versionable));
+
+        Registry registry = Registry(registryAddress);
+        address registryServiceAddress = registry.getServiceAddress("RegistryService", VersionLib.toVersion(3, 0, 0).toMajorPart());
+        RegistryService registryService = RegistryService(registryServiceAddress);
+        // TODO this must have a role or own nft to register service
+        //registryService.registerService(_distributionService);
+        
+        // TODO no nft to link yet
+        // link ownership of instance service manager ot nft owner of instance service
+        //_linkToNftOwnable(
+        //    address(registryAddress),
+        //    address(_distributionService));
+
+        // implies that after this constructor call only upgrade functionality is available
+        _isDeployed = true;
+    }
+
+    //--- view functions ----------------------------------------------------//
+    function getDistributionService()
+        external
+        view
+        returns (DistributionService distributionService)
+    {
+        return _distributionService;
+    }
+
+}

package/contracts/instance/service/IComponentOwnerService.sol

@@ -5,7 +5,7 @@ import {NftId} from "../../types/NftId.sol";
 import {ObjectType} from "../../types/ObjectType.sol";
 import {RoleId} from "../../types/RoleId.sol";
 import {IBaseComponent} from "../../components/IBaseComponent.sol";
-import {IService} from "../base/IService.sol";
+import {IService} from "../../shared/IService.sol";
 
 // TODO rename to registry service
 interface IComponentOwnerService is IService {

package/contracts/instance/service/IDistributionService.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.8.19;
 
 import {NftId} from "../../types/NftId.sol";
 import {Fee} from "../../types/Fee.sol";
-import {IService} from "../base/IService.sol";
+import {IService} from "../../shared/IService.sol";
 
 interface IDistributionService is IService {
     function setFees(

package/contracts/instance/service/IPoolService.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.8.19;
 
 import {NftId} from "../../types/NftId.sol";
 import {Fee} from "../../types/Fee.sol";
-import {IService} from "../base/IService.sol";
+import {IService} from "../../shared/IService.sol";
 
 interface IPoolService is IService {
     function setFees(

package/contracts/instance/service/IProductService.sol

@@ -2,7 +2,7 @@
 pragma solidity ^0.8.19;
 
 import {IRisk} from "../module/IRisk.sol";
-import {IService} from "../base/IService.sol";
+import {IService} from "../../shared/IService.sol";
 
 import {NftId} from "../../types/NftId.sol";
 import {ReferralId} from "../../types/Referral.sol";