@etherisc/gif-next 0.0.2-78e428e-483 → 0.0.2-79292f9-089

package/contracts/product/Product.sol

@@ -12,11 +12,11 @@ import {IApplicationService} from "./IApplicationService.sol";
 import {IAuthorization} from "../authorization/IAuthorization.sol";
 import {IComponentService} from "../shared/IComponentService.sol";
 import {IPolicyService} from "./IPolicyService.sol";
-import {IProductService} from "./IProductService.sol";
+import {IRiskService} from "./IRiskService.sol";
 import {IClaimService} from "./IClaimService.sol";
 import {IPricingService} from "./IPricingService.sol";
 import {IProductComponent} from "./IProductComponent.sol";
-import {NftId, NftIdLib} from "../type/NftId.sol";
+import {NftId} from "../type/NftId.sol";
 import {PayoutId} from "../type/PayoutId.sol";
 import {COMPONENT, PRODUCT, APPLICATION, POLICY, CLAIM, PRICE } from "../type/ObjectType.sol";
 import {ReferralId} from "../type/Referral.sol";
@@ -25,9 +25,6 @@ import {Seconds} from "../type/Seconds.sol";
 import {StateId} from "../type/StateId.sol";
 import {Timestamp} from "../type/Timestamp.sol";
 
-import {TokenHandler} from "../shared/TokenHandler.sol";
-
-import {InstanceReader} from "../instance/InstanceReader.sol";
 import {IPolicy} from "../instance/module/IPolicy.sol";
 import {IComponents} from "../instance/module/IComponents.sol";
 import {Pool} from "../pool/Pool.sol";
@@ -41,7 +38,7 @@ abstract contract Product is
     bytes32 public constant PRODUCT_STORAGE_LOCATION_V1 = 0x0bb7aafdb8e380f81267337bc5b5dfdf76e6d3a380ecadb51ec665246d9d6800;
 
     struct ProductStorage {
-        IProductService _productService;
+        IRiskService _riskService;
         IApplicationService _applicationService;
         IPolicyService _policyService;
         IClaimService _claimService;
@@ -62,7 +59,7 @@ abstract contract Product is
         NftId bundleNftId,
         ReferralId referralId
     )
-        external 
+        public 
         view 
         override 
         returns (Amount premiumAmount)
@@ -143,8 +140,9 @@ abstract contract Product is
         string memory name,
         address token,
         bool isInterceptor,
-        address pool,
-        address distribution,
+        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
         bytes memory componentData // writeonly data that will saved in the object info record of the registry
     )
@@ -166,8 +164,8 @@ abstract contract Product is
 
         ProductStorage storage $ = _getProductStorage();
         // TODO add validation
-        // TODO refactor to go via registry ?
-        $._productService = IProductService(_getServiceAddress(PRODUCT())); 
+        // TODO refactor to go via registry for all components linked to this product (#527)
+        $._riskService = IRiskService(_getServiceAddress(PRODUCT())); 
         $._applicationService = IApplicationService(_getServiceAddress(APPLICATION())); 
         $._policyService = IPolicyService(_getServiceAddress(POLICY())); 
         $._claimService = IClaimService(_getServiceAddress(CLAIM())); 
@@ -197,7 +195,7 @@ abstract contract Product is
         RiskId id,
         bytes memory data
     ) internal {
-        _getProductService().createRisk(
+        _getRiskService().createRisk(
             id,
             data
         );
@@ -207,7 +205,7 @@ abstract contract Product is
         RiskId id,
         bytes memory data
     ) internal {
-        _getProductService().updateRisk(
+        _getRiskService().updateRisk(
             id,
             data
         );
@@ -217,7 +215,7 @@ abstract contract Product is
         RiskId id,
         StateId state
     ) internal {
-        _getProductService().updateRiskState(
+        _getRiskService().updateRiskState(
             id,
             state
         );
@@ -233,6 +231,7 @@ abstract contract Product is
         address applicationOwner,
         RiskId riskId,
         Amount sumInsuredAmount,
+        Amount premiumAmount,
         Seconds lifetime,
         NftId bundleNftId,
         ReferralId referralId,
@@ -245,6 +244,7 @@ abstract contract Product is
             applicationOwner,
             riskId,
             sumInsuredAmount,
+            premiumAmount,
             lifetime,
             bundleNftId,
             referralId,
@@ -252,15 +252,15 @@ abstract contract Product is
         );
     }
 
-    function _collateralize(
-        NftId policyNftId,
+    function _createPolicy(
+        NftId applicationNftId,
         bool requirePremiumPayment,
         Timestamp activateAt
     )
         internal
     {
-        _getProductStorage()._policyService.collateralize(
-            policyNftId, 
+        _getProductStorage()._policyService.createPolicy(
+            applicationNftId, 
             requirePremiumPayment, 
             activateAt);
     }
@@ -279,9 +279,9 @@ abstract contract Product is
         Timestamp expireAt
     )
         internal
-        returns (Timestamp)
+        returns (Timestamp expiredAt)
     {
-        return _getProductStorage()._policyService.expire(policyNftId, expireAt);
+        expiredAt = _getProductStorage()._policyService.expire(policyNftId, expireAt);
     }
 
     function _collectPremium(
@@ -405,7 +405,7 @@ abstract contract Product is
         }
     }
 
-    function _getProductService() internal view returns (IProductService) {
-        return _getProductStorage()._productService;
+    function _getRiskService() internal view returns (IRiskService) {
+        return _getProductStorage()._riskService;
     }
 }

package/contracts/product/{ProductService.sol → RiskService.sol}

@@ -4,7 +4,7 @@ pragma solidity ^0.8.20;
 import {IInstance} from "../instance/IInstance.sol";
 import {IInstanceService} from "../instance/IInstanceService.sol";
 import {IPoolService} from "../pool/PoolService.sol";
-import {IProductService} from "./IProductService.sol";
+import {IRiskService} from "./IRiskService.sol";
 import {IRegistryService} from "../registry/IRegistryService.sol";
 import {IRisk} from "../instance/module/IRisk.sol";
 
@@ -16,23 +16,21 @@ import {RiskId} from "../type/RiskId.sol";
 import {StateId} from "../type/StateId.sol";
 import {ComponentVerifyingService} from "../shared/ComponentVerifyingService.sol";
 
-contract ProductService is
+contract RiskService is
     ComponentVerifyingService,
-    IProductService 
+    IRiskService 
 {
     IInstanceService private _instanceService;
     IPoolService internal _poolService;
     IRegistryService private _registryService;
 
-    event LogProductServiceSender(address sender);
-
     function _initialize(
         address owner, 
         bytes memory data
     )
         internal
-        initializer
         virtual override
+        onlyInitializing()
     {
         (
             address registryAddress,, 
@@ -46,7 +44,7 @@ contract ProductService is
         _poolService = IPoolService(getRegistry().getServiceAddress(POOL(), getVersion().toMajorPart()));
         _registryService = IRegistryService(_getServiceAddress(REGISTRY()));
 
-        registerInterface(type(IProductService).interfaceId);
+        registerInterface(type(IRiskService).interfaceId);
     }
 
 

package/contracts/product/{ProductServiceManager.sol → RiskServiceManager.sol}

@@ -3,11 +3,11 @@ pragma solidity ^0.8.20;
 
 import {IVersionable} from "../upgradeability/IVersionable.sol";
 import {ProxyManager} from "../upgradeability/ProxyManager.sol";
-import {ProductService} from "./ProductService.sol";
+import {RiskService} from "./RiskService.sol";
 
-contract ProductServiceManager is ProxyManager {
+contract RiskServiceManager is ProxyManager {
 
-    ProductService private _productService;
+    RiskService private _riskService;
 
     /// @dev initializes proxy manager with product service implementation 
     constructor(
@@ -17,23 +17,23 @@ contract ProductServiceManager is ProxyManager {
     ) 
         ProxyManager(registryAddress)
     {
-        ProductService svc = new ProductService{salt: salt}();
+        RiskService svc = new RiskService{salt: salt}();
         bytes memory data = abi.encode(registryAddress, address(this), authority);
         IVersionable versionable = deployDetermenistic(
             address(svc), 
             data,
             salt);
 
-        _productService = ProductService(address(versionable));
+        _riskService = RiskService(address(versionable));
     }
 
     //--- view functions ----------------------------------------------------//
-    function getProductService()
+    function getRiskService()
         external
         view
-        returns (ProductService productService)
+        returns (RiskService riskService)
     {
-        return _productService;
+        return _riskService;
     }
 
 }

package/contracts/registry/ChainNft.sol

@@ -8,6 +8,8 @@ import {ITransferInterceptor} from "./ITransferInterceptor.sol";
 
 contract ChainNft is ERC721Enumerable {
 
+    event LogTokenInterceptorAddress(uint256 tokenId, address interceptor);
+
     // constants
     string public constant NAME = "Dezentralized Insurance Protocol NFT";
     string public constant SYMBOL = "DIPNFT";
@@ -15,12 +17,11 @@ contract ChainNft is ERC721Enumerable {
     uint256 public constant PROTOCOL_NFT_ID = 1101;
     uint256 public constant GLOBAL_REGISTRY_ID = 2101;
 
-    // TODO rename errors to error pattern: CallerNotRegistry -> ErrorCallerNotRegistry etc.
     // custom errors
-    error CallerNotRegistry(address caller);
-    error RegistryAddressZero();
-    error NftUriEmpty();
-    error NftUriAlreadySet();
+    error ErrorChainNftCallerNotRegistry(address caller);
+    error ErrorChainNftRegistryAddressZero();
+    error ErrorChainNftUriEmpty();
+    error ErrorChainNftUriAlreadySet();
 
     // contract state
 
@@ -34,31 +35,25 @@ contract ChainNft is ERC721Enumerable {
     address private _registry;
 
     // only used for _getNextTokenId
-    uint256 internal _chainIdInt;
     uint256 internal _chainIdDigits;
     uint256 internal _chainIdMultiplier;
     uint256 internal _idNext;
     uint256 internal _totalMinted;
 
     modifier onlyRegistry() {
-        if (msg.sender != _registry) { revert CallerNotRegistry(msg.sender); }
+        if (msg.sender != _registry) { revert ErrorChainNftCallerNotRegistry(msg.sender); }
         _;
     }
 
-    constructor(address registry) ERC721(NAME, SYMBOL) {
-        if (registry == address(0)) { revert RegistryAddressZero(); }
+    constructor(address registry)
+        ERC721(NAME, SYMBOL)
+    {
+        if (registry == address(0)) { revert ErrorChainNftRegistryAddressZero(); }
 
+        // NFT contract is deployed by the registry
         _registry = registry;
-        _chainIdInt = block.chainid;
-        _chainIdDigits = 0;
-
-        // count digis
-        uint256 num = _chainIdInt;
-        while (num != 0) {
-            _chainIdDigits++;
-            num /= 10;
-        }
 
+        _chainIdDigits = _calculateChainIdDigits(block.chainid);
         _chainIdMultiplier = 10 ** _chainIdDigits;
 
         // the first object registered through normal registration starts with id 4
@@ -74,12 +69,16 @@ contract ChainNft is ERC721Enumerable {
     * not part of the IRegistry interface only needed for
     * initial registry setup (protocol and global registry objects)
     */
-    function mint(address to, uint256 tokenId) external onlyRegistry {
-        _totalMinted++;
-        _safeMint(to, tokenId);
+    function mint(
+        address to, 
+        uint256 tokenId
+    )
+        external
+        onlyRegistry()
+    {
+        _safeMintWithInterceptorAddress(to, tokenId, address(0));
     }
 
-
     /**
     * @dev mints the next token to register new objects
     * non-zero transferInterceptors are recorded and called during nft token transfers.
@@ -89,7 +88,11 @@ contract ChainNft is ERC721Enumerable {
         address to,
         address interceptor,
         string memory uri
-    ) public onlyRegistry returns (uint256 tokenId) {
+    )
+        public
+        onlyRegistry()
+        returns (uint256 tokenId) 
+    {
         tokenId = _getNextTokenId();
 
         if (interceptor != address(0)) {
@@ -100,8 +103,7 @@ contract ChainNft is ERC721Enumerable {
             _uri[tokenId] = uri;
         }
 
-        _totalMinted++;
-        _safeMint(to, tokenId);
+        _safeMintWithInterceptorAddress(to, tokenId, interceptor);
 
         if(interceptor != address(0)) {
             ITransferInterceptor(interceptor).nftMint(to, tokenId);
@@ -132,8 +134,8 @@ contract ChainNft is ERC721Enumerable {
         uint256 tokenId,
         string memory uri
     ) external onlyRegistry {
-        if (bytes(uri).length == 0) { revert NftUriEmpty(); }
-        if (bytes(_uri[tokenId]).length > 0) { revert NftUriAlreadySet(); }
+        if (bytes(uri).length == 0) { revert ErrorChainNftUriEmpty(); }
+        if (bytes(_uri[tokenId]).length > 0) { revert ErrorChainNftUriAlreadySet(); }
 
         _requireOwned(tokenId);
         _uri[tokenId] = uri;
@@ -199,19 +201,50 @@ contract ChainNft is ERC721Enumerable {
     * (42 * 10 ** 10 + 9876543210) * 100 + 10
     * (index * 10 ** digits + chainid) * 100 + digits (1 < digits < 100)
     */
-    function calculateTokenId(uint256 idIndex) public view returns (uint256 id) {
-        id =
-            (idIndex * _chainIdMultiplier + _chainIdInt) *
-            100 +
-            _chainIdDigits;
+    function calculateTokenId(uint256 idIndex, uint256 chainId) public view returns (uint256 id) {
+        if(chainId == block.chainid) {
+            return 100 * (idIndex * _chainIdMultiplier + chainId) + _chainIdDigits;
+        } else {
+            uint256 chainIdDigits = _calculateChainIdDigits(chainId);
+            return 100 * (idIndex * (10 ** chainIdDigits) + chainId) + chainIdDigits;
+        }
+    }
+
+    function calculateTokenId(uint256 idIndex) public view returns (uint256) {
+        return 100 * (idIndex * _chainIdMultiplier + block.chainid) + _chainIdDigits;
     }
 
     function getNextTokenId() external view returns (uint256) {
         return calculateTokenId(_idNext);
     }
 
+    // ---------------- private functions ----------------- //
+
     function _getNextTokenId() private returns (uint256 id) {
         id = calculateTokenId(_idNext);
         _idNext++;
     }
+
+    function _calculateChainIdDigits(uint256 chainId) private pure returns (uint256) {
+        uint256 num = chainId;
+        uint256 digits = 0;
+        while (num != 0) {
+            digits++;
+            num /= 10;
+        }
+        return digits;
+    }
+
+    function _safeMintWithInterceptorAddress(
+        address to,
+        uint256 tokenId,
+        address interceptor
+    )
+        private
+    {
+        emit LogTokenInterceptorAddress(tokenId, interceptor);
+        
+        _totalMinted++;
+        _safeMint(to, tokenId);
+    }
 }

package/contracts/registry/IRegistry.sol

@@ -7,35 +7,48 @@ import {NftId} from "../type/NftId.sol";
 import {ObjectType} from "../type/ObjectType.sol";
 import {VersionPart} from "../type/Version.sol";
 import {Timestamp} from "../type/Timestamp.sol";
+import {StateId} from "../type/StateId.sol";
+
+import {IServiceAuthorization} from "../authorization/IServiceAuthorization.sol";
 
 /// @title Chain Registry interface.
 /// A chain registry holds all protocol relevant objects with basic metadata.
 /// Registered objects include services, instances, products, pools, policies, bundles, stakes and more.
 /// Registered objects are represented by NFTs.
+/// When on mainnet registry is global and keeps arbitrary number of chain registries residing on different chain ids.
+/// When not on mainnet registry keeps the only object residing on different chain id (on mainnet) - global registry.
 interface IRegistry is IERC165 {
 
     event LogRegistration(NftId nftId, NftId parentNftId, ObjectType objectType, bool isInterceptor, address objectAddress, address initialOwner);
     event LogServiceRegistration(VersionPart majorVersion, ObjectType domain);
+    event LogChainRegistryRegistration(NftId nftId, uint256 chainId, address chainRegistryAddress);
+
+    // initialize
+    error ErrorRegistryCallerNotDeployer();
 
-    // register()
-    error ErrorRegistryCallerNotRegistryService();
-    error ErrorRegistryService(address service);
+    // registerRegistry()
+    error ErrorRegistryNotOnMainnet(uint256 chainId);
+    error ErrorRegistryChainRegistryChainidZero(NftId nftId);
+    error ErrorRegistryChainRegistryAddressZero(NftId nftId, uint256 chainId);
+    error ErrorRegistryChainRegistryNftIdInvalid(NftId nftId, uint256 chainId);
+    error ErrorRegistryChainRegistryAlreadyRegistered(NftId nftId, uint256 chainId);
 
     // registerService()
-    error ErrorRegistryCallerNotReleaseRegistry();
     error ErrorRegistryServiceAddressZero(); 
-    error ErrorRegistryServiceVersionZero(); 
+    error ErrorRegistryServiceVersionZero(address service);
+    //error ErrorRegistryServiceVersionMismatch(address service, VersionPart serviceVersion, VersionPart releaseVersion);
+    //error ErrorRegistryServiceVersionNotDeploying(address service, VersionPart version);
+    error ErrorRegistryServiceDomainZero(address service, VersionPart version);
     error ErrorRegistryNotService(address service, ObjectType objectType);
-    error ErrorRegistryServiceParentNotRegistry(NftId parentNftId);
-    error ErrorRegistryDomainZero(address service);
-    error ErrorRegistryDomainAlreadyRegistered(address service, VersionPart version, ObjectType domain);
+    error ErrorRegistryServiceParentNotRegistry(address service, VersionPart version, NftId parentNftId);
+    error ErrorRegistryServiceDomainAlreadyRegistered(address service, VersionPart version, ObjectType domain);
 
     // registerWithCustomTypes()
     error ErrorRegistryCoreTypeRegistration();
 
     // _register()
-    error ErrorRegistryParentAddressZero();
-    error ErrorRegistryTypesCombinationInvalid(ObjectType objectType, ObjectType parentType);
+    error ErrorRegistryGlobalRegistryAsParent(address objectAddress, ObjectType objectType);
+    error ErrorRegistryTypesCombinationInvalid(address objectAddress, ObjectType objectType, ObjectType parentType);
     error ErrorRegistryContractAlreadyRegistered(address objectAddress);
 
     struct ObjectInfo {
@@ -49,19 +62,24 @@ interface IRegistry is IERC165 {
     }
 
     struct ReleaseInfo {
+        StateId state;
         VersionPart version;
         bytes32 salt;
         address[] addresses;
         string[] names;
         ObjectType[] domains;
+        IServiceAuthorization auth;
         Timestamp activatedAt;
         Timestamp disabledAt;
     }
 
-    /// @dev Register an object with a known core type.
-    /// The function returns a newly minted object NFT ID.
-    /// May not be used to register services.
-    function register(ObjectInfo memory info) external returns (NftId nftId);
+    /// @dev Registers a registry contract for a specified chain.
+    /// Only one chain registry may be registered per chain
+    function registerRegistry(
+        NftId nftId, 
+        uint256 chainId, 
+        address chainRegistryAddress
+    ) external;
 
     /// @dev Register a service with using the provided domain and version.
     /// The function returns a newly minted service NFT ID.
@@ -72,6 +90,11 @@ interface IRegistry is IERC165 {
         ObjectType serviceDomain
     ) external returns(NftId nftId);
 
+    /// @dev Register an object with a known core type.
+    /// The function returns a newly minted object NFT ID.
+    /// May not be used to register services.
+    function register(ObjectInfo memory info) external returns (NftId nftId);
+
     /// @dev Register an object with a custom type.
     /// The function returns a newly minted object NFT ID.
     /// This function is reserved for GIF releases > 3.
@@ -86,6 +109,15 @@ interface IRegistry is IERC165 {
 
     function getReleaseInfo(VersionPart version) external view returns (ReleaseInfo memory);
 
+    /// @dev Returns the number of supported chains.
+    function chainIds() external view returns (uint256);
+
+    /// @dev Returns the chain id at the specified index.
+    function getChainId(uint256 idx) external view returns (uint256);
+
+    /// @dev Returns the NFT ID of the registry for the specified chain.
+    function getRegistryNftId(uint256 chainId) external returns (NftId nftId); 
+
     function getObjectCount() external view returns (uint256);
 
     function getNftId(address objectAddress) external view returns (NftId nftId);
@@ -96,6 +128,8 @@ interface IRegistry is IERC165 {
 
     function getObjectInfo(NftId nftId) external view returns (ObjectInfo memory info);
 
+    /// @dev Returns the object info for the specified object address.
+    //  MUST not be used with chain registry address (resides on different chan id)
     function getObjectInfo(address object) external view returns (ObjectInfo memory info);
 
     function isRegistered(NftId nftId) external view returns (bool);