@etherisc/gif-next 0.0.2-e37834a-021 → 0.0.2-e3f4f82-063

package/artifacts/contracts/{instance/base/InstanceBase.sol/InstanceBase.json → shared/Service.sol/Service.json}

@@ -1,8 +1,89 @@
 {
   "_format": "hh-sol-artifact-1",
-  "contractName": "InstanceBase",
-  "sourceName": "contracts/instance/base/InstanceBase.sol",
+  "contractName": "Service",
+  "sourceName": "contracts/shared/Service.sol",
   "abi": [
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "registry",
+          "type": "address"
+        },
+        {
+          "internalType": "NftId",
+          "name": "nftId",
+          "type": "uint96"
+        }
+      ],
+      "name": "ErrorAlreadyLinked",
+      "type": "error"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "contractAddress",
+          "type": "address"
+        }
+      ],
+      "name": "ErrorContractNotRegistered",
+      "type": "error"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "account",
+          "type": "address"
+        }
+      ],
+      "name": "ErrorNotOwner",
+      "type": "error"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "registryAddress",
+          "type": "address"
+        }
+      ],
+      "name": "ErrorNotRegistry",
+      "type": "error"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "registryAddress",
+          "type": "address"
+        }
+      ],
+      "name": "ErrorRegisterableNotRegistry",
+      "type": "error"
+    },
+    {
+      "inputs": [],
+      "name": "ErrorRegistryAddressZero",
+      "type": "error"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "registry",
+          "type": "address"
+        }
+      ],
+      "name": "ErrorRegistryAlreadyInitialized",
+      "type": "error"
+    },
+    {
+      "inputs": [],
+      "name": "ErrorRegistryNotInitialized",
+      "type": "error"
+    },
     {
       "inputs": [],
       "name": "InvalidInitialization",
@@ -64,32 +145,6 @@
       "stateMutability": "view",
       "type": "function"
     },
-    {
-      "inputs": [],
-      "name": "getComponentOwnerService",
-      "outputs": [
-        {
-          "internalType": "contract IComponentOwnerService",
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "getDistributionService",
-      "outputs": [
-        {
-          "internalType": "contract IDistributionService",
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
     {
       "inputs": [],
       "name": "getInitialInfo",
@@ -160,12 +215,12 @@
     },
     {
       "inputs": [],
-      "name": "getKeyValueStore",
+      "name": "getMajorVersion",
       "outputs": [
         {
-          "internalType": "contract IKeyValueStore",
-          "name": "keyValueStore",
-          "type": "address"
+          "internalType": "VersionPart",
+          "name": "majorVersion",
+          "type": "uint8"
         }
       ],
       "stateMutability": "view",
@@ -173,38 +228,25 @@
     },
     {
       "inputs": [],
-      "name": "getNftId",
+      "name": "getName",
       "outputs": [
         {
-          "internalType": "NftId",
-          "name": "nftId",
-          "type": "uint96"
+          "internalType": "string",
+          "name": "name",
+          "type": "string"
         }
       ],
-      "stateMutability": "view",
+      "stateMutability": "pure",
       "type": "function"
     },
     {
       "inputs": [],
-      "name": "getOwner",
+      "name": "getNftId",
       "outputs": [
         {
-          "internalType": "address",
+          "internalType": "NftId",
           "name": "",
-          "type": "address"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "getPoolService",
-      "outputs": [
-        {
-          "internalType": "contract IPoolService",
-          "name": "service",
-          "type": "address"
+          "type": "uint96"
         }
       ],
       "stateMutability": "view",
@@ -212,11 +254,11 @@
     },
     {
       "inputs": [],
-      "name": "getProductService",
+      "name": "getOwner",
       "outputs": [
         {
-          "internalType": "contract IProductService",
-          "name": "service",
+          "internalType": "address",
+          "name": "",
           "type": "address"
         }
       ],
@@ -229,32 +271,13 @@
       "outputs": [
         {
           "internalType": "contract IRegistry",
-          "name": "registry",
+          "name": "",
           "type": "address"
         }
       ],
       "stateMutability": "view",
       "type": "function"
     },
-    {
-      "inputs": [
-        {
-          "internalType": "Key32",
-          "name": "key",
-          "type": "bytes32"
-        }
-      ],
-      "name": "getState",
-      "outputs": [
-        {
-          "internalType": "StateId",
-          "name": "state",
-          "type": "uint8"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
     {
       "inputs": [],
       "name": "getVersion",
@@ -388,6 +411,13 @@
       "stateMutability": "view",
       "type": "function"
     },
+    {
+      "inputs": [],
+      "name": "linkToRegisteredNftId",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
     {
       "inputs": [
         {
@@ -407,24 +437,6 @@
       "stateMutability": "view",
       "type": "function"
     },
-    {
-      "inputs": [
-        {
-          "internalType": "Key32",
-          "name": "key",
-          "type": "bytes32"
-        },
-        {
-          "internalType": "StateId",
-          "name": "state",
-          "type": "uint8"
-        }
-      ],
-      "name": "updateState",
-      "outputs": [],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
     {
       "inputs": [
         {

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

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

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

@@ -0,0 +1,96 @@
+{
+  "_format": "hh-sol-artifact-1",
+  "contractName": "TokenHandler",
+  "sourceName": "contracts/shared/TokenHandler.sol",
+  "abi": [
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "token",
+          "type": "address"
+        }
+      ],
+      "stateMutability": "nonpayable",
+      "type": "constructor"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "target",
+          "type": "address"
+        }
+      ],
+      "name": "AddressEmptyCode",
+      "type": "error"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "account",
+          "type": "address"
+        }
+      ],
+      "name": "AddressInsufficientBalance",
+      "type": "error"
+    },
+    {
+      "inputs": [],
+      "name": "FailedInnerCall",
+      "type": "error"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "token",
+          "type": "address"
+        }
+      ],
+      "name": "SafeERC20FailedOperation",
+      "type": "error"
+    },
+    {
+      "inputs": [],
+      "name": "getToken",
+      "outputs": [
+        {
+          "internalType": "contract IERC20Metadata",
+          "name": "",
+          "type": "address"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "from",
+          "type": "address"
+        },
+        {
+          "internalType": "address",
+          "name": "to",
+          "type": "address"
+        },
+        {
+          "internalType": "uint256",
+          "name": "amount",
+          "type": "uint256"
+        }
+      ],
+      "name": "transfer",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    }
+  ],
+  "bytecode": "0x608060405234801561001057600080fd5b506040516103fd3803806103fd83398101604081905261002f91610054565b600080546001600160a01b0319166001600160a01b0392909216919091179055610084565b60006020828403121561006657600080fd5b81516001600160a01b038116811461007d57600080fd5b9392505050565b61036a806100936000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c806321df0da71461003b578063beabacc81461005a575b600080fd5b600054604080516001600160a01b039092168252519081900360200190f35b61006d6100683660046102a7565b61006f565b005b600054610087906001600160a01b031684848461008c565b505050565b604080516001600160a01b0385811660248301528416604482015260648082018490528251808303909101815260849091019091526020810180516001600160e01b03166323b872dd60e01b1790526100e69085906100ec565b50505050565b60006101016001600160a01b03841683610154565b9050805160001415801561012657508080602001905181019061012491906102e3565b155b1561008757604051635274afe760e01b81526001600160a01b03841660048201526024015b60405180910390fd5b606061016283836000610169565b9392505050565b60608147101561018e5760405163cd78605960e01b815230600482015260240161014b565b600080856001600160a01b031684866040516101aa9190610305565b60006040518083038185875af1925050503d80600081146101e7576040519150601f19603f3d011682016040523d82523d6000602084013e6101ec565b606091505b50915091506101fc868383610206565b9695505050505050565b60608261021b5761021682610262565b610162565b815115801561023257506001600160a01b0384163b155b1561025b57604051639996b31560e01b81526001600160a01b038516600482015260240161014b565b5080610162565b8051156102725780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b80356001600160a01b03811681146102a257600080fd5b919050565b6000806000606084860312156102bc57600080fd5b6102c58461028b565b92506102d36020850161028b565b9150604084013590509250925092565b6000602082840312156102f557600080fd5b8151801515811461016257600080fd5b6000825160005b81811015610326576020818601810151858301520161030c565b50600092019182525091905056fea26469706673582212205dcbb6c5ddae5c31498dff1c0933ab8c0d284bb07f5e69fd452d43a18212e70964736f6c63430008140033",
+  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100365760003560e01c806321df0da71461003b578063beabacc81461005a575b600080fd5b600054604080516001600160a01b039092168252519081900360200190f35b61006d6100683660046102a7565b61006f565b005b600054610087906001600160a01b031684848461008c565b505050565b604080516001600160a01b0385811660248301528416604482015260648082018490528251808303909101815260849091019091526020810180516001600160e01b03166323b872dd60e01b1790526100e69085906100ec565b50505050565b60006101016001600160a01b03841683610154565b9050805160001415801561012657508080602001905181019061012491906102e3565b155b1561008757604051635274afe760e01b81526001600160a01b03841660048201526024015b60405180910390fd5b606061016283836000610169565b9392505050565b60608147101561018e5760405163cd78605960e01b815230600482015260240161014b565b600080856001600160a01b031684866040516101aa9190610305565b60006040518083038185875af1925050503d80600081146101e7576040519150601f19603f3d011682016040523d82523d6000602084013e6101ec565b606091505b50915091506101fc868383610206565b9695505050505050565b60608261021b5761021682610262565b610162565b815115801561023257506001600160a01b0384163b155b1561025b57604051639996b31560e01b81526001600160a01b038516600482015260240161014b565b5080610162565b8051156102725780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b80356001600160a01b03811681146102a257600080fd5b919050565b6000806000606084860312156102bc57600080fd5b6102c58461028b565b92506102d36020850161028b565b9150604084013590509250925092565b6000602082840312156102f557600080fd5b8151801515811461016257600080fd5b6000825160005b81811015610326576020818601810151858301520161030c565b50600092019182525091905056fea26469706673582212205dcbb6c5ddae5c31498dff1c0933ab8c0d284bb07f5e69fd452d43a18212e70964736f6c63430008140033",
+  "linkReferences": {},
+  "deployedLinkReferences": {}
+}

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

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

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

@@ -122,8 +122,8 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x60a06040523480156200001157600080fd5b5060405162000f2f38038062000f2f8339810160408190526200003491620003e1565b8282828281620000458282620000b0565b50508160405162000056906200037a565b6001600160a01b039091168152602001604051809103906000f08015801562000083573d6000803e3d6000fd5b506001600160a01b0316608052620000a46200009e60805190565b62000116565b505050505050620004df565b620000bb8262000188565b6040516001600160a01b038316907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a2805115620001085762000103828262000208565b505050565b6200011262000285565b5050565b7f7e644d79422f17c01e4894b5f4f588d331ebfa28653d42ae832dc59e38c9798f6200015860008051602062000f0f833981519152546001600160a01b031690565b604080516001600160a01b03928316815291841660208301520160405180910390a16200018581620002a7565b50565b806001600160a01b03163b600003620001c457604051634c9c8ce360e01b81526001600160a01b03821660048201526024015b60405180910390fd5b807f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc5b80546001600160a01b0319166001600160a01b039290921691909117905550565b6060600080846001600160a01b031684604051620002279190620004c1565b600060405180830381855af49150503d806000811462000264576040519150601f19603f3d011682016040523d82523d6000602084013e62000269565b606091505b5090925090506200027c858383620002ea565b95945050505050565b3415620002a55760405163b398979f60e01b815260040160405180910390fd5b565b6001600160a01b038116620002d357604051633173bdd160e11b815260006004820152602401620001bb565b8060008051602062000f0f833981519152620001e7565b6060826200030357620002fd8262000350565b62000349565b81511580156200031b57506001600160a01b0384163b155b156200034657604051639996b31560e01b81526001600160a01b0385166004820152602401620001bb565b50805b9392505050565b805115620003615780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b61052480620009eb83390190565b80516001600160a01b0381168114620003a057600080fd5b919050565b634e487b7160e01b600052604160045260246000fd5b60005b83811015620003d8578181015183820152602001620003be565b50506000910152565b600080600060608486031215620003f757600080fd5b620004028462000388565b9250620004126020850162000388565b60408501519092506001600160401b03808211156200043057600080fd5b818601915086601f8301126200044557600080fd5b8151818111156200045a576200045a620003a5565b604051601f8201601f19908116603f01168101908382118183101715620004855762000485620003a5565b816040528281528960208487010111156200049f57600080fd5b620004b2836020830160208801620003bb565b80955050505050509250925092565b60008251620004d5818460208701620003bb565b9190910192915050565b6080516104eb620005006000396000818160370152607401526104eb6000f3fe60806040526004361061001e5760003560e01c80638b3240a014610028575b610026610072565b005b34801561003457600080fd5b507f00000000000000000000000000000000000000000000000000000000000000006040516001600160a01b03909116815260200160405180910390f35b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031633036100df576000356001600160e01b03191663278f794360e11b146100d5576040516334ad5dbb60e21b815260040160405180910390fd5b6100dd6100ec565b565b6100dd61011b565b905090565b6000806100fc3660048184610376565b81019061010991906103b6565b91509150610117828261012b565b5050565b6100dd610126610186565b6101b9565b610134826101dd565b6040516001600160a01b038316907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a280511561017e576101798282610259565b505050565b6101176102cf565b60006100e77f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc546001600160a01b031690565b3660008037600080366000845af43d6000803e8080156101d8573d6000f35b3d6000fd5b806001600160a01b03163b60000361021857604051634c9c8ce360e01b81526001600160a01b03821660048201526024015b60405180910390fd5b7f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc80546001600160a01b0319166001600160a01b0392909216919091179055565b6060600080846001600160a01b0316846040516102769190610486565b600060405180830381855af49150503d80600081146102b1576040519150601f19603f3d011682016040523d82523d6000602084013e6102b6565b606091505b50915091506102c68583836102ee565b95945050505050565b34156100dd5760405163b398979f60e01b815260040160405180910390fd5b606082610303576102fe8261034d565b610346565b815115801561031a57506001600160a01b0384163b155b1561034357604051639996b31560e01b81526001600160a01b038516600482015260240161020f565b50805b9392505050565b80511561035d5780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b6000808585111561038657600080fd5b8386111561039357600080fd5b5050820193919092039150565b634e487b7160e01b600052604160045260246000fd5b600080604083850312156103c957600080fd5b82356001600160a01b03811681146103e057600080fd5b9150602083013567ffffffffffffffff808211156103fd57600080fd5b818501915085601f83011261041157600080fd5b813581811115610423576104236103a0565b604051601f8201601f19908116603f0116810190838211818310171561044b5761044b6103a0565b8160405282815288602084870101111561046457600080fd5b8260208601602083013760006020848301015280955050505050509250929050565b6000825160005b818110156104a7576020818601810151858301520161048d565b50600092019182525091905056fea26469706673582212207ccd55bcf74484fb7eef473db81b031299bb67c0edc154b0af62f736ec9caf5d64736f6c63430008140033608060405234801561001057600080fd5b5060405161052438038061052483398101604081905261002f916100be565b806001600160a01b03811661005e57604051631e4fbdf760e01b81526000600482015260240160405180910390fd5b6100678161006e565b50506100ee565b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b6000602082840312156100d057600080fd5b81516001600160a01b03811681146100e757600080fd5b9392505050565b610427806100fd6000396000f3fe60806040526004361061004a5760003560e01c8063715018a61461004f5780638da5cb5b146100665780639623609d14610093578063ad3cb1cc146100a6578063f2fde38b146100e4575b600080fd5b34801561005b57600080fd5b50610064610104565b005b34801561007257600080fd5b506000546040516001600160a01b0390911681526020015b60405180910390f35b6100646100a1366004610272565b610118565b3480156100b257600080fd5b506100d7604051806040016040528060058152602001640352e302e360dc1b81525081565b60405161008a919061038e565b3480156100f057600080fd5b506100646100ff3660046103a8565b610187565b61010c6101ca565b61011660006101f7565b565b6101206101ca565b60405163278f794360e11b81526001600160a01b03841690634f1ef28690349061015090869086906004016103c5565b6000604051808303818588803b15801561016957600080fd5b505af115801561017d573d6000803e3d6000fd5b5050505050505050565b61018f6101ca565b6001600160a01b0381166101be57604051631e4fbdf760e01b8152600060048201526024015b60405180910390fd5b6101c7816101f7565b50565b6000546001600160a01b031633146101165760405163118cdaa760e01b81523360048201526024016101b5565b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b6001600160a01b03811681146101c757600080fd5b634e487b7160e01b600052604160045260246000fd5b60008060006060848603121561028757600080fd5b833561029281610247565b925060208401356102a281610247565b9150604084013567ffffffffffffffff808211156102bf57600080fd5b818601915086601f8301126102d357600080fd5b8135818111156102e5576102e561025c565b604051601f8201601f19908116603f0116810190838211818310171561030d5761030d61025c565b8160405282815289602084870101111561032657600080fd5b8260208601602083013760006020848301015280955050505050509250925092565b6000815180845260005b8181101561036e57602081850181015186830182015201610352565b506000602082860101526020601f19601f83011685010191505092915050565b6020815260006103a16020830184610348565b9392505050565b6000602082840312156103ba57600080fd5b81356103a181610247565b6001600160a01b03831681526040602082018190526000906103e990830184610348565b94935050505056fea2646970667358221220f0b2d68a0060e1e014170ca14fc6dc543adce5c23840b5caa5f84f10d50459b364736f6c63430008140033b53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103",
-  "deployedBytecode": "0x60806040526004361061001e5760003560e01c80638b3240a014610028575b610026610072565b005b34801561003457600080fd5b507f00000000000000000000000000000000000000000000000000000000000000006040516001600160a01b03909116815260200160405180910390f35b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031633036100df576000356001600160e01b03191663278f794360e11b146100d5576040516334ad5dbb60e21b815260040160405180910390fd5b6100dd6100ec565b565b6100dd61011b565b905090565b6000806100fc3660048184610376565b81019061010991906103b6565b91509150610117828261012b565b5050565b6100dd610126610186565b6101b9565b610134826101dd565b6040516001600160a01b038316907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a280511561017e576101798282610259565b505050565b6101176102cf565b60006100e77f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc546001600160a01b031690565b3660008037600080366000845af43d6000803e8080156101d8573d6000f35b3d6000fd5b806001600160a01b03163b60000361021857604051634c9c8ce360e01b81526001600160a01b03821660048201526024015b60405180910390fd5b7f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc80546001600160a01b0319166001600160a01b0392909216919091179055565b6060600080846001600160a01b0316846040516102769190610486565b600060405180830381855af49150503d80600081146102b1576040519150601f19603f3d011682016040523d82523d6000602084013e6102b6565b606091505b50915091506102c68583836102ee565b95945050505050565b34156100dd5760405163b398979f60e01b815260040160405180910390fd5b606082610303576102fe8261034d565b610346565b815115801561031a57506001600160a01b0384163b155b1561034357604051639996b31560e01b81526001600160a01b038516600482015260240161020f565b50805b9392505050565b80511561035d5780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b6000808585111561038657600080fd5b8386111561039357600080fd5b5050820193919092039150565b634e487b7160e01b600052604160045260246000fd5b600080604083850312156103c957600080fd5b82356001600160a01b03811681146103e057600080fd5b9150602083013567ffffffffffffffff808211156103fd57600080fd5b818501915085601f83011261041157600080fd5b813581811115610423576104236103a0565b604051601f8201601f19908116603f0116810190838211818310171561044b5761044b6103a0565b8160405282815288602084870101111561046457600080fd5b8260208601602083013760006020848301015280955050505050509250929050565b6000825160005b818110156104a7576020818601810151858301520161048d565b50600092019182525091905056fea26469706673582212207ccd55bcf74484fb7eef473db81b031299bb67c0edc154b0af62f736ec9caf5d64736f6c63430008140033",
+  "bytecode": "0x60a06040523480156200001157600080fd5b5060405162000f2f38038062000f2f8339810160408190526200003491620003e1565b8282828281620000458282620000b0565b50508160405162000056906200037a565b6001600160a01b039091168152602001604051809103906000f08015801562000083573d6000803e3d6000fd5b506001600160a01b0316608052620000a46200009e60805190565b62000116565b505050505050620004df565b620000bb8262000188565b6040516001600160a01b038316907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a2805115620001085762000103828262000208565b505050565b6200011262000285565b5050565b7f7e644d79422f17c01e4894b5f4f588d331ebfa28653d42ae832dc59e38c9798f6200015860008051602062000f0f833981519152546001600160a01b031690565b604080516001600160a01b03928316815291841660208301520160405180910390a16200018581620002a7565b50565b806001600160a01b03163b600003620001c457604051634c9c8ce360e01b81526001600160a01b03821660048201526024015b60405180910390fd5b807f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc5b80546001600160a01b0319166001600160a01b039290921691909117905550565b6060600080846001600160a01b031684604051620002279190620004c1565b600060405180830381855af49150503d806000811462000264576040519150601f19603f3d011682016040523d82523d6000602084013e62000269565b606091505b5090925090506200027c858383620002ea565b95945050505050565b3415620002a55760405163b398979f60e01b815260040160405180910390fd5b565b6001600160a01b038116620002d357604051633173bdd160e11b815260006004820152602401620001bb565b8060008051602062000f0f833981519152620001e7565b6060826200030357620002fd8262000350565b62000349565b81511580156200031b57506001600160a01b0384163b155b156200034657604051639996b31560e01b81526001600160a01b0385166004820152602401620001bb565b50805b9392505050565b805115620003615780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b61052480620009eb83390190565b80516001600160a01b0381168114620003a057600080fd5b919050565b634e487b7160e01b600052604160045260246000fd5b60005b83811015620003d8578181015183820152602001620003be565b50506000910152565b600080600060608486031215620003f757600080fd5b620004028462000388565b9250620004126020850162000388565b60408501519092506001600160401b03808211156200043057600080fd5b818601915086601f8301126200044557600080fd5b8151818111156200045a576200045a620003a5565b604051601f8201601f19908116603f01168101908382118183101715620004855762000485620003a5565b816040528281528960208487010111156200049f57600080fd5b620004b2836020830160208801620003bb565b80955050505050509250925092565b60008251620004d5818460208701620003bb565b9190910192915050565b6080516104eb620005006000396000818160370152607401526104eb6000f3fe60806040526004361061001e5760003560e01c80638b3240a014610028575b610026610072565b005b34801561003457600080fd5b507f00000000000000000000000000000000000000000000000000000000000000006040516001600160a01b03909116815260200160405180910390f35b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031633036100df576000356001600160e01b03191663278f794360e11b146100d5576040516334ad5dbb60e21b815260040160405180910390fd5b6100dd6100ec565b565b6100dd61011b565b905090565b6000806100fc3660048184610376565b81019061010991906103b6565b91509150610117828261012b565b5050565b6100dd610126610186565b6101b9565b610134826101dd565b6040516001600160a01b038316907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a280511561017e576101798282610259565b505050565b6101176102cf565b60006100e77f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc546001600160a01b031690565b3660008037600080366000845af43d6000803e8080156101d8573d6000f35b3d6000fd5b806001600160a01b03163b60000361021857604051634c9c8ce360e01b81526001600160a01b03821660048201526024015b60405180910390fd5b7f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc80546001600160a01b0319166001600160a01b0392909216919091179055565b6060600080846001600160a01b0316846040516102769190610486565b600060405180830381855af49150503d80600081146102b1576040519150601f19603f3d011682016040523d82523d6000602084013e6102b6565b606091505b50915091506102c68583836102ee565b95945050505050565b34156100dd5760405163b398979f60e01b815260040160405180910390fd5b606082610303576102fe8261034d565b610346565b815115801561031a57506001600160a01b0384163b155b1561034357604051639996b31560e01b81526001600160a01b038516600482015260240161020f565b50805b9392505050565b80511561035d5780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b6000808585111561038657600080fd5b8386111561039357600080fd5b5050820193919092039150565b634e487b7160e01b600052604160045260246000fd5b600080604083850312156103c957600080fd5b82356001600160a01b03811681146103e057600080fd5b9150602083013567ffffffffffffffff808211156103fd57600080fd5b818501915085601f83011261041157600080fd5b813581811115610423576104236103a0565b604051601f8201601f19908116603f0116810190838211818310171561044b5761044b6103a0565b8160405282815288602084870101111561046457600080fd5b8260208601602083013760006020848301015280955050505050509250929050565b6000825160005b818110156104a7576020818601810151858301520161048d565b50600092019182525091905056fea264697066735822122061d21ea0f293a274302e47ad0e30c5fb666a07dc4f8e1cfa79d3064668655aa064736f6c63430008140033608060405234801561001057600080fd5b5060405161052438038061052483398101604081905261002f916100be565b806001600160a01b03811661005e57604051631e4fbdf760e01b81526000600482015260240160405180910390fd5b6100678161006e565b50506100ee565b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b6000602082840312156100d057600080fd5b81516001600160a01b03811681146100e757600080fd5b9392505050565b610427806100fd6000396000f3fe60806040526004361061004a5760003560e01c8063715018a61461004f5780638da5cb5b146100665780639623609d14610093578063ad3cb1cc146100a6578063f2fde38b146100e4575b600080fd5b34801561005b57600080fd5b50610064610104565b005b34801561007257600080fd5b506000546040516001600160a01b0390911681526020015b60405180910390f35b6100646100a1366004610272565b610118565b3480156100b257600080fd5b506100d7604051806040016040528060058152602001640352e302e360dc1b81525081565b60405161008a919061038e565b3480156100f057600080fd5b506100646100ff3660046103a8565b610187565b61010c6101ca565b61011660006101f7565b565b6101206101ca565b60405163278f794360e11b81526001600160a01b03841690634f1ef28690349061015090869086906004016103c5565b6000604051808303818588803b15801561016957600080fd5b505af115801561017d573d6000803e3d6000fd5b5050505050505050565b61018f6101ca565b6001600160a01b0381166101be57604051631e4fbdf760e01b8152600060048201526024015b60405180910390fd5b6101c7816101f7565b50565b6000546001600160a01b031633146101165760405163118cdaa760e01b81523360048201526024016101b5565b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b6001600160a01b03811681146101c757600080fd5b634e487b7160e01b600052604160045260246000fd5b60008060006060848603121561028757600080fd5b833561029281610247565b925060208401356102a281610247565b9150604084013567ffffffffffffffff808211156102bf57600080fd5b818601915086601f8301126102d357600080fd5b8135818111156102e5576102e561025c565b604051601f8201601f19908116603f0116810190838211818310171561030d5761030d61025c565b8160405282815289602084870101111561032657600080fd5b8260208601602083013760006020848301015280955050505050509250925092565b6000815180845260005b8181101561036e57602081850181015186830182015201610352565b506000602082860101526020601f19601f83011685010191505092915050565b6020815260006103a16020830184610348565b9392505050565b6000602082840312156103ba57600080fd5b81356103a181610247565b6001600160a01b03831681526040602082018190526000906103e990830184610348565b94935050505056fea2646970667358221220cb46d8eee562c2068d4d3afab9e2a7f48be119bb61a6a1c3d7ef6ba5a8aff09464736f6c63430008140033b53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103",
+  "deployedBytecode": "0x60806040526004361061001e5760003560e01c80638b3240a014610028575b610026610072565b005b34801561003457600080fd5b507f00000000000000000000000000000000000000000000000000000000000000006040516001600160a01b03909116815260200160405180910390f35b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031633036100df576000356001600160e01b03191663278f794360e11b146100d5576040516334ad5dbb60e21b815260040160405180910390fd5b6100dd6100ec565b565b6100dd61011b565b905090565b6000806100fc3660048184610376565b81019061010991906103b6565b91509150610117828261012b565b5050565b6100dd610126610186565b6101b9565b610134826101dd565b6040516001600160a01b038316907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a280511561017e576101798282610259565b505050565b6101176102cf565b60006100e77f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc546001600160a01b031690565b3660008037600080366000845af43d6000803e8080156101d8573d6000f35b3d6000fd5b806001600160a01b03163b60000361021857604051634c9c8ce360e01b81526001600160a01b03821660048201526024015b60405180910390fd5b7f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc80546001600160a01b0319166001600160a01b0392909216919091179055565b6060600080846001600160a01b0316846040516102769190610486565b600060405180830381855af49150503d80600081146102b1576040519150601f19603f3d011682016040523d82523d6000602084013e6102b6565b606091505b50915091506102c68583836102ee565b95945050505050565b34156100dd5760405163b398979f60e01b815260040160405180910390fd5b606082610303576102fe8261034d565b610346565b815115801561031a57506001600160a01b0384163b155b1561034357604051639996b31560e01b81526001600160a01b038516600482015260240161020f565b50805b9392505050565b80511561035d5780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b6000808585111561038657600080fd5b8386111561039357600080fd5b5050820193919092039150565b634e487b7160e01b600052604160045260246000fd5b600080604083850312156103c957600080fd5b82356001600160a01b03811681146103e057600080fd5b9150602083013567ffffffffffffffff808211156103fd57600080fd5b818501915085601f83011261041157600080fd5b813581811115610423576104236103a0565b604051601f8201601f19908116603f0116810190838211818310171561044b5761044b6103a0565b8160405282815288602084870101111561046457600080fd5b8260208601602083013760006020848301015280955050505050509250929050565b6000825160005b818110156104a7576020818601810151858301520161048d565b50600092019182525091905056fea264697066735822122061d21ea0f293a274302e47ad0e30c5fb666a07dc4f8e1cfa79d3064668655aa064736f6c63430008140033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }

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

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

package/artifacts/contracts/test/TestFee.sol/TestFee.dbg.json

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

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

@@ -70,8 +70,8 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x608060405234801561001057600080fd5b50610301806100206000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c80634e3dca121461003b57806387c565861461006d575b600080fd5b61004e610049366004610217565b610075565b6040805182518152602092830151928101929092520160405180910390f35b61004e610192565b6040805180820190915260008082526020820152604051631488c84560e01b815260048101859052600084900b602482015273__$a23651848365a6a5ca15f07b4331037f48$__9063c7010dfa9073__$fa7f345063a1bf0cf2bd14a32ccc1b6018$__90631488c84590604401602060405180830381865af41580156100ff573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101239190610255565b846040518363ffffffff1660e01b815260040161014a929190918252602082015260400190565b6040805180830381865af4158015610166573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061018a919061026e565b949350505050565b604080518082019091526000808252602082015273__$a23651848365a6a5ca15f07b4331037f48$__632bd182d36040518163ffffffff1660e01b81526004016040805180830381865af41580156101ee573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610212919061026e565b905090565b60008060006060848603121561022c57600080fd5b8335925060208401358060000b811461024457600080fd5b929592945050506040919091013590565b60006020828403121561026757600080fd5b5051919050565b60006040828403121561028057600080fd5b6040516040810181811067ffffffffffffffff821117156102b157634e487b7160e01b600052604160045260246000fd5b60405282518152602092830151928101929092525091905056fea26469706673582212209bfce5af9619ec4b682783c86a4a759179e4f7d10da372b502c45afa25ab2e8864736f6c63430008140033",
-  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100365760003560e01c80634e3dca121461003b57806387c565861461006d575b600080fd5b61004e610049366004610217565b610075565b6040805182518152602092830151928101929092520160405180910390f35b61004e610192565b6040805180820190915260008082526020820152604051631488c84560e01b815260048101859052600084900b602482015273__$a23651848365a6a5ca15f07b4331037f48$__9063c7010dfa9073__$fa7f345063a1bf0cf2bd14a32ccc1b6018$__90631488c84590604401602060405180830381865af41580156100ff573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101239190610255565b846040518363ffffffff1660e01b815260040161014a929190918252602082015260400190565b6040805180830381865af4158015610166573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061018a919061026e565b949350505050565b604080518082019091526000808252602082015273__$a23651848365a6a5ca15f07b4331037f48$__632bd182d36040518163ffffffff1660e01b81526004016040805180830381865af41580156101ee573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610212919061026e565b905090565b60008060006060848603121561022c57600080fd5b8335925060208401358060000b811461024457600080fd5b929592945050506040919091013590565b60006020828403121561026757600080fd5b5051919050565b60006040828403121561028057600080fd5b6040516040810181811067ffffffffffffffff821117156102b157634e487b7160e01b600052604160045260246000fd5b60405282518152602092830151928101929092525091905056fea26469706673582212209bfce5af9619ec4b682783c86a4a759179e4f7d10da372b502c45afa25ab2e8864736f6c63430008140033",
+  "bytecode": "0x608060405234801561001057600080fd5b50610301806100206000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c80634e3dca121461003b57806387c565861461006d575b600080fd5b61004e610049366004610217565b610075565b6040805182518152602092830151928101929092520160405180910390f35b61004e610192565b6040805180820190915260008082526020820152604051631488c84560e01b815260048101859052600084900b602482015273__$a23651848365a6a5ca15f07b4331037f48$__9063c7010dfa9073__$5ac3274b8cf1e01ea223bf093142af05b0$__90631488c84590604401602060405180830381865af41580156100ff573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101239190610255565b846040518363ffffffff1660e01b815260040161014a929190918252602082015260400190565b6040805180830381865af4158015610166573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061018a919061026e565b949350505050565b604080518082019091526000808252602082015273__$a23651848365a6a5ca15f07b4331037f48$__632bd182d36040518163ffffffff1660e01b81526004016040805180830381865af41580156101ee573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610212919061026e565b905090565b60008060006060848603121561022c57600080fd5b8335925060208401358060000b811461024457600080fd5b929592945050506040919091013590565b60006020828403121561026757600080fd5b5051919050565b60006040828403121561028057600080fd5b6040516040810181811067ffffffffffffffff821117156102b157634e487b7160e01b600052604160045260246000fd5b60405282518152602092830151928101929092525091905056fea264697066735822122041aa15510fb37657a6c552e37f03f0eaede74e53f7efbffea09948301a33eef864736f6c63430008140033",
+  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100365760003560e01c80634e3dca121461003b57806387c565861461006d575b600080fd5b61004e610049366004610217565b610075565b6040805182518152602092830151928101929092520160405180910390f35b61004e610192565b6040805180820190915260008082526020820152604051631488c84560e01b815260048101859052600084900b602482015273__$a23651848365a6a5ca15f07b4331037f48$__9063c7010dfa9073__$5ac3274b8cf1e01ea223bf093142af05b0$__90631488c84590604401602060405180830381865af41580156100ff573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101239190610255565b846040518363ffffffff1660e01b815260040161014a929190918252602082015260400190565b6040805180830381865af4158015610166573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061018a919061026e565b949350505050565b604080518082019091526000808252602082015273__$a23651848365a6a5ca15f07b4331037f48$__632bd182d36040518163ffffffff1660e01b81526004016040805180830381865af41580156101ee573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610212919061026e565b905090565b60008060006060848603121561022c57600080fd5b8335925060208401358060000b811461024457600080fd5b929592945050506040919091013590565b60006020828403121561026757600080fd5b5051919050565b60006040828403121561028057600080fd5b6040516040810181811067ffffffffffffffff821117156102b157634e487b7160e01b600052604160045260246000fd5b60405282518152602092830151928101929092525091905056fea264697066735822122041aa15510fb37657a6c552e37f03f0eaede74e53f7efbffea09948301a33eef864736f6c63430008140033",
   "linkReferences": {
     "contracts/types/Fee.sol": {
       "FeeLib": [
@@ -86,7 +86,7 @@
       ]
     },
     "contracts/types/UFixed.sol": {
-      "UFixedMathLib": [
+      "UFixedLib": [
         {
           "length": 20,
           "start": 229
@@ -108,7 +108,7 @@
       ]
     },
     "contracts/types/UFixed.sol": {
-      "UFixedMathLib": [
+      "UFixedLib": [
         {
           "length": 20,
           "start": 197

package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.dbg.json

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