@etherisc/gif-next 0.0.2-9dd1984-554 → 0.0.2-9fbf8d0-135

package/contracts/instance/service/PoolService.sol

@@ -6,20 +6,22 @@ import {IRegistry} from "../../registry/IRegistry.sol";
 import {IInstance} from "../../instance/IInstance.sol";
 import {IBundle} from "../../instance/module/IBundle.sol";
 import {TokenHandler} from "../../instance/module/ITreasury.sol";
-import {ISetup} from "../module/ISetup.sol";
+import {IComponents} from "../module/IComponents.sol";
 import {IPolicy} from "../module/IPolicy.sol";
 
 import {IVersionable} from "../../shared/IVersionable.sol";
 import {Versionable} from "../../shared/Versionable.sol";
 import {INftOwnable} from "../../shared/INftOwnable.sol";
 
+import {Fee, FeeLib} from "../../types/Fee.sol";
 import {NftId, NftIdLib, zeroNftId} from "../../types/NftId.sol";
 import {ObjectType, POOL, BUNDLE} from "../../types/ObjectType.sol";
-import {POOL_OWNER_ROLE, RoleId} from "../../types/RoleId.sol";
+import {PUBLIC_ROLE, POOL_OWNER_ROLE, POLICY_SERVICE_ROLE, RoleId} from "../../types/RoleId.sol";
 import {Fee, FeeLib} from "../../types/Fee.sol";
 import {Version, VersionLib} from "../../types/Version.sol";
 import {KEEP_STATE, StateId} from "../../types/StateId.sol";
 import {TimestampLib, zeroTimestamp} from "../../types/Timestamp.sol";
+import {Version, VersionLib} from "../../types/Version.sol";
 
 import {IService} from "../../shared/IService.sol";
 import {Service} from "../../shared/Service.sol";
@@ -30,6 +32,7 @@ import {IRegistryService} from "../../registry/IRegistryService.sol";
 import {InstanceService} from "../InstanceService.sol";
 import {InstanceReader} from "../InstanceReader.sol";
 import {IComponent} from "../../components/IComponent.sol";
+import {IPoolComponent} from "../../components/IPoolComponent.sol";
 
 string constant POOL_SERVICE_NAME = "PoolService";
 
@@ -54,21 +57,20 @@ contract PoolService is
         (registryAddress, initialOwner) = abi.decode(data, (address, address));
         // TODO while PoolService is not deployed in PoolServiceManager constructor
         //      owner is PoolServiceManager deployer
-        _initializeService(registryAddress, owner);
-
-        _registerInterface(type(IPoolService).interfaceId);
+        initializeService(registryAddress, owner);
+        registerInterface(type(IPoolService).interfaceId);
     }
 
     function getDomain() public pure override(Service, IService) returns(ObjectType) {
         return POOL();
     }
 
-    function register(address poolAddress) 
+    /*function register(address poolAddress) 
         external
         returns(NftId poolNftId)
     {
         (
-            IComponent pool,
+            IComponent component,
             address owner,
             IInstance instance,
             NftId instanceNftId
@@ -77,66 +79,142 @@ contract PoolService is
             POOL(),
             POOL_OWNER_ROLE());
 
-        (
-            IRegistry.ObjectInfo memory poolInfo,
-            bytes memory data
-        ) = getRegistryService().registerPool(pool, owner);
+        IPoolComponent pool = IPoolComponent(poolAddress);
+        IRegistry.ObjectInfo memory registryInfo = getRegistryService().registerPool(pool, owner);
         pool.linkToRegisteredNftId();
-        poolNftId = poolInfo.nftId;
+        poolNftId = registryInfo.nftId;
+
+        instance.createPoolSetup(poolNftId, pool.getSetupInfo());
 
+        bytes4[][] memory selectors = new bytes4[][](2);
+        selectors[0] = new bytes4[](1);
+        selectors[1] = new bytes4[](1);
+
+        selectors[0][0] = IPoolComponent.setFees.selector;
+        selectors[1][0] = IPoolComponent.verifyApplication.selector;
+
+        RoleId[] memory roles = new RoleId[](2);
+        roles[0] = POOL_OWNER_ROLE();
+        roles[1] = POLICY_SERVICE_ROLE();
+
+        getInstanceService().createGifTarget(
+            instanceNftId, 
+            poolAddress, 
+            pool.getName(), 
+            selectors, 
+            roles);
+    }*/
+
+    function register(address poolAddress) 
+        external
+        returns(NftId poolNftId)
+    {
         (
-            string memory name, 
-            ISetup.PoolSetupInfo memory initialSetup
-        ) = _decodeAndVerifyPoolData(data);
-        instance.createPoolSetup(poolNftId, initialSetup);
+            IComponent component,
+            address owner,
+            IInstance instance,
+            NftId instanceNftId
+        ) = _checkComponentForRegistration(
+            poolAddress,
+            POOL(),
+            POOL_OWNER_ROLE());
+
+        IPoolComponent pool = IPoolComponent(poolAddress);
+        IRegistry.ObjectInfo memory registryInfo = getRegistryService().registerPool(pool, owner);
+        pool.linkToRegisteredNftId();
+        poolNftId = registryInfo.nftId;
+
+        // amend component info with pool specific token handler
+        IComponents.ComponentInfo memory componentInfo = pool.getComponentInfo();
+        componentInfo.tokenHandler = new TokenHandler(address(componentInfo.token));
+
+        // save amended component info with instance
+        instance.createPoolSetup(poolNftId, componentInfo);
+
+        bytes4[][] memory selectors = new bytes4[][](2);
+        selectors[0] = new bytes4[](1);
+        selectors[1] = new bytes4[](1);
+
+        selectors[0][0] = IPoolComponent.setFees.selector;
+        selectors[1][0] = IPoolComponent.verifyApplication.selector;
+
+        RoleId[] memory roles = new RoleId[](2);
+        roles[0] = POOL_OWNER_ROLE();
+        roles[1] = POLICY_SERVICE_ROLE();
 
-        getInstanceService().createTarget(instanceNftId, poolAddress, name);
+        getInstanceService().createGifTarget(
+            instanceNftId, 
+            poolAddress, 
+            pool.getName(), 
+            selectors, 
+            roles);
     }
 
-    function _decodeAndVerifyPoolData(bytes memory data) 
-        internal 
-        returns(string memory name, ISetup.PoolSetupInfo memory setup)
+
+    function setMaxCapitalAmount(uint256 maxCapitalAmount)
+        external
+        virtual
     {
-        (name, setup) = abi.decode(
-            data,
-            (string, ISetup.PoolSetupInfo)
-        );
+        (IRegistry.ObjectInfo memory registryInfo, IInstance instance) = _getAndVerifyComponentInfoAndInstance(POOL());
+        InstanceReader instanceReader = instance.getInstanceReader();
+        NftId poolNftId = registryInfo.nftId;
 
-        // TODO add checks
-        /*IRegistry _registry = getRegistry();
+        IComponents.ComponentInfo memory componentInfo = instanceReader.getComponentInfo(poolNftId);
+        IComponents.PoolInfo memory poolInfo = abi.decode(componentInfo.data, (IComponents.PoolInfo));
+        uint256 previousMaxCapitalAmount = poolInfo.maxCapitalAmount;
 
-        if(wallet == address(0)) {
-            revert WalletIsZero();
-        }
+        poolInfo.maxCapitalAmount = maxCapitalAmount;
+        componentInfo.data = abi.encode(poolInfo);
+        instance.updatePoolSetup(poolNftId, componentInfo, KEEP_STATE());
+
+        emit LogPoolServiceMaxCapitalAmountUpdated(poolNftId, previousMaxCapitalAmount, maxCapitalAmount);
+    }
+
+    function setBundleOwnerRole(RoleId bundleOwnerRole)
+        external
+        virtual
+    {
+        (IRegistry.ObjectInfo memory registryInfo, IInstance instance) = _getAndVerifyComponentInfoAndInstance(POOL());
+        InstanceReader instanceReader = instance.getInstanceReader();
+        NftId poolNftId = registryInfo.nftId;
 
-        ObjectType tokenType = _registry.getObjectInfo(address(token)).objectType;
+        IComponents.ComponentInfo memory componentInfo = instanceReader.getComponentInfo(poolNftId);
+        IComponents.PoolInfo memory poolInfo = abi.decode(componentInfo.data, (IComponents.PoolInfo));
 
-        if(tokenType != TOKEN()) {
-            revert InvalidToken();
-        } 
+        // bundle owner role may only be set once per pool
+        if(poolInfo.bundleOwnerRole != PUBLIC_ROLE()) {
+            revert ErrorPoolServiceBundleOwnerRoleAlreadySet(poolNftId);
+        }
 
-        if(UFixedLib.eqz(info.collateralizationLevel)) { 
-            revert CollateralizationLevelIsZero();
-        }*/
+        poolInfo.bundleOwnerRole = bundleOwnerRole;
+        componentInfo.data = abi.encode(poolInfo);
+        instance.updatePoolSetup(poolNftId, componentInfo, KEEP_STATE());
+
+        emit LogPoolServiceBundleOwnerRoleSet(poolNftId, bundleOwnerRole);
     }
 
+
     function setFees(
         Fee memory poolFee,
         Fee memory stakingFee,
         Fee memory performanceFee
     )
         external
-        override
+        virtual
     {
-        (IRegistry.ObjectInfo memory poolInfo, IInstance instance) = _getAndVerifyComponentInfoAndInstance(POOL());
+        (IRegistry.ObjectInfo memory registryInfo, IInstance instance) = _getAndVerifyComponentInfoAndInstance(POOL());
         InstanceReader instanceReader = instance.getInstanceReader();
-        NftId poolNftId = poolInfo.nftId;
-
-        ISetup.PoolSetupInfo memory poolSetupInfo = instanceReader.getPoolSetupInfo(poolNftId);
-        poolSetupInfo.poolFee = poolFee;
-        poolSetupInfo.stakingFee = stakingFee;
-        poolSetupInfo.performanceFee = performanceFee;
-        
-        instance.updatePoolSetup(poolNftId, poolSetupInfo, KEEP_STATE());
+        NftId poolNftId = registryInfo.nftId;
+
+        IComponents.ComponentInfo memory componentInfo = instanceReader.getComponentInfo(poolNftId);
+        IComponents.PoolInfo memory poolInfo = abi.decode(componentInfo.data, (IComponents.PoolInfo));
+
+        poolInfo.poolFee = poolFee;
+        poolInfo.stakingFee = stakingFee;
+        poolInfo.performanceFee = performanceFee;
+        componentInfo.data = abi.encode(poolInfo);
+        instance.updatePoolSetup(poolNftId, componentInfo, KEEP_STATE());
+
+        // TODO add logging
     }
 }

package/contracts/instance/service/PoolServiceManager.sol

@@ -16,7 +16,7 @@ contract PoolServiceManager is ProxyManager {
     constructor(
         address registryAddress
     )
-        ProxyManager()
+        ProxyManager(registryAddress)
     {
         PoolService poolSrv = new PoolService();
         bytes memory data = abi.encode(registryAddress, address(this));

package/contracts/instance/service/ProductService.sol

@@ -60,11 +60,11 @@ contract ProductService is ComponentService, IProductService {
         address initialOwner;
         (registryAddress, initialOwner) = abi.decode(data, (address, address));
 
-        _initializeService(registryAddress, owner);
+        initializeService(registryAddress, owner);
 
-        _poolService = IPoolService(_registry.getServiceAddress(POOL(), getMajorVersion()));
+        _poolService = IPoolService(getRegistry().getServiceAddress(POOL(), getMajorVersion()));
 
-        _registerInterface(type(IProductService).interfaceId);
+        registerInterface(type(IProductService).interfaceId);
     }
 
 
@@ -73,7 +73,7 @@ contract ProductService is ComponentService, IProductService {
         returns(NftId productNftId)
     {
         (
-            IComponent product,
+            IComponent component,
             address owner,
             IInstance instance,
             NftId instanceNftId
@@ -82,37 +82,28 @@ contract ProductService is ComponentService, IProductService {
             PRODUCT(),
             PRODUCT_OWNER_ROLE());
 
-        (
-            IRegistry.ObjectInfo memory productInfo,
-            bytes memory data
-        ) = getRegistryService().registerProduct(product, owner);
-
+        IProductComponent product = IProductComponent(productAddress);
+        IRegistry.ObjectInfo memory productInfo = getRegistryService().registerProduct(product, owner);
         productNftId = productInfo.nftId;
         _createProductSetup(
             instance, 
             product, 
-            productNftId, 
-            data);
+            productNftId);
     }
 
 
     function _createProductSetup(
         IInstance instance, 
-        IComponent product, 
-        NftId productNftId, 
-        bytes memory data
+        IProductComponent product, 
+        NftId productNftId 
     )
         internal
         returns (string memory name)
     {
-        (
-            string memory name, 
-            ISetup.ProductSetupInfo memory setup
-        ) = _decodeAndVerifyProductData(data);
-
         // wire distribution and pool components to product component
-        IComponent distribution = IComponent(_registry.getObjectInfo(setup.distributionNftId).objectAddress);
-        IComponent pool = IComponent(_registry.getObjectInfo(setup.poolNftId).objectAddress);
+        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);
@@ -120,13 +111,22 @@ contract ProductService is ComponentService, IProductService {
         product.linkToRegisteredNftId();
 
         // create product setup in instance
-        instance.createProductSetup(productNftId, setup);
+        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().createTarget(
-            _registry.getNftId(address(instance)), 
+        getInstanceService().createGifTarget(
+            getRegistry().getNftId(address(instance)), 
             address(product), 
-            name);
+            product.getName(),
+            selectors,
+            roles);
     }
 
     function getDomain() public pure override(IService, Service) returns(ObjectType) {
@@ -148,13 +148,13 @@ contract ProductService is ComponentService, IProductService {
         //     revert WalletIsZero();
         // }
 
-        // IRegistry.ObjectInfo memory tokenInfo = _registry.getObjectInfo(address(info.token));
+        // IRegistry.ObjectInfo memory tokenInfo = getRegistry().getObjectInfo(address(info.token));
 
         // if(tokenInfo.objectType != TOKEN()) {
         //     revert InvalidToken();
         // } 
 
-        // IRegistry.ObjectInfo memory poolInfo = _registry.getObjectInfo(info.poolNftId);
+        // IRegistry.ObjectInfo memory poolInfo = getRegistry().getObjectInfo(info.poolNftId);
 
         // if(poolInfo.objectType != POOL()) {
         //     revert InvalidPool();
@@ -168,7 +168,7 @@ contract ProductService is ComponentService, IProductService {
         // //require(tokenInfo.objectAddress == address(poolSetup.token), "ERROR:COS-018:PRODUCT_POOL_TOKEN_MISMATCH");
         // // TODO pool is not linked
 
-        // IRegistry.ObjectInfo memory distributionInfo = _registry.getObjectInfo(info.distributionNftId);
+        // IRegistry.ObjectInfo memory distributionInfo = getRegistry().getObjectInfo(info.distributionNftId);
 
         // if(distributionInfo.objectType != DISTRIBUTION()) {
         //     revert  InvalidDistribution();

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

@@ -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,7 +3,6 @@ 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";
@@ -14,13 +13,16 @@ interface IRegistry is IERC165 {
     event LogRegistration(NftId nftId, NftId parentNftId, ObjectType objectType, bool isInterceptor, address objectAddress, address initialOwner);
     event LogServiceRegistration(VersionPart majorVersion, ObjectType domain);
 
+    // registerService()
+    error CallerNotReleaseManager();
+    error ServiceAlreadyRegistered(address service);
+
     // register()
     error CallerNotRegistryService();
     error ServiceRegistration();
 
-    // registerService()
-    error CallerNotReleaseManager();
-    error ServiceAlreadyRegistered(address service);
+    // registerWithCustomTypes()
+    error CoreTypeRegistration();
 
     // _register()
     error ZeroParentAddress();
@@ -52,11 +54,13 @@ interface IRegistry is IERC165 {
 
     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);
 
@@ -80,12 +84,18 @@ interface IRegistry is IERC165 {
 
     function isRegisteredService(address contractAddress) external view returns (bool);
 
+    function isRegisteredComponent(address object) external view returns (bool);
+
+    function isValidRelease(VersionPart version) external view returns (bool);
+
     function getServiceAddress(
         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

@@ -35,21 +35,30 @@ interface IRegistryService is
      struct FunctionConfig
      {
           ObjectType serviceDomain;
-          bytes4 selector;
+          bytes4[] selectors;
      }
 
+     function getFunctionConfigs()
+          external
+          pure
+          returns(
+               FunctionConfig[] memory config
+          );
+
      // TODO used by service -> add owner arg 
-     function registerInstance(IRegisterable instance)
-          external returns(IRegistry.ObjectInfo memory info, bytes memory data); 
+     function registerInstance(IRegisterable instance, address owner)
+          external returns(IRegistry.ObjectInfo memory info); 
 
      function registerProduct(IComponent product, address owner)
-          external returns(IRegistry.ObjectInfo memory info, bytes memory data);
+          external returns(IRegistry.ObjectInfo memory info);
 
      function registerPool(IComponent pool, address owner)
-          external returns(IRegistry.ObjectInfo memory info, bytes memory data);
+          external returns(IRegistry.ObjectInfo memory info);
 
      function registerDistribution(IComponent distribution, address owner)
-          external returns(IRegistry.ObjectInfo memory info, bytes memory data);
+          external returns(IRegistry.ObjectInfo memory info);
+
+     function registerDistributor(IRegistry.ObjectInfo memory info) external returns(NftId nftId);
 
      function registerPolicy(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;
 }