@etherisc/gif-next 0.0.2-a4051e9-983 → 0.0.2-a419a2f-980

package/artifacts/contracts/type/RiskId.sol/RiskIdLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/7c2b910852397af65cbc23034f863f80.json"
+  "buildInfo": "../../../build-info/a19f266ef259651b9fce93c8a284e28c.json"
 }

package/artifacts/contracts/type/RoleId.sol/RoleIdLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/7c2b910852397af65cbc23034f863f80.json"
+  "buildInfo": "../../../build-info/a19f266ef259651b9fce93c8a284e28c.json"
 }

package/artifacts/contracts/type/Seconds.sol/SecondsLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/7c2b910852397af65cbc23034f863f80.json"
+  "buildInfo": "../../../build-info/a19f266ef259651b9fce93c8a284e28c.json"
 }

package/artifacts/contracts/type/Selector.sol/SelectorLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/7c2b910852397af65cbc23034f863f80.json"
+  "buildInfo": "../../../build-info/a19f266ef259651b9fce93c8a284e28c.json"
 }

package/artifacts/contracts/type/Selector.sol/SelectorSetLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/7c2b910852397af65cbc23034f863f80.json"
+  "buildInfo": "../../../build-info/a19f266ef259651b9fce93c8a284e28c.json"
 }

package/artifacts/contracts/type/StateId.sol/StateIdLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/7c2b910852397af65cbc23034f863f80.json"
+  "buildInfo": "../../../build-info/a19f266ef259651b9fce93c8a284e28c.json"
 }

package/artifacts/contracts/type/String.sol/StrLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/7c2b910852397af65cbc23034f863f80.json"
+  "buildInfo": "../../../build-info/a19f266ef259651b9fce93c8a284e28c.json"
 }

package/artifacts/contracts/type/Timestamp.sol/TimestampLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/7c2b910852397af65cbc23034f863f80.json"
+  "buildInfo": "../../../build-info/a19f266ef259651b9fce93c8a284e28c.json"
 }

package/artifacts/contracts/type/UFixed.sol/MathLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/7c2b910852397af65cbc23034f863f80.json"
+  "buildInfo": "../../../build-info/a19f266ef259651b9fce93c8a284e28c.json"
 }

package/artifacts/contracts/type/UFixed.sol/UFixedLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/7c2b910852397af65cbc23034f863f80.json"
+  "buildInfo": "../../../build-info/a19f266ef259651b9fce93c8a284e28c.json"
 }

package/artifacts/contracts/type/Version.sol/VersionLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/7c2b910852397af65cbc23034f863f80.json"
+  "buildInfo": "../../../build-info/a19f266ef259651b9fce93c8a284e28c.json"
 }

package/artifacts/contracts/type/Version.sol/VersionPartLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/7c2b910852397af65cbc23034f863f80.json"
+  "buildInfo": "../../../build-info/a19f266ef259651b9fce93c8a284e28c.json"
 }

package/artifacts/contracts/upgradeability/IVersionable.sol/IVersionable.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/7c2b910852397af65cbc23034f863f80.json"
+  "buildInfo": "../../../build-info/a19f266ef259651b9fce93c8a284e28c.json"
 }

package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/7c2b910852397af65cbc23034f863f80.json"
+  "buildInfo": "../../../build-info/a19f266ef259651b9fce93c8a284e28c.json"
 }

package/artifacts/contracts/upgradeability/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/7c2b910852397af65cbc23034f863f80.json"
+  "buildInfo": "../../../build-info/a19f266ef259651b9fce93c8a284e28c.json"
 }

package/artifacts/contracts/upgradeability/Versionable.sol/Versionable.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/7c2b910852397af65cbc23034f863f80.json"
+  "buildInfo": "../../../build-info/a19f266ef259651b9fce93c8a284e28c.json"
 }

package/contracts/distribution/DistributionService.sol

@@ -171,7 +171,7 @@ contract DistributionService is
         if (bytes(code).length == 0) {
             revert ErrorIDistributionServiceInvalidReferral(code);
         }
-        if (expiryAt.eqz()) {
+        if (expiryAt.eqz() || expiryAt.lte(TimestampLib.blockTimestamp())) {
             revert ErrorIDistributionServiceExpirationInvalid(expiryAt);
         }
 

package/contracts/examples/fire/FirePool.sol

@@ -1,14 +1,12 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {Amount, AmountLib} from "../../type/Amount.sol";
+import {Amount} from "../../type/Amount.sol";
 import {BasicPool} from "../../pool/BasicPool.sol";
-import {BasicPoolAuthorization} from "../../pool/BasicPoolAuthorization.sol";
 import {Fee} from "../../type/Fee.sol";
 import {IAuthorization} from "../../authorization/IAuthorization.sol";
 import {NftId} from "../../type/NftId.sol";
 import {Seconds} from "../../type/Timestamp.sol";
-import {UFixed} from "../../type/UFixed.sol";
 
 contract FirePool is
     BasicPool
@@ -16,7 +14,7 @@ contract FirePool is
     
     constructor(
         address registry,
-        NftId instanceNftId,
+        NftId fireProductNftId,
         string memory componentName,
         address token,
         IAuthorization authorization
@@ -25,7 +23,7 @@ contract FirePool is
         address initialOwner = msg.sender;
         _intialize(
             registry,
-            instanceNftId,
+            fireProductNftId,
             componentName,
             token,
             authorization,
@@ -34,7 +32,7 @@ contract FirePool is
 
     function _intialize(
         address registry,
-        NftId instanceNftId,
+        NftId fireProductNftId,
         string memory componentName,
         address token,
         IAuthorization authorization,
@@ -45,7 +43,7 @@ contract FirePool is
     {
         _initializeBasicPool(
             registry,
-            instanceNftId,
+            fireProductNftId,
             authorization,
             token,
             componentName,

package/contracts/examples/fire/FireProduct.sol

@@ -65,7 +65,6 @@ contract FireProduct is
         NftId instanceNftid,
         string memory componentName,
         address token,
-        address pool,
         IAuthorization authorization
     )
     {
@@ -76,7 +75,6 @@ contract FireProduct is
             instanceNftid,
             componentName,
             token,
-            pool,
             authorization,
             initialOwner);
     }
@@ -86,7 +84,6 @@ contract FireProduct is
         NftId instanceNftid,
         string memory componentName,
         address token,
-        address pool,
         IAuthorization authorization,
         address initialOwner
     )

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/InstanceService.sol

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

package/contracts/pool/BundleService.sol

@@ -63,8 +63,9 @@ contract BundleService is
     )
         external
         virtual
-        onlyNftOfType(bundleNftId, BUNDLE())
     {
+        _checkNftType(bundleNftId, BUNDLE());
+
         (NftId poolNftId,, IInstance instance) = _getAndVerifyActiveComponent(POOL());
         InstanceReader instanceReader = instance.getInstanceReader();
         IBundle.BundleInfo memory bundleInfo = instanceReader.getBundleInfo(bundleNftId);
@@ -93,9 +94,10 @@ contract BundleService is
         external
         override
         restricted
-        onlyNftOfType(poolNftId, POOL())
         returns(NftId bundleNftId)
     {
+        _checkNftType(poolNftId, POOL());
+
         // register bundle with registry
         bundleNftId = _registryService.registerBundle(
             IRegistry.ObjectInfo(
@@ -149,9 +151,10 @@ contract BundleService is
         external
         virtual
         restricted()
-        onlyNftOfType(policyNftId, POLICY())
-        onlyNftOfType(bundleNftId, BUNDLE())
     {
+        _checkNftType(policyNftId, POLICY());
+        _checkNftType(bundleNftId, BUNDLE());
+
         InstanceReader instanceReader = instance.getInstanceReader();
 
         {
@@ -191,8 +194,9 @@ contract BundleService is
     function lock(NftId bundleNftId) 
         external
         virtual
-        onlyNftOfType(bundleNftId, BUNDLE())
     {
+        _checkNftType(bundleNftId, BUNDLE());
+
         (,, IInstance instance) = _getAndVerifyActiveComponent(POOL());
 
         // udpate bundle state
@@ -209,8 +213,9 @@ contract BundleService is
     function unlock(NftId bundleNftId) 
         external
         virtual
-        onlyNftOfType(bundleNftId, BUNDLE())
     {
+        _checkNftType(bundleNftId, BUNDLE());
+
         (,, IInstance instance) = _getAndVerifyActiveComponent(POOL());
 
         // udpate bundle state
@@ -231,9 +236,10 @@ contract BundleService is
         external
         virtual
         restricted
-        onlyNftOfType(bundleNftId, BUNDLE())
         returns (Amount unstakedAmount, Amount feeAmount)
     {
+        _checkNftType(bundleNftId, BUNDLE());
+
         InstanceReader instanceReader = instance.getInstanceReader();
 
         // ensure no open policies attached to bundle
@@ -265,9 +271,10 @@ contract BundleService is
     ) 
         external 
         virtual
-        onlyNftOfType(bundleNftId, BUNDLE())
         // TODO: restricted() (once #462 is done)
     {
+        _checkNftType(bundleNftId, BUNDLE());
+
         IBundle.BundleInfo memory bundleInfo = instance.getInstanceReader().getBundleInfo(bundleNftId);
         StateId bundleState = instance.getInstanceReader().getBundleState(bundleNftId);
 
@@ -292,10 +299,11 @@ contract BundleService is
     ) 
         external 
         virtual
-        onlyNftOfType(bundleNftId, BUNDLE())
         // TODO: restricted() (once #462 is done)
         returns (Amount unstakedAmount)
     {
+        _checkNftType(bundleNftId, BUNDLE());
+
         InstanceStore instanceStore = instance.getInstanceStore();
         (
             Amount balanceAmount,
@@ -327,10 +335,11 @@ contract BundleService is
     function extend(NftId bundleNftId, Seconds lifetimeExtension) 
         external 
         virtual
-        onlyNftOfType(bundleNftId, BUNDLE())
         // TODO: restricted() (once #462 is done)
         returns (Timestamp extendedExpiredAt) 
     {
+        _checkNftType(bundleNftId, BUNDLE());
+
         (NftId poolNftId,, IInstance instance) = _getAndVerifyActiveComponent(POOL());
         IBundle.BundleInfo memory bundleInfo = instance.getInstanceReader().getBundleInfo(bundleNftId);
         StateId bundleState = instance.getInstanceReader().getBundleState(bundleNftId);
@@ -367,9 +376,10 @@ contract BundleService is
         external
         virtual
         restricted()
-        onlyNftOfType(policyNftId, POLICY())
-        onlyNftOfType(bundleNftId, BUNDLE())
     {
+        _checkNftType(policyNftId, POLICY());
+        _checkNftType(bundleNftId, BUNDLE());
+
         instance.getInstanceStore().decreaseLocked(bundleNftId, collateralAmount);
     }
 
@@ -381,8 +391,9 @@ contract BundleService is
         external
         virtual
         restricted
-        onlyNftOfType(policyNftId, POLICY())
     {
+        _checkNftType(policyNftId, POLICY());
+
         // ensure policy is closeable
         if (!policyIsCloseable(instance, policyNftId)) {
             revert ErrorBundleServicePolicyNotCloseable(policyNftId);
@@ -395,10 +406,11 @@ contract BundleService is
     function withdrawBundleFees(NftId bundleNftId, Amount amount) 
         public 
         virtual
-        onlyNftOfType(bundleNftId, BUNDLE())
         // TODO: restricted() (once #462 is done)
         returns (Amount withdrawnAmount) 
     {
+        _checkNftType(bundleNftId, BUNDLE());
+
         (NftId poolNftId,, IInstance instance) = _getAndVerifyActiveComponent(POOL());
         InstanceReader reader = instance.getInstanceReader();
         
@@ -438,9 +450,10 @@ contract BundleService is
     function policyIsCloseable(IInstance instance, NftId policyNftId)
         public
         view
-        onlyNftOfType(policyNftId, POLICY())
         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)

package/contracts/product/ApplicationService.sol

@@ -135,9 +135,10 @@ contract ApplicationService is
         external
         virtual
         nonReentrant()
-        onlyNftOfType(bundleNftId, BUNDLE())
         returns (NftId applicationNftId)
     {
+        _checkNftType(bundleNftId, BUNDLE());
+
         (NftId productNftId,, IInstance instance) = _getAndVerifyActiveComponent(PRODUCT());
 
         // check if provided references are valid and linked to calling product contract
@@ -212,10 +213,10 @@ contract ApplicationService is
         external
         virtual
         nonReentrant()
-        onlyNftOfType(policyNftId, POLICY())
-        onlyNftOfType(bundleNftId, BUNDLE())
         returns (NftId applicationNftId)
     {
+        _checkNftType(policyNftId, POLICY());
+        _checkNftType(bundleNftId, BUNDLE());
         // TODO implement
     }
 
@@ -232,9 +233,9 @@ contract ApplicationService is
         external
         virtual
         nonReentrant()
-        onlyNftOfType(applicationNftId, POLICY())
-        onlyNftOfType(bundleNftId, BUNDLE())
     {
+        _checkNftType(applicationNftId, POLICY());
+        _checkNftType(bundleNftId, BUNDLE());
         // TODO implement
     }
 
@@ -242,8 +243,9 @@ contract ApplicationService is
         external
         virtual
         nonReentrant()
-        onlyNftOfType(applicationNftId, POLICY())
     {
+        _checkNftType(applicationNftId, POLICY());
+
         (,, IInstance instance) = _getAndVerifyActiveComponent(PRODUCT());
         instance.getInstanceStore().updateApplicationState(applicationNftId, REVOKED());
     }

package/contracts/product/ClaimService.sol

@@ -60,10 +60,11 @@ contract ClaimService is
     )
         external
         virtual
-        onlyNftOfType(policyNftId, POLICY())
         // nonReentrant() // prevents creating a reinsurance claim in a single tx
         returns (ClaimId claimId)
     {
+        _checkNftType(policyNftId, POLICY());
+
         (
             ,
             IInstance instance,,
@@ -117,9 +118,10 @@ contract ClaimService is
     )
         external
         virtual
-        onlyNftOfType(policyNftId, POLICY())
         // nonReentrant() // prevents creating a reinsurance claim in a single tx
     {
+        _checkNftType(policyNftId, POLICY());
+
         (
             NftId productNftId,
             IInstance instance,
@@ -162,9 +164,10 @@ contract ClaimService is
     )
         external
         virtual
-        onlyNftOfType(policyNftId, POLICY())
         // nonReentrant() // prevents creating a reinsurance claim in a single tx
     {
+        _checkNftType(policyNftId, POLICY());
+
         (
             ,
             IInstance instance,
@@ -194,9 +197,10 @@ contract ClaimService is
     )
         external
         virtual
-        onlyNftOfType(policyNftId, POLICY())
         // nonReentrant() // prevents creating a reinsurance claim in a single tx
     {
+        _checkNftType(policyNftId, POLICY());
+        
         (
             ,
             IInstance instance,
@@ -224,9 +228,10 @@ contract ClaimService is
     )
         external
         virtual
-        onlyNftOfType(policyNftId, POLICY())
         // nonReentrant() // prevents creating a reinsurance claim in a single tx
     {
+        _checkNftType(policyNftId, POLICY());
+        
         (
             ,
             IInstance instance,
@@ -269,10 +274,11 @@ contract ClaimService is
     )
         external
         virtual
-        onlyNftOfType(policyNftId, POLICY())
         // nonReentrant() // prevents creating a reinsurance claim in a single tx
         returns (PayoutId payoutId)
     {
+        _checkNftType(policyNftId, POLICY());
+        
         if (beneficiary == address(0)) {
             revert ErrorClaimServiceBeneficiaryIsZero(policyNftId, claimId);
         }
@@ -294,10 +300,11 @@ contract ClaimService is
     )
         external
         virtual
-        onlyNftOfType(policyNftId, POLICY())
         // nonReentrant() // prevents creating a reinsurance payout in a single tx
         returns (PayoutId payoutId)
     {
+        _checkNftType(policyNftId, POLICY());
+        
         return _createPayout(
             policyNftId, 
             claimId, 
@@ -313,9 +320,10 @@ contract ClaimService is
     )
         external
         virtual
-        onlyNftOfType(policyNftId, POLICY())
         // nonReentrant() // prevents creating a reinsurance payout in a single tx
     {
+        _checkNftType(policyNftId, POLICY());
+        
         (
             ,
             IInstance instance,

package/contracts/product/PolicyService.sol

@@ -15,7 +15,7 @@ import {Amount, AmountLib} from "../type/Amount.sol";
 import {Timestamp, TimestampLib, zeroTimestamp} from "../type/Timestamp.sol";
 import {ObjectType, APPLICATION, COMPONENT, DISTRIBUTION, PRODUCT, POOL, POLICY, BUNDLE, CLAIM, PRICE} from "../type/ObjectType.sol";
 import {APPLIED, COLLATERALIZED, KEEP_STATE, CLOSED, DECLINED, PAID} from "../type/StateId.sol";
-import {NftId, NftIdLib} from "../type/NftId.sol";
+import {NftId} from "../type/NftId.sol";
 import {ReferralId} from "../type/Referral.sol";
 import {StateId} from "../type/StateId.sol";
 import {VersionPart} from "../type/Version.sol";
@@ -38,10 +38,7 @@ contract PolicyService is
     ComponentVerifyingService, 
     IPolicyService
 {
-    IApplicationService internal _applicationService;
     IComponentService internal _componentService;
-    IBundleService internal _bundleService;
-    IClaimService internal _claimService;
     IDistributionService internal _distributionService;
     IPoolService internal _poolService;
     IPricingService internal _pricingService;
@@ -62,10 +59,7 @@ contract PolicyService is
         _initializeService(registryAddress, authority, owner);
 
         VersionPart majorVersion = getVersion().toMajorPart();
-        _applicationService = IApplicationService(getRegistry().getServiceAddress(APPLICATION(), majorVersion));
-        _bundleService = IBundleService(getRegistry().getServiceAddress(BUNDLE(), majorVersion));
         _componentService = IComponentService(getRegistry().getServiceAddress(COMPONENT(), majorVersion));
-        _claimService = IClaimService(getRegistry().getServiceAddress(CLAIM(), majorVersion));
         _poolService = IPoolService(getRegistry().getServiceAddress(POOL(), majorVersion));
         _distributionService = IDistributionService(getRegistry().getServiceAddress(DISTRIBUTION(), majorVersion));
         _pricingService = IPricingService(getRegistry().getServiceAddress(PRICE(), majorVersion));
@@ -81,6 +75,8 @@ contract PolicyService is
         virtual
         nonReentrant()
     {
+        _checkNftType(applicationNftId, POLICY());
+
         (NftId productNftId,, IInstance instance) = _getAndVerifyActiveComponent(PRODUCT());
         InstanceReader instanceReader = instance.getInstanceReader();
 
@@ -117,6 +113,8 @@ contract PolicyService is
         virtual
         nonReentrant()
     {
+        _checkNftType(applicationNftId, POLICY());
+
         // check caller is registered product
         (NftId productNftId,, IInstance instance) = _getAndVerifyActiveComponent(PRODUCT());
         InstanceReader instanceReader = instance.getInstanceReader();
@@ -202,6 +200,8 @@ contract PolicyService is
         virtual
         nonReentrant()
     {
+        _checkNftType(policyNftId, POLICY());
+
         // check caller is registered product
         (,, IInstance instance) = _getAndVerifyActiveComponent(PRODUCT());
         InstanceReader instanceReader = instance.getInstanceReader();
@@ -246,6 +246,8 @@ contract PolicyService is
         virtual
         nonReentrant()
     {
+        _checkNftType(policyNftId, POLICY());
+
         // check caller is registered product
         (,, IInstance instance) = _getAndVerifyActiveComponent(PRODUCT());
         InstanceReader instanceReader = instance.getInstanceReader();
@@ -273,6 +275,8 @@ contract PolicyService is
         nonReentrant()
         returns (Timestamp expiredAt)
     {
+        _checkNftType(policyNftId, POLICY());
+
         (NftId productNftId,, IInstance instance) = _getAndVerifyActiveComponent(PRODUCT());
         
         // check policy matches with calling product
@@ -302,6 +306,8 @@ contract PolicyService is
         nonReentrant()
         returns (Timestamp expiredAt)
     {
+        _checkNftType(policyNftId, POLICY());
+
         return _expire(
             instance,
             policyNftId,
@@ -361,6 +367,8 @@ contract PolicyService is
         virtual
         nonReentrant()
     {
+        _checkNftType(policyNftId, POLICY());
+        
         (,, IInstance instance) = _getAndVerifyActiveComponent(PRODUCT());
         InstanceReader instanceReader = instance.getInstanceReader();
 

package/contracts/product/PricingService.sol

@@ -9,7 +9,7 @@ import {NftId} from "../type/NftId.sol";
 import {Fee} from "../type/Fee.sol";
 import {ReferralId} from "../type/Referral.sol";
 import {RiskId} from "../type/RiskId.sol";
-import {PRODUCT, DISTRIBUTION, PRICE} from "../type/ObjectType.sol";
+import {PRODUCT, BUNDLE, DISTRIBUTION, PRICE} from "../type/ObjectType.sol";
 import {IRegistry} from "../registry/IRegistry.sol";
 
 import {IProductComponent} from "./IProductComponent.sol";
@@ -70,6 +70,9 @@ contract PricingService is
             IPolicy.PremiumInfo memory premium
         )
     {
+        _checkNftType(productNftId, PRODUCT());
+        _checkNftType(bundleNftId, BUNDLE());
+
         InstanceReader reader;
         Amount netPremiumAmount;