@etherisc/gif-next 0.0.2-9e6b423-414 → 0.0.2-9f51324-299

package/contracts/authorization/ServiceAuthorization.sol

@@ -1,314 +1,100 @@
 // 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 {IServiceAuthorization} from "./IServiceAuthorization.sol";
-
-import {ADMIN_ROLE_NAME, PUBLIC_ROLE_NAME} from "./AccessAdmin.sol";
-import {InitializableERC165} from "../shared/InitializableERC165.sol";
-import {ObjectType, ObjectTypeLib, ALL} from "../type/ObjectType.sol";
-import {RoleId, RoleIdLib, ADMIN_ROLE, PUBLIC_ROLE} from "../type/RoleId.sol";
 import {SelectorLib} from "../type/Selector.sol";
-import {Str, StrLib} from "../type/String.sol";
+import {StrLib} from "../type/String.sol";
 import {TimestampLib} from "../type/Timestamp.sol";
 import {VersionPart, VersionPartLib} from "../type/Version.sol";
 
-
-/// @dev Base contract for release specific service authorization contracts and for Authorization contracts.
+/// @dev Base contract for release specific service authorization contracts.
 contract ServiceAuthorization is 
-     InitializableERC165,
      IServiceAuthorization
 {
-
-     string public constant COMMIT_HASH = "1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a";
-
      uint256 public constant COMMIT_HASH_LENGTH = 40;
      uint256 public constant GIF_INITIAL_VERSION = 3;
 
-     string public constant SERVICE_NAME_SUFFIX = "Service";
-     string public constant ROLE_NAME_SUFFIX = "_Role";
+     uint256 public immutable VERSION;
+     string public COMMIT_HASH;
 
-     ObjectType public immutable DOMAIN;
-     uint256 internal immutable _release;
-     string internal _commitHash;
-
-     string internal _mainTargetName;
-     Str internal _mainTarget;
-
-     // services
      ObjectType[] internal _serviceDomains;
      mapping(ObjectType domain => address service) internal _serviceAddress;
+     mapping(ObjectType domain => ObjectType[] authorizedDomains) internal _authorizedDomains;
+     mapping(ObjectType domain => mapping(ObjectType authorizedDomain => IAccess.FunctionInfo[] functions)) internal _authorizedFunctions;
 
-     // roles
-     RoleId[] internal _roles;
-     mapping(RoleId role => RoleInfo info) internal _roleInfo;
-
-     // targets
-     Str[] internal _targets;
-     mapping(Str target => bool exists) internal _targetExists;
-     mapping(Str target => RoleId roleId) internal _targetRole;
-     mapping(Str target => RoleId[] authorizedRoles) internal _authorizedRoles;
-     mapping(Str target => mapping(RoleId authorizedRole => IAccess.FunctionInfo[] functions)) internal _authorizedFunctions;
-
-
-     constructor(
-          string memory mainTargetName, 
-          ObjectType domain,
-          uint8 release,
-          string memory commitHash
-     )
-     {
-          // checks
-          if (bytes(mainTargetName).length == 0) {
-               revert ErrorAuthorizationMainTargetNameEmpty();
-          }
-
-          if (domain == ObjectTypeLib.zero()) {
-               revert ErrorAuthorizationTargetDomainZero();
-          }
-
-          if (release < VersionPartLib.releaseMin().toInt() || release >= VersionPartLib.releaseMax().toInt()) {
-               revert ErrorAuthorizationReleaseInvalid(release);
-          }
-
-          if (bytes(commitHash).length != COMMIT_HASH_LENGTH) {
-               revert ErrorAuthorizationCommitHashInvalid(commitHash);
-          }
-
-          // effects
-          _initializeERC165();
-          _registerInterfaceNotInitializing(type(IServiceAuthorization).interfaceId);
-
-          _mainTargetName = mainTargetName;
-          _mainTarget = StrLib.toStr(mainTargetName);
-
-          DOMAIN = domain;
-          _release = release;
-          _commitHash = commitHash;
+     constructor(string memory commitHash, uint256 version) {
+          assert(bytes(commitHash).length == COMMIT_HASH_LENGTH);
+          assert(version >= GIF_INITIAL_VERSION);
 
-          // setup of roles defined in OpenZeppelin AccessManager
-          _addRole(ADMIN_ROLE(), _toRoleInfo(ADMIN_ROLE(), RoleType.Core, 1, ADMIN_ROLE_NAME()));
-          _addRole(PUBLIC_ROLE(), _toRoleInfo(ADMIN_ROLE(), RoleType.Core, 1, PUBLIC_ROLE_NAME()));
-
-          // defines service domains relevant for the authorization
+          COMMIT_HASH = commitHash;
+          VERSION = version;
           _setupDomains();
           _setupDomainAuthorizations();
      }
 
-     /// @inheritdoc IServiceAuthorization
-     function getDomain() public view returns(ObjectType targetDomain) {
-          return DOMAIN;
-     }
-
-     /// @inheritdoc IServiceAuthorization
-     function getRelease() public view returns(VersionPart release) {
-          return VersionPartLib.toVersionPart(_release);
-     }
-
-     /// @inheritdoc IServiceAuthorization
      function getCommitHash() external view returns(string memory commitHash) {
-          return _commitHash;
+          return COMMIT_HASH;
      }
 
-     /// @inheritdoc IServiceAuthorization
-     function getMainTargetName() public view returns (string memory name) {
-          return _mainTargetName;
+     function getRelease() external view returns(VersionPart release) {
+          return VersionPartLib.toVersionPart(VERSION);
      }
 
-     /// @inheritdoc IServiceAuthorization
-     function getMainTarget() external view returns(Str target) {
-          return _mainTarget;
-     }
-
-     /// @inheritdoc IServiceAuthorization
      function getServiceDomains() external view returns(ObjectType[] memory serviceDomains) {
           return _serviceDomains;
      }
 
-     /// @inheritdoc IServiceAuthorization
-     function getServiceDomain(uint256 idx) external view returns(ObjectType serviceDomain) {
+     function getServiceDomain(uint idx) external view returns(ObjectType serviceDomain) {
           return _serviceDomains[idx];
      }
 
-     /// @inheritdoc IServiceAuthorization
-     function getServiceTarget(ObjectType serviceDomain) public view returns(Str target) {
-          string memory serviceTargetName = ObjectTypeLib.toVersionedName(
-               ObjectTypeLib.toName(serviceDomain), 
-               "Service", 
-               getRelease());
-
-          return StrLib.toStr(serviceTargetName);
-     }
-
-     /// @inheritdoc IServiceAuthorization
-     function getServiceRole(ObjectType serviceDomain) public view returns(RoleId serviceRoleId) {
-          // special case domain ALL
-          if (serviceDomain == ALL()) {
-               return PUBLIC_ROLE();
-          }
-
-          Str target = getServiceTarget(serviceDomain);
-          return getTargetRole(target);
-     }
-
-     /// @inheritdoc IServiceAuthorization
      function getServiceAddress(ObjectType serviceDomain) external view returns(address service) {
           return _serviceAddress[serviceDomain];
      }
 
-     /// @inheritdoc IServiceAuthorization
-     function getTargetRole(Str target) public view returns(RoleId roleId) {
-          return _targetRole[target];
-     }
-
-     /// @inheritdoc IServiceAuthorization
-     function roleExists(RoleId roleId) public view returns(bool exists) {
-          return _roleInfo[roleId].roleType != RoleType.Undefined;
-     }
-
-     /// @inheritdoc IServiceAuthorization
-     function getRoles() external view returns(RoleId[] memory roles) {
-          return _roles;
+     function getAuthorizedDomains(ObjectType serviceDomain) external view returns(ObjectType[] memory authorizatedDomains) {
+          return _authorizedDomains[serviceDomain];
      }
 
-     /// @inheritdoc IServiceAuthorization
-     function getRoleInfo(RoleId roleId) external view returns (RoleInfo memory info) {
-          return _roleInfo[roleId];
+     function getAuthorizedFunctions(ObjectType serviceDomain, ObjectType authorizedDomain) external view returns(IAccess.FunctionInfo[] memory authorizatedFunctions) {
+          return _authorizedFunctions[serviceDomain][authorizedDomain];
      }
 
-     /// @inheritdoc IServiceAuthorization
-     function getRoleName(RoleId roleId) external view returns (string memory roleName) {
-          return _roleInfo[roleId].name.toString();
+     // ERC165
+     function supportsInterface(bytes4 interfaceId) public pure returns (bool) {
+          return (
+               interfaceId == type(IServiceAuthorization).interfaceId || 
+               interfaceId == type(IERC165).interfaceId
+          );
      }
 
-     /// @inheritdoc IServiceAuthorization
-     function getAuthorizedRoles(Str target) external view returns(RoleId[] memory roleIds) {
-          return _authorizedRoles[target];
-     }
-
-     /// @inheritdoc IServiceAuthorization
-     function getAuthorizedFunctions(Str target, RoleId roleId) external view returns(FunctionInfo[] memory authorizatedFunctions) {
-          return _authorizedFunctions[target][roleId];
-     }
 
-     /// @dev Defines service domains relevant for the authorization.
-     /// When used for ReleaseAdmin the list defines the services to be registered for the release.
-     /// IMPORTANT: Both the list of the service domains as well as the ordering of the domains is important.
-     /// Trying to register services not in this list or register services in a different order will result in an error.
-     // solhint-disable-next-line no-empty-blocks
+     /// @dev Overwrite this function for a specific realease.
      function _setupDomains() internal virtual {}
 
      /// @dev Overwrite this function for a specific realease.
-     // solhint-disable-next-line no-empty-blocks
      function _setupDomainAuthorizations() internal virtual {}
 
      /// @dev Use this method to to add an authorized domain.
      /// The services will need to be registered in the order they are added using this function.
-     function _authorizeServiceDomain(ObjectType serviceDomain, address serviceAddress) internal {
+     function _authorizeDomain(ObjectType serviceDomain, address serviceAddress) internal {
           _serviceDomains.push(serviceDomain);
           _serviceAddress[serviceDomain] = serviceAddress;
-
-          string memory serviceName = ObjectTypeLib.toVersionedName(
-               ObjectTypeLib.toName(serviceDomain), 
-               SERVICE_NAME_SUFFIX, 
-               getRelease());
-
-          _addTargetWithRole(
-               serviceName, 
-               RoleIdLib.toServiceRoleId(serviceDomain, getRelease()), 
-               string(abi.encodePacked(serviceName, ROLE_NAME_SUFFIX)));
-     }
-
-
-     /// @dev Use this method to to add an authorized target together with its target role.
-     function _addTargetWithRole(
-          string memory targetName, 
-          RoleId roleId, 
-          string memory roleName
-     )
-          internal
-     {
-          // add target
-          Str target = StrLib.toStr(targetName);
-          _targets.push(target);
-
-          _targetExists[target] = true;
-
-          // link role to target if defined
-          if (roleId != RoleIdLib.zero()) {
-               // add role if new
-               if (!roleExists(roleId)) {
-                    _addContractRole(roleId, roleName);
-               }
-
-               // link target to role
-               _targetRole[target] = roleId;
-          }
-     }
-
-
-     /// @dev Add a contract role for the provided role id and name.
-     function _addContractRole(RoleId roleId, string memory name) internal {
-          _addRole(
-               roleId,
-               _toRoleInfo(
-                    ADMIN_ROLE(),
-                    RoleType.Contract,
-                    1,
-                    name));
      }
 
-
-     /// @dev Use this method to to add an authorized role.
-     function _addRole(RoleId roleId, RoleInfo memory info) internal {
-          _roles.push(roleId);
-          _roleInfo[roleId] = info;
-     }
-
-
-     /// @dev creates a role info object from the provided parameters
-     function _toRoleInfo(RoleId adminRoleId, RoleType roleType, uint32 maxMemberCount, string memory name) internal view returns (RoleInfo memory info) {
-          return RoleInfo({
-               name: StrLib.toStr(name),
-               adminRoleId: adminRoleId,
-               roleType: roleType,
-               maxMemberCount: maxMemberCount,
-               createdAt: TimestampLib.blockTimestamp(),
-               pausedAt: TimestampLib.max()});
-     }
-
-
      /// @dev Use this method to authorize the specified domain to access the service domain.
-     function _authorizeForService(
-          ObjectType serviceDomain, 
-          ObjectType authorizedDomain
-     )
+     function _authorizeForService(ObjectType serviceDomain, ObjectType authorizedDomain)
           internal
           returns (IAccess.FunctionInfo[] storage authorizatedFunctions)
      {
-          Str serviceTarget = getServiceTarget(serviceDomain);
-          RoleId authorizedRoleId = getServiceRole(authorizedDomain);
-
-          return _authorizeForTarget(serviceTarget.toString(), authorizedRoleId);
+          _authorizedDomains[serviceDomain].push(authorizedDomain);
+          return _authorizedFunctions[serviceDomain][authorizedDomain];
      }
 
-
-     /// @dev Use this method to authorize the specified role to access the target.
-     function _authorizeForTarget(string memory target, RoleId authorizedRoleId)
-          internal
-          returns (IAccess.FunctionInfo[] storage authorizatedFunctions)
-     {
-          Str targetStr = StrLib.toStr(target);
-
-          // add authorized role if not already added
-          if (_authorizedFunctions[targetStr][authorizedRoleId].length == 0) {
-               _authorizedRoles[targetStr].push(authorizedRoleId);
-          }
-
-          return _authorizedFunctions[targetStr][authorizedRoleId];
-     }
-
-
      /// @dev Use this method to authorize a specific function authorization
      function _authorize(IAccess.FunctionInfo[] storage functions, bytes4 selector, string memory name) internal {
           functions.push(

package/contracts/distribution/BasicDistributionAuthorization.sol

@@ -8,7 +8,7 @@ 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 {RoleId, PUBLIC_ROLE} from "../type/RoleId.sol";
 import {TokenHandler} from "../shared/TokenHandler.sol";
 
 
@@ -16,22 +16,15 @@ contract BasicDistributionAuthorization
      is Authorization
 {
 
-     constructor(string memory distributionName)
-          Authorization(
-               distributionName, 
-               DISTRIBUTION(), 
-               3,
-               COMMIT_HASH,
-               true, 
-               true)
+     constructor(string memory distributionlName)
+          Authorization(distributionlName, DISTRIBUTION(), true, true)
      {}
 
      function _setupServiceTargets()
           internal
           virtual override
      {
-          _authorizeServiceDomain(COMPONENT(), address(11));
-          _authorizeServiceDomain(DISTRIBUTION(), address(11));
+          _addServiceTargetWithRole(COMPONENT());
      }
 
      function _setupTokenHandlerAuthorizations() internal virtual override {

package/contracts/distribution/Distribution.sol

@@ -37,7 +37,6 @@ abstract contract Distribution is
         external
         virtual
         restricted()
-    // solhint-disable-next-line no-empty-blocks
     {
         // default is no action
     }
@@ -82,7 +81,7 @@ abstract contract Distribution is
 
 
     function calculateRenewalFeeAmount(
-        ReferralId, // referralId
+        ReferralId referralId,
         uint256 netPremiumAmount
     )
         external

package/contracts/distribution/DistributionService.sol

@@ -13,19 +13,18 @@ import {IComponents} from "../instance/module/IComponents.sol";
 import {IPolicy} from "../instance/module/IPolicy.sol";
 
 import {Amount, AmountLib} from "../type/Amount.sol";
+import {ContractLib} from "../shared/ContractLib.sol";
+import {Service} from "../shared/Service.sol";
 import {DistributorType, DistributorTypeLib} from "../type/DistributorType.sol";
 import {NftId, NftIdLib} from "../type/NftId.sol";
 import {KEEP_STATE} from "../type/StateId.sol";
 import {ObjectType, ACCOUNTING, COMPONENT, DISTRIBUTION, INSTANCE, DISTRIBUTION, DISTRIBUTOR, REGISTRY} from "../type/ObjectType.sol";
 import {InstanceReader} from "../instance/InstanceReader.sol";
 import {InstanceStore} from "../instance/InstanceStore.sol";
-// TODO PoolLib feels wrong, should likely go in a component type independent lib
-import {PoolLib} from "../pool/PoolLib.sol";
-import {ReferralId, ReferralStatus, ReferralLib, REFERRAL_OK, REFERRAL_ERROR_UNKNOWN, REFERRAL_ERROR_EXPIRED, REFERRAL_ERROR_EXHAUSTED} from "../type/Referral.sol";
+import {ReferralId, ReferralLib} from "../type/Referral.sol";
 import {Seconds} from "../type/Seconds.sol";
-import {Service} from "../shared/Service.sol";
 import {Timestamp, TimestampLib} from "../type/Timestamp.sol";
-import {UFixed, UFixedLib} from "../type/UFixed.sol";
+import {UFixed} from "../type/UFixed.sol";
 
 
 contract DistributionService is
@@ -76,8 +75,7 @@ contract DistributionService is
         restricted()
         returns (DistributorType distributorType)
     {
-        // _getAndVerifyActiveDistribution
-        (NftId distributionNftId, IInstance instance) = _getAndVerifyActiveDistribution();
+        (NftId distributionNftId, IInstance instance) = _getAndVerifyActiveDistribution(getRegistry());
 
         {
             NftId productNftId = getRegistry().getParentNftId(distributionNftId);
@@ -91,7 +89,7 @@ contract DistributionService is
             }
             UFixed maxDiscountPercentageLimit = variableDistributionFees - variableFeesPartsTotal;
 
-            if (maxDiscountPercentage > maxDiscountPercentageLimit) {
+            if (maxDiscountPercentage.gt(maxDiscountPercentageLimit)) {
                 revert ErrorDistributionServiceMaxDiscountTooHigh(maxDiscountPercentage.toInt1000(), maxDiscountPercentageLimit.toInt1000());
             }
         }
@@ -123,7 +121,7 @@ contract DistributionService is
         restricted()
         returns (NftId distributorNftId)
     {
-        (NftId distributionNftId, IInstance instance) = _getAndVerifyActiveDistribution();
+        (NftId distributionNftId, IInstance instance) = _getAndVerifyActiveDistribution(getRegistry());
         _checkDistributionType(instance.getInstanceReader(), distributorType, distributionNftId);
 
         distributorNftId = _registryService.registerDistributor(
@@ -156,7 +154,7 @@ contract DistributionService is
         restricted()
     {
         _checkNftType(distributorNftId, DISTRIBUTOR());
-        (NftId distributionNftId, IInstance instance) = _getAndVerifyActiveDistribution();
+        (NftId distributionNftId, IInstance instance) = _getAndVerifyActiveDistribution(getRegistry());
         _checkDistributionType(instance.getInstanceReader(), newDistributorType, distributionNftId);
         
         IDistribution.DistributorInfo memory distributorInfo = instance.getInstanceReader().getDistributorInfo(distributorNftId);
@@ -180,7 +178,7 @@ contract DistributionService is
         onlyNftOfType(distributorNftId, DISTRIBUTOR())
         returns (ReferralId referralId)
     {
-        (NftId distributionNftId, IInstance instance) = _getAndVerifyActiveDistribution();
+        (NftId distributionNftId, IInstance instance) = _getAndVerifyActiveDistribution(getRegistry());
 
         if (bytes(code).length == 0) {
             revert ErrorDistributionServiceInvalidReferral(code);
@@ -241,7 +239,8 @@ contract DistributionService is
         onlyNftOfType(distributionNftId, DISTRIBUTION())
     {
         if (referralIsValid(distributionNftId, referralId)) {
-            IInstance instance = _getInstanceForDistribution(getRegistry(), distributionNftId);
+            IRegistry registry = getRegistry();
+            IInstance instance = IInstance(ContractLib.getInstanceForComponent(getRegistry(), distributionNftId));
 
             // update book keeping for referral info
             IDistribution.ReferralInfo memory referralInfo = instance.getInstanceReader().getReferralInfo(referralId);
@@ -260,7 +259,8 @@ contract DistributionService is
         restricted()
         onlyNftOfType(distributionNftId, DISTRIBUTION())
     {
-        IInstance instance = _getInstanceForDistribution(getRegistry(), distributionNftId);
+        IRegistry registry = getRegistry();
+        IInstance instance = IInstance(ContractLib.getInstanceForComponent(registry, distributionNftId));
         InstanceReader reader = instance.getInstanceReader();
         InstanceStore store = instance.getInstanceStore();
 
@@ -297,7 +297,7 @@ contract DistributionService is
         onlyNftOfType(distributorNftId, DISTRIBUTOR())
         returns (Amount withdrawnAmount) 
     {
-        (NftId distributionNftId, IInstance instance) = _getAndVerifyActiveDistribution();
+        (NftId distributionNftId, IInstance instance) = _getAndVerifyActiveDistribution(getRegistry());
         InstanceReader reader = instance.getInstanceReader();
         
         IComponents.ComponentInfo memory distributionInfo = reader.getComponentInfo(distributionNftId);
@@ -307,10 +307,10 @@ contract DistributionService is
         
         // determine withdrawn amount
         withdrawnAmount = amount;
-        if (withdrawnAmount >= AmountLib.max()) {
+        if (withdrawnAmount.gte(AmountLib.max())) {
             withdrawnAmount = commissionAmount;
         } else {
-            if (withdrawnAmount > commissionAmount) {
+            if (withdrawnAmount.gt(commissionAmount)) {
                 revert ErrorDistributionServiceCommissionWithdrawAmountExceedsLimit(withdrawnAmount, commissionAmount);
             }
         }
@@ -342,7 +342,8 @@ contract DistributionService is
             return false;
         }
 
-        IInstance instance = _getInstanceForDistribution(getRegistry(), distributionNftId);
+        IRegistry registry = getRegistry();
+        IInstance instance = IInstance(ContractLib.getInstanceForComponent(registry, distributionNftId));
         IDistribution.ReferralInfo memory info = instance.getInstanceReader().getReferralInfo(referralId);
 
         if (info.distributorNftId.eqz()) {
@@ -358,48 +359,6 @@ contract DistributionService is
         isValid = isValid && info.usedReferrals < info.maxReferrals;
     }
 
-
-    function getDiscountPercentage(
-        InstanceReader instanceReader,
-        ReferralId referralId
-    )
-        external
-        virtual
-        view 
-        returns (
-            UFixed discountPercentage, 
-            ReferralStatus status
-        )
-    { 
-        IDistribution.ReferralInfo memory info = instanceReader.getReferralInfo(
-            referralId);        
-
-        if (info.expiryAt.eqz()) {
-            return (
-                UFixedLib.zero(),
-                REFERRAL_ERROR_UNKNOWN());
-        }
-
-        if (info.expiryAt < TimestampLib.blockTimestamp()) {
-            return (
-                UFixedLib.zero(),
-                REFERRAL_ERROR_EXPIRED());
-        }
-
-        if (info.usedReferrals >= info.maxReferrals) {
-            return (
-                UFixedLib.zero(),
-                REFERRAL_ERROR_EXHAUSTED());
-        }
-
-        return (
-            info.discountPercentage,
-            REFERRAL_OK()
-        );
-
-    }
-
-
     function _checkDistributionType(InstanceReader instanceReader, DistributorType distributorType, NftId expectedDistributionNftId) 
         internal
         view 
@@ -412,30 +371,29 @@ contract DistributionService is
         }
     }
 
-
-    function _getInstanceForDistribution(IRegistry registry, NftId distributionNftId)
-        internal
-        view
-        returns(IInstance instance)
-    {
-        // TODO refactor to ComponentLib or similar
-        return PoolLib.getInstanceForComponent(registry, distributionNftId);
-    }
-
-
-    function _getAndVerifyActiveDistribution()
+    function _getAndVerifyActiveDistribution(
+        IRegistry registry
+    )
         internal
-        virtual
         view
         returns (
-            NftId poolNftId,
+            NftId didstributionNftId,
             IInstance instance
         )
     {
-        return PoolLib.getAndVerifyActiveComponent(getRegistry(), msg.sender, DISTRIBUTION());
+        (
+            IRegistry.ObjectInfo memory info, 
+            address instanceAddress
+        ) = ContractLib.getAndVerifyComponent(
+            registry, 
+            msg.sender,
+            DISTRIBUTION(),
+            true); // only active pools
+
+        didstributionNftId = info.nftId;
+        instance = IInstance(instanceAddress);
     }
 
-
     function _getDomain() internal pure override returns(ObjectType) {
         return DISTRIBUTION();
     }

package/contracts/distribution/IDistributionComponent.sol

@@ -1,14 +1,12 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {IInstanceLinkedComponent} from "../shared/IInstanceLinkedComponent.sol";
-
 import {Amount} from "../type/Amount.sol";
+import {IInstanceLinkedComponent} from "../shared/IInstanceLinkedComponent.sol";
 import {NftId} from "../type/NftId.sol";
 import {ReferralId, ReferralStatus} from "../type/Referral.sol";
 import {UFixed} from "../type/UFixed.sol";
 
-
 interface IDistributionComponent is IInstanceLinkedComponent {
 
     event LogDistributorUpdated(address to, address operator);

package/contracts/distribution/IDistributionService.sol

@@ -1,17 +1,15 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
+import {Amount} from "../type/Amount.sol";
+import {NftId} from "../type/NftId.sol";
 import {IPolicy} from "../instance/module/IPolicy.sol";
 import {IService} from "../shared/IService.sol";
-
-import {Amount} from "../type/Amount.sol";
+import {UFixed} from "../type/UFixed.sol";
 import {DistributorType} from "../type/DistributorType.sol";
-import {InstanceReader} from "../instance/InstanceReader.sol";
-import {NftId} from "../type/NftId.sol";
-import {ReferralId, ReferralStatus} from "../type/Referral.sol";
+import {ReferralId} from "../type/Referral.sol";
 import {Seconds} from "../type/Seconds.sol";
 import {Timestamp} from "../type/Timestamp.sol";
-import {UFixed} from "../type/UFixed.sol";
 
 
 interface IDistributionService is IService {
@@ -102,8 +100,4 @@ interface IDistributionService is IService {
     /// @param amount the amount to withdraw. If set to AMOUNT_MAX, the full commission available is withdrawn
     /// @return withdrawnAmount the effective withdrawn amount
     function withdrawCommission(NftId distributorNftId, Amount amount) external returns (Amount withdrawnAmount);
-
-    /// @dev Returns the discount percentage for the provided referral code.
-    /// The function retuns both the percentage and the status of the referral code.
-    function getDiscountPercentage(InstanceReader instanceReader, ReferralId referralId) external view returns (UFixed discountPercentage, ReferralStatus status);
 }