@etherisc/gif-next 0.0.2-743affe-003 → 0.0.2-7878646-744

package/contracts/experiment/cloning/Cloner.sol

@@ -0,0 +1,47 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.20;
+
+import {Clones} from "@openzeppelin/contracts/proxy/Clones.sol";
+
+
+contract Cloner {
+
+    Mock1 public mock1;
+    Mock2 public mock2;
+
+    constructor() {
+        mock1 = new Mock1();
+        mock2 = new Mock2();
+    }
+
+    function createClone(address master)
+        external 
+        returns (address cloned)
+    {
+        cloned = Clones.clone(master);
+    }
+}
+
+
+contract Mock1 {
+    function getValue() external virtual view returns (uint256) {
+        return 42;
+    }
+}
+
+contract Mock2 is Mock1 {
+    uint256 internal _value;
+
+    constructor() {
+        _value = 42;
+    }
+
+    function setValue(uint256 value) external virtual {
+        _value = value;
+    }
+
+    function getValue() external virtual override view returns (uint256) {
+        return _value;
+    }
+}
+

package/contracts/instance/IInstance.sol

@@ -1,14 +1,13 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.19;
 
-import {IERC165} from "@openzeppelin5/contracts/utils/introspection/IERC165.sol";
+import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
 
+import {INftOwnable} from "../shared/INftOwnable.sol";
 import {IVersionable} from "../shared/IVersionable.sol";
 import {IRegisterable} from "../shared/IRegisterable.sol";
-import {IOwnable} from "../shared/IOwnable.sol";
 import {RoleId} from "../types/RoleId.sol";
 
-import {IAccessModule} from "./module/access/IAccess.sol";
 import {IBundleModule} from "./module/bundle/IBundle.sol";
 import {IDistributionModule} from "./module/distribution/IDistribution.sol";
 import {IComponentModule} from "./module/component/IComponent.sol";
@@ -18,7 +17,7 @@ import {IRiskModule} from "./module/risk/IRisk.sol";
 import {ITreasuryModule} from "./module/treasury/ITreasury.sol";
 
 import {IKeyValueStore} from "./base/IKeyValueStore.sol";
-import {IRegistry} from "../registry/IRegistryLinked.sol";
+import {IRegistry} from "../registry/IRegistry.sol";
 
 import {IComponentOwnerService} from "./service/IComponentOwnerService.sol";
 import {IDistributionService} from "./service/IDistributionService.sol";
@@ -31,7 +30,6 @@ interface IInstance is
     IERC165,
     IVersionable,
     IRegisterable,
-    IAccessModule,
     IPolicyModule,
     IPoolModule,
     IRiskModule,
@@ -41,8 +39,8 @@ interface IInstance is
     IDistributionModule,
     IInstanceBase
 {
-    function getRegistry() external view override (IPolicyModule, IRegisterable) returns (IRegistry registry);
-    function getOwner() external view override (IOwnable, IAccessModule) returns(address owner);
+    function getRegistry() external view override (INftOwnable) returns (IRegistry registry);
+    function getOwner() external view override returns(address owner);
 
     function getKeyValueStore() external view override (IInstanceBase) returns (IKeyValueStore keyValueStore);
 

package/contracts/instance/Instance.sol

@@ -2,10 +2,11 @@
 pragma solidity ^0.8.19;
 
 import {NftId} from "../types/NftId.sol";
+import {INftOwnable} from "../shared/INftOwnable.sol";
+import {NftOwnable} from "../shared/NftOwnable.sol";
 import {RoleId} from "../types/RoleId.sol";
 
 import {InstanceBase} from "./base/InstanceBase.sol";
-import {AccessModule} from "./module/access/Access.sol";
 import {ComponentModule} from "./module/component/ComponentModule.sol";
 import {DistributionModule} from "./module/distribution/DistributionModule.sol";
 import {PolicyModule} from "./module/policy/PolicyModule.sol";
@@ -16,7 +17,6 @@ import {TreasuryModule} from "./module/treasury/TreasuryModule.sol";
 
 import {IRegistry} from "../registry/IRegistry.sol";
 import {Registerable} from "../shared/Registerable.sol";
-import {IAccessModule} from "./module/access/IAccess.sol";
 import {IBundleModule} from "./module/bundle/IBundle.sol";
 import {IComponentModule} from "./module/component/IComponent.sol";
 import {IPoolModule} from "./module/pool/IPoolModule.sol";
@@ -33,7 +33,6 @@ import {IKeyValueStore} from "./base/IKeyValueStore.sol";
 
 contract Instance is
     InstanceBase,
-    AccessModule,
     BundleModule,
     ComponentModule,
     DistributionModule,
@@ -48,7 +47,6 @@ contract Instance is
         address initialOwner
     )
         InstanceBase(registry, registryNftId, initialOwner)
-        AccessModule()
         BundleModule()
         DistributionModule()
         ComponentModule()
@@ -72,7 +70,7 @@ contract Instance is
         _;
     }
 
-    function getRegistry() public view override (Registerable, IPolicyModule) returns (IRegistry registry) { return super.getRegistry(); }
+    function getRegistry() public view override (INftOwnable, NftOwnable) returns (IRegistry registry) { return super.getRegistry(); }
 
     function getKeyValueStore() public view override (InstanceBase) returns (IKeyValueStore keyValueStore) { return super.getKeyValueStore(); }
 
@@ -81,5 +79,5 @@ contract Instance is
     function getProductService() external view override (IBundleModule, IPolicyModule, IInstanceBase) returns(IProductService service) { return _productService; }
     function getPoolService() external view override (IBundleModule, IPoolModule, IInstanceBase) returns(IPoolService service) { return _poolService; }
 
-    function getOwner() public view override (IAccessModule, Registerable) returns(address owner) { return super.getOwner(); }
+    function getOwner() public view override (INftOwnable, NftOwnable) returns(address owner) { return super.getOwner(); }
 }

package/contracts/instance/base/ServiceBase.sol

@@ -6,6 +6,7 @@ import {ObjectType, SERVICE} from "../../types/ObjectType.sol";
 import {Version, VersionPart, VersionLib} from "../../types/Version.sol";
 
 import {Registerable} from "../../shared/Registerable.sol";
+import {IRegistry} from "../../registry/IRegistry.sol";
 import {IVersionable} from "../../shared/IVersionable.sol";
 import {Versionable} from "../../shared/Versionable.sol";
 

package/contracts/instance/module/component/ComponentModule.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {IERC20Metadata} from "@openzeppelin5/contracts/token/ERC20/extensions/IERC20Metadata.sol";
+import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 import {IKeyValueStore} from "../../base/IKeyValueStore.sol";
 import {IComponentModule} from "./IComponent.sol";
 

package/contracts/instance/module/component/IComponent.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {IERC20Metadata} from "@openzeppelin5/contracts/token/ERC20/extensions/IERC20Metadata.sol";
+import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 import {IComponentOwnerService} from "../../service/IComponentOwnerService.sol";
 
 import {StateId} from "../../../types/StateId.sol";

package/contracts/instance/module/policy/IPolicy.sol

@@ -56,7 +56,7 @@ interface IPolicyModule is IPolicy {
     ) external view returns (PolicyInfo memory info);
 
     // repeat registry linked signature
-    function getRegistry() external view returns (IRegistry registry);
+    // function getRegistry() external view returns (IRegistry registry);
 
     // repeat service linked signature to avoid linearization issues
     function getProductService() external  returns(IProductService);

package/contracts/instance/module/treasury/ITreasury.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {IERC20Metadata} from "@openzeppelin5/contracts/token/ERC20/extensions/IERC20Metadata.sol";
+import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 import {IDistributionComponent} from "../../../components/IDistributionComponent.sol";
 import {IPoolComponent} from "../../../components/IPoolComponent.sol";
 import {IProductComponent} from "../../../components/IProductComponent.sol";

package/contracts/instance/module/treasury/TokenHandler.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {IERC20Metadata} from "@openzeppelin5/contracts/token/ERC20/extensions/IERC20Metadata.sol";
+import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 
 import {NftId} from "../../../types/NftId.sol";
 

package/contracts/instance/module/treasury/TreasuryModule.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {IERC20Metadata} from "@openzeppelin5/contracts/token/ERC20/extensions/IERC20Metadata.sol";
+import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 import {IDistributionComponent} from "../../../components/IDistributionComponent.sol";
 import {IPoolComponent} from "../../../components/IPoolComponent.sol";
 import {IProductComponent} from "../../../components/IProductComponent.sol";
@@ -9,7 +9,7 @@ import {IProductComponent} from "../../../components/IProductComponent.sol";
 import {NftId} from "../../../types/NftId.sol";
 import {TREASURY} from "../../../types/ObjectType.sol";
 import {Fee, FeeLib} from "../../../types/Fee.sol";
-import {UFixed, UFixedMathLib} from "../../../types/UFixed.sol";
+import {UFixed, UFixedLib} from "../../../types/UFixed.sol";
 import {TokenHandler} from "./TokenHandler.sol";
 import {IKeyValueStore} from "../../base/IKeyValueStore.sol";
 import {ITreasuryModule} from "./ITreasury.sol";
@@ -118,7 +118,7 @@ abstract contract TreasuryModule is
     function getUFixed(
         uint256 a
     ) external pure override returns (UFixed) {
-        return UFixedMathLib.toUFixed(a);
+        return UFixedLib.toUFixed(a);
     }
 
     function getUFixed(
@@ -126,6 +126,6 @@ abstract contract TreasuryModule is
         int8 exp
     ) external pure returns (UFixed)
     {
-        return UFixedMathLib.toUFixed(a, exp);
+        return UFixedLib.toUFixed(a, exp);
     }
 }

package/contracts/instance/service/ComponentOwnerService.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {IERC20Metadata} from "@openzeppelin5/contracts/token/ERC20/extensions/IERC20Metadata.sol";
+import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 
 import {IRegistry} from "../../registry/IRegistry.sol";
 import {IInstance} from "../IInstance.sol";
@@ -22,7 +22,7 @@ import {Key32} from "../../types/Key32.sol";
 import {NftId, NftIdLib, zeroNftId} from "../../types/NftId.sol";
 import {Fee} from "../../types/Fee.sol";
 import {Version, VersionLib} from "../../types/Version.sol";
-import {UFixed, UFixedMathLib} from "../../types/UFixed.sol";
+import {UFixed, UFixedLib} from "../../types/UFixed.sol";
 
 import {IDistributionComponent} from "../../components/IDistributionComponent.sol";
 import {IPoolComponent} from "../../components/IPoolComponent.sol";
@@ -94,44 +94,87 @@ contract ComponentOwnerService is
         return IRegistryService(service);
     }
 
-    // TODO if user passes type BUNDLE??? -> registerComponent() must catch this
-    function register(	
-        IBaseComponent component,
-        ObjectType componentType 	
+    function registerProduct(	
+        IBaseComponent product
     ) external returns (NftId nftId) {	
 
         // TODO some info parameters from component and from register may differ -> getObjectInfo() after registration?
         (
             IRegistry.ObjectInfo memory info,
             bytes memory data
-        ) = getRegistryService().registerComponent(component, componentType, msg.sender);	
+        ) = getRegistryService().registerProduct(
+            product,
+            msg.sender);	
 
         NftId instanceNftId = info.parentNftId;
-        address instancAddress = getRegistry().getObjectInfo(instanceNftId).objectAddress;
-        IInstance instance = IInstance(instancAddress);
-
-        RoleId typeRole = getRoleForType(componentType);
-        if(instance.hasRole(typeRole, msg.sender) == false) {
-            revert MissingTypeRole();
-        } 
-
-        // component type specific registration actions	
-        if (componentType == PRODUCT()) {	
-            _registerProduct(
-                    info.nftId, 
-                    instanceNftId,
-                    instance,
-                    data
-            );
-        } else if (componentType == POOL()) {	
-            _registerPool(
-                info.nftId,
+        address instanceAddress = getRegistry().getObjectInfo(instanceNftId).objectAddress;
+        IInstance instance = IInstance(instanceAddress);
+
+        RoleId typeRole = getRoleForType(PRODUCT());
+        // TODO refactor to use access manager infra
+        // if(instance.hasRole(typeRole, msg.sender) == false) {
+        //     revert MissingTypeRole();
+        // }
+        
+        _registerProduct(
+                info.nftId, 
                 instanceNftId,
                 instance,
                 data
-            );
-        }	
-        // TODO add distribution and oracle	
+        );
+    }
+
+    function registerPool(	
+        IBaseComponent pool
+    ) external returns (NftId nftId) {	
+
+        // TODO some info parameters from component and from register may differ -> getObjectInfo() after registration?
+        (
+            IRegistry.ObjectInfo memory info,
+            bytes memory data
+        ) = getRegistryService().registerPool(
+            pool,
+            msg.sender);	
+
+        NftId instanceNftId = info.parentNftId;
+        address instanceAddress = getRegistry().getObjectInfo(instanceNftId).objectAddress;
+        IInstance instance = IInstance(instanceAddress);
+
+        RoleId typeRole = getRoleForType(POOL());
+        // TODO refactor to use access manager infra
+        // if(instance.hasRole(typeRole, msg.sender) == false) {
+        //     revert MissingTypeRole();
+        // } 
+
+        _registerPool(
+            info.nftId,
+            instanceNftId,
+            instance,
+            data
+        );
+    }
+
+    function registerDistribution(	
+        IBaseComponent distribution
+    ) external returns (NftId nftId) {	
+
+        // TODO some info parameters from component and from register may differ -> getObjectInfo() after registration?
+        (
+            IRegistry.ObjectInfo memory info,
+            bytes memory data
+        ) = getRegistryService().registerDistribution(
+            distribution,
+            msg.sender);	
+
+        NftId instanceNftId = info.parentNftId;
+        address instanceAddress = getRegistry().getObjectInfo(instanceNftId).objectAddress;
+        IInstance instance = IInstance(instanceAddress);
+
+        RoleId typeRole = getRoleForType(DISTRIBUTION());
+        // TODO refactor to use access manager infra
+        // if(instance.hasRole(typeRole, msg.sender) == false) {
+        //     revert MissingTypeRole();
+        // }
     }
 
     function lock(
@@ -250,7 +293,7 @@ contract ComponentOwnerService is
             revert InvalidToken();
         } 
 
-        if(UFixedMathLib.eqz(info.collateralizationLevel)) { 
+        if(UFixedLib.eqz(info.collateralizationLevel)) { 
             revert CollateralizationLevelIsZero();
         }
 

package/contracts/instance/service/ProductService.sol

@@ -3,6 +3,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 {IPoolComponent} from "../../components/IPoolComponent.sol";
 import {IDistributionComponent} from "../../components/IDistributionComponent.sol";
 import {IInstance} from "../../instance/IInstance.sol";
@@ -17,7 +18,7 @@ import {IVersionable} from "../../shared/IVersionable.sol";
 import {Versionable} from "../../shared/Versionable.sol";
 
 import {Timestamp, zeroTimestamp} from "../../types/Timestamp.sol";
-import {UFixed, UFixedMathLib} from "../../types/UFixed.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} from "../../types/StateId.sol";
@@ -105,10 +106,10 @@ contract ProductService is ComponentServiceBase, IProductService {
         );
     }
 
-    function _getAndVerifyInstanceAndProduct() internal view returns (IProductComponent product) {
+    function _getAndVerifyInstanceAndProduct() internal view returns (Product product) {
         IRegistry.ObjectInfo memory productInfo;
         (productInfo,) = _getAndVerifyComponentInfoAndInstance(PRODUCT());
-        product = IProductComponent(productInfo.objectAddress);
+        product = Product(productInfo.objectAddress);
     }
 
     function calculatePremium(
@@ -130,7 +131,7 @@ contract ProductService is ComponentServiceBase, IProductService {
             uint256 distributionFeeAmount
         )
     {
-        IProductComponent product = _getAndVerifyInstanceAndProduct();
+        Product product = _getAndVerifyInstanceAndProduct();
         uint256 netPremiumAmount = product.calculateNetPremium(
             sumInsuredAmount,
             riskId,
@@ -157,7 +158,7 @@ contract ProductService is ComponentServiceBase, IProductService {
 
     function _calculateFeeAmounts(
         uint256 netPremiumAmount,
-        IProductComponent product,
+        Product product,
         NftId bundleNftId,
         ReferralId referralId
     )
@@ -393,7 +394,7 @@ contract ProductService is ComponentServiceBase, IProductService {
     }
 
     function calculateRequiredCollateral(UFixed collateralizationLevel, uint256 sumInsuredAmount) public pure override returns(uint256 collateralAmount) {
-        UFixed sumInsuredUFixed = UFixedMathLib.toUFixed(sumInsuredAmount);
+        UFixed sumInsuredUFixed = UFixedLib.toUFixed(sumInsuredAmount);
         UFixed collateralUFixed =  collateralizationLevel * sumInsuredUFixed;
         return collateralUFixed.toInt();
     } 

package/contracts/registry/ChainNft.sol

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {ERC721, ERC721Enumerable} from "@openzeppelin5/contracts/token/ERC721/extensions/ERC721Enumerable.sol";
-import {IERC721} from "@openzeppelin5/contracts/token/ERC721/IERC721.sol";
+import {ERC721, ERC721Enumerable} from "@openzeppelin/contracts/token/ERC721/extensions/ERC721Enumerable.sol";
+import {IERC721} from "@openzeppelin/contracts/token/ERC721/IERC721.sol";
 
 import {IChainNft} from "./IChainNft.sol";
 import {ITransferInterceptor} from "./ITransferInterceptor.sol";

package/contracts/registry/IChainNft.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {IERC721Enumerable} from "@openzeppelin5/contracts/token/ERC721/extensions/IERC721Enumerable.sol";
+import {IERC721Enumerable} from "@openzeppelin/contracts/token/ERC721/extensions/IERC721Enumerable.sol";
 
 interface IChainNft is IERC721Enumerable {
     function mint(

package/contracts/registry/IRegistry.sol

@@ -1,21 +1,19 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {IERC165} from "@openzeppelin5/contracts/utils/introspection/IERC165.sol";
+import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
 
-import {IOwnable} from "../shared/IOwnable.sol";
 import {NftId} from "../types/NftId.sol";
 import {ObjectType} from "../types/ObjectType.sol";
 import {VersionPart} from "../types/Version.sol";
 import {IChainNft} from "./IChainNft.sol";
 
-interface IRegistry is IERC165, IOwnable {
+interface IRegistry is IERC165 {
 
-    event LogRegistration(NftId indexed nftId, NftId parentNftId, ObjectType objectType, address objectAddress, address initialOwner);
+    event LogRegistration(ObjectInfo info);
 
     event LogServiceNameRegistration(string serviceName, VersionPart majorVersion); 
 
-    event LogApproval(NftId indexed nftId, ObjectType objectType);
 
     struct ObjectInfo {
         NftId nftId;
@@ -29,33 +27,17 @@ interface IRegistry is IERC165, IOwnable {
 
     function register(ObjectInfo memory info) external returns (NftId nftId);
     
-    function registerFrom(
-        address from, 
-        ObjectInfo memory info
-    ) external returns (NftId nftId);
-
-    function approve(
-        NftId registrar,
-        ObjectType object,
-        ObjectType parent
-    ) external;
-
-    function allowance(
-        NftId registrar,
-        ObjectType object
-    ) external view returns (bool);
 
     function getObjectCount() external view returns (uint256);
 
-    //nftIdOf
     function getNftId(address objectAddress) external view returns (NftId nftId);
 
     function ownerOf(NftId nftId) external view returns (address);
 
     function ownerOf(address contractAddress) external view returns (address);
-    // infoOf()
+
     function getObjectInfo(NftId nftId) external view returns (ObjectInfo memory info);
-    // infoOf()
+
     function getObjectInfo(address object) external view returns (ObjectInfo memory info);
 
     function isRegistered(NftId nftId) external view returns (bool);
@@ -69,7 +51,7 @@ interface IRegistry is IERC165, IOwnable {
         VersionPart majorVersion
     ) external view returns (address serviceAddress);
 
-    function getProtocolOwner() external view returns (address);
-
     function getChainNft() external view returns (IChainNft);
+
+    function getOwner() external view returns (address);
 }

package/contracts/registry/IRegistryService.sol

@@ -16,12 +16,18 @@ interface IRegistryService is IService {
 
     function registerService(IService service)  external returns(IRegistry.ObjectInfo memory info, bytes memory data);
 
-    function registerComponent(IBaseComponent component, ObjectType componentType, address owner) 
-        external returns(IRegistry.ObjectInfo memory info, bytes memory data);
-
     function registerInstance(IRegisterable instance)
         external returns(IRegistry.ObjectInfo memory info, bytes memory data); 
 
+    function registerProduct(IBaseComponent product, address owner)
+         external returns(IRegistry.ObjectInfo memory info, bytes memory data);
+
+    function registerPool(IBaseComponent pool, address owner)
+         external returns(IRegistry.ObjectInfo memory info, bytes memory data);
+
+    function registerDistribution(IBaseComponent distribution, address owner)
+         external returns(IRegistry.ObjectInfo memory info, bytes memory data);
+
     function registerPolicy(IRegistry.ObjectInfo memory info) external returns(NftId nftId); // -> easy to upgrade
 
     function registerBundle(IRegistry.ObjectInfo memory info) external returns(NftId nftId);