@etherisc/gif-next 0.0.2-b9e43cf-870 → 0.0.2-bad4d33-850

package/contracts/instance/service/BundleService.sol

@@ -24,17 +24,16 @@ import {TimestampLib, zeroTimestamp} from "../../types/Timestamp.sol";
 import {IService} from "../../shared/IService.sol";
 import {Service} from "../../shared/Service.sol";
 import {BundleManager} from "../BundleManager.sol";
-import {ComponentServiceBase} from "../base/ComponentServiceBase.sol";
+import {ComponentService} from "../base/ComponentService.sol";
 import {IBundleService} from "./IBundleService.sol";
 import {IRegistryService} from "../../registry/IRegistryService.sol";
 import {InstanceService} from "../InstanceService.sol";
 import {InstanceReader} from "../InstanceReader.sol";
-import {IBaseComponent} from "../../components/IBaseComponent.sol";
 
 string constant BUNDLE_SERVICE_NAME = "BundleService";
 
 contract BundleService is 
-    ComponentServiceBase, 
+    ComponentService, 
     IBundleService 
 {
     using NftIdLib for NftId;

package/contracts/instance/service/DistributionService.sol

@@ -19,14 +19,14 @@ import {Versionable} from "../../shared/Versionable.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 {InstanceService} from "../InstanceService.sol";
+import {IComponent} from "../../components/IComponent.sol";
+import {IDistributionComponent} from "../../components/IDistributionComponent.sol";
 import {IDistributionService} from "./IDistributionService.sol";
-import {IBaseComponent} from "../../components/IBaseComponent.sol";
-
 
 contract DistributionService is
-    ComponentServiceBase,
+    ComponentService,
     IDistributionService
 {
     using NftIdLib for NftId;
@@ -59,45 +59,31 @@ contract DistributionService is
         external
         returns(NftId distributionNftId)
     {
-        address distributionOwner = msg.sender;
-        IBaseComponent distribution = IBaseComponent(distributionAddress);
-
-        IRegistry.ObjectInfo memory info;
-        bytes memory data;
-        (info, data) = getRegistryService().registerDistribution(distribution, distributionOwner);
-
-        NftId instanceNftId = info.parentNftId;
-        IInstance instance = _getInstance(instanceNftId);
-        InstanceService instanceService = getInstanceService();
-
-        bool hasRole = instanceService.hasRole(
-            distributionOwner, 
-            DISTRIBUTION_OWNER_ROLE(), 
-            address(instance));
-
-        if(!hasRole) {
-            revert ExpectedRoleMissing(DISTRIBUTION_OWNER_ROLE(), distributionOwner);
-        }
-
-        distributionNftId = info.nftId;
-        string memory distributionName;
-        ISetup.DistributionSetupInfo memory initialSetup;
-        (distributionName, initialSetup) = _decodeAndVerifyDistributionData(data);
-        instance.createDistributionSetup(distributionNftId, initialSetup);
-
-        instanceService.createTarget(instanceNftId, distributionAddress, distributionName);
-
+        (
+            IComponent component,
+            address owner,
+            IInstance instance,
+            NftId instanceNftId
+        ) = _checkComponentForRegistration(
+            distributionAddress,
+            DISTRIBUTION(),
+            DISTRIBUTION_OWNER_ROLE());
+
+        IRegistry.ObjectInfo memory distributionInfo = getRegistryService().registerDistribution(component, owner);
+        IDistributionComponent distribution = IDistributionComponent(distributionAddress);
         distribution.linkToRegisteredNftId();
+        distributionNftId = distributionInfo.nftId;
+
+        instance.createDistributionSetup(distributionNftId, distribution.getSetupInfo());
+        getInstanceService().createGifTarget(instanceNftId, distributionAddress, distribution.getName());
+        getInstanceService().grantDistributionDefaultPermissions(instanceNftId, distributionAddress, distribution.getName());
     }
 
     function _decodeAndVerifyDistributionData(bytes memory data)
         internal 
-        returns(string memory name, ISetup.DistributionSetupInfo memory setup)
+        returns(string memory name)
     {
-        (name, setup) = abi.decode(
-            data,
-            (string, ISetup.DistributionSetupInfo)
-        );
+        (name) = abi.decode(data, (string));
 
         // TODO add checks if applicable 
     }

package/contracts/instance/service/PolicyService.sol

@@ -4,7 +4,6 @@ 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 {IPoolComponent} from "../../components/IPoolComponent.sol";
 import {IDistributionComponent} from "../../components/IDistributionComponent.sol";
 import {IInstance} from "../IInstance.sol";
@@ -35,14 +34,14 @@ import {Version, VersionLib} from "../../types/Version.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 {IPolicyService} from "./IPolicyService.sol";
 import {InstanceReader} from "../InstanceReader.sol";
 import {IPoolService} from "./IPoolService.sol";
 import {IBundleService} from "./IBundleService.sol";
 
 
-contract PolicyService is ComponentServiceBase, IPolicyService {
+contract PolicyService is ComponentService, IPolicyService {
     using NftIdLib for NftId;
     using TimestampLib for Timestamp;
 

package/contracts/instance/service/PoolService.sol

@@ -24,17 +24,18 @@ import {TimestampLib, zeroTimestamp} from "../../types/Timestamp.sol";
 import {IService} from "../../shared/IService.sol";
 import {Service} from "../../shared/Service.sol";
 import {BundleManager} from "../BundleManager.sol";
-import {ComponentServiceBase} from "../base/ComponentServiceBase.sol";
+import {ComponentService} from "../base/ComponentService.sol";
 import {IPoolService} from "./IPoolService.sol";
 import {IRegistryService} from "../../registry/IRegistryService.sol";
 import {InstanceService} from "../InstanceService.sol";
 import {InstanceReader} from "../InstanceReader.sol";
-import {IBaseComponent} from "../../components/IBaseComponent.sol";
+import {IComponent} from "../../components/IComponent.sol";
+import {IPoolComponent} from "../../components/IPoolComponent.sol";
 
 string constant POOL_SERVICE_NAME = "PoolService";
 
 contract PoolService is 
-    ComponentServiceBase, 
+    ComponentService, 
     IPoolService 
 {
     using NftIdLib for NftId;
@@ -67,60 +68,24 @@ contract PoolService is
         external
         returns(NftId poolNftId)
     {
-        address poolOwner = msg.sender;
-        IBaseComponent pool = IBaseComponent(poolAddress);
-
-        IRegistry.ObjectInfo memory info;
-        bytes memory data;
-        (info, data) = getRegistryService().registerPool(pool, poolOwner);
-
-        NftId instanceNftId = info.parentNftId;
-        IInstance instance = _getInstance(instanceNftId);
-        bool hasRole = getInstanceService().hasRole(
-            poolOwner, 
-            POOL_OWNER_ROLE(), 
-            address(instance));
-
-        if(!hasRole) {
-            revert ExpectedRoleMissing(POOL_OWNER_ROLE(), poolOwner);
-        }
-
-        poolNftId = info.nftId;
-        string memory poolName;
-        ISetup.PoolSetupInfo memory initialSetup;
-        (poolName, initialSetup) = _decodeAndVerifyPoolData(data);
-        instance.createPoolSetup(poolNftId, initialSetup);
-
-        getInstanceService().createTarget(instanceNftId, poolAddress, poolName);
-
+        (
+            IComponent component,
+            address owner,
+            IInstance instance,
+            NftId instanceNftId
+        ) = _checkComponentForRegistration(
+            poolAddress,
+            POOL(),
+            POOL_OWNER_ROLE());
+
+        IPoolComponent pool = IPoolComponent(poolAddress);
+        IRegistry.ObjectInfo memory poolInfo = getRegistryService().registerPool(pool, owner);
         pool.linkToRegisteredNftId();
-    }
-
-    function _decodeAndVerifyPoolData(bytes memory data) 
-        internal 
-        returns(string memory name, ISetup.PoolSetupInfo memory setup)
-    {
-        (name, setup) = abi.decode(
-            data,
-            (string, ISetup.PoolSetupInfo)
-        );
-
-        // TODO add checks
-        /*IRegistry _registry = getRegistry();
-
-        if(wallet == address(0)) {
-            revert WalletIsZero();
-        }
-
-        ObjectType tokenType = _registry.getObjectInfo(address(token)).objectType;
-
-        if(tokenType != TOKEN()) {
-            revert InvalidToken();
-        } 
+        poolNftId = poolInfo.nftId;
 
-        if(UFixedLib.eqz(info.collateralizationLevel)) { 
-            revert CollateralizationLevelIsZero();
-        }*/
+        instance.createPoolSetup(poolNftId, pool.getSetupInfo());
+        getInstanceService().createGifTarget(instanceNftId, poolAddress, pool.getName());
+        getInstanceService().grantPoolDefaultPermissions(instanceNftId, poolAddress, pool.getName());
     }
 
     function setFees(

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";
@@ -35,13 +35,13 @@ 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";
 
 // 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;
 
     IPoolService internal _poolService;
@@ -68,44 +68,64 @@ contract ProductService is ComponentServiceBase, IProductService {
     }
 
 
-    function getDomain() public pure override(IService, Service) returns(ObjectType) {
-        return PRODUCT();
-    }
-
     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);
-
-        NftId instanceNftId = info.parentNftId;
-        IInstance instance = _getInstance(instanceNftId);
-        bool hasRole = getInstanceService().hasRole(
-            productOwner, 
-            PRODUCT_OWNER_ROLE(), 
-            address(instance));
+        (
+            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);
+    }
 
-        if(!hasRole) {
-            revert ExpectedRoleMissing(PRODUCT_OWNER_ROLE(), productOwner);
-        }
 
-        productNftId = info.nftId;
-        string memory productName;
-        ISetup.ProductSetupInfo memory initialSetup;
-        (productName, initialSetup) = _decodeAndVerifyProductData(data);
+    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(_registry.getObjectInfo(setup.distributionNftId).objectAddress);
+        IComponent pool = IComponent(_registry.getObjectInfo(setup.poolNftId).objectAddress);
+
+        distribution.setProductNftId(productNftId);
+        pool.setProductNftId(productNftId);
+        product.setProductNftId(productNftId);
+        product.linkToRegisteredNftId();
 
-        instance.createProductSetup(productNftId, initialSetup);
+        // create product setup in instance
+        instance.createProductSetup(productNftId, product.getSetupInfo());
 
-        getInstanceService().createTarget(instanceNftId, productAddress, productName);
+        // create target for instane access manager
+        getInstanceService().createGifTarget(
+            _registry.getNftId(address(instance)), 
+            address(product), 
+            product.getName());
+        getInstanceService().grantProductDefaultPermissions(instance.getNftId(), address(product), product.getName());
+    }
 
-        product.linkToRegisteredNftId();
+    function getDomain() public pure override(IService, Service) returns(ObjectType) {
+        return PRODUCT();
     }
 
+
     function _decodeAndVerifyProductData(bytes memory data) 
         internal 
         returns(string memory name, ISetup.ProductSetupInfo memory setup)

package/contracts/registry/IRegistry.sol

@@ -14,13 +14,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 +55,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 getMajorVersionMax() external view returns (VersionPart);
+    function getInitialVersion() external view returns (VersionPart);
 
-    function getMajorVersion() external view returns (VersionPart);
+    function getNextVersion() external view returns (VersionPart);
+
+    function getLatestVersion() external view returns (VersionPart);
 
     function getReleaseInfo(VersionPart version) external view returns (ReleaseInfo memory);
 
@@ -80,6 +85,8 @@ interface IRegistry is IERC165 {
 
     function isRegisteredService(address contractAddress) external view returns (bool);
 
+    function isValidRelease(VersionPart version) external view returns (bool);
+
     function getServiceAddress(
         ObjectType serviceDomain, 
         VersionPart releaseVersion

package/contracts/registry/IRegistryService.sol

@@ -10,7 +10,7 @@ import {IService} from "../shared/IService.sol";
 import {IRegistry} from "./IRegistry.sol";
 
 import {IRegisterable} from "../shared/IRegisterable.sol";
-import {IBaseComponent} from "../components/IBaseComponent.sol";
+import {IComponent} from "../components/IComponent.sol";
 
 interface IRegistryService is 
      IService, 
@@ -38,18 +38,25 @@ interface IRegistryService is
           bytes4 selector;
      }
 
+    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(IBaseComponent product, address owner)
-          external returns(IRegistry.ObjectInfo memory info, bytes memory data);
+     function registerProduct(IComponent product, address owner)
+          external returns(IRegistry.ObjectInfo memory info);
 
-     function registerPool(IBaseComponent pool, address owner)
-          external returns(IRegistry.ObjectInfo memory info, bytes memory data);
+     function registerPool(IComponent pool, address owner)
+          external returns(IRegistry.ObjectInfo memory info);
 
-     function registerDistribution(IBaseComponent distribution, address owner)
-          external returns(IRegistry.ObjectInfo memory info, bytes memory data);
+     function registerDistribution(IComponent distribution, address owner)
+          external returns(IRegistry.ObjectInfo memory info);
 
      function registerPolicy(IRegistry.ObjectInfo memory info) external returns(NftId nftId);