@etherisc/gif-next 0.0.2-e1e92ab-754 → 0.0.2-e26c262-698

package/contracts/instance/base/ComponentServiceBase.sol

@@ -1,49 +0,0 @@
-// 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 {ObjectType, INSTANCE, PRODUCT, POOL} from "../../types/ObjectType.sol";
-import {NftId, NftIdLib} from "../../types/NftId.sol";
-
-import {ServiceBase} from "./ServiceBase.sol";
-import {Version, VersionPart, VersionLib} from "../../types/Version.sol";
-
-abstract contract ComponentServiceBase is ServiceBase {
-
-    constructor(
-        address registry,
-        NftId registryNftId,
-        address initialOwner
-    )
-    {
-        _initializeServiceBase(registry, registryNftId, initialOwner);
-    }
-
-
-    function _getAndVerifyComponentInfoAndInstance(
-        ObjectType objectType
-    )
-        internal
-        view
-        returns(
-            IRegistry.ObjectInfo memory info, 
-            IInstance instance
-        )
-    {
-        NftId componentNftId = getRegistry().getNftId(msg.sender);
-        require(componentNftId.gtz(), "ERROR_COMPONENT_UNKNOWN");
-
-        info = getRegistry().getObjectInfo(componentNftId);
-        require(info.objectType == objectType, "OBJECT_TYPE_INVALID");
-
-        address instanceAddress = getRegistry().getObjectInfo(info.parentNftId).objectAddress;
-        instance = IInstance(instanceAddress);
-    }
-
-    function getRegistryService() public view virtual returns (IRegistryService) {
-        address service = getRegistry().getServiceAddress("RegistryService", getMajorVersion());
-        return IRegistryService(service);
-    }
-}

package/contracts/instance/base/IInstanceBase.sol

@@ -1,23 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.20;
-
-import {Key32} from "../../types/Key32.sol";
-import {StateId} from "../../types/StateId.sol";
-
-import {IKeyValueStore} from "./IKeyValueStore.sol";
-
-import {IComponentOwnerService} from "../service/IComponentOwnerService.sol";
-import {IDistributionService} from "../service/IDistributionService.sol";
-import {IProductService} from "../service/IProductService.sol";
-import {IPoolService} from "../service/IPoolService.sol";
-
-interface IInstanceBase {
-    function getKeyValueStore() external view returns (IKeyValueStore keyValueStore);
-    function updateState(Key32 key, StateId state) external;
-    function getState(Key32 key) external view returns (StateId state);
-
-    function getComponentOwnerService() external view returns(IComponentOwnerService);
-    function getDistributionService() external view returns(IDistributionService);
-    function getProductService() external view returns(IProductService service);
-    function getPoolService() external view returns(IPoolService service);
-}

package/contracts/instance/base/IService.sol

@@ -1,15 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.19;
-
-import {VersionPart} from "../../types/Version.sol";
-
-import {IRegisterable} from "../../shared/IRegisterable.sol";
-import {IVersionable} from "../../shared/IVersionable.sol";
-
-interface IService is 
-    IRegisterable,
-    IVersionable
-{
-    function getName() external pure returns(string memory name);
-    function getMajorVersion() external view returns(VersionPart majorVersion);
-}

package/contracts/instance/base/InstanceBase.sol

@@ -1,89 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.20;
-
-import {Versionable} from "../../shared/Versionable.sol";
-import {Registerable} from "../../shared/Registerable.sol";
-
-import {ObjectType, INSTANCE} from "../../types/ObjectType.sol";
-import {Key32} from "../../types/Key32.sol";
-import {NftId} from "../../types/NftId.sol";
-import {StateId} from "../../types/StateId.sol";
-import {Version, VersionPart, VersionLib} from "../../types/Version.sol";
-
-import {IComponentOwnerService} from "../service/IComponentOwnerService.sol";
-import {IDistributionService} from "../service/IDistributionService.sol";
-import {IProductService} from "../service/IProductService.sol";
-import {IPoolService} from "../service/IPoolService.sol";
-
-import {IKeyValueStore} from "./IKeyValueStore.sol";
-import {IInstance} from "../IInstance.sol";
-import {IInstanceBase} from "./IInstanceBase.sol";
-
-import {KeyValueStore} from "./KeyValueStore.sol";
-
-abstract contract InstanceBase is
-    Versionable,
-    Registerable,
-    IInstanceBase
-{
-    IKeyValueStore internal _keyValueStore;
-
-    IComponentOwnerService internal _componentOwnerService;
-    IDistributionService internal _distributionService;
-    IProductService internal _productService;
-    IPoolService internal _poolService;
-
-    constructor(
-        address registry,
-        NftId registryNftId,
-        address initialOwner
-    )
-        Versionable()
-    {
-        bytes memory data = "";
-        _initializeRegisterable(registry, registryNftId, INSTANCE(), true, initialOwner, data);
-        _keyValueStore = new KeyValueStore();
-
-        _registerInterface(type(IInstance).interfaceId);
-        _linkToServicesInRegistry();
-    }
-
-    function getKeyValueStore() public view virtual override returns (IKeyValueStore keyValueStore) { return _keyValueStore; }
-
-    function updateState(Key32 key, StateId state) external override {
-        _keyValueStore.updateState(key, state);
-    }
-
-    function getState(Key32 key) external view override returns (StateId state) {
-        return _keyValueStore.getState(key);
-    }
-
-    // from versionable
-    function getVersion()
-        public 
-        pure 
-        virtual override
-        returns(Version)
-    {
-        return VersionLib.toVersion(3,0,0);
-    }
-
-    // from registerable
-
-    // internal / private functions
-    function _linkToServicesInRegistry() internal {
-        VersionPart majorVersion = getVersion().toMajorPart();
-        _componentOwnerService = IComponentOwnerService(_getAndCheck("ComponentOwnerService", majorVersion));
-        _distributionService = IDistributionService(_getAndCheck("DistributionService", majorVersion));
-        _productService = IProductService(_getAndCheck("ProductService", majorVersion));
-        _poolService = IPoolService(_getAndCheck("PoolService", majorVersion));
-    }
-
-    function _getAndCheck(string memory serviceName, VersionPart majorVersion) internal view returns (address serviceAddress) {
-        serviceAddress = getRegistry().getServiceAddress(serviceName, majorVersion);
-        require(
-            serviceAddress != address(0),
-            "ERROR:INS-001:NOT_REGISTERED"
-        );
-    }
-}

package/contracts/instance/base/ModuleBase.sol

@@ -1,57 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.19;
-
-import {IRegistry} from "../../registry/IRegistry.sol";
-
-import {Blocknumber, blockNumber} from "../../types/Blocknumber.sol";
-import {Key32, KeyId} from "../../types/Key32.sol";
-import {LibNftIdSet} from "../../types/NftIdSet.sol";
-import {NftId} from "../../types/NftId.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, blockTimestamp, zeroTimestamp} from "../../types/Timestamp.sol";
-
-import {IKeyValueStore} from "./IKeyValueStore.sol";
-
-abstract contract ModuleBase {
-
-    IKeyValueStore private _store;
-
-    function _initialize(IKeyValueStore keyValueStore) internal {
-        _store = keyValueStore;
-    }
-
-    function _create(ObjectType objectType, Key32 key, bytes memory data) internal {
-        _store.create(
-            key, 
-            objectType,
-            data);
-    }
-
-    function _create(ObjectType objectType, NftId nftId, bytes memory data) internal {
-        _store.create(
-            nftId.toKey32(objectType), 
-            objectType,
-            data);
-    }
-
-    function _updateData(ObjectType objectType, NftId nftId, bytes memory data) internal {
-        _store.updateData(nftId.toKey32(objectType), data);
-    }
-
-    function _updateState(ObjectType objectType, NftId nftId, StateId state) internal {
-        _store.updateState(nftId.toKey32(objectType), state);
-    }
-
-    function _exists(ObjectType objectType, NftId nftId) internal view returns (bool hasData) {
-        return _store.exists(nftId.toKey32(objectType));
-    }
-
-    function _getData(ObjectType objectType, NftId nftId) internal view returns(bytes memory data) {
-        return _store.getData(nftId.toKey32(objectType));
-    }
-
-    function _getState(ObjectType objectType, NftId nftId) internal view returns(StateId) {
-        return _store.getState(nftId.toKey32(objectType));
-    }
-}

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, blockTimestamp, 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
-            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/ReferralId.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);
-}