@etherisc/gif-next 0.0.2-c00cf5d-513 → 0.0.2-c0457ac-280

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

@@ -198,6 +198,19 @@
       "stateMutability": "pure",
       "type": "function"
     },
+    {
+      "inputs": [],
+      "name": "max",
+      "outputs": [
+        {
+          "internalType": "Timestamp",
+          "name": "",
+          "type": "uint40"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
+    },
     {
       "inputs": [
         {
@@ -255,14 +268,14 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x6103d161003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100be5760003560e01c8063adb618321161007b578063adb618321461016d578063add9ce9914610173578063bc1b392d14610186578063c24922ce1461018d578063da09d484146101a0578063ddf3d631146101c657600080fd5b8063790a38ad146100c357806383ffcdef146100f15780638d38cd4b1461010457806394335b1a1461011e5780639df8763914610131578063a5798b4e14610144575b600080fd5b6100dc6100d1366004610304565b64ffffffffff161590565b60405190151581526020015b60405180910390f35b6100dc6100ff366004610328565b6101d9565b6100dc610112366004610304565b64ffffffffff16151590565b6100dc61012c366004610328565b6101f2565b6100dc61013f366004610328565b610207565b610157610152366004610328565b61021b565b60405164ffffffffff90911681526020016100e8565b42610157565b6100dc610181366004610328565b6102b0565b6000610157565b6100dc61019b366004610328565b6102c4565b6101b86101ae366004610304565b64ffffffffff1690565b6040519081526020016100e8565b6100dc6101d4366004610328565b6102d9565b600064ffffffffff808316908416115b90505b92915050565b600064ffffffffff80831690841611156101e9565b600064ffffffffff808416908316146101e9565b604051633682752160e21b815264ffffffffff821660048201526000906101e99073__$71e292c09eace9601b3e21e68a1278917a$__9063da09d48490602401602060405180830381865af4158015610278573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061029c9190610361565b6102ad9064ffffffffff861661037a565b90565b600064ffffffffff808316908416106101e9565b600064ffffffffff80831690841610156101e9565b600064ffffffffff80841690831614156101e9565b64ffffffffff8116811461030157600080fd5b50565b60006020828403121561031657600080fd5b8135610321816102ee565b9392505050565b6000806040838503121561033b57600080fd5b8235610346816102ee565b91506020830135610356816102ee565b809150509250929050565b60006020828403121561037357600080fd5b5051919050565b808201808211156101ec57634e487b7160e01b600052601160045260246000fdfea2646970667358221220e27795aed0fb220ac22bb86f271a1ba6642f346c96838d1f065f2310c47b381b64736f6c63430008140033",
-  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100be5760003560e01c8063adb618321161007b578063adb618321461016d578063add9ce9914610173578063bc1b392d14610186578063c24922ce1461018d578063da09d484146101a0578063ddf3d631146101c657600080fd5b8063790a38ad146100c357806383ffcdef146100f15780638d38cd4b1461010457806394335b1a1461011e5780639df8763914610131578063a5798b4e14610144575b600080fd5b6100dc6100d1366004610304565b64ffffffffff161590565b60405190151581526020015b60405180910390f35b6100dc6100ff366004610328565b6101d9565b6100dc610112366004610304565b64ffffffffff16151590565b6100dc61012c366004610328565b6101f2565b6100dc61013f366004610328565b610207565b610157610152366004610328565b61021b565b60405164ffffffffff90911681526020016100e8565b42610157565b6100dc610181366004610328565b6102b0565b6000610157565b6100dc61019b366004610328565b6102c4565b6101b86101ae366004610304565b64ffffffffff1690565b6040519081526020016100e8565b6100dc6101d4366004610328565b6102d9565b600064ffffffffff808316908416115b90505b92915050565b600064ffffffffff80831690841611156101e9565b600064ffffffffff808416908316146101e9565b604051633682752160e21b815264ffffffffff821660048201526000906101e99073__$71e292c09eace9601b3e21e68a1278917a$__9063da09d48490602401602060405180830381865af4158015610278573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061029c9190610361565b6102ad9064ffffffffff861661037a565b90565b600064ffffffffff808316908416106101e9565b600064ffffffffff80831690841610156101e9565b600064ffffffffff80841690831614156101e9565b64ffffffffff8116811461030157600080fd5b50565b60006020828403121561031657600080fd5b8135610321816102ee565b9392505050565b6000806040838503121561033b57600080fd5b8235610346816102ee565b91506020830135610356816102ee565b809150509250929050565b60006020828403121561037357600080fd5b5051919050565b808201808211156101ec57634e487b7160e01b600052601160045260246000fdfea2646970667358221220e27795aed0fb220ac22bb86f271a1ba6642f346c96838d1f065f2310c47b381b64736f6c63430008140033",
+  "bytecode": "0x6103f361003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100d95760003560e01c8063a5798b4e11610096578063bc1b392d11610070578063bc1b392d146101a8578063c24922ce146101af578063da09d484146101c2578063ddf3d631146101e857600080fd5b8063a5798b4e1461017c578063adb618321461018f578063add9ce991461019557600080fd5b80636ac5db19146100de578063790a38ad1461010057806383ffcdef146101295780638d38cd4b1461013c57806394335b1a146101565780639df8763914610169575b600080fd5b64ffffffffff5b60405164ffffffffff90911681526020015b60405180910390f35b61011961010e366004610326565b64ffffffffff161590565b60405190151581526020016100f7565b61011961013736600461034a565b6101fb565b61011961014a366004610326565b64ffffffffff16151590565b61011961016436600461034a565b610214565b61011961017736600461034a565b610229565b6100e561018a36600461034a565b61023d565b426100e5565b6101196101a336600461034a565b6102d2565b60006100e5565b6101196101bd36600461034a565b6102e6565b6101da6101d0366004610326565b64ffffffffff1690565b6040519081526020016100f7565b6101196101f636600461034a565b6102fb565b600064ffffffffff808316908416115b90505b92915050565b600064ffffffffff808316908416111561020b565b600064ffffffffff8084169083161461020b565b604051633682752160e21b815264ffffffffff8216600482015260009061020b9073__$71e292c09eace9601b3e21e68a1278917a$__9063da09d48490602401602060405180830381865af415801561029a573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102be9190610383565b6102cf9064ffffffffff861661039c565b90565b600064ffffffffff8083169084161061020b565b600064ffffffffff808316908416101561020b565b600064ffffffffff808416908316141561020b565b64ffffffffff8116811461032357600080fd5b50565b60006020828403121561033857600080fd5b813561034381610310565b9392505050565b6000806040838503121561035d57600080fd5b823561036881610310565b9150602083013561037881610310565b809150509250929050565b60006020828403121561039557600080fd5b5051919050565b8082018082111561020e57634e487b7160e01b600052601160045260246000fdfea26469706673582212209890a14bb844121bec36db6b483d0fd433ade54756fd967a580b148c99cfadfc64736f6c63430008140033",
+  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100d95760003560e01c8063a5798b4e11610096578063bc1b392d11610070578063bc1b392d146101a8578063c24922ce146101af578063da09d484146101c2578063ddf3d631146101e857600080fd5b8063a5798b4e1461017c578063adb618321461018f578063add9ce991461019557600080fd5b80636ac5db19146100de578063790a38ad1461010057806383ffcdef146101295780638d38cd4b1461013c57806394335b1a146101565780639df8763914610169575b600080fd5b64ffffffffff5b60405164ffffffffff90911681526020015b60405180910390f35b61011961010e366004610326565b64ffffffffff161590565b60405190151581526020016100f7565b61011961013736600461034a565b6101fb565b61011961014a366004610326565b64ffffffffff16151590565b61011961016436600461034a565b610214565b61011961017736600461034a565b610229565b6100e561018a36600461034a565b61023d565b426100e5565b6101196101a336600461034a565b6102d2565b60006100e5565b6101196101bd36600461034a565b6102e6565b6101da6101d0366004610326565b64ffffffffff1690565b6040519081526020016100f7565b6101196101f636600461034a565b6102fb565b600064ffffffffff808316908416115b90505b92915050565b600064ffffffffff808316908416111561020b565b600064ffffffffff8084169083161461020b565b604051633682752160e21b815264ffffffffff8216600482015260009061020b9073__$71e292c09eace9601b3e21e68a1278917a$__9063da09d48490602401602060405180830381865af415801561029a573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102be9190610383565b6102cf9064ffffffffff861661039c565b90565b600064ffffffffff8083169084161061020b565b600064ffffffffff808316908416101561020b565b600064ffffffffff808416908316141561020b565b64ffffffffff8116811461032357600080fd5b50565b60006020828403121561033857600080fd5b813561034381610310565b9392505050565b6000806040838503121561035d57600080fd5b823561036881610310565b9150602083013561037881610310565b809150509250929050565b60006020828403121561039557600080fd5b5051919050565b8082018082111561020e57634e487b7160e01b600052601160045260246000fdfea26469706673582212209890a14bb844121bec36db6b483d0fd433ade54756fd967a580b148c99cfadfc64736f6c63430008140033",
   "linkReferences": {
     "contracts/type/Seconds.sol": {
       "SecondsLib": [
         {
           "length": 20,
-          "start": 632
+          "start": 666
         }
       ]
     }
@@ -272,7 +285,7 @@
       "SecondsLib": [
         {
           "length": 20,
-          "start": 574
+          "start": 608
         }
       ]
     }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/2524dfb696dedd4fe68aef311e06e791.json"
+  "buildInfo": "../../../build-info/6efa1c926ce3374a2355eff3df062902.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/2524dfb696dedd4fe68aef311e06e791.json"
+  "buildInfo": "../../../build-info/6efa1c926ce3374a2355eff3df062902.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/2524dfb696dedd4fe68aef311e06e791.json"
+  "buildInfo": "../../../build-info/6efa1c926ce3374a2355eff3df062902.json"
 }

package/artifacts/contracts/type/Version.sol/VersionLib.json

@@ -170,8 +170,8 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x61039161003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100925760003560e01c80638e4ad86c116100655780638e4ad86c1461012157806394aa449c14610144578063a123b37c14610152578063c9e66e291461017957600080fd5b806304b8f6c5146100975780632efe0113146100b357806349a7111a146100c657806355601007146100fd575b600080fd5b60005b60405162ffffff90911681526020015b60405180910390f35b61009a6100c136600461026e565b610190565b6100d96100d436600461029a565b610231565b6040805160ff948516815292841660208401529216918101919091526060016100aa565b61011361010b36600461029a565b62ffffff1690565b6040519081526020016100aa565b61013261012f3660046102c6565b90565b60405160ff90911681526020016100aa565b61009a61012f3660046102df565b61016061010b36600461029a565b60405167ffffffffffffffff90911681526020016100aa565b61013261018736600461029a565b60101c60ff1690565b6000610100841080156101a4575061010083105b80156101b1575061010082105b61020c5760405162461bcd60e51b815260206004820152602260248201527f4552524f523a5652532d3031303a56455253494f4e5f504152545f544f4f5f42604482015261494760f01b606482015260840160405180910390fd5b8161021f600885901b601087901b61031f565b610229919061031f565b949350505050565b600080808360ff601082901c166102488383610338565b915061ffff600883901c16600061025f8185610338565b92989197509195509350505050565b60008060006060848603121561028357600080fd5b505081359360208301359350604090920135919050565b6000602082840312156102ac57600080fd5b813562ffffff811681146102bf57600080fd5b9392505050565b6000602082840312156102d857600080fd5b5035919050565b6000602082840312156102f157600080fd5b813567ffffffffffffffff811681146102bf57600080fd5b634e487b7160e01b600052601160045260246000fd5b8082018082111561033257610332610309565b92915050565b62ffffff82811682821603908082111561035457610354610309565b509291505056fea26469706673582212201d4dd35474cec161a16fe12e8c428c93b28e9b80e6b379b8fbcd0128635f549264736f6c63430008140033",
-  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100925760003560e01c80638e4ad86c116100655780638e4ad86c1461012157806394aa449c14610144578063a123b37c14610152578063c9e66e291461017957600080fd5b806304b8f6c5146100975780632efe0113146100b357806349a7111a146100c657806355601007146100fd575b600080fd5b60005b60405162ffffff90911681526020015b60405180910390f35b61009a6100c136600461026e565b610190565b6100d96100d436600461029a565b610231565b6040805160ff948516815292841660208401529216918101919091526060016100aa565b61011361010b36600461029a565b62ffffff1690565b6040519081526020016100aa565b61013261012f3660046102c6565b90565b60405160ff90911681526020016100aa565b61009a61012f3660046102df565b61016061010b36600461029a565b60405167ffffffffffffffff90911681526020016100aa565b61013261018736600461029a565b60101c60ff1690565b6000610100841080156101a4575061010083105b80156101b1575061010082105b61020c5760405162461bcd60e51b815260206004820152602260248201527f4552524f523a5652532d3031303a56455253494f4e5f504152545f544f4f5f42604482015261494760f01b606482015260840160405180910390fd5b8161021f600885901b601087901b61031f565b610229919061031f565b949350505050565b600080808360ff601082901c166102488383610338565b915061ffff600883901c16600061025f8185610338565b92989197509195509350505050565b60008060006060848603121561028357600080fd5b505081359360208301359350604090920135919050565b6000602082840312156102ac57600080fd5b813562ffffff811681146102bf57600080fd5b9392505050565b6000602082840312156102d857600080fd5b5035919050565b6000602082840312156102f157600080fd5b813567ffffffffffffffff811681146102bf57600080fd5b634e487b7160e01b600052601160045260246000fd5b8082018082111561033257610332610309565b92915050565b62ffffff82811682821603908082111561035457610354610309565b509291505056fea26469706673582212201d4dd35474cec161a16fe12e8c428c93b28e9b80e6b379b8fbcd0128635f549264736f6c63430008140033",
+  "bytecode": "0x61039161003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100925760003560e01c80638e4ad86c116100655780638e4ad86c1461012157806394aa449c14610144578063a123b37c14610152578063c9e66e291461017957600080fd5b806304b8f6c5146100975780632efe0113146100b357806349a7111a146100c657806355601007146100fd575b600080fd5b60005b60405162ffffff90911681526020015b60405180910390f35b61009a6100c136600461026e565b610190565b6100d96100d436600461029a565b610231565b6040805160ff948516815292841660208401529216918101919091526060016100aa565b61011361010b36600461029a565b62ffffff1690565b6040519081526020016100aa565b61013261012f3660046102c6565b90565b60405160ff90911681526020016100aa565b61009a61012f3660046102df565b61016061010b36600461029a565b60405167ffffffffffffffff90911681526020016100aa565b61013261018736600461029a565b60101c60ff1690565b6000610100841080156101a4575061010083105b80156101b1575061010082105b61020c5760405162461bcd60e51b815260206004820152602260248201527f4552524f523a5652532d3031303a56455253494f4e5f504152545f544f4f5f42604482015261494760f01b606482015260840160405180910390fd5b8161021f600885901b601087901b61031f565b610229919061031f565b949350505050565b600080808360ff601082901c166102488383610338565b915061ffff600883901c16600061025f8185610338565b92989197509195509350505050565b60008060006060848603121561028357600080fd5b505081359360208301359350604090920135919050565b6000602082840312156102ac57600080fd5b813562ffffff811681146102bf57600080fd5b9392505050565b6000602082840312156102d857600080fd5b5035919050565b6000602082840312156102f157600080fd5b813567ffffffffffffffff811681146102bf57600080fd5b634e487b7160e01b600052601160045260246000fd5b8082018082111561033257610332610309565b92915050565b62ffffff82811682821603908082111561035457610354610309565b509291505056fea2646970667358221220eb37260908a3d8439e91e2cbdc02081f9145e9e198f585235c075e7f68458bfb64736f6c63430008140033",
+  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100925760003560e01c80638e4ad86c116100655780638e4ad86c1461012157806394aa449c14610144578063a123b37c14610152578063c9e66e291461017957600080fd5b806304b8f6c5146100975780632efe0113146100b357806349a7111a146100c657806355601007146100fd575b600080fd5b60005b60405162ffffff90911681526020015b60405180910390f35b61009a6100c136600461026e565b610190565b6100d96100d436600461029a565b610231565b6040805160ff948516815292841660208401529216918101919091526060016100aa565b61011361010b36600461029a565b62ffffff1690565b6040519081526020016100aa565b61013261012f3660046102c6565b90565b60405160ff90911681526020016100aa565b61009a61012f3660046102df565b61016061010b36600461029a565b60405167ffffffffffffffff90911681526020016100aa565b61013261018736600461029a565b60101c60ff1690565b6000610100841080156101a4575061010083105b80156101b1575061010082105b61020c5760405162461bcd60e51b815260206004820152602260248201527f4552524f523a5652532d3031303a56455253494f4e5f504152545f544f4f5f42604482015261494760f01b606482015260840160405180910390fd5b8161021f600885901b601087901b61031f565b610229919061031f565b949350505050565b600080808360ff601082901c166102488383610338565b915061ffff600883901c16600061025f8185610338565b92989197509195509350505050565b60008060006060848603121561028357600080fd5b505081359360208301359350604090920135919050565b6000602082840312156102ac57600080fd5b813562ffffff811681146102bf57600080fd5b9392505050565b6000602082840312156102d857600080fd5b5035919050565b6000602082840312156102f157600080fd5b813567ffffffffffffffff811681146102bf57600080fd5b634e487b7160e01b600052601160045260246000fd5b8082018082111561033257610332610309565b92915050565b62ffffff82811682821603908082111561035457610354610309565b509291505056fea2646970667358221220eb37260908a3d8439e91e2cbdc02081f9145e9e198f585235c075e7f68458bfb64736f6c63430008140033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/2524dfb696dedd4fe68aef311e06e791.json"
+  "buildInfo": "../../../build-info/6efa1c926ce3374a2355eff3df062902.json"
 }

package/artifacts/contracts/type/Version.sol/VersionPartLib.json

@@ -42,8 +42,8 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x60fb610039600b82828239805160001a60731461002c57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe7300000000000000000000000000000000000000003014608060405260043610603d5760003560e01c80638e4ad86c146042578063ac43d834146067575b600080fd5b6050604d3660046085565b90565b60405160ff90911681526020015b60405180910390f35b60786072366004609d565b60ff1690565b604051908152602001605e565b600060208284031215609657600080fd5b5035919050565b60006020828403121560ae57600080fd5b813560ff8116811460be57600080fd5b939250505056fea2646970667358221220d4e44d0551a02092949fff97b216e1f9b3b93142e68e155f5815f857f381e5e264736f6c63430008140033",
-  "deployedBytecode": "0x7300000000000000000000000000000000000000003014608060405260043610603d5760003560e01c80638e4ad86c146042578063ac43d834146067575b600080fd5b6050604d3660046085565b90565b60405160ff90911681526020015b60405180910390f35b60786072366004609d565b60ff1690565b604051908152602001605e565b600060208284031215609657600080fd5b5035919050565b60006020828403121560ae57600080fd5b813560ff8116811460be57600080fd5b939250505056fea2646970667358221220d4e44d0551a02092949fff97b216e1f9b3b93142e68e155f5815f857f381e5e264736f6c63430008140033",
+  "bytecode": "0x60fb610039600b82828239805160001a60731461002c57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe7300000000000000000000000000000000000000003014608060405260043610603d5760003560e01c80638e4ad86c146042578063ac43d834146067575b600080fd5b6050604d3660046085565b90565b60405160ff90911681526020015b60405180910390f35b60786072366004609d565b60ff1690565b604051908152602001605e565b600060208284031215609657600080fd5b5035919050565b60006020828403121560ae57600080fd5b813560ff8116811460be57600080fd5b939250505056fea2646970667358221220742e3ab5a296d15998aa86746aaa2f0482bcf0402212cee58404b09b0c2b6c4264736f6c63430008140033",
+  "deployedBytecode": "0x7300000000000000000000000000000000000000003014608060405260043610603d5760003560e01c80638e4ad86c146042578063ac43d834146067575b600080fd5b6050604d3660046085565b90565b60405160ff90911681526020015b60405180910390f35b60786072366004609d565b60ff1690565b604051908152602001605e565b600060208284031215609657600080fd5b5035919050565b60006020828403121560ae57600080fd5b813560ff8116811460be57600080fd5b939250505056fea2646970667358221220742e3ab5a296d15998aa86746aaa2f0482bcf0402212cee58404b09b0c2b6c4264736f6c63430008140033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }

package/contracts/distribution/Distribution.sol

@@ -1,19 +1,17 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.19;
+pragma solidity ^0.8.20;
 
-import {DISTRIBUTION} from "../type/ObjectType.sol";
+import {COMPONENT, DISTRIBUTION} from "../type/ObjectType.sol";
 import {IDistributionService} from "./IDistributionService.sol";
 import {IProductService} from "../product/IProductService.sol";
-import {NftId, zeroNftId, NftIdLib, toNftId} from "../type/NftId.sol";
+import {NftId, NftIdLib} from "../type/NftId.sol";
 import {ReferralId, ReferralStatus, ReferralLib} from "../type/Referral.sol";
 import {Fee, FeeLib} from "../type/Fee.sol";
-import {Component} from "../shared/Component.sol";
+import {InstanceLinkedComponent} from "../shared/InstanceLinkedComponent.sol";
+import {IComponentService} from "../shared/IComponentService.sol";
 import {IDistribution} from "../instance/module/IDistribution.sol";
 import {IDistributionComponent} from "./IDistributionComponent.sol";
 import {IRegistry} from "../registry/IRegistry.sol";
-import {IRegisterable} from "../shared/IRegisterable.sol";
-import {ISetup} from "../instance/module/ISetup.sol";
-import {Registerable} from "../shared/Registerable.sol";
 import {TokenHandler} from "../shared/TokenHandler.sol";
 import {InstanceReader} from "../instance/InstanceReader.sol";
 import {UFixed} from "../type/UFixed.sol";
@@ -23,16 +21,14 @@ import {ITransferInterceptor} from "../registry/ITransferInterceptor.sol";
 
 
 abstract contract Distribution is
-    Component,
+    InstanceLinkedComponent,
     IDistributionComponent
 {
     // keccak256(abi.encode(uint256(keccak256("etherisc.storage.Distribution")) - 1)) & ~bytes32(uint256(0xff));
     bytes32 public constant DISTRIBUTION_STORAGE_LOCATION_V1 = 0xaab7c5ea03d290056d6c060e0833d3ebcbe647f7694616a2ec52738a64b2f900;
 
     struct DistributionStorage {
-        Fee _minDistributionOwnerFee;
-        Fee _distributionFee;
-        TokenHandler _tokenHandler;
+        IComponentService _componentService;
         IDistributionService _distributionService;
         mapping(address distributor => NftId distributorNftId) _distributorNftId;
     }
@@ -42,45 +38,47 @@ abstract contract Distribution is
     function initializeDistribution(
         address registry,
         NftId instanceNftId,
+        address initialOwner,
         string memory name,
         address token,
-        Fee memory minDistributionOwnerFee,
-        Fee memory distributionFee,
-        address initialOwner,
-        bytes memory registryData // writeonly data that will saved in the object info record of the registry
+        bytes memory registryData, // writeonly data that will saved in the object info record of the registry
+        bytes memory componentData // component specifidc data 
     )
         public
         virtual
         onlyInitializing()
     {
-        initializeComponent(registry, instanceNftId, name, token, DISTRIBUTION(), true, initialOwner, registryData);
+        initializeInstanceLinkedComponent(registry, instanceNftId, name, token, DISTRIBUTION(), true, initialOwner, registryData, componentData);
 
         DistributionStorage storage $ = _getDistributionStorage();
-        // TODO add validation
-        $._minDistributionOwnerFee = minDistributionOwnerFee;
-        $._distributionFee = distributionFee;
-        $._tokenHandler = new TokenHandler(token);
         $._distributionService = IDistributionService(_getServiceAddress(DISTRIBUTION())); 
+        $._componentService = IComponentService(_getServiceAddress(COMPONENT())); 
 
         registerInterface(type(IDistributionComponent).interfaceId);
     }
 
+    function register()
+        external
+        virtual
+        onlyOwner()
+    {
+        _getDistributionStorage()._componentService.registerDistribution();
+    }
+
     function setFees(
-        Fee memory minDistributionOwnerFee,
-        Fee memory distributionFee
+        Fee memory distributionFee,
+        Fee memory minDistributionOwnerFee
     )
         external
         override
-        onlyOwner
+        onlyOwner()
         restricted()
     {
-        _getDistributionStorage()._distributionService.setFees(minDistributionOwnerFee, distributionFee);
+        _getDistributionStorage()._componentService.setDistributionFees(
+            distributionFee, 
+            minDistributionOwnerFee);
     }
 
-    function getDistributionFee() external view returns (Fee memory distributionFee) {
-        DistributionStorage storage $ = _getDistributionStorage();
-        return $._distributionFee;
-    }
 
     function createDistributorType(
         string memory name,
@@ -240,40 +238,18 @@ abstract contract Distribution is
         // default is no action
     }
 
-    function getSetupInfo() public view returns (ISetup.DistributionSetupInfo memory setupInfo) {
-        InstanceReader reader = getInstance().getInstanceReader();
-        setupInfo = reader.getDistributionSetupInfo(getNftId());
-
-        // fallback to initial setup info (wallet is always != address(0))
-        if(setupInfo.wallet == address(0)) {
-            setupInfo = _getInitialSetupInfo();
-        }
-    }
-
-    function _getInitialSetupInfo() internal view returns (ISetup.DistributionSetupInfo memory setupInfo) {
-        DistributionStorage storage $ = _getDistributionStorage();
-        return ISetup.DistributionSetupInfo(
-            zeroNftId(),
-            $._tokenHandler,
-            $._minDistributionOwnerFee,
-            $._distributionFee,
-            address(this),
-            0
-        );
-    }
-
 
     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();
-        $._distributorNftId[from] = zeroNftId();
-        $._distributorNftId[to] = toNftId(tokenId);
+        $._distributorNftId[from] = NftIdLib.zero();
+        $._distributorNftId[to] = NftIdLib.toNftId(tokenId);
     }
     
 
     /// @dev returns true iff the component needs to be called when selling/renewing policis
-    function isVerifying() external view returns (bool verifying) {
+    function isVerifying() external pure returns (bool verifying) {
         return true;
     }
 

package/contracts/distribution/DistributionService.sol

@@ -1,19 +1,22 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.19;
+pragma solidity ^0.8.20;
 
 import {IRegistry} from "../registry/IRegistry.sol";
 import {IInstance} from "../instance/IInstance.sol";
 import {InstanceAdmin} from "../instance/InstanceAdmin.sol";
+import {IComponentService} from "../shared/IComponentService.sol";
+import {IInstanceService} from "../instance/IInstanceService.sol";
+import {IRegistryService} from "../registry/IRegistryService.sol";
 import {InstanceReader} from "../instance/InstanceReader.sol";
-import {ISetup} from "../instance/module/ISetup.sol";
+import {IComponents} from "../instance/module/IComponents.sol";
 import {IPolicy} from "../instance/module/IPolicy.sol";
 
 import {Amount, AmountLib} from "../type/Amount.sol";
-import {NftId, NftIdLib, zeroNftId} from "../type/NftId.sol";
+import {NftId, NftIdLib} from "../type/NftId.sol";
 import {Fee, FeeLib} from "../type/Fee.sol";
 import {PRODUCT_SERVICE_ROLE, DISTRIBUTION_OWNER_ROLE} from "../type/RoleId.sol";
 import {KEEP_STATE} from "../type/StateId.sol";
-import {ObjectType, DISTRIBUTION, INSTANCE, DISTRIBUTION, DISTRIBUTOR, PRICE} from "../type/ObjectType.sol";
+import {ObjectType, COMPONENT, DISTRIBUTION, INSTANCE, DISTRIBUTION, DISTRIBUTOR, REGISTRY} from "../type/ObjectType.sol";
 import {Version, VersionLib} from "../type/Version.sol";
 import {RoleId} from "../type/RoleId.sol";
 
@@ -22,7 +25,7 @@ import {Versionable} from "../shared/Versionable.sol";
 
 import {IService} from "../shared/IService.sol";
 import {Service} from "../shared/Service.sol";
-import {ComponentService} from "../shared/ComponentService.sol";
+import {ComponentVerifyingService} from "../shared/ComponentVerifyingService.sol";
 import {InstanceService} from "../instance/InstanceService.sol";
 import {IComponent} from "../shared/IComponent.sol";
 import {IDistributionComponent} from "../distribution/IDistributionComponent.sol";
@@ -39,7 +42,7 @@ import {InstanceStore} from "../instance/InstanceStore.sol";
 
 
 contract DistributionService is
-    ComponentService,
+    ComponentVerifyingService,
     IDistributionService
 {
     using NftIdLib for NftId;
@@ -48,7 +51,9 @@ contract DistributionService is
     using FeeLib for Fee;
     using ReferralLib for ReferralId;
 
-    address internal _registryAddress;
+    IComponentService private _componentService;
+    IInstanceService private _instanceService;
+    IRegistryService private _registryService;
     
     function _initialize(
         address owner, 
@@ -58,81 +63,20 @@ contract DistributionService is
         initializer
         virtual override
     {
-        (
-            address registryAddress,, 
-            //address managerAddress
-            address authority
-        ) = abi.decode(data, (address, address, address));
+        address initialOwner;
+        address registryAddress;
+        (registryAddress, initialOwner) = abi.decode(data, (address, address));
+        // TODO while DistributionService is not deployed in DistributionServiceManager constructor
+        //      owner is DistributionServiceManager deployer
+        initializeService(registryAddress, address(0), owner);
+
+        _componentService = IComponentService(_getServiceAddress(COMPONENT()));
+        _instanceService = IInstanceService(_getServiceAddress(INSTANCE()));
+        _registryService = IRegistryService(_getServiceAddress(REGISTRY()));
 
-        initializeService(registryAddress, authority, owner);
         registerInterface(type(IDistributionService).interfaceId);
     }
 
-    function getDomain() public pure override returns(ObjectType) {
-        return DISTRIBUTION();
-    }
-
-    function register(address distributionAddress) 
-        external
-        returns(NftId distributionNftId)
-    {
-        (
-            IComponent component,
-            address owner,
-            IInstance instance,
-            NftId instanceNftId
-        ) = _checkComponentForRegistration(
-            distributionAddress,
-            DISTRIBUTION(),
-            DISTRIBUTION_OWNER_ROLE());
-
-        IRegistry.ObjectInfo memory distributionInfo = getRegistryService().registerDistribution(component, owner);
-        IDistributionComponent distribution = IDistributionComponent(distributionAddress);
-        distribution.linkToRegisteredNftId();
-        distributionNftId = distributionInfo.nftId;
-
-        instance.getInstanceStore().createDistributionSetup(distributionNftId, distribution.getSetupInfo());
-        // TODO move to distribution?
-        bytes4[][] memory selectors = new bytes4[][](2);
-        selectors[0] = new bytes4[](1);
-        // TODO check if array size should be 1 instead of 2
-        selectors[1] = new bytes4[](2);
-
-        selectors[0][0] = IDistributionComponent.setFees.selector;
-        selectors[1][0] = IDistributionComponent.processRenewal.selector;
-
-        RoleId[] memory roles = new RoleId[](2);
-        roles[0] = DISTRIBUTION_OWNER_ROLE();
-        roles[1] = PRODUCT_SERVICE_ROLE();
-
-        getInstanceService().createGifTarget(
-            instanceNftId, 
-            distributionAddress, 
-            distribution.getName(), 
-            selectors, 
-            roles);
-    }
-
-    function setFees(
-        Fee memory minDistributionOwnerFee,
-        Fee memory distributionFee
-    )
-        external
-        override
-    {
-        if (minDistributionOwnerFee.fractionalFee > distributionFee.fractionalFee) {
-            revert ErrorIDistributionServiceMinFeeTooHigh(minDistributionOwnerFee.fractionalFee.toInt(), distributionFee.fractionalFee.toInt());
-        }
-
-        (NftId distributionNftId,, IInstance instance) = _getAndVerifyCallingComponentAndInstance(DISTRIBUTION());
-        InstanceReader instanceReader = instance.getInstanceReader();
-
-        ISetup.DistributionSetupInfo memory distSetupInfo = instanceReader.getDistributionSetupInfo(distributionNftId);
-        distSetupInfo.minDistributionOwnerFee = minDistributionOwnerFee;
-        distSetupInfo.distributionFee = distributionFee;
-        
-        instance.getInstanceStore().updateDistributionSetup(distributionNftId, distSetupInfo, KEEP_STATE());
-    }
 
     function createDistributorType(
         string memory name,
@@ -148,12 +92,14 @@ contract DistributionService is
         external
         returns (DistributorType distributorType)
     {
-        (NftId distributionNftId,, IInstance instance) = _getAndVerifyCallingComponentAndInstance(DISTRIBUTION());
+        (NftId distributionNftId,, IInstance instance) = _getAndVerifyActiveComponent(DISTRIBUTION());
+        InstanceReader instanceReader = instance.getInstanceReader();
 
         {
-            ISetup.DistributionSetupInfo memory setupInfo = instance.getInstanceReader().getDistributionSetupInfo(distributionNftId);
-            UFixed variableFeesPartsTotal = setupInfo.minDistributionOwnerFee.fractionalFee.add(commissionPercentage);
-            UFixed maxDiscountPercentageLimit = setupInfo.distributionFee.fractionalFee.sub(variableFeesPartsTotal);
+            NftId productNftId = _getProductNftId(instanceReader, distributionNftId);
+            IComponents.ProductInfo memory productInfo = instance.getInstanceReader().getProductInfo(productNftId);
+            UFixed variableFeesPartsTotal = productInfo.minDistributionOwnerFee.fractionalFee.add(commissionPercentage);
+            UFixed maxDiscountPercentageLimit = productInfo.distributionFee.fractionalFee.sub(variableFeesPartsTotal);
             if (maxDiscountPercentage.gt(maxDiscountPercentageLimit)) {
                 revert ErrorIDistributionServiceMaxDiscountTooHigh(maxDiscountPercentage.toInt(), maxDiscountPercentageLimit.toInt());
             }
@@ -184,11 +130,11 @@ contract DistributionService is
         virtual
         returns (NftId distributorNftId)
     {
-        (NftId distributionNftId,, IInstance instance) = _getAndVerifyCallingComponentAndInstance(DISTRIBUTION());
+        (NftId distributionNftId,, IInstance instance) = _getAndVerifyActiveComponent(DISTRIBUTION());
 
-        distributorNftId = getRegistryService().registerDistributor(
+        distributorNftId = _registryService.registerDistributor(
             IRegistry.ObjectInfo(
-                zeroNftId(), 
+                NftIdLib.zero(), 
                 distributionNftId,
                 DISTRIBUTOR(),
                 true, // intercepting property for bundles is defined on pool
@@ -236,7 +182,7 @@ contract DistributionService is
         virtual
         returns (ReferralId referralId)
     {
-        (NftId distributionNftId,, IInstance instance) = _getAndVerifyCallingComponentAndInstance(DISTRIBUTION());
+        (NftId distributionNftId,, IInstance instance) = _getAndVerifyActiveComponent(DISTRIBUTION());
 
         if (bytes(code).length == 0) {
             revert ErrorIDistributionServiceInvalidReferral(code);
@@ -277,57 +223,53 @@ contract DistributionService is
         return referralId;
     }
 
+
     function processSale(
         NftId distributionNftId, // assume always of distribution type
         ReferralId referralId,
-        IPolicy.Premium memory premium,
-        Amount transferredDistributionFeeAmount
+        IPolicy.Premium memory premium
     )
         external
         virtual
         restricted
     {
-        bool isReferral = ! referralId.eqz();
-        bool referralValid = referralIsValid(distributionNftId, referralId);
-
-        if (isReferral && ! referralValid) {
-            revert ErrorIDistributionServiceReferralInvalid(distributionNftId, referralId);
-        }
-
         IInstance instance = _getInstanceForDistribution(distributionNftId);
         InstanceReader reader = instance.getInstanceReader();
         InstanceStore store = instance.getInstanceStore();
-        IDistribution.ReferralInfo memory referralInfo = reader.getReferralInfo(referralId);
-        IDistribution.DistributorInfo memory distributorInfo = reader.getDistributorInfo(referralInfo.distributorNftId);
-        ISetup.DistributionSetupInfo memory setupInfo = reader.getDistributionSetupInfo(distributionNftId);
-        
-        Amount distributionOwnerFee = AmountLib.toAmount(premium.distributionOwnerFeeFixAmount + premium.distributionOwnerFeeVarAmount);
-        Amount commissionAmount = AmountLib.toAmount(premium.commissionAmount);
 
-        if (!(transferredDistributionFeeAmount == distributionOwnerFee + commissionAmount)) {
-            revert ErrorDistributionServiceInvalidFeeTransferred(transferredDistributionFeeAmount, distributionOwnerFee + commissionAmount);
-        }
+        // get distribution owner fee amount
+        Amount distributionOwnerFee = AmountLib.toAmount(premium.distributionOwnerFeeFixAmount + premium.distributionOwnerFeeVarAmount);
 
+        // update referral/distributor info if applicable
+        if (referralIsValid(distributionNftId, referralId)) {
 
-        if (distributionOwnerFee.gtz()) {
-            setupInfo.sumDistributionOwnerFees += distributionOwnerFee.toInt();
-            store.updateDistributionSetup(distributionNftId, setupInfo, KEEP_STATE());
-        }
+            // increase distribution balance by commission amount and distribution owner fee
+            Amount commissionAmount = AmountLib.toAmount(premium.commissionAmount);
+            _componentService.increaseDistributionBalance(store, distributionNftId, commissionAmount, distributionOwnerFee);
 
-        if (isReferral) {
+            // update book keeping for referral info
+            IDistribution.ReferralInfo memory referralInfo = reader.getReferralInfo(referralId);
             referralInfo.usedReferrals += 1;
             store.updateReferral(referralId, referralInfo, KEEP_STATE());
 
-            if (commissionAmount.gtz()) {
-                distributorInfo.commissionAmount = distributorInfo.commissionAmount + commissionAmount;
-                distributorInfo.numPoliciesSold += 1;
-                store.updateDistributor(referralInfo.distributorNftId, distributorInfo, KEEP_STATE());
-            }
+            // update book keeping for distributor info
+            IDistribution.DistributorInfo memory distributorInfo = reader.getDistributorInfo(referralInfo.distributorNftId);
+            // TODO refactor sum of commission amount into a fee balance for distributors
+            distributorInfo.commissionAmount = distributorInfo.commissionAmount + commissionAmount;
+            distributorInfo.numPoliciesSold += 1;
+            store.updateDistributor(referralInfo.distributorNftId, distributorInfo, KEEP_STATE());
+        } else {
+
+            // increase distribution balance by distribution owner fee
+            _componentService.increaseDistributionBalance(store, distributionNftId, AmountLib.zero(), distributionOwnerFee);
         }
     }
 
-    // TODO: zero should return false
     function referralIsValid(NftId distributionNftId, ReferralId referralId) public view returns (bool isValid) {
+        if (distributionNftId.eqz() || referralId.eqz()) {
+            return false;
+        }
+
         IInstance instance = _getInstanceForDistribution(distributionNftId);
         IDistribution.ReferralInfo memory info = instance.getInstanceReader().getReferralInfo(referralId);
 
@@ -348,4 +290,8 @@ contract DistributionService is
         address instanceAddress = getRegistry().getObjectInfo(instanceNftId).objectAddress;
         return IInstance(instanceAddress);
     }
+
+    function _getDomain() internal pure override returns(ObjectType) {
+        return DISTRIBUTION();
+    }
 }

package/contracts/distribution/IDistributionComponent.sol

@@ -1,24 +1,21 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.19;
+pragma solidity ^0.8.20;
 
 import {Fee} from "../type/Fee.sol";
-import {IComponent} from "../shared/IComponent.sol";
-import {ISetup} from "../instance/module/ISetup.sol";
+import {IInstanceLinkedComponent} from "../shared/IInstanceLinkedComponent.sol";
 import {ReferralId, ReferralStatus} from "../type/Referral.sol";
 import {NftId} from "../type/NftId.sol";
 import {DistributorType} from "../type/DistributorType.sol";
 import {UFixed} from "../type/UFixed.sol";
 import {Timestamp} from "../type/Timestamp.sol";
 
-interface IDistributionComponent is IComponent {
+interface IDistributionComponent is IInstanceLinkedComponent {
 
     event LogDistributorUpdated(address to, address caller);
 
-    function getSetupInfo() external view returns (ISetup.DistributionSetupInfo memory setupInfo);
-
     function setFees(
-        Fee memory minDistributionOwnerFee,
-        Fee memory distributionFee
+        Fee memory distributionFee,
+        Fee memory minDistributionOwnerFee
     ) external;
 
     function createDistributorType(
@@ -60,8 +57,6 @@ interface IDistributionComponent is IComponent {
         string memory referralCode
     ) external view returns (UFixed discountPercentage, ReferralStatus status);
 
-    function getDistributionFee() external view returns (Fee memory distibutionFee);
-
     function getReferralId(
         string memory referralCode
     ) external returns (ReferralId referralId);

package/contracts/distribution/IDistributionService.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.19;
+pragma solidity ^0.8.20;
 
 import {Amount} from "../type/Amount.sol";
 import {NftId} from "../type/NftId.sol";
@@ -29,11 +29,6 @@ interface IDistributionService is IService {
     error ErrorIDistributionServiceReferralInvalid(NftId distributionNftId, ReferralId referralId);
     error ErrorDistributionServiceInvalidFeeTransferred(Amount transferredDistributionFeeAmount, Amount expectedDistributionFeeAmount);
 
-    function setFees(
-        Fee memory minDistributionOwnerFee,
-        Fee memory distributionFee
-    ) external;
-    
     function createDistributorType(
         string memory name,
         UFixed minDiscountPercentage,
@@ -76,8 +71,7 @@ interface IDistributionService is IService {
     function processSale(
         NftId distributionNftId,
         ReferralId referralId,
-        IPolicy.Premium memory premium,
-        Amount transferredDistributionFeeAmount
+        IPolicy.Premium memory premium
     ) external;
 
     function referralIsValid(