@etherisc/gif-next 0.0.2-9e6b423-414 → 0.0.2-9f1b659-471

package/contracts/instance/RiskSet.sol

@@ -19,7 +19,6 @@ contract RiskSet is
     event LogRiskSetRiskAdded(NftId productNftId, RiskId riskId);
     event LogRiskSetRiskActive(NftId poolNftId,  RiskId riskId);
     event LogRiskSetRiskPaused(NftId poolNftId,  RiskId riskId);
-    event LogRiskSetRiskArchived(NftId poolNftId,  RiskId riskId);
 
     error ErrorRiskSetRiskLocked(RiskId riskId, NftId policyNftId); 
     error ErrorRiskSetRiskUnknown(RiskId riskId);
@@ -73,7 +72,7 @@ contract RiskSet is
     }
 
     /// @dev Applications linked to paused/archived risks may not be underwritten
-    function pause(RiskId riskId) external restricted() {
+    function deactivate(RiskId riskId) external restricted() {
         NftId productNftId = ObjectSetHelperLib.getProductNftId(_instanceAddress, riskId);
         _deactivate(productNftId, riskId.toKey32());
         emit LogRiskSetRiskPaused(productNftId, riskId);
@@ -92,6 +91,15 @@ contract RiskSet is
         }
     }
 
+    function hasRisk(NftId productNftId, RiskId riskId)
+        public
+        view 
+        returns (bool)
+    {
+        Key32 riskKey32 = riskId.toKey32();
+        return _contains(productNftId, riskKey32);
+    }
+
     function risks(NftId productNftId) external view returns(uint256) {
         return _objects(productNftId);
     }

package/contracts/instance/base/BalanceStore.sol

@@ -116,6 +116,6 @@ contract BalanceStore {
 
     //--- internal/private functions ----------------------------------------//
     function _setLastUpdatedIn(NftId targetNftId) internal {
-        _lastUpdatedIn[targetNftId] = BlocknumberLib.currentBlocknumber();
+        _lastUpdatedIn[targetNftId] = BlocknumberLib.current();
     }
 }

package/contracts/instance/base/ObjectLifecycle.sol

@@ -44,10 +44,7 @@ contract ObjectLifecycle is
 
     function _setupBundleLifecycle() private {
         setInitialState(BUNDLE(), ACTIVE());
-        setStateTransition(BUNDLE(), ACTIVE(), PAUSED());
         setStateTransition(BUNDLE(), ACTIVE(), CLOSED());
-        setStateTransition(BUNDLE(), PAUSED(), ACTIVE());
-        setStateTransition(BUNDLE(), PAUSED(), CLOSED());
     }
 
     function _setupPolicyLifecycle() private {
@@ -69,6 +66,7 @@ contract ObjectLifecycle is
         setStateTransition(CLAIM(), SUBMITTED(), CONFIRMED());
         setStateTransition(CLAIM(), SUBMITTED(), DECLINED());
         setStateTransition(CLAIM(), CONFIRMED(), CLOSED());
+        setStateTransition(CLAIM(), CONFIRMED(), CANCELLED());
     }
 
     function _setupPayoutLifecycle() private {
@@ -79,9 +77,7 @@ contract ObjectLifecycle is
 
     function _setupRiskLifecycle() private {
         setInitialState(RISK(), ACTIVE());
-        setStateTransition(RISK(), ACTIVE(), PAUSED());
-        setStateTransition(RISK(), PAUSED(), ACTIVE());
-        setStateTransition(RISK(), PAUSED(), ARCHIVED());
+        setStateTransition(RISK(), ACTIVE(), CLOSED());
     }
 
     function _setupRequestLifecycle() private {

package/contracts/oracle/BasicOracle.sol

@@ -34,7 +34,7 @@ contract BasicOracle is
         onlyInitializing()
     {
 
-        _initializeOracle(
+        __Oracle_init(
             registry,
             instanceNftId,
             authorization,

package/contracts/oracle/Oracle.sol

@@ -75,7 +75,7 @@ abstract contract Oracle is
     }
 
 
-    function _initializeOracle(
+    function __Oracle_init(
         address registry,
         NftId productNftId,
         IAuthorization authorization,
@@ -87,7 +87,7 @@ abstract contract Oracle is
         virtual
         onlyInitializing()
     {
-        _initializeInstanceLinkedComponent(
+        __InstanceLinkedComponent_init(
             registry, 
             productNftId, 
             name, 

package/contracts/oracle/OracleService.sol

@@ -118,7 +118,7 @@ contract OracleService is
         bool callerIsOracle = true;
         IOracle.RequestInfo memory request = _checkAndGetRequestInfo(instance, requestId, oracleNftId, callerIsOracle);
         request.responseData = responseData;
-        request.respondedAt = TimestampLib.blockTimestamp();
+        request.respondedAt = TimestampLib.current();
 
         instance.getInstanceStore().updateRequest(
             requestId, request, KEEP_STATE());
@@ -253,8 +253,8 @@ contract OracleService is
         }
 
         // check expiriyAt >= now
-        if (expiryAt < TimestampLib.blockTimestamp()) {
-            revert ErrorOracleServiceExpiryInThePast(TimestampLib.blockTimestamp(), expiryAt);
+        if (expiryAt < TimestampLib.current()) {
+            revert ErrorOracleServiceExpiryInThePast(TimestampLib.current(), expiryAt);
         }
 
         // check callbackMethodName.length > 0
@@ -298,7 +298,7 @@ contract OracleService is
         }
 
         // check expiry
-        if (info.expiredAt < TimestampLib.blockTimestamp()) {
+        if (info.expiredAt < TimestampLib.current()) {
             revert ErrorOracleServiceRequestExpired(requestId, info.expiredAt);
         }
     }

package/contracts/pool/BasicPool.sol

@@ -29,7 +29,7 @@ abstract contract BasicPool is
         virtual
         onlyInitializing()
     {
-        _initializePool(
+        __Pool_init(
             registry, 
             productNftId, 
             name, 
@@ -82,25 +82,14 @@ abstract contract BasicPool is
     }
 
 
-    function lockBundle(NftId bundleNftId)
+    function setBundleLocked(NftId bundleNftId, bool locked)
         public
         virtual
         restricted()
         onlyBundleOwner(bundleNftId)
         onlyNftOfType(bundleNftId, BUNDLE())
     {
-        _lockBundle(bundleNftId);
-    }
-
-
-    function unlockBundle(NftId bundleNftId)
-        public
-        virtual
-        restricted()
-        onlyBundleOwner(bundleNftId)
-        onlyNftOfType(bundleNftId, BUNDLE())
-    {
-        _unlockBundle(bundleNftId);
+        _setBundleLocked(bundleNftId, locked);
     }
 
 

package/contracts/pool/BasicPoolAuthorization.sol

@@ -60,8 +60,7 @@ contract BasicPoolAuthorization
           _authorize(functions, BasicPool.stake.selector, "stake");
           _authorize(functions, BasicPool.unstake.selector, "unstake");
           _authorize(functions, BasicPool.extend.selector, "extend");
-          _authorize(functions, BasicPool.lockBundle.selector, "lockBundle");
-          _authorize(functions, BasicPool.unlockBundle.selector, "unlockBundle");
+          _authorize(functions, BasicPool.setBundleLocked.selector, "setBundleLocked");
           _authorize(functions, BasicPool.closeBundle.selector, "closeBundle");
           _authorize(functions, BasicPool.setBundleFee.selector, "setBundleFee");
 

package/contracts/pool/BundleService.sol

@@ -4,7 +4,6 @@ pragma solidity ^0.8.20;
 import {IAccountingService} from "../accounting/IAccountingService.sol";
 import {IBundle} from "../instance/module/IBundle.sol";
 import {IBundleService} from "./IBundleService.sol";
-import {IComponents} from "../instance/module/IComponents.sol";
 import {IComponentService} from "../shared/IComponentService.sol";
 import {IRegistry} from "../registry/IRegistry.sol";
 import {IRegistryService} from "../registry/IRegistryService.sol";
@@ -13,19 +12,19 @@ import {InstanceStore} from "../instance/InstanceStore.sol";
 
 import {Amount, AmountLib} from "../type/Amount.sol";
 import {BundleSet} from "../instance/BundleSet.sol";
-import {ComponentVerifyingService} from "../shared/ComponentVerifyingService.sol";
 import {Fee} from "../type/Fee.sol";
 import {InstanceReader} from "../instance/InstanceReader.sol";
 import {NftId, NftIdLib} from "../type/NftId.sol";
 import {ObjectType, ACCOUNTING, COMPONENT, POOL, BUNDLE, POLICY, REGISTRY} from "../type/ObjectType.sol";
-import {StateId, ACTIVE, PAUSED, CLOSED, KEEP_STATE} from "../type/StateId.sol";
+import {PoolLib} from "./PoolLib.sol";
 import {Seconds} from "../type/Seconds.sol";
+import {Service} from "../shared/Service.sol";
+import {StateId, ACTIVE, PAUSED, CLOSED, KEEP_STATE} from "../type/StateId.sol";
 import {Timestamp, TimestampLib, zeroTimestamp} from "../type/Timestamp.sol";
 
-string constant BUNDLE_SERVICE_NAME = "BundleService";
 
 contract BundleService is 
-    ComponentVerifyingService, 
+    Service, 
     IBundleService 
 {
     
@@ -69,7 +68,7 @@ contract BundleService is
     {
         _checkNftType(bundleNftId, BUNDLE());
 
-        (NftId poolNftId,, IInstance instance) = _getAndVerifyActiveComponent(POOL());
+        (NftId poolNftId, IInstance instance) = PoolLib.getAndVerifyActivePool(getRegistry(), msg.sender);
         InstanceReader instanceReader = instance.getInstanceReader();
         IBundle.BundleInfo memory bundleInfo = instanceReader.getBundleInfo(bundleNftId);
         if(bundleInfo.poolNftId.eqz()) {
@@ -82,6 +81,8 @@ contract BundleService is
 
         bundleInfo.fee = fee;
         instance.getInstanceStore().updateBundle(bundleNftId, bundleInfo, KEEP_STATE());
+
+        emit LogBundleServiceBundleFeeUpdated(bundleNftId, fee.fixedFee, fee.fractionalFee);
     }
 
 
@@ -96,7 +97,7 @@ contract BundleService is
         restricted()
         returns(NftId bundleNftId)
     {
-        (NftId poolNftId,, IInstance instance) = _getAndVerifyActiveComponent(POOL());
+        (NftId poolNftId, IInstance instance) = PoolLib.getAndVerifyActivePool(getRegistry(), msg.sender);
 
         // register bundle with registry
         bundleNftId = _registryService.registerBundle(
@@ -119,8 +120,8 @@ contract BundleService is
                 poolNftId: poolNftId,
                 fee: bundleFee,
                 filter: filter,
-                activatedAt: TimestampLib.blockTimestamp(),
-                expiredAt: TimestampLib.blockTimestamp().addSeconds(lifetime),
+                activatedAt: TimestampLib.current(),
+                expiredAt: TimestampLib.current().addSeconds(lifetime),
                 closedAt: zeroTimestamp()
             })
         );
@@ -129,7 +130,7 @@ contract BundleService is
         BundleSet bundleManager = instance.getBundleSet();
         bundleManager.add(bundleNftId);
 
-        emit LogBundleServiceBundleCreated(bundleNftId, poolNftId);
+        emit LogBundleServiceBundleCreated(bundleNftId, poolNftId, lifetime);
     }
 
 
@@ -155,7 +156,7 @@ contract BundleService is
             IBundle.BundleInfo memory bundleInfo = instanceReader.getBundleInfo(bundleNftId);
 
             // ensure bundle is active and not yet expired
-            if(bundleState != ACTIVE() || bundleInfo.expiredAt < TimestampLib.blockTimestamp()) {
+            if(bundleState != ACTIVE() || bundleInfo.expiredAt < TimestampLib.current()) {
                 revert ErrorBundleServiceBundleNotOpen(bundleNftId, bundleState, bundleInfo.expiredAt);
             }
         }
@@ -179,32 +180,12 @@ contract BundleService is
         // effects
         // updated locked amount
         instanceStore.increaseLocked(bundleNftId, collateralAmount);
-    }
-
-
-    function lock(NftId bundleNftId) 
-        external
-        virtual
-        restricted()
-    {
-        // checks
-        _checkNftType(bundleNftId, BUNDLE());
-
-        (,, IInstance instance) = _getAndVerifyActiveComponent(POOL());
-
-        // udpate bundle state
-        instance.getInstanceStore().updateBundleState(bundleNftId, PAUSED());
 
-        // effects
-        // update set of active bundles
-        BundleSet bundleManager = instance.getBundleSet();
-        bundleManager.lock(bundleNftId);
-
-        emit LogBundleServiceBundleLocked(bundleNftId);
+        emit LogBundleServiceCollateralLocked(bundleNftId, policyNftId, collateralAmount);
     }
 
 
-    function unlock(NftId bundleNftId) 
+    function setLocked(NftId bundleNftId, bool locked) 
         external
         virtual
         restricted()
@@ -212,19 +193,21 @@ contract BundleService is
         // checks
         _checkNftType(bundleNftId, BUNDLE());
 
-        (,, IInstance instance) = _getAndVerifyActiveComponent(POOL());
+        (, IInstance instance) = PoolLib.getAndVerifyActivePool(getRegistry(), msg.sender);
 
         // effects
-        // udpate bundle state
-        instance.getInstanceStore().updateBundleState(bundleNftId, ACTIVE());
-
         // update set of active bundles
         BundleSet bundleManager = instance.getBundleSet();
-        bundleManager.unlock(bundleNftId);
 
-        emit LogBundleServiceBundleActivated(bundleNftId);
+        if (locked) {
+            bundleManager.lock(bundleNftId);
+            emit LogBundleServiceBundleLocked(bundleNftId);
+        } else {
+            bundleManager.unlock(bundleNftId);
+            emit LogBundleServiceBundleUnlocked(bundleNftId);
+        }
     }
-
+    
 
     function close(
         IInstance instance,
@@ -260,6 +243,8 @@ contract BundleService is
             unstakedAmount = balanceAmountWithFees - feeAmount;
             _accountingService.decreaseBundleBalance(instanceStore, bundleNftId, unstakedAmount, feeAmount);
         }
+
+        emit LogBundleServiceBundleClosed(bundleNftId);
     }
 
     /// @inheritdoc IBundleService
@@ -280,7 +265,7 @@ contract BundleService is
         StateId bundleState = instanceReader.getBundleState(bundleNftId);
 
         if( (bundleState != ACTIVE() && bundleState != PAUSED()) // locked bundles can be staked
-            || bundleInfo.expiredAt < TimestampLib.blockTimestamp() 
+            || bundleInfo.expiredAt < TimestampLib.current() 
             || bundleInfo.closedAt.gtz()) {
             revert ErrorBundleServiceBundleNotOpen(bundleNftId, bundleState, bundleInfo.expiredAt);
         }
@@ -291,6 +276,8 @@ contract BundleService is
             bundleNftId, 
             amount, 
             AmountLib.zero());
+
+        emit LogBundleServiceBundleStaked(bundleNftId, amount);
     }
 
     /// @inheritdoc IBundleService
@@ -332,6 +319,8 @@ contract BundleService is
             bundleNftId, 
             unstakedAmount, 
             AmountLib.zero());
+        
+        emit LogBundleServiceBundleUnstaked(bundleNftId, unstakedAmount);
     }
 
     /// @inheritdoc IBundleService
@@ -344,7 +333,7 @@ contract BundleService is
         // checks
         _checkNftType(bundleNftId, BUNDLE());
 
-        (NftId poolNftId,, IInstance instance) = _getAndVerifyActiveComponent(POOL());
+        (NftId poolNftId, IInstance instance) = PoolLib.getAndVerifyActivePool(getRegistry(), msg.sender);
         IBundle.BundleInfo memory bundleInfo = instance.getInstanceReader().getBundleInfo(bundleNftId);
         StateId bundleState = instance.getInstanceReader().getBundleState(bundleNftId);
 
@@ -354,7 +343,7 @@ contract BundleService is
         }
 
         // ensure bundle is active and not yet expired
-        if(bundleState != ACTIVE() || bundleInfo.expiredAt < TimestampLib.blockTimestamp()) {
+        if(bundleState != ACTIVE() || bundleInfo.expiredAt < TimestampLib.current()) {
             revert ErrorBundleServiceBundleNotOpen(bundleNftId, bundleState, bundleInfo.expiredAt);
         }
 
@@ -386,6 +375,8 @@ contract BundleService is
         _checkNftType(bundleNftId, BUNDLE());
 
         instanceStore.decreaseLocked(bundleNftId, collateralAmount);
+
+        emit LogBundleServiceCollateralReleased(bundleNftId, policyNftId, collateralAmount);
     }
 
 

package/contracts/pool/IBundleService.sol

@@ -12,13 +12,10 @@ import {InstanceStore} from "../instance/InstanceStore.sol";
 import {Seconds} from "../type/Seconds.sol";
 import {StateId} from "../type/StateId.sol";
 import {Timestamp} from "../type/Timestamp.sol";
+import {UFixed} from "../type/UFixed.sol";
 
 interface IBundleService is IService {
 
-    event LogBundleServiceBundleCreated(NftId bundleNftId, NftId poolNftId);
-    event LogBundleServiceBundleActivated(NftId bundleNftId);
-    event LogBundleServiceBundleLocked(NftId bundleNftId);
-
     error ErrorBundleServiceInsufficientAllowance(address bundleOwner, address tokenHandlerAddress, Amount amount);
     error ErrorBundleServiceBundleNotOpen(NftId bundleNftId, StateId state, Timestamp expiredAt);
     error ErrorBundleServiceCapacityInsufficient(NftId bundleNftId, Amount capacityAmount, Amount collateralAmount);
@@ -33,7 +30,16 @@ interface IBundleService is IService {
 
     error ErrorBundleServiceExtensionLifetimeIsZero();
 
+    event LogBundleServiceBundleCreated(NftId bundleNftId, NftId poolNftId, Seconds lifetime);
+    event LogBundleServiceBundleClosed(NftId bundleNftId);
+    event LogBundleServiceBundleLocked(NftId bundleNftId);
+    event LogBundleServiceBundleUnlocked(NftId bundleNftId);
     event LogBundleServiceBundleExtended(NftId bundleNftId, Seconds lifetimeExtension, Timestamp extendedExpiredAt);
+    event LogBundleServiceBundleFeeUpdated(NftId bundleNftId, Amount fixedFee, UFixed fractionalFee);
+    event LogBundleServiceCollateralLocked(NftId bundleNftId, NftId policyNftId, Amount collateralAmount);
+    event LogBundleServiceCollateralReleased(NftId bundleNftId, NftId policyNftId, Amount collateralAmount);
+    event LogBundleServiceBundleStaked(NftId bundleNftId, Amount amount);
+    event LogBundleServiceBundleUnstaked(NftId bundleNftId, Amount amount);
 
     /// @dev Create a new bundle for the specified attributes.
     function create(
@@ -62,15 +68,10 @@ interface IBundleService is IService {
     /// @dev extend the lifetime of the bundle by the specified time in seconds
     function extend(NftId bundleNftId, Seconds lifetimeExtension) external returns (Timestamp extendedExpiredAt);
 
-    /// @dev locks the specified bundle, locked bundles are not available to collateralize new policies
-    /// only active bundles may be locked
-    /// may only be called by registered and unlocked pool components
-    function lock(NftId bundleNftId) external;
-
-    /// @dev activates the specified bundle
-    /// only locked bundles may be unlocked
-    /// may only be called by registered and unlocked pool components
-    function unlock(NftId bundleNftId) external;
+    /// @dev locks/unlocks the specified bundle. 
+    /// locked bundles are not available to collateralize new policies.
+    /// may only be called by registered and unlocked pool components.
+    function setLocked(NftId bundleNftId, bool locked) external;
 
     /// @dev closes the specified bundle
     /// only open bundles (active or locked) may be closed

package/contracts/pool/IPoolService.sol

@@ -11,7 +11,6 @@ import {InstanceReader} from "../instance/InstanceReader.sol";
 import {InstanceStore} from "../instance/InstanceStore.sol";
 import {NftId} from "../type/NftId.sol";
 import {PayoutId} from "../type/PayoutId.sol";
-import {UFixed} from "../type/UFixed.sol";
 
 interface IPoolService is IService {
 
@@ -29,6 +28,12 @@ interface IPoolService is IService {
 
     event LogPoolServiceProcessFundedClaim(NftId policyNftId, ClaimId claimId, Amount availableAmount);
 
+    event LogPoolServiceApplicationVerified(NftId poolNftId, NftId bundleNftId, NftId applicationNftId, Amount totalCollateralAmount);
+    event LogPoolServiceCollateralLocked(NftId poolNftId, NftId bundleNftId, NftId applicationNftId, Amount totalCollateralAmount, Amount lockedCollateralAmount);
+    event LogPoolServiceCollateralReleased(NftId bundleNftId, NftId policyNftId, Amount remainingCollateralAmount);
+    event LogPoolServiceSaleProcessed(NftId poolNftId, NftId bundleNftId, Amount bundleNetAmount, Amount bundleFeeAmount, Amount poolFeeAmount);
+    event LogPoolServicePayoutProcessed(NftId poolNftId, NftId bundleNftId, NftId policyNftId, PayoutId payoutId, Amount netPayoutAmount, Amount processingFeeAmount, address payoutBeneficiary);
+
     error ErrorPoolServicePoolNotExternallyManaged(NftId poolNftId);
     error ErrorPoolServicePolicyPoolMismatch(NftId policyNftId, NftId productNftId, NftId expectedProductNftId);
     error ErrorPoolServiceBundleOwnerRoleAlreadySet(NftId poolNftId);
@@ -81,7 +86,7 @@ interface IPoolService is IService {
         PayoutId payoutId,
         Amount payoutAmount,
         address payoutBeneficiary
-    ) external;
+    ) external returns (Amount netPayoutAmount, Amount processingFeeAmount);
 
 
     /// @dev increase stakes for bundle

package/contracts/pool/Pool.sol

@@ -123,7 +123,7 @@ abstract contract Pool is
 
     // Internals
 
-    function _initializePool(
+    function __Pool_init(
         address registry,
         NftId productNftId,
         string memory name,
@@ -136,7 +136,7 @@ abstract contract Pool is
         virtual
         onlyInitializing()
     {
-        _initializeInstanceLinkedComponent(
+        __InstanceLinkedComponent_init(
             registry, 
             productNftId,  
             name, 
@@ -283,21 +283,11 @@ abstract contract Pool is
     /// @dev Locks the specified bundle.
     /// A bundle to be locked MUST be in active state.
     /// Locked bundles may not be used to collateralize any new policy.
-    function _lockBundle(NftId bundleNftId)
+    function _setBundleLocked(NftId bundleNftId, bool locked)
         internal
         virtual
     {
-        _getPoolStorage()._bundleService.lock(bundleNftId);
-    }
-
-
-    /// @dev Unlocks the specified bundle.
-    /// A bundle to be unlocked MUST be in locked state.
-    function _unlockBundle(NftId bundleNftId)
-        internal
-        virtual
-    {
-        _getPoolStorage()._bundleService.unlock(bundleNftId);
+        _getPoolStorage()._bundleService.setLocked(bundleNftId, locked);
     }
 
 

package/contracts/pool/PoolLib.sol

@@ -129,7 +129,7 @@ library PoolLib {
             // calculate processing fees if applicable
             IComponents.FeeInfo memory feeInfo = instanceReader.getFeeInfo(productNftId);
             if(FeeLib.gtz(feeInfo.processingFee)) {
-                // TODO calculate and set net payout and processing fees
+                (processingFeeAmount, netPayoutAmount) = FeeLib.calculateFee(feeInfo.processingFee, payoutAmount);
             }
         }
     }
@@ -232,24 +232,6 @@ library PoolLib {
         instance = IInstance(instanceAddress);
     }
 
-
-    function getInstanceForComponent(
-        IRegistry registry,
-        NftId componentNftId
-    )
-        public
-        view
-        returns (
-            IInstance instance
-        )
-    {
-        NftId productNftId = registry.getParentNftId(componentNftId);
-        NftId instanceNftId = registry.getParentNftId(productNftId);
-        address instanceAddress = registry.getObjectAddress(instanceNftId);
-        return IInstance(instanceAddress);
-    }
-
-
     function checkNftType(
         IRegistry registry, 
         NftId nftId, 
@@ -271,11 +253,17 @@ library PoolLib {
         address payoutBeneficiary
     )
         external
+        returns (
+            Amount netPayoutAmount,
+            Amount processingFeeAmount
+        )
     {
+        address beneficiary;
+
         (
-            Amount netPayoutAmount,
-            Amount processingFeeAmount,
-            address beneficiary
+            netPayoutAmount,
+            processingFeeAmount,
+            beneficiary
         ) = calculatePayoutAmounts(
             registry,
             instanceReader,

package/contracts/pool/PoolService.sol

@@ -2,13 +2,11 @@
 pragma solidity ^0.8.20;
 
 import {IAccountingService} from "../accounting/IAccountingService.sol";
-import {IBundle} from "../instance/module/IBundle.sol";
 import {IBundleService} from "./IBundleService.sol";
 import {IComponents} from "../instance/module/IComponents.sol";
 import {IComponentService} from "../shared/IComponentService.sol";
 import {IInstance} from "../instance/IInstance.sol";
 import {IPolicy} from "../instance/module/IPolicy.sol";
-import {IPolicyHolder} from "../shared/IPolicyHolder.sol";
 import {IPoolComponent} from "../pool/IPoolComponent.sol";
 import {IPoolService} from "./IPoolService.sol";
 import {IProductComponent} from "../product/IProductComponent.sol";
@@ -27,9 +25,6 @@ import {PayoutId} from "../type/PayoutId.sol";
 import {PoolLib} from "./PoolLib.sol";
 import {Service} from "../shared/Service.sol";
 import {TokenHandler} from "../shared/TokenHandler.sol";
-import {UFixed} from "../type/UFixed.sol";
-
-string constant POOL_SERVICE_NAME = "PoolService";
 
 
 contract PoolService is 
@@ -366,6 +361,8 @@ contract PoolService is
             bundleNftId,
             bundleNetAmount, 
             bundleFeeAmount);
+
+        emit LogPoolServiceSaleProcessed(poolNftId, bundleNftId, bundleNetAmount, bundleFeeAmount, poolFeeAmount);
     }
 
 
@@ -424,10 +421,15 @@ contract PoolService is
                 bundleNftId, 
                 totalCollateralAmount);
 
-            // TODO add logging
+            emit LogPoolServiceApplicationVerified(poolNftId, bundleNftId, applicationNftId, totalCollateralAmount);
         }
 
-        // TODO add logging
+        emit LogPoolServiceCollateralLocked(
+            poolNftId,
+            bundleNftId, 
+            applicationNftId, 
+            totalCollateralAmount, 
+            localCollateralAmount);
     }
 
     function processPayout(
@@ -443,6 +445,10 @@ contract PoolService is
         external
         virtual
         restricted()
+        returns (
+            Amount netPayoutAmount,
+            Amount processingFeeAmount
+        )
     {
         // checks
         _checkNftType(policyNftId, POLICY());
@@ -477,7 +483,7 @@ contract PoolService is
             payoutAmount);
 
         // interactions
-        PoolLib.transferTokenAndNotifyPolicyHolder(
+        (netPayoutAmount, processingFeeAmount) = PoolLib.transferTokenAndNotifyPolicyHolder(
             getRegistry(),
             instanceReader, 
             poolTokenHandler,
@@ -486,6 +492,22 @@ contract PoolService is
             payoutId, 
             payoutAmount, 
             payoutBeneficiary);
+        
+        if (processingFeeAmount.gtz()) {
+            _accountingService.increaseProductFeesForPool(
+                instanceStore,
+                productNftId,
+                processingFeeAmount);
+        }
+
+        emit LogPoolServicePayoutProcessed(
+            poolNftId,
+            bundleNftId, 
+            policyNftId, 
+            payoutId, 
+            netPayoutAmount, 
+            processingFeeAmount,
+            payoutBeneficiary);
     }
 
 
@@ -565,6 +587,11 @@ contract PoolService is
             instanceReader.getInstanceNftId(),
             address(instanceReader.getToken(policyInfo.productNftId)),
             remainingCollateralAmount);
+
+        emit LogPoolServiceCollateralReleased(
+            policyInfo.bundleNftId, 
+            policyNftId, 
+            remainingCollateralAmount);
     }