@etherisc/gif-next 0.0.2-a25e4b8-781 → 0.0.2-a307d03-692

package/artifacts/contracts/types/Version.sol/VersionPartLib.json

@@ -1,49 +0,0 @@
-{
-  "_format": "hh-sol-artifact-1",
-  "contractName": "VersionPartLib",
-  "sourceName": "contracts/types/Version.sol",
-  "abi": [
-    {
-      "inputs": [
-        {
-          "internalType": "VersionPart",
-          "name": "a",
-          "type": "uint8"
-        }
-      ],
-      "name": "toInt",
-      "outputs": [
-        {
-          "internalType": "uint256",
-          "name": "",
-          "type": "uint256"
-        }
-      ],
-      "stateMutability": "pure",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "uint256",
-          "name": "a",
-          "type": "uint256"
-        }
-      ],
-      "name": "toVersionPart",
-      "outputs": [
-        {
-          "internalType": "VersionPart",
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "stateMutability": "pure",
-      "type": "function"
-    }
-  ],
-  "bytecode": "0x60fb610039600b82828239805160001a60731461002c57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe7300000000000000000000000000000000000000003014608060405260043610603d5760003560e01c80638e4ad86c146042578063ac43d834146067575b600080fd5b6050604d3660046085565b90565b60405160ff90911681526020015b60405180910390f35b60786072366004609d565b60ff1690565b604051908152602001605e565b600060208284031215609657600080fd5b5035919050565b60006020828403121560ae57600080fd5b813560ff8116811460be57600080fd5b939250505056fea264697066735822122074bb6f75f2cab9692d05e41844bf40283045a9440c662c37a97b2502d38207ed64736f6c63430008140033",
-  "deployedBytecode": "0x7300000000000000000000000000000000000000003014608060405260043610603d5760003560e01c80638e4ad86c146042578063ac43d834146067575b600080fd5b6050604d3660046085565b90565b60405160ff90911681526020015b60405180910390f35b60786072366004609d565b60ff1690565b604051908152602001605e565b600060208284031215609657600080fd5b5035919050565b60006020828403121560ae57600080fd5b813560ff8116811460be57600080fd5b939250505056fea264697066735822122074bb6f75f2cab9692d05e41844bf40283045a9440c662c37a97b2502d38207ed64736f6c63430008140033",
-  "linkReferences": {},
-  "deployedLinkReferences": {}
-}

package/contracts/components/Component.sol

@@ -1,179 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.20;
-
-import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
-import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
-import {AccessManagedUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";
-
-import {IComponent} from "./IComponent.sol";
-import {IProductService} from "../instance/service/IProductService.sol";
-import {IInstanceService} from "../instance/IInstanceService.sol";
-import {IInstance} from "../instance/IInstance.sol";
-import {InstanceAccessManager} from "../instance/InstanceAccessManager.sol";
-import {IRegistry} from "../registry/IRegistry.sol";
-import {NftId, zeroNftId, NftIdLib} from "../types/NftId.sol";
-import {ObjectType, INSTANCE, PRODUCT} from "../types/ObjectType.sol";
-import {VersionLib} from "../types/Version.sol";
-import {Registerable} from "../shared/Registerable.sol";
-import {RoleId, RoleIdLib} from "../types/RoleId.sol";
-import {IAccess} from "../instance/module/IAccess.sol";
-
-// TODO discuss to inherit from oz accessmanaged
-// TODO make contract upgradeable, then add ComponentUpradeable that also intherits from Versionable
-// same pattern as for Service which is also upgradeable
-abstract contract Component is
-    Registerable,
-    IComponent,
-    AccessManagedUpgradeable
-{
-    IInstanceService internal _instanceService;
-    IProductService internal _productService;
-
-    IInstance internal _instance;
-    IERC20Metadata internal _token;
-    address internal _wallet;
-    NftId internal _productNftId;
-
-    modifier onlyProductService() {
-        if(msg.sender != address(_productService)) {
-            revert ErrorComponentNotProductService(msg.sender);
-        }
-        _;
-    }
-
-    // TODO discuss replacement with modifier restricted from accessmanaged
-    modifier onlyInstanceRole(uint64 roleIdNum) {
-        RoleId roleId = RoleIdLib.toRoleId(roleIdNum);
-        InstanceAccessManager accessManager = InstanceAccessManager(_instance.authority());
-        if( !accessManager.hasRole(roleId, msg.sender)) {
-            revert ErrorComponentUnauthorized(msg.sender, roleIdNum);
-        }
-        _;
-    }
-
-    // TODO discuss replacement with modifier restricted from accessmanaged
-    modifier isNotLocked() {
-        InstanceAccessManager accessManager = InstanceAccessManager(_instance.authority());
-        if (accessManager.isTargetLocked(address(this))) {
-            revert IAccess.ErrorIAccessTargetLocked(address(this));
-        }
-        _;
-    }
-
-    function __initialize_component (
-        address registry,
-        NftId instanceNftId,
-        address token,
-        ObjectType componentType,
-        bool isInterceptor,
-        address initialOwner
-    ) internal
-    {
-        bytes memory data = "";
-        _initializeRegisterable(registry, instanceNftId, componentType, isInterceptor, initialOwner, data);
-
-        IRegistry.ObjectInfo memory instanceInfo = _registry.getObjectInfo(instanceNftId);
-        _instance = IInstance(instanceInfo.objectAddress);
-        require(
-            _instance.supportsInterface(type(IInstance).interfaceId),
-            ""
-        );
-
-        _instanceService = IInstanceService(_registry.getServiceAddress(INSTANCE(), VersionLib.toVersion(3, 0, 0).toMajorPart()));
-        _productService = IProductService(_registry.getServiceAddress(PRODUCT(), VersionLib.toVersion(3, 0, 0).toMajorPart()));
-        _wallet = address(this);
-        _token = IERC20Metadata(token);
-
-        _registerInterface(type(IComponent).interfaceId);
-    }
-
-    // TODO discuss replacement with modifier restricted from accessmanaged
-    function lock() external onlyOwner override {
-        _instanceService.setTargetLocked(getName(), true);
-    }
-    
-    // TODO discuss replacement with modifier restricted from accessmanaged
-    function unlock() external onlyOwner override {
-        _instanceService.setTargetLocked(getName(), false);
-    }
-
-    // TODO discuss to split this base contract into a minimal component base (eg oracle)
-    // and a component base that is linked to a product component (all others in v3)
-    function setProductNftId(NftId productNftId)
-        external
-        override
-        onlyProductService() 
-    {
-        if(_productNftId.gtz()) {
-            revert ErrorComponentProductNftAlreadySet();
-        }
-
-        _productNftId = productNftId;
-    }
-
-    /// @dev Sets the wallet address for the component. 
-    /// if the current wallet has tokens, these will be transferred. 
-    /// if the new wallet address is externally owned, an approval from the 
-    /// owner of the external wallet for the component to move all tokens must exist. 
-    function setWallet(address newWallet) external override onlyOwner {
-        address currentWallet = _wallet;
-        uint256 currentBalance = _token.balanceOf(currentWallet);
-
-        // checks
-        if (newWallet == currentWallet) {
-            revert ErrorComponentWalletAddressIsSameAsCurrent(newWallet);
-        }
-
-        if (currentBalance > 0) {
-            if (currentWallet == address(this)) {
-                // move tokens from component smart contract to external wallet
-            } else {
-                // move tokens from external wallet to component smart contract or another external wallet
-                uint256 allowance = _token.allowance(currentWallet, address(this));
-                if (allowance < currentBalance) {
-                    revert ErrorComponentWalletAllowanceTooSmall(currentWallet, newWallet, allowance, currentBalance);
-                }
-            }
-        }
-
-        // effects
-        _wallet = newWallet;
-        emit LogComponentWalletAddressChanged(newWallet);
-
-        // interactions
-        if (currentBalance > 0) {
-            // transfer tokens from current wallet to new wallet
-            if (currentWallet == address(this)) {
-                // transferFrom requires self allowance too
-                _token.approve(address(this), currentBalance);
-            }
-            
-            SafeERC20.safeTransferFrom(_token, currentWallet, newWallet, currentBalance);
-            emit LogComponentWalletTokensTransferred(currentWallet, newWallet, currentBalance);
-        }
-    }
-
-    // TODO set name via constructor or initialization, pure function likely too restrictive
-    function getName() public pure virtual returns (string memory name);
-
-    function getWallet()
-        external
-        view
-        override
-        returns (address walletAddress)
-    {
-        return _wallet;
-    }
-
-    function getToken() public view override returns (IERC20Metadata token) {
-        return _token;
-    }
-
-    function getInstance() public view override returns (IInstance instance) {
-        return _instance;
-    }
-
-    function getProductNftId() public view override returns (NftId productNftId) {
-        return _productNftId;
-    }
-}

package/contracts/components/Distribution.sol

@@ -1,154 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.19;
-
-import {DISTRIBUTION} from "../types/ObjectType.sol";
-import {IDistributionService} from "../instance/service/IDistributionService.sol";
-import {IProductService} from "../instance/service/IProductService.sol";
-import {NftId, zeroNftId, NftIdLib} from "../types/NftId.sol";
-import {ReferralId} from "../types/Referral.sol";
-import {Fee, FeeLib} from "../types/Fee.sol";
-import {Component} from "./Component.sol";
-import {IDistributionComponent} from "./IDistributionComponent.sol";
-import {IRegistry} from "../registry/IRegistry.sol";
-import {IRegisterable} from "../shared/IRegisterable.sol";
-import {ISetup} from "../instance/module/ISetup.sol";
-import {Registerable} from "../shared/Registerable.sol";
-import {TokenHandler} from "../shared/TokenHandler.sol";
-import {InstanceReader} from "../instance/InstanceReader.sol";
-
-abstract contract Distribution is
-    Component,
-    IDistributionComponent
-{
-    using NftIdLib for NftId;
-
-    Fee internal _initialDistributionFee;
-    bool internal _isVerifying;
-
-    TokenHandler internal _tokenHandler;
-
-    IDistributionService private _distributionService;
-
-    function __initialize(
-        address registry,
-        NftId instanceNftId,
-        // TODO refactor into tokenNftId
-        address token,
-        bool verifying,
-        Fee memory distributionFee,
-        address initialOwner
-    ) internal {
-        __initialize_component(registry, instanceNftId, token, DISTRIBUTION(), true, initialOwner);
-
-        _isVerifying = verifying;
-        _initialDistributionFee = distributionFee;
-
-        _tokenHandler = TokenHandler(token);
-        _distributionService = _instance.getDistributionService();
-
-        _registerInterface(type(IDistributionComponent).interfaceId);
-    }
-
-
-    function setFees(
-        Fee memory distributionFee
-    )
-        external
-        override
-    {
-        _distributionService.setFees(distributionFee);
-    }
-
-    function calculateFeeAmount(
-        ReferralId referralId,
-        uint256 netPremiumAmount
-    )
-        external
-        view
-        virtual override
-        returns (uint256 feeAmount)
-    {
-        ISetup.DistributionSetupInfo memory setupInfo = getSetupInfo();
-        Fee memory fee = setupInfo.distributionFee;
-        (feeAmount,) = FeeLib.calculateFee(fee, netPremiumAmount);
-    }
-
-
-    function calculateRenewalFeeAmount(
-        ReferralId referralId,
-        uint256 netPremiumAmount
-    )
-        external
-        view
-        virtual override
-        returns (uint256 feeAmount)
-    {
-        // default is no fees
-        return 0 * netPremiumAmount;
-    }
-
-    function processSale(
-        ReferralId referralId,
-        uint256 feeAmount
-    )
-        external
-        onlyProductService
-        virtual override
-    {
-        // default is no action
-    }
-
-    function processRenewal(
-        ReferralId referralId,
-        uint256 feeAmount
-    )
-        external
-        onlyProductService
-        virtual override
-    {
-        // default is no action
-    }
-
-    function referralIsValid(ReferralId referralId) external view returns (bool isValid) {
-        // default is invalid
-        return false;
-    }
-
-    function getSetupInfo() public view returns (ISetup.DistributionSetupInfo memory setupInfo) {
-        InstanceReader reader = _instance.getInstanceReader();
-        return reader.getDistributionSetupInfo(getNftId());
-    }
-    
-
-    /// @dev returns true iff the component needs to be called when selling/renewing policis
-    function isVerifying() external view returns (bool verifying) {
-        return _isVerifying;
-    }
-
-    // from IRegisterable
-
-    function getInitialInfo() 
-        public 
-        view
-        override (IRegisterable, Registerable)
-        returns(IRegistry.ObjectInfo memory, bytes memory)
-    {
-        (
-            IRegistry.ObjectInfo memory info, 
-        ) = super.getInitialInfo();
-
-        return (
-            info,
-            abi.encode(
-                getName(),
-                ISetup.DistributionSetupInfo(
-                    _productNftId,
-                    _tokenHandler,
-                    _initialDistributionFee,
-                    _isVerifying,
-                    address(this)
-                )
-            )
-        );
-    }
-}

package/contracts/components/IComponent.sol

@@ -1,37 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.20;
-
-import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
-
-import {IRegisterable} from "../shared/IRegisterable.sol";
-import {IInstance} from "../instance/IInstance.sol";
-import {NftId} from "../types/NftId.sol";
-
-interface IComponent is IRegisterable {
-
-    error ErrorComponentProductNftAlreadySet();
-    error ErrorComponentWalletAddressIsSameAsCurrent(address newWallet);
-    error ErrorComponentWalletAllowanceTooSmall(address oldWallet, address newWallet, uint256 allowance, uint256 balance);
-    error ErrorComponentUnauthorized(address caller, uint64 requiredRoleIdNum);
-    error ErrorComponentNotProductService(address caller);
-
-    event LogComponentWalletAddressChanged(address newWallet);
-    event LogComponentWalletTokensTransferred(address from, address to, uint256 amount);
-
-    function getName() external pure returns (string memory name);
-
-    // TODO remove and replace with accessmanaged target locking mechanism
-    function lock() external;
-    function unlock() external;
-
-    function getToken() external view returns (IERC20Metadata token);
-
-    function setWallet(address walletAddress) external;
-    function getWallet() external view returns (address walletAddress);
-
-    function getInstance() external view returns (IInstance instance);
-
-    function setProductNftId(NftId productNftId) external;
-    function getProductNftId() external view returns (NftId productNftId);
-
-}

package/contracts/components/IDistributionComponent.sol

@@ -1,44 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.19;
-
-import {Fee} from "../types/Fee.sol";
-import {ReferralId} from "../types/Referral.sol";
-import {NftId} from "../types/NftId.sol";
-import {ISetup} from "../instance/module/ISetup.sol";
-
-interface IDistributionComponent {
-
-    function setFees(
-        Fee memory distributionFee
-    ) external;
-
-    function calculateFeeAmount(
-        ReferralId referralId,
-        uint256 netPremiumAmount
-    ) external view returns (uint256 feeAmount);
-
-    function calculateRenewalFeeAmount(
-        ReferralId referralId,
-        uint256 netPremiumAmount
-    ) external view returns (uint256 feeAmount);
-
-    /// @dev callback from product service when selling a policy for a specific referralId
-    /// the used referral id and the collected fee are provided as parameters
-    /// the component implementation can then process this information accordingly
-    function processSale(
-        ReferralId referralId,
-        uint256 feeAmount
-    ) external;
-
-    /// @dev callback from product service when a policy is renews for a specific referralId
-    function processRenewal(
-        ReferralId referralId,
-        uint256 feeAmount
-    ) external;
-
-    /// @dev returns true iff the referral id is valid
-    function referralIsValid(ReferralId referralId) external view returns (bool isValid);
-
-    /// @dev returns true iff the component needs to be called when selling/renewing policis
-    function isVerifying() external view returns (bool verifying);
-}

package/contracts/components/IPoolComponent.sol

@@ -1,66 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.20;
-
-import {NftId} from "../types/NftId.sol";
-import {Fee} from "../types/Fee.sol";
-import {UFixed} from "../types/UFixed.sol";
-
-interface IPoolComponent {
-
-    event LogUnderwrittenByPool(NftId policyNftId, uint256 collateralizationAmount, address pool);
-
-    function setFees(
-        Fee memory poolFee,
-        Fee memory stakingFee,
-        Fee memory performanceFee
-    ) external;
-
-    /**
-     * @dev creates a new bundle for this pool.
-     */
-    function createBundle(
-        Fee memory fee,
-        uint256 initialAmount,
-        uint256 lifetime,
-        bytes memory filter
-    ) external returns(NftId bundleNftId);
-
-    function setBundleFee(
-        NftId policyNftId, 
-        Fee memory fee
-    ) external;
-
-    /** 
-     * @dev this is a callback function that is called by the product service when underwriting a policy.
-     * the pool has the option to check the details and object to underwriting by reverting.
-     * the function is only called for "active" pools that ask to be involved/notified
-     * by product related state changes.
-     */
-    function underwrite(
-        NftId policyNftId, 
-        bytes memory policyData,
-        bytes memory bundleFilter,
-        uint256 collateralizationAmount
-    ) external;
-
-    function lockBundle(NftId bundleNftId) external;
-
-    function unlockBundle(NftId bundleNftId) external;
-
-    /**
-     * @dev returns true iff the policy application data in policyData matches
-     * with the bundle filter criteria encoded in bundleFilter. 
-     */
-    function policyMatchesBundle(
-        bytes memory policyData,
-        bytes memory bundleFilter
-    )
-        external
-        view
-        returns (bool isMatching);
-
-    function isConfirmingApplication() external view returns (bool isConfirmingApplication);
-
-    function getCollateralizationLevel() external view returns (UFixed collateralizationLevel);
-
-}

package/contracts/components/IProductComponent.sol

@@ -1,35 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.20;
-
-import {Fee} from "../types/Fee.sol";
-import {NftId} from "../types/NftId.sol";
-import {ReferralId} from "../types/Referral.sol";
-import {RiskId} from "../types/RiskId.sol";
-
-interface IProductComponent {
-
-    function setFees(
-        Fee memory productFee,
-        Fee memory processingFee
-    ) external;
-
-    function calculatePremium(
-        uint256 sumInsuredAmount,
-        RiskId riskId,
-        uint256 lifetime,
-        bytes memory applicationData,
-        NftId bundleNftId,
-        ReferralId referralId
-    ) external view returns (uint256 premiumAmount);
-
-    function calculateNetPremium(
-        uint256 sumInsuredAmount,
-        RiskId riskId,
-        uint256 lifetime,
-        bytes memory applicationData
-    ) external view returns (uint256 netPremiumAmount);    
-
-    
-    function getPoolNftId() external view returns (NftId poolNftId);
-    function getDistributionNftId() external view returns (NftId distributionNftId);
-}