@etherisc/gif-next 0.0.2-62fa865-047 → 0.0.2-65388eb-933

package/README.md

@@ -1,4 +1,4 @@
-# gif-next (Generic Insurance Framework next version)
+# GIF-Next (Generic Insurance Framework, next version)
 
 ## Add OpenZeppelin V5 Dependencies
 
@@ -40,6 +40,17 @@ npm run test-with-gas
 npm run coverage
 ```
 
+### Docgen
+
+Produce `solidty-docgen` documentation using the command below.
+
+```shell
+hh docgen
+```
+
+The resulting markdown files are written to `docs`
+
+
 ### Deployment 
 
 Install the dependencies before running the script below for the first time.
@@ -272,6 +283,98 @@ pool_id = pool.getNftId()
 product_id = product.getNftId()
 ```
 
+## Objects
+
+### Registry
+
+Mandatory properties
+
+* One registry per chain
+* Global registry: the registry on mainnet
+* One entry per protocol object
+* Once registered object properties are immutable
+* Globally unique NFT minted per protocol object (chain id is embedded in NFT id)
+* Object ownership defined by NFT ownernship
+* Typed objects (instance, product, policy, ...)
+* Each object has parent object (only one exception: protocol object does not have parent object)
+* Parent object type is defined by type of child object
+
+Object properties (for smart contracts)
+* Objects that represent a smart contract record its contract address
+* With one exception (see next point) smart contract addresses refer to the address on the same chain as the registry
+* The global registry also holds entries for all the registries on different chains than mainnet, in these cases the addresses refer to the chains of these chain specific registries (this is the only case where registered addresses do not refer to the same chain)
+
+Optional properties
+
+* Objects can have names
+* Object names are unique per chain
+* Objects may define an intercepting property, in which case a predefined smart contract is involved in NFT transfers of the objects NFT (transfer may trigger actions, transfer may be blocked etc)
+* 
+
+Ownership property
+
+* Object ownership defined by ownership of NFT representing the object
+* Protocol
+  * Fixed/predefined owner (address without private key)
+* Registry
+  * Allows registration of token and services (per major release)
+  * May transfer ownership
+* Token
+  * Fixed/predefined owner (address without private key)
+  * TODO add whitelisting for token per major release
+* Service
+  * Allows upgrades of services as long as major version is same
+  * Until further notice the same entity as the registry owner
+  * May transfer ownership
+* Instance
+  * Granting/revoking of roles (both default + custom)
+  * Management of custom roles and targets
+  * May lock instance and/or components
+  * May transfer ownership
+* Component (Product, Pool, Distribution, Oracle)
+  * Register component
+  * Set component wallet (which receives fees, holds funds)
+  * May lock component
+  * May transfer ownership
+  * Additional use case specific features
+* Policy
+  * Represents policy holder
+  * Receive payouts (GIF default behaviour)
+  * May transfer ownership
+* Bundle
+  * Represents funds owner
+  * May withdraw funds not locked by active policies
+  * May transfer ownership
+* Distributor
+  * Receives commissions from sales (GIF default behaviour)
+  * May transfer ownership
+
+Intercepting property
+  * Service owner is indirectly owner of service manager contract
+
+* Instance
+  * intercepts transfer of instance owner (new owner needs access manager admin rights for custom roles and targets)
+  * intercepts transfer of components, to do what? check that new owner has necessary roles?
+* Product
+  * intercepts transfer of policies (use case specific: eg. limit/disallow transfers)
+* Pool:
+  * intercepts transfer of bundles (use case specific: eg. limit/disallow transfers)
+* Distribution
+  * intercepts transfer of distributors (bookkeeping: only one distributor per address allowed)
+* Oracle
+  * likely meaningless
+
+
+### Instance
+
+### Product
+
+### Pool
+
+### Distribution
+
+### Oracle
+
 ## Registry and Services
 
 ### Principles

package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.dbg.json

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

package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.json

@@ -3,6 +3,87 @@
   "contractName": "BaseComponent",
   "sourceName": "contracts/components/BaseComponent.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",
@@ -113,7 +194,7 @@
       "outputs": [
         {
           "internalType": "NftId",
-          "name": "nftId",
+          "name": "",
           "type": "uint96"
         }
       ],
@@ -133,13 +214,26 @@
       "stateMutability": "view",
       "type": "function"
     },
+    {
+      "inputs": [],
+      "name": "getProductNftId",
+      "outputs": [
+        {
+          "internalType": "NftId",
+          "name": "productNftId",
+          "type": "uint96"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
     {
       "inputs": [],
       "name": "getRegistry",
       "outputs": [
         {
           "internalType": "contract IRegistry",
-          "name": "registry",
+          "name": "",
           "type": "address"
         }
       ],
@@ -172,6 +266,13 @@
       "stateMutability": "view",
       "type": "function"
     },
+    {
+      "inputs": [],
+      "name": "linkToRegisteredNftId",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
     {
       "inputs": [],
       "name": "lock",

package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json

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

package/artifacts/contracts/components/Distribution.sol/Distribution.json

@@ -15,6 +15,11 @@
           "name": "instanceNftId",
           "type": "uint96"
         },
+        {
+          "internalType": "NftId",
+          "name": "productNftId",
+          "type": "uint96"
+        },
         {
           "internalType": "address",
           "name": "token",
@@ -51,6 +56,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",
@@ -135,31 +221,6 @@
       "stateMutability": "view",
       "type": "function"
     },
-    {
-      "inputs": [],
-      "name": "getDistributionFee",
-      "outputs": [
-        {
-          "components": [
-            {
-              "internalType": "UFixed",
-              "name": "fractionalFee",
-              "type": "uint256"
-            },
-            {
-              "internalType": "uint256",
-              "name": "fixedFee",
-              "type": "uint256"
-            }
-          ],
-          "internalType": "struct Fee",
-          "name": "distributionFee",
-          "type": "tuple"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
     {
       "inputs": [],
       "name": "getInitialInfo",
@@ -234,7 +295,7 @@
       "outputs": [
         {
           "internalType": "NftId",
-          "name": "nftId",
+          "name": "",
           "type": "uint96"
         }
       ],
@@ -254,19 +315,84 @@
       "stateMutability": "view",
       "type": "function"
     },
+    {
+      "inputs": [],
+      "name": "getProductNftId",
+      "outputs": [
+        {
+          "internalType": "NftId",
+          "name": "productNftId",
+          "type": "uint96"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
     {
       "inputs": [],
       "name": "getRegistry",
       "outputs": [
         {
           "internalType": "contract IRegistry",
-          "name": "registry",
+          "name": "",
           "type": "address"
         }
       ],
       "stateMutability": "view",
       "type": "function"
     },
+    {
+      "inputs": [],
+      "name": "getSetupInfo",
+      "outputs": [
+        {
+          "components": [
+            {
+              "internalType": "NftId",
+              "name": "productNftId",
+              "type": "uint96"
+            },
+            {
+              "internalType": "contract TokenHandler",
+              "name": "tokenHandler",
+              "type": "address"
+            },
+            {
+              "components": [
+                {
+                  "internalType": "UFixed",
+                  "name": "fractionalFee",
+                  "type": "uint256"
+                },
+                {
+                  "internalType": "uint256",
+                  "name": "fixedFee",
+                  "type": "uint256"
+                }
+              ],
+              "internalType": "struct Fee",
+              "name": "distributionFee",
+              "type": "tuple"
+            },
+            {
+              "internalType": "bool",
+              "name": "isIntercepting",
+              "type": "bool"
+            },
+            {
+              "internalType": "address",
+              "name": "wallet",
+              "type": "address"
+            }
+          ],
+          "internalType": "struct ISetup.DistributionSetupInfo",
+          "name": "setupInfo",
+          "type": "tuple"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
     {
       "inputs": [],
       "name": "getToken",
@@ -306,6 +432,13 @@
       "stateMutability": "view",
       "type": "function"
     },
+    {
+      "inputs": [],
+      "name": "linkToRegisteredNftId",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
     {
       "inputs": [],
       "name": "lock",
@@ -420,14 +553,30 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x60806040523480156200001157600080fd5b5060405162001a2c38038062001a2c83398101604081905262000034916200076c565b85858560786301ffc9a760e01b60009081526020527f67be87c3ff9960ca1e9cfac5cab2ff4747269cf9ed20c9b7306235ac35a491c5805460ff19166001908117909155856040805160208101909152600081526200009887878686868662000473565b6000620000cc7f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa300546001600160a01b031690565b6040516305247a1760e51b81526001600160601b03891660048201526001600160a01b03919091169063a48f42e090602401600060405180830381865afa1580156200011c573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052620001469190810190620008d5565b6080810151600580546001600160a01b0319166001600160a01b0390921691821790556040516301ffc9a760e01b8152630de7806f60e41b6004820152919250906301ffc9a790602401602060405180830381865afa158015620001ae573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620001d49190620009bb565b620002005760405162461bcd60e51b815260206004820152600060248201526044015b60405180910390fd5b600560009054906101000a90046001600160a01b03166001600160a01b0316636fa298536040518163ffffffff1660e01b8152600401602060405180830381865afa15801562000254573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906200027a9190620009e0565b600180546001600160a01b03199081166001600160a01b0393841617825560038054309083161790556004805490911692891692909217909155631b1599eb60e21b60009081526020527f82dc1aafdf8e16d475718790c9464a2912866acb395e292abd1ea37be80f5b28805460ff1916909117905550506008805460ff19168a1515179055505085516006555050506020808401516007556005546040805163329802c760e21b815290516001600160a01b03909216935063ca600b1c9260048083019391928290030181865afa1580156200035b573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620003819190620009e0565b60088054610100600160a81b0319166101006001600160a01b039384160217905560055460408051634288121d60e01b815290519190921691634288121d9160048083019260209291908290030181865afa158015620003e5573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906200040b9190620009e0565b600980546001600160a01b0319166001600160a01b039290921691909117905563b4d7c7a360e01b60009081526020527f28392f1ce6972666bf759ebdf276b971884e972a5de82920a201036d483f35c5805460ff1916600117905550505050505062000b5b565b6001600160a01b038616620004cb5760405162461bcd60e51b815260206004820152601b60248201527f4552524f523a5247422d3031303a52454749535452595f5a45524f00000000006044820152606401620001f7565b6040516301ffc9a760e01b8152636882e63f60e11b600482015286906001600160a01b038216906301ffc9a790602401602060405180830381865afa15801562000519573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906200053f9190620009bb565b6200058d5760405162461bcd60e51b815260206004820152601a60248201527f4552524f523a5247422d3031313a4e4f545f52454749535452590000000000006044820152606401620001f7565b6001600160a01b03818116600160a01b6001600160601b0389168102919091177f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa3009081557f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30180546001600160a01b031961ffff60a01b1990911660ff8b1690940260ff60a81b191693909317600160a81b8915150217929092169286169290921790557f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa3026200065d848262000a8f565b5063a6d3826560e01b60009081526020527f164a5a3a3a16df858f794c5fc01b962add2c2151ae53ddb31581eabdf1156730805460ff191660011790555050505050505050565b6001600160a01b0381168114620006ba57600080fd5b50565b8051620006ca81620006a4565b919050565b80516001600160601b0381168114620006ca57600080fd5b80518015158114620006ca57600080fd5b634e487b7160e01b600052604160045260246000fd5b60405160e081016001600160401b0381118282101715620007335762000733620006f8565b60405290565b604051601f8201601f191681016001600160401b0381118282101715620007645762000764620006f8565b604052919050565b60008060008060008086880360e08112156200078757600080fd5b87516200079481620006a4565b9650620007a460208901620006cf565b95506040880151620007b681620006a4565b9450620007c660608901620006e7565b93506040607f1982011215620007db57600080fd5b50604080519081016001600160401b0381118282101715620008015762000801620006f8565b6040526080880151815260a0880151602082015260c08801519092506200082881620006a4565b809150509295509295509295565b805160ff81168114620006ca57600080fd5b600082601f8301126200085a57600080fd5b81516001600160401b03811115620008765762000876620006f8565b60206200088c601f8301601f1916820162000739565b8281528582848701011115620008a157600080fd5b60005b83811015620008c1578581018301518282018401528201620008a4565b506000928101909101919091529392505050565b600060208284031215620008e857600080fd5b81516001600160401b03808211156200090057600080fd5b9083019060e082860312156200091557600080fd5b6200091f6200070e565b6200092a83620006cf565b81526200093a60208401620006cf565b60208201526200094d6040840162000836565b60408201526200096060608401620006e7565b60608201526200097360808401620006bd565b60808201526200098660a08401620006bd565b60a082015260c0830151828111156200099e57600080fd5b620009ac8782860162000848565b60c08301525095945050505050565b600060208284031215620009ce57600080fd5b620009d982620006e7565b9392505050565b600060208284031215620009f357600080fd5b8151620009d981620006a4565b600181811c9082168062000a1557607f821691505b60208210810362000a3657634e487b7160e01b600052602260045260246000fd5b50919050565b601f82111562000a8a57600081815260208120601f850160051c8101602086101562000a655750805b601f850160051c820191505b8181101562000a865782815560010162000a71565b5050505b505050565b81516001600160401b0381111562000aab5762000aab620006f8565b62000ac38162000abc845462000a00565b8462000a3c565b602080601f83116001811462000afb576000841562000ae25750858301515b600019600386901b1c1916600185901b17855562000a86565b600085815260208120601f198616915b8281101562000b2c5788860151825594840194600190910190840162000b0b565b508582101562000b4b5787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b610ec18062000b6b6000396000f3fe608060405234801561001057600080fd5b50600436106101215760003560e01c80637c3d5166116100ad578063de7b5d1411610071578063de7b5d1414610280578063e214756714610291578063f7d39dea146102a5578063f80e2072146101ec578063f83d08ba146102b857600080fd5b80637c3d51661461023d57806387ef9ba014610252578063893d20e81461025d578063a69df4b514610265578063d16d0fe81461026d57600080fd5b806321df0da7116100f457806321df0da7146101c65780633f52c0f6146101d75780634cf30a84146101ec5780635ab1bd53146101ff578063644c45e01461021d57600080fd5b806301ffc9a7146101265780630fec111c14610168578063132996041461017e5780631eff4b22146101a3575b600080fd5b610153610134366004610a33565b6001600160e01b03191660009081526020819052604090205460ff1690565b60405190151581526020015b60405180910390f35b6101706102c0565b60405161015f929190610aaa565b6003546001600160a01b03165b6040516001600160a01b03909116815260200161015f565b6101b8600080516020610e6c83398151915281565b60405190815260200161015f565b6004546001600160a01b031661018b565b6101ea6101e5366004610bba565b610347565b005b6101ea6101fa366004610c09565b6103b0565b600080516020610e6c833981519152546001600160a01b031661018b565b61022561041d565b6040516001600160601b03909116815260200161015f565b61024561049d565b60405161015f9190610c33565b60085460ff16610153565b61018b61064d565b6101ea6106c8565b6101b861027b366004610c09565b61078a565b6005546001600160a01b031661018b565b61015361029f366004610c4a565b50600090565b6101b86102b3366004610c09565b61079f565b6101ea61083a565b6040805160e08101825260008082526020820181905291810182905260608082018390526080820183905260a0820183905260c082018190529091806103046108cc565b506008546040805160065460208201526007548183015260ff90921615156060808401919091528151808403909101815260809092019052909590945092505050565b600854604051631fa9607b60e11b81526101009091046001600160a01b031690633f52c0f69061037b908490600401610c33565b600060405180830381600087803b15801561039557600080fd5b505af11580156103a9573d6000803e3d6000fd5b5050505050565b6009546001600160a01b031633146104195760405162461bcd60e51b815260206004820152602160248201527f4552524f523a504f4c2d3030323a4e4f545f50524f445543545f5345525649436044820152604560f81b60648201526084015b60405180910390fd5b5050565b6000600080516020610e6c83398151915254604051636939560f60e11b81523060048201526001600160a01b039091169063d272ac1e90602401602060405180830381865afa158015610474573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104989190610c7c565b905090565b60408051808201909152600080825260208201526005546000906001600160a01b0316639ae31ff56104cd61041d565b6040516001600160e01b031960e084901b1681526001600160601b039091166004820152602401602060405180830381865afa158015610511573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105359190610c7c565b60055460405163278b381b60e01b81526001600160601b03831660048201529192506001600160a01b03169063278b381b90602401602060405180830381865afa158015610587573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105ab9190610c97565b156106315760055460405163f2b246c360e01b81526001600160601b03831660048201526001600160a01b039091169063f2b246c3906024016101e060405180830381865afa158015610602573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106269190610d0c565b610100015191505090565b5050604080518082019091526006548152600754602082015290565b6000600080516020610e6c83398151915254604051630a57ebcf60e11b81523060048201526001600160a01b03909116906314afd79e90602401602060405180830381865afa1580156106a4573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104989190610dcb565b6106d061064d565b6001600160a01b0316336001600160a01b03161461072a5760405162461bcd60e51b815260206004820152601760248201527622a92927a91d2923a1169818189d2727aa2fa7aba722a960491b6044820152606401610410565b600154604051630bdb124f60e21b81523060048201526001600160a01b0390911690632f6c493c906024015b600060405180830381600087803b15801561077057600080fd5b505af1158015610784573d6000803e3d6000fd5b50505050565b60006107968282610de8565b90505b92915050565b6000806107aa61049d565b60405163012ebd8360e21b815281516004820152602082015160248201526044810185905290915073__$a23651848365a6a5ca15f07b4331037f48$__906304baf60c906064016040805180830381865af415801561080d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108319190610e0d565b50949350505050565b61084261064d565b6001600160a01b0316336001600160a01b03161461089c5760405162461bcd60e51b815260206004820152601760248201527622a92927a91d2923a1169818189d2727aa2fa7aba722a960491b6044820152606401610410565b60015460405163f435f5a760e01b81523060048201526001600160a01b039091169063f435f5a790602401610756565b6040805160e08101825260008082526020820181905291810182905260608082018390526080820183905260a082019290925260c081019190915260606000600080516020610e6c83398151915290506040518060e0016040528061092f600090565b6001600160601b0390811682528354600160a01b908190049091166020830152600184015490810460ff9081166040840152600160a81b820416151560608301523060808301526001600160a01b031660a082015260028301805460c09092019161099990610e31565b80601f01602080910402602001604051908101604052809291908181526020018280546109c590610e31565b8015610a125780601f106109e757610100808354040283529160200191610a12565b820191906000526020600020905b8154815290600101906020018083116109f557829003601f168201915b50505050508152506040518060200160405280600081525092509250509091565b600060208284031215610a4557600080fd5b81356001600160e01b031981168114610a5d57600080fd5b9392505050565b6000815180845260005b81811015610a8a57602081850181015186830182015201610a6e565b506000602082860101526020601f19601f83011685010191505092915050565b6040815260006001600160601b038085511660408401528060208601511660608401525060ff60408501511660808301526060840151610aee60a084018215159052565b5060808401516001600160a01b03811660c08401525060a08401516001600160a01b03811660e08401525060c084015160e0610100840152610b34610120840182610a64565b90508281036020840152610b488185610a64565b95945050505050565b6040805190810167ffffffffffffffff81118282101715610b8257634e487b7160e01b600052604160045260246000fd5b60405290565b604051610120810167ffffffffffffffff81118282101715610b8257634e487b7160e01b600052604160045260246000fd5b600060408284031215610bcc57600080fd5b610bd4610b51565b82358152602083013560208201528091505092915050565b80356001600160c01b031981168114610c0457600080fd5b919050565b60008060408385031215610c1c57600080fd5b610c2583610bec565b946020939093013593505050565b815181526020808301519082015260408101610799565b600060208284031215610c5c57600080fd5b61079682610bec565b80516001600160601b0381168114610c0457600080fd5b600060208284031215610c8e57600080fd5b61079682610c65565b600060208284031215610ca957600080fd5b81518015158114610a5d57600080fd5b6001600160a01b0381168114610cce57600080fd5b50565b8051610c0481610cb9565b600060408284031215610cee57600080fd5b610cf6610b51565b9050815181526020820151602082015292915050565b60006101e08284031215610d1f57600080fd5b610d27610b88565b610d3083610c65565b8152610d3e60208401610c65565b6020820152610d4f60408401610cd1565b6040820152610d618460608501610cdc565b6060820152610d738460a08501610cdc565b6080820152610d858460e08501610cdc565b60a0820152610d98846101208501610cdc565b60c0820152610dab846101608501610cdc565b60e0820152610dbe846101a08501610cdc565b6101008201529392505050565b600060208284031215610ddd57600080fd5b8151610a5d81610cb9565b808202811582820484141761079957634e487b7160e01b600052601160045260246000fd5b60008060408385031215610e2057600080fd5b505080516020909101519092909150565b600181811c90821680610e4557607f821691505b602082108103610e6557634e487b7160e01b600052602260045260246000fd5b5091905056fe6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa300a26469706673582212202b6848b6950af8ce12f3ee21c3e3dae0b22865be8ad44699dcd6e1d677f2349a64736f6c63430008140033",
-  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106101215760003560e01c80637c3d5166116100ad578063de7b5d1411610071578063de7b5d1414610280578063e214756714610291578063f7d39dea146102a5578063f80e2072146101ec578063f83d08ba146102b857600080fd5b80637c3d51661461023d57806387ef9ba014610252578063893d20e81461025d578063a69df4b514610265578063d16d0fe81461026d57600080fd5b806321df0da7116100f457806321df0da7146101c65780633f52c0f6146101d75780634cf30a84146101ec5780635ab1bd53146101ff578063644c45e01461021d57600080fd5b806301ffc9a7146101265780630fec111c14610168578063132996041461017e5780631eff4b22146101a3575b600080fd5b610153610134366004610a33565b6001600160e01b03191660009081526020819052604090205460ff1690565b60405190151581526020015b60405180910390f35b6101706102c0565b60405161015f929190610aaa565b6003546001600160a01b03165b6040516001600160a01b03909116815260200161015f565b6101b8600080516020610e6c83398151915281565b60405190815260200161015f565b6004546001600160a01b031661018b565b6101ea6101e5366004610bba565b610347565b005b6101ea6101fa366004610c09565b6103b0565b600080516020610e6c833981519152546001600160a01b031661018b565b61022561041d565b6040516001600160601b03909116815260200161015f565b61024561049d565b60405161015f9190610c33565b60085460ff16610153565b61018b61064d565b6101ea6106c8565b6101b861027b366004610c09565b61078a565b6005546001600160a01b031661018b565b61015361029f366004610c4a565b50600090565b6101b86102b3366004610c09565b61079f565b6101ea61083a565b6040805160e08101825260008082526020820181905291810182905260608082018390526080820183905260a0820183905260c082018190529091806103046108cc565b506008546040805160065460208201526007548183015260ff90921615156060808401919091528151808403909101815260809092019052909590945092505050565b600854604051631fa9607b60e11b81526101009091046001600160a01b031690633f52c0f69061037b908490600401610c33565b600060405180830381600087803b15801561039557600080fd5b505af11580156103a9573d6000803e3d6000fd5b5050505050565b6009546001600160a01b031633146104195760405162461bcd60e51b815260206004820152602160248201527f4552524f523a504f4c2d3030323a4e4f545f50524f445543545f5345525649436044820152604560f81b60648201526084015b60405180910390fd5b5050565b6000600080516020610e6c83398151915254604051636939560f60e11b81523060048201526001600160a01b039091169063d272ac1e90602401602060405180830381865afa158015610474573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104989190610c7c565b905090565b60408051808201909152600080825260208201526005546000906001600160a01b0316639ae31ff56104cd61041d565b6040516001600160e01b031960e084901b1681526001600160601b039091166004820152602401602060405180830381865afa158015610511573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105359190610c7c565b60055460405163278b381b60e01b81526001600160601b03831660048201529192506001600160a01b03169063278b381b90602401602060405180830381865afa158015610587573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105ab9190610c97565b156106315760055460405163f2b246c360e01b81526001600160601b03831660048201526001600160a01b039091169063f2b246c3906024016101e060405180830381865afa158015610602573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106269190610d0c565b610100015191505090565b5050604080518082019091526006548152600754602082015290565b6000600080516020610e6c83398151915254604051630a57ebcf60e11b81523060048201526001600160a01b03909116906314afd79e90602401602060405180830381865afa1580156106a4573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104989190610dcb565b6106d061064d565b6001600160a01b0316336001600160a01b03161461072a5760405162461bcd60e51b815260206004820152601760248201527622a92927a91d2923a1169818189d2727aa2fa7aba722a960491b6044820152606401610410565b600154604051630bdb124f60e21b81523060048201526001600160a01b0390911690632f6c493c906024015b600060405180830381600087803b15801561077057600080fd5b505af1158015610784573d6000803e3d6000fd5b50505050565b60006107968282610de8565b90505b92915050565b6000806107aa61049d565b60405163012ebd8360e21b815281516004820152602082015160248201526044810185905290915073__$a23651848365a6a5ca15f07b4331037f48$__906304baf60c906064016040805180830381865af415801561080d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108319190610e0d565b50949350505050565b61084261064d565b6001600160a01b0316336001600160a01b03161461089c5760405162461bcd60e51b815260206004820152601760248201527622a92927a91d2923a1169818189d2727aa2fa7aba722a960491b6044820152606401610410565b60015460405163f435f5a760e01b81523060048201526001600160a01b039091169063f435f5a790602401610756565b6040805160e08101825260008082526020820181905291810182905260608082018390526080820183905260a082019290925260c081019190915260606000600080516020610e6c83398151915290506040518060e0016040528061092f600090565b6001600160601b0390811682528354600160a01b908190049091166020830152600184015490810460ff9081166040840152600160a81b820416151560608301523060808301526001600160a01b031660a082015260028301805460c09092019161099990610e31565b80601f01602080910402602001604051908101604052809291908181526020018280546109c590610e31565b8015610a125780601f106109e757610100808354040283529160200191610a12565b820191906000526020600020905b8154815290600101906020018083116109f557829003601f168201915b50505050508152506040518060200160405280600081525092509250509091565b600060208284031215610a4557600080fd5b81356001600160e01b031981168114610a5d57600080fd5b9392505050565b6000815180845260005b81811015610a8a57602081850181015186830182015201610a6e565b506000602082860101526020601f19601f83011685010191505092915050565b6040815260006001600160601b038085511660408401528060208601511660608401525060ff60408501511660808301526060840151610aee60a084018215159052565b5060808401516001600160a01b03811660c08401525060a08401516001600160a01b03811660e08401525060c084015160e0610100840152610b34610120840182610a64565b90508281036020840152610b488185610a64565b95945050505050565b6040805190810167ffffffffffffffff81118282101715610b8257634e487b7160e01b600052604160045260246000fd5b60405290565b604051610120810167ffffffffffffffff81118282101715610b8257634e487b7160e01b600052604160045260246000fd5b600060408284031215610bcc57600080fd5b610bd4610b51565b82358152602083013560208201528091505092915050565b80356001600160c01b031981168114610c0457600080fd5b919050565b60008060408385031215610c1c57600080fd5b610c2583610bec565b946020939093013593505050565b815181526020808301519082015260408101610799565b600060208284031215610c5c57600080fd5b61079682610bec565b80516001600160601b0381168114610c0457600080fd5b600060208284031215610c8e57600080fd5b61079682610c65565b600060208284031215610ca957600080fd5b81518015158114610a5d57600080fd5b6001600160a01b0381168114610cce57600080fd5b50565b8051610c0481610cb9565b600060408284031215610cee57600080fd5b610cf6610b51565b9050815181526020820151602082015292915050565b60006101e08284031215610d1f57600080fd5b610d27610b88565b610d3083610c65565b8152610d3e60208401610c65565b6020820152610d4f60408401610cd1565b6040820152610d618460608501610cdc565b6060820152610d738460a08501610cdc565b6080820152610d858460e08501610cdc565b60a0820152610d98846101208501610cdc565b60c0820152610dab846101608501610cdc565b60e0820152610dbe846101a08501610cdc565b6101008201529392505050565b600060208284031215610ddd57600080fd5b8151610a5d81610cb9565b808202811582820484141761079957634e487b7160e01b600052601160045260246000fd5b60008060408385031215610e2057600080fd5b505080516020909101519092909150565b600181811c90821680610e4557607f821691505b602082108103610e6557634e487b7160e01b600052602260045260246000fd5b5091905056fe6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa300a26469706673582212202b6848b6950af8ce12f3ee21c3e3dae0b22865be8ad44699dcd6e1d677f2349a64736f6c63430008140033",
+  "bytecode": "0x60806040523480156200001157600080fd5b5060405162001c5638038062001c568339810160408190526200003491620006a1565b8686868660786301ffc9a760e01b60009081526020527f67be87c3ff9960ca1e9cfac5cab2ff4747269cf9ed20c9b7306235ac35a491c5805460ff1916600190811790915586600280546001600160a01b03191633179055604080516020810190915260008152620000ab88888686868662000371565b6000620000c06001546001600160a01b031690565b6040516305247a1760e51b81526001600160601b038a1660048201526001600160a01b03919091169063a48f42e090602401600060405180830381865afa15801562000110573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526200013a91908101906200081f565b6080810151600780546001600160a01b0319166001600160a01b0390921691821790556040516301ffc9a760e01b81526342e19e5f60e01b6004820152919250906301ffc9a790602401602060405180830381865afa158015620001a2573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620001c8919062000905565b620001f45760405162461bcd60e51b815260206004820152600060248201526044015b60405180910390fd5b600760009054906101000a90046001600160a01b03166001600160a01b0316636fa298536040518163ffffffff1660e01b8152600401602060405180830381865afa15801562000248573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906200026e91906200092a565b600380546001600160a01b03199081166001600160a01b039384161790915560058054309083161790556006805490911688831617905560078054909116600160a01b6001600160601b038a160217905563593e597960e11b60009081526020527fe5ff73b5268559916713b465b9aafbfc723fb1444fb210a355c8977973af6095805460ff191660011790555050600a80548b151560ff199182161790915589516008556020808b015160095563c8ea96c560e01b600090815290527f358bf83baf6613c2def0011c88aae44093f6c2a350167255c9453fdf9640579480549091166001179055506200036495505050505050565b5050505050505062000aa5565b6200037d828762000442565b60007f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30080546001600160601b0388166001600160681b0319909116176c0100000000000000000000000060ff8816021760ff60681b19166d010000000000000000000000000086151502178155905060018101620003fc8382620009d9565b506303fb044760e21b60009081526020527fb43e4f3791bfcdefa3a0fbe2a5555f8d6490b90e01de0ff40c66f18b49b562c5805460ff1916600117905550505050505050565b600280546001600160a01b0319166001600160a01b03841617905562000468816200046c565b5050565b6001546001600160a01b031615620004a75760015460405163fcdbf2d960e01b81526001600160a01b039091166004820152602401620001eb565b6001600160a01b038116620004cf5760405163f5c4d07d60e01b815260040160405180910390fd5b806001600160a01b03163b600003620005075760405163fdeac91f60e01b81526001600160a01b0382166004820152602401620001eb565b600180546001600160a01b0319166001600160a01b0383169081179091556040516301ffc9a760e01b815263350fb35160e11b60048201526301ffc9a790602401602060405180830381865afa92505050801562000584575060408051601f3d908101601f19168201909252620005819181019062000905565b60015b620005ae5760405163fdeac91f60e01b81526001600160a01b0382166004820152602401620001eb565b80620004685760405163fdeac91f60e01b81526001600160a01b0383166004820152602401620001eb565b50565b6001600160a01b0381168114620005d957600080fd5b8051620005ff81620005dc565b919050565b80516001600160601b0381168114620005ff57600080fd5b80518015158114620005ff57600080fd5b634e487b7160e01b600052604160045260246000fd5b60405160e081016001600160401b03811182821017156200066857620006686200062d565b60405290565b604051601f8201601f191681016001600160401b03811182821017156200069957620006996200062d565b604052919050565b6000806000806000806000878903610100811215620006bf57600080fd5b8851620006cc81620005dc565b9750620006dc60208a0162000604565b9650620006ec60408a0162000604565b95506060890151620006fe81620005dc565b94506200070e60808a016200061c565b93506040609f19820112156200072357600080fd5b50604080519081016001600160401b03811182821017156200074957620007496200062d565b60405260a0890151815260c0890151602082015260e08901519092506200077081620005dc565b8091505092959891949750929550565b805160ff81168114620005ff57600080fd5b600082601f830112620007a457600080fd5b81516001600160401b03811115620007c057620007c06200062d565b6020620007d6601f8301601f191682016200066e565b8281528582848701011115620007eb57600080fd5b60005b838110156200080b578581018301518282018401528201620007ee565b506000928101909101919091529392505050565b6000602082840312156200083257600080fd5b81516001600160401b03808211156200084a57600080fd5b9083019060e082860312156200085f57600080fd5b6200086962000643565b620008748362000604565b8152620008846020840162000604565b6020820152620008976040840162000780565b6040820152620008aa606084016200061c565b6060820152620008bd60808401620005f2565b6080820152620008d060a08401620005f2565b60a082015260c083015182811115620008e857600080fd5b620008f68782860162000792565b60c08301525095945050505050565b6000602082840312156200091857600080fd5b62000923826200061c565b9392505050565b6000602082840312156200093d57600080fd5b81516200092381620005dc565b600181811c908216806200095f57607f821691505b6020821081036200098057634e487b7160e01b600052602260045260246000fd5b50919050565b601f821115620009d457600081815260208120601f850160051c81016020861015620009af5750805b601f850160051c820191505b81811015620009d057828155600101620009bb565b5050505b505050565b81516001600160401b03811115620009f557620009f56200062d565b62000a0d8162000a0684546200094a565b8462000986565b602080601f83116001811462000a45576000841562000a2c5750858301515b600019600386901b1c1916600185901b178555620009d0565b600085815260208120601f198616915b8281101562000a765788860151825594840194600190910190840162000a55565b508582101562000a955787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b6111a18062000ab56000396000f3fe608060405234801561001057600080fd5b50600436106101365760003560e01c8063644c45e0116100b8578063d16d0fe81161007c578063d16d0fe814610305578063de7b5d1414610318578063e214756714610329578063f7d39dea1461033d578063f80e207214610247578063f83d08ba1461035057600080fd5b8063644c45e01461026b57806387ef9ba014610283578063893d20e81461028e578063a69df4b514610296578063c200b8091461029e57600080fd5b80631eff4b22116100ff5780631eff4b22146101ee57806321df0da7146102235780633f52c0f6146102345780634cf30a84146102475780635ab1bd531461025a57600080fd5b806251884a1461013b57806301ffc9a71461016c5780630fec111c146101a957806313299604146101bf578063138461e0146101e4575b600080fd5b600754600160a01b90046001600160601b03165b6040516001600160601b0390911681526020015b60405180910390f35b61019961017a366004610d89565b6001600160e01b03191660009081526020819052604090205460ff1690565b6040519015158152602001610163565b6101b1610358565b604051610163929190610e00565b6005546001600160a01b03165b6040516001600160a01b039091168152602001610163565b6101ec6103df565b005b6102157f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30081565b604051908152602001610163565b6006546001600160a01b03166101cc565b6101ec610242366004610ede565b610601565b6101ec610255366004610f2d565b61066a565b6001546001600160a01b03166101cc565b600154600160a01b90046001600160601b031661014f565b600a5460ff16610199565b6101cc6106d2565b6101ec6107f0565b6102a661086d565b6040805182516001600160601b031681526020808401516001600160a01b0390811682840152848401518051948401949094529201516060808301919091528301511515608080830191909152909201511660a082015260c001610163565b610215610313366004610f2d565b610a73565b6007546001600160a01b03166101cc565b610199610337366004610f57565b50600090565b61021561034b366004610f2d565b610a88565b6101ec610b2a565b6040805160e08101825260008082526020820181905291810182905260608082018390526080820183905260a0820183905260c0820181905290918061039c610ba7565b50600a546040805160085460208201526009548183015260ff90921615156060808401919091528151808403909101815260809092019052909590945092505050565b6001546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015273__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af4158015610441573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104659190610f82565b156104ac576001546040516316322c0f60e31b81526001600160a01b0382166004820152600160a01b9091046001600160601b031660248201526044015b60405180910390fd5b6001546001600160a01b03166104d55760405163cf29926160e01b815260040160405180910390fd5b60015460405163c3c5a54760e01b81523060048201819052916001600160a01b03169063c3c5a54790602401602060405180830381865afa15801561051e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105429190610f82565b61056a576040516372657a5160e01b81526001600160a01b03821660048201526024016104a3565b600154604051636939560f60e11b81526001600160a01b0383811660048301529091169063d272ac1e90602401602060405180830381865afa1580156105b4573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105d89190610fb4565b600160146101000a8154816001600160601b0302191690836001600160601b0316021790555050565b600a54604051631fa9607b60e11b81526101009091046001600160a01b031690633f52c0f690610635908490600401610fcf565b600060405180830381600087803b15801561064f57600080fd5b505af1158015610663573d6000803e3d6000fd5b5050505050565b600b546001600160a01b031633146106ce5760405162461bcd60e51b815260206004820152602160248201527f4552524f523a504f4c2d3030323a4e4f545f50524f445543545f5345525649436044820152604560f81b60648201526084016104a3565b5050565b6001546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015260009073__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af4158015610737573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061075b9190610f82565b156107e057600154604051631c5da14d60e11b8152600160a01b82046001600160601b031660048201526001600160a01b03909116906338bb429a90602401602060405180830381865afa1580156107b7573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906107db9190611009565b905090565b506002546001600160a01b031690565b60006107fa6106d2565b90506001600160a01b0381161580159061081d5750336001600160a01b03821614155b1561083d5760405163700dd81160e01b81523360048201526024016104a3565b600354604051630bdb124f60e21b81523060048201526001600160a01b0390911690632f6c493c90602401610635565b610875610d2d565b6001546040805163c4cade9d60e01b8152600160a01b9092046001600160601b03166004830152600060248301525173__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__9163c4cade9d9160448083019260209291908290030181865af41580156108e4573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906109089190610f82565b1561096c57506040805160a081018252600754600160a01b90046001600160601b03168152600060208083018290528351808501855260085481526009549181019190915292820192909252600a5460ff1615156060820152608081019190915290565b600754604080516302cd307160e01b815290516000926001600160a01b0316916302cd30719160048083019260209291908290030181865afa1580156109b6573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906109da9190611009565b9050806001600160a01b0316639ad69c67610a056001546001600160601b03600160a01b9091041690565b6040516001600160e01b031960e084901b1681526001600160601b03909116600482015260240160c060405180830381865afa158015610a49573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a6d9190611026565b91505090565b6000610a7f82826110e8565b90505b92915050565b600080610a9361086d565b604081810151905163012ebd8360e21b81528151600482015260208201516024820152604481018690529192509073__$a23651848365a6a5ca15f07b4331037f48$__906304baf60c906064016040805180830381865af4158015610afc573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610b20919061110d565b5095945050505050565b6000610b346106d2565b90506001600160a01b03811615801590610b575750336001600160a01b03821614155b15610b775760405163700dd81160e01b81523360048201526024016104a3565b60035460405163f435f5a760e01b81523060048201526001600160a01b039091169063f435f5a790602401610635565b6040805160e08101825260008082526020820181905291810182905260608082018390526080820183905260a082019290925260c0810191909152606060007f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30090506040518060e00160405280610c2e6001546001600160601b03600160a01b9091041690565b6001600160601b0390811682528354908116602083015260ff600160601b820481166040840152600160681b909104161515606082015230608082015260a001610c766106d2565b6001600160a01b03168152602001826001018054610c9390611131565b80601f0160208091040260200160405190810160405280929190818152602001828054610cbf90611131565b8015610d0c5780601f10610ce157610100808354040283529160200191610d0c565b820191906000526020600020905b815481529060010190602001808311610cef57829003601f168201915b50505050508152506040518060200160405280600081525092509250509091565b6040518060a0016040528060006001600160601b0316815260200160006001600160a01b03168152602001610d75604051806040016040528060008152602001600081525090565b815260006020820181905260409091015290565b600060208284031215610d9b57600080fd5b81356001600160e01b031981168114610db357600080fd5b9392505050565b6000815180845260005b81811015610de057602081850181015186830182015201610dc4565b506000602082860101526020601f19601f83011685010191505092915050565b6040815260006001600160601b038085511660408401528060208601511660608401525060ff60408501511660808301526060840151610e4460a084018215159052565b5060808401516001600160a01b03811660c08401525060a08401516001600160a01b03811660e08401525060c084015160e0610100840152610e8a610120840182610dba565b90508281036020840152610e9e8185610dba565b95945050505050565b6040805190810167ffffffffffffffff81118282101715610ed857634e487b7160e01b600052604160045260246000fd5b60405290565b600060408284031215610ef057600080fd5b610ef8610ea7565b82358152602083013560208201528091505092915050565b80356001600160c01b031981168114610f2857600080fd5b919050565b60008060408385031215610f4057600080fd5b610f4983610f10565b946020939093013593505050565b600060208284031215610f6957600080fd5b610a7f82610f10565b80518015158114610f2857600080fd5b600060208284031215610f9457600080fd5b610a7f82610f72565b80516001600160601b0381168114610f2857600080fd5b600060208284031215610fc657600080fd5b610a7f82610f9d565b815181526020808301519082015260408101610a82565b6001600160a01b0381168114610ffb57600080fd5b50565b8051610f2881610fe6565b60006020828403121561101b57600080fd5b8151610db381610fe6565b600081830360c081121561103957600080fd5b60405160a0810181811067ffffffffffffffff8211171561106a57634e487b7160e01b600052604160045260246000fd5b60405261107684610f9d565b8152602084015161108681610fe6565b60208201526040603f198301121561109d57600080fd5b6110a5610ea7565b915060408401518252606084015160208301528160408201526110ca60808501610f72565b60608201526110db60a08501610ffe565b6080820152949350505050565b8082028115828204841417610a8257634e487b7160e01b600052601160045260246000fd5b6000806040838503121561112057600080fd5b505080516020909101519092909150565b600181811c9082168061114557607f821691505b60208210810361116557634e487b7160e01b600052602260045260246000fd5b5091905056fea2646970667358221220826ff1278946ea962c35ee01d94e874e4bd5a3179396157f99899553df9659ff64736f6c63430008140033",
+  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106101365760003560e01c8063644c45e0116100b8578063d16d0fe81161007c578063d16d0fe814610305578063de7b5d1414610318578063e214756714610329578063f7d39dea1461033d578063f80e207214610247578063f83d08ba1461035057600080fd5b8063644c45e01461026b57806387ef9ba014610283578063893d20e81461028e578063a69df4b514610296578063c200b8091461029e57600080fd5b80631eff4b22116100ff5780631eff4b22146101ee57806321df0da7146102235780633f52c0f6146102345780634cf30a84146102475780635ab1bd531461025a57600080fd5b806251884a1461013b57806301ffc9a71461016c5780630fec111c146101a957806313299604146101bf578063138461e0146101e4575b600080fd5b600754600160a01b90046001600160601b03165b6040516001600160601b0390911681526020015b60405180910390f35b61019961017a366004610d89565b6001600160e01b03191660009081526020819052604090205460ff1690565b6040519015158152602001610163565b6101b1610358565b604051610163929190610e00565b6005546001600160a01b03165b6040516001600160a01b039091168152602001610163565b6101ec6103df565b005b6102157f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30081565b604051908152602001610163565b6006546001600160a01b03166101cc565b6101ec610242366004610ede565b610601565b6101ec610255366004610f2d565b61066a565b6001546001600160a01b03166101cc565b600154600160a01b90046001600160601b031661014f565b600a5460ff16610199565b6101cc6106d2565b6101ec6107f0565b6102a661086d565b6040805182516001600160601b031681526020808401516001600160a01b0390811682840152848401518051948401949094529201516060808301919091528301511515608080830191909152909201511660a082015260c001610163565b610215610313366004610f2d565b610a73565b6007546001600160a01b03166101cc565b610199610337366004610f57565b50600090565b61021561034b366004610f2d565b610a88565b6101ec610b2a565b6040805160e08101825260008082526020820181905291810182905260608082018390526080820183905260a0820183905260c0820181905290918061039c610ba7565b50600a546040805160085460208201526009548183015260ff90921615156060808401919091528151808403909101815260809092019052909590945092505050565b6001546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015273__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af4158015610441573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104659190610f82565b156104ac576001546040516316322c0f60e31b81526001600160a01b0382166004820152600160a01b9091046001600160601b031660248201526044015b60405180910390fd5b6001546001600160a01b03166104d55760405163cf29926160e01b815260040160405180910390fd5b60015460405163c3c5a54760e01b81523060048201819052916001600160a01b03169063c3c5a54790602401602060405180830381865afa15801561051e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105429190610f82565b61056a576040516372657a5160e01b81526001600160a01b03821660048201526024016104a3565b600154604051636939560f60e11b81526001600160a01b0383811660048301529091169063d272ac1e90602401602060405180830381865afa1580156105b4573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105d89190610fb4565b600160146101000a8154816001600160601b0302191690836001600160601b0316021790555050565b600a54604051631fa9607b60e11b81526101009091046001600160a01b031690633f52c0f690610635908490600401610fcf565b600060405180830381600087803b15801561064f57600080fd5b505af1158015610663573d6000803e3d6000fd5b5050505050565b600b546001600160a01b031633146106ce5760405162461bcd60e51b815260206004820152602160248201527f4552524f523a504f4c2d3030323a4e4f545f50524f445543545f5345525649436044820152604560f81b60648201526084016104a3565b5050565b6001546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015260009073__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af4158015610737573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061075b9190610f82565b156107e057600154604051631c5da14d60e11b8152600160a01b82046001600160601b031660048201526001600160a01b03909116906338bb429a90602401602060405180830381865afa1580156107b7573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906107db9190611009565b905090565b506002546001600160a01b031690565b60006107fa6106d2565b90506001600160a01b0381161580159061081d5750336001600160a01b03821614155b1561083d5760405163700dd81160e01b81523360048201526024016104a3565b600354604051630bdb124f60e21b81523060048201526001600160a01b0390911690632f6c493c90602401610635565b610875610d2d565b6001546040805163c4cade9d60e01b8152600160a01b9092046001600160601b03166004830152600060248301525173__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__9163c4cade9d9160448083019260209291908290030181865af41580156108e4573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906109089190610f82565b1561096c57506040805160a081018252600754600160a01b90046001600160601b03168152600060208083018290528351808501855260085481526009549181019190915292820192909252600a5460ff1615156060820152608081019190915290565b600754604080516302cd307160e01b815290516000926001600160a01b0316916302cd30719160048083019260209291908290030181865afa1580156109b6573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906109da9190611009565b9050806001600160a01b0316639ad69c67610a056001546001600160601b03600160a01b9091041690565b6040516001600160e01b031960e084901b1681526001600160601b03909116600482015260240160c060405180830381865afa158015610a49573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a6d9190611026565b91505090565b6000610a7f82826110e8565b90505b92915050565b600080610a9361086d565b604081810151905163012ebd8360e21b81528151600482015260208201516024820152604481018690529192509073__$a23651848365a6a5ca15f07b4331037f48$__906304baf60c906064016040805180830381865af4158015610afc573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610b20919061110d565b5095945050505050565b6000610b346106d2565b90506001600160a01b03811615801590610b575750336001600160a01b03821614155b15610b775760405163700dd81160e01b81523360048201526024016104a3565b60035460405163f435f5a760e01b81523060048201526001600160a01b039091169063f435f5a790602401610635565b6040805160e08101825260008082526020820181905291810182905260608082018390526080820183905260a082019290925260c0810191909152606060007f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30090506040518060e00160405280610c2e6001546001600160601b03600160a01b9091041690565b6001600160601b0390811682528354908116602083015260ff600160601b820481166040840152600160681b909104161515606082015230608082015260a001610c766106d2565b6001600160a01b03168152602001826001018054610c9390611131565b80601f0160208091040260200160405190810160405280929190818152602001828054610cbf90611131565b8015610d0c5780601f10610ce157610100808354040283529160200191610d0c565b820191906000526020600020905b815481529060010190602001808311610cef57829003601f168201915b50505050508152506040518060200160405280600081525092509250509091565b6040518060a0016040528060006001600160601b0316815260200160006001600160a01b03168152602001610d75604051806040016040528060008152602001600081525090565b815260006020820181905260409091015290565b600060208284031215610d9b57600080fd5b81356001600160e01b031981168114610db357600080fd5b9392505050565b6000815180845260005b81811015610de057602081850181015186830182015201610dc4565b506000602082860101526020601f19601f83011685010191505092915050565b6040815260006001600160601b038085511660408401528060208601511660608401525060ff60408501511660808301526060840151610e4460a084018215159052565b5060808401516001600160a01b03811660c08401525060a08401516001600160a01b03811660e08401525060c084015160e0610100840152610e8a610120840182610dba565b90508281036020840152610e9e8185610dba565b95945050505050565b6040805190810167ffffffffffffffff81118282101715610ed857634e487b7160e01b600052604160045260246000fd5b60405290565b600060408284031215610ef057600080fd5b610ef8610ea7565b82358152602083013560208201528091505092915050565b80356001600160c01b031981168114610f2857600080fd5b919050565b60008060408385031215610f4057600080fd5b610f4983610f10565b946020939093013593505050565b600060208284031215610f6957600080fd5b610a7f82610f10565b80518015158114610f2857600080fd5b600060208284031215610f9457600080fd5b610a7f82610f72565b80516001600160601b0381168114610f2857600080fd5b600060208284031215610fc657600080fd5b610a7f82610f9d565b815181526020808301519082015260408101610a82565b6001600160a01b0381168114610ffb57600080fd5b50565b8051610f2881610fe6565b60006020828403121561101b57600080fd5b8151610db381610fe6565b600081830360c081121561103957600080fd5b60405160a0810181811067ffffffffffffffff8211171561106a57634e487b7160e01b600052604160045260246000fd5b60405261107684610f9d565b8152602084015161108681610fe6565b60208201526040603f198301121561109d57600080fd5b6110a5610ea7565b915060408401518252606084015160208301528160408201526110ca60808501610f72565b60608201526110db60a08501610ffe565b6080820152949350505050565b8082028115828204841417610a8257634e487b7160e01b600052601160045260246000fd5b6000806040838503121561112057600080fd5b505080516020909101519092909150565b600181811c9082168061114557607f821691505b60208210810361116557634e487b7160e01b600052602260045260246000fd5b5091905056fea2646970667358221220826ff1278946ea962c35ee01d94e874e4bd5a3179396157f99899553df9659ff64736f6c63430008140033",
   "linkReferences": {
     "contracts/types/Fee.sol": {
       "FeeLib": [
         {
           "length": 20,
-          "start": 4927
+          "start": 5496
+        }
+      ]
+    },
+    "contracts/types/NftId.sol": {
+      "NftIdLib": [
+        {
+          "length": 20,
+          "start": 3772
+        },
+        {
+          "length": 20,
+          "start": 4530
+        },
+        {
+          "length": 20,
+          "start": 4955
         }
       ]
     }
@@ -437,7 +586,23 @@
       "FeeLib": [
         {
           "length": 20,
-          "start": 2004
+          "start": 2755
+        }
+      ]
+    },
+    "contracts/types/NftId.sol": {
+      "NftIdLib": [
+        {
+          "length": 20,
+          "start": 1031
+        },
+        {
+          "length": 20,
+          "start": 1789
+        },
+        {
+          "length": 20,
+          "start": 2214
         }
       ]
     }

package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.dbg.json

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