@etherisc/gif-next 0.0.2-b3e9a44-364 → 0.0.2-b43fece-589

package/contracts/product/Product.sol

@@ -3,18 +3,21 @@ 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, BUNDLE } from "../type/ObjectType.sol";
 import {ReferralId} from "../type/Referral.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);
     }
 
 
@@ -122,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
@@ -164,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)
+        $._productInfo = productInfo;
         $._riskService = IRiskService(_getServiceAddress(PRODUCT())); 
         $._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);  
     }
@@ -201,8 +179,11 @@ abstract contract Product is
     function _createRisk(
         RiskId id,
         bytes memory data
-    ) internal {
-        _getRiskService().createRisk(
+    )
+        internal
+        virtual
+    {
+        _getProductStorage()._riskService.createRisk(
             id,
             data
         );
@@ -211,8 +192,11 @@ abstract contract Product is
     function _updateRisk(
         RiskId id,
         bytes memory data
-    ) internal {
-        _getRiskService().updateRisk(
+    )
+        internal
+        virtual
+    {
+        _getProductStorage()._riskService.updateRisk(
             id,
             data
         );
@@ -221,15 +205,18 @@ 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) {
+    function _getRiskInfo(RiskId id) internal virtual view returns (IRisk.RiskInfo memory info) {
         return getInstance().getInstanceReader().getRiskInfo(id);
     }
 
@@ -245,6 +232,7 @@ abstract contract Product is
         bytes memory applicationData
     )
         internal
+        virtual
         returns (NftId applicationNftId) 
     {
         return _getProductStorage()._applicationService.create(
@@ -264,6 +252,7 @@ abstract contract Product is
         Timestamp activateAt
     )
         internal
+        virtual
     {
         _getProductStorage()._policyService.createPolicy(
             applicationNftId, 
@@ -274,6 +263,7 @@ abstract contract Product is
         NftId policyNftId
     )
         internal
+        virtual
     {
         _getProductStorage()._policyService.decline(
             policyNftId);
@@ -284,6 +274,7 @@ abstract contract Product is
         Timestamp expireAt
     )
         internal
+        virtual
         returns (Timestamp expiredAt)
     {
         expiredAt = _getProductStorage()._policyService.expire(policyNftId, expireAt);
@@ -294,6 +285,7 @@ abstract contract Product is
         Timestamp activateAt
     )
         internal
+        virtual
     {
         _getProductStorage()._policyService.collectPremium(
             policyNftId, 
@@ -305,6 +297,7 @@ abstract contract Product is
         Timestamp activateAt
     )
         internal
+        virtual
     {
         _getProductStorage()._policyService.activate(
             policyNftId, 
@@ -315,6 +308,7 @@ abstract contract Product is
         NftId policyNftId
     )
         internal
+        virtual
     {
         _getProductStorage()._policyService.close(
             policyNftId);
@@ -326,6 +320,7 @@ abstract contract Product is
         bytes memory claimData
     )
         internal
+        virtual
         returns(ClaimId)
     {
         return _getProductStorage()._claimService.submit(
@@ -341,6 +336,7 @@ abstract contract Product is
         bytes memory data
     )
         internal
+        virtual
     {
         _getProductStorage()._claimService.confirm(
             policyNftId,
@@ -355,6 +351,7 @@ abstract contract Product is
         bytes memory data
     )
         internal
+        virtual
     {
         _getProductStorage()._claimService.decline(
             policyNftId,
@@ -367,6 +364,7 @@ abstract contract Product is
         ClaimId claimId
     )
         internal
+        virtual
     {
         _getProductStorage()._claimService.close(
             policyNftId,
@@ -380,6 +378,7 @@ abstract contract Product is
         bytes memory data
     )
         internal
+        virtual
         returns (PayoutId)
     {
         return _getProductStorage()._claimService.createPayout(
@@ -397,6 +396,7 @@ abstract contract Product is
         bytes memory data
     )
         internal
+        virtual
         returns (PayoutId)
     {
         return _getProductStorage()._claimService.createPayoutForBeneficiary(
@@ -412,23 +412,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/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;

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

@@ -699,13 +699,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

package/contracts/registry/RegistryAdmin.sol

@@ -115,21 +115,6 @@ contract RegistryAdmin is
             address(service)); 
     }
 
-    function revokeServiceRole(
-        IService service,
-        ObjectType domain, 
-        VersionPart version
-    )
-        external
-        restricted()
-    {
-        _revokeRoleFromAccount(
-            RoleIdLib.roleForTypeAndVersion(
-                domain, 
-                version), 
-            address(service));
-    }
-
     function grantServiceRoleForAllVersions(IService service, ObjectType domain)
         external
         restricted()
@@ -139,13 +124,11 @@ contract RegistryAdmin is
             address(service)); 
     }
 
-    function revokeServiceRoleForAllVersions(IService service, ObjectType domain)
+    function setServiceLocked(IService service, bool locked)
         external
         restricted()
     {
-        _revokeRoleFromAccount(
-            RoleIdLib.roleForTypeAndAllVersions(domain), 
-            address(service));
+        _setTargetClosed(address(service), locked);
     }
 
     /*function transferAdmin(address to)
@@ -188,6 +171,8 @@ contract RegistryAdmin is
             true,
             false);
 
+        _setTargetClosed(address(service), true);
+
         // create service role
         RoleId serviceRoleId = RoleIdLib.roleForTypeAndVersion(
             serviceDomain, 
@@ -330,12 +315,11 @@ contract RegistryAdmin is
                 name: RELEASE_REGISTRY_ROLE_NAME}));
 
         FunctionInfo[] memory functions;
-        functions = new FunctionInfo[](5);
+        functions = new FunctionInfo[](4);
         functions[0] = toFunction(RegistryAdmin.authorizeService.selector, "authorizeService");
         functions[1] = toFunction(RegistryAdmin.grantServiceRoleForAllVersions.selector, "grantServiceRoleForAllVersions");
-        functions[2] = toFunction(RegistryAdmin.revokeServiceRoleForAllVersions.selector, "revokeServiceRoleForAllVersions");
-        functions[3] = toFunction(RegistryAdmin.grantServiceRole.selector, "grantServiceRole");
-        functions[4] = toFunction(RegistryAdmin.revokeServiceRole.selector, "revokeServiceRole");
+        functions[2] = toFunction(RegistryAdmin.grantServiceRole.selector, "grantServiceRole");
+        functions[3] = toFunction(RegistryAdmin.setServiceLocked.selector, "setServiceLocked");
         _authorizeTargetFunctions(address(this), releaseRegistryRoleId, functions);
 
         _grantRoleToAccount(releaseRegistryRoleId, _releaseRegistry);

package/contracts/registry/RegistryService.sol

@@ -18,8 +18,6 @@ contract RegistryService is
     Service,
     IRegistryService
 {
-    using NftIdLib for NftId;
-
     // TODO update to real hash when registry is stable
     bytes32 public constant REGISTRY_CREATION_CODE_HASH = bytes32(0);
 
@@ -60,7 +58,7 @@ contract RegistryService is
     function registerInstance(IRegisterable instance, address owner)
         external
         virtual
-        restricted
+        restricted()
         returns(
             IRegistry.ObjectInfo memory info
         ) 
@@ -75,29 +73,33 @@ contract RegistryService is
         instance.linkToRegisteredNftId(); // asume safe
     }
 
-    // function registerProduct(IComponent product, address owner)
-    //     external
-    //     restricted
-    //     returns(
-    //         IRegistry.ObjectInfo memory info
-    //     ) 
-    // {
-    //     // CAN revert if no ERC165 support -> will revert with empty message 
-    //     if(!product.supportsInterface(type(IProductComponent).interfaceId)) {
-    //         revert ErrorRegistryServiceNotProduct(address(product));
-    //     }
-
-    //     info = _getAndVerifyContractInfo(product, PRODUCT(), owner);
-    //     info.nftId = getRegistry().register(info);
-    // }
-
-    function registerComponent(
+    function registerProduct(
+        IComponent product, 
+        address initialOwner
+    )
+        external
+        virtual
+        restricted()
+        returns(
+            IRegistry.ObjectInfo memory info
+        ) 
+    {
+        if(!product.supportsInterface(type(IProductComponent).interfaceId)) {
+            revert ErrorRegistryServiceNotProduct(address(product));
+        }
+
+        info = _getAndVerifyContractInfo(product, PRODUCT(), initialOwner);
+        info.nftId = getRegistry().register(info);
+    }
+
+    function registerProductLinkedComponent(
         IComponent component, 
         ObjectType objectType,
         address initialOwner
     )
         external
-        restricted
+        virtual
+        restricted()
         returns(
             IRegistry.ObjectInfo memory info
         ) 
@@ -107,43 +109,18 @@ contract RegistryService is
             revert ErrorRegistryServiceNotComponent(address(component));
         }
 
+        if (!(objectType == DISTRIBUTION() || objectType == ORACLE() || objectType == POOL())) {
+            revert ErrorRegistryServiceNotProductLinkedComponent(address(component));
+        }
+
         info = _getAndVerifyContractInfo(component, objectType, initialOwner);
         info.nftId = getRegistry().register(info);
     }
 
-    // function registerPool(IComponent pool, address owner)
-    //     external
-    //     restricted
-    //     returns(
-    //         IRegistry.ObjectInfo memory info
-    //     ) 
-    // {
-    //     if(!pool.supportsInterface(type(IPoolComponent).interfaceId)) {
-    //         revert ErrorRegistryServiceNotPool(address(pool));
-    //     }
-
-    //     info = _getAndVerifyContractInfo(pool, POOL(), owner);
-    //     info.nftId = getRegistry().register(info);
-    // }
-
-    // function registerDistribution(IComponent distribution, address owner)
-    //     external
-    //     restricted
-    //     returns(
-    //         IRegistry.ObjectInfo memory info
-    //     ) 
-    // {
-    //     if(!distribution.supportsInterface(type(IDistributionComponent).interfaceId)) {
-    //         revert ErrorRegistryServiceNotDistribution(address(distribution));
-    //     }
-
-    //     info = _getAndVerifyContractInfo(distribution, DISTRIBUTION(), owner);
-    //     info.nftId = getRegistry().register(info);
-    // }
-
     function registerDistributor(IRegistry.ObjectInfo memory info)
         external
-        restricted 
+        virtual
+        restricted()
         returns(NftId nftId) 
     {
         _verifyObjectInfo(info, DISTRIBUTOR());
@@ -152,7 +129,8 @@ contract RegistryService is
 
     function registerPolicy(IRegistry.ObjectInfo memory info)
         external
-        restricted 
+        virtual
+        restricted()
         returns(NftId nftId) 
     {
         _verifyObjectInfo(info, POLICY());
@@ -161,7 +139,8 @@ contract RegistryService is
 
     function registerBundle(IRegistry.ObjectInfo memory info)
         external
-        restricted 
+        virtual
+        restricted()
         returns(NftId nftId) 
     {
         _verifyObjectInfo(info, BUNDLE());
@@ -170,7 +149,8 @@ contract RegistryService is
 
     function registerStake(IRegistry.ObjectInfo memory info)
         external
-        restricted 
+        virtual
+        restricted()
         returns(NftId nftId) 
     {
         _verifyObjectInfo(info, STAKE());
@@ -185,6 +165,7 @@ contract RegistryService is
         address expectedOwner // assume can be 0 when given by other service
     )
         internal
+        virtual
         view
         returns(
             IRegistry.ObjectInfo memory info 
@@ -224,6 +205,7 @@ contract RegistryService is
         ObjectType expectedType
     )
         internal
+        virtual
         view
     {
         if(info.objectAddress > address(0)) {

package/contracts/registry/ReleaseLifecycle.sol

@@ -2,7 +2,7 @@
 pragma solidity ^0.8.20;
 
 import {RELEASE} from "../type/ObjectType.sol";
-import {SCHEDULED, DEPLOYING, ACTIVE, PAUSED, CLOSED/*, FREE*/} from "../type/StateId.sol";
+import {SCHEDULED, DEPLOYING, DEPLOYED, SKIPPED, ACTIVE, PAUSED, CLOSED} from "../type/StateId.sol";
 import {Lifecycle} from "../shared/Lifecycle.sol";
 
 contract ReleaseLifecycle is
@@ -18,9 +18,12 @@ contract ReleaseLifecycle is
     {
         setInitialState(RELEASE(), SCHEDULED());
 
+        setStateTransition(RELEASE(), SCHEDULED(), SKIPPED());
         setStateTransition(RELEASE(), SCHEDULED(), DEPLOYING());
-        setStateTransition(RELEASE(), DEPLOYING(), DEPLOYING());
-        setStateTransition(RELEASE(), DEPLOYING(), ACTIVE());
+        setStateTransition(RELEASE(), DEPLOYING(), SKIPPED());
+        setStateTransition(RELEASE(), DEPLOYING(), DEPLOYED());
+        setStateTransition(RELEASE(), DEPLOYED(), SKIPPED());
+        setStateTransition(RELEASE(), DEPLOYED(), ACTIVE());
         setStateTransition(RELEASE(), ACTIVE(), PAUSED());
         setStateTransition(RELEASE(), PAUSED(), ACTIVE());
     }