@etherisc/gif-next 0.0.2-7c8d286-020 → 0.0.2-7d488b3-675

package/contracts/pool/PoolService.sol

@@ -69,7 +69,6 @@ contract PoolService is
     function setMaxBalanceAmount(Amount maxBalanceAmount)
         external
         virtual
-        restricted()
     {
         (NftId poolNftId, IInstance instance) = _getAndVerifyActivePool();
         InstanceReader instanceReader = instance.getInstanceReader();
@@ -85,7 +84,6 @@ contract PoolService is
 
     function closeBundle(NftId bundleNftId)
         external
-        restricted()
         virtual
     {
         _checkNftType(bundleNftId, BUNDLE());
@@ -121,7 +119,6 @@ contract PoolService is
         Amount availableAmount
     ) 
         external
-        restricted()
         virtual
     {
         _checkNftType(policyNftId, POLICY());
@@ -178,7 +175,7 @@ contract PoolService is
     function stake(NftId bundleNftId, Amount amount) 
         external 
         virtual
-        restricted()
+        // TODO: restricted() (once #462 is done)
         returns(
             Amount netAmount
         ) 
@@ -225,7 +222,7 @@ contract PoolService is
 
             // collect tokens from bundle owner
             address bundleOwner = getRegistry().ownerOf(bundleNftId);
-            PoolLib.pullStakingAmount(
+            _pullStakingAmount(
                 instanceReader,
                 poolNftId, 
                 bundleOwner, 
@@ -238,7 +235,7 @@ contract PoolService is
     function unstake(NftId bundleNftId, Amount amount) 
         external 
         virtual
-        restricted()
+        // TODO: restricted() (once #462 is done)
         returns(Amount netAmount) 
     {
         (
@@ -272,7 +269,7 @@ contract PoolService is
 
             // transfer amount to bundle owner
             address bundleOwner = getRegistry().ownerOf(bundleNftId);
-            PoolLib.pushUnstakingAmount(
+            _pushUnstakingAmount(
                 instanceReader,
                 poolNftId, 
                 bundleOwner, 
@@ -284,7 +281,7 @@ contract PoolService is
     function fundPoolWallet(Amount amount)
         external
         virtual
-        restricted()
+        // restricted()
     {
         (
             NftId poolNftId,
@@ -300,7 +297,7 @@ contract PoolService is
         address poolOwner = getRegistry().ownerOf(poolNftId);
         emit LogPoolServiceWalletFunded(poolNftId, poolOwner, amount);
 
-        PoolLib.pullStakingAmount(
+        _pullStakingAmount(
             reader,
             poolNftId, 
             poolOwner, 
@@ -311,7 +308,7 @@ contract PoolService is
     function defundPoolWallet(Amount amount)
         external
         virtual
-        restricted()
+        // restricted()
     {
         (
             NftId poolNftId,
@@ -327,7 +324,7 @@ contract PoolService is
         address poolOwner = getRegistry().ownerOf(poolNftId);
         emit LogPoolServiceWalletDefunded(poolNftId, poolOwner, amount);
 
-        PoolLib.pushUnstakingAmount(
+        _pushUnstakingAmount(
             reader,
             poolNftId, 
             poolOwner, 
@@ -479,8 +476,7 @@ contract PoolService is
             payoutAmount);
 
         // interactions
-        PoolLib.transferTokenAndNotifyPolicyHolder(
-            getRegistry(),
+        _transferTokenAndNotifyPolicyHolder(
             instanceReader, 
             poolTokenHandler,
             productNftId, 
@@ -490,49 +486,49 @@ contract PoolService is
             payoutBeneficiary);
     }
 
-    //function _transferTokenAndNotifyPolicyHolder(
-    //    InstanceReader instanceReader,
-    //    TokenHandler poolTokenHandler,
-    //    NftId productNftId,
-    //    NftId policyNftId,
-    //    PayoutId payoutId,
-    //    Amount payoutAmount,
-    //    address payoutBeneficiary
-    //)
-    //    internal
-    //{
-    //    (
-    //        Amount netPayoutAmount,
-    //        Amount processingFeeAmount,
-    //        address beneficiary
-    //    ) = PoolLib.calculatePayoutAmounts(
-    //        getRegistry(),
-    //        instanceReader,
-    //        productNftId, 
-    //        policyNftId,
-    //        payoutAmount,
-    //        payoutBeneficiary);
+    function _transferTokenAndNotifyPolicyHolder(
+        InstanceReader instanceReader,
+        TokenHandler poolTokenHandler,
+        NftId productNftId,
+        NftId policyNftId,
+        PayoutId payoutId,
+        Amount payoutAmount,
+        address payoutBeneficiary
+    )
+        internal
+    {
+        (
+            Amount netPayoutAmount,
+            Amount processingFeeAmount,
+            address beneficiary
+        ) = PoolLib.calculatePayoutAmounts(
+            getRegistry(),
+            instanceReader,
+            productNftId, 
+            policyNftId,
+            payoutAmount,
+            payoutBeneficiary);
 
         // 1st token tx to payout to beneficiary
-    //    poolTokenHandler.pushToken(
-    //        beneficiary, 
-    //        netPayoutAmount);
+        poolTokenHandler.pushToken(
+            beneficiary, 
+            netPayoutAmount);
 
         // 2nd token tx to transfer processing fees to product wallet
         // if processingFeeAmount > 0
-    //    if (processingFeeAmount.gtz()) {
-    //        poolTokenHandler.pushToken(
-    //            instanceReader.getWallet(productNftId), 
-    //            processingFeeAmount);
-    //    }
+        if (processingFeeAmount.gtz()) {
+            poolTokenHandler.pushToken(
+                instanceReader.getWallet(productNftId), 
+                processingFeeAmount);
+        }
 
         // callback to policy holder if applicable
-    //    _policyHolderPayoutExecuted(
-    //        policyNftId, 
-    //        payoutId, 
-    //        beneficiary, 
-    //        netPayoutAmount);
-    //}
+        _policyHolderPayoutExecuted(
+            policyNftId, 
+            payoutId, 
+            beneficiary, 
+            netPayoutAmount);
+    }
 
 
     /// @inheritdoc IPoolService
@@ -674,48 +670,50 @@ contract PoolService is
 
 
 
-    //function _policyHolderPayoutExecuted(
-    //    NftId policyNftId, 
-    //    PayoutId payoutId,
-    //    address beneficiary,
-    //    Amount payoutAmount
-    //)
-    //    internal
-    //{
-    //    IPolicyHolder policyHolder = PoolLib.getPolicyHolder(getRegistry(), policyNftId);
-    //    if(address(policyHolder) != address(0)) {
-    //        policyHolder.payoutExecuted(policyNftId, payoutId, payoutAmount, beneficiary);
-    //    }
-    //}
-
-
-    //function _pullStakingAmount(
-    //    InstanceReader reader,
-    //    NftId poolNftId,
-    //    address from,
-    //    Amount amount
-    //)
-    //    internal
-    //{
-    //    IComponents.ComponentInfo memory info = reader.getComponentInfo(poolNftId);
-    //    info.tokenHandler.pullToken(
-    //        from,
-    //        amount);
-    //}
-
-    //function _pushUnstakingAmount(
-    //    InstanceReader reader,
-    //    NftId poolNftId,
-    //    address to,
-    //    Amount amount
-    //)
-    //    internal
-    //{
-    //    IComponents.ComponentInfo memory info = reader.getComponentInfo(poolNftId);
-    //    info.tokenHandler.pushToken(
-    //        to, 
-    //        amount);
-    //}
+    function _policyHolderPayoutExecuted(
+        NftId policyNftId, 
+        PayoutId payoutId,
+        address beneficiary,
+        Amount payoutAmount
+    )
+        internal
+    {
+        IPolicyHolder policyHolder = PoolLib.getPolicyHolder(getRegistry(), policyNftId);
+        if(address(policyHolder) != address(0)) {
+            policyHolder.payoutExecuted(policyNftId, payoutId, payoutAmount, beneficiary);
+        }
+    }
+
+
+    /// @dev Transfers the specified amount from the "from account" to the pool's wallet
+    function _pullStakingAmount(
+        InstanceReader reader,
+        NftId poolNftId,
+        address from,
+        Amount amount
+    )
+        internal
+    {
+        IComponents.ComponentInfo memory info = reader.getComponentInfo(poolNftId);
+        info.tokenHandler.pullToken(
+            from,
+            amount);
+    }
+
+    /// @dev Transfers the specified amount from the pool's wallet to the "to account"
+    function _pushUnstakingAmount(
+        InstanceReader reader,
+        NftId poolNftId,
+        address to,
+        Amount amount
+    )
+        internal
+    {
+        IComponents.ComponentInfo memory info = reader.getComponentInfo(poolNftId);
+        info.tokenHandler.pushToken(
+            to, 
+            amount);
+    }
 
 
     function _getAndVerifyActivePool()

package/contracts/product/ApplicationService.sol

@@ -71,11 +71,6 @@ contract ApplicationService is
         if (!exists) { revert ErrorApplicationServiceRiskUnknown(riskId, productNftId); }
         if (!active) { revert ErrorApplicationServiceRiskPaused(riskId, productNftId); }
 
-        NftId riskProductNftId = instanceReader.getRiskInfo(riskId).productNftId;
-        if (productNftId != riskProductNftId) {
-            revert ErrorApplicationServiceRiskProductMismatch(riskId, riskProductNftId, productNftId);
-        }
-
         // check bundle with pool
         IComponents.ProductInfo memory productInfo = instanceReader.getProductInfo(productNftId);
         {
@@ -88,7 +83,7 @@ contract ApplicationService is
         // check referral with distribution
         {
             if (productInfo.hasDistribution && ! referralId.eqz()) {
-                if (!_distributionService.referralIsValid(productInfo.distributionNftId, referralId)) {
+                if (!instanceReader.isReferralValid(productInfo.distributionNftId, referralId)) {
                     revert ErrorApplicationServiceReferralInvalid(productNftId, productInfo.distributionNftId, referralId);
                 }
             }
@@ -149,7 +144,6 @@ contract ApplicationService is
     )
         external
         virtual
-        restricted()
         nonReentrant()
         returns (NftId applicationNftId)
     {
@@ -228,7 +222,6 @@ contract ApplicationService is
     )
         external
         virtual
-        restricted()
         nonReentrant()
         returns (NftId applicationNftId)
     {
@@ -249,7 +242,6 @@ contract ApplicationService is
     )
         external
         virtual
-        restricted()
         nonReentrant()
     {
         _checkNftType(applicationNftId, POLICY());
@@ -260,7 +252,6 @@ contract ApplicationService is
     function revoke(NftId applicationNftId)
         external
         virtual
-        restricted()
         nonReentrant()
     {
         _checkNftType(applicationNftId, POLICY());

package/contracts/product/BasicProductAuthorization.sol

@@ -16,7 +16,7 @@ contract BasicProductAuthorization
 {
 
      constructor(string memory componentName)
-          Authorization(componentName, PRODUCT(), true, true)
+          Authorization(componentName, PRODUCT())
      {}
 
      function _setupServiceTargets()

package/contracts/product/ClaimService.sol

@@ -114,7 +114,6 @@ contract ClaimService is
     )
         external
         virtual
-        restricted()
         // nonReentrant() // prevents creating a reinsurance claim in a single tx
     {
         // checks
@@ -164,7 +163,6 @@ contract ClaimService is
     )
         external
         virtual
-        restricted()
         // nonReentrant() // prevents creating a reinsurance claim in a single tx
     {
         _checkNftType(policyNftId, POLICY());
@@ -197,7 +195,6 @@ contract ClaimService is
     )
         external
         virtual
-        restricted()
         // nonReentrant() // prevents creating a reinsurance claim in a single tx
     {        
         (
@@ -227,7 +224,6 @@ contract ClaimService is
     )
         external
         virtual
-        restricted()
         // nonReentrant() // prevents creating a reinsurance claim in a single tx
     {
         _checkNftType(policyNftId, POLICY());
@@ -274,7 +270,6 @@ contract ClaimService is
     )
         external
         virtual
-        restricted()
         // nonReentrant() // prevents creating a reinsurance claim in a single tx
         returns (PayoutId payoutId)
     {
@@ -299,7 +294,6 @@ contract ClaimService is
     )
         external
         virtual
-        restricted()
         // nonReentrant() // prevents creating a reinsurance payout in a single tx
         returns (PayoutId payoutId)
     {
@@ -320,7 +314,6 @@ contract ClaimService is
     )
         external
         virtual
-        restricted()
         // nonReentrant() // prevents creating a reinsurance payout in a single tx
     {
         // checks
@@ -399,7 +392,6 @@ contract ClaimService is
     )
         external
         virtual
-        restricted()
     {
         // checks
         (

package/contracts/product/IApplicationService.sol

@@ -16,13 +16,11 @@ import {Seconds} from "../type/Seconds.sol";
 interface IApplicationService is IService {
     
     // _checkLinkedApplicationParameters
-    error ErrorApplicationServiceRiskProductMismatch(RiskId riskId, NftId riskProductNftId, NftId productNftId);
     error ErrorApplicationServiceRiskUnknown(RiskId riskId, NftId productNftId);
     error ErrorApplicationServiceRiskPaused(RiskId riskId, NftId productNftId);
     error ErrorApplicationServiceBundleUnknown(NftId bundleNftId, NftId poolNftId);
     error ErrorApplicationServiceBundleLocked(NftId bundleNftId, NftId poolNftId);
     error ErrorApplicationServiceReferralInvalid(NftId productNftId, NftId distributionNftId, ReferralId referralId);
-    
 
     /// @dev creates a new application based on the specified attributes
     /// may only be called by a product component

package/contracts/product/IPricingService.sol

@@ -14,7 +14,6 @@ interface IPricingService is IService
 {
 
     error ErrorPricingServiceTargetWalletAmountsMismatch();
-    error ErrorPricingServiceRiskProductMismatch(RiskId riskId, NftId riskProductNftId, NftId productNftId);
     error ErrorPricingServiceBundlePoolMismatch(NftId bundleNftId, NftId bundlePoolNftId, NftId poolNftId);
     error ErrorPricingServiceFeeCalculationMismatch(
         Amount distributionFeeFixAmount,

package/contracts/product/IRiskService.sol

@@ -3,14 +3,11 @@ pragma solidity ^0.8.20;
 
 import {IService} from "../shared/IService.sol";
 
-import {NftId} from "../type/NftId.sol";
 import {RiskId} from "../type/RiskId.sol";
 import {StateId} from "../type/StateId.sol";
 
 interface IRiskService is IService {
 
-    error ErrorRiskServiceRiskProductMismatch(RiskId riskId, NftId riskProductNftId, NftId productNftId);
-
     /// @dev Create a new risk with the given id and provided data. 
     /// The key of the risk derived from the risk id in comination with the product NftId. 
     /// Risk data is stored in the instance store. 

package/contracts/product/PolicyService.sol

@@ -73,7 +73,6 @@ contract PolicyService is
     )
         external
         virtual
-        restricted()
         nonReentrant()
     {
         // checks
@@ -101,7 +100,6 @@ contract PolicyService is
     )
         external 
         virtual
-        restricted()
         nonReentrant()
         returns (Amount premiumAmount)
     {
@@ -130,7 +128,7 @@ contract PolicyService is
 
         // optional activation of policy
         if(activateAt.gtz()) {
-            applicationInfo = PolicyServiceLib.activate(applicationNftId, applicationInfo, activateAt);
+            applicationInfo = _activate(applicationNftId, applicationInfo, activateAt);
         }
 
         // update policy and set state to collateralized
@@ -188,7 +186,6 @@ contract PolicyService is
     )
         external 
         virtual
-        restricted()
         nonReentrant()
     {
         // checks
@@ -235,7 +232,7 @@ contract PolicyService is
 
         // optionally activate policy
         if(activateAt.gtz()) {
-            policyInfo = PolicyServiceLib.activate(policyNftId, policyInfo, activateAt);
+            policyInfo = _activate(policyNftId, policyInfo, activateAt);
         }
 
         instance.getInstanceStore().updatePolicy(policyNftId, policyInfo, KEEP_STATE());
@@ -253,7 +250,6 @@ contract PolicyService is
     function activate(NftId policyNftId, Timestamp activateAt)
         external
         virtual
-        restricted()
         nonReentrant()
     {
         // checks
@@ -263,7 +259,7 @@ contract PolicyService is
         ) = _getAndVerifyCallerForPolicy(policyNftId);
 
         // effects
-        policyInfo = PolicyServiceLib.activate(policyNftId, policyInfo, activateAt);
+        policyInfo = _activate(policyNftId, policyInfo, activateAt);
         instance.getInstanceStore().updatePolicy(policyNftId, policyInfo, KEEP_STATE());
 
         // log policy activation before interactions with policy holder
@@ -281,7 +277,6 @@ contract PolicyService is
     )
         external
         virtual
-        restricted()
         nonReentrant()
     {
         // checks
@@ -322,7 +317,6 @@ contract PolicyService is
     )
         external
         virtual
-        restricted()
         nonReentrant()
         returns (Timestamp expiredAt)
     {
@@ -350,7 +344,6 @@ contract PolicyService is
     )
         external
         virtual
-        restricted()
         nonReentrant()
         returns (Timestamp expiredAt)
     {
@@ -375,7 +368,6 @@ contract PolicyService is
     )
         external 
         virtual
-        restricted()
         nonReentrant()
     {
         // checks
@@ -430,12 +422,19 @@ contract PolicyService is
         internal
         returns (Timestamp)
     {
-        policyInfo = PolicyServiceLib.expire(
-            instance.getInstanceReader(),
+        PolicyServiceLib.checkExpiration(
+            expireAt,
             policyNftId,
-            policyInfo,
-            expireAt);
+            instance.getInstanceReader().getPolicyState(policyNftId),
+            policyInfo);
 
+        // effects
+        // update policyInfo with new expiredAt timestamp
+        if (expireAt.gtz()) {
+            policyInfo.expiredAt = expireAt;
+        } else {
+            policyInfo.expiredAt = TimestampLib.blockTimestamp();
+        }
         instance.getInstanceStore().updatePolicy(policyNftId, policyInfo, KEEP_STATE());
 
         emit LogPolicyServicePolicyExpirationUpdated(policyNftId, policyInfo.expiredAt);
@@ -446,31 +445,32 @@ contract PolicyService is
         return policyInfo.expiredAt;
     }
 
-    //function _activate(
-    //    NftId policyNftId, 
-    //    IPolicy.PolicyInfo memory policyInfo,
-    //    Timestamp activateAt
-    //)
-    //    internal
-    //    virtual
-    //    view 
-    //    returns (IPolicy.PolicyInfo memory)
-    //{
+
+    function _activate(
+        NftId policyNftId, 
+        IPolicy.PolicyInfo memory policyInfo,
+        Timestamp activateAt
+    )
+        internal
+        virtual
+        view 
+        returns (IPolicy.PolicyInfo memory)
+    {
         // fail if policy has already been activated and activateAt is different
-    //    if(! policyInfo.activatedAt.eqz() && activateAt != policyInfo.activatedAt) {
-    //        revert ErrorPolicyServicePolicyAlreadyActivated(policyNftId);
-    //    }
+        if(! policyInfo.activatedAt.eqz() && activateAt != policyInfo.activatedAt) {
+            revert ErrorPolicyServicePolicyAlreadyActivated(policyNftId);
+        }
 
         // ignore if policy has already been activated and activateAt is the same
-    //    if (policyInfo.activatedAt == activateAt) {
-    //        return policyInfo;
-    //    }
+        if (policyInfo.activatedAt == activateAt) {
+            return policyInfo;
+        }
 
-    //    policyInfo.activatedAt = activateAt;
-    //    policyInfo.expiredAt = activateAt.addSeconds(policyInfo.lifetime);
+        policyInfo.activatedAt = activateAt;
+        policyInfo.expiredAt = activateAt.addSeconds(policyInfo.lifetime);
 
-    //    return policyInfo;
-    //}
+        return policyInfo;
+    }
 
     /// @dev update counters by calling the involved services
     function _processSale(
@@ -544,6 +544,24 @@ contract PolicyService is
             tokenHandler.pushToken(poolWallet, premium.poolPremiumAndFeeAmount);
         }
     }
+
+
+    /// @dev checks that policy has been collateralized and has been activated.
+    /// does not check if policy has been expired or closed.
+    function _policyHasBeenActivated(
+        StateId policyState,
+        IPolicy.PolicyInfo memory policyInfo
+    )
+        internal
+        view
+        returns (bool)
+    {
+        if (policyState != COLLATERALIZED()) { return false; } 
+        if (TimestampLib.blockTimestamp() < policyInfo.activatedAt) { return false; } 
+        return true;
+    }
+
+
     function _policyHolderPolicyActivated(
         NftId policyNftId,
         Timestamp activateAt