@etherisc/gif-next 0.0.2-eb98db7-932 → 0.0.2-ebf1a6b-485

package/artifacts/contracts/types/Timestamp.sol/TimestampLib.json

@@ -11,9 +11,9 @@
           "type": "uint40"
         },
         {
-          "internalType": "uint256",
-          "name": "timeDelta",
-          "type": "uint256"
+          "internalType": "Seconds",
+          "name": "duration",
+          "type": "uint40"
         }
       ],
       "name": "addSeconds",
@@ -242,8 +242,26 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x61034b61003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100b35760003560e01c8063adb618321161007b578063adb6183214610139578063add9ce9914610151578063c24922ce14610164578063da09d48414610177578063ddf3d6311461019d578063ef6c0d78146101b057600080fd5b8063790a38ad146100b857806383ffcdef146100e65780638d38cd4b146100f957806394335b1a146101135780639df8763914610126575b600080fd5b6100d16100c636600461026a565b64ffffffffff161590565b60405190151581526020015b60405180910390f35b6100d16100f4366004610285565b6101c3565b6100d161010736600461026a565b64ffffffffff16151590565b6100d1610121366004610285565b6101da565b6100d1610134366004610285565b6101ef565b425b60405164ffffffffff90911681526020016100dd565b6100d161015f366004610285565b610203565b6100d1610172366004610285565b610217565b61018f61018536600461026a565b64ffffffffff1690565b6040519081526020016100dd565b6100d16101ab366004610285565b61022c565b61013b6101be3660046102b8565b610241565b600064ffffffffff808316908416115b9392505050565b600064ffffffffff80831690841611156101d3565b600064ffffffffff808416908316146101d3565b600064ffffffffff808316908416106101d3565b600064ffffffffff80831690841610156101d3565b600064ffffffffff80841690831614156101d3565b60006101d361018583856102e2565b803564ffffffffff8116811461026557600080fd5b919050565b60006020828403121561027c57600080fd5b6101d382610250565b6000806040838503121561029857600080fd5b6102a183610250565b91506102af60208401610250565b90509250929050565b600080604083850312156102cb57600080fd5b6102d483610250565b946020939093013593505050565b64ffffffffff81811683821601908082111561030e57634e487b7160e01b600052601160045260246000fd5b509291505056fea26469706673582212202f299f91b811d074d64e39f0cc8e41061eac2d435ad2afa8817b109f9cabc07364736f6c63430008140033",
-  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100b35760003560e01c8063adb618321161007b578063adb6183214610139578063add9ce9914610151578063c24922ce14610164578063da09d48414610177578063ddf3d6311461019d578063ef6c0d78146101b057600080fd5b8063790a38ad146100b857806383ffcdef146100e65780638d38cd4b146100f957806394335b1a146101135780639df8763914610126575b600080fd5b6100d16100c636600461026a565b64ffffffffff161590565b60405190151581526020015b60405180910390f35b6100d16100f4366004610285565b6101c3565b6100d161010736600461026a565b64ffffffffff16151590565b6100d1610121366004610285565b6101da565b6100d1610134366004610285565b6101ef565b425b60405164ffffffffff90911681526020016100dd565b6100d161015f366004610285565b610203565b6100d1610172366004610285565b610217565b61018f61018536600461026a565b64ffffffffff1690565b6040519081526020016100dd565b6100d16101ab366004610285565b61022c565b61013b6101be3660046102b8565b610241565b600064ffffffffff808316908416115b9392505050565b600064ffffffffff80831690841611156101d3565b600064ffffffffff808416908316146101d3565b600064ffffffffff808316908416106101d3565b600064ffffffffff80831690841610156101d3565b600064ffffffffff80841690831614156101d3565b60006101d361018583856102e2565b803564ffffffffff8116811461026557600080fd5b919050565b60006020828403121561027c57600080fd5b6101d382610250565b6000806040838503121561029857600080fd5b6102a183610250565b91506102af60208401610250565b90509250929050565b600080604083850312156102cb57600080fd5b6102d483610250565b946020939093013593505050565b64ffffffffff81811683821601908082111561030e57634e487b7160e01b600052601160045260246000fd5b509291505056fea26469706673582212202f299f91b811d074d64e39f0cc8e41061eac2d435ad2afa8817b109f9cabc07364736f6c63430008140033",
-  "linkReferences": {},
-  "deployedLinkReferences": {}
+  "bytecode": "0x6103bf61003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100b35760003560e01c8063a5798b4e1161007b578063a5798b4e14610139578063adb6183214610162578063add9ce9914610168578063c24922ce1461017b578063da09d4841461018e578063ddf3d631146101b457600080fd5b8063790a38ad146100b857806383ffcdef146100e65780638d38cd4b146100f957806394335b1a146101135780639df8763914610126575b600080fd5b6100d16100c63660046102f2565b64ffffffffff161590565b60405190151581526020015b60405180910390f35b6100d16100f4366004610316565b6101c7565b6100d16101073660046102f2565b64ffffffffff16151590565b6100d1610121366004610316565b6101e0565b6100d1610134366004610316565b6101f5565b61014c610147366004610316565b610209565b60405164ffffffffff90911681526020016100dd565b4261014c565b6100d1610176366004610316565b61029e565b6100d1610189366004610316565b6102b2565b6101a661019c3660046102f2565b64ffffffffff1690565b6040519081526020016100dd565b6100d16101c2366004610316565b6102c7565b600064ffffffffff808316908416115b90505b92915050565b600064ffffffffff80831690841611156101d7565b600064ffffffffff808416908316146101d7565b604051633682752160e21b815264ffffffffff821660048201526000906101d79073__$a3c3b8d16d3b00e17e1b34e034b17e7fd4$__9063da09d48490602401602060405180830381865af4158015610266573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061028a919061034f565b61029b9064ffffffffff8616610368565b90565b600064ffffffffff808316908416106101d7565b600064ffffffffff80831690841610156101d7565b600064ffffffffff80841690831614156101d7565b64ffffffffff811681146102ef57600080fd5b50565b60006020828403121561030457600080fd5b813561030f816102dc565b9392505050565b6000806040838503121561032957600080fd5b8235610334816102dc565b91506020830135610344816102dc565b809150509250929050565b60006020828403121561036157600080fd5b5051919050565b808201808211156101da57634e487b7160e01b600052601160045260246000fdfea26469706673582212209d275f5b6b2c0e4f549c3e731b1e4ec56eb4b1ed245f433dab8ae6d5e7013a1564736f6c63430008140033",
+  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100b35760003560e01c8063a5798b4e1161007b578063a5798b4e14610139578063adb6183214610162578063add9ce9914610168578063c24922ce1461017b578063da09d4841461018e578063ddf3d631146101b457600080fd5b8063790a38ad146100b857806383ffcdef146100e65780638d38cd4b146100f957806394335b1a146101135780639df8763914610126575b600080fd5b6100d16100c63660046102f2565b64ffffffffff161590565b60405190151581526020015b60405180910390f35b6100d16100f4366004610316565b6101c7565b6100d16101073660046102f2565b64ffffffffff16151590565b6100d1610121366004610316565b6101e0565b6100d1610134366004610316565b6101f5565b61014c610147366004610316565b610209565b60405164ffffffffff90911681526020016100dd565b4261014c565b6100d1610176366004610316565b61029e565b6100d1610189366004610316565b6102b2565b6101a661019c3660046102f2565b64ffffffffff1690565b6040519081526020016100dd565b6100d16101c2366004610316565b6102c7565b600064ffffffffff808316908416115b90505b92915050565b600064ffffffffff80831690841611156101d7565b600064ffffffffff808416908316146101d7565b604051633682752160e21b815264ffffffffff821660048201526000906101d79073__$a3c3b8d16d3b00e17e1b34e034b17e7fd4$__9063da09d48490602401602060405180830381865af4158015610266573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061028a919061034f565b61029b9064ffffffffff8616610368565b90565b600064ffffffffff808316908416106101d7565b600064ffffffffff80831690841610156101d7565b600064ffffffffff80841690831614156101d7565b64ffffffffff811681146102ef57600080fd5b50565b60006020828403121561030457600080fd5b813561030f816102dc565b9392505050565b6000806040838503121561032957600080fd5b8235610334816102dc565b91506020830135610344816102dc565b809150509250929050565b60006020828403121561036157600080fd5b5051919050565b808201808211156101da57634e487b7160e01b600052601160045260246000fdfea26469706673582212209d275f5b6b2c0e4f549c3e731b1e4ec56eb4b1ed245f433dab8ae6d5e7013a1564736f6c63430008140033",
+  "linkReferences": {
+    "contracts/types/Seconds.sol": {
+      "SecondsLib": [
+        {
+          "length": 20,
+          "start": 614
+        }
+      ]
+    }
+  },
+  "deployedLinkReferences": {
+    "contracts/types/Seconds.sol": {
+      "SecondsLib": [
+        {
+          "length": 20,
+          "start": 556
+        }
+      ]
+    }
+  }
 }

package/artifacts/contracts/types/UFixed.sol/MathLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/d562d636257f2606676a5d6ce99e5205.json"
+  "buildInfo": "../../../build-info/da7385118e8bdf04e0550a815c0a4eca.json"
 }

package/artifacts/contracts/types/UFixed.sol/UFixedLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/d562d636257f2606676a5d6ce99e5205.json"
+  "buildInfo": "../../../build-info/da7385118e8bdf04e0550a815c0a4eca.json"
 }

package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/d562d636257f2606676a5d6ce99e5205.json"
+  "buildInfo": "../../../build-info/da7385118e8bdf04e0550a815c0a4eca.json"
 }

package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/d562d636257f2606676a5d6ce99e5205.json"
+  "buildInfo": "../../../build-info/da7385118e8bdf04e0550a815c0a4eca.json"
 }

package/contracts/components/Component.sol

@@ -29,40 +29,21 @@ abstract contract Component is
     AccessManagedUpgradeable
 {
     // keccak256(abi.encode(uint256(keccak256("gif-next.contracts.component.Component.sol")) - 1)) & ~bytes32(uint256(0xff));
-    bytes32 public constant CONTRACT_LOCATION_V1 = 0xffe8d4462baed26a47154f4b8f6db497d2f772496965791d25bd456e342b7f00;
+    bytes32 public constant COMPONENT_LOCATION_V1 = 0xffe8d4462baed26a47154f4b8f6db497d2f772496965791d25bd456e342b7f00;
 
     struct ComponentStorage {
-        IInstance _instance; // instance for this component
-        InstanceReader _instanceReader; // instance reader for this component
         string _name; // unique (per instance) component name
         IERC20Metadata _token; // token for this component
+        IInstance _instance; // instance for this component
         address _wallet; // wallet for this component (default = component contract itself)
+        InstanceReader _instanceReader; // instance reader for this component
         bool _isNftInterceptor; // declares if component is involved in nft transfers
-        IInstanceService _instanceService; // instance service for this component
-
         NftId _productNftId; // only relevant for components that are linked to a aproduct
-        IProductService _productService; // product service for component, might not be relevant for some component types (eg oracles)
-    }
-
-
-    modifier onlyChainNft() {
-        if(msg.sender != getRegistry().getChainNftAddress()) {
-            revert ErrorComponentNotChainNft(msg.sender);
-        }
-        _;
-    }
-
-
-    modifier onlyProductService() {
-        if(msg.sender != address(_getComponentStorage()._productService)) {
-            revert ErrorComponentNotProductService(msg.sender);
-        }
-        _;
     }
 
     function _getComponentStorage() private pure returns (ComponentStorage storage $) {
         assembly {
-            $.slot := CONTRACT_LOCATION_V1
+            $.slot := COMPONENT_LOCATION_V1
         }
     }
 
@@ -74,77 +55,44 @@ abstract contract Component is
         ObjectType componentType,
         bool isInterceptor,
         address initialOwner,
-        bytes memory data
+        bytes memory registryData // writeonly data that will saved in the object info record of the registry
     )
         public
         virtual
         onlyInitializing()
     {
-        ComponentStorage storage $ = _getComponentStorage();
-        initializeRegisterable(registry, instanceNftId, componentType, isInterceptor, initialOwner, data);
-
-        // set unique name of component
-        $._name = name;
-        $._isNftInterceptor = isInterceptor;
+        initializeRegisterable(registry, instanceNftId, componentType, isInterceptor, initialOwner, registryData);
 
         // set and check linked instance
-        IRegistry.ObjectInfo memory instanceInfo = getRegistry().getObjectInfo(instanceNftId);
-        $._instance = IInstance(instanceInfo.objectAddress);
+        ComponentStorage storage $ = _getComponentStorage();
+        $._instance = IInstance(
+            getRegistry().getObjectInfo(instanceNftId).objectAddress);
+
         if(!$._instance.supportsInterface(type(IInstance).interfaceId)) {
-            revert ErrorComponentNotInstance(instanceNftId, instanceInfo.objectAddress);
+            revert ErrorComponentNotInstance(instanceNftId);
         }
 
         // initialize AccessManagedUpgradeable
         __AccessManaged_init($._instance.authority());
 
-        // set linked services
-        VersionPart gifVersion = $._instance.getMajorVersion();
-        $._instanceService = IInstanceService(getRegistry().getServiceAddress(INSTANCE(), gifVersion));
+        // set component state
+        $._name = name;
+        $._isNftInterceptor = isInterceptor;
         $._instanceReader = $._instance.getInstanceReader();
-        $._productService = IProductService(getRegistry().getServiceAddress(PRODUCT(), gifVersion));
-
-        // set wallet and token
         $._wallet = address(this);
         $._token = IERC20Metadata(token);
 
         registerInterface(type(IComponent).interfaceId);
     }
 
-    /// @dev callback function for nft transfers. may only be called by chain nft contract.
-    /// default implementation is empty. overriding functions MUST add onlyChainNft modifier
-    function nftTransferFrom(address from, address to, uint256 tokenId)
-        external
-        virtual override
-        onlyChainNft()
-    { }
-
     function lock() external onlyOwner override {
-        _getComponentStorage()._instanceService.setTargetLocked(getName(), true);
+        IInstanceService(_getServiceAddress(INSTANCE())).setTargetLocked(getName(), true);
     }
     
     function unlock() external onlyOwner override {
-        _getComponentStorage()._instanceService.setTargetLocked(getName(), false);
-    }
-
-    // only product service may set product nft id during registration of product setup
-    function setProductNftId(NftId productNftId)
-        external
-        override
-        onlyProductService() 
-    {
-        ComponentStorage storage $ = _getComponentStorage();
-
-        if($._productNftId.gtz()) {
-            revert ErrorComponentProductNftAlreadySet();
-        }
-
-        $._productNftId = productNftId;
+        IInstanceService(_getServiceAddress(INSTANCE())).setTargetLocked(getName(), false);
     }
 
-    /// @dev Sets the wallet address for the component. 
-    /// if the current wallet has tokens, these will be transferred. 
-    /// if the new wallet address is externally owned, an approval from the 
-    /// owner of the external wallet for the component to move all tokens must exist. 
     function setWallet(address newWallet)
         external
         override
@@ -159,8 +107,9 @@ abstract contract Component is
         if (newWallet == address(0)) {
             revert ErrorComponentWalletAddressZero();
         }
+
         if (newWallet == currentWallet) {
-            revert ErrorComponentWalletAddressIsSameAsCurrent(newWallet);
+            revert ErrorComponentWalletAddressIsSameAsCurrent();
         }
 
         if (currentBalance > 0) {
@@ -177,7 +126,7 @@ abstract contract Component is
 
         // effects
         $._wallet = newWallet;
-        emit LogComponentWalletAddressChanged(newWallet);
+        emit LogComponentWalletAddressChanged(currentWallet, newWallet);
 
         // interactions
         if (currentBalance > 0) {
@@ -192,11 +141,41 @@ abstract contract Component is
         }
     }
 
-    function getWallet()
-        public
-        view
+    function setProductNftId(NftId productNftId)
+        external
         override
-        returns (address walletAddress)
+    {
+        ComponentStorage storage $ = _getComponentStorage();
+
+        // verify caller is product service
+        if(msg.sender != _getServiceAddress(PRODUCT())) {
+            revert ErrorComponentNotProductService(msg.sender);
+        }
+
+        // verify component is not yet linked to a product
+        if($._productNftId.gtz()) {
+            revert ErrorComponentProductNftAlreadySet();
+        }
+
+        $._productNftId = productNftId;
+    }
+
+    /// @dev callback function for nft transfers
+    /// may only be called by chain nft contract.
+    /// do not override this function to implement business logic for handling transfers
+    /// override internal function _nftTransferFrom instead
+    function nftTransferFrom(address from, address to, uint256 tokenId)
+        external
+        virtual override
+    {
+        if(msg.sender != getRegistry().getChainNftAddress()) {
+            revert ErrorComponentNotChainNft(msg.sender);
+        }
+
+        _nftTransferFrom(from, to, tokenId);
+    }
+
+    function getWallet() public view override returns (address walletAddress)
     {
         return _getComponentStorage()._wallet;
     }
@@ -213,15 +192,6 @@ abstract contract Component is
         return _getComponentStorage()._instance;
     }
 
-    function getInstanceReader() public view returns (InstanceReader reader) {
-        return _getComponentStorage()._instanceReader;
-    }
-
-    function getServiceAddress(ObjectType domain) public view returns (address service) {
-        VersionPart majorVersion = getInstance().getMajorVersion();
-        return getRegistry().getServiceAddress(domain, majorVersion);
-    }
-
     function getName() public view override returns(string memory name) {
         return _getComponentStorage()._name;
     }
@@ -230,12 +200,22 @@ abstract contract Component is
         return _getComponentStorage()._productNftId;
     }
 
-    function getInstanceService() public view returns (IInstanceService) {
-        return _getComponentStorage()._instanceService;
-    }
+    /// @dev internal function for nft transfers.
+    /// handling logic that deals with nft transfers need to overwrite this function
+    function _nftTransferFrom(address from, address to, uint256 tokenId)
+        internal
+        virtual
+    { }
 
-    function getProductService() public view returns (IProductService) {
-        return _getComponentStorage()._productService;
+    /// @dev returns reader for linked instance
+    function _getInstanceReader() internal view returns (InstanceReader reader) {
+        return _getComponentStorage()._instanceReader;
     }
 
+    /// @dev returns the service address for the specified domain
+    /// gets address via lookup from registry using the major version form the linked instance
+    function _getServiceAddress(ObjectType domain) internal view returns (address service) {
+        VersionPart majorVersion = _getComponentStorage()._instance.getMajorVersion();
+        return getRegistry().getServiceAddress(domain, majorVersion);
+    }
 }

package/contracts/components/Distribution.sol

@@ -30,6 +30,7 @@ abstract contract Distribution is
     bytes32 public constant DISTRIBUTION_STORAGE_LOCATION_V1 = 0xaab7c5ea03d290056d6c060e0833d3ebcbe647f7694616a2ec52738a64b2f900;
 
     struct DistributionStorage {
+        Fee _minDistributionOwnerFee;
         Fee _distributionFee;
         TokenHandler _tokenHandler;
         IDistributionService _distributionService;
@@ -41,18 +42,20 @@ abstract contract Distribution is
         NftId instanceNftId,
         string memory name,
         address token,
+        Fee memory minDistributionOwnerFee,
         Fee memory distributionFee,
         address initialOwner,
-        bytes memory data
+        bytes memory registryData // writeonly data that will saved in the object info record of the registry
     )
         public
         virtual
         onlyInitializing()
     {
-        initializeComponent(registry, instanceNftId, name, token, DISTRIBUTION(), true, initialOwner, data);
+        initializeComponent(registry, instanceNftId, name, token, DISTRIBUTION(), true, initialOwner, registryData);
 
         DistributionStorage storage $ = _getDistributionStorage();
         // TODO add validation
+        $._minDistributionOwnerFee = minDistributionOwnerFee;
         $._distributionFee = distributionFee;
         $._tokenHandler = new TokenHandler(token);
         $._distributionService = getInstance().getDistributionService();
@@ -61,6 +64,7 @@ abstract contract Distribution is
     }
 
     function setFees(
+        Fee memory minDistributionOwnerFee,
         Fee memory distributionFee
     )
         external
@@ -68,7 +72,7 @@ abstract contract Distribution is
         onlyOwner
         restricted()
     {
-        _getDistributionStorage()._distributionService.setFees(distributionFee);
+        _getDistributionStorage()._distributionService.setFees(minDistributionOwnerFee, distributionFee);
     }
 
     function getDistributionFee() external view returns (Fee memory distributionFee) {
@@ -190,7 +194,7 @@ abstract contract Distribution is
         )
     {
         ReferralId referralId = getReferralId(referralCode);
-        return getInstanceReader().getDiscountPercentage(referralId);
+        return _getInstanceReader().getDiscountPercentage(referralId);
     }
 
 
@@ -259,13 +263,15 @@ abstract contract Distribution is
         return ISetup.DistributionSetupInfo(
             zeroNftId(),
             $._tokenHandler,
+            $._minDistributionOwnerFee,
             $._distributionFee,
-            address(this)
+            address(this),
+            0
         );
     }
 
 
-    function nftTransferFrom(address from, address to, uint256 tokenId) external virtual override (Component, ITransferInterceptor) {
+    function _nftTransferFrom(address from, address to, uint256 tokenId) internal virtual override {
         // keep track of distributor nft owner
         emit LogDistributorUpdated(to, msg.sender);
         DistributionStorage storage $ = _getDistributionStorage();

package/contracts/components/IComponent.sol

@@ -11,44 +11,58 @@ import {ITransferInterceptor} from "../registry/ITransferInterceptor.sol";
 import {NftId} from "../types/NftId.sol";
 import {ObjectType} from "../types/ObjectType.sol";
 
+/// @dev component base class
+/// component examples are product, distribution, pool and oracle
 interface IComponent is 
     IRegisterable,
     ITransferInterceptor
 {
-
     error ErrorComponentNotChainNft(address caller);
     error ErrorComponentNotProductService(address caller);
-    error ErrorComponentNotInstance(NftId instanceNftId, address instance);
+    error ErrorComponentNotInstance(NftId instanceNftId);
     error ErrorComponentProductNftAlreadySet();
+
     error ErrorComponentWalletAddressZero();
-    error ErrorComponentWalletAddressIsSameAsCurrent(address newWallet);
+    error ErrorComponentWalletAddressIsSameAsCurrent();
     error ErrorComponentWalletAllowanceTooSmall(address oldWallet, address newWallet, uint256 allowance, uint256 balance);
-    error ErrorComponentUnauthorized(address caller, uint64 requiredRoleIdNum);
 
-    event LogComponentWalletAddressChanged(address newWallet);
+    event LogComponentWalletAddressChanged(address oldWallet, address newWallet);
     event LogComponentWalletTokensTransferred(address from, address to, uint256 amount);
 
-    function getName() external view returns (string memory name);
-
+    /// @dev locks component to disable functions that may change state related to this component, the only exception is function "unlock"
+    /// only component owner (nft holder) is authorizes to call this function
     function lock() external;
-    function unlock() external;
 
-    function getToken() external view returns (IERC20Metadata token);
+    /// @dev unlocks component to (re-)enable functions that may change state related to this component
+    /// only component owner (nft holder) is authorizes to call this function
+    function unlock() external;
 
+    /// @dev sets the wallet address for the component
+    /// if the current wallet has tokens, these will be transferred
+    /// if the new wallet address is externally owned, an approval from the 
+    /// owner of the external wallet for the component to move all tokens must exist
     function setWallet(address walletAddress) external;
-    function getWallet() external view returns (address walletAddress);
 
-    function isNftInterceptor() external view returns(bool isInterceptor);
+    /// @dev only product service may set product nft id during registration of product setup
+    function setProductNftId(NftId productNftId) external;
+
+    /// @dev returns the name of this component
+    /// to successfully register the component with an instance the name MUST be unique in the linked instance
+    function getName() external view returns (string memory name);
+
+    /// @dev defines which ERC20 token is used by this component
+    function getToken() external view returns (IERC20Metadata token);
 
+    /// @dev defines the instance to which this component is linked to
     function getInstance() external view returns (IInstance instance);
 
-    /// @dev returns the service address for the specified domain
-    /// gets address via lookup from registry using the major version form the linked instance
-    function getServiceAddress(ObjectType domain) external view returns (address service);
+    /// @dev defines the wallet address used to hold the ERC20 tokens related to this component
+    /// the default address is the component token address
+    function getWallet() external view returns (address walletAddress);
 
-    function setProductNftId(NftId productNftId) external;
+    /// @dev defines the product to which this component is linked to
+    /// this is only relevant for pool and distribution components
     function getProductNftId() external view returns (NftId productNftId);
 
-    function getInstanceService() external view returns (IInstanceService);
-    function getProductService() external view returns (IProductService);
+    function isNftInterceptor() external view returns(bool isInterceptor);
 }

package/contracts/components/IDistributionComponent.sol

@@ -17,6 +17,7 @@ interface IDistributionComponent is IComponent {
     function getSetupInfo() external view returns (ISetup.DistributionSetupInfo memory setupInfo);
 
     function setFees(
+        Fee memory minDistributionOwnerFee,
         Fee memory distributionFee
     ) external;
 
@@ -44,20 +45,6 @@ interface IDistributionComponent is IComponent {
         bytes memory data
     ) external;
 
-    /**
-     * @dev lets distributors create referral codes.
-     * referral codes need to be unique
-     * distributor is identified via msg.sender.
-     */
-    function createReferral(
-        NftId distributorNftId,
-        string memory code,
-        UFixed discountPercentage,
-        uint32 maxReferrals,
-        Timestamp expiryAt,
-        bytes memory data
-    ) external returns (ReferralId referralId);
-
     function calculateRenewalFeeAmount(
         ReferralId referralId,
         uint256 netPremiumAmount