@etherisc/gif-next 0.0.2-93a7619-595 → 0.0.2-93ee1cf-782

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";
@@ -31,11 +31,8 @@ contract PricingService is
     ComponentVerifyingService, 
     IPricingService
 {
-    using UFixedLib for UFixed;
-
     IDistributionService internal _distributionService;
 
-
     function _initialize(
         address owner, 
         bytes memory data
@@ -73,6 +70,9 @@ contract PricingService is
             IPolicy.PremiumInfo memory premium
         )
     {
+        _checkNftType(productNftId, PRODUCT());
+        _checkNftType(bundleNftId, BUNDLE());
+
         InstanceReader reader;
         Amount netPremiumAmount;
 
@@ -101,7 +101,7 @@ contract PricingService is
 
             IBundle.BundleInfo memory bundleInfo = reader.getBundleInfo(bundleNftId);
             if(bundleInfo.poolNftId != productInfo.poolNftId) {
-                revert ErrorIPricingServiceBundlePoolMismatch(bundleNftId, bundleInfo.poolNftId, productInfo.poolNftId);
+                revert ErrorPricingServiceBundlePoolMismatch(bundleNftId, bundleInfo.poolNftId, productInfo.poolNftId);
             }
 
             // calculate fixed fees for product, pool, bundle
@@ -138,7 +138,7 @@ contract PricingService is
             }
 
             if (premium.distributionOwnerFeeFixAmount.toInt() < productInfo.minDistributionOwnerFee.fixedFee) {
-                revert ErrorIPricingServiceFeeCalculationMismatch( 
+                revert ErrorPricingServiceFeeCalculationMismatch( 
                     premium.distributionFeeFixAmount,
                     premium.distributionFeeVarAmount,
                     premium.distributionOwnerFeeFixAmount,
@@ -149,7 +149,7 @@ contract PricingService is
             }
 
             if ((premium.distributionFeeVarAmount) != (premium.discountAmount + premium.distributionOwnerFeeVarAmount + premium.commissionAmount)) {
-                revert ErrorIPricingServiceFeeCalculationMismatch(
+                revert ErrorPricingServiceFeeCalculationMismatch(
                     premium.distributionFeeFixAmount,
                     premium.distributionFeeVarAmount,
                     premium.distributionOwnerFeeFixAmount,
@@ -239,7 +239,7 @@ contract PricingService is
     {
 
         // if the referral is not valid, then the distribution owner gets everything
-        if (! _distributionService.referralIsValid(productInfo.distributionNftId, referralId)) {
+        if (productInfo.distributionNftId.eqz() || ! _distributionService.referralIsValid(productInfo.distributionNftId, referralId)) {
             premium.distributionOwnerFeeFixAmount = premium.distributionFeeFixAmount;
             premium.distributionOwnerFeeVarAmount = premium.distributionFeeVarAmount;
             premium.premiumAmount = premium.fullPremiumAmount;

package/contracts/product/Product.sol

@@ -3,20 +3,23 @@ pragma solidity ^0.8.20;
 
 import {Amount, AmountLib} from "../type/Amount.sol";
 import {ClaimId} from "../type/ClaimId.sol";
-import {InstanceLinkedComponent} from "../shared/InstanceLinkedComponent.sol";
+import {IComponent} from "../shared/IComponent.sol";
 import {Fee, FeeLib} from "../type/Fee.sol";
 import {IRisk} from "../instance/module/IRisk.sol";
 import {IApplicationService} from "./IApplicationService.sol";
 import {IAuthorization} from "../authorization/IAuthorization.sol";
 import {IComponentService} from "../shared/IComponentService.sol";
+import {InstanceLinkedComponent} from "../shared/InstanceLinkedComponent.sol";
+import {IInstanceLinkedComponent} from "../shared/IInstanceLinkedComponent.sol";
 import {IPolicyService} from "./IPolicyService.sol";
 import {IRiskService} from "./IRiskService.sol";
 import {IClaimService} from "./IClaimService.sol";
 import {IPricingService} from "./IPricingService.sol";
 import {IProductComponent} from "./IProductComponent.sol";
-import {NftId} from "../type/NftId.sol";
+import {NftId, NftIdLib} from "../type/NftId.sol";
+import {ObjectType, COMPONENT, DISTRIBUTION, ORACLE, POOL, PRODUCT, BUNDLE, APPLICATION, POLICY, CLAIM, PRICE } from "../type/ObjectType.sol";
 import {PayoutId} from "../type/PayoutId.sol";
-import {COMPONENT, PRODUCT, APPLICATION, POLICY, CLAIM, PRICE } from "../type/ObjectType.sol";
+import {COMPONENT, PRODUCT, APPLICATION, POLICY, CLAIM, PRICE, BUNDLE, RISK } from "../type/ObjectType.sol";
 import {ReferralId} from "../type/Referral.sol";
 import {RiskId, RiskIdLib} from "../type/RiskId.sol";
 import {Seconds} from "../type/Seconds.sol";
@@ -25,8 +28,9 @@ import {Timestamp} from "../type/Timestamp.sol";
 
 import {IPolicy} from "../instance/module/IPolicy.sol";
 import {IComponents} from "../instance/module/IComponents.sol";
-import {Pool} from "../pool/Pool.sol";
-import {Distribution} from "../distribution/Distribution.sol";
+import {IDistributionComponent} from "../distribution/IDistributionComponent.sol";
+import {IOracleComponent} from "../oracle/IOracleComponent.sol";
+import {IPoolComponent} from "../pool/IPoolComponent.sol";
 
 abstract contract Product is
     InstanceLinkedComponent, 
@@ -36,26 +40,23 @@ abstract contract Product is
     bytes32 public constant PRODUCT_STORAGE_LOCATION_V1 = 0x0bb7aafdb8e380f81267337bc5b5dfdf76e6d3a380ecadb51ec665246d9d6800;
 
     struct ProductStorage {
+        IComponents.ProductInfo _productInfo;
+        IComponentService _componentService;
         IRiskService _riskService;
         IApplicationService _applicationService;
         IPolicyService _policyService;
         IClaimService _claimService;
         IPricingService _pricingService;
-        IComponentService _componentService;
-        NftId _poolNftId;
-        NftId _distributionNftId;
-        Pool _pool;
-        Distribution _distribution;
     }
 
 
-    function register()
+    function registerComponent(address component)
         external
         virtual
         onlyOwner()
+        returns (NftId componentNftId)
     {
-        _getProductStorage()._componentService.registerProduct();
-        _approveTokenHandler(type(uint256).max);
+        return _getProductStorage()._componentService.registerComponent(component);
     }
 
 
@@ -67,6 +68,7 @@ abstract contract Product is
         external
         virtual
         restricted() // pool service role
+        onlyNftOfType(policyNftId, POLICY())
     {
         // default implementation does nothing
     }
@@ -83,6 +85,7 @@ abstract contract Product is
         public 
         view 
         override 
+        onlyNftOfType(bundleNftId, BUNDLE())
         returns (Amount premiumAmount)
     {
         IPolicy.PremiumInfo memory premium = _getProductStorage()._pricingService.calculatePremium(
@@ -120,35 +123,18 @@ abstract contract Product is
         view 
         returns (IComponents.ProductInfo memory poolInfo)
     {
-        ProductStorage storage $ = _getProductStorage();
-
-        return IComponents.ProductInfo({
-            distributionNftId: $._distributionNftId,
-            poolNftId: $._poolNftId,
-            isProcessingFundedClaims: false,
-            productFee: FeeLib.zero(),
-            processingFee: FeeLib.zero(),
-            distributionFee: FeeLib.zero(),
-            minDistributionOwnerFee: FeeLib.zero(),
-            poolFee: FeeLib.zero(),
-            stakingFee: FeeLib.zero(),
-            performanceFee: FeeLib.zero()
-        });
+        return _getProductStorage()._productInfo;
     }
 
 
     function _initializeProduct(
         address registry,
         NftId instanceNftId,
-        IAuthorization authorization,
-        address initialOwner,
         string memory name,
         address token,
-        bool isInterceptor,
-        address pool, // switch to pool nft id (#527)
-        address distribution, // switch to distribution nft id  (#527)
-        // add NftId [] oracleNftIds (#527)
-        bytes memory registryData, // writeonly data that will saved in the object info record of the registry
+        IComponents.ProductInfo memory productInfo,
+        IAuthorization authorization,
+        address initialOwner,
         bytes memory componentData // writeonly data that will saved in the object info record of the registry
     )
         internal
@@ -162,24 +148,18 @@ abstract contract Product is
             token, 
             PRODUCT(), 
             authorization, 
-            isInterceptor, 
+            productInfo.isInterceptingPolicyTransfers, 
             initialOwner, 
-            registryData, 
             componentData);
 
         ProductStorage storage $ = _getProductStorage();
-        // TODO add validation
-        // TODO refactor to go via registry for all components linked to this product (#527)
-        $._riskService = IRiskService(_getServiceAddress(PRODUCT())); 
+        $._productInfo = productInfo;
+        $._riskService = IRiskService(_getServiceAddress(RISK())); 
         $._applicationService = IApplicationService(_getServiceAddress(APPLICATION())); 
         $._policyService = IPolicyService(_getServiceAddress(POLICY())); 
         $._claimService = IClaimService(_getServiceAddress(CLAIM())); 
         $._pricingService = IPricingService(_getServiceAddress(PRICE()));
         $._componentService = IComponentService(_getServiceAddress(COMPONENT()));
-        $._pool = Pool(pool);
-        $._distribution = Distribution(distribution);
-        $._poolNftId = getRegistry().getNftIdForAddress(pool);
-        $._distributionNftId = getRegistry().getNftIdForAddress(distribution);
 
         _registerInterface(type(IProductComponent).interfaceId);  
     }
@@ -199,8 +179,11 @@ abstract contract Product is
     function _createRisk(
         RiskId id,
         bytes memory data
-    ) internal {
-        _getRiskService().createRisk(
+    )
+        internal
+        virtual
+    {
+        _getProductStorage()._riskService.createRisk(
             id,
             data
         );
@@ -209,8 +192,11 @@ abstract contract Product is
     function _updateRisk(
         RiskId id,
         bytes memory data
-    ) internal {
-        _getRiskService().updateRisk(
+    )
+        internal
+        virtual
+    {
+        _getProductStorage()._riskService.updateRisk(
             id,
             data
         );
@@ -219,19 +205,17 @@ abstract contract Product is
     function _updateRiskState(
         RiskId id,
         StateId state
-    ) internal {
-        _getRiskService().updateRiskState(
+    )
+        internal
+        virtual
+    {
+        _getProductStorage()._riskService.updateRiskState(
             id,
             state
         );
     }
 
 
-    function _getRiskInfo(RiskId id) internal view returns (IRisk.RiskInfo memory info) {
-        return getInstance().getInstanceReader().getRiskInfo(id);
-    }
-
-
     function _createApplication(
         address applicationOwner,
         RiskId riskId,
@@ -243,6 +227,7 @@ abstract contract Product is
         bytes memory applicationData
     )
         internal
+        virtual
         returns (NftId applicationNftId) 
     {
         return _getProductStorage()._applicationService.create(
@@ -262,8 +247,10 @@ abstract contract Product is
         Timestamp activateAt
     )
         internal
+        virtual
+        returns (Amount premiumAmount)
     {
-        _getProductStorage()._policyService.createPolicy(
+        premiumAmount = _getProductStorage()._policyService.createPolicy(
             applicationNftId, 
             activateAt);
     }
@@ -272,6 +259,7 @@ abstract contract Product is
         NftId policyNftId
     )
         internal
+        virtual
     {
         _getProductStorage()._policyService.decline(
             policyNftId);
@@ -282,6 +270,7 @@ abstract contract Product is
         Timestamp expireAt
     )
         internal
+        virtual
         returns (Timestamp expiredAt)
     {
         expiredAt = _getProductStorage()._policyService.expire(policyNftId, expireAt);
@@ -292,6 +281,7 @@ abstract contract Product is
         Timestamp activateAt
     )
         internal
+        virtual
     {
         _getProductStorage()._policyService.collectPremium(
             policyNftId, 
@@ -303,6 +293,7 @@ abstract contract Product is
         Timestamp activateAt
     )
         internal
+        virtual
     {
         _getProductStorage()._policyService.activate(
             policyNftId, 
@@ -313,6 +304,7 @@ abstract contract Product is
         NftId policyNftId
     )
         internal
+        virtual
     {
         _getProductStorage()._policyService.close(
             policyNftId);
@@ -324,6 +316,7 @@ abstract contract Product is
         bytes memory claimData
     )
         internal
+        virtual
         returns(ClaimId)
     {
         return _getProductStorage()._claimService.submit(
@@ -339,6 +332,7 @@ abstract contract Product is
         bytes memory data
     )
         internal
+        virtual
     {
         _getProductStorage()._claimService.confirm(
             policyNftId,
@@ -353,6 +347,7 @@ abstract contract Product is
         bytes memory data
     )
         internal
+        virtual
     {
         _getProductStorage()._claimService.decline(
             policyNftId,
@@ -365,6 +360,7 @@ abstract contract Product is
         ClaimId claimId
     )
         internal
+        virtual
     {
         _getProductStorage()._claimService.close(
             policyNftId,
@@ -378,6 +374,7 @@ abstract contract Product is
         bytes memory data
     )
         internal
+        virtual
         returns (PayoutId)
     {
         return _getProductStorage()._claimService.createPayout(
@@ -395,6 +392,7 @@ abstract contract Product is
         bytes memory data
     )
         internal
+        virtual
         returns (PayoutId)
     {
         return _getProductStorage()._claimService.createPayoutForBeneficiary(
@@ -410,23 +408,20 @@ abstract contract Product is
         PayoutId payoutId
     )
         internal
+        virtual
     {
         _getProductStorage()._claimService.processPayout(
             policyNftId,
             payoutId);
     }
 
-    function _toRiskId(string memory riskName) internal pure returns (RiskId riskId) {
+    function _toRiskId(string memory riskName) internal virtual pure returns (RiskId riskId) {
         return RiskIdLib.toRiskId(riskName);
     }
 
-    function _getProductStorage() internal pure returns (ProductStorage storage $) {
+    function _getProductStorage() internal virtual pure returns (ProductStorage storage $) {
         assembly {
             $.slot := PRODUCT_STORAGE_LOCATION_V1
         }
     }
-
-    function _getRiskService() internal view returns (IRiskService) {
-        return _getProductStorage()._riskService;
-    }
 }

package/contracts/product/RiskService.sol

@@ -9,11 +9,12 @@ import {IRegistryService} from "../registry/IRegistryService.sol";
 import {IRisk} from "../instance/module/IRisk.sol";
 
 import {InstanceReader} from "../instance/InstanceReader.sol";
-import {ObjectType, INSTANCE, PRODUCT, POOL, POLICY, REGISTRY} from "../type/ObjectType.sol";
-import {KEEP_STATE} from "../type/StateId.sol";
+import {ObjectType, INSTANCE, PRODUCT, POOL, POLICY, REGISTRY, RISK} from "../type/ObjectType.sol";
+import {ACTIVE, PAUSED, KEEP_STATE} from "../type/StateId.sol";
 import {NftId} from "../type/NftId.sol";
 import {RiskId} from "../type/RiskId.sol";
 import {StateId} from "../type/StateId.sol";
+import {RiskSet} from "../instance/RiskSet.sol";
 import {ComponentVerifyingService} from "../shared/ComponentVerifyingService.sol";
 
 contract RiskService is
@@ -61,6 +62,10 @@ contract RiskService is
             riskId,
             riskInfo
         );
+
+        // add risk to RiskSet
+        RiskSet riskSet = instance.getRiskSet();
+        riskSet.add(riskId);
     }
 
 
@@ -87,10 +92,16 @@ contract RiskService is
     {
         (,, IInstance instance) = _getAndVerifyActiveComponent(PRODUCT());
         instance.getInstanceStore().updateRiskState(riskId, state);
+
+        if (state == ACTIVE()) {
+            instance.getRiskSet().activate(riskId);
+        } else if (state == PAUSED()) {
+            instance.getRiskSet().pause(riskId);
+        }
     }
 
 
     function _getDomain() internal pure override returns(ObjectType) {
-        return PRODUCT();
+        return RISK();
     }
 }

package/contracts/registry/ChainNft.sol

@@ -104,10 +104,6 @@ contract ChainNft is ERC721Enumerable {
         }
 
         _safeMintWithInterceptorAddress(to, tokenId, interceptor);
-
-        if(interceptor != address(0)) {
-            ITransferInterceptor(interceptor).nftMint(to, tokenId);
-        }
     }
 
 
@@ -115,11 +111,12 @@ contract ChainNft is ERC721Enumerable {
      * @dev amend the open zeppelin transferFrom function by an interceptor call if such an interceptor is defined for the nft token id
      * this allows distribution, product and pool components to be notified when distributors, policies and bundles are transferred.
      */
-    function transferFrom(address from, address to, uint256 tokenId) public override (ERC721, IERC721) {
+    function transferFrom(address from, address to, uint256 tokenId) public override (IERC721, ERC721) {
         super.transferFrom(from, to, tokenId);
 
         if (_interceptor[tokenId] != address(0)) {
-            ITransferInterceptor(_interceptor[tokenId]).nftTransferFrom(from, to, tokenId);
+            address operator = msg.sender;
+            ITransferInterceptor(_interceptor[tokenId]).nftTransferFrom(from, to, tokenId, operator);
         }
     }
 
@@ -241,10 +238,10 @@ contract ChainNft is ERC721Enumerable {
         address interceptor
     )
         private
-    {
-        emit LogTokenInterceptorAddress(tokenId, interceptor);
-        
+    {        
         _totalMinted++;
         _safeMint(to, tokenId);
+
+        emit LogTokenInterceptorAddress(tokenId, interceptor);
     }
 }

package/contracts/registry/IRegistry.sol

@@ -65,9 +65,6 @@ interface IRegistry is IERC165 {
         StateId state;
         VersionPart version;
         bytes32 salt;
-        address[] addresses;
-        string[] names;
-        ObjectType[] domains;
         IServiceAuthorization auth;
         Timestamp activatedAt;
         Timestamp disabledAt;
@@ -124,10 +121,16 @@ interface IRegistry is IERC165 {
 
     function ownerOf(NftId nftId) external view returns (address);
 
+    function isOwnerOf(NftId nftId, address expectedOwner) external view returns (bool);
+
     function ownerOf(address contractAddress) external view returns (address);
 
     function getObjectInfo(NftId nftId) external view returns (ObjectInfo memory info);
 
+    function isObjectType(NftId nftId, ObjectType expectedObjectType) external view returns (bool);
+
+    function isObjectType(address contractAddress, ObjectType expectedObjectType) external view returns (bool);
+
     function getObjectAddress(NftId nftId) external view returns (address objectAddress);
 
     /// @dev Returns the object info for the specified object address.

package/contracts/registry/IRegistryService.sol

@@ -21,10 +21,9 @@ interface IRegistryService is
 
      error ErrorRegistryServiceNotService(address notService);
      error ErrorRegistryServiceNotInstance(address notInstance);
-     error ErrorRegistryServiceNotComponent(address notComponent);
      error ErrorRegistryServiceNotProduct(address notProduct);
-     error ErrorRegistryServiceNotPool(address notPool);
-     error ErrorRegistryServiceNotDistribution(address notDistribution);
+     error ErrorRegistryServiceNotComponent(address notComponent);
+     error ErrorRegistryServiceNotProductLinkedComponent(address notProductLinkedComponent);
 
      error ErrorRegistryServiceRegisterableAddressInvalid(IRegisterable registerable, address found);
      error ErrorRegistryServiceRegisterableTypeInvalid(IRegisterable registerable, ObjectType expected, ObjectType found);
@@ -47,7 +46,10 @@ interface IRegistryService is
      function registerInstance(IRegisterable instance, address owner)
           external returns(IRegistry.ObjectInfo memory info); 
 
-     function registerComponent(IComponent component, ObjectType objectType, address owner)
+     function registerProduct(IComponent product, address owner)
+          external returns(IRegistry.ObjectInfo memory info);
+
+     function registerProductLinkedComponent(IComponent component, ObjectType objectType, address owner)
           external returns(IRegistry.ObjectInfo memory info);
 
      function registerDistributor(IRegistry.ObjectInfo memory info) external returns(NftId nftId);

package/contracts/registry/ITransferInterceptor.sol

@@ -2,6 +2,5 @@
 pragma solidity ^0.8.20;
 
 interface ITransferInterceptor {
-    function nftMint(address to, uint256 tokenId) external;
-    function nftTransferFrom(address from, address to, uint256 tokenId) external;
+    function nftTransferFrom(address from, address to, uint256 tokenId, address operator) external;
 }

package/contracts/registry/Registry.sol

@@ -13,6 +13,7 @@ import {ObjectType, ObjectTypeLib, PROTOCOL, REGISTRY, SERVICE, INSTANCE, STAKE,
 import {ChainNft} from "./ChainNft.sol";
 import {IRegistry} from "./IRegistry.sol";
 import {IRegisterable} from "../shared/IRegisterable.sol";
+import {IStaking} from "../staking/IStaking.sol";
 import {ReleaseRegistry} from "./ReleaseRegistry.sol";
 import {TokenRegistry} from "./TokenRegistry.sol";
 import {RegistryAdmin} from "./RegistryAdmin.sol";
@@ -342,6 +343,10 @@ contract Registry is
         return CHAIN_NFT.ownerOf(nftId.toInt());
     }
 
+    function isOwnerOf(NftId nftId, address expectedOwner) public view returns (bool) {
+        return CHAIN_NFT.ownerOf(nftId.toInt()) == expectedOwner;
+    }
+
     function ownerOf(address contractAddress) public view returns (address) {
         return CHAIN_NFT.ownerOf(_nftIdByAddress[contractAddress].toInt());
     }
@@ -350,6 +355,15 @@ contract Registry is
         return _info[nftId];
     }
 
+    function isObjectType(address contractAddress, ObjectType expectedObjectType) external view returns (bool) {
+        NftId nftId = _nftIdByAddress[contractAddress];
+        return isObjectType(nftId, expectedObjectType);
+    }
+
+    function isObjectType(NftId nftId, ObjectType expectedObjectType) public view returns (bool) {
+        return _info[nftId].objectType == expectedObjectType;
+    }
+
     function getObjectAddress(NftId nftId) external view returns (address) {
         return _info[nftId].objectAddress;
     }
@@ -627,6 +641,8 @@ contract Registry is
                 initialOwner: stakingOwner,
                 data: ""}),
             true); 
+
+        IStaking(_stakingAddress).initializeTokenHandler();
     }
 
     /// @dev Register the provided object info for the specified NFT ID.
@@ -691,13 +707,15 @@ contract Registry is
 
         // components with instance parent
         _coreContractCombinations[PRODUCT()][INSTANCE()] = true;
-        _coreContractCombinations[DISTRIBUTION()][INSTANCE()] = true;
-        _coreContractCombinations[ORACLE()][INSTANCE()] = true;
-        _coreContractCombinations[POOL()][INSTANCE()] = true;
+
+        // components with product parent
+        _coreContractCombinations[DISTRIBUTION()][PRODUCT()] = true;
+        _coreContractCombinations[ORACLE()][PRODUCT()] = true;
+        _coreContractCombinations[POOL()][PRODUCT()] = true;
 
         // objects with component parents
-        _coreObjectCombinations[DISTRIBUTOR()][DISTRIBUTION()] = true;
         _coreObjectCombinations[POLICY()][PRODUCT()] = true;
+        _coreObjectCombinations[DISTRIBUTOR()][DISTRIBUTION()] = true;
         _coreObjectCombinations[BUNDLE()][POOL()] = true;
 
         // staking