@etherisc/gif-next 0.0.2-9a02a95-445 → 0.0.2-9addcc0-107

package/contracts/instance/service/ProductService.sol

@@ -4,7 +4,7 @@ pragma solidity ^0.8.19;
 import {IRegistry} from "../../registry/IRegistry.sol";
 import {IProductComponent} from "../../components/IProductComponent.sol";
 import {Product} from "../../components/Product.sol";
-import {IBaseComponent} from "../../components/IBaseComponent.sol";
+import {IComponent} from "../../components/IComponent.sol";
 import {IPoolComponent} from "../../components/IPoolComponent.sol";
 import {IDistributionComponent} from "../../components/IDistributionComponent.sol";
 import {IInstance} from "../IInstance.sol";
@@ -23,8 +23,8 @@ import {Versionable} from "../../shared/Versionable.sol";
 import {Timestamp, zeroTimestamp} from "../../types/Timestamp.sol";
 import {UFixed, UFixedLib} from "../../types/UFixed.sol";
 import {Blocknumber, blockNumber} from "../../types/Blocknumber.sol";
-import {ObjectType, INSTANCE, PRODUCT, POLICY} from "../../types/ObjectType.sol";
-import {APPLIED, UNDERWRITTEN, ACTIVE, KEEP_STATE} from "../../types/StateId.sol";
+import {ObjectType, PRODUCT, POOL, POLICY} from "../../types/ObjectType.sol";
+import {APPLIED, ACTIVE, KEEP_STATE} from "../../types/StateId.sol";
 import {NftId, NftIdLib, zeroNftId} from "../../types/NftId.sol";
 import {Fee, FeeLib} from "../../types/Fee.sol";
 import {ReferralId} from "../../types/Referral.sol";
@@ -35,20 +35,15 @@ import {RoleId, PRODUCT_OWNER_ROLE} from "../../types/RoleId.sol";
 
 import {IService} from "../../shared/IService.sol";
 import {Service} from "../../shared/Service.sol";
-import {ComponentServiceBase} from "../base/ComponentServiceBase.sol";
+import {ComponentService} from "../base/ComponentService.sol";
 import {IProductService} from "./IProductService.sol";
 import {InstanceReader} from "../InstanceReader.sol";
 import {IPoolService} from "./PoolService.sol";
-import {POOL_SERVICE_NAME} from "./PoolService.sol";
-
-string constant PRODUCT_SERVICE_NAME = "ProductService";
 
 // TODO or name this ProtectionService to have Product be something more generic (loan, savings account, ...)
-contract ProductService is ComponentServiceBase, IProductService {
+contract ProductService is ComponentService, IProductService {
     using NftIdLib for NftId;
 
-    string public constant NAME = "ProductService";
-
     IPoolService internal _poolService;
 
     event LogProductServiceSender(address sender);
@@ -65,52 +60,93 @@ contract ProductService is ComponentServiceBase, IProductService {
         address initialOwner;
         (registryAddress, initialOwner) = abi.decode(data, (address, address));
 
-        _initializeService(registryAddress, owner);
+        initializeService(registryAddress, address(0), owner);
 
-        _poolService = IPoolService(_registry.getServiceAddress(POOL_SERVICE_NAME, getMajorVersion()));
+        _poolService = IPoolService(getRegistry().getServiceAddress(POOL(), getVersion().toMajorPart()));
 
-        _registerInterface(type(IProductService).interfaceId);
+        registerInterface(type(IProductService).interfaceId);
     }
 
 
-    function getName() public pure override(IService, Service) returns(string memory name) {
-        return NAME;
-    }
-
     function register(address productAddress) 
         external
         returns(NftId productNftId)
     {
-        address productOwner = msg.sender;
-        IBaseComponent product = IBaseComponent(productAddress);
-
-        IRegistry.ObjectInfo memory info;
-        bytes memory data;
-        (info, data) = getRegistryService().registerProduct(product, productOwner);
-
-        IInstance instance = _getInstance(info);
-        bool hasRole = getInstanceService().hasRole(
-            productOwner, 
-            PRODUCT_OWNER_ROLE(), 
-            address(instance));
-
-        if(!hasRole) {
-            revert ExpectedRoleMissing(PRODUCT_OWNER_ROLE(), productOwner);
-        }
-
-        productNftId = info.nftId;
-        ISetup.ProductSetupInfo memory initialSetup = _decodeAndVerifyProductSetup(data);
-        instance.createProductSetup(productNftId, initialSetup);
+        (
+            IComponent component,
+            address owner,
+            IInstance instance,
+            NftId instanceNftId
+        ) = _checkComponentForRegistration(
+            productAddress,
+            PRODUCT(),
+            PRODUCT_OWNER_ROLE());
+
+        IProductComponent product = IProductComponent(productAddress);
+        IRegistry.ObjectInfo memory productInfo = getRegistryService().registerProduct(product, owner);
+        productNftId = productInfo.nftId;
+        _createProductSetup(
+            instance, 
+            product, 
+            productNftId);
+    }
+
+
+    function _createProductSetup(
+        IInstance instance, 
+        IProductComponent product, 
+        NftId productNftId 
+    )
+        internal
+        returns (string memory name)
+    {
+        // wire distribution and pool components to product component
+        ISetup.ProductSetupInfo memory setup = product.getSetupInfo();
+        IComponent distribution = IComponent(getRegistry().getObjectInfo(setup.distributionNftId).objectAddress);
+        IComponent pool = IComponent(getRegistry().getObjectInfo(setup.poolNftId).objectAddress);
+
+        distribution.setProductNftId(productNftId);
+        pool.setProductNftId(productNftId);
+        product.setProductNftId(productNftId);
+        product.linkToRegisteredNftId();
+
+        // create product setup in instance
+        instance.createProductSetup(productNftId, product.getSetupInfo());
+
+        bytes4[][] memory selectors = new bytes4[][](1);
+        selectors[0] = new bytes4[](1);
+        selectors[0][0] = IProductComponent.setFees.selector;
+
+        RoleId[] memory roles = new RoleId[](1);
+        roles[0] = PRODUCT_OWNER_ROLE();
+
+        // create target for instane access manager
+        getInstanceService().createGifTarget(
+            getRegistry().getNftId(address(instance)), 
+            address(product), 
+            product.getName(),
+            selectors,
+            roles);
     }
 
-    function _decodeAndVerifyProductSetup(bytes memory data) internal returns(ISetup.ProductSetupInfo memory setup)
+    function getDomain() public pure override returns(ObjectType) {
+        return PRODUCT();
+    }
+
+
+    function _decodeAndVerifyProductData(bytes memory data) 
+        internal 
+        returns(string memory name, ISetup.ProductSetupInfo memory setup)
     {
-        setup = abi.decode(
+        (name, setup) = abi.decode(
             data,
-            (ISetup.ProductSetupInfo)
+            (string, ISetup.ProductSetupInfo)
         );
 
-        // TODO add checks if applicable 
+        // TODO add checks
+        // if(wallet == address(0)) {
+        //     revert WalletIsZero();
+        // }
     }
 
     function setFees(
@@ -121,13 +157,9 @@ contract ProductService is ComponentServiceBase, IProductService {
     {
         // TODO check args 
 
-        (
-            IRegistry.ObjectInfo memory productInfo, 
-            IInstance instance
-        ) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
-
+        (NftId productNftId, IRegistry.ObjectInfo memory productInfo, IInstance instance) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
         InstanceReader instanceReader = instance.getInstanceReader();
-        NftId productNftId = productInfo.nftId;
+
         ISetup.ProductSetupInfo memory productSetupInfo = instanceReader.getProductSetupInfo(productNftId);
 
         productSetupInfo.productFee = productFee;
@@ -139,13 +171,13 @@ contract ProductService is ComponentServiceBase, IProductService {
     function createRisk(
         RiskId riskId,
         bytes memory data
-    ) external override {
-        (
-            IRegistry.ObjectInfo memory productInfo, 
-            IInstance instance
-        ) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
-        NftId productNftId = productInfo.nftId;
+    )
+        external 
+        override
+    {
+        (NftId productNftId, IRegistry.ObjectInfo memory productInfo, IInstance instance) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
         IRisk.RiskInfo memory riskInfo = IRisk.RiskInfo(productNftId, data);
+
         instance.createRisk(
             riskId,
             riskInfo
@@ -155,9 +187,12 @@ contract ProductService is ComponentServiceBase, IProductService {
     function updateRisk(
         RiskId riskId,
         bytes memory data
-    ) external {
-        (, IInstance instance) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
+    )
+        external
+    {
+        (,, IInstance instance) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
         InstanceReader instanceReader = instance.getInstanceReader();
+
         IRisk.RiskInfo memory riskInfo = instanceReader.getRiskInfo(riskId);
         riskInfo.data = data;
         instance.updateRisk(riskId, riskInfo, KEEP_STATE());
@@ -166,8 +201,10 @@ contract ProductService is ComponentServiceBase, IProductService {
     function updateRiskState(
         RiskId riskId,
         StateId state
-    ) external {
-        (, IInstance instance) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
+    )
+        external
+    {
+        (,, IInstance instance) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
         instance.updateRiskState(riskId, state);
     }
 }

package/contracts/instance/service/ProductServiceManager.sol

@@ -16,7 +16,7 @@ contract ProductServiceManager is ProxyManager {
     constructor(
         address registryAddress
     )
-        ProxyManager()
+        ProxyManager(registryAddress)
     {
         ProductService svc = new ProductService();
         bytes memory data = abi.encode(registryAddress, address(this));
@@ -39,7 +39,7 @@ contract ProductServiceManager is ProxyManager {
         //    address(_productService));
 
         // implies that after this constructor call only upgrade functionality is available
-        _isDeployed = true;
+        // _isDeployed = true;
     }
 
     //--- view functions ----------------------------------------------------//

package/contracts/registry/ChainNft.sol

@@ -59,7 +59,7 @@ contract ChainNft is ERC721Enumerable {
         }
 
         _chainIdMultiplier = 10 ** _chainIdDigits;
-        _idNext = 4;
+        _idNext = 3;
     }
 
     /**
@@ -95,6 +95,10 @@ contract ChainNft is ERC721Enumerable {
 
         _totalMinted++;
         _safeMint(to, tokenId);
+
+        if(interceptor != address(0)) {
+            ITransferInterceptor(interceptor).nftMint(to, tokenId);
+        }
     }
 
 
@@ -195,6 +199,10 @@ contract ChainNft is ERC721Enumerable {
             _chainIdDigits;
     }
 
+    function getNextTokenId() external view returns (uint256) {
+        return calculateTokenId(_idNext);
+    }
+
     function _getNextTokenId() private returns (uint256 id) {
         id = calculateTokenId(_idNext);
         _idNext++;

package/contracts/registry/IRegistry.sol

@@ -3,29 +3,31 @@ pragma solidity ^0.8.20;
 
 import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
 
-import {ChainNft} from "./ChainNft.sol";
 import {NftId} from "../types/NftId.sol";
 import {ObjectType} from "../types/ObjectType.sol";
 import {VersionPart} from "../types/Version.sol";
+import {Timestamp} from "../types/Timestamp.sol";
 
 interface IRegistry is IERC165 {
 
-    event LogInitialMajorVersionSet(VersionPart majorVersion);
-    event LogMajorVersionSet(VersionPart majorVersionMax);
-    event LogRegistration(ObjectInfo info);
-    event LogServiceNameRegistration(string serviceName, VersionPart majorVersion); 
+    event LogRegistration(NftId nftId, NftId parentNftId, ObjectType objectType, bool isInterceptor, address objectAddress, address initialOwner);
+    event LogServiceRegistration(VersionPart majorVersion, ObjectType domain);
 
-    // setMajorVersion()
-    error NotOwner(address account);
-    error MajorVersionMaxIncreaseInvalid(VersionPart newMajorVersionMax, VersionPart existingMaxMajorVersion);
+    // registerService()
+    error CallerNotReleaseManager();
+    error ServiceAlreadyRegistered(address service);
 
     // register()
-    error NotRegistryService();
+    error CallerNotRegistryService();
+    error ServiceRegistration();
+
+    // registerWithCustomTypes()
+    error CoreTypeRegistration();
+
+    // _register()
     error ZeroParentAddress();
     error InvalidTypesCombination(ObjectType objectType, ObjectType parentType);
     error ContractAlreadyRegistered(address objectAddress);
-    error InvalidServiceVersion(VersionPart majorVersion);
-    error ServiceNameAlreadyRegistered(string name, VersionPart majorVersion);
 
     struct ObjectInfo {
         NftId nftId;
@@ -38,15 +40,29 @@ interface IRegistry is IERC165 {
     }// TODO delete nftId and initialOwner(if not used) from struct
     // TODO strong disagree, keep nftId there (lets keep get object info return object consistent)
 
-    function setMajorVersion(VersionPart newMajorVersionMax) external;
+    struct ReleaseInfo {
+        ObjectType[] domains;
+        Timestamp createdAt;
+        //Timestamp updatedAt;
+    }
+
+    function registerService(
+        ObjectInfo memory serviceInfo, 
+        VersionPart serviceVersion, 
+        ObjectType serviceDomain
+    ) external returns(NftId nftId);
 
     function register(ObjectInfo memory info) external returns (NftId nftId);
 
-    function getMajorVersionMin() external view returns (VersionPart);
+    function registerWithCustomType(ObjectInfo memory info) external returns (NftId nftId);
+
+    function getInitialVersion() external view returns (VersionPart);
 
-    function getMajorVersionMax() external view returns (VersionPart);
+    function getNextVersion() external view returns (VersionPart);
 
-    function getMajorVersion() external view returns (VersionPart);
+    function getLatestVersion() external view returns (VersionPart);
+
+    function getReleaseInfo(VersionPart version) external view returns (ReleaseInfo memory);
 
     function getObjectCount() external view returns (uint256);
 
@@ -68,14 +84,18 @@ interface IRegistry is IERC165 {
 
     function isRegisteredService(address contractAddress) external view returns (bool);
 
-    function getServiceName(NftId nftId) external view returns (string memory name);
+    function isRegisteredComponent(address object) external view returns (bool);
+
+    function isValidRelease(VersionPart version) external view returns (bool);
 
     function getServiceAddress(
-        string memory serviceName, 
-        VersionPart majorVersion
+        ObjectType serviceDomain, 
+        VersionPart releaseVersion
     ) external view returns (address serviceAddress);
 
-    function getChainNft() external view returns (ChainNft);
+    function getReleaseManagerAddress() external view returns (address);
+
+    function getChainNftAddress() external view returns (address);
 
     function getOwner() external view returns (address);
 }

package/contracts/registry/IRegistryService.sol

@@ -1,6 +1,8 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
+// import {IAccessManaged} from "@openzeppelin/contracts/access/manager/IAccessManaged.sol";
+
 import {NftId} from "../types/NftId.sol";
 import {ObjectType} from "../types/ObjectType.sol";
 import {RoleId} from "../types/RoleId.sol";
@@ -8,10 +10,11 @@ import {IService} from "../shared/IService.sol";
 import {IRegistry} from "./IRegistry.sol";
 
 import {IRegisterable} from "../shared/IRegisterable.sol";
-import {IBaseComponent} from "../components/IBaseComponent.sol";
-
-interface IRegistryService is IService {
+import {IComponent} from "../components/IComponent.sol";
 
+interface IRegistryService is 
+     IService
+{
      error SelfRegistration();
      error NotRegistryOwner();
 
@@ -28,22 +31,35 @@ interface IRegistryService is IService {
      error InvalidInitialOwner(address initialOwner);
      error InvalidAddress(address registerableAddress);
 
+     struct FunctionConfig
+     {
+          ObjectType serviceDomain;
+          bytes4[] selectors;
+     }
+
+     function getFunctionConfigs()
+          external
+          pure
+          returns(
+               FunctionConfig[] memory config
+          );
 
-     function registerService(IService service)  external returns(IRegistry.ObjectInfo memory info, bytes memory data);
+     // TODO used by service -> add owner arg 
+     function registerInstance(IRegisterable instance, address owner)
+          external returns(IRegistry.ObjectInfo memory info); 
 
-     function registerInstance(IRegisterable instance)
-          external returns(IRegistry.ObjectInfo memory info, bytes memory data); 
+     function registerProduct(IComponent product, address owner)
+          external returns(IRegistry.ObjectInfo memory info);
 
-     function registerProduct(IBaseComponent product, address owner)
-          external returns(IRegistry.ObjectInfo memory info, bytes memory data);
+     function registerPool(IComponent pool, address owner)
+          external returns(IRegistry.ObjectInfo memory info);
 
-     function registerPool(IBaseComponent pool, address owner)
-          external returns(IRegistry.ObjectInfo memory info, bytes memory data);
+     function registerDistribution(IComponent distribution, address owner)
+          external returns(IRegistry.ObjectInfo memory info);
 
-     function registerDistribution(IBaseComponent distribution, address owner)
-          external returns(IRegistry.ObjectInfo memory info, bytes memory data);
+     function registerDistributor(IRegistry.ObjectInfo memory info) external returns(NftId nftId);
 
-     function registerPolicy(IRegistry.ObjectInfo memory info) external returns(NftId nftId); // -> easy to upgrade
+     function registerPolicy(IRegistry.ObjectInfo memory info) external returns(NftId nftId);
 
      function registerBundle(IRegistry.ObjectInfo memory info) external returns(NftId nftId); 
 }

package/contracts/registry/ITransferInterceptor.sol

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