@etherisc/gif-next 0.0.2-f62dcdf-553 → 0.0.2-f634e5c-828

package/contracts/oracle/OracleService.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {ComponentVerifyingService} from "../shared/ComponentVerifyingService.sol";
+import {ContractLib} from "../shared/ContractLib.sol";
 import {IComponent} from "../shared/IComponent.sol";
 import {IInstance} from "../instance/IInstance.sol";
 import {IInstanceService} from "../instance/IInstanceService.sol";
@@ -13,12 +13,13 @@ import {IRegistry} from "../registry/IRegistry.sol";
 import {NftId} from "../type/NftId.sol";
 import {ObjectType, COMPONENT, ORACLE, PRODUCT} from "../type/ObjectType.sol";
 import {RequestId} from "../type/RequestId.sol";
+import {Service} from "../shared/Service.sol";
 import {StateId, ACTIVE, KEEP_STATE, FULFILLED, FAILED, CANCELLED} from "../type/StateId.sol";
 import {Timestamp, TimestampLib} from "../type/Timestamp.sol";
 
 
 contract OracleService is
-    ComponentVerifyingService,
+    Service,
     IOracleService
 {
 
@@ -49,51 +50,27 @@ contract OracleService is
         virtual 
         // restricted() // add authz
         onlyNftOfType(oracleNftId, ORACLE())
-        returns (
-            RequestId requestId
-        ) 
+        returns (RequestId requestId) 
     {
-        (
-            NftId componentNftId,
-            IRegistry.ObjectInfo memory componentInfo, 
-            IInstance instance
-        ) = _getAndVerifyActiveComponent(COMPONENT());
+        // IRegistry registry = getRegistry();
 
-        // oracleNftId exists and is active oracle
+        // get and check active caller
         (
-            IRegistry.ObjectInfo memory oracleInfo, 
-        ) = _getAndVerifyComponentInfo(
-            oracleNftId, 
-            ORACLE(), 
-            true); // only active
-
-        {
-            // check that requester and oracle share same product cluster
-            if (componentInfo.objectType == PRODUCT()) {
-                if (oracleInfo.parentNftId != componentInfo.nftId) {
-                    revert ErrorOracleServiceProductMismatch(componentInfo.objectType, componentInfo.nftId, oracleInfo.parentNftId);
-                }
-            } else {
-                if (oracleInfo.parentNftId != componentInfo.parentNftId) {
-                    revert ErrorOracleServiceProductMismatch(componentInfo.objectType, componentInfo.parentNftId, oracleInfo.parentNftId);
-                }
-            }
+            IRegistry.ObjectInfo memory info, 
+            address instance
+        ) = ContractLib.getAndVerifyAnyComponent(
+            getRegistry(), msg.sender, true);
 
-            // check expiriyAt >= now
-            if (expiryAt < TimestampLib.blockTimestamp()) {
-                revert ErrorOracleServiceExpiryInThePast(TimestampLib.blockTimestamp(), expiryAt);
-            }
-
-            // check callbackMethodName.length > 0
-            if (bytes(callbackMethodName).length == 0) {
-                revert ErrorOracleServiceCallbackMethodNameEmpty();
-            }
-        }
+        (
+            NftId requesterNftId,
+            IOracleComponent oracle
+        ) = _checkRequestParams(
+            getRegistry(), oracleNftId, info, expiryAt, callbackMethodName);
 
         {
             // create request info
             IOracle.RequestInfo memory request = IOracle.RequestInfo({
-                requesterNftId: componentNftId,
+                requesterNftId: requesterNftId,
                 callbackMethodName: callbackMethodName,
                 oracleNftId: oracleNftId,
                 requestData: requestData,
@@ -104,17 +81,17 @@ contract OracleService is
             });
 
             // store request with instance
-            requestId = instance.getInstanceStore().createRequest(request);
+            requestId = IInstance(instance).getInstanceStore().createRequest(request);
         }
 
-        // call oracle component
-        IOracleComponent(oracleInfo.objectAddress).request(
+        // callback to oracle component
+        oracle.request(
             requestId, 
-            componentNftId, 
+            requesterNftId, 
             requestData, 
             expiryAt);
 
-        emit LogOracleServiceRequestCreated(requestId, componentNftId, oracleNftId, expiryAt);
+        emit LogOracleServiceRequestCreated(requestId, requesterNftId, oracleNftId, expiryAt);
     }
 
 
@@ -130,11 +107,13 @@ contract OracleService is
         returns (bool success)
     {
         (
-            NftId oracleNftId,
-            IRegistry.ObjectInfo memory componentInfo, 
-            IInstance instance
-        ) = _getAndVerifyActiveComponent(ORACLE());
+            IRegistry.ObjectInfo memory info, 
+            address instanceAddress
+        ) = ContractLib.getAndVerifyComponent(
+            getRegistry(), msg.sender, ORACLE(), true);
 
+        NftId oracleNftId = info.nftId;
+        IInstance instance = IInstance(instanceAddress);
         bool callerIsOracle = true;
         IOracle.RequestInfo memory request = _checkAndGetRequestInfo(instance, requestId, oracleNftId, callerIsOracle);
         request.responseData = responseData;
@@ -176,11 +155,13 @@ contract OracleService is
         // restricted() // add authz
     {
         (
-            NftId requesterNftId,
-            IRegistry.ObjectInfo memory requesterInfo, 
-            IInstance instance
-        ) = _getAndVerifyActiveComponent(COMPONENT());
+            IRegistry.ObjectInfo memory info, 
+            address instanceAddress
+        ) = ContractLib.getAndVerifyAnyComponent(
+            getRegistry(), msg.sender, true);
 
+        NftId requesterNftId = info.nftId;
+        IInstance instance = IInstance(instanceAddress);
         bool callerIsOracle = false;
         IOracle.RequestInfo memory request = _checkAndGetRequestInfo(instance, requestId, requesterNftId, callerIsOracle);
 
@@ -191,7 +172,7 @@ contract OracleService is
                 "(uint64,bytes)"
             ));
 
-        (bool success, bytes memory returnData) = requesterInfo.objectAddress.call(
+        (bool success, bytes memory returnData) = info.objectAddress.call(
             abi.encodeWithSignature(
                 functionSignature, 
                 requestId,
@@ -202,7 +183,7 @@ contract OracleService is
             instance.getInstanceStore().updateRequestState(requestId, FULFILLED());
             emit LogOracleServiceResponseResent(requestId, requesterNftId);
         } else {
-            emit LogOracleServiceDeliveryFailed(requestId, requesterInfo.objectAddress, functionSignature);
+            emit LogOracleServiceDeliveryFailed(requestId, info.objectAddress, functionSignature);
         }
     }
 
@@ -213,11 +194,13 @@ contract OracleService is
         // restricted() // add authz
     {
         (
-            NftId requesterNftId,
-            IRegistry.ObjectInfo memory componentInfo, 
-            IInstance instance
-        ) = _getAndVerifyActiveComponent(COMPONENT());
+            IRegistry.ObjectInfo memory info, 
+            address instanceAddress
+        ) = ContractLib.getAndVerifyAnyComponent(
+            getRegistry(), msg.sender, true);
 
+        NftId requesterNftId = info.nftId;
+        IInstance instance = IInstance(instanceAddress);
         bool callerIsOracle = false;
         // TODO property isCancelled and state update to CANCELLED are redundant, get rid of isCancelled
         IOracle.RequestInfo memory request = _checkAndGetRequestInfo(instance, requestId, requesterNftId, callerIsOracle);
@@ -234,6 +217,52 @@ contract OracleService is
     }
 
 
+    function _checkRequestParams(
+        IRegistry registry,
+        NftId oracleNftId,
+        IRegistry.ObjectInfo memory info,
+        Timestamp expiryAt,
+        string memory callbackMethodName
+    )
+        internal
+        virtual
+        view
+        returns (
+            NftId requesterNftId,
+            IOracleComponent oracle
+        )
+    {
+        // get oracle info
+        (IRegistry.ObjectInfo memory oracleInfo,) = ContractLib.getInfoAndInstance(
+            registry, oracleNftId, true);
+
+        // obtain return values
+        requesterNftId = info.nftId;
+        oracle = IOracleComponent(oracleInfo.objectAddress);
+
+        // check that requester and oracle share same product cluster
+        if (info.objectType == PRODUCT()) {
+            if (oracleInfo.parentNftId != requesterNftId) {
+                revert ErrorOracleServiceProductMismatch(info.objectType, requesterNftId, oracleInfo.parentNftId);
+            }
+        } else {
+            if (oracleInfo.parentNftId != info.parentNftId) {
+                revert ErrorOracleServiceProductMismatch(info.objectType, info.parentNftId, oracleInfo.parentNftId);
+            }
+        }
+
+        // check expiriyAt >= now
+        if (expiryAt < TimestampLib.blockTimestamp()) {
+            revert ErrorOracleServiceExpiryInThePast(TimestampLib.blockTimestamp(), expiryAt);
+        }
+
+        // check callbackMethodName.length > 0
+        if (bytes(callbackMethodName).length == 0) {
+            revert ErrorOracleServiceCallbackMethodNameEmpty();
+        }
+    }
+
+
     function _checkAndGetRequestInfo(
         IInstance instance,
         RequestId requestId,
@@ -274,17 +303,6 @@ contract OracleService is
     }
 
 
-    function _getInstanceForComponent(NftId componentNftId)
-        internal
-        view
-        returns(IInstance instance)
-    {
-        NftId instanceNftId = getRegistry().getObjectInfo(componentNftId).parentNftId;
-        address instanceAddress = getRegistry().getObjectAddress(instanceNftId);
-        return IInstance(instanceAddress);
-    }
-
-
     function _getDomain() internal pure override returns(ObjectType) {
         return ORACLE();
     }

package/contracts/pool/BasicPool.sol

@@ -4,6 +4,7 @@ pragma solidity ^0.8.20;
 import {Amount} from "../type/Amount.sol";
 import {Fee} from "../type/Fee.sol";
 import {IAuthorization} from "../authorization/IAuthorization.sol";
+import {IComponents} from "../instance/module/IComponents.sol";
 import {NftId} from "../type/NftId.sol";
 import {BUNDLE} from "../type/ObjectType.sol";
 import {RoleId} from "../type/RoleId.sol";
@@ -19,9 +20,10 @@ abstract contract BasicPool is
     function _initializeBasicPool(
         address registry,
         NftId productNftId,
-        IAuthorization authorization,
-        address token,
         string memory name,
+        address token,
+        IComponents.PoolInfo memory poolInfo,
+        IAuthorization authorization,
         address initialOwner
     )
         internal
@@ -33,8 +35,8 @@ abstract contract BasicPool is
             productNftId, 
             name, 
             token, 
+            poolInfo, 
             authorization,
-            false, // isInterceptingNftTransfers, 
             initialOwner, 
             ""); // componentData
     }
@@ -115,6 +117,9 @@ abstract contract BasicPool is
     }
 
 
+    /// @dev Updates the bundle feeds to the specified values.
+    /// @param bundleNftId the bundle Nft Id
+    /// @param fee the new fee values
     function setBundleFee(
         NftId bundleNftId, 
         Fee memory fee
@@ -129,6 +134,22 @@ abstract contract BasicPool is
     }
 
 
+    /// @dev Withdraw bundle feeds for the given bundle.
+    /// @param bundleNftId the bundle Nft Id
+    /// @param amount the amount to withdraw. If set to AMOUNT_MAX, the full commission available is withdrawn
+    /// @return withdrawnAmount the effective withdrawn amount
+    function withdrawBundleFees(NftId bundleNftId, Amount amount) 
+        external 
+        virtual
+        restricted()
+        onlyBundleOwner(bundleNftId)
+        onlyNftOfType(bundleNftId, BUNDLE())
+        returns (Amount withdrawnAmount) 
+    {
+        return _withdrawBundleFees(bundleNftId, amount);
+    }
+
+
     function setMaxBalanceAmount(Amount maxBalanceAmount)
         public
         virtual

package/contracts/pool/BasicPoolAuthorization.sol

@@ -19,6 +19,13 @@ contract BasicPoolAuthorization
           Authorization(poolName)
      {}
 
+     function _setupServiceTargets()
+          internal
+          virtual override
+     {
+          _addServiceTargetWithRole(POOL());
+     }
+
      function _setupTargets()
           internal
           virtual override
@@ -51,7 +58,11 @@ contract BasicPoolAuthorization
 
           _authorize(functions, IInstanceLinkedComponent.withdrawFees.selector, "withdrawFees");
 
-          _authorize(functions, IPoolComponent.withdrawBundleFees.selector, "withdrawBundleFees");
+          _authorize(functions, BasicPool.withdrawBundleFees.selector, "withdrawBundleFees");
+
+          // authorize pool service
+          functions = _authorizeForTarget(getTargetName(), getServiceRole(POOL()));
+          _authorize(functions, IPoolComponent.verifyApplication.selector, "verifyApplication");
      }
 }
 

package/contracts/pool/BundleService.sol

@@ -63,6 +63,7 @@ contract BundleService is
     )
         external
         virtual
+        restricted()
     {
         _checkNftType(bundleNftId, BUNDLE());
 
@@ -83,20 +84,17 @@ contract BundleService is
 
 
     function create(
-        IInstance instance,
-        NftId poolNftId,
         address owner, 
         Fee memory bundleFee, 
-        Amount stakingAmount, 
         Seconds lifetime, 
         bytes calldata filter
     )
         external
-        override
-        restricted
+        virtual
+        restricted()
         returns(NftId bundleNftId)
     {
-        _checkNftType(poolNftId, POOL());
+        (NftId poolNftId,, IInstance instance) = _getAndVerifyActiveComponent(POOL());
 
         // register bundle with registry
         bundleNftId = _registryService.registerBundle(
@@ -125,19 +123,11 @@ contract BundleService is
             })
         );
 
-        if (stakingAmount.gtz()) {
-            // bundle book keeping
-            _componentService.increaseBundleBalance(
-                instanceStore, 
-                bundleNftId, 
-                stakingAmount, 
-                AmountLib.zero()); // fee amount
-        }
-
         // put bundle under bundle managemet
         BundleSet bundleManager = instance.getBundleSet();
         bundleManager.add(bundleNftId);
-        // TODO add logging
+
+        emit LogBundleServiceBundleCreated(bundleNftId, poolNftId);
     }
 
 
@@ -185,15 +175,13 @@ contract BundleService is
 
         // updated locked amount
         instanceStore.increaseLocked(bundleNftId, collateralAmount);
-        
-        // link policy to bundle in bundle manger
-        _linkPolicy(instance, policyNftId);
     }
 
 
     function lock(NftId bundleNftId) 
         external
         virtual
+        restricted()
     {
         _checkNftType(bundleNftId, BUNDLE());
 
@@ -213,6 +201,7 @@ contract BundleService is
     function unlock(NftId bundleNftId) 
         external
         virtual
+        restricted()
     {
         _checkNftType(bundleNftId, BUNDLE());
 
@@ -235,7 +224,7 @@ contract BundleService is
     ) 
         external
         virtual
-        restricted
+        restricted()
         returns (Amount unstakedAmount, Amount feeAmount)
     {
         _checkNftType(bundleNftId, BUNDLE());
@@ -271,7 +260,7 @@ contract BundleService is
     ) 
         external 
         virtual
-        // TODO: restricted() (once #462 is done)
+        restricted()
     {
         _checkNftType(bundleNftId, BUNDLE());
 
@@ -299,7 +288,7 @@ contract BundleService is
     ) 
         external 
         virtual
-        // TODO: restricted() (once #462 is done)
+        restricted()
         returns (Amount unstakedAmount)
     {
         _checkNftType(bundleNftId, BUNDLE());
@@ -335,7 +324,7 @@ contract BundleService is
     function extend(NftId bundleNftId, Seconds lifetimeExtension) 
         external 
         virtual
-        // TODO: restricted() (once #462 is done)
+        restricted()
         returns (Timestamp extendedExpiredAt) 
     {
         _checkNftType(bundleNftId, BUNDLE());
@@ -383,30 +372,12 @@ contract BundleService is
         instance.getInstanceStore().decreaseLocked(bundleNftId, collateralAmount);
     }
 
-    /// @dev unlinks policy from bundle
-    function unlinkPolicy(
-        IInstance instance, 
-        NftId policyNftId
-    ) 
-        external
-        virtual
-        restricted
-    {
-        _checkNftType(policyNftId, POLICY());
-
-        // ensure policy is closeable
-        if (!policyIsCloseable(instance, policyNftId)) {
-            revert ErrorBundleServicePolicyNotCloseable(policyNftId);
-        }
-
-        instance.getBundleSet().unlinkPolicy(policyNftId);
-    }
 
     /// @inheritdoc IBundleService
     function withdrawBundleFees(NftId bundleNftId, Amount amount) 
         public 
         virtual
-        // TODO: restricted() (once #462 is done)
+        restricted()
         returns (Amount withdrawnAmount) 
     {
         _checkNftType(bundleNftId, BUNDLE());
@@ -415,7 +386,7 @@ contract BundleService is
         InstanceReader reader = instance.getInstanceReader();
         
         IComponents.ComponentInfo memory poolInfo = reader.getComponentInfo(poolNftId);
-        address poolWallet = poolInfo.wallet;
+        address poolWallet = poolInfo.tokenHandler.getWallet();
         
         // IBundle.BundleInfo memory bundleInfo = reader.getBundleInfo(bundleNftId);
         
@@ -446,47 +417,6 @@ contract BundleService is
         }
     }
 
-    /// @inheritdoc IBundleService
-    function policyIsCloseable(IInstance instance, NftId policyNftId)
-        public
-        view
-        returns (bool isCloseable)
-    {
-        _checkNftType(policyNftId, POLICY());
-
-        IPolicy.PolicyInfo memory info = instance.getInstanceReader().getPolicyInfo(policyNftId);
-        
-        if (info.productNftId.eqz()) { return false; } // not closeable: policy does not exist (or does not belong to this instance)
-        if (info.activatedAt.eqz()) { return false; } // not closeable: not yet activated
-        if (info.closedAt.gtz()) { return false; } // not closeable: already closed
-        if (info.openClaimsCount > 0) { return false; } // not closeable: has open claims
-
-        // closeable: if sum of claims matches sum insured a policy may be closed prior to the expiry date
-        if (info.claimAmount == info.sumInsuredAmount) { return true; }
-
-        // not closeable: not yet expired
-        if (TimestampLib.blockTimestamp() < info.expiredAt) { return false; }
-
-        // all conditionsl to close the policy are met
-        return true; 
-    }
-
-    /// @dev links policy to bundle
-    function _linkPolicy(IInstance instance, NftId policyNftId) 
-        internal
-    {
-        InstanceReader instanceReader = instance.getInstanceReader();
-        IPolicy.PolicyInfo memory policyInfo = instanceReader.getPolicyInfo(policyNftId);
-
-        // ensure policy has not yet been activated in a previous tx already
-        if (policyInfo.activatedAt.gtz() && policyInfo.activatedAt < TimestampLib.blockTimestamp()) {
-            revert BundleSet.ErrorBundleSetPolicyAlreadyActivated(policyNftId);
-        }
-        
-        BundleSet bundleManager = instance.getBundleSet();
-        bundleManager.linkPolicy(policyNftId);
-    }
-
     function _getDomain() internal pure override returns(ObjectType) {
         return BUNDLE();
     }

package/contracts/pool/IBundleService.sol

@@ -13,6 +13,7 @@ import {Timestamp} from "../type/Timestamp.sol";
 
 interface IBundleService is IService {
 
+    event LogBundleServiceBundleCreated(NftId bundleNftId, NftId poolNftId);
     event LogBundleServiceBundleActivated(NftId bundleNftId);
     event LogBundleServiceBundleLocked(NftId bundleNftId);
 
@@ -35,14 +36,10 @@ interface IBundleService is IService {
     event LogBundleServiceFeesWithdrawn(NftId bundleNftId, address recipient, address tokenAddress, Amount amount);
     event LogBundleServiceBundleExtended(NftId bundleNftId, Seconds lifetimeExtension, Timestamp extendedExpiredAt);
 
-    /// @dev create a new bundle for the specified attributes
-    /// may only be called by pool service
+    /// @dev Create a new bundle for the specified attributes.
     function create(
-        IInstance instance, // instance relevant for bundle
-        NftId poolNftId, // the pool the bundle will be linked to
         address owner, // initial bundle owner
         Fee memory fee, // fees deducted from premium that go to bundle owner
-        Amount stakingAmount, // staking amount - staking fees result in initial bundle capital
         Seconds lifetime, // initial duration for which new policies are covered
         bytes calldata filter // optional use case specific criteria that define if a policy may be covered by this bundle
     )
@@ -116,28 +113,10 @@ interface IBundleService is IService {
         Amount collateralAmount
     ) external;
 
-    /// @dev unlink policy from bundle
-    /// policy may only be unlinked if policy is closeable
-    /// may only be called by pool service
-    function unlinkPolicy(
-        IInstance instance, 
-        NftId policyNftId
-    ) external;
-
     // FIXME: move to pool service
     /// @dev Withdraw bundle feeds for the given bundle
     /// @param bundleNftId the bundle Nft Id
     /// @param amount the amount to withdraw. If set to AMOUNT_MAX, the full commission available is withdrawn
     /// @return withdrawnAmount the effective withdrawn amount
     function withdrawBundleFees(NftId bundleNftId, Amount amount) external returns (Amount withdrawnAmount);
-
-    /// @dev returns true iff policy may be closed
-    /// a policy can be closed all conditions below are met
-    /// - policy exists
-    /// - has been activated
-    /// - is not yet closed
-    /// - has no open claims
-    /// - claim amount matches sum insured amount or is expired
-    function policyIsCloseable(IInstance instance, NftId policyNftId) external view returns (bool isCloseable);
-
 }

package/contracts/pool/IPoolComponent.sol

@@ -27,9 +27,7 @@ interface IPoolComponent is IInstanceLinkedComponent {
     /// The default implementation is empty.
     function verifyApplication(
         NftId applicationNftId, 
-        bytes memory applicationData,
         NftId bundleNftId, 
-        bytes memory bundleFilter,
         Amount collateralizationAmount
     ) external;
 
@@ -47,6 +45,7 @@ interface IPoolComponent is IInstanceLinkedComponent {
         view
         returns (bool isMatching);
 
+
     /// @dev This is a callback function that is called by the claim service when a claim is confirmed.
     /// The pool has the option to implement custom behavirous such as triggering a reinsurance claim or blocking the claim confirmaation.
     /// The default implementation is empty.
@@ -56,11 +55,6 @@ interface IPoolComponent is IInstanceLinkedComponent {
         Amount amount
     ) external;
 
-    /// @dev Withdraw bundle feeds for the given bundle
-    /// @param bundleNftId the bundle Nft Id
-    /// @param amount the amount to withdraw. If set to AMOUNT_MAX, the full commission available is withdrawn
-    /// @return withdrawnAmount the effective withdrawn amount
-    function withdrawBundleFees(NftId bundleNftId, Amount amount) external returns (Amount withdrawnAmount);
 
     /// @dev Returns initial pool specific infos for this pool
     function getInitialPoolInfo() external view returns (IComponents.PoolInfo memory info);