@etherisc/gif-next 0.0.2-8e4a894-234 → 0.0.2-8e5f0ee-617

package/contracts/product/PricingService.sol

@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.19;
+pragma solidity ^0.8.20;
 
+import {Amount, AmountLib} from "../type/Amount.sol";
 import {Seconds} from "../type/Seconds.sol";
 import {UFixed, UFixedLib} from "../type/UFixed.sol";
 import {ObjectType} from "../type/ObjectType.sol";
@@ -9,7 +10,6 @@ import {Fee} from "../type/Fee.sol";
 import {ReferralId} from "../type/Referral.sol";
 import {RiskId} from "../type/RiskId.sol";
 import {PRODUCT, DISTRIBUTION, PRICE} from "../type/ObjectType.sol";
-import {Amount} from "../type/Amount.sol";
 import {IRegistry} from "../registry/IRegistry.sol";
 
 import {IProductComponent} from "./IProductComponent.sol";
@@ -19,17 +19,16 @@ import {InstanceReader} from "../instance/InstanceReader.sol";
 import {IComponents} from "../instance/module/IComponents.sol";
 import {IPolicy} from "../instance/module/IPolicy.sol";
 import {IBundle} from "../instance/module/IBundle.sol";
-import {ISetup} from "../instance/module/ISetup.sol";
 import {IDistribution} from "../instance/module/IDistribution.sol";
 
-import {ComponentService} from "../shared/ComponentService.sol";
+import {ComponentVerifyingService} from "../shared/ComponentVerifyingService.sol";
 
 import {IPricingService} from "./IPricingService.sol";
 import {IDistributionService} from "../distribution/IDistributionService.sol";
 
 
 contract PricingService is 
-    ComponentService, 
+    ComponentVerifyingService, 
     IPricingService
 {
     using UFixedLib for UFixed;
@@ -45,22 +44,18 @@ contract PricingService is
         virtual override
         initializer()
     {
-        // TODO check this, might no longer be the way, refactor if necessary
-        address registryAddress;
-        address initialOwner;
-        (registryAddress, initialOwner) = abi.decode(data, (address, address));
+        (
+            address registryAddress,, 
+            //address managerAddress
+            address authority
+        ) = abi.decode(data, (address, address, address));
 
-        initializeService(registryAddress, address(0), owner);
+        initializeService(registryAddress, authority, owner);
         registerInterface(type(IPricingService).interfaceId);
 
         _distributionService = IDistributionService(_getServiceAddress(DISTRIBUTION()));
     }
 
-
-    function getDomain() public pure override returns(ObjectType) {
-        return PRICE();
-    }
-
     /// @dev calculates the premium amount for the specified attributes
     /// also returns the various fee components involved with creating a policy
     function calculatePremium(
@@ -85,14 +80,14 @@ contract PricingService is
         {
             // verify product
             (
-                IRegistry.ObjectInfo memory productInfo, 
+                IRegistry.ObjectInfo memory registryInfo, 
                 IInstance instance
-            ) = _getAndVerifyComponentInfoAndInstance(productNftId, PRODUCT());
+            ) = _getAndVerifyComponentInfo(productNftId, PRODUCT(), false);
 
             reader = instance.getInstanceReader();
 
             // calculate net premium
-            netPremiumAmount = IProductComponent(productInfo.objectAddress).calculateNetPremium(
+            netPremiumAmount = IProductComponent(registryInfo.objectAddress).calculateNetPremium(
                 sumInsuredAmount,
                 riskId,
                 lifetime,
@@ -102,46 +97,45 @@ contract PricingService is
 
         {
             // get configurations for all involed objects
-            ISetup.ProductSetupInfo memory productSetup = reader.getProductSetupInfo(productNftId);
-
-            bytes memory componentData = reader.getComponentInfo(productSetup.poolNftId).data;
-            IComponents.PoolInfo memory poolInfo = abi.decode(componentData, (IComponents.PoolInfo));
+            IComponents.ProductInfo memory productInfo = reader.getProductInfo(productNftId);
 
             IBundle.BundleInfo memory bundleInfo = reader.getBundleInfo(bundleNftId);
-            if(bundleInfo.poolNftId != productSetup.poolNftId) {
-                revert ErrorIPricingServiceBundlePoolMismatch(bundleNftId, bundleInfo.poolNftId, productSetup.poolNftId);
+            if(bundleInfo.poolNftId != productInfo.poolNftId) {
+                revert ErrorIPricingServiceBundlePoolMismatch(bundleNftId, bundleInfo.poolNftId, productInfo.poolNftId);
             }
 
-            NftId distributionNftId = productSetup.distributionNftId;
-            ISetup.DistributionSetupInfo memory distSetup = reader.getDistributionSetupInfo(distributionNftId);
-
             // calculate premium, order is important
             premium = _getFixedFeeAmounts(
                 netPremiumAmount,
-                productSetup,
-                poolInfo,
-                distSetup,
+                productInfo,
                 bundleInfo
             );
 
             premium = _calculateVariableFeeAmounts(
                 premium,
-                productSetup,
-                poolInfo,
-                distSetup,
+                productInfo,
                 bundleInfo
             );
 
             premium = _calculateDistributionOwnerFeeAmount(
                 premium,
-                distSetup,
+                productInfo,
                 referralId,
-                distributionNftId,
                 reader
             );
 
+            premium = _calculateTargetWalletAmounts(premium);
+
             // sanity check to validate the fee calculation
-            if (premium.distributionOwnerFeeFixAmount < distSetup.minDistributionOwnerFee.fixedFee) {
+            if(AmountLib.toAmount(premium.premiumAmount) != 
+                premium.productFeeAmount 
+                + premium.distributionFeeAndCommissionAmount 
+                + premium.poolPremiumAndFeeAmount)
+            {
+                revert ErrorPricingServiceTargetWalletAmountsMismatch();
+            }
+
+            if (premium.distributionOwnerFeeFixAmount < productInfo.minDistributionOwnerFee.fixedFee) {
                 revert ErrorIPricingServiceFeeCalculationMismatch( 
                     premium.distributionFeeFixAmount,
                     premium.distributionFeeVarAmount,
@@ -168,13 +162,11 @@ contract PricingService is
     // internal functions
     function _getFixedFeeAmounts(
         Amount netPremiumAmount,
-        ISetup.ProductSetupInfo memory productInfo,
-        IComponents.PoolInfo memory poolInfo,
-        ISetup.DistributionSetupInfo memory distInfo,
+        IComponents.ProductInfo memory productInfo,
         IBundle.BundleInfo memory bundleInfo
     )
         internal
-        view
+        pure
         returns (
             IPolicy.Premium memory premium
         )
@@ -187,7 +179,7 @@ contract PricingService is
         premium.productFeeFixAmount = t;
         premium.fullPremiumAmount += t;
 
-        t = poolInfo.poolFee.fixedFee;
+        t = productInfo.poolFee.fixedFee;
         premium.poolFeeFixAmount = t;
         premium.fullPremiumAmount += t;
 
@@ -195,20 +187,18 @@ contract PricingService is
         premium.bundleFeeFixAmount = t;
         premium.fullPremiumAmount += t;
 
-        t = distInfo.distributionFee.fixedFee;
+        t = productInfo.distributionFee.fixedFee;
         premium.distributionFeeFixAmount = t;
         premium.fullPremiumAmount += t;
     }
 
     function _calculateVariableFeeAmounts(
         IPolicy.Premium memory premium,
-        ISetup.ProductSetupInfo memory productInfo,
-        IComponents.PoolInfo memory poolInfo,
-        ISetup.DistributionSetupInfo memory distInfo,
+        IComponents.ProductInfo memory productInfo,
         IBundle.BundleInfo memory bundleInfo
     )
         internal
-        view
+        pure
         returns (
             IPolicy.Premium memory intermadiatePremium
         )
@@ -219,7 +209,7 @@ contract PricingService is
         premium.productFeeVarAmount = t;
         premium.fullPremiumAmount += t;
 
-        t = (netPremiumAmount * poolInfo.poolFee.fractionalFee).toInt();
+        t = (netPremiumAmount * productInfo.poolFee.fractionalFee).toInt();
         premium.poolFeeVarAmount = t;
         premium.fullPremiumAmount += t;
 
@@ -227,7 +217,7 @@ contract PricingService is
         premium.bundleFeeVarAmount = t;
         premium.fullPremiumAmount += t;
 
-        t = (netPremiumAmount * distInfo.distributionFee.fractionalFee).toInt();
+        t = (netPremiumAmount * productInfo.distributionFee.fractionalFee).toInt();
         premium.distributionFeeVarAmount = t;
         premium.fullPremiumAmount += t;
 
@@ -236,24 +226,25 @@ contract PricingService is
 
     function _calculateDistributionOwnerFeeAmount(
         IPolicy.Premium memory premium,
-        ISetup.DistributionSetupInfo memory distInfo,
+        IComponents.ProductInfo memory productInfo,
+        // ISetup.DistributionSetupInfo memory distInfo,
         ReferralId referralId,
-        NftId distributionNftId,
         InstanceReader reader
     )
         internal
         view 
         returns (IPolicy.Premium memory finalPremium)
     {
+
         // if the referral is not valid, then the distribution owner gets everything
-        if (! _distributionService.referralIsValid(distributionNftId, referralId)) {
+        if (! _distributionService.referralIsValid(productInfo.distributionNftId, referralId)) {
             premium.distributionOwnerFeeFixAmount = premium.distributionFeeFixAmount;
             premium.distributionOwnerFeeVarAmount = premium.distributionFeeVarAmount;
             premium.premiumAmount = premium.fullPremiumAmount;
             return premium;
         }
 
-        Fee memory minDistributionOwnerFee = distInfo.minDistributionOwnerFee;
+        Fee memory minDistributionOwnerFee = productInfo.minDistributionOwnerFee;
 
         // if the referral is valid, the the commission and discount are calculated based in the full premium
         // the remaing amount goes to the distribution owner
@@ -265,11 +256,45 @@ contract PricingService is
             uint256 commissionAmount = UFixedLib.toUFixed(premium.netPremiumAmount).mul(distributorTypeInfo.commissionPercentage).toInt();
             premium.commissionAmount = commissionAmount;
             premium.discountAmount = UFixedLib.toUFixed(premium.fullPremiumAmount).mul(referralInfo.discountPercentage).toInt();
-            premium.distributionOwnerFeeFixAmount = distInfo.minDistributionOwnerFee.fixedFee;
+            premium.distributionOwnerFeeFixAmount = minDistributionOwnerFee.fixedFee;
             premium.distributionOwnerFeeVarAmount = premium.distributionFeeVarAmount - commissionAmount - premium.discountAmount;
             premium.premiumAmount = premium.fullPremiumAmount - premium.discountAmount;
         }
 
         return premium; 
     }
+
+
+    function _calculateTargetWalletAmounts(
+        IPolicy.Premium memory premium
+    )
+        internal
+        virtual
+        view
+        returns (
+            IPolicy.Premium memory premiumWithTargetWalletAmounts
+        )
+    {
+        // fees for product owner
+        premium.productFeeAmount = AmountLib.toAmount(
+            premium.productFeeFixAmount + premium.productFeeVarAmount);
+
+        // fees for distribution owner + distributor commission
+        premium.distributionFeeAndCommissionAmount = AmountLib.toAmount(
+            premium.distributionFeeFixAmount + premium.distributionOwnerFeeVarAmount 
+            + premium.commissionAmount);
+
+        // net premium + fees for pool owner + bundle owner
+        premium.poolPremiumAndFeeAmount = AmountLib.toAmount(
+            premium.netPremiumAmount 
+            + premium.poolFeeFixAmount + premium.poolFeeVarAmount 
+            + premium.bundleFeeFixAmount + premium.bundleFeeVarAmount);
+
+        premiumWithTargetWalletAmounts = premium;
+    }
+
+
+    function _getDomain() internal pure override returns(ObjectType) {
+        return PRICE();
+    }
 }

package/contracts/product/PricingServiceManager.sol

@@ -12,31 +12,22 @@ contract PricingServiceManager is ProxyManager {
 
     PricingService private _pricingService;
 
-    /// @dev initializes proxy manager with distribution service implementation and deploys instance
+    /// @dev initializes proxy manager with pricing service implementation and deploys instance
     constructor(
-        address registryAddress
+        address authority, 
+        address registryAddress,
+        bytes32 salt
     )
         ProxyManager(registryAddress)
     {
-        PricingService pricingSrv = new PricingService();
-        bytes memory data = abi.encode(registryAddress, address(this));
-        IVersionable versionable = deploy(
+        PricingService pricingSrv = new PricingService{salt: salt}();
+        bytes memory data = abi.encode(registryAddress, address(this), authority);
+        IVersionable versionable = deployDetermenistic(
             address(pricingSrv), 
-            data);
+            data,
+            salt);
 
         _pricingService = PricingService(address(versionable));
-        
-        // TODO `thi` must have a role or own nft to register service
-        //Registry registry = Registry(registryAddress);
-        //address registryServiceAddress = registry.getServiceAddress(REGISTRY(), _distributionService.getMajorVersion());
-        //RegistryService registryService = RegistryService(registryServiceAddress);
-        //registryService.registerService(_distributionService);
-        
-        // TODO no nft to link yet
-        // link ownership of instance service manager ot nft owner of instance service
-        //_linkToNftOwnable(
-        //    address(registryAddress),
-        //    address(_distributionService));
     }
 
     //--- view functions ----------------------------------------------------//

package/contracts/product/Product.sol

@@ -1,14 +1,16 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.19;
+pragma solidity ^0.8.20;
 
 import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 
 import {Amount, AmountLib} from "../type/Amount.sol";
 import {ClaimId} from "../type/ClaimId.sol";
-import {Component} from "../shared/Component.sol";
-import {Fee} from "../type/Fee.sol";
+import {InstanceLinkedComponent} from "../shared/InstanceLinkedComponent.sol";
+import {Fee, FeeLib} from "../type/Fee.sol";
 import {IRisk} from "../instance/module/IRisk.sol";
 import {IApplicationService} from "./IApplicationService.sol";
+import {IAuthorization} from "../authorization/IAuthorization.sol";
+import {IComponentService} from "../shared/IComponentService.sol";
 import {IPolicyService} from "./IPolicyService.sol";
 import {IProductService} from "./IProductService.sol";
 import {IClaimService} from "./IClaimService.sol";
@@ -16,7 +18,7 @@ import {IPricingService} from "./IPricingService.sol";
 import {IProductComponent} from "./IProductComponent.sol";
 import {NftId, NftIdLib} from "../type/NftId.sol";
 import {PayoutId} from "../type/PayoutId.sol";
-import {PRODUCT, APPLICATION, POLICY, CLAIM, PRICE } from "../type/ObjectType.sol";
+import {COMPONENT, PRODUCT, APPLICATION, POLICY, CLAIM, PRICE } from "../type/ObjectType.sol";
 import {ReferralId} from "../type/Referral.sol";
 import {RiskId, RiskIdLib} from "../type/RiskId.sol";
 import {Seconds} from "../type/Seconds.sol";
@@ -27,13 +29,12 @@ import {TokenHandler} from "../shared/TokenHandler.sol";
 
 import {InstanceReader} from "../instance/InstanceReader.sol";
 import {IPolicy} from "../instance/module/IPolicy.sol";
-import {ISetup} from "../instance/module/ISetup.sol";
 import {IComponents} from "../instance/module/IComponents.sol";
 import {Pool} from "../pool/Pool.sol";
 import {Distribution} from "../distribution/Distribution.sol";
 
 abstract contract Product is
-    Component, 
+    InstanceLinkedComponent, 
     IProductComponent
 {
     // keccak256(abi.encode(uint256(keccak256("etherisc.storage.Product")) - 1)) & ~bytes32(uint256(0xff));
@@ -45,33 +46,123 @@ abstract contract Product is
         IPolicyService _policyService;
         IClaimService _claimService;
         IPricingService _pricingService;
-        Pool _pool;
-        Distribution _distribution;
-        Fee _initialProductFee;
-        Fee _initialProcessingFee;
-        TokenHandler _tokenHandler;
+        IComponentService _componentService;
         NftId _poolNftId;
         NftId _distributionNftId;
+        Pool _pool;
+        Distribution _distribution;
     }
 
-    function initializeProduct(
+
+    function calculatePremium(
+        Amount sumInsuredAmount,
+        RiskId riskId,
+        Seconds lifetime,
+        bytes memory applicationData,
+        NftId bundleNftId,
+        ReferralId referralId
+    )
+        external 
+        view 
+        override 
+        returns (Amount premiumAmount)
+    {
+        IPolicy.Premium memory premium = _getProductStorage()._pricingService.calculatePremium(
+            getNftId(),
+            riskId,
+            sumInsuredAmount,
+            lifetime,
+            applicationData,
+            bundleNftId,
+            referralId
+        );
+
+        return AmountLib.toAmount(premium.premiumAmount);
+    }
+
+    function calculateNetPremium(
+        Amount sumInsuredAmount,
+        RiskId riskId,
+        Seconds lifetime,
+        bytes memory applicationData
+    )
+        external
+        view
+        virtual override
+        returns (Amount netPremiumAmount)
+    {
+        // default 10% of sum insured
+        return AmountLib.toAmount(sumInsuredAmount.toInt() / 10);
+    }
+
+
+    function register()
+        external
+        virtual
+        onlyOwner()
+    {
+        _getProductStorage()._componentService.registerProduct();
+    }
+
+
+    function getInitialProductInfo()
+        public 
+        virtual 
+        view 
+        returns (IComponents.ProductInfo memory poolInfo)
+    {
+        ProductStorage storage $ = _getProductStorage();
+
+        return IComponents.ProductInfo({
+            distributionNftId: $._distributionNftId,
+            poolNftId: $._poolNftId,
+            productFee: FeeLib.zero(),
+            processingFee: FeeLib.zero(),
+            distributionFee: FeeLib.zero(),
+            minDistributionOwnerFee: FeeLib.zero(),
+            poolFee: FeeLib.zero(),
+            stakingFee: FeeLib.zero(),
+            performanceFee: FeeLib.zero()
+        });
+    }
+
+    function getPoolNftId() external view override returns (NftId poolNftId) {
+        return getRegistry().getNftId(address(_getProductStorage()._pool));
+    }
+
+    function getDistributionNftId() external view override returns (NftId distributionNftId) {
+        return getRegistry().getNftId(address(_getProductStorage()._distribution));
+    }
+
+
+    function _initializeProduct(
         address registry,
         NftId instanceNftId,
+        IAuthorization authorization,
+        address initialOwner,
         string memory name,
         address token,
         bool isInterceptor,
         address pool,
         address distribution,
-        Fee memory productFee,
-        Fee memory processingFee,
-        address initialOwner,
-        bytes memory registryData // writeonly data that will saved in the object info record of the registry
+        bytes memory registryData, // writeonly data that will saved in the object info record of the registry
+        bytes memory componentData // writeonly data that will saved in the object info record of the registry
     )
-        public
+        internal
         virtual
         onlyInitializing()
     {
-        initializeComponent(registry, instanceNftId, name, token, PRODUCT(), isInterceptor, initialOwner, registryData);
+        _initializeInstanceLinkedComponent(
+            registry, 
+            instanceNftId, 
+            name, 
+            token, 
+            PRODUCT(), 
+            authorization, 
+            isInterceptor, 
+            initialOwner, 
+            registryData, 
+            componentData);
 
         ProductStorage storage $ = _getProductStorage();
         // TODO add validation
@@ -81,30 +172,27 @@ abstract contract Product is
         $._policyService = IPolicyService(_getServiceAddress(POLICY())); 
         $._claimService = IClaimService(_getServiceAddress(CLAIM())); 
         $._pricingService = IPricingService(_getServiceAddress(PRICE()));
+        $._componentService = IComponentService(_getServiceAddress(COMPONENT()));
         $._pool = Pool(pool);
         $._distribution = Distribution(distribution);
-        $._initialProductFee = productFee;
-        $._initialProcessingFee = processingFee;  
-        $._tokenHandler = new TokenHandler(token);
         $._poolNftId = getRegistry().getNftId(pool);
         $._distributionNftId = getRegistry().getNftId(distribution);
 
         registerInterface(type(IProductComponent).interfaceId);  
     }
 
-    // from product component
-    function setFees(
+
+    function _setFees(
         Fee memory productFee,
         Fee memory processingFee
     )
-        external
-        onlyOwner
-        restricted()
-        override
+        internal
+        virtual
     {
-        _getProductService().setFees(productFee, processingFee);
+        _getProductStorage()._componentService.setProductFees(productFee, processingFee);
     }
 
+
     function _createRisk(
         RiskId id,
         bytes memory data
@@ -135,10 +223,12 @@ abstract contract Product is
         );
     }
 
+
     function _getRiskInfo(RiskId id) internal view returns (IRisk.RiskInfo memory info) {
         return getInstance().getInstanceReader().getRiskInfo(id);
     }
 
+
     function _createApplication(
         address applicationOwner,
         RiskId riskId,
@@ -223,25 +313,29 @@ abstract contract Product is
     function _confirmClaim(
         NftId policyNftId,
         ClaimId claimId,
-        Amount confirmedAmount
+        Amount confirmedAmount,
+        bytes memory data
     )
         internal
     {
         _getProductStorage()._claimService.confirm(
             policyNftId,
             claimId,
-            confirmedAmount);
+            confirmedAmount,
+            data);
     }
 
     function _declineClaim(
         NftId policyNftId,
-        ClaimId claimId
+        ClaimId claimId,
+        bytes memory data
     )
         internal
     {
         _getProductStorage()._claimService.decline(
             policyNftId,
-            claimId);
+            claimId,
+            data);
     }
 
     function _closeClaim(
@@ -282,87 +376,10 @@ abstract contract Product is
             payoutId);
     }
 
-    function calculatePremium(
-        Amount sumInsuredAmount,
-        RiskId riskId,
-        Seconds lifetime,
-        bytes memory applicationData,
-        NftId bundleNftId,
-        ReferralId referralId
-    )
-        external 
-        view 
-        override 
-        returns (Amount premiumAmount)
-    {
-        IPolicy.Premium memory premium = _getProductStorage()._pricingService.calculatePremium(
-            getNftId(),
-            riskId,
-            sumInsuredAmount,
-            lifetime,
-            applicationData,
-            bundleNftId,
-            referralId
-        );
-
-        return AmountLib.toAmount(premium.premiumAmount);
-    }
-
-    function calculateNetPremium(
-        Amount sumInsuredAmount,
-        RiskId riskId,
-        Seconds lifetime,
-        bytes memory applicationData
-    )
-        external
-        view
-        virtual override
-        returns (Amount netPremiumAmount)
-    {
-        // default 10% of sum insured
-        return AmountLib.toAmount(sumInsuredAmount.toInt() / 10);
-    }
-
     function _toRiskId(string memory riskName) internal pure returns (RiskId riskId) {
         return RiskIdLib.toRiskId(riskName);
     }
 
-    function getPoolNftId() external view override returns (NftId poolNftId) {
-        return getRegistry().getNftId(address(_getProductStorage()._pool));
-    }
-
-    function getDistributionNftId() external view override returns (NftId distributionNftId) {
-        return getRegistry().getNftId(address(_getProductStorage()._distribution));
-    }
-
-    function getSetupInfo() public view returns (ISetup.ProductSetupInfo memory setupInfo) {
-        InstanceReader reader = getInstance().getInstanceReader();
-        setupInfo = reader.getProductSetupInfo(getNftId());
-
-        // fallback to initial setup info (wallet is always != address(0))
-        if(setupInfo.wallet == address(0)) {
-            setupInfo = _getInitialSetupInfo();
-        }
-    }
-
-    function _getInitialSetupInfo() internal view returns (ISetup.ProductSetupInfo memory setupInfo) {
-        ProductStorage storage $ = _getProductStorage();
-
-        ISetup.DistributionSetupInfo memory distributionSetupInfo = $._distribution.getSetupInfo();
-        IComponents.PoolInfo memory poolInfo = $._pool.getPoolInfo();
-
-        return ISetup.ProductSetupInfo(
-            getToken(),
-            $._tokenHandler,
-            $._distributionNftId,
-            $._poolNftId,
-            $._initialProductFee,
-            $._initialProcessingFee,
-            false,
-            getWallet()
-        );
-    }
-
     function _getProductStorage() private pure returns (ProductStorage storage $) {
         assembly {
             $.slot := PRODUCT_STORAGE_LOCATION_V1