@etherisc/gif-next 0.0.2-be8b468-276 → 0.0.2-bf51045-496

package/contracts/components/Pool.sol

@@ -1,258 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.20;
-
-import {ObjectType, POOL} from "../types/ObjectType.sol";
-import {IProductService} from "../instance/service/IProductService.sol";
-import {IPoolService} from "../instance/service/IPoolService.sol";
-import {NftId, zeroNftId, NftIdLib} from "../types/NftId.sol";
-import {Fee} from "../types/Fee.sol";
-import {UFixed} from "../types/UFixed.sol";
-import {IPoolComponent} from "./IPoolComponent.sol";
-import {BaseComponent} from "./BaseComponent.sol";
-import {TokenHandler} from "../shared/TokenHandler.sol";
-import {ISetup} from "../instance/module/ISetup.sol";
-
-import {IRegistry} from "../registry/IRegistry.sol";
-
-// import {IPool} from "../instance/module/pool/IPoolModule.sol";
-import {ITreasury} from "../instance/module/ITreasury.sol";
-import {ISetup} from "../instance/module/ISetup.sol";
-import {InstanceReader} from "../instance/InstanceReader.sol";
-
-import {IRegisterable} from "../shared/IRegisterable.sol";
-import {Registerable} from "../shared/Registerable.sol";
-
-contract Pool is BaseComponent, IPoolComponent {
-    using NftIdLib for NftId;
-
-    bool internal _isVerifying;
-    UFixed internal _collateralizationLevel;
-
-    Fee internal _initialPoolFee;
-    Fee internal _initialStakingFee;
-    Fee internal _initialPerformanceFee;
-
-    // may be used to interact with instance by derived contracts
-    IPoolService internal _poolService;
-
-    // only relevant to protect callback functions for "active" pools
-    IProductService private _productService;
-
-    modifier onlyPoolService() {
-        require(
-            msg.sender == address(_poolService), 
-            "ERROR:POL-001:NOT_POOL_SERVICE");
-        _;
-    }
-
-    modifier onlyProductService() {
-        require(
-            msg.sender == address(_productService), 
-            "ERROR:POL-002:NOT_PRODUCT_SERVICE");
-        _;
-    }
-
-    constructor(
-        address registry,
-        NftId instanceNftId,
-        // TODO refactor into tokenNftId
-        address token,
-        bool isInterceptor,
-        bool verifying,
-        UFixed collateralizationLevel,
-        Fee memory poolFee,
-        Fee memory stakingFee,
-        Fee memory performanceFee,
-        address initialOwner
-    )
-        BaseComponent(registry, instanceNftId, token, POOL(), isInterceptor, initialOwner)
-    {
-        _isVerifying = verifying;
-        // TODO add validation
-        _collateralizationLevel = collateralizationLevel;
-        _initialPoolFee = poolFee;
-        _initialStakingFee = stakingFee;
-        _initialPerformanceFee = performanceFee;
-
-        // TODO: reactivate when services are available again
-        // _poolService = _instance.getPoolService();
-        // _productService = _instance.getProductService();
-
-        _registerInterface(type(IPoolComponent).interfaceId);
-    }
-
-    function createBundle(
-        Fee memory fee,
-        uint256 initialAmount,
-        uint256 lifetime,
-        bytes memory filter
-    )
-        external
-        virtual override
-        returns(NftId bundleNftId)
-    {
-        address owner = msg.sender;
-        bundleNftId = _poolService.createBundle(
-            owner,
-            fee,
-            initialAmount,
-            lifetime,
-            filter
-        );
-
-        // TODO add logging
-    }
-
-    /**
-     * @dev see {IPool.underwrite}. 
-     * Default implementation that only writes a {LogUnderwrittenByPool} entry.
-     */
-    function underwrite(
-        NftId policyNftId, 
-        bytes memory policyData,
-        bytes memory bundleFilter,
-        uint256 collateralizationAmount
-    )
-        external
-        onlyProductService
-        virtual override 
-    {
-        _underwrite(policyNftId, policyData, bundleFilter, collateralizationAmount);
-    }
-
-    /**
-     * @dev see {IPoolComponent.policyMatchesBundle}. 
-     * Default implementation always returns true
-     */
-    function policyMatchesBundle(
-        bytes memory, // policyData
-        bytes memory // bundleFilter
-    )
-        public
-        view
-        virtual override
-        returns (bool isMatching)
-    {
-        return true;
-    }
-
-
-    function isVerifying() external view override returns (bool verifying) {
-        return _isVerifying;
-    }
-
-    function getCollateralizationLevel() external view override returns (UFixed collateralizationLevel) {
-        return _collateralizationLevel;
-    }
-
-    function setFees(
-        Fee memory poolFee,
-        Fee memory stakingFee,
-        Fee memory performanceFee
-    )
-        external
-        onlyOwner
-        override
-    {
-        _poolService.setFees(poolFee, stakingFee, performanceFee);
-    }
-
-    function setBundleFee(
-        NftId bundleNftId, 
-        Fee memory fee
-    )
-        external
-        override
-        // TODO add onlyBundleOwner
-    {
-        _poolService.setBundleFee(bundleNftId, fee);
-    }
-
-    function getSetupInfo() public view returns (ISetup.PoolSetupInfo memory setupInfo) {
-        // TODO fix this
-        if (getNftId().eq(zeroNftId())) {
-            return ISetup.PoolSetupInfo(
-                _productNftId,
-                TokenHandler(address(0)),
-                _collateralizationLevel,
-                _initialPoolFee,
-                _initialStakingFee,
-                _initialPerformanceFee,
-                _isVerifying,
-                _wallet
-            );
-        } 
-
-        InstanceReader reader = _instance.getInstanceReader();
-        return reader.getPoolSetupInfo(getNftId());
-    }
-
-    // from IRegisterable
-
-    // TODO used only once, occupies space
-    // TODO do not use super
-    function getInitialInfo() 
-        public
-        view
-        override (IRegisterable, Registerable)
-        returns (IRegistry.ObjectInfo memory, bytes memory)
-    {
-        (
-            IRegistry.ObjectInfo memory info, 
-            bytes memory data
-        ) = super.getInitialInfo();
-
-        return (
-            info,
-            abi.encode(
-                ISetup.PoolSetupInfo(
-                    getProductNftId(),
-                    TokenHandler(address(0)),
-                    _collateralizationLevel,
-                    _initialPoolFee,
-                    _initialStakingFee,
-                    _initialPerformanceFee,
-                    _isVerifying,
-                    _wallet
-                )
-            )
-        );
-    }
-
-    // Internals
-
-    function _underwrite(
-        NftId policyNftId, 
-        bytes memory policyData,
-        bytes memory bundleFilter,
-        uint256 collateralizationAmount
-    )
-        internal 
-    {
-        require(
-            policyMatchesBundle(policyData, bundleFilter),
-            "ERROR:POL-020:POLICY_BUNDLE_MISMATCH"
-        );
-
-        emit LogUnderwrittenByPool(policyNftId, collateralizationAmount, address(this));
-    }
-
-    function _createBundle(
-        address bundleOwner,
-        Fee memory fee,
-        uint256 amount,
-        uint256 lifetime, 
-        bytes calldata filter
-    )
-        internal
-        returns(NftId bundleNftId)
-    {
-        bundleNftId = _poolService.createBundle(
-            bundleOwner,
-            fee,
-            amount,
-            lifetime,
-            filter
-        );
-    }
-}

package/contracts/components/Product.sol

@@ -1,297 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.19;
-
-import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
-
-import {IRisk} from "../instance/module/IRisk.sol";
-import {ITreasury} from "../instance/module/ITreasury.sol";
-import {IProductService} from "../instance/service/IProductService.sol";
-import {IProductComponent} from "./IProductComponent.sol";
-import {NftId, zeroNftId, NftIdLib} from "../types/NftId.sol";
-import {ObjectType, PRODUCT} from "../types/ObjectType.sol";
-import {ReferralId} from "../types/Referral.sol";
-import {RiskId, RiskIdLib} from "../types/RiskId.sol";
-import {StateId} from "../types/StateId.sol";
-import {Timestamp} from "../types/Timestamp.sol";
-import {Fee, FeeLib} from "../types/Fee.sol";
-import {BaseComponent} from "./BaseComponent.sol";
-
-import {IRegistry} from "../registry/IRegistry.sol";
-import {IRegisterable} from "../shared/IRegisterable.sol";
-import {Registerable} from "../shared/Registerable.sol";
-import {TokenHandler} from "../shared/TokenHandler.sol";
-
-import {InstanceReader} from "../instance/InstanceReader.sol";
-import {ISetup} from "../instance/module/ISetup.sol";
-import {Pool} from "../components/Pool.sol";
-
-import {zeroNftId} from "../types/NftId.sol";
-
-contract Product is BaseComponent, IProductComponent {
-    using NftIdLib for NftId;
-
-    IProductService internal _productService;
-    Pool internal _pool;
-    address internal _distribution;
-    Fee internal _initialProductFee;
-    Fee internal _initialProcessingFee;
-
-    NftId internal _poolNftId;
-    NftId internal _distributionNftId;
-
-    constructor(
-        address registry,
-        NftId instanceNftid,
-        address token,
-        bool isInterceptor,
-        address pool,
-        address distribution,
-        Fee memory productFee,
-        Fee memory processingFee,
-        address initialOwner
-    ) BaseComponent(registry, instanceNftid, token, PRODUCT(), isInterceptor, initialOwner) {
-        // TODO add validation
-        // TODO: reactivate when services are available again
-        // _productService = _instance.getProductService();
-        _pool = Pool(pool);
-        _distribution = distribution;
-        _initialProductFee = productFee;
-        _initialProcessingFee = processingFee;  
-
-        _poolNftId = getRegistry().getNftId(address(_pool));
-        _distributionNftId = getRegistry().getNftId(_distribution);
-
-        _registerInterface(type(IProductComponent).interfaceId);  
-    }
-
-
-    function calculatePremium(
-        uint256 sumInsuredAmount,
-        RiskId riskId,
-        uint256 lifetime,
-        bytes memory applicationData,
-        ReferralId referralId,
-        NftId bundleNftId
-    )
-        external 
-        view 
-        override 
-        returns (uint256 premiumAmount)
-    {
-        (premiumAmount,,,,) = _productService.calculatePremium(
-            riskId,
-            sumInsuredAmount,
-            lifetime,
-            applicationData,
-            bundleNftId,
-            referralId
-        );
-    }
-
-
-    function calculateNetPremium(
-        uint256 sumInsuredAmount,
-        RiskId riskId,
-        uint256 lifetime,
-        bytes memory applicationData
-    )
-        external
-        view
-        virtual override
-        returns (uint256 netPremiumAmount)
-    {
-        // default 10% of sum insured
-        return sumInsuredAmount / 10;
-    }
-
-    function _toRiskId(string memory riskName) internal pure returns (RiskId riskId) {
-        return RiskIdLib.toRiskId(riskName);
-    }
-
-    function _createRisk(
-        RiskId id,
-        bytes memory data
-    ) internal {
-        _productService.createRisk(
-            id,
-            data
-        );
-    }
-
-    function _setRiskInfo(
-        RiskId id,
-        IRisk.RiskInfo memory info
-    ) internal {
-        _productService.setRiskInfo(
-            id,
-            info
-        );
-    }
-
-    function _updateRiskState(
-        RiskId id,
-        StateId state
-    ) internal {
-        _productService.updateRiskState(
-            id,
-            state
-        );
-    }
-
-    function _getRiskInfo(RiskId id) internal view returns (IRisk.RiskInfo memory info) {
-        return _instance.getInstanceReader().getRiskInfo(id);
-    }
-
-    function _createApplication(
-        address applicationOwner,
-        RiskId riskId,
-        uint256 sumInsuredAmount,
-        uint256 lifetime,
-        bytes memory applicationData,
-        NftId bundleNftId,
-        ReferralId referralId
-    ) internal returns (NftId nftId) {
-        nftId = _productService.createApplication(
-            applicationOwner,
-            riskId,
-            sumInsuredAmount,
-            lifetime,
-            applicationData,
-            bundleNftId,
-            referralId
-        );
-    }
-
-    function _underwrite(
-        NftId policyNftId,
-        bool requirePremiumPayment,
-        Timestamp activateAt
-    )
-        internal
-    {
-        _productService.underwrite(
-            policyNftId, 
-            requirePremiumPayment, 
-            activateAt);
-    }
-
-    function _collectPremium(
-        NftId policyNftId,
-        Timestamp activateAt
-    )
-        internal
-    {
-        _productService.collectPremium(
-            policyNftId, 
-            activateAt);
-    }
-
-    function _activate(
-        NftId policyNftId,
-        Timestamp activateAt
-    )
-        internal
-    {
-        _productService.activate(
-            policyNftId, 
-            activateAt);
-    }
-
-    function getPoolNftId() external view override returns (NftId poolNftId) {
-        return getRegistry().getNftId(address(_pool));
-    }
-
-    function getDistributionNftId() external view override returns (NftId distributionNftId) {
-        return getRegistry().getNftId(_distribution);
-    }
-
-    // from product component
-    function setFees(
-        Fee memory productFee,
-        Fee memory processingFee
-    )
-        external
-        onlyOwner
-        override
-    {
-        _productService.setFees(productFee, processingFee);
-    }
-
-    function getSetupInfo() public view returns (ISetup.ProductSetupInfo memory setupInfo) {
-        if (getNftId().eq(zeroNftId())) {
-            return ISetup.ProductSetupInfo(
-                _token,
-                TokenHandler(address(0)),
-                _distributionNftId,
-                _poolNftId,
-                FeeLib.zeroFee(), //_instance.getDistributionFee(_distributionNftId)
-                _initialProductFee,
-                _initialProcessingFee,
-                FeeLib.zeroFee(), //_instance.getPoolFee(_poolNftId)
-                FeeLib.zeroFee(), //_instance.getStakingFee(_poolNftId)
-                FeeLib.zeroFee() //_instance.getPerformanceFee(_poolNftId)
-            );
-        } 
-
-        InstanceReader reader = _instance.getInstanceReader();
-        return reader.getProductSetupInfo(getNftId());
-    }
-
-    // from IRegisterable
-
-    // TODO used only once, occupies space
-    function getInitialInfo() 
-        public
-        view 
-        override (IRegisterable, Registerable)
-        returns (IRegistry.ObjectInfo memory, bytes memory)
-    {
-        // from Registerable
-        (
-            IRegistry.ObjectInfo memory productInfo, 
-            bytes memory data
-        ) = super.getInitialInfo();
- 
-        // TODO read pool & distribution fees
-        // 1) from pool -> the only option -> pool must be registered first?
-        // 2) from instance -> all fees are set into instance at product registration which is ongoing here
-        // checks are done in registryProduct() where THIS function is called
-        //require(getRegistry().getObjectInfo(_poolNftId).objectType == POOL(), "POOL_NOT_REGISTERED");
-        //require(getRegistry().getObjectInfo(_distributionNftId).objectType == DISTRIBUTION(), "DISTRIBUTION_NOT_REGISTERED");
-        
-        // from PoolComponent
-        (
-            IRegistry.ObjectInfo memory poolInfo, 
-            bytes memory poolData
-        ) = _pool.getInitialInfo();
-
-        (
-            /*IPool.PoolInfo memory info*/,
-            /*address wallet*/,
-            /*IERC20Metadata token*/,
-            Fee memory initialPoolFee,
-            Fee memory initialStakingFee,
-            Fee memory initialPerformanceFee
-        )  = abi.decode(poolData, (ISetup.PoolSetupInfo, address, IERC20Metadata, Fee, Fee, Fee));
-
-        // TODO from DistributionComponent
-
-        return (
-            productInfo,
-            abi.encode(
-                ISetup.ProductSetupInfo(
-                    _token,
-                    TokenHandler(address(0)),
-                    _distributionNftId,
-                    _poolNftId,
-                    FeeLib.zeroFee(), //_instance.getDistributionFee(_distributionNftId)
-                    _initialProductFee,
-                    _initialProcessingFee,
-                    initialPoolFee,
-                    initialStakingFee,
-                    initialPerformanceFee
-                )
-            )
-        );
-    }
-}

package/contracts/experiment/cloning/Cloner.sol

@@ -1,47 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.20;
-
-import {Clones} from "@openzeppelin/contracts/proxy/Clones.sol";
-
-
-contract Cloner {
-
-    Mock1 public mock1;
-    Mock2 public mock2;
-
-    constructor() {
-        mock1 = new Mock1();
-        mock2 = new Mock2();
-    }
-
-    function createClone(address master)
-        external 
-        returns (address cloned)
-    {
-        cloned = Clones.clone(master);
-    }
-}
-
-
-contract Mock1 {
-    function getValue() external virtual view returns (uint256) {
-        return 42;
-    }
-}
-
-contract Mock2 is Mock1 {
-    uint256 internal _value;
-
-    constructor() {
-        _value = 42;
-    }
-
-    function setValue(uint256 value) external virtual {
-        _value = value;
-    }
-
-    function getValue() external virtual override view returns (uint256) {
-        return _value;
-    }
-}
-

package/contracts/experiment/errors/Require.sol

@@ -1,38 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.19;
-
-contract Require {
-    error AsmallerThanB_S();
-    error AsmallerThanB_M(uint a);
-    error AsmallerThanB_L(uint a, uint b);
-
-    uint256 private _b;
-
-    constructor() {
-        _b = 42;
-    }
-
-    function isAlargerThanBRequire_S(
-        uint a
-    ) external view returns (bool isLarger) {
-        require(a > _b, "ERROR:ABC-001");
-
-        return true;
-    }
-
-    function isAlargerThanBRequire_M(
-        uint a
-    ) external view returns (bool isLarger) {
-        require(a > _b, "ERROR:ABC-002:A_IS_SMALLER");
-
-        return true;
-    }
-
-    function isAlargerThanBRequire_L(
-        uint a
-    ) external view returns (bool isLarger) {
-        require(a > _b, "ERROR:ABC-003:A_IS_SMALLER_THAN_B");
-
-        return true;
-    }
-}

package/contracts/experiment/errors/Revert.sol

@@ -1,44 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.19;
-
-contract Revert {
-    error AsmallerThanB_S();
-    error AsmallerThanB_M(uint a);
-    error AsmallerThanB_L(uint a, uint b);
-
-    uint256 private _b;
-
-    constructor() {
-        _b = 42;
-    }
-
-    function isAlargerThanBRevert_S(
-        uint a
-    ) external view returns (bool isLarger) {
-        if (a <= _b) {
-            revert AsmallerThanB_S();
-        }
-
-        return true;
-    }
-
-    function isAlargerThanBRevert_M(
-        uint a
-    ) external view returns (bool isLarger) {
-        if (a <= _b) {
-            revert AsmallerThanB_M(a);
-        }
-
-        return true;
-    }
-
-    function isAlargerThanBRevert_L(
-        uint a
-    ) external view returns (bool isLarger) {
-        if (a <= _b) {
-            revert AsmallerThanB_L(a, _b);
-        }
-
-        return true;
-    }
-}