@etherisc/gif-next 0.0.2-f619be3-760 → 0.0.2-f752d2a-551

package/contracts/instance/{treasury → module/treasury}/ITreasury.sol

@@ -1,28 +1,23 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.19;
 
-import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 
-import {IRegistryLinked} from "../../registry/IRegistry.sol";
-
-import {NftId} from "../../types/NftId.sol";
-import {UFixed} from "../../types/UFixed.sol";
-import {Fee} from "../../types/Fee.sol";
+import {NftId} from "../../../types/NftId.sol";
+import {UFixed} from "../../../types/UFixed.sol";
+import {Fee} from "../../../types/Fee.sol";
 
 import {TokenHandler} from "./TokenHandler.sol";
 
 interface ITreasury {
     // TODO add events
     // TODO add errors
-}
 
-interface ITreasuryModule is IRegistryLinked, ITreasury {
     struct ProductSetup {
         NftId productNftId;
         NftId distributorNftId;
         NftId poolNftId;
-        IERC20 token;
-        TokenHandler tokenHandler;
+        IERC20Metadata token;
         address wallet;
         Fee policyFee;
         Fee processingFee;
@@ -31,7 +26,7 @@ interface ITreasuryModule is IRegistryLinked, ITreasury {
     struct DistributorSetup {
         NftId distributorNftId;
         address wallet;
-        Fee commissionFees;
+        Fee commissionFee;
     }
 
     struct PoolSetup {
@@ -40,12 +35,15 @@ interface ITreasuryModule is IRegistryLinked, ITreasury {
         Fee stakingFee;
         Fee performanceFee;
     }
+}
+
+interface ITreasuryModule is ITreasury {
 
     function registerProduct(
         NftId productNftId,
         NftId distributorNftId,
         NftId poolNftId,
-        IERC20 token,
+        IERC20Metadata token,
         address wallet,
         Fee memory policyFee,
         Fee memory processingFee
@@ -70,10 +68,8 @@ interface ITreasuryModule is IRegistryLinked, ITreasury {
         Fee memory performanceFee
     ) external;
 
-    function processPremium(NftId policyNftId, NftId productNftId) external;
-
     function getTokenHandler(
-        NftId productNftId
+        NftId componentNftId
     ) external view returns (TokenHandler tokenHandler);
 
     function getProductSetup(
@@ -88,4 +84,20 @@ interface ITreasuryModule is IRegistryLinked, ITreasury {
         uint256 amount,
         Fee memory fee
     ) external pure returns (uint256 feeAmount, uint256 netAmount);
+
+    function getFee(
+        UFixed fractionalFee, 
+        uint256 fixedFee
+    ) external pure returns (Fee memory fee);
+
+    function getZeroFee() external pure returns (Fee memory fee);
+
+    function getUFixed(
+        uint256 a
+    ) external pure returns (UFixed);
+
+    function getUFixed(
+        uint256 a, 
+        int8 exp
+    ) external pure returns (UFixed);
 }

package/contracts/instance/module/treasury/TokenHandler.sol

@@ -0,0 +1,48 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.19;
+
+import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
+
+import {NftId} from "../../../types/NftId.sol";
+
+contract TokenHandler {
+    NftId private _productNftId;
+    IERC20Metadata private _token;
+
+    constructor(
+        NftId productNftId,
+        address token
+    )
+    {
+        _productNftId = productNftId;
+        _token = IERC20Metadata(token);
+    }
+
+    // TODO add logging
+    function transfer(
+        address from,
+        address to,
+        uint256 amount
+    )
+        external // TODO add authz (only treasury/instance/product/pool/ service)
+    {
+        // TODO switch to oz safeTransferFrom
+        _token.transferFrom(from, to, amount);
+    }
+
+    function getProductNftId()
+        external
+        view
+        returns(NftId)
+    {
+        return _productNftId;
+    }
+
+    function getToken()
+        external
+        view
+        returns(IERC20Metadata)
+    {
+        return _token;
+    }
+}

package/contracts/instance/{treasury → module/treasury}/TreasuryModule.sol

@@ -1,50 +1,48 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.19;
 
-import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 
-import {NftId} from "../../types/NftId.sol";
-import {Fee, feeIsZero} from "../../types/Fee.sol";
-import {UFixed, UFixedMathLib} from "../../types/UFixed.sol";
-import {IProductComponent} from "../../components/IProduct.sol";
-import {IPolicy, IPolicyModule} from "../policy/IPolicy.sol";
+import {NftId} from "../../../types/NftId.sol";
+import {Fee, FeeLib} from "../../../types/Fee.sol";
+import {UFixed, UFixedMathLib} from "../../../types/UFixed.sol";
 import {TokenHandler} from "./TokenHandler.sol";
 import {ITreasuryModule} from "./ITreasury.sol";
-import {TokenHandler} from "./TokenHandler.sol";
 
 abstract contract TreasuryModule is ITreasuryModule {
     mapping(NftId productNftId => ProductSetup setup) private _productSetup;
     mapping(NftId distributorNftId => DistributorSetup setup)
         private _distributorSetup;
     mapping(NftId poolNftId => PoolSetup setup) private _poolSetup;
-
-    IPolicyModule private _policyModule;
-
-    constructor() {
-        _policyModule = IPolicyModule(address(this));
-    }
+    mapping(NftId componentNftId => TokenHandler tokenHanlder) _tokenHandler;
 
     function registerProduct(
         NftId productNftId,
         NftId distributorNftId,
         NftId poolNftId,
-        IERC20 token,
+        IERC20Metadata token,
         address wallet,
         Fee memory policyFee,
         Fee memory processingFee
     ) external override // TODO add authz (only component module)
     {
-        // TODO add validation
+        require(address(_tokenHandler[productNftId]) == address(0), "ERROR:TRS-010:TOKEN_HANDLER_ALREADY_REGISTERED");
+        require(address(_tokenHandler[poolNftId]) == address(0), "ERROR:TRS-011:TOKEN_HANDLER_ALREADY_REGISTERED");
+        require(address(_tokenHandler[distributorNftId]) == address(0), "ERROR:TRS-012:TOKEN_HANDLER_ALREADY_REGISTERED");
+        // TODO add additional validations
 
         // deploy product specific handler contract
-        TokenHandler tokenHandler = new TokenHandler(address(token));
+        TokenHandler tokenHandler = new TokenHandler(productNftId, address(token));
+        _tokenHandler[productNftId] = tokenHandler;
+        _tokenHandler[poolNftId] = tokenHandler;
+        _tokenHandler[distributorNftId] = tokenHandler;
 
+        // create product setup
         _productSetup[productNftId] = ProductSetup(
             productNftId,
             distributorNftId,
             poolNftId,
             token,
-            tokenHandler,
             wallet,
             policyFee,
             processingFee
@@ -103,9 +101,9 @@ abstract contract TreasuryModule is ITreasuryModule {
     }
 
     function getTokenHandler(
-        NftId productNftId
+        NftId componentNftId
     ) external view override returns (TokenHandler tokenHandler) {
-        return _productSetup[productNftId].tokenHandler;
+        return _tokenHandler[componentNftId];
     }
 
     function getProductSetup(
@@ -120,49 +118,35 @@ abstract contract TreasuryModule is ITreasuryModule {
         return _poolSetup[poolNftId];
     }
 
-    function processPremium(
-        NftId policyNftId,
-        NftId productNftId
-    ) external override // TODO add authz (only product service)
-    {
-        IPolicy.PolicyInfo memory policyInfo = _policyModule.getPolicyInfo(
-            policyNftId
-        );
-        require(
-            policyInfo.nftId == policyNftId,
-            "ERROR:TRS-020:POLICY_UNKNOWN"
-        );
-
-        ProductSetup memory product = _productSetup[productNftId];
-        TokenHandler tokenHandler = product.tokenHandler;
-        address policyOwner = this.getRegistry().getOwner(policyNftId);
-        address poolWallet = _poolSetup[product.poolNftId].wallet;
-        // TODO add validation
-
-        if (feeIsZero(product.policyFee)) {
-            tokenHandler.transfer(
-                policyOwner,
-                poolWallet,
-                policyInfo.premiumAmount
-            );
-        } else {
-            (uint256 feeAmount, uint256 netAmount) = calculateFeeAmount(
-                policyInfo.premiumAmount,
-                product.policyFee
-            );
-
-            tokenHandler.transfer(policyOwner, product.wallet, feeAmount);
-            tokenHandler.transfer(policyOwner, poolWallet, netAmount);
-        }
-    }
-
     function calculateFeeAmount(
         uint256 amount,
         Fee memory fee
     ) public pure override returns (uint256 feeAmount, uint256 netAmount) {
-        UFixed fractionalAmount = UFixedMathLib.itof(amount) *
-            fee.fractionalFee;
-        feeAmount = UFixedMathLib.ftoi(fractionalAmount) + fee.fixedFee;
-        netAmount = amount - feeAmount;
+        return FeeLib.calculateFee(amount, fee);
+    }
+
+    function getFee(
+        UFixed fractionalFee, 
+        uint256 fixedFee
+    ) external pure override returns (Fee memory fee) {
+        return FeeLib.toFee(fractionalFee, fixedFee);
+    }
+
+    function getZeroFee() external pure override returns (Fee memory fee) {
+        return FeeLib.zeroFee();
+    }
+
+    function getUFixed(
+        uint256 a
+    ) external pure override returns (UFixed) {
+        return UFixedMathLib.toUFixed(a);
+    }
+
+    function getUFixed(
+        uint256 a, 
+        int8 exp
+    ) external pure returns (UFixed)
+    {
+        return UFixedMathLib.toUFixed(a, exp);
     }
 }

package/contracts/instance/service/ComponentOwnerService.sol

@@ -0,0 +1,170 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.19;
+
+import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
+
+import {IRegistry} from "../../registry/IRegistry.sol";
+import {IInstance} from "../IInstance.sol";
+
+import {ITreasuryModule} from "../module/treasury/ITreasury.sol";
+import {TreasuryModule} from "../module/treasury/TreasuryModule.sol";
+import {IComponent, IComponentModule} from "../module/component/IComponent.sol";
+import {IBaseComponent} from "../../components/IBaseComponent.sol";
+import {IPoolComponent} from "../../components/IPoolComponent.sol";
+
+import {IVersionable} from "../../shared/IVersionable.sol";
+import {Versionable} from "../../shared/Versionable.sol";
+
+import {RoleId, PRODUCT_OWNER_ROLE, POOL_OWNER_ROLE, ORACLE_OWNER_ROLE} from "../../types/RoleId.sol";
+import {ObjectType, PRODUCT, ORACLE, POOL} from "../../types/ObjectType.sol";
+import {StateId, ACTIVE, PAUSED} from "../../types/StateId.sol";
+import {NftId, NftIdLib, zeroNftId} from "../../types/NftId.sol";
+import {Fee} from "../../types/Fee.sol";
+import {Version, VersionLib} from "../../types/Version.sol";
+
+import {IProductComponent} from "../../components/IProductComponent.sol";
+import {ServiceBase} from "../base/ServiceBase.sol";
+import {IComponentOwnerService} from "./IComponentOwnerService.sol";
+
+contract ComponentOwnerService is
+    ServiceBase,
+    IComponentOwnerService
+{
+    using NftIdLib for NftId;
+
+    string public constant NAME = "ComponentOwnerService";
+
+    modifier onlyRegisteredComponent(IBaseComponent component) {
+        NftId nftId = _registry.getNftId(address(component));
+        require(nftId.gtz(), "ERROR:COS-001:COMPONENT_UNKNOWN");
+        _;
+    }
+
+    constructor(
+        address registry,
+        NftId registryNftId
+    ) ServiceBase(registry, registryNftId) // solhint-disable-next-line no-empty-blocks
+    {
+
+    }
+
+    function getVersion()
+        public 
+        pure 
+        virtual override (IVersionable, Versionable)
+        returns(Version)
+    {
+        return VersionLib.toVersion(3,0,0);
+    }
+
+    function getName() external pure override 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 == ORACLE()) {
+            return ORACLE_OWNER_ROLE();
+        }
+    }
+
+    function register(
+        IBaseComponent component
+    ) external override returns (NftId nftId) {
+        address initialOwner = component.getOwner();
+        require(
+            msg.sender == address(component),
+            "ERROR:COS-003:NOT_COMPONENT"
+        );
+
+        IInstance instance = component.getInstance();
+        ObjectType objectType = component.getType();
+        RoleId typeRole = getRoleForType(objectType);
+        require(
+            instance.hasRole(typeRole, initialOwner),
+            "ERROR:CMP-004:TYPE_ROLE_MISSING"
+        );
+
+        nftId = _registry.register(address(component));
+        IERC20Metadata token = component.getToken();
+
+        instance.registerComponent(
+            nftId,
+            objectType,
+            token);
+
+        address wallet = component.getWallet();
+
+        // component type specific registration actions
+        if (component.getType() == PRODUCT()) {
+            IProductComponent product = IProductComponent(address(component));
+            NftId poolNftId = product.getPoolNftId();
+            require(poolNftId.gtz(), "ERROR:CMP-005:POOL_UNKNOWN");
+            // validate pool token and product token are same
+
+            // register with tresury
+            // implement and add validation
+            NftId distributorNftId = zeroNftId();
+            instance.registerProduct(
+                nftId,
+                distributorNftId,
+                poolNftId,
+                token,
+                wallet,
+                product.getPolicyFee(),
+                product.getProcessingFee()
+            );
+        } else if (component.getType() == POOL()) {
+            IPoolComponent pool = IPoolComponent(address(component));
+
+            // register with pool
+            instance.registerPool(
+                nftId,
+                pool.isVerifying(),
+                pool.getCollateralizationLevel());
+
+            // register with tresury
+            instance.registerPool(
+                nftId,
+                wallet,
+                pool.getStakingFee(),
+                pool.getPerformanceFee());
+        }
+        // TODO add distribution
+    }
+
+    function lock(
+        IBaseComponent component
+    ) external override onlyRegisteredComponent(component) {
+        IInstance instance = component.getInstance();
+        IComponent.ComponentInfo memory info = instance.getComponentInfo(
+            component.getNftId()
+        );
+        require(info.nftId.gtz(), "ERROR_COMPONENT_UNKNOWN");
+
+        info.state = PAUSED();
+        // setComponentInfo checks for valid state changes
+        instance.setComponentInfo(info);
+    }
+
+    function unlock(
+        IBaseComponent component
+    ) external override onlyRegisteredComponent(component) {
+        IInstance instance = component.getInstance();
+        IComponent.ComponentInfo memory info = instance.getComponentInfo(
+            component.getNftId()
+        );
+        require(info.nftId.gtz(), "ERROR_COMPONENT_UNKNOWN");
+
+        info.state = ACTIVE();
+        // setComponentInfo checks for valid state changes
+        instance.setComponentInfo(info);
+    }
+}

package/contracts/instance/service/IComponentOwnerService.sol

@@ -0,0 +1,22 @@
+// 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 {
+
+    function register(IBaseComponent component) external returns(NftId componentNftId);
+
+    // 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/IPoolService.sol

@@ -0,0 +1,30 @@
+// 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 stakingFee,
+        Fee memory performanceFee
+    ) external;
+
+    function createBundle(
+        address owner,
+        uint256 amount,
+        uint256 lifetime, 
+        bytes calldata filter
+    ) external returns(NftId bundleNftId);
+
+    // 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

@@ -0,0 +1,58 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.19;
+
+import {NftId} from "../../types/NftId.sol";
+import {Timestamp} from "../../types/Timestamp.sol";
+import {UFixed} from "../../types/UFixed.sol";
+import {Fee} from "../../types/Fee.sol";
+import {IService} from "../base/IService.sol";
+
+interface IProductService is IService {
+    function setFees(
+        Fee memory policyFee,
+        Fee memory processingFee
+    ) external;
+
+    function createApplication(
+        address applicationOwner,
+        uint256 sumInsuredAmount,
+        uint256 premiumAmount,
+        uint256 lifetime,
+        NftId bundleNftId
+    ) external returns (NftId nftId);
+
+    // function revoke(unit256 nftId) 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 nftId, Timestamp activateAt) external;
+
+    function activate(NftId nftId, 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);
+
+}