@etherisc/gif-next 0.0.2-d5522f6-712 → 0.0.2-d5b7b78-706

package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/259bf223b7f6fbb107e68b29f5f6d212.json"
+  "buildInfo": "../../../build-info/95371df5f28c49f1193e96df62dcfc87.json"
 }

package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.json

@@ -3,11 +3,6 @@
   "contractName": "ObjectManager",
   "sourceName": "contracts/instance/ObjectManager.sol",
   "abi": [
-    {
-      "inputs": [],
-      "stateMutability": "nonpayable",
-      "type": "constructor"
-    },
     {
       "inputs": [
         {
@@ -46,6 +41,11 @@
       "name": "AccessManagedUnauthorized",
       "type": "error"
     },
+    {
+      "inputs": [],
+      "name": "CloneableAuthorityZero",
+      "type": "error"
+    },
     {
       "inputs": [
         {
@@ -142,16 +142,10 @@
     {
       "anonymous": false,
       "inputs": [
-        {
-          "indexed": false,
-          "internalType": "NftId",
-          "name": "instanceNftId",
-          "type": "uint96"
-        },
         {
           "indexed": false,
           "internalType": "address",
-          "name": "instanceReader",
+          "name": "instance",
           "type": "address"
         }
       ],
@@ -173,23 +167,10 @@
     },
     {
       "inputs": [],
-      "name": "getInstanceNftId",
+      "name": "getInstance",
       "outputs": [
         {
-          "internalType": "NftId",
-          "name": "",
-          "type": "uint96"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "getInstanceReader",
-      "outputs": [
-        {
-          "internalType": "contract InstanceReader",
+          "internalType": "contract IInstance",
           "name": "",
           "type": "address"
         }
@@ -232,18 +213,8 @@
       "inputs": [
         {
           "internalType": "address",
-          "name": "authority",
-          "type": "address"
-        },
-        {
-          "internalType": "address",
-          "name": "registry",
+          "name": "instanceAddress",
           "type": "address"
-        },
-        {
-          "internalType": "NftId",
-          "name": "instanceNftId",
-          "type": "uint96"
         }
       ],
       "name": "initialize",
@@ -278,8 +249,8 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x608060405234801561001057600080fd5b50600080546001600160a01b0319169055600380546001600160601b031690556109a98061003f6000396000f3fe608060405234801561001057600080fd5b50600436106100885760003560e01c80637e7986691161005b5780637e798669146100f75780638fb3603714610112578063bf7e214f14610133578063c861c2501461015157600080fd5b806302cd30711461008d578063485cc955146100be5780635ab1bd53146100d35780637a9e5e4b146100e4575b600080fd5b600354600160601b90046001600160a01b03165b6040516001600160a01b0390911681526020015b60405180910390f35b6100d16100cc366004610675565b610164565b005b6000546001600160a01b03166100a1565b6100d16100f23660046106ae565b61030b565b6003546040516001600160601b0390911681526020016100b5565b61011a6103a9565b6040516001600160e01b031990911681526020016100b5565b600080516020610954833981519152546001600160a01b03166100a1565b6100d161015f3660046106e7565b6103e2565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a008054600160401b810460ff16159067ffffffffffffffff166000811580156101aa5750825b905060008267ffffffffffffffff1660011480156101c75750303b155b9050811580156101d5575080155b156101f35760405163f92ee8a960e01b815260040160405180910390fd5b845467ffffffffffffffff19166001178555831561021d57845460ff60401b1916600160401b1785555b6102268761058f565b856001600160a01b03163b6000036102615760405163071669cf60e21b81526001600160a01b03871660048201526024015b60405180910390fd5b600080546001600160a01b0319166001600160a01b0388811691821790925560408051928a16835260208301919091527fa6804c76412ae2d729353ed187a48b0b95177ee5c111049b80878fd127224412910160405180910390a1831561030257845460ff60401b19168555604051600181527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a15b50505050505050565b3361032b600080516020610954833981519152546001600160a01b031690565b6001600160a01b0316816001600160a01b0316146103665760405162d1953b60e31b81526001600160a01b0382166004820152602401610258565b816001600160a01b03163b60000361039c576040516361798f2f60e11b81526001600160a01b0383166004820152602401610258565b6103a5826105a3565b5050565b600080516020610954833981519152805460009190600160a01b900460ff166103d35760006103dc565b638fb3603760e01b5b91505090565b6103ec8383610164565b600080546040516305247a1760e51b81526001600160601b03841660048201526001600160a01b039091169063a48f42e090602401600060405180830381865afa15801561043e573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526104669190810190610863565b90506104848160400151610478604690565b60ff9081169116141590565b156104ad57604051632295742160e21b81526001600160601b0383166004820152602401610258565b600081608001519050806001600160a01b03166302cd30716040518163ffffffff1660e01b8152600401602060405180830381865afa1580156104f4573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105189190610936565b6001600160601b0384166001600160a01b03918216600160601b9081026bffffffffffffffffffffffff1916821760038190556040805193845291900490921660208201527fc23472ef19cd3719232c2fbc22eb87b48424eba43454acefd67a6578fda49d90910160405180910390a15050505050565b610597610604565b6105a08161064f565b50565b60008051602061095483398151915280546001600160a01b0383166001600160a01b03199091168117825560408051918252517f2f658b440c35314f52658ea8a740e05b284cdc84dc9ae01e891f21b8933e7cad9181900360200190a15050565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a0054600160401b900460ff1661064d57604051631afcd79f60e31b815260040160405180910390fd5b565b610657610604565b6105a0816105a3565b6001600160a01b03811681146105a057600080fd5b6000806040838503121561068857600080fd5b823561069381610660565b915060208301356106a381610660565b809150509250929050565b6000602082840312156106c057600080fd5b81356106cb81610660565b9392505050565b6001600160601b03811681146105a057600080fd5b6000806000606084860312156106fc57600080fd5b833561070781610660565b9250602084013561071781610660565b91506040840135610727816106d2565b809150509250925092565b634e487b7160e01b600052604160045260246000fd5b60405160e0810167ffffffffffffffff8111828210171561076b5761076b610732565b60405290565b604051601f8201601f1916810167ffffffffffffffff8111828210171561079a5761079a610732565b604052919050565b80516107ad816106d2565b919050565b805160ff811681146107ad57600080fd5b805180151581146107ad57600080fd5b80516107ad81610660565b600082601f8301126107ef57600080fd5b815167ffffffffffffffff81111561080957610809610732565b602061081d601f8301601f19168201610771565b828152858284870101111561083157600080fd5b60005b8381101561084f578581018301518282018401528201610834565b506000928101909101919091529392505050565b60006020828403121561087557600080fd5b815167ffffffffffffffff8082111561088d57600080fd5b9083019060e082860312156108a157600080fd5b6108a9610748565b6108b2836107a2565b81526108c0602084016107a2565b60208201526108d1604084016107b2565b60408201526108e2606084016107c3565b60608201526108f3608084016107d3565b608082015261090460a084016107d3565b60a082015260c08301518281111561091b57600080fd5b610927878286016107de565b60c08301525095945050505050565b60006020828403121561094857600080fd5b81516106cb8161066056fef3177357ab46d8af007ab3fdb9af81da189e1068fefdc0073dca88a2cab40a00a26469706673582212200cbe34b79c4fe6f613ddec589f97d2a71c3e97599f294c99f82ac764a470e9d964736f6c63430008140033",
-  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100885760003560e01c80637e7986691161005b5780637e798669146100f75780638fb3603714610112578063bf7e214f14610133578063c861c2501461015157600080fd5b806302cd30711461008d578063485cc955146100be5780635ab1bd53146100d35780637a9e5e4b146100e4575b600080fd5b600354600160601b90046001600160a01b03165b6040516001600160a01b0390911681526020015b60405180910390f35b6100d16100cc366004610675565b610164565b005b6000546001600160a01b03166100a1565b6100d16100f23660046106ae565b61030b565b6003546040516001600160601b0390911681526020016100b5565b61011a6103a9565b6040516001600160e01b031990911681526020016100b5565b600080516020610954833981519152546001600160a01b03166100a1565b6100d161015f3660046106e7565b6103e2565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a008054600160401b810460ff16159067ffffffffffffffff166000811580156101aa5750825b905060008267ffffffffffffffff1660011480156101c75750303b155b9050811580156101d5575080155b156101f35760405163f92ee8a960e01b815260040160405180910390fd5b845467ffffffffffffffff19166001178555831561021d57845460ff60401b1916600160401b1785555b6102268761058f565b856001600160a01b03163b6000036102615760405163071669cf60e21b81526001600160a01b03871660048201526024015b60405180910390fd5b600080546001600160a01b0319166001600160a01b0388811691821790925560408051928a16835260208301919091527fa6804c76412ae2d729353ed187a48b0b95177ee5c111049b80878fd127224412910160405180910390a1831561030257845460ff60401b19168555604051600181527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a15b50505050505050565b3361032b600080516020610954833981519152546001600160a01b031690565b6001600160a01b0316816001600160a01b0316146103665760405162d1953b60e31b81526001600160a01b0382166004820152602401610258565b816001600160a01b03163b60000361039c576040516361798f2f60e11b81526001600160a01b0383166004820152602401610258565b6103a5826105a3565b5050565b600080516020610954833981519152805460009190600160a01b900460ff166103d35760006103dc565b638fb3603760e01b5b91505090565b6103ec8383610164565b600080546040516305247a1760e51b81526001600160601b03841660048201526001600160a01b039091169063a48f42e090602401600060405180830381865afa15801561043e573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526104669190810190610863565b90506104848160400151610478604690565b60ff9081169116141590565b156104ad57604051632295742160e21b81526001600160601b0383166004820152602401610258565b600081608001519050806001600160a01b03166302cd30716040518163ffffffff1660e01b8152600401602060405180830381865afa1580156104f4573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105189190610936565b6001600160601b0384166001600160a01b03918216600160601b9081026bffffffffffffffffffffffff1916821760038190556040805193845291900490921660208201527fc23472ef19cd3719232c2fbc22eb87b48424eba43454acefd67a6578fda49d90910160405180910390a15050505050565b610597610604565b6105a08161064f565b50565b60008051602061095483398151915280546001600160a01b0383166001600160a01b03199091168117825560408051918252517f2f658b440c35314f52658ea8a740e05b284cdc84dc9ae01e891f21b8933e7cad9181900360200190a15050565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a0054600160401b900460ff1661064d57604051631afcd79f60e31b815260040160405180910390fd5b565b610657610604565b6105a0816105a3565b6001600160a01b03811681146105a057600080fd5b6000806040838503121561068857600080fd5b823561069381610660565b915060208301356106a381610660565b809150509250929050565b6000602082840312156106c057600080fd5b81356106cb81610660565b9392505050565b6001600160601b03811681146105a057600080fd5b6000806000606084860312156106fc57600080fd5b833561070781610660565b9250602084013561071781610660565b91506040840135610727816106d2565b809150509250925092565b634e487b7160e01b600052604160045260246000fd5b60405160e0810167ffffffffffffffff8111828210171561076b5761076b610732565b60405290565b604051601f8201601f1916810167ffffffffffffffff8111828210171561079a5761079a610732565b604052919050565b80516107ad816106d2565b919050565b805160ff811681146107ad57600080fd5b805180151581146107ad57600080fd5b80516107ad81610660565b600082601f8301126107ef57600080fd5b815167ffffffffffffffff81111561080957610809610732565b602061081d601f8301601f19168201610771565b828152858284870101111561083157600080fd5b60005b8381101561084f578581018301518282018401528201610834565b506000928101909101919091529392505050565b60006020828403121561087557600080fd5b815167ffffffffffffffff8082111561088d57600080fd5b9083019060e082860312156108a157600080fd5b6108a9610748565b6108b2836107a2565b81526108c0602084016107a2565b60208201526108d1604084016107b2565b60408201526108e2606084016107c3565b60608201526108f3608084016107d3565b608082015261090460a084016107d3565b60a082015260c08301518281111561091b57600080fd5b610927878286016107de565b60c08301525095945050505050565b60006020828403121561094857600080fd5b81516106cb8161066056fef3177357ab46d8af007ab3fdb9af81da189e1068fefdc0073dca88a2cab40a00a26469706673582212200cbe34b79c4fe6f613ddec589f97d2a71c3e97599f294c99f82ac764a470e9d964736f6c63430008140033",
+  "bytecode": "0x608060405234801561001057600080fd5b50600080546001600160a01b03191690556106b9806100306000396000f3fe608060405234801561001057600080fd5b506004361061007d5760003560e01c80638fb360371161005b5780638fb36037146100d4578063bf7e214f146100f5578063c4d66de814610113578063de7b5d141461012657600080fd5b8063485cc955146100825780635ab1bd53146100975780637a9e5e4b146100c1575b600080fd5b6100956100903660046105e9565b610137565b005b6000546001600160a01b03165b6040516001600160a01b0390911681526020015b60405180910390f35b6100956100cf366004610622565b61020a565b6100dc6102a8565b6040516001600160e01b031990911681526020016100b8565b600080516020610664833981519152546001600160a01b03166100a4565b610095610121366004610622565b6102e1565b6003546001600160a01b03166100a4565b61013f61050a565b6001600160a01b0382166101665760405163e639886560e01b815260040160405180910390fd5b61016f82610555565b806001600160a01b03163b6000036101aa5760405163071669cf60e21b81526001600160a01b03821660048201526024015b60405180910390fd5b600080546001600160a01b0319166001600160a01b0383811691821790925560408051928516835260208301919091527fa6804c76412ae2d729353ed187a48b0b95177ee5c111049b80878fd12722441291015b60405180910390a15050565b3361022a600080516020610664833981519152546001600160a01b031690565b6001600160a01b0316816001600160a01b0316146102655760405162d1953b60e31b81526001600160a01b03821660048201526024016101a1565b816001600160a01b03163b60000361029b576040516361798f2f60e11b81526001600160a01b03831660048201526024016101a1565b6102a482610569565b5050565b600080516020610664833981519152805460009190600160a01b900460ff166102d25760006102db565b638fb3603760e01b5b91505090565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a008054600160401b810460ff16159067ffffffffffffffff166000811580156103275750825b905060008267ffffffffffffffff1660011480156103445750303b155b905081158015610352575080155b156103705760405163f92ee8a960e01b815260040160405180910390fd5b845467ffffffffffffffff19166001178555831561039a57845460ff60401b1916600160401b1785555b6000869050610466816001600160a01b031663bf7e214f6040518163ffffffff1660e01b8152600401602060405180830381865afa1580156103e0573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104049190610646565b826001600160a01b031663f21de1e86040518163ffffffff1660e01b8152600401602060405180830381865afa158015610442573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906100909190610646565b600380546001600160a01b0319166001600160a01b038381169190911790915560405190881681527fe89455dcb69bf4efd41cbb10c8064808f360b87b03ae8c96349c71f4934ffa0f9060200160405180910390a150831561050257845460ff60401b19168555604051600181527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a15b505050505050565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a0054600160401b900460ff1661055357604051631afcd79f60e31b815260040160405180910390fd5b565b61055d61050a565b610566816105c3565b50565b60008051602061066483398151915280546001600160a01b0319166001600160a01b03831690811782556040519081527f2f658b440c35314f52658ea8a740e05b284cdc84dc9ae01e891f21b8933e7cad906020016101fe565b6105cb61050a565b61056681610569565b6001600160a01b038116811461056657600080fd5b600080604083850312156105fc57600080fd5b8235610607816105d4565b91506020830135610617816105d4565b809150509250929050565b60006020828403121561063457600080fd5b813561063f816105d4565b9392505050565b60006020828403121561065857600080fd5b815161063f816105d456fef3177357ab46d8af007ab3fdb9af81da189e1068fefdc0073dca88a2cab40a00a2646970667358221220379eef4a0c4272b36536933847484a46501a49275078fe85b2bfb2dbb86aa23764736f6c63430008140033",
+  "deployedBytecode": "0x608060405234801561001057600080fd5b506004361061007d5760003560e01c80638fb360371161005b5780638fb36037146100d4578063bf7e214f146100f5578063c4d66de814610113578063de7b5d141461012657600080fd5b8063485cc955146100825780635ab1bd53146100975780637a9e5e4b146100c1575b600080fd5b6100956100903660046105e9565b610137565b005b6000546001600160a01b03165b6040516001600160a01b0390911681526020015b60405180910390f35b6100956100cf366004610622565b61020a565b6100dc6102a8565b6040516001600160e01b031990911681526020016100b8565b600080516020610664833981519152546001600160a01b03166100a4565b610095610121366004610622565b6102e1565b6003546001600160a01b03166100a4565b61013f61050a565b6001600160a01b0382166101665760405163e639886560e01b815260040160405180910390fd5b61016f82610555565b806001600160a01b03163b6000036101aa5760405163071669cf60e21b81526001600160a01b03821660048201526024015b60405180910390fd5b600080546001600160a01b0319166001600160a01b0383811691821790925560408051928516835260208301919091527fa6804c76412ae2d729353ed187a48b0b95177ee5c111049b80878fd12722441291015b60405180910390a15050565b3361022a600080516020610664833981519152546001600160a01b031690565b6001600160a01b0316816001600160a01b0316146102655760405162d1953b60e31b81526001600160a01b03821660048201526024016101a1565b816001600160a01b03163b60000361029b576040516361798f2f60e11b81526001600160a01b03831660048201526024016101a1565b6102a482610569565b5050565b600080516020610664833981519152805460009190600160a01b900460ff166102d25760006102db565b638fb3603760e01b5b91505090565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a008054600160401b810460ff16159067ffffffffffffffff166000811580156103275750825b905060008267ffffffffffffffff1660011480156103445750303b155b905081158015610352575080155b156103705760405163f92ee8a960e01b815260040160405180910390fd5b845467ffffffffffffffff19166001178555831561039a57845460ff60401b1916600160401b1785555b6000869050610466816001600160a01b031663bf7e214f6040518163ffffffff1660e01b8152600401602060405180830381865afa1580156103e0573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104049190610646565b826001600160a01b031663f21de1e86040518163ffffffff1660e01b8152600401602060405180830381865afa158015610442573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906100909190610646565b600380546001600160a01b0319166001600160a01b038381169190911790915560405190881681527fe89455dcb69bf4efd41cbb10c8064808f360b87b03ae8c96349c71f4934ffa0f9060200160405180910390a150831561050257845460ff60401b19168555604051600181527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a15b505050505050565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a0054600160401b900460ff1661055357604051631afcd79f60e31b815260040160405180910390fd5b565b61055d61050a565b610566816105c3565b50565b60008051602061066483398151915280546001600160a01b0319166001600160a01b03831690811782556040519081527f2f658b440c35314f52658ea8a740e05b284cdc84dc9ae01e891f21b8933e7cad906020016101fe565b6105cb61050a565b61056681610569565b6001600160a01b038116811461056657600080fd5b600080604083850312156105fc57600080fd5b8235610607816105d4565b91506020830135610617816105d4565b809150509250929050565b60006020828403121561063457600080fd5b813561063f816105d4565b9392505050565b60006020828403121561065857600080fd5b815161063f816105d456fef3177357ab46d8af007ab3fdb9af81da189e1068fefdc0073dca88a2cab40a00a2646970667358221220379eef4a0c4272b36536933847484a46501a49275078fe85b2bfb2dbb86aa23764736f6c63430008140033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }

package/artifacts/contracts/instance/base/ComponentService.sol/ComponentService.dbg.json

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

package/artifacts/contracts/instance/base/{ComponentServiceBase.sol/ComponentServiceBase.json → ComponentService.sol/ComponentService.json}

@@ -1,125 +1,167 @@
 {
   "_format": "hh-sol-artifact-1",
-  "contractName": "ComponentServiceBase",
-  "sourceName": "contracts/instance/base/ComponentServiceBase.sol",
+  "contractName": "ComponentService",
+  "sourceName": "contracts/instance/base/ComponentService.sol",
   "abi": [
     {
       "inputs": [
         {
-          "internalType": "ObjectType",
-          "name": "componentType",
-          "type": "uint8"
+          "internalType": "address",
+          "name": "component",
+          "type": "address"
+        },
+        {
+          "internalType": "NftId",
+          "name": "nftId",
+          "type": "uint96"
         }
       ],
-      "name": "ComponentTypeInvalid",
+      "name": "ErrorComponentServiceAlreadyRegistered",
       "type": "error"
     },
     {
       "inputs": [
         {
           "internalType": "address",
-          "name": "registry",
+          "name": "component",
           "type": "address"
-        },
-        {
-          "internalType": "NftId",
-          "name": "nftId",
-          "type": "uint96"
         }
       ],
-      "name": "ErrorAlreadyLinked",
+      "name": "ErrorComponentServiceComponentLocked",
       "type": "error"
     },
     {
       "inputs": [
+        {
+          "internalType": "NftId",
+          "name": "instanceNftId",
+          "type": "uint96"
+        },
+        {
+          "internalType": "RoleId",
+          "name": "requiredRole",
+          "type": "uint64"
+        },
         {
           "internalType": "address",
-          "name": "componentAddress",
+          "name": "sender",
           "type": "address"
         }
       ],
-      "name": "ErrorComponentServiceBaseComponentLocked",
+      "name": "ErrorComponentServiceExpectedRoleMissing",
       "type": "error"
     },
     {
       "inputs": [
         {
           "internalType": "address",
-          "name": "contractAddress",
+          "name": "component",
           "type": "address"
+        },
+        {
+          "internalType": "ObjectType",
+          "name": "requiredType",
+          "type": "uint8"
+        },
+        {
+          "internalType": "ObjectType",
+          "name": "componentType",
+          "type": "uint8"
         }
       ],
-      "name": "ErrorContractNotRegistered",
+      "name": "ErrorComponentServiceInvalidType",
       "type": "error"
     },
     {
       "inputs": [
         {
           "internalType": "address",
-          "name": "account",
+          "name": "component",
           "type": "address"
         }
       ],
-      "name": "ErrorNotOwner",
+      "name": "ErrorComponentServiceNotComponent",
       "type": "error"
     },
     {
       "inputs": [
         {
           "internalType": "address",
-          "name": "registryAddress",
+          "name": "component",
+          "type": "address"
+        },
+        {
+          "internalType": "address",
+          "name": "initialOwner",
+          "type": "address"
+        },
+        {
+          "internalType": "address",
+          "name": "sender",
           "type": "address"
         }
       ],
-      "name": "ErrorNotRegistry",
+      "name": "ErrorComponentServiceSenderNotOwner",
       "type": "error"
     },
     {
       "inputs": [
         {
           "internalType": "address",
-          "name": "registryAddress",
+          "name": "caller",
           "type": "address"
         }
       ],
-      "name": "ErrorRegisterableNotRegistry",
+      "name": "ErrorIServiceCallerUnknown",
       "type": "error"
     },
     {
-      "inputs": [],
-      "name": "ErrorRegistryAddressZero",
+      "inputs": [
+        {
+          "internalType": "NftId",
+          "name": "nftId",
+          "type": "uint96"
+        }
+      ],
+      "name": "ErrorNftOwnableAlreadyLinked",
       "type": "error"
     },
     {
       "inputs": [
         {
           "internalType": "address",
-          "name": "registry",
+          "name": "contractAddress",
           "type": "address"
         }
       ],
-      "name": "ErrorRegistryAlreadyInitialized",
+      "name": "ErrorNftOwnableContractNotRegistered",
       "type": "error"
     },
     {
       "inputs": [],
-      "name": "ErrorRegistryNotInitialized",
+      "name": "ErrorNftOwnableInitialOwnerZero",
       "type": "error"
     },
     {
       "inputs": [
         {
-          "internalType": "RoleId",
-          "name": "expected",
-          "type": "uint64"
-        },
+          "internalType": "address",
+          "name": "account",
+          "type": "address"
+        }
+      ],
+      "name": "ErrorNftOwnableNotOwner",
+      "type": "error"
+    },
+    {
+      "inputs": [
         {
           "internalType": "address",
-          "name": "caller",
+          "name": "registryAddress",
           "type": "address"
         }
       ],
-      "name": "ExpectedRoleMissing",
+      "name": "ErrorNotRegistry",
       "type": "error"
     },
     {
@@ -146,29 +188,17 @@
       "type": "event"
     },
     {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": false,
-          "internalType": "Version",
-          "name": "version",
-          "type": "uint24"
-        },
-        {
-          "indexed": false,
-          "internalType": "address",
-          "name": "implementation",
-          "type": "address"
-        },
+      "inputs": [],
+      "name": "NFT_OWNABLE_STORAGE_LOCATION_V1",
+      "outputs": [
         {
-          "indexed": false,
-          "internalType": "address",
-          "name": "activatedBy",
-          "type": "address"
+          "internalType": "bytes32",
+          "name": "",
+          "type": "bytes32"
         }
       ],
-      "name": "LogVersionableInitialized",
-      "type": "event"
+      "stateMutability": "view",
+      "type": "function"
     },
     {
       "inputs": [],
@@ -239,26 +269,8 @@
             }
           ],
           "internalType": "struct IRegistry.ObjectInfo",
-          "name": "",
+          "name": "info",
           "type": "tuple"
-        },
-        {
-          "internalType": "bytes",
-          "name": "data",
-          "type": "bytes"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "getInitializedVersion",
-      "outputs": [
-        {
-          "internalType": "uint64",
-          "name": "",
-          "type": "uint64"
         }
       ],
       "stateMutability": "view",
@@ -331,10 +343,10 @@
     },
     {
       "inputs": [],
-      "name": "getRegistryService",
+      "name": "getRegistryAddress",
       "outputs": [
         {
-          "internalType": "contract IRegistryService",
+          "internalType": "address",
           "name": "",
           "type": "address"
         }
@@ -344,25 +356,19 @@
     },
     {
       "inputs": [],
-      "name": "getVersion",
+      "name": "getRegistryService",
       "outputs": [
         {
-          "internalType": "Version",
+          "internalType": "contract IRegistryService",
           "name": "",
-          "type": "uint24"
+          "type": "address"
         }
       ],
-      "stateMutability": "pure",
+      "stateMutability": "view",
       "type": "function"
     },
     {
-      "inputs": [
-        {
-          "internalType": "uint256",
-          "name": "idx",
-          "type": "uint256"
-        }
-      ],
+      "inputs": [],
       "name": "getVersion",
       "outputs": [
         {
@@ -371,87 +377,68 @@
           "type": "uint24"
         }
       ],
-      "stateMutability": "view",
+      "stateMutability": "pure",
       "type": "function"
     },
     {
       "inputs": [],
-      "name": "getVersionCount",
-      "outputs": [
-        {
-          "internalType": "uint256",
-          "name": "",
-          "type": "uint256"
-        }
-      ],
-      "stateMutability": "view",
+      "name": "initializeERC165",
+      "outputs": [],
+      "stateMutability": "nonpayable",
       "type": "function"
     },
     {
       "inputs": [
         {
-          "internalType": "Version",
-          "name": "_version",
-          "type": "uint24"
-        }
-      ],
-      "name": "getVersionInfo",
-      "outputs": [
+          "internalType": "address",
+          "name": "initialOwner",
+          "type": "address"
+        },
         {
-          "components": [
-            {
-              "internalType": "Version",
-              "name": "version",
-              "type": "uint24"
-            },
-            {
-              "internalType": "address",
-              "name": "implementation",
-              "type": "address"
-            },
-            {
-              "internalType": "address",
-              "name": "activatedBy",
-              "type": "address"
-            },
-            {
-              "internalType": "Timestamp",
-              "name": "activatedAt",
-              "type": "uint40"
-            },
-            {
-              "internalType": "Blocknumber",
-              "name": "activatedIn",
-              "type": "uint32"
-            }
-          ],
-          "internalType": "struct IVersionable.VersionInfo",
-          "name": "",
-          "type": "tuple"
+          "internalType": "address",
+          "name": "registryAddress",
+          "type": "address"
         }
       ],
-      "stateMutability": "view",
+      "name": "initializeNftOwnable",
+      "outputs": [],
+      "stateMutability": "nonpayable",
       "type": "function"
     },
     {
       "inputs": [
         {
           "internalType": "address",
-          "name": "implementation",
+          "name": "registryAddress",
           "type": "address"
         },
+        {
+          "internalType": "NftId",
+          "name": "parentNftId",
+          "type": "uint96"
+        },
+        {
+          "internalType": "ObjectType",
+          "name": "objectType",
+          "type": "uint8"
+        },
+        {
+          "internalType": "bool",
+          "name": "isInterceptor",
+          "type": "bool"
+        },
         {
           "internalType": "address",
-          "name": "activatedBy",
+          "name": "initialOwner",
           "type": "address"
         },
         {
           "internalType": "bytes",
-          "name": "data",
+          "name": "registryData",
           "type": "bytes"
         }
       ],
-      "name": "initialize",
+      "name": "initializeRegisterable",
       "outputs": [],
       "stateMutability": "nonpayable",
       "type": "function"
@@ -459,20 +446,50 @@
     {
       "inputs": [
         {
-          "internalType": "Version",
-          "name": "_version",
-          "type": "uint24"
+          "internalType": "address",
+          "name": "registryAddress",
+          "type": "address"
         }
       ],
-      "name": "isInitialized",
-      "outputs": [
+      "name": "initializeRegistryLinked",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [
         {
-          "internalType": "bool",
-          "name": "",
-          "type": "bool"
+          "internalType": "address",
+          "name": "registry",
+          "type": "address"
+        },
+        {
+          "internalType": "address",
+          "name": "initialOwner",
+          "type": "address"
         }
       ],
-      "stateMutability": "view",
+      "name": "initializeService",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "activatedBy",
+          "type": "address"
+        },
+        {
+          "internalType": "bytes",
+          "name": "data",
+          "type": "bytes"
+        }
+      ],
+      "name": "initializeVersionable",
+      "outputs": [],
+      "stateMutability": "nonpayable",
       "type": "function"
     },
     {
@@ -482,6 +499,19 @@
       "stateMutability": "nonpayable",
       "type": "function"
     },
+    {
+      "inputs": [
+        {
+          "internalType": "bytes4",
+          "name": "interfaceId",
+          "type": "bytes4"
+        }
+      ],
+      "name": "registerInterface",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
     {
       "inputs": [
         {
@@ -503,23 +533,13 @@
     },
     {
       "inputs": [
-        {
-          "internalType": "address",
-          "name": "implementation",
-          "type": "address"
-        },
-        {
-          "internalType": "address",
-          "name": "activatedBy",
-          "type": "address"
-        },
         {
           "internalType": "bytes",
           "name": "data",
           "type": "bytes"
         }
       ],
-      "name": "upgrade",
+      "name": "upgradeVersionable",
       "outputs": [],
       "stateMutability": "nonpayable",
       "type": "function"