@etherisc/gif-next 3.0.0-ab0fcb2-112 → 3.0.0-bd6db59-832

package/contracts/accounting/AccountingServiceManager.sol

@@ -2,7 +2,7 @@
 pragma solidity ^0.8.20;
 
 import {AccountingService} from "./AccountingService.sol";
-import {IUpgradeable} from "../upgradeability/IUpgradeable.sol";
+import {IVersionable} from "../upgradeability/IVersionable.sol";
 import {ProxyManager} from "../upgradeability/ProxyManager.sol";
 
 contract AccountingServiceManager is ProxyManager {
@@ -12,17 +12,19 @@ contract AccountingServiceManager is ProxyManager {
     /// @dev initializes proxy manager with service implementation 
     constructor(
         address authority, 
+        address registry,
         bytes32 salt
     )
     {
         AccountingService svc = new AccountingService();
-        bytes memory data = abi.encode(authority);
-        IUpgradeable upgradeable = initialize(
+        bytes memory data = abi.encode(authority, registry);
+        IVersionable versionable = initialize(
+            registry,
             address(svc), 
             data,
             salt);
 
-        _accountingService = AccountingService(address(upgradeable));
+        _accountingService = AccountingService(address(versionable));
     }
 
     //--- view functions ----------------------------------------------------//

package/contracts/accounting/IAccountingService.sol

@@ -13,7 +13,7 @@ import {UFixed} from "../type/UFixed.sol";
 interface IAccountingService is 
     IService
 {
-    event LogAccountingServiceUpdateFee(
+    event LogComponentServiceUpdateFee(
         NftId nftId, 
         string feeName, 
         UFixed previousFractionalFee, 

package/contracts/authorization/AccessAdmin.sol

@@ -7,20 +7,20 @@ import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet
 import {IAccess} from "./IAccess.sol";
 import {IAccessAdmin} from "./IAccessAdmin.sol";
 import {IAuthorization} from "./IAuthorization.sol";
+import {IRegistry} from "../registry/IRegistry.sol";
 import {IServiceAuthorization} from "./IServiceAuthorization.sol";
 
 import {AccessAdminLib} from "./AccessAdminLib.sol";
 import {AccessManagerCloneable} from "./AccessManagerCloneable.sol";
 import {Blocknumber, BlocknumberLib} from "../type/Blocknumber.sol";
 import {ContractLib} from "../shared/ContractLib.sol";
-import {NftId} from "../type/NftId.sol";
+import {NftId, NftIdLib} from "../type/NftId.sol";
 import {ObjectType} from "../type/ObjectType.sol";
 import {RoleId, RoleIdLib, ADMIN_ROLE, PUBLIC_ROLE} from "../type/RoleId.sol";
-import {RegistryLinked} from "../shared/RegistryLinked.sol";
 import {Selector, SelectorSetLib} from "../type/Selector.sol";
 import {Str, StrLib} from "../type/String.sol";
 import {TimestampLib} from "../type/Timestamp.sol";
-import {VersionPartLib, VersionPart} from "../type/Version.sol";
+import {VersionPart} from "../type/Version.sol";
 
 
 /**
@@ -30,7 +30,6 @@ import {VersionPartLib, VersionPart} from "../type/Version.sol";
  */ 
 contract AccessAdmin is
     AccessManagedUpgradeable,
-    RegistryLinked,
     IAccessAdmin
 {
     using EnumerableSet for EnumerableSet.AddressSet;
@@ -92,16 +91,12 @@ contract AccessAdmin is
     /// Internally initializes access manager with this admin and creates basic role setup.
     function initialize(
         address authority,
-        string memory adminName,
-        VersionPart release 
+        string memory adminName 
     )
         public
+        initializer()
     {
-        if(_getInitializedVersion() != 0) {
-            revert InvalidInitialization();
-        }
-
-        __AccessAdmin_init(authority, adminName, release);
+        __AccessAdmin_init(authority, adminName);
     }
 
 
@@ -111,16 +106,14 @@ contract AccessAdmin is
     /// - this function as well as any completeSetup functions MUST be called in the same tx.
     function __AccessAdmin_init(
         address authority, 
-        string memory adminName,
-        VersionPart release
+        string memory adminName 
     )
         internal
-        reinitializer(release.toInt())
+        onlyInitializing()
     {
         AccessAdminLib.checkInitParameters(authority, adminName);
-
         _authority = AccessManagerCloneable(authority);
-        _authority.initialize(address(this), release);
+        _authority.initialize(address(this));
 
         // delayed additional check for authority after its initialization
         if (!ContractLib.isAuthority(authority)) {
@@ -128,7 +121,7 @@ contract AccessAdmin is
         }
 
         // effects
-        // set and initialize this contract as
+        // set and initialize this access manager contract as
         // the admin (ADMIN_ROLE) of the provided authority
         __AccessManaged_init(authority);
 
@@ -136,7 +129,7 @@ contract AccessAdmin is
         _adminName = adminName;
 
         // set initial linked NFT ID to zero
-        //_linkedNftId = NftIdLib.zero();
+        _linkedNftId = NftIdLib.zero();
 
         // setup admin role
         _createRoleUnchecked(
@@ -156,7 +149,12 @@ contract AccessAdmin is
     //--- view functions for access admin ---------------------------------------//
 
     function getRelease() public view virtual returns (VersionPart release) {
-        return VersionPartLib.toVersionPart(uint8(_getInitializedVersion()));
+        return _authority.getRelease();
+    }
+
+
+    function getRegistry() public view returns (IRegistry registry) {
+        return _authority.getRegistry();
     }
 
 
@@ -281,10 +279,11 @@ contract AccessAdmin is
     {
         Selector selector = SelectorSetLib.at(_targetFunctions[target], idx);
         func = _functionInfo[target][selector];
-        roleId = RoleIdLib.toRoleId(
-            _authority.getTargetFunctionRole(
-                target, 
-                selector.toBytes4()));
+        roleId = AccessAdminLib.getFunctionRoleId(_authority, target, selector);
+        // roleId = RoleIdLib.toRoleId(
+        //     _authority.getTargetFunctionRole(
+        //         target, 
+        //         selector.toBytes4()));
     }
 
 
@@ -299,12 +298,11 @@ contract AccessAdmin is
     //--- internal/private functions -------------------------------------------------//
 
     function _linkToNftOwnable(address registerable) internal {
-        NftId nftId = _getRegistry().getNftIdForAddress(registerable);
-        if (nftId.eqz()) {
+        if (!getRegistry().isRegistered(registerable)) {
             revert ErrorAccessAdminNotRegistered(registerable);
         }
 
-        _linkedNftId = nftId;
+        _linkedNftId = getRegistry().getNftIdForAddress(registerable);
     }
 
 
@@ -321,7 +319,7 @@ contract AccessAdmin is
             (RoleId roleId, bool exists) = getRoleForName(roleInfo.name.toString());
 
             if (!exists) {
-                if (!AccessAdminLib.isDynamicRoleId(authzRoleId)) {
+                if (!AccessAdminLib.isDynamicRoleId(authzRoleId) || roleInfo.targetType == TargetType.Custom) {
                     roleId = authzRoleId;
                 }
 
@@ -661,22 +659,23 @@ contract AccessAdmin is
     }
 
 
-    function _checkAuthorization( 
-        address authorization,
-        ObjectType expectedDomain, 
-        VersionPart expectedRelease,
-        bool expectServiceAuthorization,
-        bool checkAlreadyInitialized
-    )
-        internal
-        view
-    {
-        AccessAdminLib.checkAuthorization(
-            address(_authorization), 
-            authorization, 
-            expectedDomain, 
-            expectedRelease, 
-            expectServiceAuthorization,
-            checkAlreadyInitialized);
-    }
+    // TODO cleanup
+    // function _checkAuthorization( 
+    //     address authorization,
+    //     ObjectType expectedDomain, 
+    //     VersionPart expectedRelease,
+    //     bool expectServiceAuthorization,
+    //     bool checkAlreadyInitialized
+    // )
+    //     internal
+    //     view
+    // {
+    //     AccessAdminLib.checkAuthorization(
+    //         _authorization, 
+    //         authorization, 
+    //         expectedDomain, 
+    //         expectedRelease, 
+    //         expectServiceAuthorization,
+    //         checkAlreadyInitialized);
+    // }
 }

package/contracts/authorization/AccessAdminLib.sol

@@ -12,11 +12,12 @@ import {IRegistry} from "../registry/IRegistry.sol";
 import {IService} from "../shared/IService.sol";
 import {IServiceAuthorization} from "./IServiceAuthorization.sol";
 
+import {AccessManagerCloneable} from "./AccessManagerCloneable.sol";
 import {BlocknumberLib} from "../type/Blocknumber.sol";
 import {ContractLib} from "../shared/ContractLib.sol";
 import {ObjectType} from "../type/ObjectType.sol";
 import {RoleId, RoleIdLib, ADMIN_ROLE, PUBLIC_ROLE} from "../type/RoleId.sol";
-import {SelectorLib} from "../type/Selector.sol";
+import {Selector, SelectorLib} from "../type/Selector.sol";
 import {Str, StrLib} from "../type/String.sol";
 import {TimestampLib} from "../type/Timestamp.sol";
 import {VersionPart, VersionPartLib} from "../type/Version.sol";
@@ -335,9 +336,9 @@ library AccessAdminLib { // ACCESS_ADMIN_LIB
         view
         returns (IAuthorization componentAuthorization)
     {
-        VersionPart expecteRelease = accessAdmin.getRelease();
-        checkIsRegistered(componentAddress, expectedType, expecteRelease);
+        checkIsRegistered(address(accessAdmin.getRegistry()), componentAddress, expectedType);
 
+        VersionPart expecteRelease = accessAdmin.getRelease();
         IAuthorizedComponent component = IAuthorizedComponent(componentAddress);
         componentAuthorization = component.getAuthorization();
 
@@ -435,25 +436,22 @@ library AccessAdminLib { // ACCESS_ADMIN_LIB
 
 
     function checkIsRegistered( 
+        address registry,
         address target,
-        ObjectType expectedType,
-        VersionPart expectedRelease
+        ObjectType expectedType
     )
         public
         view 
     {
-        IRegistry.ObjectInfo memory info = ContractLib.getRegistry().getObjectInfo(target);
+        checkRegistry(registry);
 
-        if (info.objectType.eqz()) {
+        ObjectType tagetType = IRegistry(registry).getObjectInfo(target).objectType;
+        if (tagetType.eqz()) {
             revert IAccessAdmin.ErrorAccessAdminNotRegistered(target);
         }
 
-        if (info.objectType != expectedType) {
-            revert IAccessAdmin.ErrorAccessAdminTargetTypeMismatch(target, expectedType, info.objectType);
-        }
-
-        if (info.release != expectedRelease) {
-            revert IAccessAdmin.ErrorAccessAdminTargetReleaseMismatch(target, expectedRelease, info.release);
+        if (tagetType != expectedType) {
+            revert IAccessAdmin.ErrorAccessAdminTargetTypeMismatch(target, expectedType, tagetType);
         }
     }
 
@@ -484,6 +482,22 @@ library AccessAdminLib { // ACCESS_ADMIN_LIB
     }
 
 
+    function getFunctionRoleId(
+        AccessManagerCloneable authority,
+        address target,
+        Selector selector
+    )
+        public
+        view
+        returns (RoleId functionRoleId)
+    {
+        return RoleIdLib.toRoleId(
+            authority.getTargetFunctionRole(
+                target, 
+                selector.toBytes4()));
+    }
+
+
     function getServiceRoleId(
         address serviceAddress,
         IAccess.TargetType serviceTargetType

package/contracts/authorization/AccessManagerCloneable.sol

@@ -4,9 +4,9 @@ pragma solidity ^0.8.20;
 import {AccessManagerUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagerUpgradeable.sol";
 import {IAccessManager} from "@openzeppelin/contracts/access/manager/IAccessManager.sol";
 
-import {IAccessAdmin} from "./IAccessAdmin.sol";
 import {InitializableERC165} from "../shared/InitializableERC165.sol";
-import {VersionPartLib, VersionPart} from "../type/Version.sol";
+import {RegistryLinked} from "../shared/RegistryLinked.sol";
+import {VersionPart} from "../type/Version.sol";
 
 
 /// @dev An AccessManager based on OpenZeppelin that is cloneable and has a central lock property.
@@ -14,7 +14,8 @@ import {VersionPartLib, VersionPart} from "../type/Version.sol";
 /// Cloned by upon release preparation and instance cloning.
 contract AccessManagerCloneable is
     AccessManagerUpgradeable,
-    InitializableERC165
+    InitializableERC165,
+    RegistryLinked
 {
     error ErrorAccessManagerCallerNotAdmin(address caller);
     error ErrorAccessManagerRegistryAlreadySet(address registry);
@@ -23,6 +24,7 @@ contract AccessManagerCloneable is
     error ErrorAccessManagerTargetAdminLocked(address target);
     error ErrorAccessManagerCallerAdminLocked(address caller);
 
+    VersionPart private _release;
     bool private _isLocked;
 
 
@@ -34,36 +36,34 @@ contract AccessManagerCloneable is
         _;
     }
 
-    function initialize(address adminAddress, VersionPart release)
-        public
 
+    function initialize(address admin)
+        public
+        initializer()
     {
-        if(_getInitializedVersion() != 0) {
-            revert InvalidInitialization();
-        }
+        __ERC165_init();
+        __AccessManager_init(admin);
 
-        AccessManagerCloneable_init(adminAddress, release);
+        _registerInterface(type(IAccessManager).interfaceId);
     }
 
-    function AccessManagerCloneable_init(
-        address admin,
+
+    /// @dev Completes the setup of the access manager.
+    /// Links the access manager to the registry and sets the release version.
+    function completeSetup(
+        address registry, 
         VersionPart release
     )
-        internal
-        reinitializer(release.toInt())
+        external
+        onlyAdminRole
+        reinitializer(uint64(release.toInt()))
     {
-        if (!release.isValidRelease()) {
-            revert ErrorAccessManagerInvalidRelease(release);
-        }
-
-        __ERC165_init();
-        __AccessManager_init(admin);
-
-        _registerInterface(type(IAccessManager).interfaceId);
+        _checkAndSetRegistry(registry);
+        _checkAndSetRelease(release);
     }
 
     /// @dev Returns true if the caller is authorized to call the target with the given selector and the manager lock is not set to locked.
-    /// Return values as in OpenZeppelin AccessManager.
+    /// Feturn values as in OpenZeppelin AccessManager.
     /// For a locked manager the function reverts with ErrorAccessManagerTargetAdminLocked.
     function canCall(
         address caller,
@@ -101,10 +101,10 @@ contract AccessManagerCloneable is
     /// For the registry admin release 3 is returned.
     /// For the release admin and the instance admin the actual release version is returned.
     function getRelease() external view returns (VersionPart release) {
-        return VersionPartLib.toVersionPart(
-            uint8(_getInitializedVersion()));
+        return _release;
     }
 
+
     /// @dev Returns true iff all contracts of this access manager are locked.
     function isLocked()
         public
@@ -113,4 +113,28 @@ contract AccessManagerCloneable is
     {
         return _isLocked;
     }
+
+
+    function _checkAndSetRelease(VersionPart release)
+        internal
+    {
+        if (!release.isValidRelease()) {
+            revert ErrorAccessManagerInvalidRelease(release);
+        }
+
+        _release = release;
+    }
+
+
+    function _checkAndSetRegistry(address registry)
+        internal
+    {
+        // checks
+        if(address(getRegistry()) != address(0)) {
+            revert ErrorAccessManagerRegistryAlreadySet(address(getRegistry()) );
+        }
+
+        // effects
+        __RegistryLinked_init(registry);
+    }
 }

package/contracts/authorization/Authorization.sol

@@ -9,7 +9,7 @@ import {ObjectType} from "../type/ObjectType.sol";
 import {RoleId, RoleIdLib} from "../type/RoleId.sol";
 import {ServiceAuthorization} from "../authorization/ServiceAuthorization.sol";
 import {Str, StrLib} from "../type/String.sol";
-import {VersionPart} from "../type/Version.sol";
+
 
 contract Authorization is
     ServiceAuthorization,
@@ -30,7 +30,7 @@ contract Authorization is
     constructor(
         string memory mainTargetName, 
         ObjectType domain,
-        VersionPart release,
+        uint8 release,
         string memory commitHash,
         IAccess.TargetType targetType,
         bool includeTokenHandler

package/contracts/authorization/IAccessAdmin.sol

@@ -6,6 +6,7 @@ import {IAccessManaged} from "@openzeppelin/contracts/access/manager/IAccessMana
 import {IAccess} from "./IAccess.sol";
 import {IAuthorization} from "./IAuthorization.sol";
 import {IRegistryLinked} from "../shared/IRegistryLinked.sol";
+import {IRelease} from "../registry/IRelease.sol";
 
 import {Blocknumber} from "../type/Blocknumber.sol";
 import {NftId} from "../type/NftId.sol";
@@ -18,7 +19,8 @@ import {VersionPart} from "../type/Version.sol";
 interface IAccessAdmin is 
     IAccessManaged,
     IAccess,
-    IRegistryLinked
+    IRegistryLinked,
+    IRelease
 {
 
     // roles, targets and functions
@@ -57,7 +59,6 @@ interface IAccessAdmin is
     error ErrorAccessAdminTargetNotCreated(address target);
     error ErrorAccessAdminTargetNotRegistered(address target);
     error ErrorAccessAdminTargetTypeMismatch(address target, ObjectType expectedType, ObjectType actualType);
-    error ErrorAccessAdminTargetReleaseMismatch(address target, VersionPart expectedRelease, VersionPart actualRelease);
 
     // check authorization
     error ErrorAccessAdminAlreadyInitialized(address authorization);
@@ -138,5 +139,4 @@ interface IAccessAdmin is
 
     function authorizedFunctions(address target) external view returns (uint256 numberOfFunctions);
     function getAuthorizedFunction(address target, uint256 idx) external view returns (FunctionInfo memory func, RoleId roleId);
-        function getRelease() external view returns (VersionPart);
 }

package/contracts/authorization/IServiceAuthorization.sol

@@ -16,7 +16,7 @@ interface IServiceAuthorization is
 
      error ErrorAuthorizationMainTargetNameEmpty();
      error ErrorAuthorizationTargetDomainZero();
-     error ErrorAuthorizationReleaseInvalid(VersionPart release);
+     error ErrorAuthorizationReleaseInvalid(uint8 release);
      error ErrorAuthorizationCommitHashInvalid(string commitHash);
 
      /// @dev Returns the main domain of the authorization.

package/contracts/authorization/ServiceAuthorization.sol

@@ -30,7 +30,7 @@ contract ServiceAuthorization is
      string public constant ROLE_NAME_SUFFIX = "_Role";
 
      ObjectType public immutable DOMAIN;
-     VersionPart internal immutable _release;
+     uint256 internal immutable _release;
      string internal _commitHash;
 
      string internal _mainTargetName;
@@ -55,7 +55,7 @@ contract ServiceAuthorization is
      constructor(
           string memory mainTargetName, 
           ObjectType domain,
-          VersionPart release,
+          uint8 release,
           string memory commitHash
      )
      {
@@ -68,7 +68,7 @@ contract ServiceAuthorization is
                revert ErrorAuthorizationTargetDomainZero();
           }
 
-          if (!VersionPartLib.isValidRelease(release)) {
+          if (release < VersionPartLib.releaseMin().toInt() || release >= VersionPartLib.releaseMax().toInt()) {
                revert ErrorAuthorizationReleaseInvalid(release);
           }
 
@@ -103,7 +103,7 @@ contract ServiceAuthorization is
 
      /// @inheritdoc IServiceAuthorization
      function getRelease() public view returns(VersionPart release) {
-          return _release;
+          return VersionPartLib.toVersionPart(_release);
      }
 
      /// @inheritdoc IServiceAuthorization

package/contracts/distribution/BasicDistribution.sol

@@ -119,6 +119,7 @@ contract BasicDistribution is
     }
 
     function _initializeBasicDistribution(
+        address registry,
         NftId instanceNftId,
         IAuthorization authorization, 
         address initialOwner,
@@ -129,6 +130,7 @@ contract BasicDistribution is
         onlyInitializing()
     {
         __Distribution_init(
+            registry, 
             instanceNftId, 
             authorization,
             false,

package/contracts/distribution/BasicDistributionAuthorization.sol

@@ -2,16 +2,15 @@
 pragma solidity ^0.8.20;
 
 import {IAccess} from "../authorization/IAccess.sol";
-import {IComponent} from "../shared/IComponent.sol";
+import {IInstanceLinkedComponent} from "../shared/IInstanceLinkedComponent.sol";
 
 import {Authorization} from "../authorization/Authorization.sol";
 import {BasicDistribution} from "./BasicDistribution.sol"; 
 import {Distribution} from "./Distribution.sol";
 import {COMPONENT, DISTRIBUTION} from "../type/ObjectType.sol";
 import {PUBLIC_ROLE} from "../type/RoleId.sol";
-import {GIF_INITIAL_RELEASE} from "../registry/Registry.sol";
 import {TokenHandler} from "../shared/TokenHandler.sol";
-import {VersionPartLib} from "../type/Version.sol";
+
 
 contract BasicDistributionAuthorization
      is Authorization
@@ -21,7 +20,7 @@ contract BasicDistributionAuthorization
           Authorization(
                distributionName, 
                DISTRIBUTION(), 
-               GIF_INITIAL_RELEASE(),
+               3,
                COMMIT_HASH,
                TargetType.Component, 
                true)
@@ -61,7 +60,7 @@ contract BasicDistributionAuthorization
           _authorize(functions, BasicDistribution.changeDistributorType.selector, "changeDistributorType");
           _authorize(functions, BasicDistribution.createReferral.selector, "createReferral");
           
-          _authorize(functions, IComponent.withdrawFees.selector, "withdrawFees");
+          _authorize(functions, IInstanceLinkedComponent.withdrawFees.selector, "withdrawFees");
           _authorize(functions, Distribution.withdrawCommission.selector, "withdrawCommission");
      }
 }

package/contracts/distribution/Distribution.sol

@@ -104,6 +104,7 @@ abstract contract Distribution is
 
 
     function __Distribution_init(
+        address registry,
         NftId productNftId,
         IAuthorization authorization, 
         bool isInterceptor,
@@ -115,6 +116,7 @@ abstract contract Distribution is
         onlyInitializing()
     {
         __InstanceLinkedComponent_init(
+            registry, 
             productNftId, 
             name, 
             DISTRIBUTION(),