@etherisc/gif-next 3.0.0-24be7ed-702 → 3.0.0-2e16ebd-614

package/artifacts/contracts/upgradeability/{Versionable.sol/Versionable.json → Upgradeable.sol/Upgradeable.json}

@@ -1,13 +1,50 @@
 {
   "_format": "hh-sol-artifact-1",
-  "contractName": "Versionable",
-  "sourceName": "contracts/upgradeability/Versionable.sol",
+  "contractName": "Upgradeable",
+  "sourceName": "contracts/upgradeability/Upgradeable.sol",
   "abi": [
     {
       "inputs": [],
       "name": "ErrorVersionableInitializeNotImplemented",
       "type": "error"
     },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "target",
+          "type": "address"
+        },
+        {
+          "internalType": "VersionPart",
+          "name": "invalidRelease",
+          "type": "uint8"
+        }
+      ],
+      "name": "ErrorVersionableReleaseInvalid",
+      "type": "error"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "target",
+          "type": "address"
+        },
+        {
+          "internalType": "VersionPart",
+          "name": "expected",
+          "type": "uint8"
+        },
+        {
+          "internalType": "VersionPart",
+          "name": "actual",
+          "type": "uint8"
+        }
+      ],
+      "name": "ErrorVersionableReleaseMismatch",
+      "type": "error"
+    },
     {
       "inputs": [],
       "name": "ErrorVersionableUpgradeNotImplemented",
@@ -36,6 +73,19 @@
       "name": "Initialized",
       "type": "event"
     },
+    {
+      "inputs": [],
+      "name": "getRelease",
+      "outputs": [
+        {
+          "internalType": "VersionPart",
+          "name": "",
+          "type": "uint8"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
+    },
     {
       "inputs": [],
       "name": "getVersion",
@@ -62,7 +112,7 @@
           "type": "bytes"
         }
       ],
-      "name": "initializeVersionable",
+      "name": "initialize",
       "outputs": [],
       "stateMutability": "nonpayable",
       "type": "function"
@@ -75,7 +125,7 @@
           "type": "bytes"
         }
       ],
-      "name": "upgradeVersionable",
+      "name": "upgrade",
       "outputs": [],
       "stateMutability": "nonpayable",
       "type": "function"

package/contracts/accounting/AccountingService.sol

@@ -26,14 +26,13 @@ contract AccountingService is
     )
         internal
         virtual override
-        initializer()
+        onlyInitializing()
     {
         (
-            address authority,
-            address registry
-        ) = abi.decode(data, (address, address));
+            address authority
+        ) = abi.decode(data, (address));
 
-        __Service_init(authority, registry, owner);
+        __Service_init(authority, owner);
         _registerInterface(type(IAccountingService).interfaceId);
     }
 
@@ -256,7 +255,7 @@ contract AccountingService is
         internal
         virtual
     {
-        emit LogComponentServiceUpdateFee(
+        emit LogAccountingServiceUpdateFee(
             productNftId, 
             name,
             feeBefore.fractionalFee,

package/contracts/accounting/AccountingServiceManager.sol

@@ -2,7 +2,7 @@
 pragma solidity ^0.8.20;
 
 import {AccountingService} from "./AccountingService.sol";
-import {IVersionable} from "../upgradeability/IVersionable.sol";
+import {IUpgradeable} from "../upgradeability/IUpgradeable.sol";
 import {ProxyManager} from "../upgradeability/ProxyManager.sol";
 
 contract AccountingServiceManager is ProxyManager {
@@ -12,19 +12,17 @@ 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, registry);
-        IVersionable versionable = initialize(
-            registry,
+        bytes memory data = abi.encode(authority);
+        IUpgradeable upgradeable = initialize(
             address(svc), 
             data,
             salt);
 
-        _accountingService = AccountingService(address(versionable));
+        _accountingService = AccountingService(address(upgradeable));
     }
 
     //--- view functions ----------------------------------------------------//

package/contracts/accounting/IAccountingService.sol

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

package/contracts/authorization/AccessAdmin.sol

@@ -14,13 +14,14 @@ 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, NftIdLib} from "../type/NftId.sol";
+import {NftId} 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 {VersionPart} from "../type/Version.sol";
+import {VersionPartLib, VersionPart} from "../type/Version.sol";
 
 
 /**
@@ -30,6 +31,7 @@ import {VersionPart} from "../type/Version.sol";
  */ 
 contract AccessAdmin is
     AccessManagedUpgradeable,
+    RegistryLinked,
     IAccessAdmin
 {
     using EnumerableSet for EnumerableSet.AddressSet;
@@ -91,12 +93,16 @@ contract AccessAdmin is
     /// Internally initializes access manager with this admin and creates basic role setup.
     function initialize(
         address authority,
-        string memory adminName 
+        string memory adminName,
+        VersionPart release 
     )
         public
-        initializer()
     {
-        __AccessAdmin_init(authority, adminName);
+        if(_getInitializedVersion() != 0) {
+            revert InvalidInitialization();
+        }
+
+        __AccessAdmin_init(authority, adminName, release);
     }
 
 
@@ -106,14 +112,16 @@ 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 
+        string memory adminName,
+        VersionPart release
     )
         internal
-        onlyInitializing()
+        reinitializer(release.toInt())
     {
         AccessAdminLib.checkInitParameters(authority, adminName);
+
         _authority = AccessManagerCloneable(authority);
-        _authority.initialize(address(this));
+        _authority.initialize(address(this), release);
 
         // delayed additional check for authority after its initialization
         if (!ContractLib.isAuthority(authority)) {
@@ -121,7 +129,7 @@ contract AccessAdmin is
         }
 
         // effects
-        // set and initialize this access manager contract as
+        // set and initialize this contract as
         // the admin (ADMIN_ROLE) of the provided authority
         __AccessManaged_init(authority);
 
@@ -129,7 +137,7 @@ contract AccessAdmin is
         _adminName = adminName;
 
         // set initial linked NFT ID to zero
-        _linkedNftId = NftIdLib.zero();
+        //_linkedNftId = NftIdLib.zero();
 
         // setup admin role
         _createRoleUnchecked(
@@ -149,12 +157,7 @@ contract AccessAdmin is
     //--- view functions for access admin ---------------------------------------//
 
     function getRelease() public view virtual returns (VersionPart release) {
-        return _authority.getRelease();
-    }
-
-
-    function getRegistry() public view returns (IRegistry registry) {
-        return _authority.getRegistry();
+        return VersionPartLib.toVersionPart(uint8(_getInitializedVersion()));
     }
 
 
@@ -297,11 +300,12 @@ contract AccessAdmin is
     //--- internal/private functions -------------------------------------------------//
 
     function _linkToNftOwnable(address registerable) internal {
-        if (!getRegistry().isRegistered(registerable)) {
+        NftId nftId = _getRegistry().getNftIdForAddress(registerable);
+        if (nftId.eqz()) {
             revert ErrorAccessAdminNotRegistered(registerable);
         }
 
-        _linkedNftId = getRegistry().getNftIdForAddress(registerable);
+        _linkedNftId = nftId;
     }
 
 

package/contracts/authorization/AccessAdminLib.sol

@@ -335,9 +335,9 @@ library AccessAdminLib { // ACCESS_ADMIN_LIB
         view
         returns (IAuthorization componentAuthorization)
     {
-        checkIsRegistered(address(accessAdmin.getRegistry()), componentAddress, expectedType);
-
         VersionPart expecteRelease = accessAdmin.getRelease();
+        checkIsRegistered(componentAddress, expectedType, expecteRelease);
+
         IInstanceLinkedComponent component = IInstanceLinkedComponent(componentAddress);
         componentAuthorization = component.getAuthorization();
 
@@ -435,22 +435,25 @@ library AccessAdminLib { // ACCESS_ADMIN_LIB
 
 
     function checkIsRegistered( 
-        address registry,
         address target,
-        ObjectType expectedType
+        ObjectType expectedType,
+        VersionPart expectedRelease
     )
         public
         view 
     {
-        checkRegistry(registry);
+        IRegistry.ObjectInfo memory info = ContractLib.getRegistry().getObjectInfo(target);
 
-        ObjectType tagetType = IRegistry(registry).getObjectInfo(target).objectType;
-        if (tagetType.eqz()) {
+        if (info.objectType.eqz()) {
             revert IAccessAdmin.ErrorAccessAdminNotRegistered(target);
         }
 
-        if (tagetType != expectedType) {
-            revert IAccessAdmin.ErrorAccessAdminTargetTypeMismatch(target, expectedType, tagetType);
+        if (info.objectType != expectedType) {
+            revert IAccessAdmin.ErrorAccessAdminTargetTypeMismatch(target, expectedType, info.objectType);
+        }
+
+        if (info.release != expectedRelease) {
+            revert IAccessAdmin.ErrorAccessAdminTargetReleaseMismatch(target, expectedRelease, info.release);
         }
     }
 

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 {RegistryLinked} from "../shared/RegistryLinked.sol";
-import {VersionPart} from "../type/Version.sol";
+import {VersionPartLib, VersionPart} from "../type/Version.sol";
 
 
 /// @dev An AccessManager based on OpenZeppelin that is cloneable and has a central lock property.
@@ -14,8 +14,7 @@ import {VersionPart} from "../type/Version.sol";
 /// Cloned by upon release preparation and instance cloning.
 contract AccessManagerCloneable is
     AccessManagerUpgradeable,
-    InitializableERC165,
-    RegistryLinked
+    InitializableERC165
 {
     error ErrorAccessManagerCallerNotAdmin(address caller);
     error ErrorAccessManagerRegistryAlreadySet(address registry);
@@ -24,7 +23,6 @@ contract AccessManagerCloneable is
     error ErrorAccessManagerTargetAdminLocked(address target);
     error ErrorAccessManagerCallerAdminLocked(address caller);
 
-    VersionPart private _release;
     bool private _isLocked;
 
 
@@ -36,34 +34,36 @@ contract AccessManagerCloneable is
         _;
     }
 
-
-    function initialize(address admin)
+    function initialize(address adminAddress, VersionPart release)
         public
-        initializer()
+
     {
-        __ERC165_init();
-        __AccessManager_init(admin);
+        if(_getInitializedVersion() != 0) {
+            revert InvalidInitialization();
+        }
 
-        _registerInterface(type(IAccessManager).interfaceId);
+        AccessManagerCloneable_init(adminAddress, release);
     }
 
-
-    /// @dev Completes the setup of the access manager.
-    /// Links the access manager to the registry and sets the release version.
-    function completeSetup(
-        address registry, 
+    function AccessManagerCloneable_init(
+        address admin,
         VersionPart release
     )
-        external
-        onlyAdminRole
-        reinitializer(uint64(release.toInt()))
+        internal
+        reinitializer(release.toInt())
     {
-        _checkAndSetRegistry(registry);
-        _checkAndSetRelease(release);
+        if (!release.isValidRelease()) {
+            revert ErrorAccessManagerInvalidRelease(release);
+        }
+
+        __ERC165_init();
+        __AccessManager_init(admin);
+
+        _registerInterface(type(IAccessManager).interfaceId);
     }
 
     /// @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.
-    /// Feturn values as in OpenZeppelin AccessManager.
+    /// Return 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 _release;
+        return VersionPartLib.toVersionPart(
+            uint8(_getInitializedVersion()));
     }
 
-
     /// @dev Returns true iff all contracts of this access manager are locked.
     function isLocked()
         public
@@ -113,28 +113,4 @@ 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,
-        uint8 release,
+        VersionPart release,
         string memory commitHash,
         IAccess.TargetType targetType,
         bool includeTokenHandler

package/contracts/authorization/IAccessAdmin.sol

@@ -6,7 +6,6 @@ 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";
@@ -19,8 +18,7 @@ import {VersionPart} from "../type/Version.sol";
 interface IAccessAdmin is 
     IAccessManaged,
     IAccess,
-    IRegistryLinked,
-    IRelease
+    IRegistryLinked
 {
 
     // roles, targets and functions
@@ -59,6 +57,7 @@ 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);
@@ -139,4 +138,5 @@ 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(uint8 release);
+     error ErrorAuthorizationReleaseInvalid(VersionPart 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;
-     uint256 internal immutable _release;
+     VersionPart internal immutable _release;
      string internal _commitHash;
 
      string internal _mainTargetName;
@@ -55,7 +55,7 @@ contract ServiceAuthorization is
      constructor(
           string memory mainTargetName, 
           ObjectType domain,
-          uint8 release,
+          VersionPart release,
           string memory commitHash
      )
      {
@@ -68,7 +68,7 @@ contract ServiceAuthorization is
                revert ErrorAuthorizationTargetDomainZero();
           }
 
-          if (release < VersionPartLib.releaseMin().toInt() || release >= VersionPartLib.releaseMax().toInt()) {
+          if (!VersionPartLib.isValidRelease(release)) {
                revert ErrorAuthorizationReleaseInvalid(release);
           }
 
@@ -103,7 +103,7 @@ contract ServiceAuthorization is
 
      /// @inheritdoc IServiceAuthorization
      function getRelease() public view returns(VersionPart release) {
-          return VersionPartLib.toVersionPart(_release);
+          return _release;
      }
 
      /// @inheritdoc IServiceAuthorization

package/contracts/distribution/BasicDistribution.sol

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

package/contracts/distribution/BasicDistributionAuthorization.sol

@@ -2,15 +2,16 @@
 pragma solidity ^0.8.20;
 
 import {IAccess} from "../authorization/IAccess.sol";
-import {IInstanceLinkedComponent} from "../shared/IInstanceLinkedComponent.sol";
+import {IComponent} 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
@@ -20,7 +21,7 @@ contract BasicDistributionAuthorization
           Authorization(
                distributionName, 
                DISTRIBUTION(), 
-               3,
+               GIF_INITIAL_RELEASE(),
                COMMIT_HASH,
                TargetType.Component, 
                true)
@@ -60,7 +61,7 @@ contract BasicDistributionAuthorization
           _authorize(functions, BasicDistribution.changeDistributorType.selector, "changeDistributorType");
           _authorize(functions, BasicDistribution.createReferral.selector, "createReferral");
           
-          _authorize(functions, IInstanceLinkedComponent.withdrawFees.selector, "withdrawFees");
+          _authorize(functions, IComponent.withdrawFees.selector, "withdrawFees");
           _authorize(functions, Distribution.withdrawCommission.selector, "withdrawCommission");
      }
 }

package/contracts/distribution/Distribution.sol

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