@etherisc/gif-next 0.0.2-e37834a-021 → 0.0.2-e46206a-486

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

@@ -3,6 +3,87 @@
   "contractName": "Registerable",
   "sourceName": "contracts/shared/Registerable.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",
@@ -100,7 +181,7 @@
       "outputs": [
         {
           "internalType": "NftId",
-          "name": "nftId",
+          "name": "",
           "type": "uint96"
         }
       ],
@@ -126,13 +207,20 @@
       "outputs": [
         {
           "internalType": "contract IRegistry",
-          "name": "registry",
+          "name": "",
           "type": "address"
         }
       ],
       "stateMutability": "view",
       "type": "function"
     },
+    {
+      "inputs": [],
+      "name": "linkToRegisteredNftId",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
     {
       "inputs": [
         {
@@ -153,8 +241,34 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x",
-  "deployedBytecode": "0x",
-  "linkReferences": {},
-  "deployedLinkReferences": {}
+  "bytecode": "0x608060405234801561001057600080fd5b506301ffc9a760e01b60009081526020527f67be87c3ff9960ca1e9cfac5cab2ff4747269cf9ed20c9b7306235ac35a491c5805460ff19166001179055600280546001600160a01b031916331790556108358061006e6000396000f3fe608060405234801561001057600080fd5b506004361061007d5760003560e01c80631eff4b221161005b5780631eff4b22146100e45780635ab1bd5314610119578063644c45e01461013e578063893d20e81461016957600080fd5b806301ffc9a7146100825780630fec111c146100c4578063138461e0146100da575b600080fd5b6100af610090366004610633565b6001600160e01b03191660009081526020819052604090205460ff1690565b60405190151581526020015b60405180910390f35b6100cc610171565b6040516100bb9291906106aa565b6100e26102f3565b005b61010b7f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30081565b6040519081526020016100bb565b6001546001600160a01b03165b6040516001600160a01b0390911681526020016100bb565b600154600160a01b90046001600160601b03166040516001600160601b0390911681526020016100bb565b610126610515565b6040805160e08101825260008082526020820181905291810182905260608082018390526080820183905260a0820183905260c0820181905290917f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30090506040518060e001604052806101f46001546001600160601b03600160a01b9091041690565b6001600160601b0390811682528354908116602083015260ff600160601b820481166040840152600160681b909104161515606082015230608082015260a00161023c610515565b6001600160a01b0316815260200182600101805461025990610751565b80601f016020809104026020016040519081016040528092919081815260200182805461028590610751565b80156102d25780601f106102a7576101008083540402835291602001916102d2565b820191906000526020600020905b8154815290600101906020018083116102b557829003601f168201915b50505050508152506040518060200160405280600081525092509250509091565b6001546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015273__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af4158015610355573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610379919061078b565b156103c0576001546040516316322c0f60e31b81526001600160a01b0382166004820152600160a01b9091046001600160601b031660248201526044015b60405180910390fd5b6001546001600160a01b03166103e95760405163cf29926160e01b815260040160405180910390fd5b60015460405163c3c5a54760e01b81523060048201819052916001600160a01b03169063c3c5a54790602401602060405180830381865afa158015610432573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610456919061078b565b61047e576040516372657a5160e01b81526001600160a01b03821660048201526024016103b7565b600154604051636939560f60e11b81526001600160a01b0383811660048301529091169063d272ac1e90602401602060405180830381865afa1580156104c8573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104ec91906107ad565b600160146101000a8154816001600160601b0302191690836001600160601b0316021790555050565b6001546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015260009073__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af415801561057a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061059e919061078b565b1561062357600154604051631c5da14d60e11b8152600160a01b82046001600160601b031660048201526001600160a01b03909116906338bb429a90602401602060405180830381865afa1580156105fa573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061061e91906107d6565b905090565b506002546001600160a01b031690565b60006020828403121561064557600080fd5b81356001600160e01b03198116811461065d57600080fd5b9392505050565b6000815180845260005b8181101561068a5760208185018101518683018201520161066e565b506000602082860101526020601f19601f83011685010191505092915050565b6040815260006001600160601b038085511660408401528060208601511660608401525060ff604085015116608083015260608401516106ee60a084018215159052565b5060808401516001600160a01b03811660c08401525060a08401516001600160a01b03811660e08401525060c084015160e0610100840152610734610120840182610664565b905082810360208401526107488185610664565b95945050505050565b600181811c9082168061076557607f821691505b60208210810361078557634e487b7160e01b600052602260045260246000fd5b50919050565b60006020828403121561079d57600080fd5b8151801515811461065d57600080fd5b6000602082840312156107bf57600080fd5b81516001600160601b038116811461065d57600080fd5b6000602082840312156107e857600080fd5b81516001600160a01b038116811461065d57600080fdfea2646970667358221220991d2e57549c74f645be2f462e9e6d6c7057b7ddadd820f198add2cf8f97e1a764736f6c63430008140033",
+  "deployedBytecode": "0x608060405234801561001057600080fd5b506004361061007d5760003560e01c80631eff4b221161005b5780631eff4b22146100e45780635ab1bd5314610119578063644c45e01461013e578063893d20e81461016957600080fd5b806301ffc9a7146100825780630fec111c146100c4578063138461e0146100da575b600080fd5b6100af610090366004610633565b6001600160e01b03191660009081526020819052604090205460ff1690565b60405190151581526020015b60405180910390f35b6100cc610171565b6040516100bb9291906106aa565b6100e26102f3565b005b61010b7f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30081565b6040519081526020016100bb565b6001546001600160a01b03165b6040516001600160a01b0390911681526020016100bb565b600154600160a01b90046001600160601b03166040516001600160601b0390911681526020016100bb565b610126610515565b6040805160e08101825260008082526020820181905291810182905260608082018390526080820183905260a0820183905260c0820181905290917f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30090506040518060e001604052806101f46001546001600160601b03600160a01b9091041690565b6001600160601b0390811682528354908116602083015260ff600160601b820481166040840152600160681b909104161515606082015230608082015260a00161023c610515565b6001600160a01b0316815260200182600101805461025990610751565b80601f016020809104026020016040519081016040528092919081815260200182805461028590610751565b80156102d25780601f106102a7576101008083540402835291602001916102d2565b820191906000526020600020905b8154815290600101906020018083116102b557829003601f168201915b50505050508152506040518060200160405280600081525092509250509091565b6001546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015273__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af4158015610355573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610379919061078b565b156103c0576001546040516316322c0f60e31b81526001600160a01b0382166004820152600160a01b9091046001600160601b031660248201526044015b60405180910390fd5b6001546001600160a01b03166103e95760405163cf29926160e01b815260040160405180910390fd5b60015460405163c3c5a54760e01b81523060048201819052916001600160a01b03169063c3c5a54790602401602060405180830381865afa158015610432573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610456919061078b565b61047e576040516372657a5160e01b81526001600160a01b03821660048201526024016103b7565b600154604051636939560f60e11b81526001600160a01b0383811660048301529091169063d272ac1e90602401602060405180830381865afa1580156104c8573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104ec91906107ad565b600160146101000a8154816001600160601b0302191690836001600160601b0316021790555050565b6001546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015260009073__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af415801561057a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061059e919061078b565b1561062357600154604051631c5da14d60e11b8152600160a01b82046001600160601b031660048201526001600160a01b03909116906338bb429a90602401602060405180830381865afa1580156105fa573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061061e91906107d6565b905090565b506002546001600160a01b031690565b60006020828403121561064557600080fd5b81356001600160e01b03198116811461065d57600080fd5b9392505050565b6000815180845260005b8181101561068a5760208185018101518683018201520161066e565b506000602082860101526020601f19601f83011685010191505092915050565b6040815260006001600160601b038085511660408401528060208601511660608401525060ff604085015116608083015260608401516106ee60a084018215159052565b5060808401516001600160a01b03811660c08401525060a08401516001600160a01b03811660e08401525060c084015160e0610100840152610734610120840182610664565b905082810360208401526107488185610664565b95945050505050565b600181811c9082168061076557607f821691505b60208210810361078557634e487b7160e01b600052602260045260246000fd5b50919050565b60006020828403121561079d57600080fd5b8151801515811461065d57600080fd5b6000602082840312156107bf57600080fd5b81516001600160601b038116811461065d57600080fd5b6000602082840312156107e857600080fd5b81516001600160a01b038116811461065d57600080fdfea2646970667358221220991d2e57549c74f645be2f462e9e6d6c7057b7ddadd820f198add2cf8f97e1a764736f6c63430008140033",
+  "linkReferences": {
+    "contracts/types/NftId.sol": {
+      "NftIdLib": [
+        {
+          "length": 20,
+          "start": 905
+        },
+        {
+          "length": 20,
+          "start": 1454
+        }
+      ]
+    }
+  },
+  "deployedLinkReferences": {
+    "contracts/types/NftId.sol": {
+      "NftIdLib": [
+        {
+          "length": 20,
+          "start": 795
+        },
+        {
+          "length": 20,
+          "start": 1344
+        }
+      ]
+    }
+  }
 }

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/22ace16a46acabda891a4eae781c3ca6.json"
 }

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

@@ -122,8 +122,8 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x60a06040523480156200001157600080fd5b5060405162000f2f38038062000f2f8339810160408190526200003491620003e1565b8282828281620000458282620000b0565b50508160405162000056906200037a565b6001600160a01b039091168152602001604051809103906000f08015801562000083573d6000803e3d6000fd5b506001600160a01b0316608052620000a46200009e60805190565b62000116565b505050505050620004df565b620000bb8262000188565b6040516001600160a01b038316907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a2805115620001085762000103828262000208565b505050565b6200011262000285565b5050565b7f7e644d79422f17c01e4894b5f4f588d331ebfa28653d42ae832dc59e38c9798f6200015860008051602062000f0f833981519152546001600160a01b031690565b604080516001600160a01b03928316815291841660208301520160405180910390a16200018581620002a7565b50565b806001600160a01b03163b600003620001c457604051634c9c8ce360e01b81526001600160a01b03821660048201526024015b60405180910390fd5b807f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc5b80546001600160a01b0319166001600160a01b039290921691909117905550565b6060600080846001600160a01b031684604051620002279190620004c1565b600060405180830381855af49150503d806000811462000264576040519150601f19603f3d011682016040523d82523d6000602084013e62000269565b606091505b5090925090506200027c858383620002ea565b95945050505050565b3415620002a55760405163b398979f60e01b815260040160405180910390fd5b565b6001600160a01b038116620002d357604051633173bdd160e11b815260006004820152602401620001bb565b8060008051602062000f0f833981519152620001e7565b6060826200030357620002fd8262000350565b62000349565b81511580156200031b57506001600160a01b0384163b155b156200034657604051639996b31560e01b81526001600160a01b0385166004820152602401620001bb565b50805b9392505050565b805115620003615780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b61052480620009eb83390190565b80516001600160a01b0381168114620003a057600080fd5b919050565b634e487b7160e01b600052604160045260246000fd5b60005b83811015620003d8578181015183820152602001620003be565b50506000910152565b600080600060608486031215620003f757600080fd5b620004028462000388565b9250620004126020850162000388565b60408501519092506001600160401b03808211156200043057600080fd5b818601915086601f8301126200044557600080fd5b8151818111156200045a576200045a620003a5565b604051601f8201601f19908116603f01168101908382118183101715620004855762000485620003a5565b816040528281528960208487010111156200049f57600080fd5b620004b2836020830160208801620003bb565b80955050505050509250925092565b60008251620004d5818460208701620003bb565b9190910192915050565b6080516104eb620005006000396000818160370152607401526104eb6000f3fe60806040526004361061001e5760003560e01c80638b3240a014610028575b610026610072565b005b34801561003457600080fd5b507f00000000000000000000000000000000000000000000000000000000000000006040516001600160a01b03909116815260200160405180910390f35b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031633036100df576000356001600160e01b03191663278f794360e11b146100d5576040516334ad5dbb60e21b815260040160405180910390fd5b6100dd6100ec565b565b6100dd61011b565b905090565b6000806100fc3660048184610376565b81019061010991906103b6565b91509150610117828261012b565b5050565b6100dd610126610186565b6101b9565b610134826101dd565b6040516001600160a01b038316907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a280511561017e576101798282610259565b505050565b6101176102cf565b60006100e77f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc546001600160a01b031690565b3660008037600080366000845af43d6000803e8080156101d8573d6000f35b3d6000fd5b806001600160a01b03163b60000361021857604051634c9c8ce360e01b81526001600160a01b03821660048201526024015b60405180910390fd5b7f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc80546001600160a01b0319166001600160a01b0392909216919091179055565b6060600080846001600160a01b0316846040516102769190610486565b600060405180830381855af49150503d80600081146102b1576040519150601f19603f3d011682016040523d82523d6000602084013e6102b6565b606091505b50915091506102c68583836102ee565b95945050505050565b34156100dd5760405163b398979f60e01b815260040160405180910390fd5b606082610303576102fe8261034d565b610346565b815115801561031a57506001600160a01b0384163b155b1561034357604051639996b31560e01b81526001600160a01b038516600482015260240161020f565b50805b9392505050565b80511561035d5780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b6000808585111561038657600080fd5b8386111561039357600080fd5b5050820193919092039150565b634e487b7160e01b600052604160045260246000fd5b600080604083850312156103c957600080fd5b82356001600160a01b03811681146103e057600080fd5b9150602083013567ffffffffffffffff808211156103fd57600080fd5b818501915085601f83011261041157600080fd5b813581811115610423576104236103a0565b604051601f8201601f19908116603f0116810190838211818310171561044b5761044b6103a0565b8160405282815288602084870101111561046457600080fd5b8260208601602083013760006020848301015280955050505050509250929050565b6000825160005b818110156104a7576020818601810151858301520161048d565b50600092019182525091905056fea26469706673582212207ccd55bcf74484fb7eef473db81b031299bb67c0edc154b0af62f736ec9caf5d64736f6c63430008140033608060405234801561001057600080fd5b5060405161052438038061052483398101604081905261002f916100be565b806001600160a01b03811661005e57604051631e4fbdf760e01b81526000600482015260240160405180910390fd5b6100678161006e565b50506100ee565b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b6000602082840312156100d057600080fd5b81516001600160a01b03811681146100e757600080fd5b9392505050565b610427806100fd6000396000f3fe60806040526004361061004a5760003560e01c8063715018a61461004f5780638da5cb5b146100665780639623609d14610093578063ad3cb1cc146100a6578063f2fde38b146100e4575b600080fd5b34801561005b57600080fd5b50610064610104565b005b34801561007257600080fd5b506000546040516001600160a01b0390911681526020015b60405180910390f35b6100646100a1366004610272565b610118565b3480156100b257600080fd5b506100d7604051806040016040528060058152602001640352e302e360dc1b81525081565b60405161008a919061038e565b3480156100f057600080fd5b506100646100ff3660046103a8565b610187565b61010c6101ca565b61011660006101f7565b565b6101206101ca565b60405163278f794360e11b81526001600160a01b03841690634f1ef28690349061015090869086906004016103c5565b6000604051808303818588803b15801561016957600080fd5b505af115801561017d573d6000803e3d6000fd5b5050505050505050565b61018f6101ca565b6001600160a01b0381166101be57604051631e4fbdf760e01b8152600060048201526024015b60405180910390fd5b6101c7816101f7565b50565b6000546001600160a01b031633146101165760405163118cdaa760e01b81523360048201526024016101b5565b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b6001600160a01b03811681146101c757600080fd5b634e487b7160e01b600052604160045260246000fd5b60008060006060848603121561028757600080fd5b833561029281610247565b925060208401356102a281610247565b9150604084013567ffffffffffffffff808211156102bf57600080fd5b818601915086601f8301126102d357600080fd5b8135818111156102e5576102e561025c565b604051601f8201601f19908116603f0116810190838211818310171561030d5761030d61025c565b8160405282815289602084870101111561032657600080fd5b8260208601602083013760006020848301015280955050505050509250925092565b6000815180845260005b8181101561036e57602081850181015186830182015201610352565b506000602082860101526020601f19601f83011685010191505092915050565b6020815260006103a16020830184610348565b9392505050565b6000602082840312156103ba57600080fd5b81356103a181610247565b6001600160a01b03831681526040602082018190526000906103e990830184610348565b94935050505056fea2646970667358221220f0b2d68a0060e1e014170ca14fc6dc543adce5c23840b5caa5f84f10d50459b364736f6c63430008140033b53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103",
-  "deployedBytecode": "0x60806040526004361061001e5760003560e01c80638b3240a014610028575b610026610072565b005b34801561003457600080fd5b507f00000000000000000000000000000000000000000000000000000000000000006040516001600160a01b03909116815260200160405180910390f35b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031633036100df576000356001600160e01b03191663278f794360e11b146100d5576040516334ad5dbb60e21b815260040160405180910390fd5b6100dd6100ec565b565b6100dd61011b565b905090565b6000806100fc3660048184610376565b81019061010991906103b6565b91509150610117828261012b565b5050565b6100dd610126610186565b6101b9565b610134826101dd565b6040516001600160a01b038316907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a280511561017e576101798282610259565b505050565b6101176102cf565b60006100e77f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc546001600160a01b031690565b3660008037600080366000845af43d6000803e8080156101d8573d6000f35b3d6000fd5b806001600160a01b03163b60000361021857604051634c9c8ce360e01b81526001600160a01b03821660048201526024015b60405180910390fd5b7f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc80546001600160a01b0319166001600160a01b0392909216919091179055565b6060600080846001600160a01b0316846040516102769190610486565b600060405180830381855af49150503d80600081146102b1576040519150601f19603f3d011682016040523d82523d6000602084013e6102b6565b606091505b50915091506102c68583836102ee565b95945050505050565b34156100dd5760405163b398979f60e01b815260040160405180910390fd5b606082610303576102fe8261034d565b610346565b815115801561031a57506001600160a01b0384163b155b1561034357604051639996b31560e01b81526001600160a01b038516600482015260240161020f565b50805b9392505050565b80511561035d5780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b6000808585111561038657600080fd5b8386111561039357600080fd5b5050820193919092039150565b634e487b7160e01b600052604160045260246000fd5b600080604083850312156103c957600080fd5b82356001600160a01b03811681146103e057600080fd5b9150602083013567ffffffffffffffff808211156103fd57600080fd5b818501915085601f83011261041157600080fd5b813581811115610423576104236103a0565b604051601f8201601f19908116603f0116810190838211818310171561044b5761044b6103a0565b8160405282815288602084870101111561046457600080fd5b8260208601602083013760006020848301015280955050505050509250929050565b6000825160005b818110156104a7576020818601810151858301520161048d565b50600092019182525091905056fea26469706673582212207ccd55bcf74484fb7eef473db81b031299bb67c0edc154b0af62f736ec9caf5d64736f6c63430008140033",
+  "bytecode": "0x60a06040523480156200001157600080fd5b5060405162000f2f38038062000f2f8339810160408190526200003491620003e1565b8282828281620000458282620000b0565b50508160405162000056906200037a565b6001600160a01b039091168152602001604051809103906000f08015801562000083573d6000803e3d6000fd5b506001600160a01b0316608052620000a46200009e60805190565b62000116565b505050505050620004df565b620000bb8262000188565b6040516001600160a01b038316907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a2805115620001085762000103828262000208565b505050565b6200011262000285565b5050565b7f7e644d79422f17c01e4894b5f4f588d331ebfa28653d42ae832dc59e38c9798f6200015860008051602062000f0f833981519152546001600160a01b031690565b604080516001600160a01b03928316815291841660208301520160405180910390a16200018581620002a7565b50565b806001600160a01b03163b600003620001c457604051634c9c8ce360e01b81526001600160a01b03821660048201526024015b60405180910390fd5b807f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc5b80546001600160a01b0319166001600160a01b039290921691909117905550565b6060600080846001600160a01b031684604051620002279190620004c1565b600060405180830381855af49150503d806000811462000264576040519150601f19603f3d011682016040523d82523d6000602084013e62000269565b606091505b5090925090506200027c858383620002ea565b95945050505050565b3415620002a55760405163b398979f60e01b815260040160405180910390fd5b565b6001600160a01b038116620002d357604051633173bdd160e11b815260006004820152602401620001bb565b8060008051602062000f0f833981519152620001e7565b6060826200030357620002fd8262000350565b62000349565b81511580156200031b57506001600160a01b0384163b155b156200034657604051639996b31560e01b81526001600160a01b0385166004820152602401620001bb565b50805b9392505050565b805115620003615780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b61052480620009eb83390190565b80516001600160a01b0381168114620003a057600080fd5b919050565b634e487b7160e01b600052604160045260246000fd5b60005b83811015620003d8578181015183820152602001620003be565b50506000910152565b600080600060608486031215620003f757600080fd5b620004028462000388565b9250620004126020850162000388565b60408501519092506001600160401b03808211156200043057600080fd5b818601915086601f8301126200044557600080fd5b8151818111156200045a576200045a620003a5565b604051601f8201601f19908116603f01168101908382118183101715620004855762000485620003a5565b816040528281528960208487010111156200049f57600080fd5b620004b2836020830160208801620003bb565b80955050505050509250925092565b60008251620004d5818460208701620003bb565b9190910192915050565b6080516104eb620005006000396000818160370152607401526104eb6000f3fe60806040526004361061001e5760003560e01c80638b3240a014610028575b610026610072565b005b34801561003457600080fd5b507f00000000000000000000000000000000000000000000000000000000000000006040516001600160a01b03909116815260200160405180910390f35b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031633036100df576000356001600160e01b03191663278f794360e11b146100d5576040516334ad5dbb60e21b815260040160405180910390fd5b6100dd6100ec565b565b6100dd61011b565b905090565b6000806100fc3660048184610376565b81019061010991906103b6565b91509150610117828261012b565b5050565b6100dd610126610186565b6101b9565b610134826101dd565b6040516001600160a01b038316907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a280511561017e576101798282610259565b505050565b6101176102cf565b60006100e77f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc546001600160a01b031690565b3660008037600080366000845af43d6000803e8080156101d8573d6000f35b3d6000fd5b806001600160a01b03163b60000361021857604051634c9c8ce360e01b81526001600160a01b03821660048201526024015b60405180910390fd5b7f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc80546001600160a01b0319166001600160a01b0392909216919091179055565b6060600080846001600160a01b0316846040516102769190610486565b600060405180830381855af49150503d80600081146102b1576040519150601f19603f3d011682016040523d82523d6000602084013e6102b6565b606091505b50915091506102c68583836102ee565b95945050505050565b34156100dd5760405163b398979f60e01b815260040160405180910390fd5b606082610303576102fe8261034d565b610346565b815115801561031a57506001600160a01b0384163b155b1561034357604051639996b31560e01b81526001600160a01b038516600482015260240161020f565b50805b9392505050565b80511561035d5780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b6000808585111561038657600080fd5b8386111561039357600080fd5b5050820193919092039150565b634e487b7160e01b600052604160045260246000fd5b600080604083850312156103c957600080fd5b82356001600160a01b03811681146103e057600080fd5b9150602083013567ffffffffffffffff808211156103fd57600080fd5b818501915085601f83011261041157600080fd5b813581811115610423576104236103a0565b604051601f8201601f19908116603f0116810190838211818310171561044b5761044b6103a0565b8160405282815288602084870101111561046457600080fd5b8260208601602083013760006020848301015280955050505050509250929050565b6000825160005b818110156104a7576020818601810151858301520161048d565b50600092019182525091905056fea2646970667358221220911c9b880fdf408e112bd8e81967b7aa574ec44f6f173114991cab2e2ef2636d64736f6c63430008140033608060405234801561001057600080fd5b5060405161052438038061052483398101604081905261002f916100be565b806001600160a01b03811661005e57604051631e4fbdf760e01b81526000600482015260240160405180910390fd5b6100678161006e565b50506100ee565b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b6000602082840312156100d057600080fd5b81516001600160a01b03811681146100e757600080fd5b9392505050565b610427806100fd6000396000f3fe60806040526004361061004a5760003560e01c8063715018a61461004f5780638da5cb5b146100665780639623609d14610093578063ad3cb1cc146100a6578063f2fde38b146100e4575b600080fd5b34801561005b57600080fd5b50610064610104565b005b34801561007257600080fd5b506000546040516001600160a01b0390911681526020015b60405180910390f35b6100646100a1366004610272565b610118565b3480156100b257600080fd5b506100d7604051806040016040528060058152602001640352e302e360dc1b81525081565b60405161008a919061038e565b3480156100f057600080fd5b506100646100ff3660046103a8565b610187565b61010c6101ca565b61011660006101f7565b565b6101206101ca565b60405163278f794360e11b81526001600160a01b03841690634f1ef28690349061015090869086906004016103c5565b6000604051808303818588803b15801561016957600080fd5b505af115801561017d573d6000803e3d6000fd5b5050505050505050565b61018f6101ca565b6001600160a01b0381166101be57604051631e4fbdf760e01b8152600060048201526024015b60405180910390fd5b6101c7816101f7565b50565b6000546001600160a01b031633146101165760405163118cdaa760e01b81523360048201526024016101b5565b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b6001600160a01b03811681146101c757600080fd5b634e487b7160e01b600052604160045260246000fd5b60008060006060848603121561028757600080fd5b833561029281610247565b925060208401356102a281610247565b9150604084013567ffffffffffffffff808211156102bf57600080fd5b818601915086601f8301126102d357600080fd5b8135818111156102e5576102e561025c565b604051601f8201601f19908116603f0116810190838211818310171561030d5761030d61025c565b8160405282815289602084870101111561032657600080fd5b8260208601602083013760006020848301015280955050505050509250925092565b6000815180845260005b8181101561036e57602081850181015186830182015201610352565b506000602082860101526020601f19601f83011685010191505092915050565b6020815260006103a16020830184610348565b9392505050565b6000602082840312156103ba57600080fd5b81356103a181610247565b6001600160a01b03831681526040602082018190526000906103e990830184610348565b94935050505056fea2646970667358221220cb46d8eee562c2068d4d3afab9e2a7f48be119bb61a6a1c3d7ef6ba5a8aff09464736f6c63430008140033b53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103",
+  "deployedBytecode": "0x60806040526004361061001e5760003560e01c80638b3240a014610028575b610026610072565b005b34801561003457600080fd5b507f00000000000000000000000000000000000000000000000000000000000000006040516001600160a01b03909116815260200160405180910390f35b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031633036100df576000356001600160e01b03191663278f794360e11b146100d5576040516334ad5dbb60e21b815260040160405180910390fd5b6100dd6100ec565b565b6100dd61011b565b905090565b6000806100fc3660048184610376565b81019061010991906103b6565b91509150610117828261012b565b5050565b6100dd610126610186565b6101b9565b610134826101dd565b6040516001600160a01b038316907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a280511561017e576101798282610259565b505050565b6101176102cf565b60006100e77f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc546001600160a01b031690565b3660008037600080366000845af43d6000803e8080156101d8573d6000f35b3d6000fd5b806001600160a01b03163b60000361021857604051634c9c8ce360e01b81526001600160a01b03821660048201526024015b60405180910390fd5b7f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc80546001600160a01b0319166001600160a01b0392909216919091179055565b6060600080846001600160a01b0316846040516102769190610486565b600060405180830381855af49150503d80600081146102b1576040519150601f19603f3d011682016040523d82523d6000602084013e6102b6565b606091505b50915091506102c68583836102ee565b95945050505050565b34156100dd5760405163b398979f60e01b815260040160405180910390fd5b606082610303576102fe8261034d565b610346565b815115801561031a57506001600160a01b0384163b155b1561034357604051639996b31560e01b81526001600160a01b038516600482015260240161020f565b50805b9392505050565b80511561035d5780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b6000808585111561038657600080fd5b8386111561039357600080fd5b5050820193919092039150565b634e487b7160e01b600052604160045260246000fd5b600080604083850312156103c957600080fd5b82356001600160a01b03811681146103e057600080fd5b9150602083013567ffffffffffffffff808211156103fd57600080fd5b818501915085601f83011261041157600080fd5b813581811115610423576104236103a0565b604051601f8201601f19908116603f0116810190838211818310171561044b5761044b6103a0565b8160405282815288602084870101111561046457600080fd5b8260208601602083013760006020848301015280955050505050509250929050565b6000825160005b818110156104a7576020818601810151858301520161048d565b50600092019182525091905056fea2646970667358221220911c9b880fdf408e112bd8e81967b7aa574ec44f6f173114991cab2e2ef2636d64736f6c63430008140033",
   "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/22ace16a46acabda891a4eae781c3ca6.json"
 }

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

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

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

@@ -51,6 +51,87 @@
       "stateMutability": "nonpayable",
       "type": "constructor"
     },
+    {
+      "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",
@@ -234,7 +315,7 @@
       "outputs": [
         {
           "internalType": "NftId",
-          "name": "nftId",
+          "name": "",
           "type": "uint96"
         }
       ],
@@ -260,7 +341,7 @@
       "outputs": [
         {
           "internalType": "contract IRegistry",
-          "name": "registry",
+          "name": "",
           "type": "address"
         }
       ],
@@ -306,6 +387,13 @@
       "stateMutability": "view",
       "type": "function"
     },
+    {
+      "inputs": [],
+      "name": "linkToRegisteredNftId",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
     {
       "inputs": [],
       "name": "lock",
@@ -420,14 +508,26 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x60806040523480156200001157600080fd5b5060405162001a3838038062001a38833981016040819052620000349162000778565b85858585858585858560786301ffc9a760e01b60009081526020527f67be87c3ff9960ca1e9cfac5cab2ff4747269cf9ed20c9b7306235ac35a491c5805460ff19166001908117909155856040805160208101909152600081526200009e8787868686866200047f565b6000620000d27f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa300546001600160a01b031690565b6040516305247a1760e51b81526001600160601b03891660048201526001600160a01b03919091169063a48f42e090602401600060405180830381865afa15801562000122573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526200014c9190810190620008e1565b6080810151600580546001600160a01b0319166001600160a01b0390921691821790556040516301ffc9a760e01b8152630de7806f60e41b6004820152919250906301ffc9a790602401602060405180830381865afa158015620001b4573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620001da9190620009c7565b620002065760405162461bcd60e51b815260206004820152600060248201526044015b60405180910390fd5b600560009054906101000a90046001600160a01b03166001600160a01b0316636fa298536040518163ffffffff1660e01b8152600401602060405180830381865afa1580156200025a573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620002809190620009ec565b600180546001600160a01b03199081166001600160a01b0393841617825560038054309083161790556004805490911692891692909217909155631b1599eb60e21b60009081526020527f82dc1aafdf8e16d475718790c9464a2912866acb395e292abd1ea37be80f5b28805460ff1916909117905550506008805460ff19168a1515179055505085516006555050506020808401516007556005546040805163329802c760e21b815290516001600160a01b03909216935063ca600b1c9260048083019391928290030181865afa15801562000361573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620003879190620009ec565b60088054610100600160a81b0319166101006001600160a01b039384160217905560055460408051634288121d60e01b815290519190921691634288121d9160048083019260209291908290030181865afa158015620003eb573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620004119190620009ec565b600980546001600160a01b0319166001600160a01b039290921691909117905563b4d7c7a360e01b60009081526020527f28392f1ce6972666bf759ebdf276b971884e972a5de82920a201036d483f35c5805460ff1916600117905550505050505050505050505062000b67565b6001600160a01b038616620004d75760405162461bcd60e51b815260206004820152601b60248201527f4552524f523a5247422d3031303a52454749535452595f5a45524f00000000006044820152606401620001fd565b6040516301ffc9a760e01b8152636882e63f60e11b600482015286906001600160a01b038216906301ffc9a790602401602060405180830381865afa15801562000525573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906200054b9190620009c7565b620005995760405162461bcd60e51b815260206004820152601a60248201527f4552524f523a5247422d3031313a4e4f545f52454749535452590000000000006044820152606401620001fd565b6001600160a01b03818116600160a01b6001600160601b0389168102919091177f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa3009081557f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30180546001600160a01b031961ffff60a01b1990911660ff8b1690940260ff60a81b191693909317600160a81b8915150217929092169286169290921790557f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30262000669848262000a9b565b5063a6d3826560e01b60009081526020527f164a5a3a3a16df858f794c5fc01b962add2c2151ae53ddb31581eabdf1156730805460ff191660011790555050505050505050565b6001600160a01b0381168114620006c657600080fd5b50565b8051620006d681620006b0565b919050565b80516001600160601b0381168114620006d657600080fd5b80518015158114620006d657600080fd5b634e487b7160e01b600052604160045260246000fd5b60405160e081016001600160401b03811182821017156200073f576200073f62000704565b60405290565b604051601f8201601f191681016001600160401b038111828210171562000770576200077062000704565b604052919050565b60008060008060008086880360e08112156200079357600080fd5b8751620007a081620006b0565b9650620007b060208901620006db565b95506040880151620007c281620006b0565b9450620007d260608901620006f3565b93506040607f1982011215620007e757600080fd5b50604080519081016001600160401b03811182821017156200080d576200080d62000704565b6040526080880151815260a0880151602082015260c08801519092506200083481620006b0565b809150509295509295509295565b805160ff81168114620006d657600080fd5b600082601f8301126200086657600080fd5b81516001600160401b0381111562000882576200088262000704565b602062000898601f8301601f1916820162000745565b8281528582848701011115620008ad57600080fd5b60005b83811015620008cd578581018301518282018401528201620008b0565b506000928101909101919091529392505050565b600060208284031215620008f457600080fd5b81516001600160401b03808211156200090c57600080fd5b9083019060e082860312156200092157600080fd5b6200092b6200071a565b6200093683620006db565b81526200094660208401620006db565b6020820152620009596040840162000842565b60408201526200096c60608401620006f3565b60608201526200097f60808401620006c9565b60808201526200099260a08401620006c9565b60a082015260c083015182811115620009aa57600080fd5b620009b88782860162000854565b60c08301525095945050505050565b600060208284031215620009da57600080fd5b620009e582620006f3565b9392505050565b600060208284031215620009ff57600080fd5b8151620009e581620006b0565b600181811c9082168062000a2157607f821691505b60208210810362000a4257634e487b7160e01b600052602260045260246000fd5b50919050565b601f82111562000a9657600081815260208120601f850160051c8101602086101562000a715750805b601f850160051c820191505b8181101562000a925782815560010162000a7d565b5050505b505050565b81516001600160401b0381111562000ab75762000ab762000704565b62000acf8162000ac8845462000a0c565b8462000a48565b602080601f83116001811462000b07576000841562000aee5750858301515b600019600386901b1c1916600185901b17855562000a92565b600085815260208120601f198616915b8281101562000b385788860151825594840194600190910190840162000b17565b508582101562000b575787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b610ec18062000b776000396000f3fe608060405234801561001057600080fd5b50600436106101215760003560e01c80637c3d5166116100ad578063de7b5d1411610071578063de7b5d1414610280578063e214756714610291578063f7d39dea146102a5578063f80e2072146101ec578063f83d08ba146102b857600080fd5b80637c3d51661461023d57806387ef9ba014610252578063893d20e81461025d578063a69df4b514610265578063d16d0fe81461026d57600080fd5b806321df0da7116100f457806321df0da7146101c65780633f52c0f6146101d75780634cf30a84146101ec5780635ab1bd53146101ff578063644c45e01461021d57600080fd5b806301ffc9a7146101265780630fec111c14610168578063132996041461017e5780631eff4b22146101a3575b600080fd5b610153610134366004610a33565b6001600160e01b03191660009081526020819052604090205460ff1690565b60405190151581526020015b60405180910390f35b6101706102c0565b60405161015f929190610aaa565b6003546001600160a01b03165b6040516001600160a01b03909116815260200161015f565b6101b8600080516020610e6c83398151915281565b60405190815260200161015f565b6004546001600160a01b031661018b565b6101ea6101e5366004610bba565b610347565b005b6101ea6101fa366004610c09565b6103b0565b600080516020610e6c833981519152546001600160a01b031661018b565b61022561041d565b6040516001600160601b03909116815260200161015f565b61024561049d565b60405161015f9190610c33565b60085460ff16610153565b61018b61064d565b6101ea6106c8565b6101b861027b366004610c09565b61078a565b6005546001600160a01b031661018b565b61015361029f366004610c4a565b50600090565b6101b86102b3366004610c09565b61079f565b6101ea61083a565b6040805160e08101825260008082526020820181905291810182905260608082018390526080820183905260a0820183905260c082018190529091806103046108cc565b506008546040805160065460208201526007548183015260ff90921615156060808401919091528151808403909101815260809092019052909590945092505050565b600854604051631fa9607b60e11b81526101009091046001600160a01b031690633f52c0f69061037b908490600401610c33565b600060405180830381600087803b15801561039557600080fd5b505af11580156103a9573d6000803e3d6000fd5b5050505050565b6009546001600160a01b031633146104195760405162461bcd60e51b815260206004820152602160248201527f4552524f523a504f4c2d3030323a4e4f545f50524f445543545f5345525649436044820152604560f81b60648201526084015b60405180910390fd5b5050565b6000600080516020610e6c83398151915254604051636939560f60e11b81523060048201526001600160a01b039091169063d272ac1e90602401602060405180830381865afa158015610474573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104989190610c7c565b905090565b60408051808201909152600080825260208201526005546000906001600160a01b0316639ae31ff56104cd61041d565b6040516001600160e01b031960e084901b1681526001600160601b039091166004820152602401602060405180830381865afa158015610511573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105359190610c7c565b60055460405163278b381b60e01b81526001600160601b03831660048201529192506001600160a01b03169063278b381b90602401602060405180830381865afa158015610587573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105ab9190610c97565b156106315760055460405163f2b246c360e01b81526001600160601b03831660048201526001600160a01b039091169063f2b246c3906024016101e060405180830381865afa158015610602573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106269190610d0c565b610100015191505090565b5050604080518082019091526006548152600754602082015290565b6000600080516020610e6c83398151915254604051630a57ebcf60e11b81523060048201526001600160a01b03909116906314afd79e90602401602060405180830381865afa1580156106a4573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104989190610dcb565b6106d061064d565b6001600160a01b0316336001600160a01b03161461072a5760405162461bcd60e51b815260206004820152601760248201527622a92927a91d2923a1169818189d2727aa2fa7aba722a960491b6044820152606401610410565b600154604051630bdb124f60e21b81523060048201526001600160a01b0390911690632f6c493c906024015b600060405180830381600087803b15801561077057600080fd5b505af1158015610784573d6000803e3d6000fd5b50505050565b60006107968282610de8565b90505b92915050565b6000806107aa61049d565b60405163012ebd8360e21b815281516004820152602082015160248201526044810185905290915073__$a23651848365a6a5ca15f07b4331037f48$__906304baf60c906064016040805180830381865af415801561080d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108319190610e0d565b50949350505050565b61084261064d565b6001600160a01b0316336001600160a01b03161461089c5760405162461bcd60e51b815260206004820152601760248201527622a92927a91d2923a1169818189d2727aa2fa7aba722a960491b6044820152606401610410565b60015460405163f435f5a760e01b81523060048201526001600160a01b039091169063f435f5a790602401610756565b6040805160e08101825260008082526020820181905291810182905260608082018390526080820183905260a082019290925260c081019190915260606000600080516020610e6c83398151915290506040518060e0016040528061092f600090565b6001600160601b0390811682528354600160a01b908190049091166020830152600184015490810460ff9081166040840152600160a81b820416151560608301523060808301526001600160a01b031660a082015260028301805460c09092019161099990610e31565b80601f01602080910402602001604051908101604052809291908181526020018280546109c590610e31565b8015610a125780601f106109e757610100808354040283529160200191610a12565b820191906000526020600020905b8154815290600101906020018083116109f557829003601f168201915b50505050508152506040518060200160405280600081525092509250509091565b600060208284031215610a4557600080fd5b81356001600160e01b031981168114610a5d57600080fd5b9392505050565b6000815180845260005b81811015610a8a57602081850181015186830182015201610a6e565b506000602082860101526020601f19601f83011685010191505092915050565b6040815260006001600160601b038085511660408401528060208601511660608401525060ff60408501511660808301526060840151610aee60a084018215159052565b5060808401516001600160a01b03811660c08401525060a08401516001600160a01b03811660e08401525060c084015160e0610100840152610b34610120840182610a64565b90508281036020840152610b488185610a64565b95945050505050565b6040805190810167ffffffffffffffff81118282101715610b8257634e487b7160e01b600052604160045260246000fd5b60405290565b604051610120810167ffffffffffffffff81118282101715610b8257634e487b7160e01b600052604160045260246000fd5b600060408284031215610bcc57600080fd5b610bd4610b51565b82358152602083013560208201528091505092915050565b80356001600160c01b031981168114610c0457600080fd5b919050565b60008060408385031215610c1c57600080fd5b610c2583610bec565b946020939093013593505050565b815181526020808301519082015260408101610799565b600060208284031215610c5c57600080fd5b61079682610bec565b80516001600160601b0381168114610c0457600080fd5b600060208284031215610c8e57600080fd5b61079682610c65565b600060208284031215610ca957600080fd5b81518015158114610a5d57600080fd5b6001600160a01b0381168114610cce57600080fd5b50565b8051610c0481610cb9565b600060408284031215610cee57600080fd5b610cf6610b51565b9050815181526020820151602082015292915050565b60006101e08284031215610d1f57600080fd5b610d27610b88565b610d3083610c65565b8152610d3e60208401610c65565b6020820152610d4f60408401610cd1565b6040820152610d618460608501610cdc565b6060820152610d738460a08501610cdc565b6080820152610d858460e08501610cdc565b60a0820152610d98846101208501610cdc565b60c0820152610dab846101608501610cdc565b60e0820152610dbe846101a08501610cdc565b6101008201529392505050565b600060208284031215610ddd57600080fd5b8151610a5d81610cb9565b808202811582820484141761079957634e487b7160e01b600052601160045260246000fd5b60008060408385031215610e2057600080fd5b505080516020909101519092909150565b600181811c90821680610e4557607f821691505b602082108103610e6557634e487b7160e01b600052602260045260246000fd5b5091905056fe6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa300a26469706673582212207b8ce5695dad346983644396f1c0fc7fb7008c1509ea52bc888e82c3a3ea40be64736f6c63430008140033",
-  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106101215760003560e01c80637c3d5166116100ad578063de7b5d1411610071578063de7b5d1414610280578063e214756714610291578063f7d39dea146102a5578063f80e2072146101ec578063f83d08ba146102b857600080fd5b80637c3d51661461023d57806387ef9ba014610252578063893d20e81461025d578063a69df4b514610265578063d16d0fe81461026d57600080fd5b806321df0da7116100f457806321df0da7146101c65780633f52c0f6146101d75780634cf30a84146101ec5780635ab1bd53146101ff578063644c45e01461021d57600080fd5b806301ffc9a7146101265780630fec111c14610168578063132996041461017e5780631eff4b22146101a3575b600080fd5b610153610134366004610a33565b6001600160e01b03191660009081526020819052604090205460ff1690565b60405190151581526020015b60405180910390f35b6101706102c0565b60405161015f929190610aaa565b6003546001600160a01b03165b6040516001600160a01b03909116815260200161015f565b6101b8600080516020610e6c83398151915281565b60405190815260200161015f565b6004546001600160a01b031661018b565b6101ea6101e5366004610bba565b610347565b005b6101ea6101fa366004610c09565b6103b0565b600080516020610e6c833981519152546001600160a01b031661018b565b61022561041d565b6040516001600160601b03909116815260200161015f565b61024561049d565b60405161015f9190610c33565b60085460ff16610153565b61018b61064d565b6101ea6106c8565b6101b861027b366004610c09565b61078a565b6005546001600160a01b031661018b565b61015361029f366004610c4a565b50600090565b6101b86102b3366004610c09565b61079f565b6101ea61083a565b6040805160e08101825260008082526020820181905291810182905260608082018390526080820183905260a0820183905260c082018190529091806103046108cc565b506008546040805160065460208201526007548183015260ff90921615156060808401919091528151808403909101815260809092019052909590945092505050565b600854604051631fa9607b60e11b81526101009091046001600160a01b031690633f52c0f69061037b908490600401610c33565b600060405180830381600087803b15801561039557600080fd5b505af11580156103a9573d6000803e3d6000fd5b5050505050565b6009546001600160a01b031633146104195760405162461bcd60e51b815260206004820152602160248201527f4552524f523a504f4c2d3030323a4e4f545f50524f445543545f5345525649436044820152604560f81b60648201526084015b60405180910390fd5b5050565b6000600080516020610e6c83398151915254604051636939560f60e11b81523060048201526001600160a01b039091169063d272ac1e90602401602060405180830381865afa158015610474573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104989190610c7c565b905090565b60408051808201909152600080825260208201526005546000906001600160a01b0316639ae31ff56104cd61041d565b6040516001600160e01b031960e084901b1681526001600160601b039091166004820152602401602060405180830381865afa158015610511573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105359190610c7c565b60055460405163278b381b60e01b81526001600160601b03831660048201529192506001600160a01b03169063278b381b90602401602060405180830381865afa158015610587573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105ab9190610c97565b156106315760055460405163f2b246c360e01b81526001600160601b03831660048201526001600160a01b039091169063f2b246c3906024016101e060405180830381865afa158015610602573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106269190610d0c565b610100015191505090565b5050604080518082019091526006548152600754602082015290565b6000600080516020610e6c83398151915254604051630a57ebcf60e11b81523060048201526001600160a01b03909116906314afd79e90602401602060405180830381865afa1580156106a4573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104989190610dcb565b6106d061064d565b6001600160a01b0316336001600160a01b03161461072a5760405162461bcd60e51b815260206004820152601760248201527622a92927a91d2923a1169818189d2727aa2fa7aba722a960491b6044820152606401610410565b600154604051630bdb124f60e21b81523060048201526001600160a01b0390911690632f6c493c906024015b600060405180830381600087803b15801561077057600080fd5b505af1158015610784573d6000803e3d6000fd5b50505050565b60006107968282610de8565b90505b92915050565b6000806107aa61049d565b60405163012ebd8360e21b815281516004820152602082015160248201526044810185905290915073__$a23651848365a6a5ca15f07b4331037f48$__906304baf60c906064016040805180830381865af415801561080d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108319190610e0d565b50949350505050565b61084261064d565b6001600160a01b0316336001600160a01b03161461089c5760405162461bcd60e51b815260206004820152601760248201527622a92927a91d2923a1169818189d2727aa2fa7aba722a960491b6044820152606401610410565b60015460405163f435f5a760e01b81523060048201526001600160a01b039091169063f435f5a790602401610756565b6040805160e08101825260008082526020820181905291810182905260608082018390526080820183905260a082019290925260c081019190915260606000600080516020610e6c83398151915290506040518060e0016040528061092f600090565b6001600160601b0390811682528354600160a01b908190049091166020830152600184015490810460ff9081166040840152600160a81b820416151560608301523060808301526001600160a01b031660a082015260028301805460c09092019161099990610e31565b80601f01602080910402602001604051908101604052809291908181526020018280546109c590610e31565b8015610a125780601f106109e757610100808354040283529160200191610a12565b820191906000526020600020905b8154815290600101906020018083116109f557829003601f168201915b50505050508152506040518060200160405280600081525092509250509091565b600060208284031215610a4557600080fd5b81356001600160e01b031981168114610a5d57600080fd5b9392505050565b6000815180845260005b81811015610a8a57602081850181015186830182015201610a6e565b506000602082860101526020601f19601f83011685010191505092915050565b6040815260006001600160601b038085511660408401528060208601511660608401525060ff60408501511660808301526060840151610aee60a084018215159052565b5060808401516001600160a01b03811660c08401525060a08401516001600160a01b03811660e08401525060c084015160e0610100840152610b34610120840182610a64565b90508281036020840152610b488185610a64565b95945050505050565b6040805190810167ffffffffffffffff81118282101715610b8257634e487b7160e01b600052604160045260246000fd5b60405290565b604051610120810167ffffffffffffffff81118282101715610b8257634e487b7160e01b600052604160045260246000fd5b600060408284031215610bcc57600080fd5b610bd4610b51565b82358152602083013560208201528091505092915050565b80356001600160c01b031981168114610c0457600080fd5b919050565b60008060408385031215610c1c57600080fd5b610c2583610bec565b946020939093013593505050565b815181526020808301519082015260408101610799565b600060208284031215610c5c57600080fd5b61079682610bec565b80516001600160601b0381168114610c0457600080fd5b600060208284031215610c8e57600080fd5b61079682610c65565b600060208284031215610ca957600080fd5b81518015158114610a5d57600080fd5b6001600160a01b0381168114610cce57600080fd5b50565b8051610c0481610cb9565b600060408284031215610cee57600080fd5b610cf6610b51565b9050815181526020820151602082015292915050565b60006101e08284031215610d1f57600080fd5b610d27610b88565b610d3083610c65565b8152610d3e60208401610c65565b6020820152610d4f60408401610cd1565b6040820152610d618460608501610cdc565b6060820152610d738460a08501610cdc565b6080820152610d858460e08501610cdc565b60a0820152610d98846101208501610cdc565b60c0820152610dab846101608501610cdc565b60e0820152610dbe846101a08501610cdc565b6101008201529392505050565b600060208284031215610ddd57600080fd5b8151610a5d81610cb9565b808202811582820484141761079957634e487b7160e01b600052601160045260246000fd5b60008060408385031215610e2057600080fd5b505080516020909101519092909150565b600181811c90821680610e4557607f821691505b602082108103610e6557634e487b7160e01b600052602260045260246000fd5b5091905056fe6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa300a26469706673582212207b8ce5695dad346983644396f1c0fc7fb7008c1509ea52bc888e82c3a3ea40be64736f6c63430008140033",
+  "bytecode": "0x60806040523480156200001157600080fd5b5060405162001c7c38038062001c7c8339810160408190526200003491620007a2565b85858585858585858560786301ffc9a760e01b60009081526020527f67be87c3ff9960ca1e9cfac5cab2ff4747269cf9ed20c9b7306235ac35a491c5805460ff1916600190811790915585600280546001600160a01b03191633179055604080516020810190915260008152620000b087878686868662000472565b6000620000c56001546001600160a01b031690565b6040516305247a1760e51b81526001600160601b03891660048201526001600160a01b03919091169063a48f42e090602401600060405180830381865afa15801562000115573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526200013f91908101906200090b565b6080810151600780546001600160a01b0319166001600160a01b0390921691821790556040516301ffc9a760e01b8152630de7806f60e41b6004820152919250906301ffc9a790602401602060405180830381865afa158015620001a7573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620001cd9190620009f1565b620001f95760405162461bcd60e51b815260206004820152600060248201526044015b60405180910390fd5b600760009054906101000a90046001600160a01b03166001600160a01b0316636fa298536040518163ffffffff1660e01b8152600401602060405180830381865afa1580156200024d573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019062000273919062000a16565b600380546001600160a01b03199081166001600160a01b0393841617909155600580543090831617905560068054909116918816919091179055631b1599eb60e21b60009081526020527f82dc1aafdf8e16d475718790c9464a2912866acb395e292abd1ea37be80f5b28805460ff191660011790555050600a805460ff19168a1515179055505085516008555050506020808401516009556007546040805163329802c760e21b815290516001600160a01b03909216935063ca600b1c9260048083019391928290030181865afa15801562000354573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906200037a919062000a16565b600a8054610100600160a81b0319166101006001600160a01b039384160217905560075460408051634288121d60e01b815290519190921691634288121d9160048083019260209291908290030181865afa158015620003de573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019062000404919062000a16565b600b80546001600160a01b0319166001600160a01b039290921691909117905563b4d7c7a360e01b60009081526020527f28392f1ce6972666bf759ebdf276b971884e972a5de82920a201036d483f35c5805460ff1916600117905550505050505050505050505062000b91565b6200047e828762000543565b60007f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30080546001600160601b0388166001600160681b0319909116176c0100000000000000000000000060ff8816021760ff60681b19166d010000000000000000000000000086151502178155905060018101620004fd838262000ac5565b506303fb044760e21b60009081526020527fb43e4f3791bfcdefa3a0fbe2a5555f8d6490b90e01de0ff40c66f18b49b562c5805460ff1916600117905550505050505050565b600280546001600160a01b0319166001600160a01b03841617905562000569816200056d565b5050565b6001546001600160a01b031615620005a85760015460405163fcdbf2d960e01b81526001600160a01b039091166004820152602401620001f0565b6001600160a01b038116620005d05760405163f5c4d07d60e01b815260040160405180910390fd5b806001600160a01b03163b600003620006085760405163fdeac91f60e01b81526001600160a01b0382166004820152602401620001f0565b600180546001600160a01b0319166001600160a01b0383169081179091556040516301ffc9a760e01b815263350fb35160e11b60048201526301ffc9a790602401602060405180830381865afa92505050801562000685575060408051601f3d908101601f191682019092526200068291810190620009f1565b60015b620006af5760405163fdeac91f60e01b81526001600160a01b0382166004820152602401620001f0565b80620005695760405163fdeac91f60e01b81526001600160a01b0383166004820152602401620001f0565b50565b6001600160a01b0381168114620006da57600080fd5b80516200070081620006dd565b919050565b80516001600160601b03811681146200070057600080fd5b805180151581146200070057600080fd5b634e487b7160e01b600052604160045260246000fd5b60405160e081016001600160401b03811182821017156200076957620007696200072e565b60405290565b604051601f8201601f191681016001600160401b03811182821017156200079a576200079a6200072e565b604052919050565b60008060008060008086880360e0811215620007bd57600080fd5b8751620007ca81620006dd565b9650620007da6020890162000705565b95506040880151620007ec81620006dd565b9450620007fc606089016200071d565b93506040607f19820112156200081157600080fd5b50604080519081016001600160401b03811182821017156200083757620008376200072e565b6040526080880151815260a0880151602082015260c08801519092506200085e81620006dd565b809150509295509295509295565b805160ff811681146200070057600080fd5b600082601f8301126200089057600080fd5b81516001600160401b03811115620008ac57620008ac6200072e565b6020620008c2601f8301601f191682016200076f565b8281528582848701011115620008d757600080fd5b60005b83811015620008f7578581018301518282018401528201620008da565b506000928101909101919091529392505050565b6000602082840312156200091e57600080fd5b81516001600160401b03808211156200093657600080fd5b9083019060e082860312156200094b57600080fd5b6200095562000744565b620009608362000705565b8152620009706020840162000705565b602082015262000983604084016200086c565b604082015262000996606084016200071d565b6060820152620009a960808401620006f3565b6080820152620009bc60a08401620006f3565b60a082015260c083015182811115620009d457600080fd5b620009e2878286016200087e565b60c08301525095945050505050565b60006020828403121562000a0457600080fd5b62000a0f826200071d565b9392505050565b60006020828403121562000a2957600080fd5b815162000a0f81620006dd565b600181811c9082168062000a4b57607f821691505b60208210810362000a6c57634e487b7160e01b600052602260045260246000fd5b50919050565b601f82111562000ac057600081815260208120601f850160051c8101602086101562000a9b5750805b601f850160051c820191505b8181101562000abc5782815560010162000aa7565b5050505b505050565b81516001600160401b0381111562000ae15762000ae16200072e565b62000af98162000af2845462000a36565b8462000a72565b602080601f83116001811462000b31576000841562000b185750858301515b600019600386901b1c1916600185901b17855562000abc565b600085815260208120601f198616915b8281101562000b625788860151825594840194600190910190840162000b41565b508582101562000b815787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b6110db8062000ba16000396000f3fe608060405234801561001057600080fd5b506004361061012c5760003560e01c80637c3d5166116100ad578063de7b5d1411610071578063de7b5d14146102a3578063e2147567146102b4578063f7d39dea146102c8578063f80e207214610211578063f83d08ba146102db57600080fd5b80637c3d51661461026057806387ef9ba014610275578063893d20e814610280578063a69df4b514610288578063d16d0fe81461029057600080fd5b806321df0da7116100f457806321df0da7146101ed5780633f52c0f6146101fe5780634cf30a84146102115780635ab1bd5314610224578063644c45e01461023557600080fd5b806301ffc9a7146101315780630fec111c146101735780631329960414610189578063138461e0146101ae5780631eff4b22146101b8575b600080fd5b61015e61013f366004610c6d565b6001600160e01b03191660009081526020819052604090205460ff1690565b60405190151581526020015b60405180910390f35b61017b6102e3565b60405161016a929190610ce4565b6005546001600160a01b03165b6040516001600160a01b03909116815260200161016a565b6101b661036a565b005b6101df7f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30081565b60405190815260200161016a565b6006546001600160a01b0316610196565b6101b661020c366004610df4565b61058c565b6101b661021f366004610e43565b6105f5565b6001546001600160a01b0316610196565b600154600160a01b90046001600160601b03166040516001600160601b03909116815260200161016a565b61026861065d565b60405161016a9190610e6d565b600a5460ff1661015e565b61019661081f565b6101b661093d565b6101df61029e366004610e43565b6109ba565b6007546001600160a01b0316610196565b61015e6102c2366004610e84565b50600090565b6101df6102d6366004610e43565b6109cf565b6101b6610a6a565b6040805160e08101825260008082526020820181905291810182905260608082018390526080820183905260a0820183905260c08201819052909180610327610ae7565b50600a546040805160085460208201526009548183015260ff90921615156060808401919091528151808403909101815260809092019052909590945092505050565b6001546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015273__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af41580156103cc573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103f09190610e9f565b15610437576001546040516316322c0f60e31b81526001600160a01b0382166004820152600160a01b9091046001600160601b031660248201526044015b60405180910390fd5b6001546001600160a01b03166104605760405163cf29926160e01b815260040160405180910390fd5b60015460405163c3c5a54760e01b81523060048201819052916001600160a01b03169063c3c5a54790602401602060405180830381865afa1580156104a9573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104cd9190610e9f565b6104f5576040516372657a5160e01b81526001600160a01b038216600482015260240161042e565b600154604051636939560f60e11b81526001600160a01b0383811660048301529091169063d272ac1e90602401602060405180830381865afa15801561053f573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105639190610ed8565b600160146101000a8154816001600160601b0302191690836001600160601b0316021790555050565b600a54604051631fa9607b60e11b81526101009091046001600160a01b031690633f52c0f6906105c0908490600401610e6d565b600060405180830381600087803b1580156105da57600080fd5b505af11580156105ee573d6000803e3d6000fd5b5050505050565b600b546001600160a01b031633146106595760405162461bcd60e51b815260206004820152602160248201527f4552524f523a504f4c2d3030323a4e4f545f50524f445543545f5345525649436044820152604560f81b606482015260840161042e565b5050565b60408051808201909152600080825260208201526007546000906001600160a01b0316639ae31ff561069f6001546001600160601b03600160a01b9091041690565b6040516001600160e01b031960e084901b1681526001600160601b039091166004820152602401602060405180830381865afa1580156106e3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906107079190610ed8565b60075460405163278b381b60e01b81526001600160601b03831660048201529192506001600160a01b03169063278b381b90602401602060405180830381865afa158015610759573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061077d9190610e9f565b156108035760075460405163f2b246c360e01b81526001600160601b03831660048201526001600160a01b039091169063f2b246c3906024016101e060405180830381865afa1580156107d4573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906107f89190610f46565b610100015191505090565b5050604080518082019091526008548152600954602082015290565b6001546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015260009073__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af4158015610884573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108a89190610e9f565b1561092d57600154604051631c5da14d60e11b8152600160a01b82046001600160601b031660048201526001600160a01b03909116906338bb429a90602401602060405180830381865afa158015610904573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906109289190611005565b905090565b506002546001600160a01b031690565b600061094761081f565b90506001600160a01b0381161580159061096a5750336001600160a01b03821614155b1561098a5760405163700dd81160e01b815233600482015260240161042e565b600354604051630bdb124f60e21b81523060048201526001600160a01b0390911690632f6c493c906024016105c0565b60006109c68282611022565b90505b92915050565b6000806109da61065d565b60405163012ebd8360e21b815281516004820152602082015160248201526044810185905290915073__$a23651848365a6a5ca15f07b4331037f48$__906304baf60c906064016040805180830381865af4158015610a3d573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a619190611047565b50949350505050565b6000610a7461081f565b90506001600160a01b03811615801590610a975750336001600160a01b03821614155b15610ab75760405163700dd81160e01b815233600482015260240161042e565b60035460405163f435f5a760e01b81523060048201526001600160a01b039091169063f435f5a7906024016105c0565b6040805160e08101825260008082526020820181905291810182905260608082018390526080820183905260a082019290925260c0810191909152606060007f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30090506040518060e00160405280610b6e6001546001600160601b03600160a01b9091041690565b6001600160601b0390811682528354908116602083015260ff600160601b820481166040840152600160681b909104161515606082015230608082015260a001610bb661081f565b6001600160a01b03168152602001826001018054610bd39061106b565b80601f0160208091040260200160405190810160405280929190818152602001828054610bff9061106b565b8015610c4c5780601f10610c2157610100808354040283529160200191610c4c565b820191906000526020600020905b815481529060010190602001808311610c2f57829003601f168201915b50505050508152506040518060200160405280600081525092509250509091565b600060208284031215610c7f57600080fd5b81356001600160e01b031981168114610c9757600080fd5b9392505050565b6000815180845260005b81811015610cc457602081850181015186830182015201610ca8565b506000602082860101526020601f19601f83011685010191505092915050565b6040815260006001600160601b038085511660408401528060208601511660608401525060ff60408501511660808301526060840151610d2860a084018215159052565b5060808401516001600160a01b03811660c08401525060a08401516001600160a01b03811660e08401525060c084015160e0610100840152610d6e610120840182610c9e565b90508281036020840152610d828185610c9e565b95945050505050565b6040805190810167ffffffffffffffff81118282101715610dbc57634e487b7160e01b600052604160045260246000fd5b60405290565b604051610120810167ffffffffffffffff81118282101715610dbc57634e487b7160e01b600052604160045260246000fd5b600060408284031215610e0657600080fd5b610e0e610d8b565b82358152602083013560208201528091505092915050565b80356001600160c01b031981168114610e3e57600080fd5b919050565b60008060408385031215610e5657600080fd5b610e5f83610e26565b946020939093013593505050565b8151815260208083015190820152604081016109c9565b600060208284031215610e9657600080fd5b6109c682610e26565b600060208284031215610eb157600080fd5b81518015158114610c9757600080fd5b80516001600160601b0381168114610e3e57600080fd5b600060208284031215610eea57600080fd5b6109c682610ec1565b6001600160a01b0381168114610f0857600080fd5b50565b8051610e3e81610ef3565b600060408284031215610f2857600080fd5b610f30610d8b565b9050815181526020820151602082015292915050565b60006101e08284031215610f5957600080fd5b610f61610dc2565b610f6a83610ec1565b8152610f7860208401610ec1565b6020820152610f8960408401610f0b565b6040820152610f9b8460608501610f16565b6060820152610fad8460a08501610f16565b6080820152610fbf8460e08501610f16565b60a0820152610fd2846101208501610f16565b60c0820152610fe5846101608501610f16565b60e0820152610ff8846101a08501610f16565b6101008201529392505050565b60006020828403121561101757600080fd5b8151610c9781610ef3565b80820281158282048414176109c957634e487b7160e01b600052601160045260246000fd5b6000806040838503121561105a57600080fd5b505080516020909101519092909150565b600181811c9082168061107f57607f821691505b60208210810361109f57634e487b7160e01b600052602260045260246000fd5b5091905056fea264697066735822122043cd45c973da271c57d66feeeda8493db08b220c6f442450676c8e40256f646764736f6c63430008140033",
+  "deployedBytecode": "0x608060405234801561001057600080fd5b506004361061012c5760003560e01c80637c3d5166116100ad578063de7b5d1411610071578063de7b5d14146102a3578063e2147567146102b4578063f7d39dea146102c8578063f80e207214610211578063f83d08ba146102db57600080fd5b80637c3d51661461026057806387ef9ba014610275578063893d20e814610280578063a69df4b514610288578063d16d0fe81461029057600080fd5b806321df0da7116100f457806321df0da7146101ed5780633f52c0f6146101fe5780634cf30a84146102115780635ab1bd5314610224578063644c45e01461023557600080fd5b806301ffc9a7146101315780630fec111c146101735780631329960414610189578063138461e0146101ae5780631eff4b22146101b8575b600080fd5b61015e61013f366004610c6d565b6001600160e01b03191660009081526020819052604090205460ff1690565b60405190151581526020015b60405180910390f35b61017b6102e3565b60405161016a929190610ce4565b6005546001600160a01b03165b6040516001600160a01b03909116815260200161016a565b6101b661036a565b005b6101df7f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30081565b60405190815260200161016a565b6006546001600160a01b0316610196565b6101b661020c366004610df4565b61058c565b6101b661021f366004610e43565b6105f5565b6001546001600160a01b0316610196565b600154600160a01b90046001600160601b03166040516001600160601b03909116815260200161016a565b61026861065d565b60405161016a9190610e6d565b600a5460ff1661015e565b61019661081f565b6101b661093d565b6101df61029e366004610e43565b6109ba565b6007546001600160a01b0316610196565b61015e6102c2366004610e84565b50600090565b6101df6102d6366004610e43565b6109cf565b6101b6610a6a565b6040805160e08101825260008082526020820181905291810182905260608082018390526080820183905260a0820183905260c08201819052909180610327610ae7565b50600a546040805160085460208201526009548183015260ff90921615156060808401919091528151808403909101815260809092019052909590945092505050565b6001546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015273__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af41580156103cc573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103f09190610e9f565b15610437576001546040516316322c0f60e31b81526001600160a01b0382166004820152600160a01b9091046001600160601b031660248201526044015b60405180910390fd5b6001546001600160a01b03166104605760405163cf29926160e01b815260040160405180910390fd5b60015460405163c3c5a54760e01b81523060048201819052916001600160a01b03169063c3c5a54790602401602060405180830381865afa1580156104a9573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104cd9190610e9f565b6104f5576040516372657a5160e01b81526001600160a01b038216600482015260240161042e565b600154604051636939560f60e11b81526001600160a01b0383811660048301529091169063d272ac1e90602401602060405180830381865afa15801561053f573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105639190610ed8565b600160146101000a8154816001600160601b0302191690836001600160601b0316021790555050565b600a54604051631fa9607b60e11b81526101009091046001600160a01b031690633f52c0f6906105c0908490600401610e6d565b600060405180830381600087803b1580156105da57600080fd5b505af11580156105ee573d6000803e3d6000fd5b5050505050565b600b546001600160a01b031633146106595760405162461bcd60e51b815260206004820152602160248201527f4552524f523a504f4c2d3030323a4e4f545f50524f445543545f5345525649436044820152604560f81b606482015260840161042e565b5050565b60408051808201909152600080825260208201526007546000906001600160a01b0316639ae31ff561069f6001546001600160601b03600160a01b9091041690565b6040516001600160e01b031960e084901b1681526001600160601b039091166004820152602401602060405180830381865afa1580156106e3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906107079190610ed8565b60075460405163278b381b60e01b81526001600160601b03831660048201529192506001600160a01b03169063278b381b90602401602060405180830381865afa158015610759573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061077d9190610e9f565b156108035760075460405163f2b246c360e01b81526001600160601b03831660048201526001600160a01b039091169063f2b246c3906024016101e060405180830381865afa1580156107d4573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906107f89190610f46565b610100015191505090565b5050604080518082019091526008548152600954602082015290565b6001546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015260009073__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af4158015610884573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108a89190610e9f565b1561092d57600154604051631c5da14d60e11b8152600160a01b82046001600160601b031660048201526001600160a01b03909116906338bb429a90602401602060405180830381865afa158015610904573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906109289190611005565b905090565b506002546001600160a01b031690565b600061094761081f565b90506001600160a01b0381161580159061096a5750336001600160a01b03821614155b1561098a5760405163700dd81160e01b815233600482015260240161042e565b600354604051630bdb124f60e21b81523060048201526001600160a01b0390911690632f6c493c906024016105c0565b60006109c68282611022565b90505b92915050565b6000806109da61065d565b60405163012ebd8360e21b815281516004820152602082015160248201526044810185905290915073__$a23651848365a6a5ca15f07b4331037f48$__906304baf60c906064016040805180830381865af4158015610a3d573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a619190611047565b50949350505050565b6000610a7461081f565b90506001600160a01b03811615801590610a975750336001600160a01b03821614155b15610ab75760405163700dd81160e01b815233600482015260240161042e565b60035460405163f435f5a760e01b81523060048201526001600160a01b039091169063f435f5a7906024016105c0565b6040805160e08101825260008082526020820181905291810182905260608082018390526080820183905260a082019290925260c0810191909152606060007f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30090506040518060e00160405280610b6e6001546001600160601b03600160a01b9091041690565b6001600160601b0390811682528354908116602083015260ff600160601b820481166040840152600160681b909104161515606082015230608082015260a001610bb661081f565b6001600160a01b03168152602001826001018054610bd39061106b565b80601f0160208091040260200160405190810160405280929190818152602001828054610bff9061106b565b8015610c4c5780601f10610c2157610100808354040283529160200191610c4c565b820191906000526020600020905b815481529060010190602001808311610c2f57829003601f168201915b50505050508152506040518060200160405280600081525092509250509091565b600060208284031215610c7f57600080fd5b81356001600160e01b031981168114610c9757600080fd5b9392505050565b6000815180845260005b81811015610cc457602081850181015186830182015201610ca8565b506000602082860101526020601f19601f83011685010191505092915050565b6040815260006001600160601b038085511660408401528060208601511660608401525060ff60408501511660808301526060840151610d2860a084018215159052565b5060808401516001600160a01b03811660c08401525060a08401516001600160a01b03811660e08401525060c084015160e0610100840152610d6e610120840182610c9e565b90508281036020840152610d828185610c9e565b95945050505050565b6040805190810167ffffffffffffffff81118282101715610dbc57634e487b7160e01b600052604160045260246000fd5b60405290565b604051610120810167ffffffffffffffff81118282101715610dbc57634e487b7160e01b600052604160045260246000fd5b600060408284031215610e0657600080fd5b610e0e610d8b565b82358152602083013560208201528091505092915050565b80356001600160c01b031981168114610e3e57600080fd5b919050565b60008060408385031215610e5657600080fd5b610e5f83610e26565b946020939093013593505050565b8151815260208083015190820152604081016109c9565b600060208284031215610e9657600080fd5b6109c682610e26565b600060208284031215610eb157600080fd5b81518015158114610c9757600080fd5b80516001600160601b0381168114610e3e57600080fd5b600060208284031215610eea57600080fd5b6109c682610ec1565b6001600160a01b0381168114610f0857600080fd5b50565b8051610e3e81610ef3565b600060408284031215610f2857600080fd5b610f30610d8b565b9050815181526020820151602082015292915050565b60006101e08284031215610f5957600080fd5b610f61610dc2565b610f6a83610ec1565b8152610f7860208401610ec1565b6020820152610f8960408401610f0b565b6040820152610f9b8460608501610f16565b6060820152610fad8460a08501610f16565b6080820152610fbf8460e08501610f16565b60a0820152610fd2846101208501610f16565b60c0820152610fe5846101608501610f16565b60e0820152610ff8846101a08501610f16565b6101008201529392505050565b60006020828403121561101757600080fd5b8151610c9781610ef3565b80820281158282048414176109c957634e487b7160e01b600052601160045260246000fd5b6000806040838503121561105a57600080fd5b505080516020909101519092909150565b600181811c9082168061107f57607f821691505b60208210810361109f57634e487b7160e01b600052602260045260246000fd5b5091905056fea264697066735822122043cd45c973da271c57d66feeeda8493db08b220c6f442450676c8e40256f646764736f6c63430008140033",
   "linkReferences": {
     "contracts/types/Fee.sol": {
       "FeeLib": [
         {
           "length": 20,
-          "start": 4939
+          "start": 5541
+        }
+      ]
+    },
+    "contracts/types/NftId.sol": {
+      "NftIdLib": [
+        {
+          "length": 20,
+          "start": 3891
+        },
+        {
+          "length": 20,
+          "start": 5099
         }
       ]
     }
@@ -437,7 +537,19 @@
       "FeeLib": [
         {
           "length": 20,
-          "start": 2004
+          "start": 2564
+        }
+      ]
+    },
+    "contracts/types/NftId.sol": {
+      "NftIdLib": [
+        {
+          "length": 20,
+          "start": 914
+        },
+        {
+          "length": 20,
+          "start": 2122
         }
       ]
     }

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/22ace16a46acabda891a4eae781c3ca6.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/TestPool.sol/TestPool.dbg.json

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