@etherisc/gif-next 0.0.2-a5cf039-146 → 0.0.2-a6ce659-551

package/contracts/instance/module/ISetup.sol

@@ -1,43 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.20;
-
-import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
-
-import {Fee} from "../../types/Fee.sol";
-import {NftId} from "../../types/NftId.sol";
-import {UFixed} from "../../types/UFixed.sol";
-import {TokenHandler} from "../../shared/TokenHandler.sol";
-
-interface ISetup {
-    struct ProductSetupInfo {
-        IERC20Metadata token;
-        TokenHandler tokenHandler;
-        NftId distributionNftId;
-        NftId poolNftId;
-        Fee distributionFee; // default distribution fee (no referral id)
-        Fee productFee; // product fee on net premium
-        Fee processingFee; // product fee on payout amounts
-        Fee poolFee; // pool fee on net premium
-        Fee stakingFee; // pool fee on staked capital from investor
-        Fee performanceFee; // pool fee on profits from capital investors
-    }
-
-    struct DistributionSetupInfo {
-        NftId productNftId;
-        TokenHandler tokenHandler;
-        Fee distributionFee; // default distribution fee (no referral id)
-        bool isIntercepting; // intercepts nft transfers (for distributors)
-        address wallet;
-    }
-
-    struct PoolSetupInfo {
-        NftId productNftId;
-        TokenHandler tokenHandler;
-        UFixed collateralizationLevel;
-        Fee poolFee; // pool fee on net premium
-        Fee stakingFee; // pool fee on staked capital from investor
-        Fee performanceFee; // pool fee on profits from capital investors
-        bool isIntercepting; // intercepts nft transfers (for bundles)
-        address wallet;
-    }
-}

package/contracts/instance/module/ITreasury.sol

@@ -1,23 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.20;
-
-import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
-
-import {Fee} from "../../types/Fee.sol";
-import {NftId} from "../../types/NftId.sol";
-import {TokenHandler} from "../../shared/TokenHandler.sol";
-
-interface ITreasury {
-    struct TreasuryInfo {
-        IERC20Metadata token;
-        TokenHandler tokenHandler;
-        NftId distributionNftId;
-        NftId poolNftId;
-        Fee distributionFee; // default distribution fee (no referral id)
-        Fee productFee; // product fee on net premium
-        Fee processingFee; // product fee on payout amounts
-        Fee poolFee; // pool fee on net premium
-        Fee stakingFee; // pool fee on staked capital from investor
-        Fee performanceFee; // pool fee on profits from capital investors
-    }
-}

package/contracts/instance/service/ComponentOwnerService.sol

@@ -1,317 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.20;
-
-import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
-
-import {IRegistry} from "../../registry/IRegistry.sol";
-import {IInstance} from "../IInstance.sol";
-
-import {ITreasury} from "../module/ITreasury.sol";
-// import {TreasuryModule} from "../module/TreasuryModule.sol";
-import {ISetup} from "../module/ISetup.sol";
-import {IBaseComponent} from "../../components/IBaseComponent.sol";
-import {IPoolComponent} from "../../components/IPoolComponent.sol";
-import {IKeyValueStore} from "../../instance/base/IKeyValueStore.sol";
-import {IVersionable} from "../../shared/IVersionable.sol";
-import {Versionable} from "../../shared/Versionable.sol";
-
-import {RoleId, PRODUCT_OWNER_ROLE, POOL_OWNER_ROLE, DISTRIBUTION_OWNER_ROLE, ORACLE_OWNER_ROLE} from "../../types/RoleId.sol";
-import {ObjectType, TOKEN, COMPONENT, PRODUCT, ORACLE, POOL, DISTRIBUTION} from "../../types/ObjectType.sol";
-import {StateId, ACTIVE, PAUSED} from "../../types/StateId.sol";
-import {Key32} from "../../types/Key32.sol";
-import {NftId, NftIdLib, zeroNftId} from "../../types/NftId.sol";
-import {Fee} from "../../types/Fee.sol";
-import {Version, VersionLib} from "../../types/Version.sol";
-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 {IComponentOwnerService} from "./IComponentOwnerService.sol";
-import {ServiceBase} from "../base/ServiceBase.sol";
-// import {IPool, IPoolModule} from "../module/IPoolModule.sol";
-
-import {IRegistryService} from "../../registry/IRegistryService.sol";
-
-contract ComponentOwnerService is
-    ServiceBase,
-    IComponentOwnerService
-{
-    using NftIdLib for NftId;
-
-    error MissingTypeRole();
-    error WalletIsZero();
-    error InvalidToken();
-    error InvalidPool();
-    error InvalidDistribution();
-    error InvalidPoolsInstance();
-    error InvalidDistributionsInstance();
-
-    error CollateralizationLevelIsZero();
-
-    string public constant NAME = "ComponentOwnerService";
-
-    modifier onlyRegisteredComponent(IBaseComponent component) {
-        NftId nftId = getRegistry().getNftId(address(component));
-        require(nftId.gtz(), "ERROR:COS-001:COMPONENT_UNKNOWN");
-        _;
-    }
-
-    constructor(
-        address registry,
-        NftId registryNftId,
-        address initialOwner
-    )
-    {
-        _initializeServiceBase(registry, registryNftId, initialOwner);
-        _registerInterface(type(IComponentOwnerService).interfaceId);
-    }
-
-    function getName() public pure override(IService, ServiceBase) returns(string memory name) {
-        return NAME;
-    }
-
-    function getRoleForType(
-        ObjectType cType
-    ) public pure override returns (RoleId role) {
-        if (cType == PRODUCT()) {
-            return PRODUCT_OWNER_ROLE();
-        }
-        if (cType == POOL()) {
-            return POOL_OWNER_ROLE();
-        }
-        if (cType == DISTRIBUTION()) {
-            return DISTRIBUTION_OWNER_ROLE();
-        }
-        if (cType == ORACLE()) {
-            return ORACLE_OWNER_ROLE();
-        }
-    }
-
-    function getRegistryService() public view virtual returns (IRegistryService) {
-        address service = getRegistry().getServiceAddress("RegistryService", getMajorVersion());
-        return IRegistryService(service);
-    }
-
-    function registerProduct(	
-        IBaseComponent product
-    ) external returns (NftId nftId) {	
-
-        // TODO some info parameters from component and from register may differ -> getObjectInfo() after registration?
-        (
-            IRegistry.ObjectInfo memory info,
-            bytes memory data
-        ) = getRegistryService().registerProduct(
-            product,
-            msg.sender);	
-
-        NftId instanceNftId = info.parentNftId;
-        address instanceAddress = getRegistry().getObjectInfo(instanceNftId).objectAddress;
-        IInstance instance = IInstance(instanceAddress);
-
-        RoleId typeRole = getRoleForType(PRODUCT());
-        // TODO refactor to use access manager infra
-        // if(instance.hasRole(typeRole, msg.sender) == false) {
-        //     revert MissingTypeRole();
-        // }
-        
-        _registerProduct(
-                info.nftId, 
-                instanceNftId,
-                instance,
-                data
-        );
-    }
-
-    function registerPool(	
-        IBaseComponent pool
-    ) external returns (NftId nftId) {	
-
-        // TODO some info parameters from component and from register may differ -> getObjectInfo() after registration?
-        (
-            IRegistry.ObjectInfo memory info,
-            bytes memory data
-        ) = getRegistryService().registerPool(
-            pool,
-            msg.sender);	
-
-        NftId instanceNftId = info.parentNftId;
-        address instanceAddress = getRegistry().getObjectInfo(instanceNftId).objectAddress;
-        IInstance instance = IInstance(instanceAddress);
-
-        RoleId typeRole = getRoleForType(POOL());
-        // TODO refactor to use access manager infra
-        // if(instance.hasRole(typeRole, msg.sender) == false) {
-        //     revert MissingTypeRole();
-        // } 
-
-        _registerPool(
-            info.nftId,
-            instanceNftId,
-            instance,
-            data
-        );
-    }
-
-    function registerDistribution(	
-        IBaseComponent distribution
-    ) external returns (NftId nftId) {	
-
-        // TODO some info parameters from component and from register may differ -> getObjectInfo() after registration?
-        (
-            IRegistry.ObjectInfo memory info,
-            bytes memory data
-        ) = getRegistryService().registerDistribution(
-            distribution,
-            msg.sender);	
-
-        NftId instanceNftId = info.parentNftId;
-        address instanceAddress = getRegistry().getObjectInfo(instanceNftId).objectAddress;
-        IInstance instance = IInstance(instanceAddress);
-
-        RoleId typeRole = getRoleForType(DISTRIBUTION());
-        // TODO refactor to use access manager infra
-        // if(instance.hasRole(typeRole, msg.sender) == false) {
-        //     revert MissingTypeRole();
-        // }
-    }
-
-    function lock(
-        IBaseComponent component
-    ) external override onlyRegisteredComponent(component) {
-        // TODO use msg.sender to get component and get instance via registered parent nft id
-        IInstance instance = component.getInstance();
-        NftId nftId = component.getNftId();
-        Key32 key = nftId.toKey32(COMPONENT());
-        // instance.updateState(key, PAUSED());
-    }
-
-    function unlock(
-        IBaseComponent component
-    ) external override onlyRegisteredComponent(component) {
-        // TODO use msg.sender to get component and get instance via registered parent nft id
-        IInstance instance = component.getInstance();
-        NftId nftId = component.getNftId();
-        Key32 key = nftId.toKey32(COMPONENT());
-        // instance.updateState(key, ACTIVE());
-    }
-
-    // Internals
-
-    function _registerProduct(
-        NftId nftId, 
-        NftId instanceNftId,
-        IInstance instance,
-        bytes memory data
-    )
-        internal
-    {
-        // TODO change treasury info to product setup info
-        (ISetup.ProductSetupInfo memory info) = abi.decode(data, (ISetup.ProductSetupInfo));
-        // (
-        //     ITreasury.TreasuryInfo memory info,
-        //     address wallet
-        // )  = abi.decode(data, (ITreasury.TreasuryInfo, address));
-
-        // IRegistry _registry = getRegistry();
-
-        // 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
-
-        // // component module
-        // instance.registerComponent(
-        //     nftId,
-        //     info.token,
-        //     wallet // TODO move wallet into TreasuryInfo?
-        // );
-
-        // treasury module
-        instance.createProductSetup(
-            nftId, 
-            info
-        );
-    }
-
-    function _registerPool(
-        NftId nftId,
-        NftId instanceNftId,
-        IInstance instance,
-        bytes memory data
-    )
-        internal
-    {
-        (
-            ISetup.PoolSetupInfo memory info,
-            address wallet,
-            IERC20Metadata token,
-            /*poolFee*/,
-            /*stakingFee*/,
-            /*performanceFee*/
-        )  = abi.decode(data, (ISetup.PoolSetupInfo, address, IERC20Metadata, Fee, Fee, Fee));
-
-        IRegistry _registry = getRegistry();
-
-        if(wallet == address(0)) {
-            revert WalletIsZero();
-        }
-
-        ObjectType tokenType = _registry.getObjectInfo(address(token)).objectType;
-
-        if(tokenType != TOKEN()) {
-            revert InvalidToken();
-        } 
-
-        if(UFixedLib.eqz(info.collateralizationLevel)) { 
-            revert CollateralizationLevelIsZero();
-        }
-
-        // TODO add more validations
-
-        // // component module
-        // instance.registerComponent(
-        //     nftId,
-        //     token,
-        //     wallet
-        // ); 
-
-        // pool module
-        instance.createPoolSetup(
-            nftId, 
-            info
-        );
-    }
-}

package/contracts/instance/service/IComponentOwnerService.sol

@@ -1,20 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.19;
-
-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";
-
-// TODO rename to registry service
-interface IComponentOwnerService is IService {
-
-    // TODO move to product/pool services
-    function lock(IBaseComponent component) external;
-
-    // TODO move to product/pool services
-    function unlock(IBaseComponent component) external;
-
-    function getRoleForType(ObjectType cType) external pure returns (RoleId role);
-}

package/contracts/instance/service/IDistributionService.sol

@@ -1,12 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.19;
-
-import {NftId} from "../../types/NftId.sol";
-import {Fee} from "../../types/Fee.sol";
-import {IService} from "../base/IService.sol";
-
-interface IDistributionService is IService {
-    function setFees(
-        Fee memory distributionFee
-    ) external;
-}

package/contracts/instance/service/IPoolService.sol

@@ -1,37 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.19;
-
-import {NftId} from "../../types/NftId.sol";
-import {Fee} from "../../types/Fee.sol";
-import {IService} from "../base/IService.sol";
-
-interface IPoolService is IService {
-    function setFees(
-        Fee memory poolFee,
-        Fee memory stakingFee,
-        Fee memory performanceFee
-    ) external;
-
-    function createBundle(
-        address owner,
-        Fee memory fee, 
-        uint256 amount,
-        uint256 lifetime, 
-        bytes calldata filter
-    ) external returns(NftId bundleNftId);
-
-    function setBundleFee(
-        NftId bundleNftId,
-        Fee memory fee
-    ) external;
-
-    // function fundBundle(NftId bundleNftId, uint256 amount) external returns(uint256 netAmount);
-
-    // function defundBundle(NftId bundleNftId, uint256 amount) external returns(uint256 netAmount);
-
-    // function lockBundle(NftId bundleNftId) external;
-
-    // function unlockBundle(NftId bundleNftId) external;
-
-    // function closeBundle(NftId bundleNftId) external;
-}

package/contracts/instance/service/IProductService.sol

@@ -1,107 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.19;
-
-import {IRisk} from "../module/IRisk.sol";
-import {IService} from "../base/IService.sol";
-
-import {NftId} from "../../types/NftId.sol";
-import {ReferralId} from "../../types/Referral.sol";
-import {RiskId} from "../../types/RiskId.sol";
-import {StateId} from "../../types/StateId.sol";
-import {Timestamp} from "../../types/Timestamp.sol";
-import {UFixed} from "../../types/UFixed.sol";
-import {Fee} from "../../types/Fee.sol";
-
-interface IProductService is IService {
-    function setFees(
-        Fee memory productFee,
-        Fee memory processingFee
-    ) external;
-
-    function createRisk(
-        RiskId riskId,
-        bytes memory data
-    ) external;
-
-
-    function setRiskInfo(
-        RiskId riskId,
-        IRisk.RiskInfo memory data
-    ) external;
-
-
-    function updateRiskState(
-        RiskId riskId,
-        StateId state
-    ) external;
-
-
-    function calculatePremium(
-        RiskId riskId,
-        uint256 sumInsuredAmount,
-        uint256 lifetime,
-        bytes memory applicationData,
-        NftId bundleNftId,
-        ReferralId referralId
-    )
-        external
-        view
-        returns (
-            uint256 premiumAmount,
-            uint256 productFeeAmount,
-            uint256 poolFeeAmount,
-            uint256 bundleFeeAmount,
-            uint256 distributionFeeAmount
-        );
-
-
-    function createApplication(
-        address applicationOwner,
-        RiskId riskId,
-        uint256 sumInsuredAmount,
-        uint256 lifetime,
-        bytes memory applicationData,
-        NftId bundleNftId,
-        ReferralId referralId
-    ) external returns (NftId nftId);
-
-    /**
-     * @dev revokes the application represented by {policyNftId}.
-     * an application can only be revoked in applied state.
-     * only the application holder may revoke an application.
-     */
-    function revoke(NftId policyNftId) external;
-
-    /**
-     * @dev underwrites the policy represented by {policyNftId}.
-     * optionally collects premiums and activates the policy.
-     * - premium payment is only attempted if requirePremiumPayment is set to true
-     * - activation is only done if activateAt is a non-zero timestamp
-     */
-    function underwrite(
-        NftId policyNftId,
-        bool requirePremiumPayment,
-        Timestamp activateAt
-    ) external;
-
-    // function decline(uint256 nftId) external;
-    // function expire(uint256 nftId) external;
-
-    function collectPremium(NftId policyNftId, Timestamp activateAt) external;
-
-    function activate(NftId policyNftId, Timestamp activateAt) external;
-
-
-    function close(NftId nftId) external;
-
-    // function createClaim(uint256 nftId, uint256 claimAmount) external;
-    // function confirmClaim(uint256 nftId, uint256 claimId, uint256 claimAmount) external;
-    // function declineClaim(uint256 nftId, uint256 claimId) external;
-    // function closeClaim(uint256 nftId, uint256 claimId) external;
-
-    function calculateRequiredCollateral(
-        UFixed collateralizationLevel, 
-        uint256 sumInsuredAmount
-    ) external pure returns(uint256 collateralAmount);
-
-}

package/contracts/shared/ContractDeployerLib.sol

@@ -1,72 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.20;
-
-library ContractDeployerLib {
-
-    event LogContractDeployed(address contractAddress);
-
-    error ErrorCreationCodeHashMismatch(bytes32 expectedHash, bytes32 actualHash);
-
-    /// @dev deploys a new contract using the provided creation code
-    function deploy(
-        bytes memory creationCode,
-        bytes32 expectedCreationCodeHash
-    ) 
-        public
-        returns (address contractAdress)
-    {
-        // check against expected hash, if provided
-        if (expectedCreationCodeHash != bytes32(0)) {
-            bytes32 creationCodeHash = getHash(creationCode);
-            if (creationCodeHash != expectedCreationCodeHash) {
-                revert ErrorCreationCodeHashMismatch(expectedCreationCodeHash, creationCodeHash);
-            }
-        }
-
-        // solhint-disable no-inline-assembly
-        assembly {
-            contractAdress := create(0, add(creationCode, 0x20), mload(creationCode))  
-
-            if iszero(extcodesize(contractAdress)) {
-                revert(0, 0)
-            }
-        }
-        // solhint enable
-
-        emit LogContractDeployed(contractAdress);
-    }
-
-    /// @dev gets the creation code for the new contract
-    // for terminology see eg https://www.rareskills.io/post/ethereum-contract-creation-code
-    function getCreationCode(
-        bytes memory byteCodeWithInitCode, // what you get with type(<Contract>).creationCode
-        bytes memory encodedConstructorArguments // what you get with 
-    )
-        public
-        pure
-        returns (bytes memory creationCode)
-    {
-        return abi.encodePacked(byteCodeWithInitCode, encodedConstructorArguments);
-    }
-
-
-    function matchesWithHash(
-        bytes memory creationCode,
-        bytes32 expectedHash
-    )
-        public
-        pure
-        returns (bool isMatching)
-    {
-        return getHash(creationCode) == expectedHash;
-    }
-
-
-    function getHash(bytes memory creationCode)
-        public
-        pure
-        returns (bytes32 hash)
-    {
-        return keccak256(creationCode);
-    }
-}

package/contracts/test/TestFee.sol

@@ -1,25 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.19;
-
-import {UFixed, UFixedLib} from "../types/UFixed.sol";
-import {Fee, FeeLib} from "../types/Fee.sol";
-
-contract TestFee {
-
-    function createFee(
-        uint256 fractionalValue,
-        int8 exponent,
-        uint256 fixedValue
-    )
-        external 
-        pure 
-        returns(Fee memory fee)
-    {
-        return FeeLib.toFee(UFixedLib.toUFixed(fractionalValue, exponent), fixedValue);
-    }
-
-    function getZeroFee() external pure returns(Fee memory fee) {
-        return FeeLib.zeroFee();
-    }
-
-}

package/contracts/test/TestRegisterable.sol

@@ -1,18 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.19;
-
-import {NftId} from "../../contracts/types/NftId.sol";
-import {ObjectType, TOKEN} from "../../contracts/types/ObjectType.sol";
-import {IRegistry} from "../../contracts/registry/IRegistry.sol";
-import {Registerable} from "../../contracts/shared/Registerable.sol";
-
-contract TestRegisterable is Registerable {
-
-    constructor(address registry, NftId registryNftId, ObjectType objectType, bool isInterceptor, address initialOwner)
-        //Registerable(registry, registryNftId)
-    // solhint-disable-next-line no-empty-blocks
-    {
-        bytes memory data = "";
-        _initializeRegisterable(registry, registryNftId, objectType, isInterceptor, initialOwner, data);
-    }
-}