@etherisc/gif-next 0.0.2-f15b559-661 → 0.0.2-f1b01e0-214

package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.dbg.json

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

package/artifacts/contracts/shared/ContractLib.sol/ContractLib.dbg.json

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

package/artifacts/contracts/shared/ContractLib.sol/ContractLib.json

@@ -381,6 +381,25 @@
       "stateMutability": "view",
       "type": "function"
     },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "target",
+          "type": "address"
+        }
+      ],
+      "name": "isAccessManaged",
+      "outputs": [
+        {
+          "internalType": "bool",
+          "name": "",
+          "type": "bool"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
     {
       "inputs": [
         {
@@ -472,6 +491,35 @@
       "stateMutability": "view",
       "type": "function"
     },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "registry",
+          "type": "address"
+        },
+        {
+          "internalType": "address",
+          "name": "caller",
+          "type": "address"
+        },
+        {
+          "internalType": "ObjectType",
+          "name": "expectedType",
+          "type": "uint8"
+        }
+      ],
+      "name": "isRegistered",
+      "outputs": [
+        {
+          "internalType": "bool",
+          "name": "",
+          "type": "bool"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
     {
       "inputs": [
         {
@@ -516,14 +564,18 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x61112c610034600b8282823980515f1a607314602857634e487b7160e01b5f525f60045260245ffd5b305f52607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100b1575f3560e01c80637d482da1116100795780637d482da114610148578063aa13a9881461015b578063b6bbad121461016e578063c52721a314610181578063ce64d28114610194578063d9057007146101bf575f80fd5b80630c21dea2146100b557806316279055146100de5780632330f247146101015780633334d16b146101145780635c990ed314610127575b5f80fd5b6100c86100c3366004610be8565b6101d2565b6040516100d59190610cde565b60405180910390f35b6100f16100ec366004610cf0565b610246565b60405190151581526020016100d5565b6100f161010f366004610cf0565b610263565b6100f1610122366004610cf0565b610289565b61013a610135366004610d26565b6102af565b6040516100d5929190610d7f565b6100f1610156366004610da8565b61033e565b61013a610169366004610ded565b6103c2565b6100f161017c366004610cf0565b61048f565b61013a61018f366004610e49565b6104a0565b6101a76101a2366004610e76565b61053c565b6040516001600160a01b0390911681526020016100d5565b6100f16101cd366004610ea2565b6106a4565b6101da610b94565b6101e483836106b6565b905061020281604001516101f6600390565b60ff9081169116141590565b15610240578051604080830151905163067e446760e31b81526001600160601b03909216600483015260ff1660248201526044015b60405180910390fd5b92915050565b5f6001600160a01b03821661025c57505f919050565b503b151590565b5f61026d82610246565b61027857505f919050565b610240826309990e3960e41b6106a4565b5f61029382610246565b61029e57505f919050565b61024082630398724f60e11b6106a4565b6102b7610b94565b5f6102c286866106b6565b91506102d982604001518560ff9081169116141590565b1561031a578151604080840151905163176bb19d60e21b81526001600160601b03909216600483015260ff8087166024840152166044820152606401610237565b6103248683610848565b90506103358186845f0151866109c3565b94509492505050565b604051634806e33f60e11b8152600481018390526001600160a01b03848116602483015260ff831660448301525f919086169063900dc67e90606401602060405180830381865afa158015610395573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906103b99190610eea565b95945050505050565b6103ca610b94565b5f6103d585856106b6565b91506103f282604001516103e7600c90565b60ff90811691161490565b80610408575061040882604001516103e7600f90565b8061041e575061041e82604001516103e7600e90565b80610434575061043482604001516103e7600d90565b61046c5781516040808401519051631df6ffe760e01b81526001600160601b03909216600483015260ff166024820152604401610237565b6104768583610848565b90506104878185845f0151866109c3565b935093915050565b5f61024082620b5ccf60e31b610ac1565b6104a8610b94565b6040516305247a1760e51b81526001600160601b03841660048201525f906001600160a01b0386169063a48f42e0906024015f60405180830381865afa1580156104f4573d5f803e3d5ffd5b505050506040513d5f823e601f3d908101601f1916820160405261051b9190810190610fee565b91506105278583610848565b9050610487818360800151845f0151866109c3565b60405163677d3feb60e11b81526001600160601b03821660048201525f9081906001600160a01b0385169063cefa7fd690602401602060405180830381865afa15801561058b573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906105af91906110c0565b60405163677d3feb60e11b81526001600160601b03821660048201529091505f906001600160a01b0386169063cefa7fd690602401602060405180830381865afa1580156105ff573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061062391906110c0565b6040516305247a1760e51b81526001600160601b03821660048201529091506001600160a01b0386169063a48f42e0906024015f60405180830381865afa158015610670573d5f803e3d5ffd5b505050506040513d5f823e601f3d908101601f191682016040526106979190810190610fee565b6080015195945050505050565b5f6106af8383610ac1565b9392505050565b6106be610b94565b604051632f2a35f760e11b81526001600160a01b0383811660048301525f9190851690635e546bee90602401602060405180830381865afa158015610705573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061072991906110c0565b604051630a4d29dd60e31b81526001600160601b038216600482015290915073__$94a2c899be079b00d952d0d84fffaa5c34$__906352694ee890602401602060405180830381865af4158015610782573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906107a69190610eea565b156107cf57604051630e8088a760e01b81526001600160a01b0384166004820152602401610237565b6040516305247a1760e51b81526001600160601b03821660048201526001600160a01b0385169063a48f42e0906024015f60405180830381865afa158015610819573d5f803e3d5ffd5b505050506040513d5f823e601f3d908101601f191682016040526108409190810190610fee565b949350505050565b5f61085982604001516103e7600c90565b156108da57602082015160405163bf8e179760e01b81526001600160601b0390911660048201526001600160a01b0384169063bf8e179790602401602060405180830381865afa1580156108af573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906108d391906110db565b9050610240565b60208201516040516305247a1760e51b81526001600160601b0390911660048201526001600160a01b0384169063bf8e179790829063a48f42e0906024015f60405180830381865afa158015610932573d5f803e3d5ffd5b505050506040513d5f823e601f3d908101601f191682016040526109599190810190610fee565b602001516040516001600160e01b031960e084901b1681526001600160601b039091166004820152602401602060405180830381865afa15801561099f573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906106af91906110db565b8015610abb57836001600160a01b031663311adb686040518163ffffffff1660e01b8152600401602060405180830381865afa158015610a05573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610a2991906110db565b604051629b7b3560e61b81526001600160a01b03858116600483015291909116906326decd4090602401602060405180830381865afa158015610a6e573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610a929190610eea565b15610abb57604051633a31890160e11b81526001600160601b0383166004820152602401610237565b50505050565b5f610acb83610adc565b80156106af57506106af8383610b0e565b5f610aee826301ffc9a760e01b610b0e565b80156102405750610b07826001600160e01b0319610b0e565b1592915050565b6040516001600160e01b0319821660248201525f90819060440160408051601f19818403018152919052602080820180516001600160e01b03166301ffc9a760e01b17815282519293505f9283928392909183918a617530fa92503d91505f519050828015610b7e575060208210155b8015610b8957505f81115b979650505050505050565b6040805160e0810182525f8082526020820181905291810182905260608082018390526080820183905260a082019290925260c081019190915290565b6001600160a01b0381168114610be5575f80fd5b50565b5f8060408385031215610bf9575f80fd5b8235610c0481610bd1565b91506020830135610c1481610bd1565b809150509250929050565b5f81518084528060208401602086015e5f602082860101526020601f19601f83011685010191505092915050565b6001600160601b0381511682526001600160601b03602082015116602083015260ff60408201511660408301525f6060820151610c8e606085018215159052565b506080820151610ca960808501826001600160a01b03169052565b5060a0820151610cc460a08501826001600160a01b03169052565b5060c082015160e060c085015261084060e0850182610c1f565b602081525f6106af6020830184610c4d565b5f60208284031215610d00575f80fd5b81356106af81610bd1565b60ff81168114610be5575f80fd5b8015158114610be5575f80fd5b5f805f8060808587031215610d39575f80fd5b8435610d4481610bd1565b93506020850135610d5481610bd1565b92506040850135610d6481610d0b565b91506060850135610d7481610d19565b939692955090935050565b604081525f610d916040830185610c4d565b905060018060a01b03831660208301529392505050565b5f805f8060808587031215610dbb575f80fd5b8435610dc681610bd1565b93506020850135610dd681610bd1565b9250604085013591506060850135610d7481610d0b565b5f805f60608486031215610dff575f80fd5b8335610e0a81610bd1565b92506020840135610e1a81610bd1565b91506040840135610e2a81610d19565b809150509250925092565b6001600160601b0381168114610be5575f80fd5b5f805f60608486031215610e5b575f80fd5b8335610e6681610bd1565b92506020840135610e1a81610e35565b5f8060408385031215610e87575f80fd5b8235610e9281610bd1565b91506020830135610c1481610e35565b5f8060408385031215610eb3575f80fd5b8235610ebe81610bd1565b915060208301356001600160e01b031981168114610c14575f80fd5b8051610ee581610d19565b919050565b5f60208284031215610efa575f80fd5b81516106af81610d19565b634e487b7160e01b5f52604160045260245ffd5b60405160e0810167ffffffffffffffff81118282101715610f3c57610f3c610f05565b60405290565b8051610ee581610e35565b8051610ee581610d0b565b8051610ee581610bd1565b5f82601f830112610f72575f80fd5b815167ffffffffffffffff811115610f8c57610f8c610f05565b604051601f8201601f19908116603f0116810167ffffffffffffffff81118282101715610fbb57610fbb610f05565b604052818152838201602001851015610fd2575f80fd5b8160208501602083015e5f918101602001919091529392505050565b5f60208284031215610ffe575f80fd5b815167ffffffffffffffff811115611014575f80fd5b820160e08185031215611025575f80fd5b61102d610f19565b61103682610f42565b815261104460208301610f42565b602082015261105560408301610f4d565b604082015261106660608301610eda565b606082015261107760808301610f58565b608082015261108860a08301610f58565b60a082015260c082015167ffffffffffffffff8111156110a6575f80fd5b6110b286828501610f63565b60c083015250949350505050565b5f602082840312156110d0575f80fd5b81516106af81610e35565b5f602082840312156110eb575f80fd5b81516106af81610bd156fea2646970667358221220ed749e11944e4fdc572b6896cb185c28acf692e398a29e38c2958e11a5af347964736f6c634300081a0033",
-  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100b1575f3560e01c80637d482da1116100795780637d482da114610148578063aa13a9881461015b578063b6bbad121461016e578063c52721a314610181578063ce64d28114610194578063d9057007146101bf575f80fd5b80630c21dea2146100b557806316279055146100de5780632330f247146101015780633334d16b146101145780635c990ed314610127575b5f80fd5b6100c86100c3366004610be8565b6101d2565b6040516100d59190610cde565b60405180910390f35b6100f16100ec366004610cf0565b610246565b60405190151581526020016100d5565b6100f161010f366004610cf0565b610263565b6100f1610122366004610cf0565b610289565b61013a610135366004610d26565b6102af565b6040516100d5929190610d7f565b6100f1610156366004610da8565b61033e565b61013a610169366004610ded565b6103c2565b6100f161017c366004610cf0565b61048f565b61013a61018f366004610e49565b6104a0565b6101a76101a2366004610e76565b61053c565b6040516001600160a01b0390911681526020016100d5565b6100f16101cd366004610ea2565b6106a4565b6101da610b94565b6101e483836106b6565b905061020281604001516101f6600390565b60ff9081169116141590565b15610240578051604080830151905163067e446760e31b81526001600160601b03909216600483015260ff1660248201526044015b60405180910390fd5b92915050565b5f6001600160a01b03821661025c57505f919050565b503b151590565b5f61026d82610246565b61027857505f919050565b610240826309990e3960e41b6106a4565b5f61029382610246565b61029e57505f919050565b61024082630398724f60e11b6106a4565b6102b7610b94565b5f6102c286866106b6565b91506102d982604001518560ff9081169116141590565b1561031a578151604080840151905163176bb19d60e21b81526001600160601b03909216600483015260ff8087166024840152166044820152606401610237565b6103248683610848565b90506103358186845f0151866109c3565b94509492505050565b604051634806e33f60e11b8152600481018390526001600160a01b03848116602483015260ff831660448301525f919086169063900dc67e90606401602060405180830381865afa158015610395573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906103b99190610eea565b95945050505050565b6103ca610b94565b5f6103d585856106b6565b91506103f282604001516103e7600c90565b60ff90811691161490565b80610408575061040882604001516103e7600f90565b8061041e575061041e82604001516103e7600e90565b80610434575061043482604001516103e7600d90565b61046c5781516040808401519051631df6ffe760e01b81526001600160601b03909216600483015260ff166024820152604401610237565b6104768583610848565b90506104878185845f0151866109c3565b935093915050565b5f61024082620b5ccf60e31b610ac1565b6104a8610b94565b6040516305247a1760e51b81526001600160601b03841660048201525f906001600160a01b0386169063a48f42e0906024015f60405180830381865afa1580156104f4573d5f803e3d5ffd5b505050506040513d5f823e601f3d908101601f1916820160405261051b9190810190610fee565b91506105278583610848565b9050610487818360800151845f0151866109c3565b60405163677d3feb60e11b81526001600160601b03821660048201525f9081906001600160a01b0385169063cefa7fd690602401602060405180830381865afa15801561058b573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906105af91906110c0565b60405163677d3feb60e11b81526001600160601b03821660048201529091505f906001600160a01b0386169063cefa7fd690602401602060405180830381865afa1580156105ff573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061062391906110c0565b6040516305247a1760e51b81526001600160601b03821660048201529091506001600160a01b0386169063a48f42e0906024015f60405180830381865afa158015610670573d5f803e3d5ffd5b505050506040513d5f823e601f3d908101601f191682016040526106979190810190610fee565b6080015195945050505050565b5f6106af8383610ac1565b9392505050565b6106be610b94565b604051632f2a35f760e11b81526001600160a01b0383811660048301525f9190851690635e546bee90602401602060405180830381865afa158015610705573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061072991906110c0565b604051630a4d29dd60e31b81526001600160601b038216600482015290915073__$94a2c899be079b00d952d0d84fffaa5c34$__906352694ee890602401602060405180830381865af4158015610782573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906107a69190610eea565b156107cf57604051630e8088a760e01b81526001600160a01b0384166004820152602401610237565b6040516305247a1760e51b81526001600160601b03821660048201526001600160a01b0385169063a48f42e0906024015f60405180830381865afa158015610819573d5f803e3d5ffd5b505050506040513d5f823e601f3d908101601f191682016040526108409190810190610fee565b949350505050565b5f61085982604001516103e7600c90565b156108da57602082015160405163bf8e179760e01b81526001600160601b0390911660048201526001600160a01b0384169063bf8e179790602401602060405180830381865afa1580156108af573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906108d391906110db565b9050610240565b60208201516040516305247a1760e51b81526001600160601b0390911660048201526001600160a01b0384169063bf8e179790829063a48f42e0906024015f60405180830381865afa158015610932573d5f803e3d5ffd5b505050506040513d5f823e601f3d908101601f191682016040526109599190810190610fee565b602001516040516001600160e01b031960e084901b1681526001600160601b039091166004820152602401602060405180830381865afa15801561099f573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906106af91906110db565b8015610abb57836001600160a01b031663311adb686040518163ffffffff1660e01b8152600401602060405180830381865afa158015610a05573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610a2991906110db565b604051629b7b3560e61b81526001600160a01b03858116600483015291909116906326decd4090602401602060405180830381865afa158015610a6e573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610a929190610eea565b15610abb57604051633a31890160e11b81526001600160601b0383166004820152602401610237565b50505050565b5f610acb83610adc565b80156106af57506106af8383610b0e565b5f610aee826301ffc9a760e01b610b0e565b80156102405750610b07826001600160e01b0319610b0e565b1592915050565b6040516001600160e01b0319821660248201525f90819060440160408051601f19818403018152919052602080820180516001600160e01b03166301ffc9a760e01b17815282519293505f9283928392909183918a617530fa92503d91505f519050828015610b7e575060208210155b8015610b8957505f81115b979650505050505050565b6040805160e0810182525f8082526020820181905291810182905260608082018390526080820183905260a082019290925260c081019190915290565b6001600160a01b0381168114610be5575f80fd5b50565b5f8060408385031215610bf9575f80fd5b8235610c0481610bd1565b91506020830135610c1481610bd1565b809150509250929050565b5f81518084528060208401602086015e5f602082860101526020601f19601f83011685010191505092915050565b6001600160601b0381511682526001600160601b03602082015116602083015260ff60408201511660408301525f6060820151610c8e606085018215159052565b506080820151610ca960808501826001600160a01b03169052565b5060a0820151610cc460a08501826001600160a01b03169052565b5060c082015160e060c085015261084060e0850182610c1f565b602081525f6106af6020830184610c4d565b5f60208284031215610d00575f80fd5b81356106af81610bd1565b60ff81168114610be5575f80fd5b8015158114610be5575f80fd5b5f805f8060808587031215610d39575f80fd5b8435610d4481610bd1565b93506020850135610d5481610bd1565b92506040850135610d6481610d0b565b91506060850135610d7481610d19565b939692955090935050565b604081525f610d916040830185610c4d565b905060018060a01b03831660208301529392505050565b5f805f8060808587031215610dbb575f80fd5b8435610dc681610bd1565b93506020850135610dd681610bd1565b9250604085013591506060850135610d7481610d0b565b5f805f60608486031215610dff575f80fd5b8335610e0a81610bd1565b92506020840135610e1a81610bd1565b91506040840135610e2a81610d19565b809150509250925092565b6001600160601b0381168114610be5575f80fd5b5f805f60608486031215610e5b575f80fd5b8335610e6681610bd1565b92506020840135610e1a81610e35565b5f8060408385031215610e87575f80fd5b8235610e9281610bd1565b91506020830135610c1481610e35565b5f8060408385031215610eb3575f80fd5b8235610ebe81610bd1565b915060208301356001600160e01b031981168114610c14575f80fd5b8051610ee581610d19565b919050565b5f60208284031215610efa575f80fd5b81516106af81610d19565b634e487b7160e01b5f52604160045260245ffd5b60405160e0810167ffffffffffffffff81118282101715610f3c57610f3c610f05565b60405290565b8051610ee581610e35565b8051610ee581610d0b565b8051610ee581610bd1565b5f82601f830112610f72575f80fd5b815167ffffffffffffffff811115610f8c57610f8c610f05565b604051601f8201601f19908116603f0116810167ffffffffffffffff81118282101715610fbb57610fbb610f05565b604052818152838201602001851015610fd2575f80fd5b8160208501602083015e5f918101602001919091529392505050565b5f60208284031215610ffe575f80fd5b815167ffffffffffffffff811115611014575f80fd5b820160e08185031215611025575f80fd5b61102d610f19565b61103682610f42565b815261104460208301610f42565b602082015261105560408301610f4d565b604082015261106660608301610eda565b606082015261107760808301610f58565b608082015261108860a08301610f58565b60a082015260c082015167ffffffffffffffff8111156110a6575f80fd5b6110b286828501610f63565b60c083015250949350505050565b5f602082840312156110d0575f80fd5b81516106af81610e35565b5f602082840312156110eb575f80fd5b81516106af81610bd156fea2646970667358221220ed749e11944e4fdc572b6896cb185c28acf692e398a29e38c2958e11a5af347964736f6c634300081a0033",
+  "bytecode": "0x6113e7610034600b8282823980515f1a607314602857634e487b7160e01b5f525f60045260245ffd5b305f52607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100d6575f3560e01c80635c990ed311610093578063b6bbad121161006e578063b6bbad12146101b9578063c52721a3146101cc578063ce64d281146101df578063d90570071461020a575f80fd5b80635c990ed3146101725780637d482da114610193578063aa13a988146101a6575f80fd5b80630c21dea2146100da5780630f4809ac1461010357806316279055146101265780632227ca6d146101395780632330f2471461014c5780633334d16b1461015f575b5f80fd5b6100ed6100e8366004610e50565b61021d565b6040516100fa9190610f46565b60405180910390f35b610116610111366004610f58565b610291565b60405190151581526020016100fa565b610116610134366004610f58565b61032e565b610116610147366004610f81565b61034b565b61011661015a366004610f58565b6104d2565b61011661016d366004610f58565b6104f8565b610185610180366004610fd6565b61051e565b6040516100fa92919061102f565b6101166101a1366004611058565b6105ad565b6101856101b436600461109d565b610631565b6101166101c7366004610f58565b6106fe565b6101856101da3660046110ee565b61070f565b6101f26101ed36600461111b565b6107ab565b6040516001600160a01b0390911681526020016100fa565b610116610218366004611147565b610913565b610225610dfc565b61022f838361091e565b905061024d8160400151610241600390565b60ff9081169116141590565b1561028b578051604080830151905163067e446760e31b81526001600160601b03909216600483015260ff1660248201526044015b60405180910390fd5b92915050565b5f61029b8261032e565b6102a657505f919050565b60408051600481526024810182526020810180516001600160e01b031663bf7e214f60e01b17905290515f916001600160a01b038516916102e7919061117f565b5f60405180830381855afa9150503d805f811461031f576040519150601f19603f3d011682016040523d82523d5f602084013e610324565b606091505b5090949350505050565b5f6001600160a01b03821661034457505f919050565b503b151590565b604051632f2a35f760e11b81526001600160a01b0383811660048301525f918291861690635e546bee90602401602060405180830381865afa158015610393573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906103b791906111a5565b604051630a4d29dd60e31b81526001600160601b038216600482015290915073__$94a2c899be079b00d952d0d84fffaa5c34$__906352694ee890602401602060405180830381865af4158015610410573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061043491906111cb565b15610442575f9150506104cb565b6040516305247a1760e51b81526001600160601b03821660048201526104c7906001600160a01b0387169063a48f42e0906024015f60405180830381865afa158015610490573d5f803e3d5ffd5b505050506040513d5f823e601f3d908101601f191682016040526104b791908101906112c4565b604001518460ff90811691161490565b9150505b9392505050565b5f6104dc8261032e565b6104e757505f919050565b61028b826309990e3960e41b610913565b5f6105028261032e565b61050d57505f919050565b61028b82630398724f60e11b610913565b610526610dfc565b5f610531868661091e565b915061054882604001518560ff9081169116141590565b15610589578151604080840151905163176bb19d60e21b81526001600160601b03909216600483015260ff8087166024840152166044820152606401610282565b6105938683610ab0565b90506105a48186845f015186610c2b565b94509492505050565b604051634806e33f60e11b8152600481018390526001600160a01b03848116602483015260ff831660448301525f919086169063900dc67e90606401602060405180830381865afa158015610604573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061062891906111cb565b95945050505050565b610639610dfc565b5f610644858561091e565b91506106618260400151610656600c90565b60ff90811691161490565b8061067757506106778260400151610656600f90565b8061068d575061068d8260400151610656600e90565b806106a357506106a38260400151610656600d90565b6106db5781516040808401519051631df6ffe760e01b81526001600160601b03909216600483015260ff166024820152604401610282565b6106e58583610ab0565b90506106f68185845f015186610c2b565b935093915050565b5f61028b82620b5ccf60e31b610d29565b610717610dfc565b6040516305247a1760e51b81526001600160601b03841660048201525f906001600160a01b0386169063a48f42e0906024015f60405180830381865afa158015610763573d5f803e3d5ffd5b505050506040513d5f823e601f3d908101601f1916820160405261078a91908101906112c4565b91506107968583610ab0565b90506106f6818360800151845f015186610c2b565b60405163677d3feb60e11b81526001600160601b03821660048201525f9081906001600160a01b0385169063cefa7fd690602401602060405180830381865afa1580156107fa573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061081e91906111a5565b60405163677d3feb60e11b81526001600160601b03821660048201529091505f906001600160a01b0386169063cefa7fd690602401602060405180830381865afa15801561086e573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061089291906111a5565b6040516305247a1760e51b81526001600160601b03821660048201529091506001600160a01b0386169063a48f42e0906024015f60405180830381865afa1580156108df573d5f803e3d5ffd5b505050506040513d5f823e601f3d908101601f1916820160405261090691908101906112c4565b6080015195945050505050565b5f6104cb8383610d29565b610926610dfc565b604051632f2a35f760e11b81526001600160a01b0383811660048301525f9190851690635e546bee90602401602060405180830381865afa15801561096d573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061099191906111a5565b604051630a4d29dd60e31b81526001600160601b038216600482015290915073__$94a2c899be079b00d952d0d84fffaa5c34$__906352694ee890602401602060405180830381865af41580156109ea573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610a0e91906111cb565b15610a3757604051630e8088a760e01b81526001600160a01b0384166004820152602401610282565b6040516305247a1760e51b81526001600160601b03821660048201526001600160a01b0385169063a48f42e0906024015f60405180830381865afa158015610a81573d5f803e3d5ffd5b505050506040513d5f823e601f3d908101601f19168201604052610aa891908101906112c4565b949350505050565b5f610ac18260400151610656600c90565b15610b4257602082015160405163bf8e179760e01b81526001600160601b0390911660048201526001600160a01b0384169063bf8e179790602401602060405180830381865afa158015610b17573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610b3b9190611396565b905061028b565b60208201516040516305247a1760e51b81526001600160601b0390911660048201526001600160a01b0384169063bf8e179790829063a48f42e0906024015f60405180830381865afa158015610b9a573d5f803e3d5ffd5b505050506040513d5f823e601f3d908101601f19168201604052610bc191908101906112c4565b602001516040516001600160e01b031960e084901b1681526001600160601b039091166004820152602401602060405180830381865afa158015610c07573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906104cb9190611396565b8015610d2357836001600160a01b031663311adb686040518163ffffffff1660e01b8152600401602060405180830381865afa158015610c6d573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610c919190611396565b604051629b7b3560e61b81526001600160a01b03858116600483015291909116906326decd4090602401602060405180830381865afa158015610cd6573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610cfa91906111cb565b15610d2357604051633a31890160e11b81526001600160601b0383166004820152602401610282565b50505050565b5f610d3383610d44565b80156104cb57506104cb8383610d76565b5f610d56826301ffc9a760e01b610d76565b801561028b5750610d6f826001600160e01b0319610d76565b1592915050565b6040516001600160e01b0319821660248201525f90819060440160408051601f19818403018152919052602080820180516001600160e01b03166301ffc9a760e01b17815282519293505f9283928392909183918a617530fa92503d91505f519050828015610de6575060208210155b8015610df157505f81115b979650505050505050565b6040805160e0810182525f8082526020820181905291810182905260608082018390526080820183905260a082019290925260c081019190915290565b6001600160a01b0381168114610e4d575f80fd5b50565b5f8060408385031215610e61575f80fd5b8235610e6c81610e39565b91506020830135610e7c81610e39565b809150509250929050565b5f81518084528060208401602086015e5f602082860101526020601f19601f83011685010191505092915050565b6001600160601b0381511682526001600160601b03602082015116602083015260ff60408201511660408301525f6060820151610ef6606085018215159052565b506080820151610f1160808501826001600160a01b03169052565b5060a0820151610f2c60a08501826001600160a01b03169052565b5060c082015160e060c0850152610aa860e0850182610e87565b602081525f6104cb6020830184610eb5565b5f60208284031215610f68575f80fd5b81356104cb81610e39565b60ff81168114610e4d575f80fd5b5f805f60608486031215610f93575f80fd5b8335610f9e81610e39565b92506020840135610fae81610e39565b91506040840135610fbe81610f73565b809150509250925092565b8015158114610e4d575f80fd5b5f805f8060808587031215610fe9575f80fd5b8435610ff481610e39565b9350602085013561100481610e39565b9250604085013561101481610f73565b9150606085013561102481610fc9565b939692955090935050565b604081525f6110416040830185610eb5565b905060018060a01b03831660208301529392505050565b5f805f806080858703121561106b575f80fd5b843561107681610e39565b9350602085013561108681610e39565b925060408501359150606085013561102481610f73565b5f805f606084860312156110af575f80fd5b83356110ba81610e39565b925060208401356110ca81610e39565b91506040840135610fbe81610fc9565b6001600160601b0381168114610e4d575f80fd5b5f805f60608486031215611100575f80fd5b833561110b81610e39565b925060208401356110ca816110da565b5f806040838503121561112c575f80fd5b823561113781610e39565b91506020830135610e7c816110da565b5f8060408385031215611158575f80fd5b823561116381610e39565b915060208301356001600160e01b031981168114610e7c575f80fd5b5f82518060208501845e5f920191825250919050565b80516111a0816110da565b919050565b5f602082840312156111b5575f80fd5b81516104cb816110da565b80516111a081610fc9565b5f602082840312156111db575f80fd5b81516104cb81610fc9565b634e487b7160e01b5f52604160045260245ffd5b60405160e0810167ffffffffffffffff8111828210171561121d5761121d6111e6565b60405290565b80516111a081610f73565b80516111a081610e39565b5f82601f830112611248575f80fd5b815167ffffffffffffffff811115611262576112626111e6565b604051601f8201601f19908116603f0116810167ffffffffffffffff81118282101715611291576112916111e6565b6040528181528382016020018510156112a8575f80fd5b8160208501602083015e5f918101602001919091529392505050565b5f602082840312156112d4575f80fd5b815167ffffffffffffffff8111156112ea575f80fd5b820160e081850312156112fb575f80fd5b6113036111fa565b61130c82611195565b815261131a60208301611195565b602082015261132b60408301611223565b604082015261133c606083016111c0565b606082015261134d6080830161122e565b608082015261135e60a0830161122e565b60a082015260c082015167ffffffffffffffff81111561137c575f80fd5b61138886828501611239565b60c083015250949350505050565b5f602082840312156113a6575f80fd5b81516104cb81610e3956fea264697066735822122059bfd04173a100ec4c8ec93131dcc63e397ca98f15fbf5b1d1a400bd8c487e5e64736f6c634300081a0033",
+  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100d6575f3560e01c80635c990ed311610093578063b6bbad121161006e578063b6bbad12146101b9578063c52721a3146101cc578063ce64d281146101df578063d90570071461020a575f80fd5b80635c990ed3146101725780637d482da114610193578063aa13a988146101a6575f80fd5b80630c21dea2146100da5780630f4809ac1461010357806316279055146101265780632227ca6d146101395780632330f2471461014c5780633334d16b1461015f575b5f80fd5b6100ed6100e8366004610e50565b61021d565b6040516100fa9190610f46565b60405180910390f35b610116610111366004610f58565b610291565b60405190151581526020016100fa565b610116610134366004610f58565b61032e565b610116610147366004610f81565b61034b565b61011661015a366004610f58565b6104d2565b61011661016d366004610f58565b6104f8565b610185610180366004610fd6565b61051e565b6040516100fa92919061102f565b6101166101a1366004611058565b6105ad565b6101856101b436600461109d565b610631565b6101166101c7366004610f58565b6106fe565b6101856101da3660046110ee565b61070f565b6101f26101ed36600461111b565b6107ab565b6040516001600160a01b0390911681526020016100fa565b610116610218366004611147565b610913565b610225610dfc565b61022f838361091e565b905061024d8160400151610241600390565b60ff9081169116141590565b1561028b578051604080830151905163067e446760e31b81526001600160601b03909216600483015260ff1660248201526044015b60405180910390fd5b92915050565b5f61029b8261032e565b6102a657505f919050565b60408051600481526024810182526020810180516001600160e01b031663bf7e214f60e01b17905290515f916001600160a01b038516916102e7919061117f565b5f60405180830381855afa9150503d805f811461031f576040519150601f19603f3d011682016040523d82523d5f602084013e610324565b606091505b5090949350505050565b5f6001600160a01b03821661034457505f919050565b503b151590565b604051632f2a35f760e11b81526001600160a01b0383811660048301525f918291861690635e546bee90602401602060405180830381865afa158015610393573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906103b791906111a5565b604051630a4d29dd60e31b81526001600160601b038216600482015290915073__$94a2c899be079b00d952d0d84fffaa5c34$__906352694ee890602401602060405180830381865af4158015610410573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061043491906111cb565b15610442575f9150506104cb565b6040516305247a1760e51b81526001600160601b03821660048201526104c7906001600160a01b0387169063a48f42e0906024015f60405180830381865afa158015610490573d5f803e3d5ffd5b505050506040513d5f823e601f3d908101601f191682016040526104b791908101906112c4565b604001518460ff90811691161490565b9150505b9392505050565b5f6104dc8261032e565b6104e757505f919050565b61028b826309990e3960e41b610913565b5f6105028261032e565b61050d57505f919050565b61028b82630398724f60e11b610913565b610526610dfc565b5f610531868661091e565b915061054882604001518560ff9081169116141590565b15610589578151604080840151905163176bb19d60e21b81526001600160601b03909216600483015260ff8087166024840152166044820152606401610282565b6105938683610ab0565b90506105a48186845f015186610c2b565b94509492505050565b604051634806e33f60e11b8152600481018390526001600160a01b03848116602483015260ff831660448301525f919086169063900dc67e90606401602060405180830381865afa158015610604573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061062891906111cb565b95945050505050565b610639610dfc565b5f610644858561091e565b91506106618260400151610656600c90565b60ff90811691161490565b8061067757506106778260400151610656600f90565b8061068d575061068d8260400151610656600e90565b806106a357506106a38260400151610656600d90565b6106db5781516040808401519051631df6ffe760e01b81526001600160601b03909216600483015260ff166024820152604401610282565b6106e58583610ab0565b90506106f68185845f015186610c2b565b935093915050565b5f61028b82620b5ccf60e31b610d29565b610717610dfc565b6040516305247a1760e51b81526001600160601b03841660048201525f906001600160a01b0386169063a48f42e0906024015f60405180830381865afa158015610763573d5f803e3d5ffd5b505050506040513d5f823e601f3d908101601f1916820160405261078a91908101906112c4565b91506107968583610ab0565b90506106f6818360800151845f015186610c2b565b60405163677d3feb60e11b81526001600160601b03821660048201525f9081906001600160a01b0385169063cefa7fd690602401602060405180830381865afa1580156107fa573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061081e91906111a5565b60405163677d3feb60e11b81526001600160601b03821660048201529091505f906001600160a01b0386169063cefa7fd690602401602060405180830381865afa15801561086e573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061089291906111a5565b6040516305247a1760e51b81526001600160601b03821660048201529091506001600160a01b0386169063a48f42e0906024015f60405180830381865afa1580156108df573d5f803e3d5ffd5b505050506040513d5f823e601f3d908101601f1916820160405261090691908101906112c4565b6080015195945050505050565b5f6104cb8383610d29565b610926610dfc565b604051632f2a35f760e11b81526001600160a01b0383811660048301525f9190851690635e546bee90602401602060405180830381865afa15801561096d573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061099191906111a5565b604051630a4d29dd60e31b81526001600160601b038216600482015290915073__$94a2c899be079b00d952d0d84fffaa5c34$__906352694ee890602401602060405180830381865af41580156109ea573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610a0e91906111cb565b15610a3757604051630e8088a760e01b81526001600160a01b0384166004820152602401610282565b6040516305247a1760e51b81526001600160601b03821660048201526001600160a01b0385169063a48f42e0906024015f60405180830381865afa158015610a81573d5f803e3d5ffd5b505050506040513d5f823e601f3d908101601f19168201604052610aa891908101906112c4565b949350505050565b5f610ac18260400151610656600c90565b15610b4257602082015160405163bf8e179760e01b81526001600160601b0390911660048201526001600160a01b0384169063bf8e179790602401602060405180830381865afa158015610b17573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610b3b9190611396565b905061028b565b60208201516040516305247a1760e51b81526001600160601b0390911660048201526001600160a01b0384169063bf8e179790829063a48f42e0906024015f60405180830381865afa158015610b9a573d5f803e3d5ffd5b505050506040513d5f823e601f3d908101601f19168201604052610bc191908101906112c4565b602001516040516001600160e01b031960e084901b1681526001600160601b039091166004820152602401602060405180830381865afa158015610c07573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906104cb9190611396565b8015610d2357836001600160a01b031663311adb686040518163ffffffff1660e01b8152600401602060405180830381865afa158015610c6d573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610c919190611396565b604051629b7b3560e61b81526001600160a01b03858116600483015291909116906326decd4090602401602060405180830381865afa158015610cd6573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610cfa91906111cb565b15610d2357604051633a31890160e11b81526001600160601b0383166004820152602401610282565b50505050565b5f610d3383610d44565b80156104cb57506104cb8383610d76565b5f610d56826301ffc9a760e01b610d76565b801561028b5750610d6f826001600160e01b0319610d76565b1592915050565b6040516001600160e01b0319821660248201525f90819060440160408051601f19818403018152919052602080820180516001600160e01b03166301ffc9a760e01b17815282519293505f9283928392909183918a617530fa92503d91505f519050828015610de6575060208210155b8015610df157505f81115b979650505050505050565b6040805160e0810182525f8082526020820181905291810182905260608082018390526080820183905260a082019290925260c081019190915290565b6001600160a01b0381168114610e4d575f80fd5b50565b5f8060408385031215610e61575f80fd5b8235610e6c81610e39565b91506020830135610e7c81610e39565b809150509250929050565b5f81518084528060208401602086015e5f602082860101526020601f19601f83011685010191505092915050565b6001600160601b0381511682526001600160601b03602082015116602083015260ff60408201511660408301525f6060820151610ef6606085018215159052565b506080820151610f1160808501826001600160a01b03169052565b5060a0820151610f2c60a08501826001600160a01b03169052565b5060c082015160e060c0850152610aa860e0850182610e87565b602081525f6104cb6020830184610eb5565b5f60208284031215610f68575f80fd5b81356104cb81610e39565b60ff81168114610e4d575f80fd5b5f805f60608486031215610f93575f80fd5b8335610f9e81610e39565b92506020840135610fae81610e39565b91506040840135610fbe81610f73565b809150509250925092565b8015158114610e4d575f80fd5b5f805f8060808587031215610fe9575f80fd5b8435610ff481610e39565b9350602085013561100481610e39565b9250604085013561101481610f73565b9150606085013561102481610fc9565b939692955090935050565b604081525f6110416040830185610eb5565b905060018060a01b03831660208301529392505050565b5f805f806080858703121561106b575f80fd5b843561107681610e39565b9350602085013561108681610e39565b925060408501359150606085013561102481610f73565b5f805f606084860312156110af575f80fd5b83356110ba81610e39565b925060208401356110ca81610e39565b91506040840135610fbe81610fc9565b6001600160601b0381168114610e4d575f80fd5b5f805f60608486031215611100575f80fd5b833561110b81610e39565b925060208401356110ca816110da565b5f806040838503121561112c575f80fd5b823561113781610e39565b91506020830135610e7c816110da565b5f8060408385031215611158575f80fd5b823561116381610e39565b915060208301356001600160e01b031981168114610e7c575f80fd5b5f82518060208501845e5f920191825250919050565b80516111a0816110da565b919050565b5f602082840312156111b5575f80fd5b81516104cb816110da565b80516111a081610fc9565b5f602082840312156111db575f80fd5b81516104cb81610fc9565b634e487b7160e01b5f52604160045260245ffd5b60405160e0810167ffffffffffffffff8111828210171561121d5761121d6111e6565b60405290565b80516111a081610f73565b80516111a081610e39565b5f82601f830112611248575f80fd5b815167ffffffffffffffff811115611262576112626111e6565b604051601f8201601f19908116603f0116810167ffffffffffffffff81118282101715611291576112916111e6565b6040528181528382016020018510156112a8575f80fd5b8160208501602083015e5f918101602001919091529392505050565b5f602082840312156112d4575f80fd5b815167ffffffffffffffff8111156112ea575f80fd5b820160e081850312156112fb575f80fd5b6113036111fa565b61130c82611195565b815261131a60208301611195565b602082015261132b60408301611223565b604082015261133c606083016111c0565b606082015261134d6080830161122e565b608082015261135e60a0830161122e565b60a082015260c082015167ffffffffffffffff81111561137c575f80fd5b61138886828501611239565b60c083015250949350505050565b5f602082840312156113a6575f80fd5b81516104cb81610e3956fea264697066735822122059bfd04173a100ec4c8ec93131dcc63e397ca98f15fbf5b1d1a400bd8c487e5e64736f6c634300081a0033",
   "linkReferences": {
     "contracts/type/NftId.sol": {
       "NftIdLib": [
         {
           "length": 20,
-          "start": 1918
+          "start": 1036
+        },
+        {
+          "length": 20,
+          "start": 2534
         }
       ]
     }
@@ -533,7 +585,11 @@
       "NftIdLib": [
         {
           "length": 20,
-          "start": 1866
+          "start": 984
+        },
+        {
+          "length": 20,
+          "start": 2482
         }
       ]
     }

package/artifacts/contracts/shared/ContractLib.sol/IInstanceAdminHelper.dbg.json

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

package/artifacts/contracts/shared/ContractLib.sol/ITargetHelper.dbg.json

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

package/artifacts/contracts/shared/ContractLib.sol/ITokenRegistryHelper.dbg.json

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

package/artifacts/contracts/shared/IComponent.sol/IComponent.dbg.json

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

package/artifacts/contracts/shared/IComponent.sol/IComponent.json

@@ -78,17 +78,6 @@
       "name": "ErrorComponentProductNftIdZero",
       "type": "error"
     },
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "token",
-          "type": "address"
-        }
-      ],
-      "name": "ErrorComponentTokenInvalid",
-      "type": "error"
-    },
     {
       "inputs": [],
       "name": "ErrorComponentWalletAddressIsSameAsCurrent",
@@ -286,11 +275,6 @@
               "name": "name",
               "type": "string"
             },
-            {
-              "internalType": "contract IERC20Metadata",
-              "name": "token",
-              "type": "address"
-            },
             {
               "internalType": "contract TokenHandler",
               "name": "tokenHandler",
@@ -321,11 +305,6 @@
               "name": "name",
               "type": "string"
             },
-            {
-              "internalType": "contract IERC20Metadata",
-              "name": "token",
-              "type": "address"
-            },
             {
               "internalType": "contract TokenHandler",
               "name": "tokenHandler",

package/artifacts/contracts/shared/IComponentService.sol/IComponentService.dbg.json

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

package/artifacts/contracts/shared/IComponentService.sol/IComponentService.json

@@ -234,6 +234,17 @@
       "name": "ErrorComponentServiceSenderNotRegistered",
       "type": "error"
     },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "token",
+          "type": "address"
+        }
+      ],
+      "name": "ErrorComponentServiceTokenInvalid",
+      "type": "error"
+    },
     {
       "inputs": [
         {
@@ -592,25 +603,25 @@
           "indexed": false,
           "internalType": "UFixed",
           "name": "previousFractionalFee",
-          "type": "uint256"
+          "type": "uint160"
         },
         {
           "indexed": false,
-          "internalType": "uint256",
+          "internalType": "Amount",
           "name": "previousFixedFee",
-          "type": "uint256"
+          "type": "uint96"
         },
         {
           "indexed": false,
           "internalType": "UFixed",
           "name": "newFractionalFee",
-          "type": "uint256"
+          "type": "uint160"
         },
         {
           "indexed": false,
-          "internalType": "uint256",
+          "internalType": "Amount",
           "name": "newFixedFee",
-          "type": "uint256"
+          "type": "uint96"
         }
       ],
       "name": "LogComponentServiceUpdateFee",
@@ -926,6 +937,11 @@
           "internalType": "address",
           "name": "product",
           "type": "address"
+        },
+        {
+          "internalType": "address",
+          "name": "token",
+          "type": "address"
         }
       ],
       "name": "registerProduct",
@@ -959,12 +975,12 @@
             {
               "internalType": "UFixed",
               "name": "fractionalFee",
-              "type": "uint256"
+              "type": "uint160"
             },
             {
-              "internalType": "uint256",
+              "internalType": "Amount",
               "name": "fixedFee",
-              "type": "uint256"
+              "type": "uint96"
             }
           ],
           "internalType": "struct Fee",
@@ -976,12 +992,12 @@
             {
               "internalType": "UFixed",
               "name": "fractionalFee",
-              "type": "uint256"
+              "type": "uint160"
             },
             {
-              "internalType": "uint256",
+              "internalType": "Amount",
               "name": "fixedFee",
-              "type": "uint256"
+              "type": "uint96"
             }
           ],
           "internalType": "struct Fee",
@@ -996,36 +1012,13 @@
     },
     {
       "inputs": [
-        {
-          "internalType": "address",
-          "name": "componentAddress",
-          "type": "address"
-        },
-        {
-          "internalType": "bool",
-          "name": "locked",
-          "type": "bool"
-        }
-      ],
-      "name": "setLockedFromComponent",
-      "outputs": [],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "componentAddress",
-          "type": "address"
-        },
         {
           "internalType": "bool",
           "name": "locked",
           "type": "bool"
         }
       ],
-      "name": "setLockedFromInstance",
+      "name": "setLocked",
       "outputs": [],
       "stateMutability": "nonpayable",
       "type": "function"
@@ -1037,12 +1030,12 @@
             {
               "internalType": "UFixed",
               "name": "fractionalFee",
-              "type": "uint256"
+              "type": "uint160"
             },
             {
-              "internalType": "uint256",
+              "internalType": "Amount",
               "name": "fixedFee",
-              "type": "uint256"
+              "type": "uint96"
             }
           ],
           "internalType": "struct Fee",
@@ -1054,12 +1047,12 @@
             {
               "internalType": "UFixed",
               "name": "fractionalFee",
-              "type": "uint256"
+              "type": "uint160"
             },
             {
-              "internalType": "uint256",
+              "internalType": "Amount",
               "name": "fixedFee",
-              "type": "uint256"
+              "type": "uint96"
             }
           ],
           "internalType": "struct Fee",
@@ -1071,12 +1064,12 @@
             {
               "internalType": "UFixed",
               "name": "fractionalFee",
-              "type": "uint256"
+              "type": "uint160"
             },
             {
-              "internalType": "uint256",
+              "internalType": "Amount",
               "name": "fixedFee",
-              "type": "uint256"
+              "type": "uint96"
             }
           ],
           "internalType": "struct Fee",
@@ -1096,12 +1089,12 @@
             {
               "internalType": "UFixed",
               "name": "fractionalFee",
-              "type": "uint256"
+              "type": "uint160"
             },
             {
-              "internalType": "uint256",
+              "internalType": "Amount",
               "name": "fixedFee",
-              "type": "uint256"
+              "type": "uint96"
             }
           ],
           "internalType": "struct Fee",
@@ -1113,12 +1106,12 @@
             {
               "internalType": "UFixed",
               "name": "fractionalFee",
-              "type": "uint256"
+              "type": "uint160"
             },
             {
-              "internalType": "uint256",
+              "internalType": "Amount",
               "name": "fixedFee",
-              "type": "uint256"
+              "type": "uint96"
             }
           ],
           "internalType": "struct Fee",

package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.dbg.json

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

package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.json

@@ -78,17 +78,6 @@
       "name": "ErrorComponentProductNftIdZero",
       "type": "error"
     },
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "token",
-          "type": "address"
-        }
-      ],
-      "name": "ErrorComponentTokenInvalid",
-      "type": "error"
-    },
     {
       "inputs": [],
       "name": "ErrorComponentWalletAddressIsSameAsCurrent",
@@ -331,11 +320,6 @@
               "name": "name",
               "type": "string"
             },
-            {
-              "internalType": "contract IERC20Metadata",
-              "name": "token",
-              "type": "address"
-            },
             {
               "internalType": "contract TokenHandler",
               "name": "tokenHandler",
@@ -366,11 +350,6 @@
               "name": "name",
               "type": "string"
             },
-            {
-              "internalType": "contract IERC20Metadata",
-              "name": "token",
-              "type": "address"
-            },
             {
               "internalType": "contract TokenHandler",
               "name": "tokenHandler",

package/artifacts/contracts/shared/IKeyValueStore.sol/IKeyValueStore.dbg.json

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

package/artifacts/contracts/shared/ILifecycle.sol/ILifecycle.dbg.json

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

package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json

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

package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json

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

package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json

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

package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.dbg.json

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

package/artifacts/contracts/shared/IService.sol/IService.dbg.json

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

package/artifacts/contracts/shared/InitializableERC165.sol/InitializableERC165.dbg.json

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

package/artifacts/contracts/shared/InitializableERC165.sol/InitializableERC165.json

@@ -46,8 +46,8 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x6080604052348015600e575f80fd5b5060c980601a5f395ff3fe6080604052348015600e575f80fd5b50600436106026575f3560e01c806301ffc9a714602a575b5f80fd5b605360353660046067565b6001600160e01b0319165f9081526020819052604090205460ff1690565b604051901515815260200160405180910390f35b5f602082840312156076575f80fd5b81356001600160e01b031981168114608c575f80fd5b939250505056fea2646970667358221220f28bbd7f2c036f1e5e2150f1ef1f4e613f6041cd1d24b8841b28dc4efae93f5064736f6c634300081a0033",
-  "deployedBytecode": "0x6080604052348015600e575f80fd5b50600436106026575f3560e01c806301ffc9a714602a575b5f80fd5b605360353660046067565b6001600160e01b0319165f9081526020819052604090205460ff1690565b604051901515815260200160405180910390f35b5f602082840312156076575f80fd5b81356001600160e01b031981168114608c575f80fd5b939250505056fea2646970667358221220f28bbd7f2c036f1e5e2150f1ef1f4e613f6041cd1d24b8841b28dc4efae93f5064736f6c634300081a0033",
+  "bytecode": "0x6080604052348015600e575f80fd5b5060c980601a5f395ff3fe6080604052348015600e575f80fd5b50600436106026575f3560e01c806301ffc9a714602a575b5f80fd5b605360353660046067565b6001600160e01b0319165f9081526020819052604090205460ff1690565b604051901515815260200160405180910390f35b5f602082840312156076575f80fd5b81356001600160e01b031981168114608c575f80fd5b939250505056fea2646970667358221220e17b1480c958561a8210e063e8bfb94a7d90b9bb257b4fc7c3ee4f4a0bc799c264736f6c634300081a0033",
+  "deployedBytecode": "0x6080604052348015600e575f80fd5b50600436106026575f3560e01c806301ffc9a714602a575b5f80fd5b605360353660046067565b6001600160e01b0319165f9081526020819052604090205460ff1690565b604051901515815260200160405180910390f35b5f602082840312156076575f80fd5b81356001600160e01b031981168114608c575f80fd5b939250505056fea2646970667358221220e17b1480c958561a8210e063e8bfb94a7d90b9bb257b4fc7c3ee4f4a0bc799c264736f6c634300081a0033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }

package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.dbg.json

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

package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.json

@@ -78,17 +78,6 @@
       "name": "ErrorComponentProductNftIdZero",
       "type": "error"
     },
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "token",
-          "type": "address"
-        }
-      ],
-      "name": "ErrorComponentTokenInvalid",
-      "type": "error"
-    },
     {
       "inputs": [],
       "name": "ErrorComponentWalletAddressIsSameAsCurrent",
@@ -406,11 +395,6 @@
               "name": "name",
               "type": "string"
             },
-            {
-              "internalType": "contract IERC20Metadata",
-              "name": "token",
-              "type": "address"
-            },
             {
               "internalType": "contract TokenHandler",
               "name": "tokenHandler",
@@ -441,11 +425,6 @@
               "name": "name",
               "type": "string"
             },
-            {
-              "internalType": "contract IERC20Metadata",
-              "name": "token",
-              "type": "address"
-            },
             {
               "internalType": "contract TokenHandler",
               "name": "tokenHandler",