@etherisc/gif-next 0.0.2-df73b56-462 → 0.0.2-dfb8aa3-070

package/contracts/instance/Instance.sol

@@ -5,13 +5,15 @@ import {AccessManagedUpgradeable} from "@openzeppelin/contracts-upgradeable/acce
 
 import {Amount} from "../type/Amount.sol";
 import {BundleSet} from "./BundleSet.sol";
+import {COMPONENT, INSTANCE} from "../type/ObjectType.sol";
 import {IInstance} from "./IInstance.sol";
+import {IComponentService} from "../shared/IComponentService.sol";
 import {IInstanceService} from "./IInstanceService.sol";
 import {InstanceReader} from "./InstanceReader.sol";
 import {InstanceAdmin} from "./InstanceAdmin.sol";
 import {InstanceStore} from "./InstanceStore.sol";
-import {INSTANCE} from "../type/ObjectType.sol";
 import {IRegistry} from "../registry/IRegistry.sol";
+import {NftId} from "../type/NftId.sol";
 import {Registerable} from "../shared/Registerable.sol";
 import {RoleId} from "../type/RoleId.sol";
 import {Seconds} from "../type/Seconds.sol";
@@ -23,10 +25,9 @@ contract Instance is
     AccessManagedUpgradeable,
     Registerable
 {
-    uint256 public constant GIF_MAJOR_VERSION = 3;
-
     bool private _initialized;
 
+    IComponentService internal _componentService;
     IInstanceService internal _instanceService;
     InstanceAdmin internal _instanceAdmin;
     InstanceReader internal _instanceReader;
@@ -53,7 +54,6 @@ contract Instance is
     {
         _instanceAdmin = instanceAdmin;
         if(_instanceAdmin.authority() == address(0)) {
-            // TODO rename error
             revert ErrorInstanceInstanceAdminZero();
         }
 
@@ -79,19 +79,32 @@ contract Instance is
         _bundleManager.initialize();
         _instanceReader.initialize();
 
+        _componentService = IComponentService(
+            getRegistry().getServiceAddress(
+                COMPONENT(), 
+                getRelease()));
+
         _instanceService = IInstanceService(
             getRegistry().getServiceAddress(
                 INSTANCE(), 
-                getMajorVersion()));
+                getRelease()));
 
         _registerInterface(type(IInstance).interfaceId);    
     }
 
+    //--- ProductRegistration ----------------------------------------------//
+    function registerProduct(address product)
+        external
+        onlyOwner()
+        returns (NftId productNftId)
+    {
+        return _componentService.registerProduct(product);
+    }
+
     //--- Staking ----------------------------------------------------------//
 
     function setStakingLockingPeriod(Seconds stakeLockingPeriod)
         external
-        // TODO decide if onlyOwner or restricted to instance owner role is better
         onlyOwner()
     {
         _instanceService.setStakingLockingPeriod(stakeLockingPeriod);
@@ -178,13 +191,7 @@ contract Instance is
 
     //--- ITransferInterceptor ----------------------------------------------//
 
-    // TODO interception of child components nfts
-    function nftMint(address to, uint256 tokenId) external onlyChainNft {
-        // TODO refactor
-        // _instanceAdmin.transferInstanceOwnerRole(address(0), to);
-    }
-
-    function nftTransferFrom(address from, address to, uint256 tokenId) external onlyChainNft {
+    function nftTransferFrom(address from, address to, uint256 tokenId, address operator) external onlyChainNft {
         // TODO refactor
         // _instanceAdmin.transferInstanceOwnerRole(from, to);
     }
@@ -221,9 +228,5 @@ contract Instance is
         return _instanceStore;
     }
 
-    function getMajorVersion() public pure returns (VersionPart majorVersion) {
-        return VersionPartLib.toVersionPart(GIF_MAJOR_VERSION);
-    }
-
     //--- internal view/pure functions --------------------------------------//
 }

package/contracts/instance/InstanceAdmin.sol

@@ -7,13 +7,13 @@ import {AccessAdmin} from "../authorization/AccessAdmin.sol";
 import {AccessManagerCloneable} from "../authorization/AccessManagerCloneable.sol";
 import {IAccessAdmin} from "../authorization/IAccessAdmin.sol";
 import {IAuthorization} from "../authorization/IAuthorization.sol";
-import {IComponent} from "../shared/IComponent.sol";
-import {IModuleAuthorization} from "../authorization/IModuleAuthorization.sol";
+import {IInstanceLinkedComponent} from "../shared/IInstanceLinkedComponent.sol";
+import {IAuthorization} from "../authorization/IAuthorization.sol";
 import {IRegistry} from "../registry/IRegistry.sol";
 import {IInstance} from "./IInstance.sol";
 import {IService} from "../shared/IService.sol";
 import {ObjectType, ObjectTypeLib, ALL, POOL, RELEASE} from "../type/ObjectType.sol";
-import {RoleId, RoleIdLib, ADMIN_ROLE, PUBLIC_ROLE, DISTRIBUTION_OWNER_ROLE, ORACLE_OWNER_ROLE, POOL_OWNER_ROLE, PRODUCT_OWNER_ROLE} from "../type/RoleId.sol";
+import {RoleId, RoleIdLib, ADMIN_ROLE, PUBLIC_ROLE} from "../type/RoleId.sol";
 import {Str, StrLib} from "../type/String.sol";
 import {TokenHandler} from "../shared/TokenHandler.sol";
 import {VersionPart} from "../type/Version.sol";
@@ -38,12 +38,12 @@ contract InstanceAdmin is
     IRegistry internal _registry;
     uint64 _idNext;
 
-    IModuleAuthorization _instanceAuthorization;
+    IAuthorization _instanceAuthorization;
 
     /// @dev Only used for master instance admin.
     /// Contracts created via constructor come with disabled initializers.
     constructor(
-        IModuleAuthorization instanceAuthorization
+        IAuthorization instanceAuthorization
     )
         AccessAdmin()
     {
@@ -56,7 +56,7 @@ contract InstanceAdmin is
     /// Important: Initialization of this instance admin is only complete after calling function initializeInstance. 
     function initialize(
         AccessManagerCloneable accessManager,
-        IModuleAuthorization instanceAuthorization
+        IAuthorization instanceAuthorization
     )
         external
         initializer() 
@@ -68,7 +68,7 @@ contract InstanceAdmin is
         _createAdminAndPublicRoles();
 
         // store instance authorization specification
-        _instanceAuthorization = IModuleAuthorization(instanceAuthorization);
+        _instanceAuthorization = IAuthorization(instanceAuthorization);
     }
 
     function _checkTargetIsReadyForAuthorization(address target)
@@ -96,7 +96,7 @@ contract InstanceAdmin is
         _registry = _instance.getRegistry();
 
         // check matching releases
-        if (_instanceAuthorization.getRelease() != _instance.getMajorVersion()) {
+        if (_instanceAuthorization.getRelease() != _instance.getRelease()) {
             revert ErrorInstanceAdminReleaseMismatch();
         }
 
@@ -104,22 +104,22 @@ contract InstanceAdmin is
         _createRoles(_instanceAuthorization);
         _createModuleTargetsWithRoles();
         _createTargetAuthorizations(_instanceAuthorization);
-
-        // grant component owner roles to instance owner
-        _grantComponentOwnerRoles();
     }
 
 
     /// @dev Initializes the authorization for the specified component.
     /// Important: The component MUST be registered.
     function initializeComponentAuthorization(
-        IComponent component,
-        IAuthorization authorization
+        IInstanceLinkedComponent component
     )
         external
     {
         _checkTargetIsReadyForAuthorization(address(component));
 
+        // get authorization specification
+        IAuthorization authorization = component.getAuthorization();
+
+        // create roles
         _createRoles(authorization);
 
         // create component target
@@ -135,12 +135,12 @@ contract InstanceAdmin is
             true, 
             false);
         
-        // FIXME: make this a bit nicer and work with IAuthorization. Use a specific role, not public - access to TokenHandler must be restricted
         FunctionInfo[] memory functions = new FunctionInfo[](3);
         functions[0] = toFunction(TokenHandler.collectTokens.selector, "collectTokens");
         functions[1] = toFunction(TokenHandler.collectTokensToThreeRecipients.selector, "collectTokensToThreeRecipients");
         functions[2] = toFunction(TokenHandler.distributeTokens.selector, "distributeTokens");
 
+        // FIXME: make this a bit nicer and work with IAuthorization. Use a specific role, not public - access to TokenHandler must be restricted
         _authorizeTargetFunctions(
             address(component.getTokenHandler()),
             getPublicRole(),
@@ -148,23 +148,12 @@ contract InstanceAdmin is
 
         _grantRoleToAccount(
             authorization.getTargetRole(
-                authorization.getTarget()), 
+                authorization.getMainTarget()), 
             address(component));
         
         _createTargetAuthorizations(authorization);
     }
 
-
-    function _grantComponentOwnerRoles()
-        internal
-    {
-        address instanceOwner = _registry.ownerOf(_instance.getNftId());
-        _grantRoleToAccount(DISTRIBUTION_OWNER_ROLE(), instanceOwner);
-        _grantRoleToAccount(ORACLE_OWNER_ROLE(), instanceOwner);
-        _grantRoleToAccount(POOL_OWNER_ROLE(), instanceOwner);
-        _grantRoleToAccount(PRODUCT_OWNER_ROLE(), instanceOwner);
-    }
-
     /// @dev Creates a custom role
     // TODO implement
     // function createRole()
@@ -188,7 +177,7 @@ contract InstanceAdmin is
     function getInstanceAuthorization()
         external
         view
-        returns (IModuleAuthorization instanceAuthorizaion)
+        returns (IAuthorization instanceAuthorizaion)
     {
         return _instanceAuthorization;
     }
@@ -203,9 +192,12 @@ contract InstanceAdmin is
 
         for(uint256 i = 0; i < roles.length; i++) {
             roleId = roles[i];
-            _createRole(
-                roleId,
-                authorization.getRoleInfo(roleId));
+
+            if (!roleExists(roleId)) {
+                _createRole(
+                    roleId,
+                    authorization.getRoleInfo(roleId));
+            }
         }
     }
 

package/contracts/instance/InstanceAuthorizationV3.sol

@@ -5,44 +5,33 @@ import {
      PRODUCT, ORACLE, POOL, INSTANCE, COMPONENT, DISTRIBUTION, APPLICATION, POLICY, CLAIM, BUNDLE
 } from "../../contracts/type/ObjectType.sol";
 
-import {
-     DISTRIBUTION_OWNER_ROLE, ORACLE_OWNER_ROLE, POOL_OWNER_ROLE, PRODUCT_OWNER_ROLE
-} from "../../contracts/type/RoleId.sol";
-
 import {BundleSet} from "../instance/BundleSet.sol"; 
 import {IAccess} from "../authorization/IAccess.sol";
 import {Instance} from "../instance/Instance.sol";
 import {InstanceAdmin} from "../instance/InstanceAdmin.sol";
 import {InstanceStore} from "../instance/InstanceStore.sol";
-import {ModuleAuthorization} from "../authorization/ModuleAuthorization.sol";
+import {Authorization} from "../authorization/Authorization.sol";
 
 
 contract InstanceAuthorizationV3
-     is ModuleAuthorization
+     is Authorization
 {
 
+     string public constant INSTANCE_ROLE_NAME = "InstanceRole";
+
      string public constant INSTANCE_TARGET_NAME = "Instance";
      string public constant INSTANCE_STORE_TARGET_NAME = "InstanceStore";
      string public constant INSTANCE_ADMIN_TARGET_NAME = "InstanceAdmin";
      string public constant BUNDLE_SET_TARGET_NAME = "BundleSet";
 
-     string public constant INSTANCE_ROLE_NAME = "InstanceRole";
-     string public constant DISTRIBUTION_OWNER_ROLE_NAME = "DistributionOwnerRole";
-     string public constant ORACLE_OWNER_ROLE_NAME = "OracleOwnerRole";
-     string public constant POOL_OWNER_ROLE_NAME = "PoolOwnerRole";
-     string public constant PRODUCT_OWNER_ROLE_NAME = "ProductOwnerRole";
-
-     constructor() ModuleAuthorization(INSTANCE_TARGET_NAME) {}
+     constructor() Authorization(INSTANCE_TARGET_NAME) {}
 
 
      function _setupRoles()
           internal
           override
      {
-          _addGifRole(DISTRIBUTION_OWNER_ROLE(), DISTRIBUTION_OWNER_ROLE_NAME);
-          _addGifRole(ORACLE_OWNER_ROLE(), ORACLE_OWNER_ROLE_NAME);
-          _addGifRole(POOL_OWNER_ROLE(), POOL_OWNER_ROLE_NAME);
-          _addGifRole(PRODUCT_OWNER_ROLE(), PRODUCT_OWNER_ROLE_NAME);
+          // empty implementation
      }
 
 
@@ -53,7 +42,7 @@ contract InstanceAuthorizationV3
           // instance target
           _addTargetWithRole(
                INSTANCE_TARGET_NAME, 
-               _getTargetRoleId(INSTANCE()),
+               _toTargetRoleId(INSTANCE()),
                INSTANCE_ROLE_NAME);
 
           // instance supporting targets
@@ -83,6 +72,7 @@ contract InstanceAuthorizationV3
           _setupInstanceAdminAuthorization();
           _setupInstanceStoreAuthorization();
           _setupBundleSetAuthorization();
+
      }
 
 
@@ -118,7 +108,7 @@ contract InstanceAuthorizationV3
           IAccess.FunctionInfo[] storage functions;
 
           // authorize instance role
-          functions = _authorizeForTarget(INSTANCE_ADMIN_TARGET_NAME, _getTargetRoleId(INSTANCE()));
+          functions = _authorizeForTarget(INSTANCE_ADMIN_TARGET_NAME, _toTargetRoleId(INSTANCE()));
           _authorize(functions, InstanceAdmin.grantRole.selector, "grantRole");
 
           // authorize instance service role

package/contracts/instance/InstanceReader.sol

@@ -2,12 +2,12 @@
 pragma solidity ^0.8.20;
 
 import {Amount} from "../type/Amount.sol";
-import {ClaimId} from "../type/ClaimId.sol";
+import {ClaimId, ClaimIdLib} from "../type/ClaimId.sol";
 import {DistributorType} from "../type/DistributorType.sol";
 import {Key32} from "../type/Key32.sol";
 import {NftId} from "../type/NftId.sol";
 import {COMPONENT, DISTRIBUTOR, DISTRIBUTION, PREMIUM, PRODUCT, POLICY, POOL, BUNDLE} from "../type/ObjectType.sol";
-import {PayoutId} from "../type/PayoutId.sol";
+import {PayoutId, PayoutIdLib} from "../type/PayoutId.sol";
 import {ReferralId, ReferralStatus, ReferralLib, REFERRAL_OK, REFERRAL_ERROR_UNKNOWN, REFERRAL_ERROR_EXPIRED, REFERRAL_ERROR_EXHAUSTED} from "../type/Referral.sol";
 import {RequestId} from "../type/RequestId.sol";
 import {RiskId} from "../type/RiskId.sol";
@@ -26,6 +26,7 @@ import {IRisk} from "../instance/module/IRisk.sol";
 import {TimestampLib} from "../type/Timestamp.sol";
 
 import {InstanceStore} from "./InstanceStore.sol";
+import {BundleSet} from "./BundleSet.sol";
 
 
 contract InstanceReader {
@@ -37,6 +38,7 @@ contract InstanceReader {
 
     IInstance internal _instance;
     InstanceStore internal _store;
+    BundleSet internal _bundleSet;
 
     /// @dev This initializer needs to be called from the instance itself.
     function initialize() public {
@@ -56,6 +58,7 @@ contract InstanceReader {
         _initialized = true;
         _instance = IInstance(instanceAddress);
         _store = _instance.getInstanceStore();
+        _bundleSet = _instance.getBundleSet();
     }
 
 
@@ -99,6 +102,22 @@ contract InstanceReader {
         return _store.getState(toPremiumKey(policyNftId));
     }
 
+    function activeBundles(NftId poolNftId)
+        public
+        view
+        returns (uint256 bundles)
+    {
+        return _bundleSet.activeBundles(poolNftId);
+    }
+
+    function getActiveBundleNftId(NftId poolNftId, uint256 idx)
+        public
+        view
+        returns (NftId bundleNftId)
+    {
+        return _bundleSet.getActiveBundleNftId(poolNftId, idx);
+    }
+
     function getBundleState(NftId bundleNftId)
         public
         view
@@ -107,14 +126,8 @@ contract InstanceReader {
         return _store.getState(toBundleKey(bundleNftId));
     }
 
-    /// @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(NftId policyNftId)
+    /// @dev Returns true iff policy is active.
+    function policyIsActive(NftId policyNftId)
         public
         view
         returns (bool isCloseable)
@@ -123,17 +136,27 @@ contract InstanceReader {
 
         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
+        if (info.activatedAt > TimestampLib.blockTimestamp()) { return false; } // not yet active
+        if (info.expiredAt <= TimestampLib.blockTimestamp()) { return false; } // already expired
 
-        // 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; }
+        return true;
+    }
+
+    function claims(NftId policyNftId)
+        public
+        view
+        returns (uint16 claims)
+    {
+        return getPolicyInfo(policyNftId).claimsCount;
+    }
 
-        // not closeable: not yet expired
-        if (TimestampLib.blockTimestamp() < info.expiredAt) { return false; }
 
-        // all conditionsl to close the policy are met
-        return true; 
+    function getClaimId(uint idx)
+        public
+        view
+        returns (ClaimId claimId)
+    {
+        return ClaimIdLib.toClaimId(idx + 1);
     }
 
     function getClaimInfo(NftId policyNftId, ClaimId claimId)
@@ -147,6 +170,7 @@ contract InstanceReader {
         }
     }
 
+
     function getClaimState(NftId policyNftId, ClaimId claimId)
         public
         view
@@ -155,6 +179,34 @@ contract InstanceReader {
         return _store.getState(claimId.toKey32(policyNftId));
     }
 
+
+    function payouts(NftId policyNftId, ClaimId claimId)
+        public
+        view
+        returns (uint24 payouts)
+    {
+        return getClaimInfo(policyNftId, claimId).payoutsCount;
+    }
+
+
+    function getPayoutId(ClaimId claimId, uint24 idx)
+        public
+        view
+        returns (PayoutId payoutId)
+    {
+        return PayoutIdLib.toPayoutId(claimId, idx + 1);
+    }
+
+
+    function getRemainingClaimableAmount(NftId policyNftId)
+        public
+        view
+        returns (Amount remainingClaimableAmount)
+    {
+        IPolicy.PolicyInfo memory info = getPolicyInfo(policyNftId);
+        return info.sumInsuredAmount - info.claimAmount;
+    }
+
     function getPayoutInfo(NftId policyNftId, PayoutId payoutId)
         public
         view
@@ -185,6 +237,19 @@ contract InstanceReader {
         }
     }
 
+    function getWallet(NftId componentNftId)
+        public
+        view
+        returns (address tokenHandler)
+    {
+        bytes memory data = _store.getData(toComponentKey(componentNftId));
+
+        if (data.length > 0) {
+            IComponents.ComponentInfo memory info = abi.decode(data, (IComponents.ComponentInfo));
+            return info.wallet;
+        }
+    }
+
     function getTokenHandler(NftId componentNftId)
         public
         view

package/contracts/instance/InstanceService.sol

@@ -12,7 +12,7 @@ import {NftId} from "../type/NftId.sol";
 import {RoleId} from "../type/RoleId.sol";
 import {SecondsLib} from "../type/Seconds.sol";
 import {UFixed, UFixedLib} from "../type/UFixed.sol";
-import {ADMIN_ROLE, DISTRIBUTION_OWNER_ROLE, ORACLE_OWNER_ROLE, POOL_OWNER_ROLE, PRODUCT_OWNER_ROLE} from "../type/RoleId.sol";
+import {ADMIN_ROLE} from "../type/RoleId.sol";
 import {ObjectType, INSTANCE, BUNDLE, APPLICATION, CLAIM, DISTRIBUTION, INSTANCE, POLICY, POOL, PRODUCT, REGISTRY, STAKING} from "../type/ObjectType.sol";
 
 import {Service} from "../shared/Service.sol";
@@ -29,7 +29,6 @@ import {IStakingService} from "../staking/IStakingService.sol";
 import {TargetManagerLib} from "../staking/TargetManagerLib.sol";
 
 import {Instance} from "./Instance.sol";
-import {IModuleAuthorization} from "../authorization/IModuleAuthorization.sol";
 import {IInstance} from "./IInstance.sol";
 import {InstanceAdmin} from "./InstanceAdmin.sol";
 import {IInstanceService} from "./IInstanceService.sol";
@@ -70,7 +69,7 @@ contract InstanceService is
             revert ErrorInstanceServiceNotInstance(instanceAddress, objectType);
         }
 
-        VersionPart instanceVersion = IInstance(instanceAddress).getMajorVersion();
+        VersionPart instanceVersion = IInstance(instanceAddress).getRelease();
         if (instanceVersion != getVersion().toMajorPart()) {
             revert ErrorInstanceServiceInstanceVersionMismatch(instanceAddress, instanceVersion);
         }
@@ -193,8 +192,7 @@ contract InstanceService is
         NftId instanceNftId = registry.getObjectInfo(componentAddress).parentNftId;
 
         IInstance instance = IInstance(
-            registry.getObjectInfo(
-                instanceNftId).objectAddress);
+            registry.getObjectAddress(instanceNftId));
 
         // no revert in case already locked
         // TODO refactor/implement
@@ -268,6 +266,7 @@ contract InstanceService is
     function upgradeInstanceReader(NftId instanceNftId) 
         external 
         onlyInstanceOwner(instanceNftId) 
+        onlyNftOfType(instanceNftId, INSTANCE())
     {
         IRegistry registry = getRegistry();
         IRegistry.ObjectInfo memory instanceInfo = registry.getObjectInfo(instanceNftId);
@@ -278,67 +277,6 @@ contract InstanceService is
         instance.setInstanceReader(upgradedInstanceReaderClone);
     }
 
-
-    function createGifTarget(
-        NftId instanceNftId,
-        address targetAddress,
-        string memory targetName,
-        bytes4[][] memory selectors,
-        RoleId[] memory roles
-    )
-        external
-        virtual
-        restricted()
-    {
-        _createGifTarget(
-            instanceNftId,
-            targetAddress,
-            targetName,
-            roles,
-            selectors
-        );
-    }
-
-
-    function initializeAuthorization(
-        NftId instanceNftId, 
-        IInstanceLinkedComponent component
-    )
-        external
-        virtual
-        restricted()
-    {
-        (IInstance instance, ) = _validateInstanceAndComponent(
-            instanceNftId, 
-            address(component));
-
-        InstanceAdmin instanceAdmin = instance.getInstanceAdmin();
-        instanceAdmin.initializeComponentAuthorization(
-            component,
-            component.getAuthorization());
-    }
-
-
-    function createComponentTarget(
-        NftId instanceNftId,
-        address targetAddress,
-        string memory targetName,
-        bytes4[][] memory selectors,
-        RoleId[] memory roles
-    )
-        external
-        virtual
-        restricted()
-    {
-        _createGifTarget(
-            instanceNftId,
-            targetAddress,
-            targetName,
-            roles,
-            selectors
-        );
-    }
-
     /// @dev create new cloned instance admin
     /// function used to setup a new instance
     function _createInstanceAdmin()
@@ -450,13 +388,20 @@ contract InstanceService is
             revert ErrorInstanceServiceNotInstanceNftId(instanceNftId);
         }
 
-        IRegistry.ObjectInfo memory componentInfo = registry.getObjectInfo(componentAddress);
-        if(componentInfo.parentNftId != instanceNftId) {
-            revert ErrorInstanceServiceInstanceComponentMismatch(instanceNftId, componentInfo.nftId);
+        if (registry.getNftIdForAddress(componentAddress).gtz()) {
+            IRegistry.ObjectInfo memory componentInfo = registry.getObjectInfo(componentAddress);
+
+            if(componentInfo.parentNftId != instanceNftId) {
+                revert ErrorInstanceServiceInstanceComponentMismatch(instanceNftId, componentInfo.nftId);
+            }
+
+            componentNftId = componentInfo.nftId;
+        } else {
+
         }
 
         instance = Instance(instanceInfo.objectAddress);
-        componentNftId = componentInfo.nftId;
+        
     }
 
     // From IService

package/contracts/instance/module/IComponents.sol

@@ -14,7 +14,6 @@ interface IComponents {
 
     struct ComponentInfo {
         string name; // component name (needs to be unique per instance)
-        NftId productNftId;
         IERC20Metadata token;
         TokenHandler tokenHandler;
         address wallet;
@@ -22,9 +21,13 @@ interface IComponents {
     }
 
     struct ProductInfo {
-        NftId distributionNftId;
-        NftId poolNftId;
         bool isProcessingFundedClaims; // custom logic to react to pool events for funded claims
+        bool hasDistribution; // flag to indicate if distribution is enabled
+        uint8 expectedNumberOfOracles; // expected number of oracles
+        uint8 numberOfOracles; // actual number of oracles
+        NftId poolNftId; // mandatory
+        NftId distributionNftId; // 0..1 (optional)
+        NftId [] oracleNftId; // 0..n (optional)
         Fee productFee; // product fee on net premium
         Fee processingFee; // product fee on payout amounts        
         Fee distributionFee; // distribution fee for sales that do not include commissions

package/contracts/instance/module/IPolicy.sol

@@ -66,8 +66,8 @@ interface IPolicy {
     struct ClaimInfo {
         Amount claimAmount;
         Amount paidAmount;
-        uint8 payoutsCount;
-        uint8 openPayoutsCount;
+        uint24 payoutsCount;
+        uint24 openPayoutsCount;
         bytes submissionData; // use case specific claim submission data, no changes after submitting the claim
         bytes processData; // use case specific data that may include information supporting confirm or decline
         Timestamp closedAt; // payment of confirmed claim amount (or declinedAt)

package/contracts/oracle/BasicOracle.sol

@@ -42,7 +42,6 @@ contract BasicOracle is
             initialOwner,
             name,
             token,
-            "",
             "");
     }
 }