@etherisc/gif-next 0.0.2-e5a2253-213 → 0.0.2-e69072e-892

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

@@ -28,81 +28,60 @@
       "inputs": [
         {
           "internalType": "address",
-          "name": "registry",
+          "name": "caller",
           "type": "address"
-        },
-        {
-          "internalType": "NftId",
-          "name": "nftId",
-          "type": "uint96"
         }
       ],
-      "name": "ErrorAlreadyLinked",
+      "name": "ErrorIServiceCallerUnknown",
       "type": "error"
     },
     {
       "inputs": [
         {
-          "internalType": "address",
-          "name": "contractAddress",
-          "type": "address"
+          "internalType": "NftId",
+          "name": "nftId",
+          "type": "uint96"
         }
       ],
-      "name": "ErrorContractNotRegistered",
+      "name": "ErrorNftOwnableAlreadyLinked",
       "type": "error"
     },
     {
       "inputs": [
         {
           "internalType": "address",
-          "name": "account",
+          "name": "contractAddress",
           "type": "address"
         }
       ],
-      "name": "ErrorNotOwner",
+      "name": "ErrorNftOwnableContractNotRegistered",
       "type": "error"
     },
     {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "registryAddress",
-          "type": "address"
-        }
-      ],
-      "name": "ErrorNotRegistry",
+      "inputs": [],
+      "name": "ErrorNftOwnableInitialOwnerZero",
       "type": "error"
     },
     {
       "inputs": [
         {
           "internalType": "address",
-          "name": "registryAddress",
+          "name": "account",
           "type": "address"
         }
       ],
-      "name": "ErrorRegisterableNotRegistry",
-      "type": "error"
-    },
-    {
-      "inputs": [],
-      "name": "ErrorRegistryAddressZero",
+      "name": "ErrorNftOwnableNotOwner",
       "type": "error"
     },
     {
       "inputs": [
         {
           "internalType": "address",
-          "name": "registry",
+          "name": "registryAddress",
           "type": "address"
         }
       ],
-      "name": "ErrorRegistryAlreadyInitialized",
-      "type": "error"
-    },
-    {
-      "inputs": [],
-      "name": "ErrorRegistryNotInitialized",
+      "name": "ErrorNotRegistry",
       "type": "error"
     },
     {
@@ -129,38 +108,26 @@
       "type": "event"
     },
     {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": false,
-          "internalType": "Version",
-          "name": "version",
-          "type": "uint24"
-        },
-        {
-          "indexed": false,
-          "internalType": "address",
-          "name": "implementation",
-          "type": "address"
-        },
+      "inputs": [],
+      "name": "NAME",
+      "outputs": [
         {
-          "indexed": false,
-          "internalType": "address",
-          "name": "activatedBy",
-          "type": "address"
+          "internalType": "string",
+          "name": "",
+          "type": "string"
         }
       ],
-      "name": "LogVersionableInitialized",
-      "type": "event"
+      "stateMutability": "view",
+      "type": "function"
     },
     {
       "inputs": [],
-      "name": "NAME",
+      "name": "NFT_OWNABLE_STORAGE_LOCATION_V1",
       "outputs": [
         {
-          "internalType": "string",
+          "internalType": "bytes32",
           "name": "",
-          "type": "string"
+          "type": "bytes32"
         }
       ],
       "stateMutability": "view",
@@ -235,26 +202,8 @@
             }
           ],
           "internalType": "struct IRegistry.ObjectInfo",
-          "name": "",
+          "name": "info",
           "type": "tuple"
-        },
-        {
-          "internalType": "bytes",
-          "name": "data",
-          "type": "bytes"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "getInitializedVersion",
-      "outputs": [
-        {
-          "internalType": "uint64",
-          "name": "",
-          "type": "uint64"
         }
       ],
       "stateMutability": "view",
@@ -314,25 +263,19 @@
     },
     {
       "inputs": [],
-      "name": "getVersion",
+      "name": "getRegistryAddress",
       "outputs": [
         {
-          "internalType": "Version",
+          "internalType": "address",
           "name": "",
-          "type": "uint24"
+          "type": "address"
         }
       ],
-      "stateMutability": "pure",
+      "stateMutability": "view",
       "type": "function"
     },
     {
-      "inputs": [
-        {
-          "internalType": "uint256",
-          "name": "idx",
-          "type": "uint256"
-        }
-      ],
+      "inputs": [],
       "name": "getVersion",
       "outputs": [
         {
@@ -341,87 +284,68 @@
           "type": "uint24"
         }
       ],
-      "stateMutability": "view",
+      "stateMutability": "pure",
       "type": "function"
     },
     {
       "inputs": [],
-      "name": "getVersionCount",
-      "outputs": [
-        {
-          "internalType": "uint256",
-          "name": "",
-          "type": "uint256"
-        }
-      ],
-      "stateMutability": "view",
+      "name": "initializeERC165",
+      "outputs": [],
+      "stateMutability": "nonpayable",
       "type": "function"
     },
     {
       "inputs": [
         {
-          "internalType": "Version",
-          "name": "_version",
-          "type": "uint24"
-        }
-      ],
-      "name": "getVersionInfo",
-      "outputs": [
+          "internalType": "address",
+          "name": "initialOwner",
+          "type": "address"
+        },
         {
-          "components": [
-            {
-              "internalType": "Version",
-              "name": "version",
-              "type": "uint24"
-            },
-            {
-              "internalType": "address",
-              "name": "implementation",
-              "type": "address"
-            },
-            {
-              "internalType": "address",
-              "name": "activatedBy",
-              "type": "address"
-            },
-            {
-              "internalType": "Timestamp",
-              "name": "activatedAt",
-              "type": "uint40"
-            },
-            {
-              "internalType": "Blocknumber",
-              "name": "activatedIn",
-              "type": "uint32"
-            }
-          ],
-          "internalType": "struct IVersionable.VersionInfo",
-          "name": "",
-          "type": "tuple"
+          "internalType": "address",
+          "name": "registryAddress",
+          "type": "address"
         }
       ],
-      "stateMutability": "view",
+      "name": "initializeNftOwnable",
+      "outputs": [],
+      "stateMutability": "nonpayable",
       "type": "function"
     },
     {
       "inputs": [
         {
           "internalType": "address",
-          "name": "implementation",
+          "name": "registryAddress",
           "type": "address"
         },
+        {
+          "internalType": "NftId",
+          "name": "parentNftId",
+          "type": "uint96"
+        },
+        {
+          "internalType": "ObjectType",
+          "name": "objectType",
+          "type": "uint8"
+        },
+        {
+          "internalType": "bool",
+          "name": "isInterceptor",
+          "type": "bool"
+        },
         {
           "internalType": "address",
-          "name": "activatedBy",
+          "name": "initialOwner",
           "type": "address"
         },
         {
           "internalType": "bytes",
-          "name": "data",
+          "name": "registryData",
           "type": "bytes"
         }
       ],
-      "name": "initialize",
+      "name": "initializeRegisterable",
       "outputs": [],
       "stateMutability": "nonpayable",
       "type": "function"
@@ -429,20 +353,50 @@
     {
       "inputs": [
         {
-          "internalType": "Version",
-          "name": "_version",
-          "type": "uint24"
+          "internalType": "address",
+          "name": "registryAddress",
+          "type": "address"
         }
       ],
-      "name": "isInitialized",
-      "outputs": [
+      "name": "initializeRegistryLinked",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [
         {
-          "internalType": "bool",
-          "name": "",
-          "type": "bool"
+          "internalType": "address",
+          "name": "registry",
+          "type": "address"
+        },
+        {
+          "internalType": "address",
+          "name": "initialOwner",
+          "type": "address"
         }
       ],
-      "stateMutability": "view",
+      "name": "initializeService",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "activatedBy",
+          "type": "address"
+        },
+        {
+          "internalType": "bytes",
+          "name": "data",
+          "type": "bytes"
+        }
+      ],
+      "name": "initializeVersionable",
+      "outputs": [],
+      "stateMutability": "nonpayable",
       "type": "function"
     },
     {
@@ -452,6 +406,19 @@
       "stateMutability": "nonpayable",
       "type": "function"
     },
+    {
+      "inputs": [
+        {
+          "internalType": "bytes4",
+          "name": "interfaceId",
+          "type": "bytes4"
+        }
+      ],
+      "name": "registerInterface",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
     {
       "inputs": [
         {
@@ -473,56 +440,30 @@
     },
     {
       "inputs": [
-        {
-          "internalType": "address",
-          "name": "implementation",
-          "type": "address"
-        },
-        {
-          "internalType": "address",
-          "name": "activatedBy",
-          "type": "address"
-        },
         {
           "internalType": "bytes",
           "name": "data",
           "type": "bytes"
         }
       ],
-      "name": "upgrade",
+      "name": "upgradeVersionable",
       "outputs": [],
       "stateMutability": "nonpayable",
       "type": "function"
     }
   ],
-  "bytecode": "0x60806040523480156200001157600080fd5b5060405162001dcc38038062001dcc83398101604081905262000034916200069b565b620000656301ffc9a760e01b600090815260205260008051602062001dac833981519152805460ff19166001179055565b600280546001600160a01b031916331790556200008162000096565b6200008d83826200014a565b505050620008eb565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a00805468010000000000000000900460ff1615620000e75760405163f92ee8a960e01b815260040160405180910390fd5b80546001600160401b0390811614620001475780546001600160401b0319166001600160401b0390811782556040519081527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a15b50565b6000606e62000158620001ed565b6040805160ff9384166020820152929091169082015260600160408051601f1981840301815291905290506000620001908462000275565b90506000620001a58583603c848888620002e9565b637b6a51fd60e01b60009081526020527f9104d64c0a509f323b61ab0d4830bb2242bc1a960637a1dcf1f2b72e0a7bd64d805460ff191660011790555050505050565b905090565b6000620001f9620003eb565b60405163c9e66e2960e01b815262ffffff909116600482015273__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__9063c9e66e2990602401602060405180830381865af41580156200024f573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620001e89190620006e5565b604051636939560f60e11b81526001600160a01b0382166004820181905260009163d272ac1e90602401602060405180830381865afa158015620002bd573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620002e3919062000711565b92915050565b6200031a6301ffc9a760e01b600090815260205260008051602062001dac833981519152805460ff19166001179055565b62000326828762000473565b60007f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30080546001600160601b0388166001600160681b0319909116176c0100000000000000000000000060ff8816021760ff60681b19166d010000000000000000000000000086151502178155905060018101620003a58382620007d4565b506303fb044760e21b60009081526020527fb43e4f3791bfcdefa3a0fbe2a5555f8d6490b90e01de0ff40c66f18b49b562c5805460ff1916600117905550505050505050565b604051632efe011360e01b815260036004820152600060248201819052604482018190529073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90632efe011390606401602060405180830381865af41580156200044d573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620001e89190620008a0565b6001600160a01b038216620004cf5760405162461bcd60e51b815260206004820152601e60248201527f4e66744f776e61626c653a20696e697469616c206f776e65722069732030000060448201526064015b60405180910390fd5b600280546001600160a01b0319166001600160a01b038416179055620004f581620004f9565b5050565b6001546001600160a01b031615620005345760015460405163fcdbf2d960e01b81526001600160a01b039091166004820152602401620004c6565b6001600160a01b0381166200055c5760405163f5c4d07d60e01b815260040160405180910390fd5b806001600160a01b03163b600003620005945760405163fdeac91f60e01b81526001600160a01b0382166004820152602401620004c6565b600180546001600160a01b0319166001600160a01b0383169081179091556040516301ffc9a760e01b815263102da10360e01b60048201526301ffc9a790602401602060405180830381865afa92505050801562000611575060408051601f3d908101601f191682019092526200060e91810190620008c7565b60015b6200063b5760405163fdeac91f60e01b81526001600160a01b0382166004820152602401620004c6565b80620004f55760405163fdeac91f60e01b81526001600160a01b0383166004820152602401620004c6565b80516001600160a01b03811681146200067e57600080fd5b919050565b80516001600160601b03811681146200067e57600080fd5b600080600060608486031215620006b157600080fd5b620006bc8462000666565b9250620006cc6020850162000683565b9150620006dc6040850162000666565b90509250925092565b600060208284031215620006f857600080fd5b815160ff811681146200070a57600080fd5b9392505050565b6000602082840312156200072457600080fd5b6200070a8262000683565b634e487b7160e01b600052604160045260246000fd5b600181811c908216806200075a57607f821691505b6020821081036200077b57634e487b7160e01b600052602260045260246000fd5b50919050565b601f821115620007cf57600081815260208120601f850160051c81016020861015620007aa5750805b601f850160051c820191505b81811015620007cb57828155600101620007b6565b5050505b505050565b81516001600160401b03811115620007f057620007f06200072f565b620008088162000801845462000745565b8462000781565b602080601f831160018114620008405760008415620008275750858301515b600019600386901b1c1916600185901b178555620007cb565b600085815260208120601f198616915b82811015620008715788860151825594840194600190910190840162000850565b5085821015620008905787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b600060208284031215620008b357600080fd5b815162ffffff811681146200070a57600080fd5b600060208284031215620008da57600080fd5b815180151581146200070a57600080fd5b6114b180620008fb6000396000f3fe608060405234801561001057600080fd5b50600436106101165760003560e01c8063893d20e8116100a2578063b3c6501511610071578063b3c65015146103c3578063b68d1809146103e4578063b88da759146103f9578063cde749f41461040c578063cf7a1d771461041457600080fd5b8063893d20e81461034a578063946dfcfe14610352578063a3f4df7e14610379578063a745e3df146103b057600080fd5b80631eff4b22116100e95780631eff4b22146101995780634d459c90146101ce5780634f421333146102e75780635ab1bd53146102fa578063644c45e01461031f57600080fd5b806301ffc9a71461011b5780630d8e6e2c1461015d5780630fec111c14610179578063138461e01461018f575b600080fd5b61014861012936600461105d565b6001600160e01b03191660009081526020819052604090205460ff1690565b60405190151581526020015b60405180910390f35b610165610427565b60405162ffffff9091168152602001610154565b6101816104b1565b6040516101549291906110d4565b610197610633565b005b6101c07f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30081565b604051908152602001610154565b61028a6101dc36600461118f565b6040805160a08101825260008082526020820181905291810182905260608101829052608081019190915260008051602061145c83398151915262ffffff92831660009081526020918252604090819020815160a0810183528154958616815263010000009095046001600160a01b03908116938601939093526001015491821690840152600160a01b810464ffffffffff166060840152600160c81b900463ffffffff1660808301525090565b60408051825162ffffff1681526020808401516001600160a01b039081169183019190915283830151169181019190915260608083015164ffffffffff169082015260809182015163ffffffff169181019190915260a001610154565b6101486102f536600461118f565b610855565b6001546001600160a01b03165b6040516001600160a01b039091168152602001610154565b600154600160a01b90046001600160601b03166040516001600160601b039091168152602001610154565b610307610908565b7f4f61291a8ac3d020d0a7d919a76b8592aa88385744dee3f8b4f3873b969ed901546101c0565b6103a36040518060400160405280600b81526020016a546573745365727669636560a81b81525081565b60405161015491906111ac565b6101976103be3660046111ea565b610a21565b6103cb610b7e565b60405167ffffffffffffffff9091168152602001610154565b606e5b60405160ff9091168152602001610154565b6101656104073660046112c0565b610ba0565b6103e7610bf1565b6101976104223660046111ea565b610c74565b604051632efe011360e01b815260036004820152600060248201819052604482018190529073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90632efe011390606401602060405180830381865af4158015610488573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104ac91906112d9565b905090565b6040805160e08101825260008082526020820181905291810182905260608082018390526080820183905260a0820183905260c0820181905290917f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30090506040518060e001604052806105346001546001600160601b03600160a01b9091041690565b6001600160601b0390811682528354908116602083015260ff600160601b820481166040840152600160681b909104161515606082015230608082015260a00161057c610908565b6001600160a01b03168152602001826001018054610599906112f6565b80601f01602080910402602001604051908101604052809291908181526020018280546105c5906112f6565b80156106125780601f106105e757610100808354040283529160200191610612565b820191906000526020600020905b8154815290600101906020018083116105f557829003601f168201915b50505050508152506040518060200160405280600081525092509250509091565b6001546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015273__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af4158015610695573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106b99190611330565b15610700576001546040516316322c0f60e31b81526001600160a01b0382166004820152600160a01b9091046001600160601b031660248201526044015b60405180910390fd5b6001546001600160a01b03166107295760405163cf29926160e01b815260040160405180910390fd5b60015460405163c3c5a54760e01b81523060048201819052916001600160a01b03169063c3c5a54790602401602060405180830381865afa158015610772573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906107969190611330565b6107be576040516372657a5160e01b81526001600160a01b03821660048201526024016106f7565b600154604051636939560f60e11b81526001600160a01b0383811660048301529091169063d272ac1e90602401602060405180830381865afa158015610808573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061082c9190611352565b600160146101000a8154816001600160601b0302191690836001600160601b0316021790555050565b60008060008051602061145c83398151915262ffffff84166000908152602091909152604090819020600101549051631bbffab160e21b8152600160c81b90910463ffffffff16600482015273__$5f476116ae21c5294e0c0761c07efa7e1c$__90636effeac490602401602060405180830381865af41580156108dd573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610901919061137b565b1192915050565b6001546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015260009073__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af415801561096d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906109919190611330565b15610a1157600154604051631c5da14d60e11b8152600160a01b82046001600160601b031660048201526001600160a01b03909116906338bb429a90602401602060405180830381865afa1580156109ed573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104ac9190611394565b506002546001600160a01b031690565b73__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__63a123b37c610a43610427565b6040516001600160e01b031960e084901b16815262ffffff9091166004820152602401602060405180830381865af4158015610a83573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610aa791906113b1565b60008051602061143c8339815191528054600160401b900460ff1680610adb5750805467ffffffffffffffff808416911610155b15610af95760405163f92ee8a960e01b815260040160405180910390fd5b805468ffffffffffffffffff191667ffffffffffffffff831617600160401b178155610b258585610d7f565b610b2e83611020565b805460ff60401b1916815560405167ffffffffffffffff831681527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d2906020015b60405180910390a15050505050565b60006104ac60008051602061143c8339815191525467ffffffffffffffff1690565b600060008051602061145c8339815191526001018281548110610bc557610bc56113db565b90600052602060002090600a91828204019190066003029054906101000a900462ffffff169050919050565b6000610bfb610427565b60405163c9e66e2960e01b815262ffffff909116600482015273__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__9063c9e66e2990602401602060405180830381865af4158015610c50573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104ac91906113f1565b60008051602061143c8339815191528054600160401b810460ff16159067ffffffffffffffff16600081158015610ca85750825b905060008267ffffffffffffffff166001148015610cc55750303b155b905081158015610cd3575080155b15610cf15760405163f92ee8a960e01b815260040160405180910390fd5b845467ffffffffffffffff191660011785558315610d1b57845460ff60401b1916600160401b1785555b610d258888610d7f565b610d2f8787611020565b8315610d7557845460ff60401b19168555604051600181527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a15b5050505050505050565b610d87611024565b60008051602061145c8339815191526000610db860008051602061143c8339815191525467ffffffffffffffff1690565b90506000610dc4610427565b90508167ffffffffffffffff16600103610df25760028301805462ffffff191662ffffff8316179055610e40565b600283015462ffffff90811690821611610e405760405162461bcd60e51b815260206004820152600f60248201526e24a72b20a624a2102b22a929a4a7a760891b60448201526064016106f7565b6001808401805491820181556000908152602090819020600a808404909101805462ffffff808716600394909606939093026101000a858102930219169190911790556040805160a0810182529283526001600160a01b038089168484015287168382015280516356db0c1960e11b81529051606084019273__$d53880c81dc91c20799140d711e5ab8718$__9263adb6183292600480830193928290030181865af4158015610ef4573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610f189190611414565b64ffffffffff1681526020014363ffffffff90811690915262ffffff8084166000908152602087815260409182902085518154928701516001600160a01b039081166301000000026001600160b81b0319909416919095161791909117815584820151600190910180546060870151608090970151909516600160c81b0263ffffffff60c81b1964ffffffffff909716600160a01b026001600160c81b031990961692909416919091179390931793909316179055517fad0a0fc10465a8dd9da3ad5f43e1a7fff4b4578551c76f0ae8deb844f0d0bf6890610b6f9083908890889062ffffff9390931683526001600160a01b03918216602084015216604082015260600190565b6101165b60008051602061143c83398151915254600160401b900460ff1661105b57604051631afcd79f60e31b815260040160405180910390fd5b565b60006020828403121561106f57600080fd5b81356001600160e01b03198116811461108757600080fd5b9392505050565b6000815180845260005b818110156110b457602081850181015186830182015201611098565b506000602082860101526020601f19601f83011685010191505092915050565b6040815260006001600160601b038085511660408401528060208601511660608401525060ff6040850151166080830152606084015161111860a084018215159052565b5060808401516001600160a01b03811660c08401525060a08401516001600160a01b03811660e08401525060c084015160e061010084015261115e61012084018261108e565b90508281036020840152611172818561108e565b95945050505050565b62ffffff8116811461118c57600080fd5b50565b6000602082840312156111a157600080fd5b81356110878161117b565b602081526000611087602083018461108e565b6001600160a01b038116811461118c57600080fd5b634e487b7160e01b600052604160045260246000fd5b6000806000606084860312156111ff57600080fd5b833561120a816111bf565b9250602084013561121a816111bf565b9150604084013567ffffffffffffffff8082111561123757600080fd5b818601915086601f83011261124b57600080fd5b81358181111561125d5761125d6111d4565b604051601f8201601f19908116603f01168101908382118183101715611285576112856111d4565b8160405282815289602084870101111561129e57600080fd5b8260208601602083013760006020848301015280955050505050509250925092565b6000602082840312156112d257600080fd5b5035919050565b6000602082840312156112eb57600080fd5b81516110878161117b565b600181811c9082168061130a57607f821691505b60208210810361132a57634e487b7160e01b600052602260045260246000fd5b50919050565b60006020828403121561134257600080fd5b8151801515811461108757600080fd5b60006020828403121561136457600080fd5b81516001600160601b038116811461108757600080fd5b60006020828403121561138d57600080fd5b5051919050565b6000602082840312156113a657600080fd5b8151611087816111bf565b6000602082840312156113c357600080fd5b815167ffffffffffffffff8116811461108757600080fd5b634e487b7160e01b600052603260045260246000fd5b60006020828403121561140357600080fd5b815160ff8116811461108757600080fd5b60006020828403121561142657600080fd5b815164ffffffffff8116811461108757600080fdfef0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a004f61291a8ac3d020d0a7d919a76b8592aa88385744dee3f8b4f3873b969ed900a264697066735822122011fe545a1ca0755ce4814e511fa5475a359120b75d51cb24465ce2b66b28dd7d64736f6c6343000814003367be87c3ff9960ca1e9cfac5cab2ff4747269cf9ed20c9b7306235ac35a491c5",
-  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106101165760003560e01c8063893d20e8116100a2578063b3c6501511610071578063b3c65015146103c3578063b68d1809146103e4578063b88da759146103f9578063cde749f41461040c578063cf7a1d771461041457600080fd5b8063893d20e81461034a578063946dfcfe14610352578063a3f4df7e14610379578063a745e3df146103b057600080fd5b80631eff4b22116100e95780631eff4b22146101995780634d459c90146101ce5780634f421333146102e75780635ab1bd53146102fa578063644c45e01461031f57600080fd5b806301ffc9a71461011b5780630d8e6e2c1461015d5780630fec111c14610179578063138461e01461018f575b600080fd5b61014861012936600461105d565b6001600160e01b03191660009081526020819052604090205460ff1690565b60405190151581526020015b60405180910390f35b610165610427565b60405162ffffff9091168152602001610154565b6101816104b1565b6040516101549291906110d4565b610197610633565b005b6101c07f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30081565b604051908152602001610154565b61028a6101dc36600461118f565b6040805160a08101825260008082526020820181905291810182905260608101829052608081019190915260008051602061145c83398151915262ffffff92831660009081526020918252604090819020815160a0810183528154958616815263010000009095046001600160a01b03908116938601939093526001015491821690840152600160a01b810464ffffffffff166060840152600160c81b900463ffffffff1660808301525090565b60408051825162ffffff1681526020808401516001600160a01b039081169183019190915283830151169181019190915260608083015164ffffffffff169082015260809182015163ffffffff169181019190915260a001610154565b6101486102f536600461118f565b610855565b6001546001600160a01b03165b6040516001600160a01b039091168152602001610154565b600154600160a01b90046001600160601b03166040516001600160601b039091168152602001610154565b610307610908565b7f4f61291a8ac3d020d0a7d919a76b8592aa88385744dee3f8b4f3873b969ed901546101c0565b6103a36040518060400160405280600b81526020016a546573745365727669636560a81b81525081565b60405161015491906111ac565b6101976103be3660046111ea565b610a21565b6103cb610b7e565b60405167ffffffffffffffff9091168152602001610154565b606e5b60405160ff9091168152602001610154565b6101656104073660046112c0565b610ba0565b6103e7610bf1565b6101976104223660046111ea565b610c74565b604051632efe011360e01b815260036004820152600060248201819052604482018190529073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90632efe011390606401602060405180830381865af4158015610488573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104ac91906112d9565b905090565b6040805160e08101825260008082526020820181905291810182905260608082018390526080820183905260a0820183905260c0820181905290917f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30090506040518060e001604052806105346001546001600160601b03600160a01b9091041690565b6001600160601b0390811682528354908116602083015260ff600160601b820481166040840152600160681b909104161515606082015230608082015260a00161057c610908565b6001600160a01b03168152602001826001018054610599906112f6565b80601f01602080910402602001604051908101604052809291908181526020018280546105c5906112f6565b80156106125780601f106105e757610100808354040283529160200191610612565b820191906000526020600020905b8154815290600101906020018083116105f557829003601f168201915b50505050508152506040518060200160405280600081525092509250509091565b6001546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015273__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af4158015610695573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106b99190611330565b15610700576001546040516316322c0f60e31b81526001600160a01b0382166004820152600160a01b9091046001600160601b031660248201526044015b60405180910390fd5b6001546001600160a01b03166107295760405163cf29926160e01b815260040160405180910390fd5b60015460405163c3c5a54760e01b81523060048201819052916001600160a01b03169063c3c5a54790602401602060405180830381865afa158015610772573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906107969190611330565b6107be576040516372657a5160e01b81526001600160a01b03821660048201526024016106f7565b600154604051636939560f60e11b81526001600160a01b0383811660048301529091169063d272ac1e90602401602060405180830381865afa158015610808573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061082c9190611352565b600160146101000a8154816001600160601b0302191690836001600160601b0316021790555050565b60008060008051602061145c83398151915262ffffff84166000908152602091909152604090819020600101549051631bbffab160e21b8152600160c81b90910463ffffffff16600482015273__$5f476116ae21c5294e0c0761c07efa7e1c$__90636effeac490602401602060405180830381865af41580156108dd573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610901919061137b565b1192915050565b6001546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015260009073__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af415801561096d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906109919190611330565b15610a1157600154604051631c5da14d60e11b8152600160a01b82046001600160601b031660048201526001600160a01b03909116906338bb429a90602401602060405180830381865afa1580156109ed573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104ac9190611394565b506002546001600160a01b031690565b73__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__63a123b37c610a43610427565b6040516001600160e01b031960e084901b16815262ffffff9091166004820152602401602060405180830381865af4158015610a83573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610aa791906113b1565b60008051602061143c8339815191528054600160401b900460ff1680610adb5750805467ffffffffffffffff808416911610155b15610af95760405163f92ee8a960e01b815260040160405180910390fd5b805468ffffffffffffffffff191667ffffffffffffffff831617600160401b178155610b258585610d7f565b610b2e83611020565b805460ff60401b1916815560405167ffffffffffffffff831681527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d2906020015b60405180910390a15050505050565b60006104ac60008051602061143c8339815191525467ffffffffffffffff1690565b600060008051602061145c8339815191526001018281548110610bc557610bc56113db565b90600052602060002090600a91828204019190066003029054906101000a900462ffffff169050919050565b6000610bfb610427565b60405163c9e66e2960e01b815262ffffff909116600482015273__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__9063c9e66e2990602401602060405180830381865af4158015610c50573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104ac91906113f1565b60008051602061143c8339815191528054600160401b810460ff16159067ffffffffffffffff16600081158015610ca85750825b905060008267ffffffffffffffff166001148015610cc55750303b155b905081158015610cd3575080155b15610cf15760405163f92ee8a960e01b815260040160405180910390fd5b845467ffffffffffffffff191660011785558315610d1b57845460ff60401b1916600160401b1785555b610d258888610d7f565b610d2f8787611020565b8315610d7557845460ff60401b19168555604051600181527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a15b5050505050505050565b610d87611024565b60008051602061145c8339815191526000610db860008051602061143c8339815191525467ffffffffffffffff1690565b90506000610dc4610427565b90508167ffffffffffffffff16600103610df25760028301805462ffffff191662ffffff8316179055610e40565b600283015462ffffff90811690821611610e405760405162461bcd60e51b815260206004820152600f60248201526e24a72b20a624a2102b22a929a4a7a760891b60448201526064016106f7565b6001808401805491820181556000908152602090819020600a808404909101805462ffffff808716600394909606939093026101000a858102930219169190911790556040805160a0810182529283526001600160a01b038089168484015287168382015280516356db0c1960e11b81529051606084019273__$d53880c81dc91c20799140d711e5ab8718$__9263adb6183292600480830193928290030181865af4158015610ef4573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610f189190611414565b64ffffffffff1681526020014363ffffffff90811690915262ffffff8084166000908152602087815260409182902085518154928701516001600160a01b039081166301000000026001600160b81b0319909416919095161791909117815584820151600190910180546060870151608090970151909516600160c81b0263ffffffff60c81b1964ffffffffff909716600160a01b026001600160c81b031990961692909416919091179390931793909316179055517fad0a0fc10465a8dd9da3ad5f43e1a7fff4b4578551c76f0ae8deb844f0d0bf6890610b6f9083908890889062ffffff9390931683526001600160a01b03918216602084015216604082015260600190565b6101165b60008051602061143c83398151915254600160401b900460ff1661105b57604051631afcd79f60e31b815260040160405180910390fd5b565b60006020828403121561106f57600080fd5b81356001600160e01b03198116811461108757600080fd5b9392505050565b6000815180845260005b818110156110b457602081850181015186830182015201611098565b506000602082860101526020601f19601f83011685010191505092915050565b6040815260006001600160601b038085511660408401528060208601511660608401525060ff6040850151166080830152606084015161111860a084018215159052565b5060808401516001600160a01b03811660c08401525060a08401516001600160a01b03811660e08401525060c084015160e061010084015261115e61012084018261108e565b90508281036020840152611172818561108e565b95945050505050565b62ffffff8116811461118c57600080fd5b50565b6000602082840312156111a157600080fd5b81356110878161117b565b602081526000611087602083018461108e565b6001600160a01b038116811461118c57600080fd5b634e487b7160e01b600052604160045260246000fd5b6000806000606084860312156111ff57600080fd5b833561120a816111bf565b9250602084013561121a816111bf565b9150604084013567ffffffffffffffff8082111561123757600080fd5b818601915086601f83011261124b57600080fd5b81358181111561125d5761125d6111d4565b604051601f8201601f19908116603f01168101908382118183101715611285576112856111d4565b8160405282815289602084870101111561129e57600080fd5b8260208601602083013760006020848301015280955050505050509250925092565b6000602082840312156112d257600080fd5b5035919050565b6000602082840312156112eb57600080fd5b81516110878161117b565b600181811c9082168061130a57607f821691505b60208210810361132a57634e487b7160e01b600052602260045260246000fd5b50919050565b60006020828403121561134257600080fd5b8151801515811461108757600080fd5b60006020828403121561136457600080fd5b81516001600160601b038116811461108757600080fd5b60006020828403121561138d57600080fd5b5051919050565b6000602082840312156113a657600080fd5b8151611087816111bf565b6000602082840312156113c357600080fd5b815167ffffffffffffffff8116811461108757600080fd5b634e487b7160e01b600052603260045260246000fd5b60006020828403121561140357600080fd5b815160ff8116811461108757600080fd5b60006020828403121561142657600080fd5b815164ffffffffff8116811461108757600080fdfef0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a004f61291a8ac3d020d0a7d919a76b8592aa88385744dee3f8b4f3873b969ed900a264697066735822122011fe545a1ca0755ce4814e511fa5475a359120b75d51cb24465ce2b66b28dd7d64736f6c63430008140033",
+  "bytecode": "0x60806040523480156200001157600080fd5b5060405162001bf238038062001bf28339810160408190526200003491620004ff565b6200003e62000053565b6200004a838262000107565b50505062000703565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a00805468010000000000000000900460ff1615620000a45760405163f92ee8a960e01b815260040160405180910390fd5b80546001600160401b0390811614620001045780546001600160401b0319166001600160401b0390811782556040519081527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a15b50565b62000111620001b2565b6200019c82836001600160a01b031663644c45e06040518163ffffffff1660e01b8152600401602060405180830381865afa15801562000155573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906200017b919062000549565b603c600085604051806020016040528060008152506200020360201b60201c565b620001ae637b6a51fd60e01b620002a2565b5050565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a005468010000000000000000900460ff166200020157604051631afcd79f60e31b815260040160405180910390fd5b565b6200020d620001b2565b620002198287620002d1565b60007f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30080546001600160601b0388166001600160681b0319909116176c0100000000000000000000000060ff8816021760ff60681b19166d01000000000000000000000000008615150217815590506001810162000298838262000613565b5050505050505050565b620002ac620001b2565b6001600160e01b0319166000908152602081905260409020805460ff19166001179055565b620002db620001b2565b620002e6816200036a565b620002f062000482565b6001600160a01b038216620003185760405163f17ef42d60e01b815260040160405180910390fd5b507f07ebcf49758b6ed3af50fa146bec0abe157c0218fe65dc0874c286e9d5da4f0080546001600160601b03166c010000000000000000000000006001600160a01b0390931692909202919091179055565b62000374620001b2565b806001600160a01b03163b600003620003b05760405163fdeac91f60e01b81526001600160a01b03821660048201526024015b60405180910390fd5b600180546001600160a01b0319166001600160a01b0383169081179091556040516301ffc9a760e01b815263230c0c8160e11b60048201526301ffc9a790602401602060405180830381865afa9250505080156200042d575060408051601f3d908101601f191682019092526200042a91810190620006df565b60015b620004575760405163fdeac91f60e01b81526001600160a01b0382166004820152602401620003a7565b80620001ae5760405163fdeac91f60e01b81526001600160a01b0383166004820152602401620003a7565b6200048c620001b2565b6301ffc9a760e01b60009081526020527f67be87c3ff9960ca1e9cfac5cab2ff4747269cf9ed20c9b7306235ac35a491c5805460ff19166001179055565b80516001600160a01b0381168114620004e257600080fd5b919050565b80516001600160601b0381168114620004e257600080fd5b6000806000606084860312156200051557600080fd5b6200052084620004ca565b92506200053060208501620004e7565b91506200054060408501620004ca565b90509250925092565b6000602082840312156200055c57600080fd5b6200056782620004e7565b9392505050565b634e487b7160e01b600052604160045260246000fd5b600181811c908216806200059957607f821691505b602082108103620005ba57634e487b7160e01b600052602260045260246000fd5b50919050565b601f8211156200060e57600081815260208120601f850160051c81016020861015620005e95750805b601f850160051c820191505b818110156200060a57828155600101620005f5565b5050505b505050565b81516001600160401b038111156200062f576200062f6200056e565b620006478162000640845462000584565b84620005c0565b602080601f8311600181146200067f5760008415620006665750858301515b600019600386901b1c1916600185901b1785556200060a565b600085815260208120601f198616915b82811015620006b0578886015182559484019460019091019084016200068f565b5085821015620006cf5787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b600060208284031215620006f257600080fd5b815180151581146200056757600080fd5b6114df80620007136000396000f3fe608060405234801561001057600080fd5b50600436106101375760003560e01c80635ab1bd53116100b8578063ada9652e1161007c578063ada9652e146102e1578063b68d1809146102f6578063cde749f41461030b578063ea86657214610313578063f21de1e814610242578063f7c34ee01461032657600080fd5b80635ab1bd5314610242578063644c45e014610267578063675393bf1461028f578063893d20e8146102a2578063a3f4df7e146102aa57600080fd5b8063214cdb80116100ff578063214cdb80146101ee57806327bb7a3314610201578063329d6e741461021457806336fc697e1461022757806349bb9e4b1461022f57600080fd5b806301ffc9a71461013c5780630d8e6e2c1461017e5780630fec111c1461019a578063138461e0146101af5780631eff4b22146101b9575b600080fd5b61016961014a366004610f0a565b6001600160e01b03191660009081526020819052604090205460ff1690565b60405190151581526020015b60405180910390f35b610186610339565b60405162ffffff9091168152602001610175565b6101a26103c3565b6040516101759190610f81565b6101b7610572565b005b6101e07f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30081565b604051908152602001610175565b6101b76101fc366004610f0a565b610779565b6101b761020f3660046110f6565b6107a6565b6101b761022236600461118f565b610832565b6101b7610994565b6101b761023d3660046111c4565b6109da565b6001546001600160a01b03165b6040516001600160a01b039091168152602001610175565b60008051602061148a833981519152546040516001600160601b039091168152602001610175565b6101b761029d366004611214565b610aec565b61024f610bfa565b6102d46040518060400160405280600b81526020016a546573745365727669636560a81b81525081565b6040516101759190611231565b6101e060008051602061148a83398151915281565b606e5b60405160ff9091168152602001610175565b6102f9610d31565b6101b7610321366004611244565b610da8565b6101b7610334366004611244565b610e40565b604051632efe011360e01b815260036004820152600060248201819052604482018190529073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90632efe011390606401602060405180830381865af415801561039a573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103be919061127d565b905090565b6040805160e08101825260008082526020820181905291810182905260608082018390526080820183905260a0820183905260c0820152907f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa3006040805160808101825282546001600160601b038116825260ff600160601b820481166020840152600160681b9091041615159181019190915260018201805491929160608401919061046e906112a2565b80601f016020809104026020016040519081016040528092919081815260200182805461049a906112a2565b80156104e75780601f106104bc576101008083540402835291602001916104e7565b820191906000526020600020905b8154815290600101906020018083116104ca57829003601f168201915b50505050508152505090506040518060e00160405280610505600090565b6001600160601b0316815260200182600001516001600160601b03168152602001826020015160ff168152602001826040015115158152602001306001600160a01b03168152602001610556610bfa565b6001600160a01b03168152602001826060015181525091505090565b600060008051602061148a83398151915280546040516330b8415f60e01b81526001600160601b03909116600482015290915073__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af41580156105e1573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061060591906112dc565b156106365780546040516301ab8b6760e21b81526001600160601b0390911660048201526024015b60405180910390fd5b306106496001546001600160a01b031690565b60405163c3c5a54760e01b81526001600160a01b038381166004830152919091169063c3c5a54790602401602060405180830381865afa158015610691573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106b591906112dc565b6106dd5760405163b9304b0d60e01b81526001600160a01b038216600482015260240161062d565b6001546001600160a01b0316604051636939560f60e11b81526001600160a01b038381166004830152919091169063d272ac1e90602401602060405180830381865afa158015610731573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061075591906112f9565b82546bffffffffffffffffffffffff19166001600160601b03919091161790915550565b610781610eb7565b6001600160e01b0319166000908152602081905260409020805460ff19166001179055565b6107ae610eb7565b6107b88287610e40565b60007f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30080546001600160601b0388166cffffffffffffffffffffffffff1990911617600160601b60ff8816021760ff60681b1916600160681b861515021781559050600181016108288382611365565b5050505050505050565b73__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__63a123b37c610854610339565b6040516001600160e01b031960e084901b16815262ffffff9091166004820152602401602060405180830381865af4158015610894573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108b89190611425565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a008054600160401b900460ff16806108fe5750805467ffffffffffffffff808416911610155b1561091c5760405163f92ee8a960e01b815260040160405180910390fd5b805468ffffffffffffffffff191667ffffffffffffffff831617600160401b17815561094783610f02565b805460ff60401b1916815560405167ffffffffffffffff831681527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a1505050565b61099c610eb7565b6301ffc9a760e01b60009081526020527f67be87c3ff9960ca1e9cfac5cab2ff4747269cf9ed20c9b7306235ac35a491c5805460ff19166001179055565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a008054600160401b810460ff16159067ffffffffffffffff16600081158015610a205750825b905060008267ffffffffffffffff166001148015610a3d5750303b155b905081158015610a4b575080155b15610a695760405163f92ee8a960e01b815260040160405180910390fd5b845467ffffffffffffffff191660011785558315610a9357845460ff60401b1916600160401b1785555b610a9d8787610f02565b8315610ae357845460ff60401b19168555604051600181527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a15b50505050505050565b610af4610eb7565b806001600160a01b03163b600003610b2a5760405163fdeac91f60e01b81526001600160a01b038216600482015260240161062d565b600180546001600160a01b0319166001600160a01b0383169081179091556040516301ffc9a760e01b815263230c0c8160e11b60048201526301ffc9a790602401602060405180830381865afa925050508015610ba4575060408051601f3d908101601f19168201909252610ba1918101906112dc565b60015b610bcc5760405163fdeac91f60e01b81526001600160a01b038216600482015260240161062d565b80610bf55760405163fdeac91f60e01b81526001600160a01b038316600482015260240161062d565b505b50565b60008060008051602061148a83398151915280546040516330b8415f60e01b81526001600160601b03909116600482015290915073__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af4158015610c6a573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610c8e91906112dc565b15610d1b576001546001600160a01b03168154604051631c5da14d60e11b81526001600160601b0390911660048201526001600160a01b0391909116906338bb429a90602401602060405180830381865afa158015610cf1573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610d15919061144f565b91505090565b54600160601b90046001600160a01b0316919050565b604051632392b61b60e21b81526003600482015260009073__$9dab98ad7ae1a426029e5739f922230a41$__90638e4ad86c90602401602060405180830381865af4158015610d84573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103be919061146c565b610db0610eb7565b610e3082836001600160a01b031663644c45e06040518163ffffffff1660e01b8152600401602060405180830381865afa158015610df2573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610e1691906112f9565b603c600085604051806020016040528060008152506107a6565b610bf5637b6a51fd60e01b610779565b610e48610eb7565b610e5181610aec565b610e59610994565b6001600160a01b038216610e805760405163f17ef42d60e01b815260040160405180910390fd5b5060008051602061148a83398151915280546001600160601b0316600160601b6001600160a01b0390931692909202919091179055565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a0054600160401b900460ff16610f0057604051631afcd79f60e31b815260040160405180910390fd5b565b610137610eb7565b600060208284031215610f1c57600080fd5b81356001600160e01b031981168114610f3457600080fd5b9392505050565b6000815180845260005b81811015610f6157602081850181015186830182015201610f45565b506000602082860101526020601f19601f83011685010191505092915050565b6020815260006001600160601b038084511660208401528060208501511660408401525060ff604084015116606083015260608301511515608083015260018060a01b0360808401511660a083015260a0830151610fea60c08401826001600160a01b03169052565b5060c083015160e080840152611004610100840182610f3b565b949350505050565b6001600160a01b0381168114610bf757600080fd5b6001600160601b0381168114610bf757600080fd5b60ff81168114610bf757600080fd5b8015158114610bf757600080fd5b634e487b7160e01b600052604160045260246000fd5b600082601f83011261107a57600080fd5b813567ffffffffffffffff8082111561109557611095611053565b604051601f8301601f19908116603f011681019082821181831017156110bd576110bd611053565b816040528381528660208588010111156110d657600080fd5b836020870160208301376000602085830101528094505050505092915050565b60008060008060008060c0878903121561110f57600080fd5b863561111a8161100c565b9550602087013561112a81611021565b9450604087013561113a81611036565b9350606087013561114a81611045565b9250608087013561115a8161100c565b915060a087013567ffffffffffffffff81111561117657600080fd5b61118289828a01611069565b9150509295509295509295565b6000602082840312156111a157600080fd5b813567ffffffffffffffff8111156111b857600080fd5b61100484828501611069565b600080604083850312156111d757600080fd5b82356111e28161100c565b9150602083013567ffffffffffffffff8111156111fe57600080fd5b61120a85828601611069565b9150509250929050565b60006020828403121561122657600080fd5b8135610f348161100c565b602081526000610f346020830184610f3b565b6000806040838503121561125757600080fd5b82356112628161100c565b915060208301356112728161100c565b809150509250929050565b60006020828403121561128f57600080fd5b815162ffffff81168114610f3457600080fd5b600181811c908216806112b657607f821691505b6020821081036112d657634e487b7160e01b600052602260045260246000fd5b50919050565b6000602082840312156112ee57600080fd5b8151610f3481611045565b60006020828403121561130b57600080fd5b8151610f3481611021565b601f82111561136057600081815260208120601f850160051c8101602086101561133d5750805b601f850160051c820191505b8181101561135c57828155600101611349565b5050505b505050565b815167ffffffffffffffff81111561137f5761137f611053565b6113938161138d84546112a2565b84611316565b602080601f8311600181146113c857600084156113b05750858301515b600019600386901b1c1916600185901b17855561135c565b600085815260208120601f198616915b828110156113f7578886015182559484019460019091019084016113d8565b50858210156114155787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b60006020828403121561143757600080fd5b815167ffffffffffffffff81168114610f3457600080fd5b60006020828403121561146157600080fd5b8151610f348161100c565b60006020828403121561147e57600080fd5b8151610f348161103656fe07ebcf49758b6ed3af50fa146bec0abe157c0218fe65dc0874c286e9d5da4f00a2646970667358221220cdee5b4e09423681d15f6baf14457e980470fc7b4462d774f2e683a6e9b3bb3964736f6c63430008140033",
+  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106101375760003560e01c80635ab1bd53116100b8578063ada9652e1161007c578063ada9652e146102e1578063b68d1809146102f6578063cde749f41461030b578063ea86657214610313578063f21de1e814610242578063f7c34ee01461032657600080fd5b80635ab1bd5314610242578063644c45e014610267578063675393bf1461028f578063893d20e8146102a2578063a3f4df7e146102aa57600080fd5b8063214cdb80116100ff578063214cdb80146101ee57806327bb7a3314610201578063329d6e741461021457806336fc697e1461022757806349bb9e4b1461022f57600080fd5b806301ffc9a71461013c5780630d8e6e2c1461017e5780630fec111c1461019a578063138461e0146101af5780631eff4b22146101b9575b600080fd5b61016961014a366004610f0a565b6001600160e01b03191660009081526020819052604090205460ff1690565b60405190151581526020015b60405180910390f35b610186610339565b60405162ffffff9091168152602001610175565b6101a26103c3565b6040516101759190610f81565b6101b7610572565b005b6101e07f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30081565b604051908152602001610175565b6101b76101fc366004610f0a565b610779565b6101b761020f3660046110f6565b6107a6565b6101b761022236600461118f565b610832565b6101b7610994565b6101b761023d3660046111c4565b6109da565b6001546001600160a01b03165b6040516001600160a01b039091168152602001610175565b60008051602061148a833981519152546040516001600160601b039091168152602001610175565b6101b761029d366004611214565b610aec565b61024f610bfa565b6102d46040518060400160405280600b81526020016a546573745365727669636560a81b81525081565b6040516101759190611231565b6101e060008051602061148a83398151915281565b606e5b60405160ff9091168152602001610175565b6102f9610d31565b6101b7610321366004611244565b610da8565b6101b7610334366004611244565b610e40565b604051632efe011360e01b815260036004820152600060248201819052604482018190529073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90632efe011390606401602060405180830381865af415801561039a573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103be919061127d565b905090565b6040805160e08101825260008082526020820181905291810182905260608082018390526080820183905260a0820183905260c0820152907f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa3006040805160808101825282546001600160601b038116825260ff600160601b820481166020840152600160681b9091041615159181019190915260018201805491929160608401919061046e906112a2565b80601f016020809104026020016040519081016040528092919081815260200182805461049a906112a2565b80156104e75780601f106104bc576101008083540402835291602001916104e7565b820191906000526020600020905b8154815290600101906020018083116104ca57829003601f168201915b50505050508152505090506040518060e00160405280610505600090565b6001600160601b0316815260200182600001516001600160601b03168152602001826020015160ff168152602001826040015115158152602001306001600160a01b03168152602001610556610bfa565b6001600160a01b03168152602001826060015181525091505090565b600060008051602061148a83398151915280546040516330b8415f60e01b81526001600160601b03909116600482015290915073__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af41580156105e1573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061060591906112dc565b156106365780546040516301ab8b6760e21b81526001600160601b0390911660048201526024015b60405180910390fd5b306106496001546001600160a01b031690565b60405163c3c5a54760e01b81526001600160a01b038381166004830152919091169063c3c5a54790602401602060405180830381865afa158015610691573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106b591906112dc565b6106dd5760405163b9304b0d60e01b81526001600160a01b038216600482015260240161062d565b6001546001600160a01b0316604051636939560f60e11b81526001600160a01b038381166004830152919091169063d272ac1e90602401602060405180830381865afa158015610731573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061075591906112f9565b82546bffffffffffffffffffffffff19166001600160601b03919091161790915550565b610781610eb7565b6001600160e01b0319166000908152602081905260409020805460ff19166001179055565b6107ae610eb7565b6107b88287610e40565b60007f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30080546001600160601b0388166cffffffffffffffffffffffffff1990911617600160601b60ff8816021760ff60681b1916600160681b861515021781559050600181016108288382611365565b5050505050505050565b73__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__63a123b37c610854610339565b6040516001600160e01b031960e084901b16815262ffffff9091166004820152602401602060405180830381865af4158015610894573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108b89190611425565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a008054600160401b900460ff16806108fe5750805467ffffffffffffffff808416911610155b1561091c5760405163f92ee8a960e01b815260040160405180910390fd5b805468ffffffffffffffffff191667ffffffffffffffff831617600160401b17815561094783610f02565b805460ff60401b1916815560405167ffffffffffffffff831681527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a1505050565b61099c610eb7565b6301ffc9a760e01b60009081526020527f67be87c3ff9960ca1e9cfac5cab2ff4747269cf9ed20c9b7306235ac35a491c5805460ff19166001179055565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a008054600160401b810460ff16159067ffffffffffffffff16600081158015610a205750825b905060008267ffffffffffffffff166001148015610a3d5750303b155b905081158015610a4b575080155b15610a695760405163f92ee8a960e01b815260040160405180910390fd5b845467ffffffffffffffff191660011785558315610a9357845460ff60401b1916600160401b1785555b610a9d8787610f02565b8315610ae357845460ff60401b19168555604051600181527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a15b50505050505050565b610af4610eb7565b806001600160a01b03163b600003610b2a5760405163fdeac91f60e01b81526001600160a01b038216600482015260240161062d565b600180546001600160a01b0319166001600160a01b0383169081179091556040516301ffc9a760e01b815263230c0c8160e11b60048201526301ffc9a790602401602060405180830381865afa925050508015610ba4575060408051601f3d908101601f19168201909252610ba1918101906112dc565b60015b610bcc5760405163fdeac91f60e01b81526001600160a01b038216600482015260240161062d565b80610bf55760405163fdeac91f60e01b81526001600160a01b038316600482015260240161062d565b505b50565b60008060008051602061148a83398151915280546040516330b8415f60e01b81526001600160601b03909116600482015290915073__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af4158015610c6a573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610c8e91906112dc565b15610d1b576001546001600160a01b03168154604051631c5da14d60e11b81526001600160601b0390911660048201526001600160a01b0391909116906338bb429a90602401602060405180830381865afa158015610cf1573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610d15919061144f565b91505090565b54600160601b90046001600160a01b0316919050565b604051632392b61b60e21b81526003600482015260009073__$9dab98ad7ae1a426029e5739f922230a41$__90638e4ad86c90602401602060405180830381865af4158015610d84573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103be919061146c565b610db0610eb7565b610e3082836001600160a01b031663644c45e06040518163ffffffff1660e01b8152600401602060405180830381865afa158015610df2573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610e1691906112f9565b603c600085604051806020016040528060008152506107a6565b610bf5637b6a51fd60e01b610779565b610e48610eb7565b610e5181610aec565b610e59610994565b6001600160a01b038216610e805760405163f17ef42d60e01b815260040160405180910390fd5b5060008051602061148a83398151915280546001600160601b0316600160601b6001600160a01b0390931692909202919091179055565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a0054600160401b900460ff16610f0057604051631afcd79f60e31b815260040160405180910390fd5b565b610137610eb7565b600060208284031215610f1c57600080fd5b81356001600160e01b031981168114610f3457600080fd5b9392505050565b6000815180845260005b81811015610f6157602081850181015186830182015201610f45565b506000602082860101526020601f19601f83011685010191505092915050565b6020815260006001600160601b038084511660208401528060208501511660408401525060ff604084015116606083015260608301511515608083015260018060a01b0360808401511660a083015260a0830151610fea60c08401826001600160a01b03169052565b5060c083015160e080840152611004610100840182610f3b565b949350505050565b6001600160a01b0381168114610bf757600080fd5b6001600160601b0381168114610bf757600080fd5b60ff81168114610bf757600080fd5b8015158114610bf757600080fd5b634e487b7160e01b600052604160045260246000fd5b600082601f83011261107a57600080fd5b813567ffffffffffffffff8082111561109557611095611053565b604051601f8301601f19908116603f011681019082821181831017156110bd576110bd611053565b816040528381528660208588010111156110d657600080fd5b836020870160208301376000602085830101528094505050505092915050565b60008060008060008060c0878903121561110f57600080fd5b863561111a8161100c565b9550602087013561112a81611021565b9450604087013561113a81611036565b9350606087013561114a81611045565b9250608087013561115a8161100c565b915060a087013567ffffffffffffffff81111561117657600080fd5b61118289828a01611069565b9150509295509295509295565b6000602082840312156111a157600080fd5b813567ffffffffffffffff8111156111b857600080fd5b61100484828501611069565b600080604083850312156111d757600080fd5b82356111e28161100c565b9150602083013567ffffffffffffffff8111156111fe57600080fd5b61120a85828601611069565b9150509250929050565b60006020828403121561122657600080fd5b8135610f348161100c565b602081526000610f346020830184610f3b565b6000806040838503121561125757600080fd5b82356112628161100c565b915060208301356112728161100c565b809150509250929050565b60006020828403121561128f57600080fd5b815162ffffff81168114610f3457600080fd5b600181811c908216806112b657607f821691505b6020821081036112d657634e487b7160e01b600052602260045260246000fd5b50919050565b6000602082840312156112ee57600080fd5b8151610f3481611045565b60006020828403121561130b57600080fd5b8151610f3481611021565b601f82111561136057600081815260208120601f850160051c8101602086101561133d5750805b601f850160051c820191505b8181101561135c57828155600101611349565b5050505b505050565b815167ffffffffffffffff81111561137f5761137f611053565b6113938161138d84546112a2565b84611316565b602080601f8311600181146113c857600084156113b05750858301515b600019600386901b1c1916600185901b17855561135c565b600085815260208120601f198616915b828110156113f7578886015182559484019460019091019084016113d8565b50858210156114155787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b60006020828403121561143757600080fd5b815167ffffffffffffffff81168114610f3457600080fd5b60006020828403121561146157600080fd5b8151610f348161100c565b60006020828403121561147e57600080fd5b8151610f348161103656fe07ebcf49758b6ed3af50fa146bec0abe157c0218fe65dc0874c286e9d5da4f00a2646970667358221220cdee5b4e09423681d15f6baf14457e980470fc7b4462d774f2e683a6e9b3bb3964736f6c63430008140033",
   "linkReferences": {
-    "contracts/types/Blocknumber.sol": {
-      "BlocknumberLib": [
-        {
-          "length": 20,
-          "start": 4510
-        }
-      ]
-    },
     "contracts/types/NftId.sol": {
       "NftIdLib": [
         {
           "length": 20,
-          "start": 3926
+          "start": 3258
         },
         {
           "length": 20,
-          "start": 4654
-        }
-      ]
-    },
-    "contracts/types/Timestamp.sol": {
-      "TimestampLib": [
-        {
-          "length": 20,
-          "start": 6069
+          "start": 4931
         }
       ]
     },
@@ -530,53 +471,31 @@
       "VersionLib": [
         {
           "length": 20,
-          "start": 532
-        },
-        {
-          "length": 20,
-          "start": 1042
+          "start": 2675
         },
         {
           "length": 20,
-          "start": 3401
-        },
-        {
-          "length": 20,
-          "start": 4894
-        },
+          "start": 3911
+        }
+      ],
+      "VersionPartLib": [
         {
           "length": 20,
-          "start": 5393
+          "start": 5213
         }
       ]
     }
   },
   "deployedLinkReferences": {
-    "contracts/types/Blocknumber.sol": {
-      "BlocknumberLib": [
-        {
-          "length": 20,
-          "start": 2211
-        }
-      ]
-    },
     "contracts/types/NftId.sol": {
       "NftIdLib": [
         {
           "length": 20,
-          "start": 1627
+          "start": 1447
         },
         {
           "length": 20,
-          "start": 2355
-        }
-      ]
-    },
-    "contracts/types/Timestamp.sol": {
-      "TimestampLib": [
-        {
-          "length": 20,
-          "start": 3770
+          "start": 3120
         }
       ]
     },
@@ -584,15 +503,17 @@
       "VersionLib": [
         {
           "length": 20,
-          "start": 1102
+          "start": 864
         },
         {
           "length": 20,
-          "start": 2595
-        },
+          "start": 2100
+        }
+      ],
+      "VersionPartLib": [
         {
           "length": 20,
-          "start": 3094
+          "start": 3402
         }
       ]
     }

package/artifacts/contracts/test/TestToken.sol/TestUsdc.dbg.json

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

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

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