@etherisc/gif-next 0.0.2-cc4a5cb-898 → 0.0.2-cd89a0b-062

package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.json

@@ -3,6 +3,29 @@
   "contractName": "TestVersionable",
   "sourceName": "contracts/test/TestVersionable.sol",
   "abi": [
+    {
+      "inputs": [],
+      "name": "InvalidInitialization",
+      "type": "error"
+    },
+    {
+      "inputs": [],
+      "name": "NotInitializing",
+      "type": "error"
+    },
+    {
+      "anonymous": false,
+      "inputs": [
+        {
+          "indexed": false,
+          "internalType": "uint64",
+          "name": "version",
+          "type": "uint64"
+        }
+      ],
+      "name": "Initialized",
+      "type": "event"
+    },
     {
       "anonymous": false,
       "inputs": [
@@ -25,25 +48,20 @@
           "type": "address"
         }
       ],
-      "name": "LogVersionableActivated",
+      "name": "LogVersionableInitialized",
       "type": "event"
     },
     {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "implementation",
-          "type": "address"
-        },
+      "inputs": [],
+      "name": "getInitializedVersion",
+      "outputs": [
         {
-          "internalType": "address",
-          "name": "activatedBy",
-          "type": "address"
+          "internalType": "uint64",
+          "name": "",
+          "type": "uint64"
         }
       ],
-      "name": "activate",
-      "outputs": [],
-      "stateMutability": "nonpayable",
+      "stateMutability": "view",
       "type": "function"
     },
     {
@@ -137,6 +155,29 @@
       "stateMutability": "view",
       "type": "function"
     },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "implementation",
+          "type": "address"
+        },
+        {
+          "internalType": "address",
+          "name": "activatedBy",
+          "type": "address"
+        },
+        {
+          "internalType": "bytes",
+          "name": "data",
+          "type": "bytes"
+        }
+      ],
+      "name": "initialize",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
     {
       "inputs": [
         {
@@ -145,7 +186,7 @@
           "type": "uint24"
         }
       ],
-      "name": "isActivated",
+      "name": "isInitialized",
       "outputs": [
         {
           "internalType": "bool",
@@ -155,20 +196,39 @@
       ],
       "stateMutability": "view",
       "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "implementation",
+          "type": "address"
+        },
+        {
+          "internalType": "address",
+          "name": "activatedBy",
+          "type": "address"
+        },
+        {
+          "internalType": "bytes",
+          "name": "data",
+          "type": "bytes"
+        }
+      ],
+      "name": "upgrade",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
     }
   ],
-  "bytecode": "0x608060405234801561001057600080fd5b5061001c600033610021565b6104a4565b600061002b6102eb565b905061003681610375565b156100985760405162461bcd60e51b815260206004820152602760248201527f4552524f523a56524e2d3030313a56455253494f4e5f414c52454144595f41436044820152661512559055115160ca1b60648201526084015b60405180910390fd5b6001541561014e5760018054600091906100b3908290610428565b815481106100c3576100c3610449565b90600052602060002090600a91828204019190066003029054906101000a900462ffffff1690506100f48282610416565b61014c5760405162461bcd60e51b8152602060048201526024808201527f4552524f523a56524e2d3030323a56455253494f4e5f4e4f545f494e4352454160448201526353494e4760e01b606482015260840161008f565b505b600180548082018255600091909152600a8082047fb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf601805462ffffff808616600394909506939093026101000a848102930219169190911790556040805160a0810182529182526001600160a01b038086166020840152841690820152606081016101d64290565b64ffffffffff1681526020014363ffffffff90811690915262ffffff8084166000908152602081815260409182902085518154928701516001600160a01b039081166301000000026001600160b81b0319909416919095161791909117815584820151600190910180546060870151608090970151909516600160c81b0263ffffffff60c81b1964ffffffffff909716600160a01b026001600160c81b031990961692909416919091179390931793909316179055517f68e7327fca0057a787cde34ababb9ef9844ba8065ee03e8781d8122fc15d4419906102de9083908690869062ffffff9390931683526001600160a01b03918216602084015216604082015260600190565b60405180910390a1505050565b604051632efe011360e01b815260036004820152600060248201819052604482018190529073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90632efe011390606401602060405180830381865af415801561034c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610370919061045f565b905090565b62ffffff8116600090815260208190526040808220600101549051631bbffab160e21b8152600160c81b90910463ffffffff166004820152819073__$5f476116ae21c5294e0c0761c07efa7e1c$__90636effeac490602401602060405180830381865af41580156103eb573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061040f919061048b565b1192915050565b62ffffff808216908316115b92915050565b8181038181111561042257634e487b7160e01b600052601160045260246000fd5b634e487b7160e01b600052603260045260246000fd5b60006020828403121561047157600080fd5b815162ffffff8116811461048457600080fd5b9392505050565b60006020828403121561049d57600080fd5b5051919050565b61078a806104b36000396000f3fe608060405234801561001057600080fd5b50600436106100625760003560e01c80630abd8434146100675780630d8e6e2c1461008f5780634d459c90146100ab578063946dfcfe146101b85780639555c4db146101c9578063b88da759146101de575b600080fd5b61007a61007536600461065b565b6101f1565b60405190151581526020015b60405180910390f35b610097610292565b60405162ffffff9091168152602001610086565b61015b6100b936600461065b565b6040805160a0810182526000808252602082018190529181018290526060810182905260808101919091525062ffffff90811660009081526020818152604091829020825160a0810184528154948516815263010000009094046001600160a01b03908116928501929092526001015490811691830191909152600160a01b810464ffffffffff166060830152600160c81b900463ffffffff16608082015290565b60408051825162ffffff1681526020808401516001600160a01b039081169183019190915283830151169181019190915260608083015164ffffffffff169082015260809182015163ffffffff169181019190915260a001610086565b600154604051908152602001610086565b6101dc6101d736600461069b565b61031c565b005b6100976101ec3660046106ce565b61032a565b62ffffff8116600090815260208190526040808220600101549051631bbffab160e21b8152600160c81b90910463ffffffff166004820152819073__$5f476116ae21c5294e0c0761c07efa7e1c$__90636effeac490602401602060405180830381865af4158015610267573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061028b91906106e7565b1192915050565b604051632efe011360e01b815260036004820152600060248201819052604482018190529073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90632efe011390606401602060405180830381865af41580156102f3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103179190610700565b905090565b610326828261036b565b5050565b60006001828154811061033f5761033f61071d565b90600052602060002090600a91828204019190066003029054906101000a900462ffffff169050919050565b6000610375610292565b9050610380816101f1565b156103e25760405162461bcd60e51b815260206004820152602760248201527f4552524f523a56524e2d3030313a56455253494f4e5f414c52454144595f41436044820152661512559055115160ca1b60648201526084015b60405180910390fd5b600154156104985760018054600091906103fd908290610733565b8154811061040d5761040d61071d565b90600052602060002090600a91828204019190066003029054906101000a900462ffffff16905061043e8282610635565b6104965760405162461bcd60e51b8152602060048201526024808201527f4552524f523a56524e2d3030323a56455253494f4e5f4e4f545f494e4352454160448201526353494e4760e01b60648201526084016103d9565b505b600180548082018255600091909152600a8082047fb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf601805462ffffff808616600394909506939093026101000a848102930219169190911790556040805160a0810182529182526001600160a01b038086166020840152841690820152606081016105204290565b64ffffffffff1681526020014363ffffffff90811690915262ffffff8084166000908152602081815260409182902085518154928701516001600160a01b039081166301000000026001600160b81b0319909416919095161791909117815584820151600190910180546060870151608090970151909516600160c81b0263ffffffff60c81b1964ffffffffff909716600160a01b026001600160c81b031990961692909416919091179390931793909316179055517f68e7327fca0057a787cde34ababb9ef9844ba8065ee03e8781d8122fc15d4419906106289083908690869062ffffff9390931683526001600160a01b03918216602084015216604082015260600190565b60405180910390a1505050565b62ffffff808216908316115b92915050565b62ffffff8116811461065857600080fd5b50565b60006020828403121561066d57600080fd5b813561067881610647565b9392505050565b80356001600160a01b038116811461069657600080fd5b919050565b600080604083850312156106ae57600080fd5b6106b78361067f565b91506106c56020840161067f565b90509250929050565b6000602082840312156106e057600080fd5b5035919050565b6000602082840312156106f957600080fd5b5051919050565b60006020828403121561071257600080fd5b815161067881610647565b634e487b7160e01b600052603260045260246000fd5b8181038181111561064157634e487b7160e01b600052601160045260246000fdfea26469706673582212206bcdc2986f0372889ad6bdd3681221370a813c06c4be7e32d4c8815c5f00605364736f6c63430008140033",
-  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100625760003560e01c80630abd8434146100675780630d8e6e2c1461008f5780634d459c90146100ab578063946dfcfe146101b85780639555c4db146101c9578063b88da759146101de575b600080fd5b61007a61007536600461065b565b6101f1565b60405190151581526020015b60405180910390f35b610097610292565b60405162ffffff9091168152602001610086565b61015b6100b936600461065b565b6040805160a0810182526000808252602082018190529181018290526060810182905260808101919091525062ffffff90811660009081526020818152604091829020825160a0810184528154948516815263010000009094046001600160a01b03908116928501929092526001015490811691830191909152600160a01b810464ffffffffff166060830152600160c81b900463ffffffff16608082015290565b60408051825162ffffff1681526020808401516001600160a01b039081169183019190915283830151169181019190915260608083015164ffffffffff169082015260809182015163ffffffff169181019190915260a001610086565b600154604051908152602001610086565b6101dc6101d736600461069b565b61031c565b005b6100976101ec3660046106ce565b61032a565b62ffffff8116600090815260208190526040808220600101549051631bbffab160e21b8152600160c81b90910463ffffffff166004820152819073__$5f476116ae21c5294e0c0761c07efa7e1c$__90636effeac490602401602060405180830381865af4158015610267573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061028b91906106e7565b1192915050565b604051632efe011360e01b815260036004820152600060248201819052604482018190529073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90632efe011390606401602060405180830381865af41580156102f3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103179190610700565b905090565b610326828261036b565b5050565b60006001828154811061033f5761033f61071d565b90600052602060002090600a91828204019190066003029054906101000a900462ffffff169050919050565b6000610375610292565b9050610380816101f1565b156103e25760405162461bcd60e51b815260206004820152602760248201527f4552524f523a56524e2d3030313a56455253494f4e5f414c52454144595f41436044820152661512559055115160ca1b60648201526084015b60405180910390fd5b600154156104985760018054600091906103fd908290610733565b8154811061040d5761040d61071d565b90600052602060002090600a91828204019190066003029054906101000a900462ffffff16905061043e8282610635565b6104965760405162461bcd60e51b8152602060048201526024808201527f4552524f523a56524e2d3030323a56455253494f4e5f4e4f545f494e4352454160448201526353494e4760e01b60648201526084016103d9565b505b600180548082018255600091909152600a8082047fb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf601805462ffffff808616600394909506939093026101000a848102930219169190911790556040805160a0810182529182526001600160a01b038086166020840152841690820152606081016105204290565b64ffffffffff1681526020014363ffffffff90811690915262ffffff8084166000908152602081815260409182902085518154928701516001600160a01b039081166301000000026001600160b81b0319909416919095161791909117815584820151600190910180546060870151608090970151909516600160c81b0263ffffffff60c81b1964ffffffffff909716600160a01b026001600160c81b031990961692909416919091179390931793909316179055517f68e7327fca0057a787cde34ababb9ef9844ba8065ee03e8781d8122fc15d4419906106289083908690869062ffffff9390931683526001600160a01b03918216602084015216604082015260600190565b60405180910390a1505050565b62ffffff808216908316115b92915050565b62ffffff8116811461065857600080fd5b50565b60006020828403121561066d57600080fd5b813561067881610647565b9392505050565b80356001600160a01b038116811461069657600080fd5b919050565b600080604083850312156106ae57600080fd5b6106b78361067f565b91506106c56020840161067f565b90509250929050565b6000602082840312156106e057600080fd5b5035919050565b6000602082840312156106f957600080fd5b5051919050565b60006020828403121561071257600080fd5b815161067881610647565b634e487b7160e01b600052603260045260246000fd5b8181038181111561064157634e487b7160e01b600052601160045260246000fdfea26469706673582212206bcdc2986f0372889ad6bdd3681221370a813c06c4be7e32d4c8815c5f00605364736f6c63430008140033",
+  "bytecode": "0x608060405234801561001057600080fd5b5061001961001e565b6100d0565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a00805468010000000000000000900460ff161561006e5760405163f92ee8a960e01b815260040160405180910390fd5b80546001600160401b03908116146100cd5780546001600160401b0319166001600160401b0390811782556040519081527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a15b50565b610b4d806100df6000396000f3fe608060405234801561001057600080fd5b50600436106100885760003560e01c8063a745e3df1161005b578063a745e3df1461021a578063b3c650151461022f578063b88da75914610250578063cf7a1d771461026357600080fd5b80630d8e6e2c1461008d5780634d459c90146100ae5780634f421333146101c7578063946dfcfe146101ea575b600080fd5b610095610276565b60405162ffffff90911681526020015b60405180910390f35b61016a6100bc366004610920565b6040805160a081018252600080825260208201819052918101829052606081018290526080810191909152600080516020610af883398151915262ffffff92831660009081526020918252604090819020815160a0810183528154958616815263010000009095046001600160a01b03908116938601939093526001015491821690840152600160a01b810464ffffffffff166060840152600160c81b900463ffffffff1660808301525090565b60408051825162ffffff1681526020808401516001600160a01b039081169183019190915283830151169181019190915260608083015164ffffffffff169082015260809182015163ffffffff169181019190915260a0016100a5565b6101da6101d5366004610920565b610300565b60405190151581526020016100a5565b7f4f61291a8ac3d020d0a7d919a76b8592aa88385744dee3f8b4f3873b969ed901546040519081526020016100a5565b61022d610228366004610976565b6103b3565b005b610237610510565b60405167ffffffffffffffff90911681526020016100a5565b61009561025e366004610a48565b610532565b61022d610271366004610976565b610583565b604051632efe011360e01b815260036004820152600060248201819052604482018190529073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90632efe011390606401602060405180830381865af41580156102d7573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102fb9190610a61565b905090565b600080600080516020610af883398151915262ffffff84166000908152602091909152604090819020600101549051631bbffab160e21b8152600160c81b90910463ffffffff16600482015273__$5f476116ae21c5294e0c0761c07efa7e1c$__90636effeac490602401602060405180830381865af4158015610388573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103ac9190610a7e565b1192915050565b73__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__63a123b37c6103d5610276565b6040516001600160e01b031960e084901b16815262ffffff9091166004820152602401602060405180830381865af4158015610415573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104399190610a97565b600080516020610ad88339815191528054600160401b900460ff168061046d5750805467ffffffffffffffff808416911610155b1561048b5760405163f92ee8a960e01b815260040160405180910390fd5b805468ffffffffffffffffff191667ffffffffffffffff831617600160401b1781556104b7858561068e565b6104c0836108cf565b805460ff60401b1916815560405167ffffffffffffffff831681527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d2906020015b60405180910390a15050505050565b60006102fb600080516020610ad88339815191525467ffffffffffffffff1690565b6000600080516020610af8833981519152600101828154811061055757610557610ac1565b90600052602060002090600a91828204019190066003029054906101000a900462ffffff169050919050565b600080516020610ad88339815191528054600160401b810460ff16159067ffffffffffffffff166000811580156105b75750825b905060008267ffffffffffffffff1660011480156105d45750303b155b9050811580156105e2575080155b156106005760405163f92ee8a960e01b815260040160405180910390fd5b845467ffffffffffffffff19166001178555831561062a57845460ff60401b1916600160401b1785555b610634888861068e565b61063e87876108cf565b831561068457845460ff60401b19168555604051600181527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a15b5050505050505050565b6106966108d3565b600080516020610af883398151915260006106c7600080516020610ad88339815191525467ffffffffffffffff1690565b905060006106d3610276565b90508167ffffffffffffffff166001036107015760028301805462ffffff191662ffffff8316179055610753565b600283015462ffffff908116908216116107535760405162461bcd60e51b815260206004820152600f60248201526e24a72b20a624a2102b22a929a4a7a760891b604482015260640160405180910390fd5b6001808401805491820181556000908152602090819020600a808404909101805462ffffff808716600394909606939093026101000a858102930219169190911790556040805160a0810182529283526001600160a01b038089169284019290925290861690820152606081016107c74290565b64ffffffffff1681526020014363ffffffff90811690915262ffffff8084166000908152602087815260409182902085518154928701516001600160a01b039081166301000000026001600160b81b0319909416919095161791909117815584820151600190910180546060870151608090970151909516600160c81b0263ffffffff60c81b1964ffffffffff909716600160a01b026001600160c81b031990961692909416919091179390931793909316179055517fad0a0fc10465a8dd9da3ad5f43e1a7fff4b4578551c76f0ae8deb844f0d0bf68906105019083908890889062ffffff9390931683526001600160a01b03918216602084015216604082015260600190565b6100885b600080516020610ad883398151915254600160401b900460ff1661090a57604051631afcd79f60e31b815260040160405180910390fd5b565b62ffffff8116811461091d57600080fd5b50565b60006020828403121561093257600080fd5b813561093d8161090c565b9392505050565b80356001600160a01b038116811461095b57600080fd5b919050565b634e487b7160e01b600052604160045260246000fd5b60008060006060848603121561098b57600080fd5b61099484610944565b92506109a260208501610944565b9150604084013567ffffffffffffffff808211156109bf57600080fd5b818601915086601f8301126109d357600080fd5b8135818111156109e5576109e5610960565b604051601f8201601f19908116603f01168101908382118183101715610a0d57610a0d610960565b81604052828152896020848701011115610a2657600080fd5b8260208601602083013760006020848301015280955050505050509250925092565b600060208284031215610a5a57600080fd5b5035919050565b600060208284031215610a7357600080fd5b815161093d8161090c565b600060208284031215610a9057600080fd5b5051919050565b600060208284031215610aa957600080fd5b815167ffffffffffffffff8116811461093d57600080fd5b634e487b7160e01b600052603260045260246000fdfef0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a004f61291a8ac3d020d0a7d919a76b8592aa88385744dee3f8b4f3873b969ed900a2646970667358221220057cc85d9d65513b31827396e7fefeaa6a2b360810e1c9c13cc27a737fb0ebb364736f6c63430008140033",
+  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100885760003560e01c8063a745e3df1161005b578063a745e3df1461021a578063b3c650151461022f578063b88da75914610250578063cf7a1d771461026357600080fd5b80630d8e6e2c1461008d5780634d459c90146100ae5780634f421333146101c7578063946dfcfe146101ea575b600080fd5b610095610276565b60405162ffffff90911681526020015b60405180910390f35b61016a6100bc366004610920565b6040805160a081018252600080825260208201819052918101829052606081018290526080810191909152600080516020610af883398151915262ffffff92831660009081526020918252604090819020815160a0810183528154958616815263010000009095046001600160a01b03908116938601939093526001015491821690840152600160a01b810464ffffffffff166060840152600160c81b900463ffffffff1660808301525090565b60408051825162ffffff1681526020808401516001600160a01b039081169183019190915283830151169181019190915260608083015164ffffffffff169082015260809182015163ffffffff169181019190915260a0016100a5565b6101da6101d5366004610920565b610300565b60405190151581526020016100a5565b7f4f61291a8ac3d020d0a7d919a76b8592aa88385744dee3f8b4f3873b969ed901546040519081526020016100a5565b61022d610228366004610976565b6103b3565b005b610237610510565b60405167ffffffffffffffff90911681526020016100a5565b61009561025e366004610a48565b610532565b61022d610271366004610976565b610583565b604051632efe011360e01b815260036004820152600060248201819052604482018190529073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90632efe011390606401602060405180830381865af41580156102d7573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102fb9190610a61565b905090565b600080600080516020610af883398151915262ffffff84166000908152602091909152604090819020600101549051631bbffab160e21b8152600160c81b90910463ffffffff16600482015273__$5f476116ae21c5294e0c0761c07efa7e1c$__90636effeac490602401602060405180830381865af4158015610388573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103ac9190610a7e565b1192915050565b73__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__63a123b37c6103d5610276565b6040516001600160e01b031960e084901b16815262ffffff9091166004820152602401602060405180830381865af4158015610415573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104399190610a97565b600080516020610ad88339815191528054600160401b900460ff168061046d5750805467ffffffffffffffff808416911610155b1561048b5760405163f92ee8a960e01b815260040160405180910390fd5b805468ffffffffffffffffff191667ffffffffffffffff831617600160401b1781556104b7858561068e565b6104c0836108cf565b805460ff60401b1916815560405167ffffffffffffffff831681527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d2906020015b60405180910390a15050505050565b60006102fb600080516020610ad88339815191525467ffffffffffffffff1690565b6000600080516020610af8833981519152600101828154811061055757610557610ac1565b90600052602060002090600a91828204019190066003029054906101000a900462ffffff169050919050565b600080516020610ad88339815191528054600160401b810460ff16159067ffffffffffffffff166000811580156105b75750825b905060008267ffffffffffffffff1660011480156105d45750303b155b9050811580156105e2575080155b156106005760405163f92ee8a960e01b815260040160405180910390fd5b845467ffffffffffffffff19166001178555831561062a57845460ff60401b1916600160401b1785555b610634888861068e565b61063e87876108cf565b831561068457845460ff60401b19168555604051600181527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a15b5050505050505050565b6106966108d3565b600080516020610af883398151915260006106c7600080516020610ad88339815191525467ffffffffffffffff1690565b905060006106d3610276565b90508167ffffffffffffffff166001036107015760028301805462ffffff191662ffffff8316179055610753565b600283015462ffffff908116908216116107535760405162461bcd60e51b815260206004820152600f60248201526e24a72b20a624a2102b22a929a4a7a760891b604482015260640160405180910390fd5b6001808401805491820181556000908152602090819020600a808404909101805462ffffff808716600394909606939093026101000a858102930219169190911790556040805160a0810182529283526001600160a01b038089169284019290925290861690820152606081016107c74290565b64ffffffffff1681526020014363ffffffff90811690915262ffffff8084166000908152602087815260409182902085518154928701516001600160a01b039081166301000000026001600160b81b0319909416919095161791909117815584820151600190910180546060870151608090970151909516600160c81b0263ffffffff60c81b1964ffffffffff909716600160a01b026001600160c81b031990961692909416919091179390931793909316179055517fad0a0fc10465a8dd9da3ad5f43e1a7fff4b4578551c76f0ae8deb844f0d0bf68906105019083908890889062ffffff9390931683526001600160a01b03918216602084015216604082015260600190565b6100885b600080516020610ad883398151915254600160401b900460ff1661090a57604051631afcd79f60e31b815260040160405180910390fd5b565b62ffffff8116811461091d57600080fd5b50565b60006020828403121561093257600080fd5b813561093d8161090c565b9392505050565b80356001600160a01b038116811461095b57600080fd5b919050565b634e487b7160e01b600052604160045260246000fd5b60008060006060848603121561098b57600080fd5b61099484610944565b92506109a260208501610944565b9150604084013567ffffffffffffffff808211156109bf57600080fd5b818601915086601f8301126109d357600080fd5b8135818111156109e5576109e5610960565b604051601f8201601f19908116603f01168101908382118183101715610a0d57610a0d610960565b81604052828152896020848701011115610a2657600080fd5b8260208601602083013760006020848301015280955050505050509250925092565b600060208284031215610a5a57600080fd5b5035919050565b600060208284031215610a7357600080fd5b815161093d8161090c565b600060208284031215610a9057600080fd5b5051919050565b600060208284031215610aa957600080fd5b815167ffffffffffffffff8116811461093d57600080fd5b634e487b7160e01b600052603260045260246000fdfef0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a004f61291a8ac3d020d0a7d919a76b8592aa88385744dee3f8b4f3873b969ed900a2646970667358221220057cc85d9d65513b31827396e7fefeaa6a2b360810e1c9c13cc27a737fb0ebb364736f6c63430008140033",
   "linkReferences": {
     "contracts/types/Blocknumber.sol": {
       "BlocknumberLib": [
         {
           "length": 20,
-          "start": 945
-        },
-        {
-          "length": 20,
-          "start": 1760
+          "start": 1069
         }
       ]
     },
@@ -176,11 +236,11 @@
       "VersionLib": [
         {
           "length": 20,
-          "start": 786
+          "start": 892
         },
         {
           "length": 20,
-          "start": 1900
+          "start": 1172
         }
       ]
     }
@@ -190,7 +250,7 @@
       "BlocknumberLib": [
         {
           "length": 20,
-          "start": 557
+          "start": 846
         }
       ]
     },
@@ -198,7 +258,11 @@
       "VersionLib": [
         {
           "length": 20,
-          "start": 697
+          "start": 669
+        },
+        {
+          "length": 20,
+          "start": 949
         }
       ]
     }

package/artifacts/contracts/test/Usdc.sol/USDC.dbg.json

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

package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.dbg.json

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

package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json

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

package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json

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

package/artifacts/contracts/types/Fee.sol/FeeLib.dbg.json

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

package/artifacts/contracts/types/Key32.sol/Key32Lib.dbg.json

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

package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json

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

package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.dbg.json

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

package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.dbg.json

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

package/artifacts/contracts/types/ReferralId.sol/ReferralIdLib.dbg.json

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

package/artifacts/contracts/types/RiskId.sol/RiskIdLib.dbg.json

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

package/artifacts/contracts/types/RoleId.sol/RoleIdLib.dbg.json

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

package/artifacts/contracts/types/StateId.sol/StateIdLib.dbg.json

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

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

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

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

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

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

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

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

@@ -41,6 +41,25 @@
       "stateMutability": "pure",
       "type": "function"
     },
+    {
+      "inputs": [
+        {
+          "internalType": "Version",
+          "name": "version",
+          "type": "uint24"
+        }
+      ],
+      "name": "toUint64",
+      "outputs": [
+        {
+          "internalType": "uint64",
+          "name": "",
+          "type": "uint64"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
+    },
     {
       "inputs": [
         {
@@ -70,6 +89,25 @@
       "stateMutability": "pure",
       "type": "function"
     },
+    {
+      "inputs": [
+        {
+          "internalType": "uint64",
+          "name": "versionNumber",
+          "type": "uint64"
+        }
+      ],
+      "name": "toVersion",
+      "outputs": [
+        {
+          "internalType": "Version",
+          "name": "",
+          "type": "uint24"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
+    },
     {
       "inputs": [
         {
@@ -132,8 +170,8 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x61030c61003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe730000000000000000000000000000000000000000301460806040526004361061006c5760003560e01c806304b8f6c5146100715780632efe01131461008d57806349a7111a146100a057806355601007146100d75780638e4ad86c146100fb578063c9e66e291461011e575b600080fd5b60005b60405162ffffff90911681526020015b60405180910390f35b61007461009b366004610213565b610135565b6100b36100ae36600461023f565b6101d6565b6040805160ff94851681529284166020840152921691810191909152606001610084565b6100ed6100e536600461023f565b62ffffff1690565b604051908152602001610084565b61010c61010936600461026b565b90565b60405160ff9091168152602001610084565b61010c61012c36600461023f565b60101c60ff1690565b600061010084108015610149575061010083105b8015610156575061010082105b6101b15760405162461bcd60e51b815260206004820152602260248201527f4552524f523a5652532d3031303a56455253494f4e5f504152545f544f4f5f42604482015261494760f01b606482015260840160405180910390fd5b816101c4600885901b601087901b61029a565b6101ce919061029a565b949350505050565b600080808360ff601082901c166101ed83836102b3565b915061ffff600883901c16600061020481856102b3565b92989197509195509350505050565b60008060006060848603121561022857600080fd5b505081359360208301359350604090920135919050565b60006020828403121561025157600080fd5b813562ffffff8116811461026457600080fd5b9392505050565b60006020828403121561027d57600080fd5b5035919050565b634e487b7160e01b600052601160045260246000fd5b808201808211156102ad576102ad610284565b92915050565b62ffffff8281168282160390808211156102cf576102cf610284565b509291505056fea2646970667358221220ba37649b9b622a7a14f84638f29a11cfa2b93f381baaceb770e1fea23e6fae7964736f6c63430008140033",
-  "deployedBytecode": "0x730000000000000000000000000000000000000000301460806040526004361061006c5760003560e01c806304b8f6c5146100715780632efe01131461008d57806349a7111a146100a057806355601007146100d75780638e4ad86c146100fb578063c9e66e291461011e575b600080fd5b60005b60405162ffffff90911681526020015b60405180910390f35b61007461009b366004610213565b610135565b6100b36100ae36600461023f565b6101d6565b6040805160ff94851681529284166020840152921691810191909152606001610084565b6100ed6100e536600461023f565b62ffffff1690565b604051908152602001610084565b61010c61010936600461026b565b90565b60405160ff9091168152602001610084565b61010c61012c36600461023f565b60101c60ff1690565b600061010084108015610149575061010083105b8015610156575061010082105b6101b15760405162461bcd60e51b815260206004820152602260248201527f4552524f523a5652532d3031303a56455253494f4e5f504152545f544f4f5f42604482015261494760f01b606482015260840160405180910390fd5b816101c4600885901b601087901b61029a565b6101ce919061029a565b949350505050565b600080808360ff601082901c166101ed83836102b3565b915061ffff600883901c16600061020481856102b3565b92989197509195509350505050565b60008060006060848603121561022857600080fd5b505081359360208301359350604090920135919050565b60006020828403121561025157600080fd5b813562ffffff8116811461026457600080fd5b9392505050565b60006020828403121561027d57600080fd5b5035919050565b634e487b7160e01b600052601160045260246000fd5b808201808211156102ad576102ad610284565b92915050565b62ffffff8281168282160390808211156102cf576102cf610284565b509291505056fea2646970667358221220ba37649b9b622a7a14f84638f29a11cfa2b93f381baaceb770e1fea23e6fae7964736f6c63430008140033",
+  "bytecode": "0x61039161003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100925760003560e01c80638e4ad86c116100655780638e4ad86c1461012157806394aa449c14610144578063a123b37c14610152578063c9e66e291461017957600080fd5b806304b8f6c5146100975780632efe0113146100b357806349a7111a146100c657806355601007146100fd575b600080fd5b60005b60405162ffffff90911681526020015b60405180910390f35b61009a6100c136600461026e565b610190565b6100d96100d436600461029a565b610231565b6040805160ff948516815292841660208401529216918101919091526060016100aa565b61011361010b36600461029a565b62ffffff1690565b6040519081526020016100aa565b61013261012f3660046102c6565b90565b60405160ff90911681526020016100aa565b61009a61012f3660046102df565b61016061010b36600461029a565b60405167ffffffffffffffff90911681526020016100aa565b61013261018736600461029a565b60101c60ff1690565b6000610100841080156101a4575061010083105b80156101b1575061010082105b61020c5760405162461bcd60e51b815260206004820152602260248201527f4552524f523a5652532d3031303a56455253494f4e5f504152545f544f4f5f42604482015261494760f01b606482015260840160405180910390fd5b8161021f600885901b601087901b61031f565b610229919061031f565b949350505050565b600080808360ff601082901c166102488383610338565b915061ffff600883901c16600061025f8185610338565b92989197509195509350505050565b60008060006060848603121561028357600080fd5b505081359360208301359350604090920135919050565b6000602082840312156102ac57600080fd5b813562ffffff811681146102bf57600080fd5b9392505050565b6000602082840312156102d857600080fd5b5035919050565b6000602082840312156102f157600080fd5b813567ffffffffffffffff811681146102bf57600080fd5b634e487b7160e01b600052601160045260246000fd5b8082018082111561033257610332610309565b92915050565b62ffffff82811682821603908082111561035457610354610309565b509291505056fea2646970667358221220e42f77cfda39708b26a423d08fb99d9e3d65c337357ab7291eb4fdfec94256eb64736f6c63430008140033",
+  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100925760003560e01c80638e4ad86c116100655780638e4ad86c1461012157806394aa449c14610144578063a123b37c14610152578063c9e66e291461017957600080fd5b806304b8f6c5146100975780632efe0113146100b357806349a7111a146100c657806355601007146100fd575b600080fd5b60005b60405162ffffff90911681526020015b60405180910390f35b61009a6100c136600461026e565b610190565b6100d96100d436600461029a565b610231565b6040805160ff948516815292841660208401529216918101919091526060016100aa565b61011361010b36600461029a565b62ffffff1690565b6040519081526020016100aa565b61013261012f3660046102c6565b90565b60405160ff90911681526020016100aa565b61009a61012f3660046102df565b61016061010b36600461029a565b60405167ffffffffffffffff90911681526020016100aa565b61013261018736600461029a565b60101c60ff1690565b6000610100841080156101a4575061010083105b80156101b1575061010082105b61020c5760405162461bcd60e51b815260206004820152602260248201527f4552524f523a5652532d3031303a56455253494f4e5f504152545f544f4f5f42604482015261494760f01b606482015260840160405180910390fd5b8161021f600885901b601087901b61031f565b610229919061031f565b949350505050565b600080808360ff601082901c166102488383610338565b915061ffff600883901c16600061025f8185610338565b92989197509195509350505050565b60008060006060848603121561028357600080fd5b505081359360208301359350604090920135919050565b6000602082840312156102ac57600080fd5b813562ffffff811681146102bf57600080fd5b9392505050565b6000602082840312156102d857600080fd5b5035919050565b6000602082840312156102f157600080fd5b813567ffffffffffffffff811681146102bf57600080fd5b634e487b7160e01b600052601160045260246000fd5b8082018082111561033257610332610309565b92915050565b62ffffff82811682821603908082111561035457610354610309565b509291505056fea2646970667358221220e42f77cfda39708b26a423d08fb99d9e3d65c337357ab7291eb4fdfec94256eb64736f6c63430008140033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }

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

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

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

@@ -23,8 +23,8 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x60b9610039600b82828239805160001a60731461002c57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe730000000000000000000000000000000000000000301460806040526004361060335760003560e01c8063ac43d834146038575b600080fd5b60496043366004605b565b60ff1690565b60405190815260200160405180910390f35b600060208284031215606c57600080fd5b813560ff81168114607c57600080fd5b939250505056fea2646970667358221220f9eff042249ef4290a2228b4a1d7046915ad93d6defe14b8c405ef07df444fa264736f6c63430008140033",
-  "deployedBytecode": "0x730000000000000000000000000000000000000000301460806040526004361060335760003560e01c8063ac43d834146038575b600080fd5b60496043366004605b565b60ff1690565b60405190815260200160405180910390f35b600060208284031215606c57600080fd5b813560ff81168114607c57600080fd5b939250505056fea2646970667358221220f9eff042249ef4290a2228b4a1d7046915ad93d6defe14b8c405ef07df444fa264736f6c63430008140033",
+  "bytecode": "0x60b9610039600b82828239805160001a60731461002c57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe730000000000000000000000000000000000000000301460806040526004361060335760003560e01c8063ac43d834146038575b600080fd5b60496043366004605b565b60ff1690565b60405190815260200160405180910390f35b600060208284031215606c57600080fd5b813560ff81168114607c57600080fd5b939250505056fea264697066735822122028c6578af7cf354c26921be53c7bafd817914c3fa380a53d5f0e3935a1b47c8b64736f6c63430008140033",
+  "deployedBytecode": "0x730000000000000000000000000000000000000000301460806040526004361060335760003560e01c8063ac43d834146038575b600080fd5b60496043366004605b565b60ff1690565b60405190815260200160405180910390f35b600060208284031215606c57600080fd5b813560ff81168114607c57600080fd5b939250505056fea264697066735822122028c6578af7cf354c26921be53c7bafd817914c3fa380a53d5f0e3935a1b47c8b64736f6c63430008140033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }

package/contracts/components/BaseComponent.sol

@@ -1,20 +1,18 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.19;
+pragma solidity ^0.8.20;
 
-import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
+import {IERC20Metadata} from "@openzeppelin5/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 
-import {IRegisterable} from "../shared/IRegisterable.sol";
 import {Registerable} from "../shared/Registerable.sol";
 
 import {IRegistry} from "../registry/IRegistry.sol";
 import {IInstance} from "../instance/IInstance.sol";
 
 import {IInstance} from "../instance/IInstance.sol";
-import {IComponent, IComponentModule} from "../instance/module/component/IComponent.sol";
 import {IComponentOwnerService} from "../instance/service/IComponentOwnerService.sol";
 import {IBaseComponent} from "./IBaseComponent.sol";
-import {Fee, FeeLib} from "../types/Fee.sol";
 import {NftId} from "../types/NftId.sol";
+import {ObjectType} from "../types/ObjectType.sol";
 
 abstract contract BaseComponent is
     Registerable,
@@ -26,17 +24,20 @@ abstract contract BaseComponent is
     address internal _wallet;
     IERC20Metadata internal _token;
     IInstance internal _instance;
-    bool internal _isRegistered;
-    Fee internal _zeroFee;
 
     constructor(
         address registry,
         NftId instanceNftId,
-        address token
+        address token,
+        ObjectType componentType,
+        bool isInterceptor,
+        address initialOwner
     )
-        Registerable(registry, instanceNftId)
     {
-        IRegistry.ObjectInfo memory instanceInfo = _registry.getObjectInfo(instanceNftId);
+        bytes memory data = "";
+        _initializeRegisterable(registry, instanceNftId, componentType, isInterceptor, initialOwner, data);
+
+        IRegistry.ObjectInfo memory instanceInfo = getRegistry().getObjectInfo(instanceNftId);
         _instance = IInstance(instanceInfo.objectAddress);
         require(
             _instance.supportsInterface(type(IInstance).interfaceId),
@@ -46,24 +47,8 @@ abstract contract BaseComponent is
         _componentOwnerService = _instance.getComponentOwnerService();
         _wallet = address(this);
         _token = IERC20Metadata(token);
-        _isRegistered = false;
-        _zeroFee = FeeLib.zeroFee();
-    }
-
-    // from registerable
-    function register() public override(IRegisterable, Registerable) returns (NftId componentId) {
-        require(msg.sender == getOwner(), "");
-        require(
-            address(_registry) != address(0),
-            "ERROR:COB-001:REGISTRY_ZERO"
-        );
-        require(
-            _registry.isRegistered(address(_instance)),
-            "ERROR:COB:INSTANCE_NOT_REGISTERED"
-        );
 
-        _isRegistered = true;
-        return _componentOwnerService.register(this);
+        _registerInterface(type(IBaseComponent).interfaceId);
     }
 
     // from component contract

package/contracts/components/Distribution.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.19;
 
-import {ObjectType, DISTRIBUTION} from "../types/ObjectType.sol";
+import {DISTRIBUTION} from "../types/ObjectType.sol";
 import {IDistributionService} from "../instance/service/IDistributionService.sol";
 import {IProductService} from "../instance/service/IProductService.sol";
 import {NftId} from "../types/NftId.sol";
@@ -9,6 +9,9 @@ import {ReferralId} from "../types/ReferralId.sol";
 import {Fee, FeeLib} from "../types/Fee.sol";
 import {BaseComponent} from "./BaseComponent.sol";
 import {IDistributionComponent} from "./IDistributionComponent.sol";
+import {IRegistry} from "../registry/IRegistry.sol";
+import {IRegisterable} from "../shared/IRegisterable.sol";
+import {Registerable} from "../shared/Registerable.sol";
 
 contract Distribution is
     BaseComponent,
@@ -34,15 +37,18 @@ contract Distribution is
         // TODO refactor into tokenNftId
         address token,
         bool verifying,
-        Fee memory distributionFee
+        Fee memory distributionFee,
+        address initialOwner
     )
-        BaseComponent(registry, instanceNftId, token)
+        BaseComponent(registry, instanceNftId, token, DISTRIBUTION(), true, initialOwner)
     {
         _isVerifying = verifying;
         _initialDistributionFee = distributionFee;
 
         _distributionService = _instance.getDistributionService();
         _productService = _instance.getProductService();
+
+        _registerInterface(type(IDistributionComponent).interfaceId);
     }
 
 
@@ -125,8 +131,25 @@ contract Distribution is
         return _isVerifying;
     }
 
-    // from registerable
-    function getType() public pure override returns (ObjectType) {
-        return DISTRIBUTION();
+    // from IRegisterable
+
+    function getInitialInfo() 
+        public 
+        view
+        override (IRegisterable, Registerable)
+        returns(IRegistry.ObjectInfo memory, bytes memory)
+    {
+        (
+            IRegistry.ObjectInfo memory info, 
+            bytes memory data
+        ) = super.getInitialInfo();
+
+        return (
+            info,
+            abi.encode(
+                _initialDistributionFee,
+                _isVerifying
+            )
+        );
     }
 }

package/contracts/components/IBaseComponent.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.19;
+pragma solidity ^0.8.20;
 
-import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
+import {IERC20Metadata} from "@openzeppelin5/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 
 import {IRegisterable} from "../shared/IRegisterable.sol";
 import {IInstanceLinked} from "../instance/IInstanceLinked.sol";

package/contracts/components/IPoolComponent.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.19;
+pragma solidity ^0.8.20;
 
 import {NftId} from "../types/NftId.sol";
 import {Fee} from "../types/Fee.sol";
@@ -60,12 +60,6 @@ interface IPoolComponent is IBaseComponent {
 
     function getCollateralizationLevel() external view returns (UFixed collateralizationLevel);
 
-    function getPoolFee() external view returns (Fee memory poolFee);
+    function getFees() external view returns (Fee memory poolFee, Fee memory stakingFee, Fee memory performanceFee);
 
-    function getStakingFee() external view returns (Fee memory stakingFee);
-
-    function getPerformanceFee()
-        external
-        view
-        returns (Fee memory performanceFee);
 }

package/contracts/components/IProductComponent.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.19;
+pragma solidity ^0.8.20;
 
 import {Fee} from "../types/Fee.sol";
 import {NftId} from "../types/NftId.sol";
@@ -9,6 +9,7 @@ import {RiskId} from "../types/RiskId.sol";
 import {IBaseComponent} from "./IBaseComponent.sol";
 
 interface IProductComponent is IBaseComponent {
+
     function setFees(
         Fee memory productFee,
         Fee memory processingFee