@etherisc/gif-next 0.0.2-7c8d286-020 → 0.0.2-7d488b3-675

package/contracts/authorization/AccessManagerCloneable.sol

@@ -2,11 +2,12 @@
 pragma solidity ^0.8.20;
 
 import {AccessManagerUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagerUpgradeable.sol";
+import {IAccessManaged} from "@openzeppelin/contracts/access/manager/IAccessManaged.sol";
 import {IAccessManager} from "@openzeppelin/contracts/access/manager/IAccessManager.sol";
 
 import {InitializableERC165} from "../shared/InitializableERC165.sol";
 import {RegistryLinked} from "../shared/RegistryLinked.sol";
-import {VersionPart} from "../type/Version.sol";
+import {VersionPart, VersionLib} from "../type/Version.sol";
 
 
 /// @dev An AccessManager based on OpenZeppelin that is cloneable and has a central lock property.
@@ -27,7 +28,6 @@ contract AccessManagerCloneable is
     VersionPart private _release;
     bool private _isLocked;
 
-
     modifier onlyAdminRole() {
         (bool isMember, ) = hasRole(ADMIN_ROLE, msg.sender);
         if(!isMember) {
@@ -36,14 +36,12 @@ contract AccessManagerCloneable is
         _;
     }
 
-
     function initialize(address admin)
-        public
+        external
         initializer()
     {
-        __ERC165_init();
         __AccessManager_init(admin);
-
+        _initializeERC165();
         _registerInterface(type(IAccessManager).interfaceId);
     }
 
@@ -58,27 +56,22 @@ contract AccessManagerCloneable is
         onlyAdminRole
         reinitializer(uint64(release.toInt()))
     {
-        _checkAndSetRegistry(registry);
-        _checkAndSetRelease(release);
+        _completeSetup(registry, release, true);
     }
 
-    // /// @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,
-    //     bool verifyRelease
-    // )
-    //     public
-    //     onlyAdminRole
-    //     reinitializer(uint64(release.toInt()))
-    // {
-    //     _checkAndSetRegistry(registry);
-
-    //     if (verifyRelease) {
-    //         _checkAndSetRelease(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, 
+        VersionPart release,
+        bool verifyRelease
+    )
+        public
+        onlyAdminRole
+        reinitializer(uint64(release.toInt()))
+    {
+        _completeSetup(registry, release, verifyRelease);
+    }
 
     /// @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.
@@ -96,12 +89,12 @@ contract AccessManagerCloneable is
             uint32 delay
         ) 
     {
+        (immediate, delay) = super.canCall(caller, target, selector);
+
         // locking of all contracts under control of this access manager
-        if (_isLocked) {
+        if (isLocked()) {
             revert ErrorAccessManagerTargetAdminLocked(target);
         }
-
-        (immediate, delay) = super.canCall(caller, target, selector);
     }
 
 
@@ -133,18 +126,11 @@ contract AccessManagerCloneable is
     }
 
 
-    function _checkAndSetRelease(VersionPart release)
-        internal
-    {
-        if (!release.isValidRelease()) {
-            revert ErrorAccessManagerInvalidRelease(release);
-        }
-
-        _release = release;
-    }
-
-
-    function _checkAndSetRegistry(address registry)
+    function _completeSetup(
+        address registry,
+        VersionPart release,
+        bool verifyRelease
+    )
         internal
     {
         // checks
@@ -152,7 +138,12 @@ contract AccessManagerCloneable is
             revert ErrorAccessManagerRegistryAlreadySet(address(getRegistry()) );
         }
 
+        if (verifyRelease && !release.isValidRelease()) {
+            revert ErrorAccessManagerInvalidRelease(release);
+        }
+
         // effects
         __RegistryLinked_init(registry);
+        _release = release;
     }
 }

package/contracts/authorization/Authorization.sol

@@ -3,32 +3,27 @@ pragma solidity ^0.8.20;
 
 import {IAccess} from "./IAccess.sol";
 import {IAuthorization} from "./IAuthorization.sol";
-
-import {InitializableERC165} from "../shared/InitializableERC165.sol";
-import {ObjectType, ObjectTypeLib} from "../type/ObjectType.sol";
+import {ObjectType, ObjectTypeLib, PRODUCT, ORACLE, DISTRIBUTION, POOL} from "../type/ObjectType.sol";
 import {RoleId, RoleIdLib, ADMIN_ROLE} from "../type/RoleId.sol";
 import {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";
 
-contract Authorization is
-    InitializableERC165,
-    IAuthorization
+contract Authorization
+    is IAuthorization
 {
     uint256 public constant GIF_RELEASE = 3;
 
     string public constant ROLE_NAME_SUFFIX = "Role";
     string public constant SERVICE_ROLE_NAME_SUFFIX = "ServiceRole";
 
-    uint64 internal _nextGifContractRoleId;
     ObjectType[] internal _serviceDomains;
     mapping(ObjectType domain => Str target) internal _serviceTarget;
 
     string internal _mainTargetName = "Component";
     string internal _tokenHandlerName = "ComponentTH";
 
-    ObjectType internal _domain;
     Str internal _mainTarget;
     Str internal _tokenHandlerTarget;
     Str[] internal _targets;
@@ -45,9 +40,7 @@ contract Authorization is
 
     constructor(
         string memory mainTargetName, 
-        ObjectType targetDomain, 
-        bool isComponent,
-        bool includeTokenHandler
+        ObjectType targetDomain
     )
     {
         // checks
@@ -55,52 +48,45 @@ contract Authorization is
             revert ErrorAuthorizationMainTargetNameEmpty();
         }
 
-        if (targetDomain == ObjectTypeLib.zero()) {
+        if (targetDomain.eqz()) {
             revert ErrorAuthorizationTargetDomainZero();
         }
 
         // effects
-        _initializeERC165();
-
-        _domain = targetDomain;
+        // setup main target, main role id and main role info
         _mainTargetName = mainTargetName;
-        _mainTarget = StrLib.toStr(mainTargetName);
-        _nextGifContractRoleId = 10;
+        _tokenHandlerName = string(abi.encodePacked(mainTargetName, "TH"));
 
-        if (isComponent) {
-            if (targetDomain.eqz()) {
-                revert ErrorAuthorizationTargetDomainZero();
-            }
+        RoleId mainRoleId = RoleIdLib.toComponentRoleId(targetDomain, 0);
+        string memory mainRolName = _toTargetRoleName(mainTargetName);
 
-            RoleId mainRoleId = RoleIdLib.toComponentRoleId(targetDomain, 0);
-            string memory mainRolName = _toTargetRoleName(_mainTargetName);
+        _addTargetWithRole(
+            _mainTargetName, 
+            mainRoleId,
+            mainRolName);
 
-            _addTargetWithRole(
-                _mainTargetName, 
-                mainRoleId,
-                mainRolName);
-        } else {
-            _addGifContractTarget(_mainTargetName);
+        _mainTarget = StrLib.toStr(mainTargetName);
+        _targetRole[_mainTarget] = mainRoleId;
+
+        // add token handler target for components
+        if (targetDomain == PRODUCT() 
+            || targetDomain == DISTRIBUTION()
+            || targetDomain == ORACLE()
+            || targetDomain == POOL()
+        ) {
+            _addTarget(_tokenHandlerName);
         }
+
+        // setup token handler target
+        _tokenHandlerTarget = StrLib.toStr(_tokenHandlerName);
+
         // setup use case specific parts
         _setupServiceTargets();
         _setupRoles(); // not including main target role
         _setupTargets(); // not including main target (and token handler target)
-        _setupTargetAuthorizations(); // not including token handler target
 
-        // setup component token handler 
-        if (includeTokenHandler) {
-            _tokenHandlerName = string(abi.encodePacked(mainTargetName, "TH"));
-            _tokenHandlerTarget = StrLib.toStr(_tokenHandlerName);
-            _addTarget(_tokenHandlerName);
-            _setupTokenHandlerAuthorizations();
-        }
-
-        _registerInterfaceNotInitializing(type(IAuthorization).interfaceId);
-    }
-
-    function getDomain() external view returns(ObjectType targetDomain) {
-        return _domain;
+        _setupTokenHandlerAuthorizations();
+        _setupTargetAuthorizations(); // not including token handler target
     }
 
     function getServiceDomains() external view returns(ObjectType[] memory serviceDomains) {
@@ -161,7 +147,7 @@ contract Authorization is
         return target == _mainTarget || _targetExists[target];
     }
 
-    function getTargetRole(Str target) public view returns(RoleId roleId) {
+    function getTargetRole(Str target) external view returns(RoleId roleId) {
         return _targetRole[target];
     }
 
@@ -197,20 +183,6 @@ contract Authorization is
     /// Overwrite this function for use case specific authorizations.
     function _setupTargetAuthorizations() internal virtual {}
 
-    function _addGifContractTarget(string memory contractName) internal {
-
-        RoleId contractRoleId = RoleIdLib.toRoleId(_nextGifContractRoleId++);
-        string memory contractRoleName = string(
-            abi.encodePacked(
-                contractName,
-                ROLE_NAME_SUFFIX));
-
-        _addTargetWithRole(
-            contractName,
-            contractRoleId,
-            contractRoleName);
-    }
-
     /// @dev Add the service target role for the specified service domain
     function _addServiceTargetWithRole(ObjectType serviceDomain) internal {
         // add service domain
@@ -220,7 +192,7 @@ contract Authorization is
         string memory serviceTargetName = ObjectTypeLib.toVersionedName(
                 ObjectTypeLib.toName(serviceDomain), 
                 "Service", 
-                getRelease());
+                getRelease().toInt());
 
         _serviceTarget[serviceDomain] = StrLib.toStr(serviceTargetName);
 
@@ -228,7 +200,7 @@ contract Authorization is
         string memory serviceRoleName = ObjectTypeLib.toVersionedName(
                 ObjectTypeLib.toName(serviceDomain), 
                 "ServiceRole", 
-                getRelease());
+                getRelease().toInt());
 
         _addTargetWithRole(
             serviceTargetName,
@@ -263,7 +235,7 @@ contract Authorization is
             ObjectTypeLib.toVersionedName(
                 ObjectTypeLib.toName(serviceDomain), 
                 SERVICE_ROLE_NAME_SUFFIX, 
-                getRelease()));
+                getRelease().toInt()));
     }
 
 

package/contracts/authorization/IAccessAdmin.sol

@@ -4,12 +4,7 @@ pragma solidity ^0.8.20;
 import {IAccessManaged} from "@openzeppelin/contracts/access/manager/IAccessManaged.sol";
 
 import {IAccess} from "./IAccess.sol";
-import {IAuthorization} from "./IAuthorization.sol";
 import {IRegistryLinked} from "../shared/IRegistryLinked.sol";
-import {IRelease} from "../registry/IRelease.sol";
-
-import {NftId} from "../type/NftId.sol";
-import {ObjectType} from "../type/ObjectType.sol";
 import {RoleId} from "../type/RoleId.sol";
 import {Selector} from "../type/Selector.sol";
 import {Str} from "../type/String.sol";
@@ -18,80 +13,59 @@ import {VersionPart} from "../type/Version.sol";
 interface IAccessAdmin is 
     IAccessManaged,
     IAccess,
-    IRegistryLinked,
-    IRelease
+    IRegistryLinked
 {
 
     // roles, targets and functions
-    event LogAccessAdminRoleCreated(string admin, RoleId roleId, RoleType roleType, RoleId roleAdminId, string name);
-    event LogAccessAdminTargetCreated(string admin, address target, string name);
+    event LogAccessAdminRoleCreated(RoleId roleId, RoleType roleType, RoleId roleAdminId, string name);
+    event LogAccessAdminTargetCreated(address target, string name);
 
-    event LogAccessAdminRoleGranted(string admin, address account, string roleName);
-    event LogAccessAdminRoleRevoked(string admin, address account, string roleName);
-    event LogAccessAdminFunctionGranted(string admin, address target, string func);
+    event LogAccessAdminRoleGranted(address account, string roleName);
+    event LogAccessAdminRoleRevoked(address account, string roleName);
+    event LogAccessAdminFunctionGranted(address target, string functionName, string roleName);
 
     // only deployer modifier
-    error ErrorAccessAdminNotDeployer();
+    error ErrorNotDeployer();
 
     // only role admin modifier
-    error ErrorAccessAdminNotAdminOfRole(RoleId adminRoleId, address account);
+    error ErrorNotAdminOfRole(RoleId adminRoleId);
 
     // only role owner modifier
-    error ErrorAccessAdminNotRoleOwner(RoleId roleId, address account);
-
-    // initialization
-    error ErrorAccessAdminNotRegistry(address registry);
-    error ErrorAccessAdminAuthorityNotContract(address authority);
-    error ErrorAccessAdminAccessManagerNotAccessManager(address authority);
-    error ErrorAccessAdminAccessManagerEmptyName();
-
-    // check target
-    error ErrorAccessAdminTargetNotCreated(address target);
-    error ErrorAccessAdminTargetNotRegistered(address target);
-    error ErrorAccessAdminTargetTypeMismatch(address target, ObjectType expectedType, ObjectType actualType);
-
-    // check authorization
-    error ErrorAccessAdminAlreadyInitialized(address authorization);
-    error ErrorAccessAdminNotAuthorization(address authorization);
-    error ErrorAccessAdminDomainMismatch(address authorization, ObjectType expectedDomain, ObjectType actualDomain);
-    error ErrorAccessAdminReleaseMismatch(address authorization, VersionPart expectedRelease, VersionPart actualRelease);
-
-    // link to nft
-    error ErrorAccessAdminNotRegistered(address registerable);
+    error ErrorNotRoleOwner(RoleId roleId);
 
     // initialize authority
-    error ErrorAccessAdminAdminRoleMissing();
+    error ErrorAdminRoleMissing();
 
     // create role
-    error ErrorAccessAdminRoleAlreadyCreated(RoleId roleId, string name);
-    error ErrorAccessAdminRoleAdminNotExisting(RoleId adminRoleId);
-    error ErrorAccessAdminRoleNameEmpty(RoleId roleId);
-    error ErrorAccessAdminRoleNameAlreadyExists(RoleId roleId, string name, RoleId existingRoleId);
+    error ErrorRoleAlreadyCreated(RoleId roleId, string name);
+    error ErrorRoleAdminNotExisting(RoleId adminRoleId);
+    error ErrorRoleNameEmpty(RoleId roleId);
+    error ErrorRoleNameAlreadyExists(RoleId roleId, string name, RoleId existingRoleId);
 
     // grant/revoke/renounce role
-    error ErrorAccessAdminRoleUnknown(RoleId roleId);
-    error ErrorAccessAdminRoleIsLocked(RoleId roleId);
-    error ErrorAccessAdminRoleIsPaused(RoleId roleId);
-    error ErrorAccessAdminRoleMembersLimitReached(RoleId roleId, uint256 memberCountLimit);
-    error ErrorAccessAdminRoleMemberNotContract(RoleId roleId, address notContract);
-    error ErrorAccessAdminRoleMemberRemovalDisabled(RoleId roleId, address expectedMember);
+    error ErrorRoleUnknown(RoleId roleId);
+    error ErrorRoleIsLocked(RoleId roleId);
+    error ErrorRoleIsPaused(RoleId roleId);
+    error ErrorRoleMembersLimitReached(RoleId roleId, uint256 memberCountLimit);
+    error ErrorRoleMemberNotContract(RoleId roleId, address notContract);
+    error ErrorRoleMemberRemovalDisabled(RoleId roleId, address expectedMember);
 
     // create target
-    error ErrorAccessAdminTargetAlreadyCreated(address target, string name);
-    error ErrorAccessAdminTargetNameEmpty(address target);
-    error ErrorAccessAdminTargetNameAlreadyExists(address target, string name, address existingTarget);
-    error ErrorAccessAdminTargetNotAccessManaged(address target);
-    error ErrorAccessAdminTargetAuthorityMismatch(address expectedAuthority, address actualAuthority);
+    error ErrorTargetAlreadyCreated(address target, string name);
+    error ErrorTargetNameEmpty(address target);
+    error ErrorTargetNameAlreadyExists(address target, string name, address existingTarget);
+    error ErrorTargetNotAccessManaged(address target);
+    error ErrorTargetAuthorityMismatch(address expectedAuthority, address actualAuthority);
 
     // lock target
-    error ErrorAccessAdminTagetNotLockable();
-    error ErrorAccessAdminTargetAlreadyLocked(address target, bool isLocked);
+    error ErrorTagetNotLockable();
+    error ErrorTargetAlreadyLocked(address target, bool isLocked);
 
     // authorize target functions
-    error ErrorAccessAdminAuthorizeForAdminRoleInvalid(address target);
+    error ErrorAuthorizeForAdminRoleInvalid(address target);
 
     // check target
-    error ErrorAccessAdminTargetUnknown(address target);
+    error ErrorTargetUnknown(address target);
 
     /// @dev Set the disabled status of the speicified role.
     /// Role disabling only prevents the role from being granted to new accounts.
@@ -136,11 +110,7 @@ interface IAccessAdmin is
 
     //--- view functions ----------------------------------------------------//
 
-    function getAuthorization() external view returns (IAuthorization authorization);
-    function getLinkedNftId() external view returns (NftId linkedNftId);
-    function getLinkedOwner() external view returns (address linkedOwner);
-
-    function isLocked() external view returns (bool locked);
+    function getRelease() external view returns (VersionPart release);
 
     function roles() external view returns (uint256 numberOfRoles);
     function getRoleId(uint256 idx) external view returns (RoleId roleId);
@@ -148,8 +118,8 @@ interface IAccessAdmin is
     function getPublicRole() external view returns (RoleId roleId);
 
     function roleExists(RoleId roleId) external view returns (bool exists); 
-    function getRoleForName(string memory name) external view returns (RoleId roleId);
     function getRoleInfo(RoleId roleId) external view returns (RoleInfo memory roleInfo);
+    function getRoleForName(Str name) external view returns (RoleNameInfo memory);
 
     function hasRole(address account, RoleId roleId) external view returns (bool);
     function hasAdminRole(address account, RoleId roleId) external view returns (bool);
@@ -157,14 +127,17 @@ interface IAccessAdmin is
     function getRoleMember(RoleId roleId, uint256 idx) external view returns (address account);
 
     function targetExists(address target) external view returns (bool exists);
-    function getTargetForName(Str name) external view returns (address target);
+    function isTargetLocked(address target) external view returns (bool locked);
     function targets() external view returns (uint256 numberOfTargets);
     function getTargetAddress(uint256 idx) external view returns (address target);
     function getTargetInfo(address target) external view returns (TargetInfo memory targetInfo);
-    function isTargetLocked(address target) external view returns (bool locked);
+    function getTargetForName(Str name) external view returns (address target);
 
     function authorizedFunctions(address target) external view returns (uint256 numberOfFunctions);
     function getAuthorizedFunction(address target, uint256 idx) external view returns (FunctionInfo memory func, RoleId roleId);
+    function canCall(address caller, address target, Selector selector) external view returns (bool can);
 
+    function toRole(RoleId adminRoleId, RoleType roleType, uint32 maxMemberCount, string memory name) external view returns (RoleInfo memory);
+    function toFunction(bytes4 selector, string memory name) external view returns (FunctionInfo memory);
     function deployer() external view returns (address);
 }

package/contracts/authorization/IAuthorization.sol

@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
-
 import {IAccess} from "../authorization/IAccess.sol";
 import {ObjectType} from "../type/ObjectType.sol";
 import {RoleId} from "../type/RoleId.sol";
@@ -10,16 +8,12 @@ import {Str} from "../type/String.sol";
 import {VersionPart} from "../type/Version.sol";
 
 interface IAuthorization is 
-     IERC165,
      IAccess 
 {
 
      error ErrorAuthorizationMainTargetNameEmpty();
      error ErrorAuthorizationTargetDomainZero();
 
-     /// @dev Returns the main domain of the authorization.
-     function getDomain() external view returns(ObjectType targetDomain);
-
      /// @dev Returns the list of service targets.
      function getServiceDomains() external view returns(ObjectType[] memory serviceDomains);
 

package/contracts/distribution/BasicDistribution.sol

@@ -7,7 +7,7 @@ import {Distribution} from "./Distribution.sol";
 import {DistributorType} from "../type/DistributorType.sol";
 import {DISTRIBUTOR} from "../type/ObjectType.sol";
 import {Fee} from "../type/Fee.sol";
-import {NftId, NftIdLib} from "../type/NftId.sol";
+import {NftId} from "../type/NftId.sol";
 import {ReferralId} from "../type/Referral.sol";
 import {Seconds} from "../type/Seconds.sol";
 import {Timestamp} from "../type/Timestamp.sol";
@@ -95,7 +95,6 @@ contract BasicDistribution is
      * referral codes need to be unique
      */
     function createReferral(
-        NftId distributorNftId,
         string memory code,
         UFixed discountPercentage,
         uint32 maxReferrals,
@@ -105,10 +104,10 @@ contract BasicDistribution is
         external
         virtual
         restricted()
-        onlyNftOwner(distributorNftId)
+        onlyDistributor()
         returns (ReferralId referralId)
     {
-        _checkNftType(distributorNftId, DISTRIBUTOR());
+        NftId distributorNftId = getDistributorNftId(msg.sender);
         return _createReferral(
             distributorNftId,
             code,
@@ -134,7 +133,6 @@ contract BasicDistribution is
             registry, 
             instanceNftId, 
             authorization,
-            false,
             initialOwner, 
             name, 
             token, 

package/contracts/distribution/BasicDistributionAuthorization.sol

@@ -17,7 +17,7 @@ contract BasicDistributionAuthorization
 {
 
      constructor(string memory distributionlName)
-          Authorization(distributionlName, DISTRIBUTION(), true, true)
+          Authorization(distributionlName, DISTRIBUTION())
      {}
 
      function _setupServiceTargets()

package/contracts/distribution/Distribution.sol

@@ -10,7 +10,7 @@ import {Amount} from "../type/Amount.sol";
 import {COMPONENT, DISTRIBUTION, DISTRIBUTOR} from "../type/ObjectType.sol";
 import {DistributorType} from "../type/DistributorType.sol";
 import {Fee} from "../type/Fee.sol";
-import {NftId} from "../type/NftId.sol";
+import {NftId, NftIdLib} from "../type/NftId.sol";
 import {ReferralId, ReferralStatus, ReferralLib} from "../type/Referral.sol";
 import {InstanceLinkedComponent} from "../shared/InstanceLinkedComponent.sol";
 import {Seconds} from "../type/Seconds.sol";
@@ -28,8 +28,17 @@ abstract contract Distribution is
     struct DistributionStorage {
         IComponentService _componentService;
         IDistributionService _distributionService;
+        mapping(address distributor => NftId distributorNftId) _distributorNftId;
     }
 
+    modifier onlyDistributor() {
+        if (!isDistributor(msg.sender)) {
+            revert ErrorDistributionNotDistributor(msg.sender);
+        }
+        _;
+    }
+
+
     function processRenewal(
         ReferralId referralId,
         uint256 feeAmount
@@ -47,6 +56,7 @@ abstract contract Distribution is
         external 
         virtual
         restricted()
+        onlyDistributor()
         onlyNftOfType(distributorNftId, DISTRIBUTOR())
         onlyNftOwner(distributorNftId)
         returns (Amount withdrawnAmount) 
@@ -54,6 +64,27 @@ abstract contract Distribution is
         return _withdrawCommission(distributorNftId, amount);
     }
 
+
+    function isDistributor(address candidate)
+        public
+        view
+        returns (bool)
+    {
+        DistributionStorage storage $ = _getDistributionStorage();
+        return $._distributorNftId[candidate].gtz();
+    }
+
+
+    function getDistributorNftId(address distributor)
+        public
+        view
+        returns (NftId distributorNftId)
+    {
+        DistributionStorage storage $ = _getDistributionStorage();
+        return $._distributorNftId[distributor];
+    }
+
+
     function getDiscountPercentage(string memory referralCode)
         external
         view
@@ -104,7 +135,6 @@ abstract contract Distribution is
         address registry,
         NftId productNftId,
         IAuthorization authorization, 
-        bool isInterceptor,
         address initialOwner,
         string memory name,
         address token,
@@ -118,10 +148,10 @@ abstract contract Distribution is
             registry, 
             productNftId, 
             name, 
-            token,
+            token, 
             DISTRIBUTION(), 
             authorization,
-            isInterceptor,
+            true, 
             initialOwner, 
             componentData);
 
@@ -185,11 +215,16 @@ abstract contract Distribution is
         returns(NftId distributorNftId)
     {
         DistributionStorage storage $ = _getDistributionStorage();
+        if($._distributorNftId[distributor].gtz()) {
+            revert ErrorDistributionAlreadyDistributor(distributor, $._distributorNftId[distributor]);
+        }
 
         distributorNftId = $._distributionService.createDistributor(
             distributor,
             distributorType,
             data);
+
+        $._distributorNftId[distributor] = distributorNftId;
     }
 
     /// @dev Uptates the distributor type for the specified distributor.
@@ -238,6 +273,14 @@ abstract contract Distribution is
         return _getDistributionStorage()._distributionService.withdrawCommission(distributorNftId, amount);
     }
 
+    function _nftTransferFrom(address from, address to, uint256 tokenId, address operator) internal virtual override {
+        // keep track of distributor nft owner
+        emit LogDistributorUpdated(to, operator);
+        DistributionStorage storage $ = _getDistributionStorage();
+        $._distributorNftId[from] = NftIdLib.zero();
+        $._distributorNftId[to] = NftIdLib.toNftId(tokenId);
+    }
+
     function _getDistributionStorage() private pure returns (DistributionStorage storage $) {
         assembly {
             $.slot := DISTRIBUTION_STORAGE_LOCATION_V1