@etherisc/gif-next 0.0.2-ac2f4a6-957 → 0.0.2-ac4bee9-682

package/contracts/examples/unpermissioned/SimpleProduct.sol

@@ -5,6 +5,7 @@ import {Amount, AmountLib} from "../../type/Amount.sol";
 import {BasicProduct} from "../../product/BasicProduct.sol";
 import {ClaimId} from "../../type/ClaimId.sol";
 import {IAuthorization} from "../../authorization/IAuthorization.sol";
+import {IComponents} from "../../instance/module/IComponents.sol";
 import {IOracleService} from "../../oracle/IOracleService.sol";
 import {ORACLE} from "../../type/ObjectType.sol";
 import {NftId} from "../../type/NftId.sol";
@@ -33,37 +34,32 @@ contract SimpleProduct is
     constructor(
         address registry,
         NftId instanceNftId,
-        IAuthorization authorization,
-        address initialOwner,
+        string memory name,
         address token,
-        bool isInterceptor,
-        bool hasDistribution,
-        uint8 numberOfOracles
+        IComponents.ProductInfo memory productInfo,
+        IAuthorization authorization,
+        address initialOwner
     )
     {
         initialize(
             registry,
             instanceNftId,
-            authorization,
-            initialOwner,
-            "SimpleProduct",
+            name,
             token,
-            isInterceptor,
-            hasDistribution,
-            numberOfOracles); 
+            productInfo,
+            authorization,
+            initialOwner); 
     }
 
 
     function initialize(
         address registry,
         NftId instanceNftid,
-        IAuthorization authorization,
-        address initialOwner,
         string memory name,
         address token,
-        bool isInterceptor,
-        bool hasDistribution,
-        uint8 numberOfOracles
+        IComponents.ProductInfo memory productInfo,
+        IAuthorization authorization,
+        address initialOwner
     )
         public
         virtual
@@ -72,13 +68,11 @@ contract SimpleProduct is
         _initializeBasicProduct(
             registry,
             instanceNftid,
-            authorization,
-            initialOwner,
             name,
             token,
-            isInterceptor,
-            hasDistribution,
-            numberOfOracles); 
+            productInfo,
+            authorization,
+            initialOwner); 
 
         _oracleService = IOracleService(_getServiceAddress(ORACLE()));
     }

package/contracts/instance/IInstanceService.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.8.20;
 
 import {Amount} from "../type/Amount.sol";
 import {BundleSet} from "./BundleSet.sol";
-import {Instance} from "./Instance.sol";
+import {IInstance} from "./IInstance.sol";
 import {IInstanceLinkedComponent} from "../shared/IInstanceLinkedComponent.sol";
 import {IService} from "../shared/IService.sol";
 import {NftId} from "../type/NftId.sol";
@@ -55,8 +55,7 @@ interface IInstanceService is IService {
     function createInstance()
         external 
         returns (
-            // TODO check if Instance can be changed to IInstance
-            Instance clonedInstance,
+            IInstance instance,
             NftId instanceNftId
         );
 

package/contracts/instance/InstanceAdmin.sol

@@ -43,11 +43,11 @@ contract InstanceAdmin is
     /// @dev Only used for master instance admin.
     /// Contracts created via constructor come with disabled initializers.
     constructor(
-        IAuthorization instanceAuthorization
+        address instanceAuthorization
     )
         AccessAdmin()
     {
-        _instanceAuthorization = instanceAuthorization;
+        _instanceAuthorization = IAuthorization(instanceAuthorization);
     }
 
     /// @dev Initializes this instance admin with the provided instances authorization specification.
@@ -56,7 +56,7 @@ contract InstanceAdmin is
     /// Important: Initialization of this instance admin is only complete after calling function initializeInstance. 
     function initialize(
         AccessManagerCloneable accessManager,
-        IAuthorization instanceAuthorization
+        address instanceAuthorization
     )
         external
         initializer() 

package/contracts/instance/InstanceReader.sol

@@ -246,7 +246,7 @@ contract InstanceReader {
 
         if (data.length > 0) {
             IComponents.ComponentInfo memory info = abi.decode(data, (IComponents.ComponentInfo));
-            return info.wallet;
+            return info.tokenHandler.getWallet();
         }
     }
 

package/contracts/instance/InstanceService.sol

@@ -96,8 +96,8 @@ contract InstanceService is
     function createInstance()
         external 
         returns (
-            Instance clonedInstance,
-            NftId clonedInstanceNftId
+            IInstance instance,
+            NftId instanceNftId
         )
     {
         // tx sender will become instance owner
@@ -105,24 +105,24 @@ contract InstanceService is
 
         // create instance admin and instance
         InstanceAdmin instanceAdmin = _createInstanceAdmin();
-        clonedInstance = _createInstance(instanceAdmin, instanceOwner);
+        instance = _createInstance(instanceAdmin, instanceOwner);
 
         // register cloned instance with registry
-        clonedInstanceNftId = _registryService.registerInstance(
-            clonedInstance, instanceOwner).nftId;
+        instanceNftId = _registryService.registerInstance(
+            instance, instanceOwner).nftId;
 
         // register cloned instance as staking target
         _stakingService.createInstanceTarget(
-            clonedInstanceNftId,
+            instanceNftId,
             TargetManagerLib.getDefaultLockingPeriod(),
             TargetManagerLib.getDefaultRewardRate());
 
         // MUST be set after instance is set up and registered
-        instanceAdmin.initializeInstanceAuthorization(address(clonedInstance));
+        instanceAdmin.initializeInstanceAuthorization(address(instance));
 
         emit LogInstanceCloned(
-            clonedInstanceNftId,
-            address(clonedInstance));
+            instanceNftId,
+            address(instance));
     }
 
 
@@ -293,9 +293,11 @@ contract InstanceService is
         clonedAccessManager.initialize(
             address(clonedInstanceAdmin)); // grant ADMIN_ROLE to instance admin
 
+        address authorization = address(
+            InstanceAdmin(_masterInstanceAdmin).getInstanceAuthorization());
         clonedInstanceAdmin.initialize(
             clonedAccessManager,
-            InstanceAdmin(_masterInstanceAdmin).getInstanceAuthorization());
+            authorization);
     }
 
 
@@ -307,14 +309,14 @@ contract InstanceService is
     )
         internal
         virtual
-        returns (Instance clonedInstance)
+        returns (IInstance)
     {
         InstanceStore clonedInstanceStore = InstanceStore(Clones.clone(address(_masterInstanceStore)));
         BundleSet clonedBundleSet = BundleSet(Clones.clone(_masterInstanceBundleSet));
         InstanceReader clonedInstanceReader = InstanceReader(Clones.clone(address(_masterInstanceReader)));
 
         // clone instance
-        clonedInstance = Instance(Clones.clone(_masterInstance));
+        Instance clonedInstance = Instance(Clones.clone(_masterInstance));
         clonedInstance.initialize(
             instanceAdmin,
             clonedInstanceStore,
@@ -322,6 +324,7 @@ contract InstanceService is
             clonedInstanceReader,
             getRegistry(),
             instanceOwner);
+        return clonedInstance;
     }
 
 

package/contracts/instance/module/IComponents.sol

@@ -16,12 +16,12 @@ interface IComponents {
         string name; // component name (needs to be unique per instance)
         IERC20Metadata token;
         TokenHandler tokenHandler;
-        address wallet;
         bytes data; // will hold component type specific additional info (eg encoded pool info)
     }
 
     struct ProductInfo {
         bool isProcessingFundedClaims; // custom logic to react to pool events for funded claims
+        bool isInterceptingPolicyTransfers; // custom logic for policy nft transfers
         bool hasDistribution; // flag to indicate if distribution is enabled
         uint8 expectedNumberOfOracles; // expected number of oracles
         uint8 numberOfOracles; // actual number of oracles
@@ -40,7 +40,6 @@ interface IComponents {
 
     struct PoolInfo {
         Amount maxBalanceAmount; // max balance amount allowed for pool
-        RoleId bundleOwnerRole; // the required role for bundle owners
         bool isInterceptingBundleTransfers; // custom logic for bundle nft transfers
         bool isProcessingConfirmedClaims; // custom logic for claims confirmation
         bool isExternallyManaged; // funding bundles is restricted to book keeping, actual funds may be provided as needed to support payouts

package/contracts/instance/module/IPolicy.sol

@@ -43,6 +43,7 @@ interface IPolicy {
 
     /// @dev policy data for the full policy lifecycle
     struct PolicyInfo {
+        // application data, no changes after applying for a policy
         NftId productNftId;
         NftId bundleNftId;
         ReferralId referralId;
@@ -50,8 +51,8 @@ interface IPolicy {
         Amount sumInsuredAmount;
         Amount premiumAmount; // expected premium at application time
         Seconds lifetime;
-        // policy application data, no changes after applying for a policy
         bytes applicationData;
+        // policy data that may change during the lifecycle
         bytes processData;
         uint16 claimsCount;
         uint16 openClaimsCount;

package/contracts/oracle/OracleService.sol

@@ -274,15 +274,16 @@ 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);
-    }
+    // TODO cleanup
+    // 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) {

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);
     }
 
 
@@ -194,6 +184,7 @@ contract BundleService is
     function lock(NftId bundleNftId) 
         external
         virtual
+        restricted()
     {
         _checkNftType(bundleNftId, BUNDLE());
 
@@ -213,6 +204,7 @@ contract BundleService is
     function unlock(NftId bundleNftId) 
         external
         virtual
+        restricted()
     {
         _checkNftType(bundleNftId, BUNDLE());
 
@@ -235,7 +227,7 @@ contract BundleService is
     ) 
         external
         virtual
-        restricted
+        restricted()
         returns (Amount unstakedAmount, Amount feeAmount)
     {
         _checkNftType(bundleNftId, BUNDLE());
@@ -271,7 +263,7 @@ contract BundleService is
     ) 
         external 
         virtual
-        // TODO: restricted() (once #462 is done)
+        restricted()
     {
         _checkNftType(bundleNftId, BUNDLE());
 
@@ -299,7 +291,7 @@ contract BundleService is
     ) 
         external 
         virtual
-        // TODO: restricted() (once #462 is done)
+        restricted()
         returns (Amount unstakedAmount)
     {
         _checkNftType(bundleNftId, BUNDLE());
@@ -335,7 +327,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());
@@ -406,7 +398,7 @@ contract BundleService is
     function withdrawBundleFees(NftId bundleNftId, Amount amount) 
         public 
         virtual
-        // TODO: restricted() (once #462 is done)
+        restricted()
         returns (Amount withdrawnAmount) 
     {
         _checkNftType(bundleNftId, BUNDLE());
@@ -415,7 +407,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);
         

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
     )

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);

package/contracts/pool/IPoolService.sol

@@ -19,16 +19,18 @@ import {UFixed} from "../type/UFixed.sol";
 interface IPoolService is IService {
 
     event LogPoolServiceMaxBalanceAmountUpdated(NftId poolNftId, Amount previousMaxCapitalAmount, Amount currentMaxCapitalAmount);
-    event LogPoolServiceBundleOwnerRoleSet(NftId poolNftId, RoleId bundleOwnerRole);
+    event LogPoolServiceWalletFunded(NftId poolNftId, address poolOwner, Amount amount);
+    event LogPoolServiceWalletDefunded(NftId poolNftId, address poolOwner, Amount amount);
 
     event LogPoolServiceBundleCreated(NftId instanceNftId, NftId poolNftId, NftId bundleNftId);
     event LogPoolServiceBundleClosed(NftId instanceNftId, NftId poolNftId, NftId bundleNftId);
 
     event LogPoolServiceBundleStaked(NftId instanceNftId, NftId poolNftId, NftId bundleNftId, Amount amount, Amount netAmount);
-    event LogPoolServiceBundleUnstaked(NftId instanceNftId, NftId poolNftId, NftId bundleNftId, Amount amount);
+    event LogPoolServiceBundleUnstaked(NftId instanceNftId, NftId poolNftId, NftId bundleNftId, Amount amount, Amount netAmount);
 
     event LogPoolServiceProcessFundedClaim(NftId policyNftId, ClaimId claimId, Amount availableAmount);
 
+    error ErrorPoolServicePoolNotExternallyManaged(NftId poolNftId);
     error ErrorPoolServicePolicyPoolMismatch(NftId policyNftId, NftId productNftId, NftId expectedProductNftId);
     error ErrorPoolServiceBundleOwnerRoleAlreadySet(NftId poolNftId);
     error ErrorPoolServiceInvalidTransferAmount(Amount expectedAmount, Amount actualAmount);
@@ -80,16 +82,17 @@ interface IPoolService is IService {
     ) external;
 
 
-    /// @dev create a new empty bundle with the provided parameters
-    /// may only be called by registered and unlocked pool components.
-    function createBundle(
-        address owner, // initial bundle owner
-        Fee memory fee, // fees deducted from premium that go to bundle owner
-        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
-    )
-        external 
-        returns(NftId bundleNftId); // the nft id of the newly created bundle
+    // TODO cleanup
+    // /// @dev create a new empty bundle with the provided parameters
+    // /// may only be called by registered and unlocked pool components.
+    // function createBundle(
+    //     address owner, // initial bundle owner
+    //     Fee memory fee, // fees deducted from premium that go to bundle owner
+    //     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
+    // )
+    //     external 
+    //     returns(NftId bundleNftId); // the nft id of the newly created bundle
 
 
     /// @dev increase stakes for bundle
@@ -117,18 +120,18 @@ interface IPoolService is IService {
     function processFundedClaim(NftId policyNftId, ClaimId claimId, Amount availableAmount) external;
 
 
-    /// @dev Fund the specified pool wallet with the provided amount.
-    /// This function will collect the amount from the sender address and transfers it to the pool wallet.
+    /// @dev Fund the pool wallet with the provided amount.
+    /// This function will collect the amount from the pool owner and transfers it to the pool wallet.
     /// The function will not update balance amounts managed by the framework.
     /// Only available for externally managed pools.
-    function fundPoolWallet(NftId poolNftId, Amount amount) external;
+    function fundPoolWallet(Amount amount) external;
 
 
     /// @dev Defund the specified pool wallet with the provided amount.
-    /// This function will transfer the amount from the pool wallet to the sender address.
+    /// This function will transfer the amount from the pool wallet to the pool owner.
     /// The function will not update balance amounts managed by the framework.
     /// Only available for externally managed pools.
-    function defundPoolWallet(NftId poolNftId, Amount amount) external;
+    function defundPoolWallet(Amount amount) external;
 
 
     /// @dev processes the sale of a bundle and track the pool fee and bundle fee amounts
@@ -144,8 +147,10 @@ interface IPoolService is IService {
         external
         view 
         returns(
+            NftId poolNftId,
             Amount totalCollateralAmount,
-            Amount localCollateralAmount
+            Amount localCollateralAmount,
+            bool poolIsVerifyingApplications
         );