@etherisc/gif-next 0.0.2-d437d8d-974 → 0.0.2-d43ca2d-657

package/contracts/product/RiskServiceManager.sol

@@ -12,14 +12,14 @@ contract RiskServiceManager is ProxyManager {
     /// @dev initializes proxy manager with product service implementation 
     constructor(
         address authority, 
-        address registryAddress,
+        address registry,
         bytes32 salt
     ) 
-        ProxyManager(registryAddress)
     {
         RiskService svc = new RiskService{salt: salt}();
-        bytes memory data = abi.encode(registryAddress, address(this), authority);
-        IVersionable versionable = deployDetermenistic(
+        bytes memory data = abi.encode(authority, registry);
+        IVersionable versionable = initialize(
+            registry,
             address(svc), 
             data,
             salt);

package/contracts/registry/ChainNft.sol

@@ -62,6 +62,7 @@ contract ChainNft is ERC721Enumerable {
         // 3 -> staking
         // >= 4 -> all other objects
         _idNext = 4;
+        _totalMinted = 0;
     }
 
     /**
@@ -104,22 +105,20 @@ contract ChainNft is ERC721Enumerable {
         }
 
         _safeMintWithInterceptorAddress(to, tokenId, interceptor);
-
-        if(interceptor != address(0)) {
-            ITransferInterceptor(interceptor).nftMint(to, tokenId);
-        }
     }
 
 
     /**
-     * @dev amend the open zeppelin transferFrom function by an interceptor call if such an interceptor is defined for the nft token id
-     * this allows distribution, product and pool components to be notified when distributors, policies and bundles are transferred.
+     * @dev Amend the open zeppelin transferFrom function by an interceptor call if such an interceptor is defined for the nft token id.
+     * This allows distribution, product and pool components to be notified when distributors, policies and bundles are transferred.
      */
-    function transferFrom(address from, address to, uint256 tokenId) public override (ERC721, IERC721) {
+    function transferFrom(address from, address to, uint256 tokenId) public override (IERC721, ERC721) {
+        // default open zeppelin implementation of transferFrom
         super.transferFrom(from, to, tokenId);
 
         if (_interceptor[tokenId] != address(0)) {
-            ITransferInterceptor(_interceptor[tokenId]).nftTransferFrom(from, to, tokenId);
+            address operator = msg.sender;
+            ITransferInterceptor(_interceptor[tokenId]).nftTransferFrom(from, to, tokenId, operator);
         }
     }
 
@@ -241,10 +240,10 @@ contract ChainNft is ERC721Enumerable {
         address interceptor
     )
         private
-    {
-        emit LogTokenInterceptorAddress(tokenId, interceptor);
-        
+    {        
         _totalMinted++;
         _safeMint(to, tokenId);
+
+        emit LogTokenInterceptorAddress(tokenId, interceptor);
     }
 }

package/contracts/registry/IRegistry.sol

@@ -3,13 +3,11 @@ pragma solidity ^0.8.20;
 
 import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
 
+import {IRelease} from "./IRelease.sol";
+
 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.
@@ -17,7 +15,9 @@ import {IServiceAuthorization} from "../authorization/IServiceAuthorization.sol"
 /// 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 {
+interface IRegistry is
+    IERC165
+{
 
     event LogRegistration(NftId nftId, NftId parentNftId, ObjectType objectType, bool isInterceptor, address objectAddress, address initialOwner);
     event LogServiceRegistration(VersionPart majorVersion, ObjectType domain);
@@ -61,18 +61,6 @@ interface IRegistry is IERC165 {
         bytes data;
     }
 
-    struct ReleaseInfo {
-        StateId state;
-        VersionPart version;
-        bytes32 salt;
-        address[] addresses;
-        string[] names;
-        ObjectType[] domains;
-        IServiceAuthorization auth;
-        Timestamp activatedAt;
-        Timestamp disabledAt;
-    }
-
     /// @dev Registers a registry contract for a specified chain.
     /// Only one chain registry may be registered per chain
     function registerRegistry(
@@ -107,7 +95,7 @@ interface IRegistry is IERC165 {
 
     function getLatestVersion() external view returns (VersionPart);
 
-    function getReleaseInfo(VersionPart version) external view returns (ReleaseInfo memory);
+    function getReleaseInfo(VersionPart release) external view returns (IRelease.ReleaseInfo memory);
 
     /// @dev Returns the number of supported chains.
     function chainIds() external view returns (uint256);
@@ -124,10 +112,18 @@ interface IRegistry is IERC165 {
 
     function ownerOf(NftId nftId) external view returns (address);
 
+    function isOwnerOf(NftId nftId, address expectedOwner) external view returns (bool);
+
     function ownerOf(address contractAddress) external view returns (address);
 
     function getObjectInfo(NftId nftId) external view returns (ObjectInfo memory info);
 
+    function isObjectType(NftId nftId, ObjectType expectedObjectType) external view returns (bool);
+
+    function isObjectType(address contractAddress, ObjectType expectedObjectType) external view returns (bool);
+
+    function getObjectAddress(NftId nftId) external view returns (address objectAddress);
+
     /// @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);

package/contracts/registry/IRegistryService.sol

@@ -21,10 +21,9 @@ interface IRegistryService is
 
      error ErrorRegistryServiceNotService(address notService);
      error ErrorRegistryServiceNotInstance(address notInstance);
-     error ErrorRegistryServiceNotComponent(address notComponent);
      error ErrorRegistryServiceNotProduct(address notProduct);
-     error ErrorRegistryServiceNotPool(address notPool);
-     error ErrorRegistryServiceNotDistribution(address notDistribution);
+     error ErrorRegistryServiceNotComponent(address notComponent);
+     error ErrorRegistryServiceNotProductLinkedComponent(address notProductLinkedComponent);
 
      error ErrorRegistryServiceRegisterableAddressInvalid(IRegisterable registerable, address found);
      error ErrorRegistryServiceRegisterableTypeInvalid(IRegisterable registerable, ObjectType expected, ObjectType found);
@@ -47,17 +46,11 @@ interface IRegistryService is
      function registerInstance(IRegisterable instance, address owner)
           external returns(IRegistry.ObjectInfo memory info); 
 
-     function registerComponent(IComponent component, ObjectType objectType, address owner)
+     function registerProduct(IComponent product, address owner)
           external returns(IRegistry.ObjectInfo memory info);
 
-     // function registerProduct(IComponent product, address owner)
-     //      external returns(IRegistry.ObjectInfo memory info);
-
-     // function registerPool(IComponent pool, address owner)
-     //      external returns(IRegistry.ObjectInfo memory info);
-
-     // function registerDistribution(IComponent distribution, address owner)
-     //      external returns(IRegistry.ObjectInfo memory info);
+     function registerProductLinkedComponent(IComponent component, ObjectType objectType, address owner)
+          external returns(IRegistry.ObjectInfo memory info);
 
      function registerDistributor(IRegistry.ObjectInfo memory info) external returns(NftId nftId);
 

package/contracts/registry/IRelease.sol

@@ -0,0 +1,26 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.20;
+
+import {IServiceAuthorization} from "../authorization/IServiceAuthorization.sol";
+
+import {StateId} from "../type/StateId.sol";
+import {Timestamp} from "../type/Timestamp.sol";
+import {VersionPart} from "../type/Version.sol";
+
+/// @title Marks contracts that are linked to a specific GIF release version.
+interface IRelease {
+
+    struct ReleaseInfo {
+        StateId state;
+        VersionPart version;
+        bytes32 salt;
+        IServiceAuthorization auth;
+        address releaseAdmin;
+        Timestamp activatedAt;
+        Timestamp disabledAt;
+    }
+
+    /// @dev Registers a registry contract for a specified chain.
+    /// Only one chain registry may be registered per chain
+    function getRelease() external view returns (VersionPart release);
+}

package/contracts/registry/ITransferInterceptor.sol

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

package/contracts/registry/Registry.sol

@@ -12,7 +12,9 @@ import {ObjectType, ObjectTypeLib, PROTOCOL, REGISTRY, SERVICE, INSTANCE, STAKE,
 
 import {ChainNft} from "./ChainNft.sol";
 import {IRegistry} from "./IRegistry.sol";
+import {IRelease} from "./IRelease.sol";
 import {IRegisterable} from "../shared/IRegisterable.sol";
+import {IStaking} from "../staking/IStaking.sol";
 import {ReleaseRegistry} from "./ReleaseRegistry.sol";
 import {TokenRegistry} from "./TokenRegistry.sol";
 import {RegistryAdmin} from "./RegistryAdmin.sol";
@@ -243,6 +245,9 @@ contract Registry is
     {
         address objectAddress = info.objectAddress;
         ObjectType objectType = info.objectType;
+
+        // this indidirectly enforces that the parent is registered
+        // parentType would be zero for a non-registered parent which is never a valid type combination
         ObjectType parentType = _info[info.parentNftId].objectType;
 
         // check type combinations for core objects
@@ -303,8 +308,8 @@ contract Registry is
         return _releaseRegistry.getLatestVersion();
     }
 
-    function getReleaseInfo(VersionPart version) external view returns (ReleaseInfo memory) {
-        return _releaseRegistry.getReleaseInfo(version);
+    function getReleaseInfo(VersionPart release) external view returns (IRelease.ReleaseInfo memory) {
+        return _releaseRegistry.getReleaseInfo(release);
     }
 
     function chainIds() public view returns (uint256) {
@@ -339,6 +344,10 @@ contract Registry is
         return CHAIN_NFT.ownerOf(nftId.toInt());
     }
 
+    function isOwnerOf(NftId nftId, address expectedOwner) public view returns (bool) {
+        return CHAIN_NFT.ownerOf(nftId.toInt()) == expectedOwner;
+    }
+
     function ownerOf(address contractAddress) public view returns (address) {
         return CHAIN_NFT.ownerOf(_nftIdByAddress[contractAddress].toInt());
     }
@@ -347,6 +356,19 @@ contract Registry is
         return _info[nftId];
     }
 
+    function isObjectType(address contractAddress, ObjectType expectedObjectType) external view returns (bool) {
+        NftId nftId = _nftIdByAddress[contractAddress];
+        return isObjectType(nftId, expectedObjectType);
+    }
+
+    function isObjectType(NftId nftId, ObjectType expectedObjectType) public view returns (bool) {
+        return _info[nftId].objectType == expectedObjectType;
+    }
+
+    function getObjectAddress(NftId nftId) external view returns (address) {
+        return _info[nftId].objectAddress;
+    }
+
     function getObjectInfo(address object) external view returns (ObjectInfo memory) {
         return _info[_nftIdByAddress[object]];
     }
@@ -374,8 +396,6 @@ contract Registry is
     }
 
     function getStakingAddress() external view returns (address staking) {
-        //return getObjectInfo(_stakingNftId).objectAddress;
-        //return _info[_stakingNftId].objectAddress;
         return _stakingAddress;
     }
 
@@ -622,6 +642,8 @@ contract Registry is
                 initialOwner: stakingOwner,
                 data: ""}),
             true); 
+
+        IStaking(_stakingAddress).initializeTokenHandler();
     }
 
     /// @dev Register the provided object info for the specified NFT ID.
@@ -686,13 +708,15 @@ contract Registry is
 
         // components with instance parent
         _coreContractCombinations[PRODUCT()][INSTANCE()] = true;
-        _coreContractCombinations[DISTRIBUTION()][INSTANCE()] = true;
-        _coreContractCombinations[ORACLE()][INSTANCE()] = true;
-        _coreContractCombinations[POOL()][INSTANCE()] = true;
+
+        // components with product parent
+        _coreContractCombinations[DISTRIBUTION()][PRODUCT()] = true;
+        _coreContractCombinations[ORACLE()][PRODUCT()] = true;
+        _coreContractCombinations[POOL()][PRODUCT()] = true;
 
         // objects with component parents
-        _coreObjectCombinations[DISTRIBUTOR()][DISTRIBUTION()] = true;
         _coreObjectCombinations[POLICY()][PRODUCT()] = true;
+        _coreObjectCombinations[DISTRIBUTOR()][DISTRIBUTION()] = true;
         _coreObjectCombinations[BUNDLE()][POOL()] = true;
 
         // staking