@etherisc/gif-next 0.0.2-e769e2e-077 → 0.0.2-e802d97-713

package/contracts/registry/Registry.sol

@@ -2,6 +2,9 @@
 pragma solidity ^0.8.20;
 
 import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
+import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
+
+import {InitializableCustom} from "../shared/InitializableCustom.sol";
 
 import {NftId, NftIdLib} from "../type/NftId.sol";
 import {VersionPart} from "../type/Version.sol";
@@ -9,8 +12,10 @@ import {ObjectType, PROTOCOL, REGISTRY, TOKEN, SERVICE, INSTANCE, STAKE, STAKING
 
 import {ChainNft} from "./ChainNft.sol";
 import {IRegistry} from "./IRegistry.sol";
+import {IRegisterable} from "../shared/IRegisterable.sol";
 import {ReleaseManager} from "./ReleaseManager.sol";
 import {TokenRegistry} from "./TokenRegistry.sol";
+import {RegistryAdmin} from "./RegistryAdmin.sol";
 
 // IMPORTANT
 // Each NFT minted by registry is accosiated with:
@@ -23,9 +28,10 @@ import {TokenRegistry} from "./TokenRegistry.sol";
 // 4) state object by regular service (POLICY, BUNDLE, STAKE)
 
 contract Registry is
+    InitializableCustom,
     IRegistry
 {
-    address public constant NFT_LOCK_ADDRESS = address(0x1);
+    address public NFT_LOCK_ADDRESS = address(0x1);
     uint256 public constant REGISTRY_TOKEN_SEQUENCE_ID = 2;
     uint256 public constant STAKING_TOKEN_SEQUENCE_ID = 3;
     string public constant EMPTY_URI = "";
@@ -43,89 +49,64 @@ contract Registry is
     mapping(ObjectType objectType => mapping(
             ObjectType parentType => bool)) private _coreObjectCombinations;
 
-    NftId private _registryNftId;
-    ChainNft private _chainNft;
+    RegistryAdmin public immutable _admin;
+    ChainNft public immutable _chainNft;
+
+    NftId public immutable _protocolNftId;
+    NftId public immutable _registryNftId;
+    NftId public _stakingNftId;
 
-    ReleaseManager private _releaseManager;
-    address private _tokenRegistryAddress;
-    address private _stakingAddress;
+    address public _tokenRegistryAddress;
+    address public _stakingAddress;
+    ReleaseManager public _releaseManager;
 
     modifier onlyRegistryService() {
         if(!_releaseManager.isActiveRegistryService(msg.sender)) {
-            revert CallerNotRegistryService();
+            revert ErrorRegistryCallerNotRegistryService();
         }
         _;
     }
 
+
     modifier onlyReleaseManager() {
         if(msg.sender != address(_releaseManager)) {
-            revert CallerNotReleaseManager();
+            revert ErrorRegistryCallerNotReleaseManager();
         }
         _;
     }
 
-    constructor() {
-        _releaseManager = ReleaseManager(msg.sender);
 
+    constructor(RegistryAdmin admin) 
+        InitializableCustom() 
+    {
+        _admin = admin;
         // deploy NFT 
         _chainNft = new ChainNft(address(this));
 
         // initial registry setup
-        _registerProtocol();
-        _registerRegistry();
+        _protocolNftId = _registerProtocol();
+        _registryNftId = _registerRegistry();
 
         // set object types and object parent relations
         _setupValidCoreTypesAndCombinations();
     }
 
 
-    function setTokenRegistry(
-        address tokenRegistry
+    /// @dev wires release manager and token to registry (this contract).
+    /// MUST be called by release manager.
+    function initialize(
+        address releaseManager,
+        address tokenRegistry,
+        address staking
     )
         external
-        onlyReleaseManager
+        initializer()
     {
-        if (_tokenRegistryAddress != address(0)) {
-            revert TokenRegistryAlreadySet(tokenRegistry);
-        }
-
-        if (address(tokenRegistry) == address(0)) {
-            revert TokenRegistryZero();
-        }
-
+        _releaseManager = ReleaseManager(releaseManager);
         _tokenRegistryAddress = tokenRegistry;
-    }
+        _stakingAddress = staking;
 
-
-    function registerStaking(
-        address stakingAddress,
-        address stakingOwner
-    )
-        external
-        onlyReleaseManager
-        returns(NftId stakingNftId)
-    {
-        // staking contract for same chain may only be registered once
-        if (_stakingAddress != address(0)) {
-            revert StakingAlreadyRegistered(_stakingAddress);
-        }
-
-        _stakingAddress = stakingAddress;
-        uint256 stakingId = _chainNft.calculateTokenId(STAKING_TOKEN_SEQUENCE_ID);
-        stakingNftId = NftIdLib.toNftId(stakingId);
-
-        _nftIdByAddress[_stakingAddress] = stakingNftId;
-        _info[stakingNftId] = ObjectInfo({
-            nftId: stakingNftId,
-            parentNftId: _registryNftId,
-            objectType: STAKING(),
-            isInterceptor: false,
-            objectAddress: _stakingAddress, 
-            initialOwner: stakingOwner,
-            data: "" 
-        });
-
-        _chainNft.mint(stakingOwner, stakingId);
+        _stakingNftId = _registerStaking();
     }
 
     function registerService(
@@ -137,7 +118,16 @@ contract Registry is
         onlyReleaseManager
         returns(NftId nftId)
     {
+        address service = info.objectAddress;
         /* must be guaranteed by release manager
+        if(service == address(0)) {
+            revert();
+        }
+
+        if(version.eqz()) {
+            revert();
+        }
+
         if(info.objectType != SERVICE()) {
             revert();
         }
@@ -147,11 +137,15 @@ contract Registry is
         info.initialOwner == NFT_LOCK_ADDRESS <- if services are access managed
         */
 
-        if(_service[version][domain] > address(0)) {
-            revert ServiceAlreadyRegistered(info.objectAddress);
+        if(domain.eqz()) {
+            revert ErrorRegistryDomainZero(service);
         }
 
-        _service[version][domain] = info.objectAddress; // nftId;
+        if(_service[version][domain] > address(0)) {
+            revert ErrorRegistryDomainAlreadyRegistered(service, version, domain);
+        }
+        
+        _service[version][domain] = service;
 
         nftId = _register(info);
 
@@ -166,23 +160,17 @@ contract Registry is
         ObjectType objectType = info.objectType;
         ObjectType parentType = _info[info.parentNftId].objectType;
 
-        // TODO do not need it here -> SERVICE is no longer part of _coreContractCombinations
-        // no service registrations
-        if(objectType == SERVICE()) {
-            revert ServiceRegistration();
-        }
-
         // only valid core types combinations
         if(info.objectAddress == address(0)) 
         {
             if(_coreObjectCombinations[objectType][parentType] == false) {
-                revert InvalidTypesCombination(objectType, parentType);
+                revert ErrorRegistryTypesCombinationInvalid(objectType, parentType);
             }
         }
         else
         {
             if(_coreContractCombinations[objectType][parentType] == false) {
-                revert InvalidTypesCombination(objectType, parentType);
+                revert ErrorRegistryTypesCombinationInvalid(objectType, parentType);
             }
         }
 
@@ -198,7 +186,7 @@ contract Registry is
         ObjectType parentType = _info[info.parentNftId].objectType;
 
         if(_coreTypes[objectType]) {
-            revert CoreTypeRegistration();
+            revert ErrorRegistryCoreTypeRegistration();
         }
 
         if(
@@ -206,7 +194,7 @@ contract Registry is
             parentType == REGISTRY() ||
             parentType == SERVICE()
         ) {
-            revert InvalidTypesCombination(objectType, parentType);
+            revert ErrorRegistryTypesCombinationInvalid(objectType, parentType);
         }
 
         _register(info);
@@ -218,13 +206,7 @@ contract Registry is
         return _releaseManager.getInitialVersion();
     }
 
-    // TODO make distinction between active an not yet active version
-    // need to be thought trough, not yet clear if necessary
-    // need to answer question: what is the latest version during the upgrade process?
-    // likely setting up a new gif version does not fit into a single tx
-    // in this case we might want to have a period where the latest version is
-    // in the process of being set up while the latest active version is 1 major release smaller
-    /// @dev latest GIF major version (might not yet be active)
+    /// @dev next GIF release version to be released
     function getNextVersion() external view returns (VersionPart) {
         return _releaseManager.getNextVersion();
     }
@@ -242,14 +224,14 @@ contract Registry is
         return _chainNft.totalSupply();
     }
 
-    function getReleaseManagerAddress() external view returns (address) {
-        return address(_releaseManager);
-    }
-
     function getNftId() external view returns (NftId nftId) {
         return _registryNftId;
     }
 
+    function getProtocolNftId() external view returns (NftId nftId) {
+        return _protocolNftId;
+    }
+
     function getNftId(address object) external view returns (NftId id) {
         return _nftIdByAddress[object];
     }
@@ -287,12 +269,14 @@ contract Registry is
         return _info[objectParentNftId].objectType == INSTANCE();
     }
 
-    function isValidRelease(VersionPart version) external view returns (bool)
+    function isActiveRelease(VersionPart version) external view returns (bool)
     {
-        return _releaseManager.isValidRelease(version);
+        return _releaseManager.isActiveRelease(version);
     }
 
     function getStakingAddress() external view returns (address staking) {
+        //return getObjectInfo(_stakingNftId).objectAddress;
+        //return _info[_stakingNftId].objectAddress;
         return _stakingAddress;
     }
 
@@ -305,16 +289,29 @@ contract Registry is
         VersionPart releaseVersion
     ) external view returns (address service)
     {
-        // TODO how can I get service address while release is not validated/activated ?!! -> user will check validity of release on its own
-        //if(_releaseManager.isValidRelease(releaseVersion)) { 
-            service =  _service[releaseVersion][serviceDomain]; 
-        //}
+        service =  _service[releaseVersion][serviceDomain]; 
+    }
+
+    function getReleaseAccessManagerAddress(VersionPart version) external view returns (address) {
+        return address(_releaseManager.getReleaseAccessManager(version));
+    }
+
+    function getReleaseManagerAddress() external view returns (address) {
+        return address(_releaseManager);
     }
 
     function getChainNftAddress() external view override returns (address) {
         return address(_chainNft);
     }
 
+    function getRegistryAdminAddress() external view returns (address) {
+        return address(_admin);
+    }
+
+    function getAuthority() external view returns (address) {
+        return _admin.authority();
+    }
+
     function getOwner() public view returns (address owner) {
         return ownerOf(address(this));
     }
@@ -338,59 +335,76 @@ contract Registry is
         returns(NftId nftId)
     {
         ObjectType objectType = info.objectType;
+        bool isInterceptor = info.isInterceptor;
+        address objectAddress = info.objectAddress;
+        address owner = info.initialOwner;
+
         NftId parentNftId = info.parentNftId;
         ObjectInfo memory parentInfo = _info[parentNftId];
         ObjectType parentType = parentInfo.objectType; // see function header
         address parentAddress = parentInfo.objectAddress;
 
         // parent is contract -> need to check? -> check before minting
+        // special case: staking: to protocol possible as well
         // special case: global registry nft as parent when not on mainnet -> global registry address is 0
         // special case: when parentNftId == _chainNft.mint(), check for zero parent address before mint
         // special case: when parentNftId == _chainNft.mint() && objectAddress == initialOwner
-        if(parentAddress == address(0)) {
-            revert ZeroParentAddress();
+        if(objectType != STAKE()) {
+            if(parentAddress == address(0)) {
+                revert ErrorRegistryParentAddressZero();
+            }
         }
 
-        address interceptor = _getInterceptor(info.isInterceptor, info.objectAddress, parentInfo.isInterceptor, parentAddress);
+        address interceptorAddress = _getInterceptor(
+            isInterceptor, 
+            objectType, 
+            objectAddress, 
+            parentInfo.isInterceptor, 
+            parentAddress);
+
         uint256 tokenId = _chainNft.getNextTokenId();
         nftId = NftIdLib.toNftId(tokenId);
-
         info.nftId = nftId;
         _info[nftId] = info;
 
-        if(info.objectAddress > address(0)) 
-        {
-            address contractAddress = info.objectAddress;
-
-            if(_nftIdByAddress[contractAddress].gtz()) { 
-                revert ContractAlreadyRegistered(contractAddress);
+        if(objectAddress > address(0)) {
+            if(_nftIdByAddress[objectAddress].gtz()) { 
+                revert ErrorRegistryContractAlreadyRegistered(objectAddress);
             }
 
-            _nftIdByAddress[contractAddress] = nftId;
+            _nftIdByAddress[objectAddress] = nftId;
         }
 
-        emit LogRegistration(nftId, parentNftId, objectType, info.isInterceptor, info.objectAddress, info.initialOwner);
+        emit LogRegistration(nftId, parentNftId, objectType, isInterceptor, objectAddress, owner);
 
         // calls nft receiver(1) and interceptor(2)
         uint256 mintedTokenId = _chainNft.mint(
-            info.initialOwner,
-            interceptor,
+            owner,
+            interceptorAddress,
             EMPTY_URI);
-        assert(mintedTokenId == tokenId);
-        
+
+        assert(mintedTokenId == tokenId);        
     }
 
     /// @dev obtain interceptor address for this nft if applicable, address(0) otherwise
+    /// special case: STAKES (parent may be any type) -> no intercept call
+    /// default case: 
     function _getInterceptor(
         bool isInterceptor, 
+        ObjectType objectType,
         address objectAddress,
         bool parentIsInterceptor,
         address parentObjectAddress
     )
         internal 
-        view 
+        pure 
         returns (address interceptor) 
     {
+        // no intercepting calls for stakes
+        if (objectType == STAKE()) {
+            return address(0);
+        }
+
         if (objectAddress == address(0)) {
             if (parentIsInterceptor) {
                 return parentObjectAddress;
@@ -411,9 +425,10 @@ contract Registry is
     /// @dev protocol registration used to anchor the dip ecosystem relations
     function _registerProtocol() 
         private
+        returns (NftId protocolNftId)
     {
         uint256 protocolId = _chainNft.PROTOCOL_NFT_ID();
-        NftId protocolNftId = NftIdLib.toNftId(protocolId);
+        protocolNftId = NftIdLib.toNftId(protocolId);
 
         _info[protocolNftId] = ObjectInfo({
             nftId: protocolNftId,
@@ -432,9 +447,10 @@ contract Registry is
     /// might also register the global registry when not on mainnet
     function _registerRegistry() 
         private
+        returns (NftId registryNftId)
     {
         uint256 registryId = _chainNft.calculateTokenId(REGISTRY_TOKEN_SEQUENCE_ID);
-        NftId registryNftId = NftIdLib.toNftId(registryId);
+        registryNftId = NftIdLib.toNftId(registryId);
         NftId parentNftId;
 
         if(registryId != _chainNft.GLOBAL_REGISTRY_ID()) 
@@ -444,7 +460,7 @@ contract Registry is
         }
         else 
         {// we are global registry
-            parentNftId = NftIdLib.toNftId(_chainNft.PROTOCOL_NFT_ID());
+            parentNftId = _protocolNftId;
         }
 
         _info[registryNftId] = ObjectInfo({
@@ -456,9 +472,8 @@ contract Registry is
             initialOwner: NFT_LOCK_ADDRESS,
             data: "" 
         });
-        _nftIdByAddress[address(this)] = registryNftId;
-        _registryNftId = registryNftId;
 
+        _nftIdByAddress[address(this)] = registryNftId;
         _chainNft.mint(NFT_LOCK_ADDRESS, registryId);
     }
 
@@ -481,13 +496,36 @@ contract Registry is
 
         _chainNft.mint(NFT_LOCK_ADDRESS, globalRegistryId);
     }
+    // depends on _registryNftId and _stakingAddress
+    function _registerStaking()
+        private
+        returns (NftId stakingNftId)
+    {
+        address stakingOwner = IRegisterable(_stakingAddress).getOwner();
+        uint256 stakingId = _chainNft.calculateTokenId(STAKING_TOKEN_SEQUENCE_ID);
+        stakingNftId = NftIdLib.toNftId(stakingId);
+
+        _info[stakingNftId] = ObjectInfo({
+            nftId: stakingNftId,
+            parentNftId: _registryNftId,
+            objectType: STAKING(),
+            isInterceptor: false,
+            objectAddress: _stakingAddress, 
+            initialOwner: stakingOwner,
+            data: "" 
+        });
+
+        _nftIdByAddress[_stakingAddress] = stakingNftId;
+        // reverts if nftId was already minted
+        _chainNft.mint(stakingOwner, stakingId);
+    }
 
     /// @dev defines which object - parent types relations are allowed to register
     // IMPORTANT: 
     // 1) EACH object type MUST have only one parent type across ALL mappings
     // 2) DO NOT use object type (e.g. POLCY, BUNDLE, STAKE) as parent type
     // 3) DO NOT use REGISTRY as object type
-    // 2) DO NOT use PROTOCOL and "zeroObjectType"
+    // 2) DO NOT use PROTOCOL and "ObjectTypeLib.zero"
     function _setupValidCoreTypesAndCombinations() 
         private 
     {
@@ -498,32 +536,41 @@ contract Registry is
         _coreTypes[PRODUCT()] = true;
         _coreTypes[POOL()] = true;
         _coreTypes[DISTRIBUTION()] = true;
+        _coreTypes[DISTRIBUTOR()] = true;
+        _coreTypes[ORACLE()] = true;
         _coreTypes[POLICY()] = true;
         _coreTypes[BUNDLE()] = true;
         _coreTypes[STAKING()] = true;
         _coreTypes[STAKE()] = true;
-        
-        _coreContractCombinations[REGISTRY()][REGISTRY()] = true; // only for global regstry
+
+        uint256 registryId = _chainNft.calculateTokenId(REGISTRY_TOKEN_SEQUENCE_ID);
+        if(registryId == _chainNft.GLOBAL_REGISTRY_ID()) {
+            // we are global registry
+            // object is registry from different chain
+            // parent is global registry, this contract
+            _coreContractCombinations[REGISTRY()][REGISTRY()] = true; // only for global regstry
+            //_coreObjectCombinations[REGISTRY()][REGISTRY()] = true;
+        } else {
+            // we are not global registry
+            // object is local registry, this contract
+            // parent is global registry, object with 0 address or registry from mainnet???
+        }
         _coreContractCombinations[STAKING()][REGISTRY()] = true; // only for chain staking contract
         _coreContractCombinations[TOKEN()][REGISTRY()] = true;
         //_coreContractCombinations[SERVICE()][REGISTRY()] = true;// do not need it here -> registerService() registers exactly this combination
-
-        // registry as parent, ONLY approved
         _coreContractCombinations[INSTANCE()][REGISTRY()] = true;
 
-        // instance as parent, ONLY approved
         _coreContractCombinations[PRODUCT()][INSTANCE()] = true;
         _coreContractCombinations[DISTRIBUTION()][INSTANCE()] = true;
         _coreContractCombinations[ORACLE()][INSTANCE()] = true;
         _coreContractCombinations[POOL()][INSTANCE()] = true;
 
         _coreObjectCombinations[DISTRIBUTOR()][DISTRIBUTION()] = true;
-
-        // product as parent, ONLY approved
         _coreObjectCombinations[POLICY()][PRODUCT()] = true;
-
-        // pool as parent, ONLY approved
         _coreObjectCombinations[BUNDLE()][POOL()] = true;
-        _coreObjectCombinations[STAKE()][POOL()] = true;
+
+        // staking
+        _coreObjectCombinations[STAKE()][PROTOCOL()] = true;
+        _coreObjectCombinations[STAKE()][INSTANCE()] = true;
     }
 }