@etherisc/gif-next 0.0.2-b5e5146-738 → 0.0.2-b61b9f6-206

package/contracts/instance/service/PoolService.sol

@@ -1,109 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.19;
-
-import {Pool} from "../../components/Pool.sol";
-import {IRegistry} from "../../registry/IRegistry.sol";
-import {IInstance} from "../../instance/IInstance.sol";
-import {IBundle} from "../../instance/module/IBundle.sol";
-import {TokenHandler} from "../../instance/module/ITreasury.sol";
-import {ISetup} from "../module/ISetup.sol";
-import {IPolicy} from "../module/IPolicy.sol";
-
-import {IVersionable} from "../../shared/IVersionable.sol";
-import {Versionable} from "../../shared/Versionable.sol";
-import {INftOwnable} from "../../shared/INftOwnable.sol";
-
-import {NftId, NftIdLib, zeroNftId} from "../../types/NftId.sol";
-import {ObjectType, POOL, BUNDLE} from "../../types/ObjectType.sol";
-import {POOL_OWNER_ROLE, RoleId} from "../../types/RoleId.sol";
-import {Fee, FeeLib} from "../../types/Fee.sol";
-import {Version, VersionLib} from "../../types/Version.sol";
-import {KEEP_STATE, StateId} from "../../types/StateId.sol";
-import {TimestampLib, zeroTimestamp} from "../../types/Timestamp.sol";
-
-import {IService} from "../../shared/IService.sol";
-import {Service} from "../../shared/Service.sol";
-import {BundleManager} from "../BundleManager.sol";
-import {ComponentService} from "../base/ComponentService.sol";
-import {IPoolService} from "./IPoolService.sol";
-import {IRegistryService} from "../../registry/IRegistryService.sol";
-import {InstanceService} from "../InstanceService.sol";
-import {InstanceReader} from "../InstanceReader.sol";
-import {IComponent} from "../../components/IComponent.sol";
-import {IPoolComponent} from "../../components/IPoolComponent.sol";
-
-string constant POOL_SERVICE_NAME = "PoolService";
-
-contract PoolService is 
-    ComponentService, 
-    IPoolService 
-{
-    using NftIdLib for NftId;
-
-    address internal _registryAddress;
-
-    function _initialize(
-        address owner, 
-        bytes memory data
-    )
-        internal
-        initializer
-        virtual override
-    {
-        address registryAddress;
-        address initialOwner;
-        (registryAddress, initialOwner) = abi.decode(data, (address, address));
-        // TODO while PoolService is not deployed in PoolServiceManager constructor
-        //      owner is PoolServiceManager deployer
-        _initializeService(registryAddress, owner);
-
-        _registerInterface(type(IPoolService).interfaceId);
-    }
-
-    function getDomain() public pure override(Service, IService) returns(ObjectType) {
-        return POOL();
-    }
-
-    function register(address poolAddress) 
-        external
-        returns(NftId poolNftId)
-    {
-        (
-            IComponent component,
-            address owner,
-            IInstance instance,
-            NftId instanceNftId
-        ) = _checkComponentForRegistration(
-            poolAddress,
-            POOL(),
-            POOL_OWNER_ROLE());
-
-        IPoolComponent pool = IPoolComponent(poolAddress);
-        IRegistry.ObjectInfo memory poolInfo = getRegistryService().registerPool(pool, owner);
-        pool.linkToRegisteredNftId();
-        poolNftId = poolInfo.nftId;
-
-        instance.createPoolSetup(poolNftId, pool.getSetupInfo());
-        getInstanceService().createGifTarget(instanceNftId, poolAddress, pool.getName());
-    }
-
-    function setFees(
-        Fee memory poolFee,
-        Fee memory stakingFee,
-        Fee memory performanceFee
-    )
-        external
-        override
-    {
-        (IRegistry.ObjectInfo memory poolInfo, IInstance instance) = _getAndVerifyComponentInfoAndInstance(POOL());
-        InstanceReader instanceReader = instance.getInstanceReader();
-        NftId poolNftId = poolInfo.nftId;
-
-        ISetup.PoolSetupInfo memory poolSetupInfo = instanceReader.getPoolSetupInfo(poolNftId);
-        poolSetupInfo.poolFee = poolFee;
-        poolSetupInfo.stakingFee = stakingFee;
-        poolSetupInfo.performanceFee = performanceFee;
-        
-        instance.updatePoolSetup(poolNftId, poolSetupInfo, KEEP_STATE());
-    }
-}

package/contracts/instance/service/PoolServiceManager.sol

@@ -1,51 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.20;
-
-import {IVersionable} from "../../shared/IVersionable.sol";
-import {ProxyManager} from "../../shared/ProxyManager.sol";
-import {PoolService} from "./PoolService.sol";
-import {Registry} from "../../registry/Registry.sol";
-import {RegistryService} from "../../registry/RegistryService.sol";
-import {REGISTRY} from "../../types/ObjectType.sol";
-
-contract PoolServiceManager is ProxyManager {
-
-    PoolService private _poolService;
-
-    /// @dev initializes proxy manager with pool service implementation 
-    constructor(
-        address registryAddress
-    )
-        ProxyManager()
-    {
-        PoolService poolSrv = new PoolService();
-        bytes memory data = abi.encode(registryAddress, address(this));
-        IVersionable versionable = deploy(
-            address(poolSrv), 
-            data);
-
-        _poolService = PoolService(address(versionable));
-
-        // TODO `this` must have a role or own nft to register service
-        //Registry registry = Registry(registryAddress);
-        //address registryServiceAddress = registry.getServiceAddress(REGISTRY(), _poolService.getMajorVersion());
-        //RegistryService registryService = RegistryService(registryServiceAddress);
-        //registryService.registerService(_poolService);
-        
-        // TODO no nft to link yet
-        // link ownership of instance service manager ot nft owner of instance service
-        //_linkToNftOwnable(
-        //    address(registryAddress),
-        //    address(_poolService));
-    }
-
-    //--- view functions ----------------------------------------------------//
-    function getPoolService()
-        external
-        view
-        returns (PoolService poolService)
-    {
-        return _poolService;
-    }
-
-}

package/contracts/instance/service/ProductService.sol

@@ -1,232 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.19;
-
-import {IRegistry} from "../../registry/IRegistry.sol";
-import {IProductComponent} from "../../components/IProductComponent.sol";
-import {Product} from "../../components/Product.sol";
-import {IComponent} from "../../components/IComponent.sol";
-import {IPoolComponent} from "../../components/IPoolComponent.sol";
-import {IDistributionComponent} from "../../components/IDistributionComponent.sol";
-import {IInstance} from "../IInstance.sol";
-import {IPolicy} from "../module/IPolicy.sol";
-import {IRisk} from "../module/IRisk.sol";
-import {IBundle} from "../module/IBundle.sol";
-import {IProductService} from "./IProductService.sol";
-import {ITreasury} from "../module/ITreasury.sol";
-import {ISetup} from "../module/ISetup.sol";
-
-import {TokenHandler} from "../../shared/TokenHandler.sol";
-
-import {IVersionable} from "../../shared/IVersionable.sol";
-import {Versionable} from "../../shared/Versionable.sol";
-
-import {Timestamp, zeroTimestamp} from "../../types/Timestamp.sol";
-import {UFixed, UFixedLib} from "../../types/UFixed.sol";
-import {Blocknumber, blockNumber} from "../../types/Blocknumber.sol";
-import {ObjectType, PRODUCT, POOL, POLICY} from "../../types/ObjectType.sol";
-import {APPLIED, UNDERWRITTEN, ACTIVE, KEEP_STATE} from "../../types/StateId.sol";
-import {NftId, NftIdLib, zeroNftId} from "../../types/NftId.sol";
-import {Fee, FeeLib} from "../../types/Fee.sol";
-import {ReferralId} from "../../types/Referral.sol";
-import {RiskId} from "../../types/RiskId.sol";
-import {StateId} from "../../types/StateId.sol";
-import {Version, VersionLib} from "../../types/Version.sol";
-import {RoleId, PRODUCT_OWNER_ROLE} from "../../types/RoleId.sol";
-
-import {IService} from "../../shared/IService.sol";
-import {Service} from "../../shared/Service.sol";
-import {ComponentService} from "../base/ComponentService.sol";
-import {IProductService} from "./IProductService.sol";
-import {InstanceReader} from "../InstanceReader.sol";
-import {IPoolService} from "./PoolService.sol";
-
-// TODO or name this ProtectionService to have Product be something more generic (loan, savings account, ...)
-contract ProductService is ComponentService, IProductService {
-    using NftIdLib for NftId;
-
-    IPoolService internal _poolService;
-
-    event LogProductServiceSender(address sender);
-
-    function _initialize(
-        address owner, 
-        bytes memory data
-    )
-        internal
-        initializer
-        virtual override
-    {
-        address registryAddress;
-        address initialOwner;
-        (registryAddress, initialOwner) = abi.decode(data, (address, address));
-
-        _initializeService(registryAddress, owner);
-
-        _poolService = IPoolService(_registry.getServiceAddress(POOL(), getMajorVersion()));
-
-        _registerInterface(type(IProductService).interfaceId);
-    }
-
-
-    function register(address productAddress) 
-        external
-        returns(NftId productNftId)
-    {
-        (
-            IComponent component,
-            address owner,
-            IInstance instance,
-            NftId instanceNftId
-        ) = _checkComponentForRegistration(
-            productAddress,
-            PRODUCT(),
-            PRODUCT_OWNER_ROLE());
-
-        IProductComponent product = IProductComponent(productAddress);
-        IRegistry.ObjectInfo memory productInfo = getRegistryService().registerProduct(product, owner);
-        productNftId = productInfo.nftId;
-        _createProductSetup(
-            instance, 
-            product, 
-            productNftId);
-    }
-
-
-    function _createProductSetup(
-        IInstance instance, 
-        IProductComponent product, 
-        NftId productNftId 
-    )
-        internal
-        returns (string memory name)
-    {
-        // wire distribution and pool components to product component
-        ISetup.ProductSetupInfo memory setup = product.getSetupInfo();
-        IComponent distribution = IComponent(_registry.getObjectInfo(setup.distributionNftId).objectAddress);
-        IComponent pool = IComponent(_registry.getObjectInfo(setup.poolNftId).objectAddress);
-
-        distribution.setProductNftId(productNftId);
-        pool.setProductNftId(productNftId);
-        product.setProductNftId(productNftId);
-        product.linkToRegisteredNftId();
-
-        // create product setup in instance
-        instance.createProductSetup(productNftId, product.getSetupInfo());
-
-        // create target for instane access manager
-        getInstanceService().createGifTarget(
-            _registry.getNftId(address(instance)), 
-            address(product), 
-            product.getName());
-    }
-
-    function getDomain() public pure override(IService, Service) returns(ObjectType) {
-        return PRODUCT();
-    }
-
-
-    function _decodeAndVerifyProductData(bytes memory data) 
-        internal 
-        returns(string memory name, ISetup.ProductSetupInfo memory setup)
-    {
-        (name, setup) = abi.decode(
-            data,
-            (string, ISetup.ProductSetupInfo)
-        );
-
-        // TODO add checks
-        // if(wallet == address(0)) {
-        //     revert WalletIsZero();
-        // }
-
-        // IRegistry.ObjectInfo memory tokenInfo = _registry.getObjectInfo(address(info.token));
-
-        // if(tokenInfo.objectType != TOKEN()) {
-        //     revert InvalidToken();
-        // } 
-
-        // IRegistry.ObjectInfo memory poolInfo = _registry.getObjectInfo(info.poolNftId);
-
-        // if(poolInfo.objectType != POOL()) {
-        //     revert InvalidPool();
-        // }
-
-        // if(poolInfo.parentNftId != instanceNftId) {
-        //     revert InvalidPoolsInstance();
-        // }
-        // // TODO pool have the same token
-        // //ITreasury.PoolSetup memory poolSetup = instance.getPoolSetup(info.poolNftId);
-        // //require(tokenInfo.objectAddress == address(poolSetup.token), "ERROR:COS-018:PRODUCT_POOL_TOKEN_MISMATCH");
-        // // TODO pool is not linked
-
-        // IRegistry.ObjectInfo memory distributionInfo = _registry.getObjectInfo(info.distributionNftId);
-
-        // if(distributionInfo.objectType != DISTRIBUTION()) {
-        //     revert  InvalidDistribution();
-        // } 
-
-        // if(distributionInfo.parentNftId != instanceNftId) {
-        //     revert InvalidDistributionsInstance();
-        // }
-        // // TODO distribution have the same token
-        // // TODO distribution is not linked
-    }
-
-    function setFees(
-        Fee memory productFee,
-        Fee memory processingFee
-    )
-        external
-    {
-        // TODO check args 
-
-        (
-            IRegistry.ObjectInfo memory productInfo, 
-            IInstance instance
-        ) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
-
-        InstanceReader instanceReader = instance.getInstanceReader();
-        NftId productNftId = productInfo.nftId;
-        ISetup.ProductSetupInfo memory productSetupInfo = instanceReader.getProductSetupInfo(productNftId);
-
-        productSetupInfo.productFee = productFee;
-        productSetupInfo.processingFee = processingFee;
-        
-        instance.updateProductSetup(productNftId, productSetupInfo, KEEP_STATE());
-    }
-
-    function createRisk(
-        RiskId riskId,
-        bytes memory data
-    ) external override {
-        (
-            IRegistry.ObjectInfo memory productInfo, 
-            IInstance instance
-        ) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
-        NftId productNftId = productInfo.nftId;
-        IRisk.RiskInfo memory riskInfo = IRisk.RiskInfo(productNftId, data);
-        instance.createRisk(
-            riskId,
-            riskInfo
-        );
-    }
-
-    function updateRisk(
-        RiskId riskId,
-        bytes memory data
-    ) external {
-        (, IInstance instance) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
-        InstanceReader instanceReader = instance.getInstanceReader();
-        IRisk.RiskInfo memory riskInfo = instanceReader.getRiskInfo(riskId);
-        riskInfo.data = data;
-        instance.updateRisk(riskId, riskInfo, KEEP_STATE());
-    }
-
-    function updateRiskState(
-        RiskId riskId,
-        StateId state
-    ) external {
-        (, IInstance instance) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
-        instance.updateRiskState(riskId, state);
-    }
-}

package/contracts/instance/service/ProductServiceManager.sol

@@ -1,54 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.20;
-
-import {IVersionable} from "../../shared/IVersionable.sol";
-import {ProxyManager} from "../../shared/ProxyManager.sol";
-import {ProductService} from "./ProductService.sol";
-import {Registry} from "../../registry/Registry.sol";
-import {RegistryService} from "../../registry/RegistryService.sol";
-import {VersionLib} from "../../types/Version.sol";
-
-contract ProductServiceManager is ProxyManager {
-
-    ProductService private _productService;
-
-    /// @dev initializes proxy manager with product service implementation 
-    constructor(
-        address registryAddress
-    )
-        ProxyManager()
-    {
-        ProductService svc = new ProductService();
-        bytes memory data = abi.encode(registryAddress, address(this));
-        IVersionable versionable = deploy(
-            address(svc), 
-            data);
-
-        _productService = ProductService(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(_productService);
-        
-        // TODO no nft to link yet
-        // link ownership of instance service manager ot nft owner of instance service
-        //_linkToNftOwnable(
-        //    address(registryAddress),
-        //    address(_productService));
-
-        // implies that after this constructor call only upgrade functionality is available
-        _isDeployed = true;
-    }
-
-    //--- view functions ----------------------------------------------------//
-    function getProductService()
-        external
-        view
-        returns (ProductService productService)
-    {
-        return _productService;
-    }
-
-}

package/contracts/registry/RegistryAccessManager.sol

@@ -1,216 +0,0 @@
-// SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.20;
-
-import {AccessManager} from "@openzeppelin/contracts/access/manager/AccessManager.sol";
-import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";
-
-import {RoleId, RoleIdLib,
-        GIF_MANAGER_ROLE,
-        GIF_ADMIN_ROLE,
-        RELEASE_MANAGER_ROLE} from "../types/RoleId.sol";
-
-import {TokenRegistry} from "./TokenRegistry.sol";
-import {ReleaseManager} from "./ReleaseManager.sol";
-
-/*
-    4 types of roles:
-    1) RELEASE_MANAGER_ROLE
-        - has only ReleaseManager as member
-        - responsible for setting and granting of REGISTRAR roles
-    1) REGISTRAR roles
-        - set and granted by RELEASE_MANAGER_ROLE
-        - each has 1 unique member (regular service ver.X) (subject to change)
-        - each set to 1 target (registry service ver.X) and 1 selector (function of registry service ver.X) (subject to change)
-    2) GIF_MANAGER_ROLE
-        - can have arbitrary number of members
-        - responsible for services registrations
-        - responsible for token registration and activation
-    3) GIF_ADMIN_ROLE
-        - admin of GIF_MANAGER_ROLE
-        - MUST have 1 member at any time
-        - granted/revoked ONLY in transferAdminRole() -> consider lock out situations!!!
-        - responsible for creation and activation of releases
-
-*/
-
-contract RegistryAccessManager is AccessManaged
-{
-    error NotInitialized();
-    error AlreadyInitialized();
-
-    uint64 public constant UNIQUE_ROLE_ID_MIN = 1000000;
-    
-    AccessManager private immutable _accessManager;
-    address private _releaseManager;
-    address private _tokenRegistry;
-
-    uint64 private _idNext; // role id
-    bool private _isInitialized;
-
-    modifier onlyOnce() {
-        if(_isInitialized) {
-            revert AlreadyInitialized();
-        } 
-        _;
-        _isInitialized = true;
-    }
-
-    modifier onlyInitialized() {
-        if(!_isInitialized) {
-            revert NotInitialized();
-        }
-        _;
-    }
-
-    constructor(address manager)
-        AccessManaged(msg.sender)
-    {
-        _accessManager = new AccessManager(address(this));
-        setAuthority(address(_accessManager));
-
-        _idNext = UNIQUE_ROLE_ID_MIN;
-
-        _configureAdminRoleInitial();
-
-        address admin = msg.sender;
-        _grantRole(GIF_ADMIN_ROLE(), admin, 0);
-        _grantRole(GIF_MANAGER_ROLE(), manager, 0);
-    }
-
-    function initialize(address releaseManager, address tokenRegistry)
-        external 
-        restricted // GIF_ADMIN_ROLE
-        onlyOnce
-    {
-        require(
-            ReleaseManager(releaseManager).authority() == address(_accessManager),
-            "RegistryAccessManager: release manager authority is invalid");
-        require(tokenRegistry > address(0), "RegistryAccessManager: token registry is 0");
-        //require(tokenRegistry.authority() == address(_accessManager));
-
-        _releaseManager = releaseManager;
-        _tokenRegistry = tokenRegistry;
-
-        _configureAdminRole();
-        _configureManagerRole();
-        _configureReleaseManagerRole();
-
-        _grantRole(RELEASE_MANAGER_ROLE(), releaseManager, 0);
-    }
-
-    // set unique role for target, role forever have 1 member and never revoked
-    function setAndGrantUniqueRole(
-        address account, 
-        address target, 
-        bytes4[] memory selector
-    )
-        external
-        restricted // RELEASE_MANAGER_ROLE
-        onlyInitialized
-        returns(RoleId)
-    {
-        // TODO questionable check...
-        // target is not part of `runtime`
-        //if(
-        //    target == address(this) ||
-        //    target == address(_accessManager) || 
-        //    target == _releaseManager || 
-        //    target == _tokenRegistry)
-        //{ return TargetInvalid(); }
-
-        RoleId roleId = _getNextRoleId();
-
-        _setTargetFunctionRole(target, selector, roleId);
-        _grantRole(roleId, account, 0);
-    }
-
-    /*function transferAdmin(address to)
-        external
-        restricted // only with GIF_ADMIN_ROLE or nft owner
-    {
-        _accessManager.revoke(GIF_ADMIN_ROLE, );
-        _accesssManager.grant(GIF_ADMIN_ROLE, to, 0);
-    }*/
-
-    //--- view functions ----------------------------------------------------//
-
-    function getAccessManager()
-        external
-        view
-        returns (AccessManager)
-    {
-        return _accessManager;
-    }
-
-    //--- private functions -------------------------------------------------//
-
-    function _configureAdminRoleInitial() private
-    {
-        bytes4[] memory functionSelector = new bytes4[](1);
-
-        functionSelector[0] = RegistryAccessManager.initialize.selector;
-        _setTargetFunctionRole(address(this), functionSelector, GIF_ADMIN_ROLE());
-    }
-
-    function _configureAdminRole() private
-    {
-        bytes4[] memory functionSelector = new bytes4[](1);
-
-        // for RegistryServiceProxyManager
-        // TODO upgrading with releaseManager.upgrade()->proxy.upgrade()???
-        //functionSelector[0] = RegistryServiceManager.upgrade.selector;
-        //_setTargetFunctionRole(address(this), functionSelector, GIF_ADMIN_ROLE());
-
-        // for TokenRegistry
-
-        // for ReleaseManager
-        functionSelector[0] = ReleaseManager.createNextRelease.selector;
-        _setTargetFunctionRole(_releaseManager, functionSelector, GIF_ADMIN_ROLE());
-
-        functionSelector[0] = ReleaseManager.activateNextRelease.selector;
-        _setTargetFunctionRole(_releaseManager, functionSelector, GIF_ADMIN_ROLE());
-    }
-    
-    function _configureManagerRole() private 
-    {
-        bytes4[] memory functionSelector = new bytes4[](1);
-
-        // for TokenRegistry
-        functionSelector[0] = TokenRegistry.setActive.selector;
-        _setTargetFunctionRole(address(_tokenRegistry), functionSelector, GIF_MANAGER_ROLE());
-
-        // for ReleaseManager
-        functionSelector[0] = ReleaseManager.registerService.selector;
-        _setTargetFunctionRole(_releaseManager, functionSelector, GIF_MANAGER_ROLE());
-
-        functionSelector[0] = ReleaseManager.registerRegistryService.selector;
-        _setTargetFunctionRole(_releaseManager, functionSelector, GIF_MANAGER_ROLE());
-
-        // set admin
-        _setRoleAdmin(GIF_MANAGER_ROLE(), GIF_ADMIN_ROLE());
-    }
-
-    function _configureReleaseManagerRole() private
-    {
-        bytes4[] memory functionSelector = new bytes4[](1);
-
-        functionSelector[0] = RegistryAccessManager.setAndGrantUniqueRole.selector;
-        _setTargetFunctionRole(address(this), functionSelector, RELEASE_MANAGER_ROLE());
-    }
-
-    function _setTargetFunctionRole(address target, bytes4[] memory selectors, RoleId roleId) private {
-        _accessManager.setTargetFunctionRole(target, selectors, roleId.toInt());        
-    }
-
-    function _setRoleAdmin(RoleId roleId, RoleId adminRoleId) private {
-        _accessManager.setRoleAdmin(roleId.toInt(), adminRoleId.toInt());
-    }
-
-    function _grantRole(RoleId roleId, address account, uint32 executionDelay) private {
-            _accessManager.grantRole(roleId.toInt(), account, executionDelay);
-    }
-
-    function _getNextRoleId() private returns(RoleId roleId) {
-        roleId = RoleIdLib.toRoleId(_idNext++);
-    }
-}