@etherisc/gif-next 0.0.2-e46206a-486 → 0.0.2-e4d7e1c-013

package/contracts/instance/base/ServiceBase.sol

@@ -1,44 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.19;
-
-import {NftId, zeroNftId} from "../../types/NftId.sol";
-import {ObjectType, SERVICE} from "../../types/ObjectType.sol";
-import {Version, VersionPart, VersionLib} from "../../types/Version.sol";
-
-import {Registerable} from "../../shared/Registerable.sol";
-import {IRegistry} from "../../registry/IRegistry.sol";
-import {IVersionable} from "../../shared/IVersionable.sol";
-import {Versionable} from "../../shared/Versionable.sol";
-
-import {IService} from "./IService.sol";
-
-abstract contract ServiceBase is 
-    Registerable,
-    Versionable,
-    IService
-{
-    function getName() public pure virtual override returns(string memory name);
-
-    function getMajorVersion() public view virtual override returns(VersionPart majorVersion) {
-        return getVersion().toMajorPart(); 
-    }
-
-    // from Versionable
-    function getVersion()
-        public 
-        pure 
-        virtual override (IVersionable, Versionable)
-        returns(Version)
-    {
-        return VersionLib.toVersion(3,0,0);
-    }
-
-    function _initializeServiceBase(address registry, NftId registryNftId, address initialOwner)
-        internal 
-        //onlyInitializing //TODO uncomment when "fully" upgradeable
-    {// service must provide its name and version upon registration
-        bytes memory data = abi.encode(getName(), getMajorVersion());
-        _initializeRegisterable(registry, registryNftId, SERVICE(), false, initialOwner, data);
-        _registerInterface(type(IService).interfaceId);
-    }
-}

package/contracts/instance/module/bundle/BundleModule.sol

@@ -1,134 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.19;
-
-import {IRegistry} from "../../../registry/IRegistry.sol";
-
-import {IProductService} from "../../service/IProductService.sol";
-import {IPoolService} from "../../service/IPoolService.sol";
-
-import {Fee} from "../../../types/Fee.sol";
-import {NftId} from "../../../types/NftId.sol";
-import {Key32, KeyId} from "../../../types/Key32.sol";
-import {LibNftIdSet} from "../../../types/NftIdSet.sol";
-import {ObjectType, PRODUCT, ORACLE, POOL, BUNDLE, POLICY} from "../../../types/ObjectType.sol";
-import {StateId, ACTIVE, PAUSED, ARCHIVED, CLOSED, APPLIED, REVOKED, DECLINED} from "../../../types/StateId.sol";
-import {Timestamp, TimestampLib, zeroTimestamp} from "../../../types/Timestamp.sol";
-import {Blocknumber, blockNumber} from "../../../types/Blocknumber.sol";
-
-import {IKeyValueStore} from "../../base/IKeyValueStore.sol";
-import {ModuleBase} from "../../base/ModuleBase.sol";
-
-import {IBundleModule} from "./IBundle.sol";
-
-abstract contract BundleModule is 
-    ModuleBase,
-    IBundleModule
-{
-
-    using LibNftIdSet for LibNftIdSet.Set;
-
-    mapping(NftId bundleNftId => LibNftIdSet.Set policies) private _collateralizedPolicies;
-    mapping(NftId bundleNftId => mapping(NftId policyNftId => uint256 amount)) private _collateralizationAmount;
-
-    modifier onlyBundlePoolService() {
-        require(
-            msg.sender == address(this.getPoolService()),
-            "ERROR:BDL-001:NOT_POOL_SERVICE"
-        );
-        _;
-    }
-
-    modifier onlyBundleProductService() {
-        require(
-            msg.sender == address(this.getProductService()),
-            "ERROR:BDL-002:NOT_PRODUCT_SERVICE"
-        );
-        _;
-    }
-
-    modifier onlyPoolOrProductService() {
-        require(
-            msg.sender == address(this.getPoolService())
-                || msg.sender == address(this.getProductService()),
-            "ERROR:BDL-003:NOT_POOL_OR_PRODUCT_SERVICE"
-        );
-        _;
-    }
-
-    function initializeBundleModule(IKeyValueStore keyValueStore) internal {
-        _initialize(keyValueStore);
-    }
-
-    function createBundleInfo(
-        NftId bundleNftId,
-        NftId poolNftId,
-        Fee memory fee,
-        uint256 amount, 
-        uint256 lifetime, 
-        bytes calldata filter
-    )
-        external
-        onlyBundlePoolService
-        override
-    {
-        BundleInfo memory info = BundleInfo(
-            poolNftId,
-            fee,
-            filter,
-            amount, // capital
-            0, // locked capital
-            amount, // balance
-            TimestampLib.blockTimestamp().addSeconds(lifetime), // expiredAt
-            zeroTimestamp() // closedAt
-        );
-
-        _create(BUNDLE(), bundleNftId, abi.encode(info));
-    }
-
-    function setBundleInfo(NftId bundleNftId, BundleInfo memory info)
-        external
-        override
-        onlyPoolOrProductService
-    {
-        _updateData(BUNDLE(), bundleNftId, abi.encode(info));
-    }
-
-    function updateBundleState(NftId bundleNftId, StateId state)
-        external
-        override
-        onlyBundlePoolService
-    {
-        _updateState(BUNDLE(), bundleNftId, state);
-    }
-
-    function collateralizePolicy(
-        NftId bundleNftId, 
-        NftId policyNftId, 
-        uint256 collateralAmount
-    )
-        external
-        onlyBundleProductService
-        override
-    {
-        _collateralizationAmount[bundleNftId][policyNftId] = collateralAmount;
-        _collateralizedPolicies[bundleNftId].add(policyNftId);
-    }
-
-    function releasePolicy(
-        NftId bundleNftId,
-        NftId policyNftId
-    )
-        external
-        onlyBundleProductService
-        override 
-        returns(uint256 collateralAmount)
-    {
-        collateralAmount = _collateralizationAmount[bundleNftId][policyNftId];
-        delete _collateralizationAmount[bundleNftId][policyNftId];
-        _collateralizedPolicies[bundleNftId].remove(policyNftId);
-    }
-
-    function getBundleInfo(NftId bundleNftId) external view override returns(BundleInfo memory bundleInfo) {
-        return abi.decode(_getData(BUNDLE(), bundleNftId), (BundleInfo));
-    }
-}

package/contracts/instance/module/bundle/IBundle.sol

@@ -1,53 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.19;
-
-import {IRegistry} from "../../../registry/IRegistry.sol";
-import {IInstance} from "../../IInstance.sol";
-import {Fee} from "../../../types/Fee.sol";
-import {Key32} from "../../../types/Key32.sol";
-import {NftId} from "../../../types/NftId.sol";
-import {StateId} from "../../../types/StateId.sol";
-import {Timestamp} from "../../../types/Timestamp.sol";
-import {Blocknumber} from "../../../types/Blocknumber.sol";
-
-import {IKeyValueStore} from "../../base/IKeyValueStore.sol";
-import {IProductService} from "../../service/IProductService.sol";
-import {IPoolService} from "../../service/IPoolService.sol";
-
-interface IBundle {
-
-    struct BundleInfo {
-        NftId poolNftId;
-        Fee fee; // bundle fee on net premium amounts
-        bytes filter; // required conditions for applications to be considered for collateralization by this bundle
-        uint256 capitalAmount; // net investment capital amount (<= balance)
-        uint256 lockedAmount; // capital amount linked to collateralizaion of non-closed policies (<= balance)
-        uint256 balanceAmount; // total amount of funds: net investment capital + net premiums - payouts
-        Timestamp expiredAt; // no new policies
-        Timestamp closedAt;
-    }
-}
-
-interface IBundleModule is IBundle {
-
-    function createBundleInfo(
-        NftId bundleNftId,
-        NftId poolNftId,
-        Fee memory fee,
-        uint256 amount, 
-        uint256 lifetime, 
-        bytes calldata filter
-    ) external;
-
-    function setBundleInfo(NftId nftId, BundleInfo memory bundleInfo) external;
-    function updateBundleState(NftId nftId, StateId state) external;
-
-    function collateralizePolicy(NftId bundleNftId, NftId policyNftId, uint256 amount) external;
-    function releasePolicy(NftId bundleNftId, NftId policyNftId) external returns(uint256 collateralAmount);
-
-    function getBundleInfo(NftId nftId) external view returns(BundleInfo memory bundleInfo);
-
-    // repeat service linked signatures to avoid linearization issues
-    function getProductService() external returns(IProductService);
-    function getPoolService() external returns(IPoolService);
-}

package/contracts/instance/module/component/ComponentModule.sol

@@ -1,71 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.20;
-
-import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
-import {IKeyValueStore} from "../../base/IKeyValueStore.sol";
-import {IComponentModule} from "./IComponent.sol";
-
-import {NftId} from "../../../types/NftId.sol";
-import {ObjectType, COMPONENT} from "../../../types/ObjectType.sol";
-import {StateId} from "../../../types/StateId.sol";
-import {ModuleBase} from "../../base/ModuleBase.sol";
-
-abstract contract ComponentModule is 
-    ModuleBase,
-    IComponentModule
-{
-
-    NftId[] private _nftIds;
-
-    // TODO try to keep 1 modifier in 1 place...
-    modifier onlyComponentOwnerService() virtual {
-        require(
-            msg.sender == address(this.getComponentOwnerService()),
-            "ERROR:CMP-001:NOT_COMPONENT_OWNER_SERVICE"
-        );
-        _;
-    }
-
-    function initializeComponentModule(IKeyValueStore keyValueStore) internal {
-        _initialize(keyValueStore);
-    }
-
-    function registerComponent(
-        NftId nftId,
-        IERC20Metadata token,
-        address wallet
-    )
-        external
-        onlyComponentOwnerService
-        override
-    {
-        ComponentInfo memory info = ComponentInfo(token, wallet);
-        _nftIds.push(nftId);
-        _create(COMPONENT(), nftId, abi.encode(info));
-    }
-
-    function getComponentToken(NftId nftId) external view override returns(IERC20Metadata token) {
-        ComponentInfo memory info = abi.decode(_getData(COMPONENT(), nftId), (ComponentInfo));
-        return info.token;
-    }
-
-    function getComponentWallet(NftId nftId) external view override returns (address wallet) {
-        ComponentInfo memory info = abi.decode(_getData(COMPONENT(), nftId), (ComponentInfo));
-        return info.wallet;
-    }
-
-    function getComponentCount()
-        external
-        view
-        override
-        returns (uint256 numberOfCompnents)
-    {
-        return _nftIds.length;
-    }
-
-    function getComponentId(
-        uint256 idx
-    ) external view override returns (NftId componentNftId) {
-        return _nftIds[idx];
-    }
-}

package/contracts/instance/module/component/IComponent.sol

@@ -1,28 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.20;
-
-import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
-import {IComponentOwnerService} from "../../service/IComponentOwnerService.sol";
-
-import {StateId} from "../../../types/StateId.sol";
-import {NftId} from "../../../types/NftId.sol";
-
-interface IComponent {
-    struct ComponentInfo {
-        IERC20Metadata token;
-        address wallet;
-    }
-}
-
-interface IComponentModule is IComponent {
-
-    function registerComponent(NftId nftId, IERC20Metadata token, address wallet) external;
-    function getComponentToken(NftId nftId) external view returns (IERC20Metadata token);
-    function getComponentWallet(NftId nftId) external view returns (address wallet);
-
-    function getComponentCount() external view returns (uint256 numberOfCompnents);
-    function getComponentId(uint256 idx) external view returns (NftId nftId);
-
-    // repeat service linked signaturea to avoid linearization issues
-    function getComponentOwnerService() external view returns(IComponentOwnerService);
-}

package/contracts/instance/module/distribution/DistributionModule.sol

@@ -1,17 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.19;
-
-import {IDistributionModule} from "./IDistribution.sol";
-import {IKeyValueStore} from "../../base/IKeyValueStore.sol";
-import {ModuleBase} from "../../base/ModuleBase.sol";
-
-contract DistributionModule is
-    ModuleBase,
-    IDistributionModule
-{
-
-    function initializeDistributionModule(IKeyValueStore keyValueStore) internal {
-        _initialize(keyValueStore);
-    }
-
-}

package/contracts/instance/module/distribution/IDistribution.sol

@@ -1,10 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.19;
-
-interface IDistribution {
-
-}
-
-interface IDistributionModule is IDistribution {
-    
-}

package/contracts/instance/module/policy/IPolicy.sol

@@ -1,63 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.19;
-
-import {IRegistry} from "../../../registry/IRegistry.sol";
-import {IInstance} from "../../IInstance.sol";
-import {IProductService} from "../../service/IProductService.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";
-
-// TODO check if there is value to introuce IContract and let IPolicy derive from IContract
-interface IPolicy {
-    struct PolicyInfo {
-        NftId productNftId;
-        NftId bundleNftId;
-        ReferralId referralId;
-        address beneficiary;
-        RiskId riskId;
-        uint256 sumInsuredAmount;
-        uint256 premiumAmount;
-        uint256 premiumPaidAmount;
-        uint256 lifetime;
-        bytes applicationData;
-        bytes policyData;
-        Timestamp activatedAt; // time of underwriting
-        Timestamp expiredAt; // no new claims (activatedAt + lifetime)
-        Timestamp closedAt; // no locked capital
-    }
-}
-
-interface IPolicyModule is IPolicy {
-    function createPolicyInfo(
-        NftId policyNftId,
-        NftId productNftId,
-        ReferralId referralId,
-        RiskId riskId,
-        uint256 sumInsuredAmount,
-        uint256 premiumAmount,
-        uint256 lifetime,
-        NftId bundleNftId
-    ) external;
-
-    function setPolicyInfo(NftId policyNftId, PolicyInfo memory info) external;
-    function updatePolicyState(NftId nftId, StateId state) external;
-
-    // function underwrite(NftId nftId) external;
-
-    // function processPremium(NftId nftId, uint256 amount) external;
-
-    // function activate(NftId nftId, Timestamp activateAt) external;
-
-    function getPolicyInfo(
-        NftId nftId
-    ) external view returns (PolicyInfo memory info);
-
-    // repeat registry linked signature
-    // function getRegistry() external view returns (IRegistry registry);
-
-    // repeat service linked signature to avoid linearization issues
-    function getProductService() external  returns(IProductService);
-}

package/contracts/instance/module/policy/PolicyModule.sol

@@ -1,91 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.19;
-
-import {IRegistry} from "../../../registry/IRegistry.sol";
-
-import {IProductService} from "../../service/IProductService.sol";
-import {IPolicy, IPolicyModule} from "./IPolicy.sol";
-import {ObjectType, POLICY} from "../../../types/ObjectType.sol";
-import {NftId, NftIdLib} from "../../../types/NftId.sol";
-import {ReferralId} from "../../../types/Referral.sol";
-import {RiskId} from "../../../types/RiskId.sol";
-import {StateId} from "../../../types/StateId.sol";
-import {Timestamp, zeroTimestamp} from "../../../types/Timestamp.sol";
-
-import {IKeyValueStore} from "../../base/IKeyValueStore.sol";
-import {ModuleBase} from "../../base/ModuleBase.sol";
-
-abstract contract PolicyModule is
-    ModuleBase,
-    IPolicyModule
-{
-
-    // TODO find a better place to avoid dupliation
-    modifier onlyProductService2() {
-        require(
-            msg.sender == address(this.getProductService()),
-            "ERROR:POL-001:NOT_PRODUCT_SERVICE"
-        );
-        _;
-    }
-
-    function initializePolicyModule(IKeyValueStore keyValueStore) internal {
-        _initialize(keyValueStore);
-    }
-
-    function createPolicyInfo(
-        NftId policyNftId,
-        NftId productNftId,
-        ReferralId referralId,
-        RiskId riskId,
-        uint256 sumInsuredAmount,
-        uint256 premiumAmount,
-        uint256 lifetime,
-        NftId bundleNftId
-    )
-        external
-        onlyProductService2
-        override
-    {
-        PolicyInfo memory info = PolicyInfo(
-            productNftId,
-            bundleNftId,
-            referralId,
-            address(0), // beneficiary = policy nft holder
-            riskId,
-            sumInsuredAmount,
-            premiumAmount,
-            0, // premium paid amount
-            lifetime, 
-            "", // applicationData
-            "", // policyData
-            zeroTimestamp(), // activatedAt
-            zeroTimestamp(), // expiredAt
-            zeroTimestamp() // closedAt
-        );
-
-        _create(POLICY(), policyNftId, abi.encode(info));
-    }
-
-    function setPolicyInfo(NftId policyNftId, PolicyInfo memory info)
-        external
-        override
-        onlyProductService2
-    {
-        _updateData(POLICY(), policyNftId, abi.encode(info));
-    }
-
-    function updatePolicyState(NftId bundleNftId, StateId state)
-        external
-        override
-        onlyProductService2
-    {
-        _updateState(POLICY(), bundleNftId, state);
-    }
-
-    function getPolicyInfo(
-        NftId nftId
-    ) external view returns (PolicyInfo memory info) {
-        return abi.decode(_getData(POLICY(), nftId), (PolicyInfo));
-    }
-}

package/contracts/instance/module/pool/IPoolModule.sol

@@ -1,41 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.19;
-
-import {IRegistry} from "../../../registry/IRegistry.sol";
-import {NftId} from "../../../types/NftId.sol";
-import {UFixed} from "../../../types/UFixed.sol";
-import {IProductService} from "../../service/IProductService.sol";
-import {IPoolService} from "../../service/IPoolService.sol";
-import {IComponentOwnerService} from "../../service/IComponentOwnerService.sol";
-
-interface IPool {
-    struct PoolInfo {
-        bool isVerifying;
-        UFixed collateralizationLevel;
-    }
-}
-
-interface IPoolModule is IPool {
-
-    function registerPool(
-        NftId nftId, 
-        PoolInfo memory info
-    ) external;
-
-    function addBundleToPool(
-        NftId bundleNftId,
-        NftId poolNftId,
-        uint256 amount
-    ) external;
-
-    function getPoolInfo(
-        NftId nftId
-    ) external view returns (PoolInfo memory info);
-
-    function getBundleCount(NftId poolNftId) external view returns (uint256 bundleCount);
-    function getBundleNftId(NftId poolNftId, uint256 index) external view returns (NftId bundleNftId);
-
-    // repeat service linked signatures to avoid linearization issues
-    function getComponentOwnerService() external view returns(IComponentOwnerService);
-    function getPoolService() external returns(IPoolService);
-}

package/contracts/instance/module/pool/PoolModule.sol

@@ -1,95 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.19;
-
-import {IRegistry} from "../../../registry/IRegistry.sol";
-import {IProductService} from "../../service/IProductService.sol";
-import {IPoolService} from "../../service/IPoolService.sol";
-import {IPolicy, IPolicyModule} from "../../module/policy/IPolicy.sol";
-import {ITreasuryModule} from "../../module/treasury/ITreasury.sol";
-
-import {NftId} from "../../../types/NftId.sol";
-import {POOL} from "../../../types/ObjectType.sol";
-import {LibNftIdSet} from "../../../types/NftIdSet.sol";
-import {StateId, APPLIED} from "../../../types/StateId.sol";
-import {UFixed} from "../../../types/UFixed.sol";
-
-import {IKeyValueStore} from "../../base/IKeyValueStore.sol";
-import {IPoolModule} from "./IPoolModule.sol";
-import {ModuleBase} from "../../base/ModuleBase.sol";
-
-abstract contract PoolModule is
-    ModuleBase,
-    IPoolModule
-{
-    using LibNftIdSet for LibNftIdSet.Set;
-
-    // mapping(NftId poolNftId => PoolInfo info) private _poolInfo;
-    mapping(NftId poolNftId => LibNftIdSet.Set bundles) private _bundlesForPool;
-
-
-    // TODO try to keep 1 modifier in 1 place...
-    modifier onlyComponentOwnerService() virtual {
-        require(
-            msg.sender == address(this.getComponentOwnerService()),
-            "ERROR:CMP-001:NOT_COMPONENT_OWNER_SERVICE"
-        );
-        _;
-    }
-
-    modifier poolServiceCallingPool() {
-        require(
-            msg.sender == address(this.getPoolService()),
-            "ERROR:PL-001:NOT_POOL_SERVICE"
-        );
-        _;
-    }
-
-    function initializePoolModule(IKeyValueStore keyValueStore) internal {
-        _initialize(keyValueStore);
-    }
-
-    function registerPool(
-        NftId nftId, 
-        PoolInfo memory info
-    )
-        public
-        onlyComponentOwnerService
-        override
-    {
-        _create(POOL(), nftId, abi.encode(info));
-    }
-
-    function addBundleToPool(
-        NftId bundleNftId,
-        NftId poolNftId,
-        uint256 // amount
-    )
-        external
-        override
-    {
-        LibNftIdSet.Set storage bundleSet = _bundlesForPool[poolNftId];
-        require(
-            !bundleSet.contains(bundleNftId),
-            "ERROR:PL-020:BUNDLE_ALREADY_ADDED");
-
-        bundleSet.add(bundleNftId);
-    }
-
-
-    function getPoolInfo(
-        NftId nftId
-    ) external view override returns (PoolInfo memory info) {
-        return abi.decode(_getData(POOL(), nftId), (PoolInfo));
-    }
-
-
-    function getBundleCount(NftId poolNftId) external view override returns (uint256 bundleCount) {
-        return _bundlesForPool[poolNftId].getLength();
-    }
-
-
-    function getBundleNftId(NftId poolNftId, uint256 index) external view override returns (NftId bundleNftId) {
-        return _bundlesForPool[poolNftId].getElementAt(index);
-    }
-
-}

package/contracts/instance/module/risk/IRisk.sol

@@ -1,26 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.19;
-
-import {NftId} from "../../../types/NftId.sol";
-import {RiskId} from "../../../types/RiskId.sol";
-import {StateId} from "../../../types/StateId.sol";
-
-interface IRisk {
-    struct RiskInfo {
-        NftId productNftId;
-        bytes data;
-    }
-}
-
-interface IRiskModule is IRisk {
-    function createRisk(
-        RiskId riskId,
-        NftId productNftId,
-        bytes memory data
-    ) external;
-
-    function setRiskInfo(RiskId riskId, RiskInfo memory info) external;
-    function updateRiskState(RiskId riskId, StateId state) external;
-
-    function getRiskInfo(RiskId riskId) external view returns (RiskInfo memory info);
-}