@etherisc/gif-next 0.0.2-e4b632c-016 → 0.0.2-e510b92-393

package/README.md

@@ -51,7 +51,7 @@ hh docgen
 The resulting markdown files are written to `docs`
 
 
-### Deployment 
+### Full protocol deployment 
 
 Install the dependencies before running the script below for the first time.
 
@@ -81,6 +81,25 @@ Environment variables:
 - `WALLET_MNEMONIC` the mnemonic of the wallet to use for deployment (required for mumbai and mainnet)
 - `ETHERSCAN_API_KEY` `POLYGONSCAN_API_KEY` the api key for etherscan/polygonscan (required for mumbai and mainnet)
 
+### Create a new instance
+
+Requires previous step to be completed. 
+
+```bash
+# set appropriate values vor env variables (see below)
+
+hh run --network <networkname> scripts/new_instance.ts
+```
+
+Currently an HD wallet is expected to be used for the deployment. The mnemonic of the wallet needs to be provided via the `WALLET_MNEMONIC` environment variable. 
+The instance owner will be the 11th address of the wallet.
+
+Environment variables:
+
+- `WEB3_INFURA_PROJECT_ID` set to infura project id (required for mumbai and mainnet)
+- `WALLET_MNEMONIC` the mnemonic of the wallet to use for deployment (required for mumbai and mainnet)
+- `REGISTRY_ADDRESS` the address of the registry that is already deployed and configured and has a valid master instance
+
 
 ### Console
 
@@ -119,7 +138,11 @@ forge test -vvvv --mt test_decimals
 # provide gas report for a single test
 forge test --mt test_decimals --gas-report
 
+# provide code coverage report
 forge coverage
+forge coverage --report lcov 
+
+
 ```
 
 Chisel session
@@ -415,3 +438,46 @@ Distribution Service
 - registered via registry service by registry owner
 - registers distribution components for registered products via registry service by distribution owner (distribution owner role is permissend by the product's instance)
 - registers distributors for registered distribution components via registry service
+
+## Contract Organisation
+
+now 
+
+contracts
+  components
+  instance
+  registry
+  shared
+  types
+
+
+contracts
+  component
+    pool
+      Pool.sol
+      PoolService.sol
+    oracle
+    distribution
+    product
+      Product.sol
+      ProductService.sol
+    Component.sol
+    ComponentService.sol
+  instance
+    Instance.sol
+    InstanceAccessManager.sol
+    InstanceReader.sol
+    InstanceService.sol
+    InstanceServiceManager.sol
+  registry
+    ChainNft.sol
+    Registry.sol
+    RegistryService.sol
+    RegistryServiceManager.sol
+  shared
+    Registerable.sol
+    RegisterableUpgradable.sol
+  type
+    NftId.sol
+    ObjectType.sol
+

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

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

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

@@ -3,6 +3,28 @@
   "contractName": "BaseComponent",
   "sourceName": "contracts/components/BaseComponent.sol",
   "abi": [
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "target",
+          "type": "address"
+        }
+      ],
+      "name": "AddressEmptyCode",
+      "type": "error"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "account",
+          "type": "address"
+        }
+      ],
+      "name": "AddressInsufficientBalance",
+      "type": "error"
+    },
     {
       "inputs": [
         {
@@ -19,6 +41,43 @@
       "name": "ErrorAlreadyLinked",
       "type": "error"
     },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "newWallet",
+          "type": "address"
+        }
+      ],
+      "name": "ErrorBaseComponentWalletAddressIsSameAsCurrent",
+      "type": "error"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "oldWallet",
+          "type": "address"
+        },
+        {
+          "internalType": "address",
+          "name": "newWallet",
+          "type": "address"
+        },
+        {
+          "internalType": "uint256",
+          "name": "allowance",
+          "type": "uint256"
+        },
+        {
+          "internalType": "uint256",
+          "name": "balance",
+          "type": "uint256"
+        }
+      ],
+      "name": "ErrorBaseComponentWalletAllowanceTooSmall",
+      "type": "error"
+    },
     {
       "inputs": [
         {
@@ -84,6 +143,11 @@
       "name": "ErrorRegistryNotInitialized",
       "type": "error"
     },
+    {
+      "inputs": [],
+      "name": "FailedInnerCall",
+      "type": "error"
+    },
     {
       "inputs": [],
       "name": "InvalidInitialization",
@@ -94,6 +158,17 @@
       "name": "NotInitializing",
       "type": "error"
     },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "token",
+          "type": "address"
+        }
+      ],
+      "name": "SafeERC20FailedOperation",
+      "type": "error"
+    },
     {
       "anonymous": false,
       "inputs": [
@@ -107,6 +182,44 @@
       "name": "Initialized",
       "type": "event"
     },
+    {
+      "anonymous": false,
+      "inputs": [
+        {
+          "indexed": false,
+          "internalType": "address",
+          "name": "newWallet",
+          "type": "address"
+        }
+      ],
+      "name": "LogBaseComponentWalletAddressChanged",
+      "type": "event"
+    },
+    {
+      "anonymous": false,
+      "inputs": [
+        {
+          "indexed": false,
+          "internalType": "address",
+          "name": "from",
+          "type": "address"
+        },
+        {
+          "indexed": false,
+          "internalType": "address",
+          "name": "to",
+          "type": "address"
+        },
+        {
+          "indexed": false,
+          "internalType": "uint256",
+          "name": "amount",
+          "type": "uint256"
+        }
+      ],
+      "name": "LogBaseComponentWalletTokensTransferred",
+      "type": "event"
+    },
     {
       "inputs": [],
       "name": "REGISTERABLE_LOCATION_V1",
@@ -280,6 +393,32 @@
       "stateMutability": "nonpayable",
       "type": "function"
     },
+    {
+      "inputs": [
+        {
+          "internalType": "NftId",
+          "name": "productNftId",
+          "type": "uint96"
+        }
+      ],
+      "name": "setProductNftId",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "newWallet",
+          "type": "address"
+        }
+      ],
+      "name": "setWallet",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
     {
       "inputs": [
         {

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

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

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

@@ -15,11 +15,6 @@
           "name": "instanceNftId",
           "type": "uint96"
         },
-        {
-          "internalType": "NftId",
-          "name": "productNftId",
-          "type": "uint96"
-        },
         {
           "internalType": "address",
           "name": "token",
@@ -56,6 +51,28 @@
       "stateMutability": "nonpayable",
       "type": "constructor"
     },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "target",
+          "type": "address"
+        }
+      ],
+      "name": "AddressEmptyCode",
+      "type": "error"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "account",
+          "type": "address"
+        }
+      ],
+      "name": "AddressInsufficientBalance",
+      "type": "error"
+    },
     {
       "inputs": [
         {
@@ -72,6 +89,43 @@
       "name": "ErrorAlreadyLinked",
       "type": "error"
     },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "newWallet",
+          "type": "address"
+        }
+      ],
+      "name": "ErrorBaseComponentWalletAddressIsSameAsCurrent",
+      "type": "error"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "oldWallet",
+          "type": "address"
+        },
+        {
+          "internalType": "address",
+          "name": "newWallet",
+          "type": "address"
+        },
+        {
+          "internalType": "uint256",
+          "name": "allowance",
+          "type": "uint256"
+        },
+        {
+          "internalType": "uint256",
+          "name": "balance",
+          "type": "uint256"
+        }
+      ],
+      "name": "ErrorBaseComponentWalletAllowanceTooSmall",
+      "type": "error"
+    },
     {
       "inputs": [
         {
@@ -137,6 +191,11 @@
       "name": "ErrorRegistryNotInitialized",
       "type": "error"
     },
+    {
+      "inputs": [],
+      "name": "FailedInnerCall",
+      "type": "error"
+    },
     {
       "inputs": [],
       "name": "InvalidInitialization",
@@ -147,6 +206,17 @@
       "name": "NotInitializing",
       "type": "error"
     },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "token",
+          "type": "address"
+        }
+      ],
+      "name": "SafeERC20FailedOperation",
+      "type": "error"
+    },
     {
       "anonymous": false,
       "inputs": [
@@ -160,6 +230,44 @@
       "name": "Initialized",
       "type": "event"
     },
+    {
+      "anonymous": false,
+      "inputs": [
+        {
+          "indexed": false,
+          "internalType": "address",
+          "name": "newWallet",
+          "type": "address"
+        }
+      ],
+      "name": "LogBaseComponentWalletAddressChanged",
+      "type": "event"
+    },
+    {
+      "anonymous": false,
+      "inputs": [
+        {
+          "indexed": false,
+          "internalType": "address",
+          "name": "from",
+          "type": "address"
+        },
+        {
+          "indexed": false,
+          "internalType": "address",
+          "name": "to",
+          "type": "address"
+        },
+        {
+          "indexed": false,
+          "internalType": "uint256",
+          "name": "amount",
+          "type": "uint256"
+        }
+      ],
+      "name": "LogBaseComponentWalletTokensTransferred",
+      "type": "event"
+    },
     {
       "inputs": [],
       "name": "REGISTERABLE_LOCATION_V1",
@@ -526,6 +634,32 @@
       "stateMutability": "nonpayable",
       "type": "function"
     },
+    {
+      "inputs": [
+        {
+          "internalType": "NftId",
+          "name": "productNftId",
+          "type": "uint96"
+        }
+      ],
+      "name": "setProductNftId",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "newWallet",
+          "type": "address"
+        }
+      ],
+      "name": "setWallet",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
     {
       "inputs": [
         {
@@ -553,14 +687,14 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x60806040523480156200001157600080fd5b5060405162001c5638038062001c568339810160408190526200003491620006a1565b8686868660786301ffc9a760e01b60009081526020527f67be87c3ff9960ca1e9cfac5cab2ff4747269cf9ed20c9b7306235ac35a491c5805460ff1916600190811790915586600280546001600160a01b03191633179055604080516020810190915260008152620000ab88888686868662000371565b6000620000c06001546001600160a01b031690565b6040516305247a1760e51b81526001600160601b038a1660048201526001600160a01b03919091169063a48f42e090602401600060405180830381865afa15801562000110573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526200013a91908101906200081f565b6080810151600780546001600160a01b0319166001600160a01b0390921691821790556040516301ffc9a760e01b815263e72ac88960e01b6004820152919250906301ffc9a790602401602060405180830381865afa158015620001a2573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620001c8919062000905565b620001f45760405162461bcd60e51b815260206004820152600060248201526044015b60405180910390fd5b600760009054906101000a90046001600160a01b03166001600160a01b0316636fa298536040518163ffffffff1660e01b8152600401602060405180830381865afa15801562000248573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906200026e91906200092a565b600380546001600160a01b03199081166001600160a01b039384161790915560058054309083161790556006805490911688831617905560078054909116600160a01b6001600160601b038a160217905563593e597960e11b60009081526020527fe5ff73b5268559916713b465b9aafbfc723fb1444fb210a355c8977973af6095805460ff191660011790555050600a80548b151560ff199182161790915589516008556020808b015160095563c8ea96c560e01b600090815290527f358bf83baf6613c2def0011c88aae44093f6c2a350167255c9453fdf9640579480549091166001179055506200036495505050505050565b5050505050505062000aa5565b6200037d828762000442565b60007f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30080546001600160601b0388166001600160681b0319909116176c0100000000000000000000000060ff8816021760ff60681b19166d010000000000000000000000000086151502178155905060018101620003fc8382620009d9565b506303fb044760e21b60009081526020527fb43e4f3791bfcdefa3a0fbe2a5555f8d6490b90e01de0ff40c66f18b49b562c5805460ff1916600117905550505050505050565b600280546001600160a01b0319166001600160a01b03841617905562000468816200046c565b5050565b6001546001600160a01b031615620004a75760015460405163fcdbf2d960e01b81526001600160a01b039091166004820152602401620001eb565b6001600160a01b038116620004cf5760405163f5c4d07d60e01b815260040160405180910390fd5b806001600160a01b03163b600003620005075760405163fdeac91f60e01b81526001600160a01b0382166004820152602401620001eb565b600180546001600160a01b0319166001600160a01b0383169081179091556040516301ffc9a760e01b815263350fb35160e11b60048201526301ffc9a790602401602060405180830381865afa92505050801562000584575060408051601f3d908101601f19168201909252620005819181019062000905565b60015b620005ae5760405163fdeac91f60e01b81526001600160a01b0382166004820152602401620001eb565b80620004685760405163fdeac91f60e01b81526001600160a01b0383166004820152602401620001eb565b50565b6001600160a01b0381168114620005d957600080fd5b8051620005ff81620005dc565b919050565b80516001600160601b0381168114620005ff57600080fd5b80518015158114620005ff57600080fd5b634e487b7160e01b600052604160045260246000fd5b60405160e081016001600160401b03811182821017156200066857620006686200062d565b60405290565b604051601f8201601f191681016001600160401b03811182821017156200069957620006996200062d565b604052919050565b6000806000806000806000878903610100811215620006bf57600080fd5b8851620006cc81620005dc565b9750620006dc60208a0162000604565b9650620006ec60408a0162000604565b95506060890151620006fe81620005dc565b94506200070e60808a016200061c565b93506040609f19820112156200072357600080fd5b50604080519081016001600160401b03811182821017156200074957620007496200062d565b60405260a0890151815260c0890151602082015260e08901519092506200077081620005dc565b8091505092959891949750929550565b805160ff81168114620005ff57600080fd5b600082601f830112620007a457600080fd5b81516001600160401b03811115620007c057620007c06200062d565b6020620007d6601f8301601f191682016200066e565b8281528582848701011115620007eb57600080fd5b60005b838110156200080b578581018301518282018401528201620007ee565b506000928101909101919091529392505050565b6000602082840312156200083257600080fd5b81516001600160401b03808211156200084a57600080fd5b9083019060e082860312156200085f57600080fd5b6200086962000643565b620008748362000604565b8152620008846020840162000604565b6020820152620008976040840162000780565b6040820152620008aa606084016200061c565b6060820152620008bd60808401620005f2565b6080820152620008d060a08401620005f2565b60a082015260c083015182811115620008e857600080fd5b620008f68782860162000792565b60c08301525095945050505050565b6000602082840312156200091857600080fd5b62000923826200061c565b9392505050565b6000602082840312156200093d57600080fd5b81516200092381620005dc565b600181811c908216806200095f57607f821691505b6020821081036200098057634e487b7160e01b600052602260045260246000fd5b50919050565b601f821115620009d457600081815260208120601f850160051c81016020861015620009af5750805b601f850160051c820191505b81811015620009d057828155600101620009bb565b5050505b505050565b81516001600160401b03811115620009f557620009f56200062d565b62000a0d8162000a0684546200094a565b8462000986565b602080601f83116001811462000a45576000841562000a2c5750858301515b600019600386901b1c1916600185901b178555620009d0565b600085815260208120601f198616915b8281101562000a765788860151825594840194600190910190840162000a55565b508582101562000a955787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b6111a18062000ab56000396000f3fe608060405234801561001057600080fd5b50600436106101365760003560e01c8063644c45e0116100b8578063d16d0fe81161007c578063d16d0fe814610305578063de7b5d1414610318578063e214756714610329578063f7d39dea1461033d578063f80e207214610247578063f83d08ba1461035057600080fd5b8063644c45e01461026b57806387ef9ba014610283578063893d20e81461028e578063a69df4b514610296578063c200b8091461029e57600080fd5b80631eff4b22116100ff5780631eff4b22146101ee57806321df0da7146102235780633f52c0f6146102345780634cf30a84146102475780635ab1bd531461025a57600080fd5b806251884a1461013b57806301ffc9a71461016c5780630fec111c146101a957806313299604146101bf578063138461e0146101e4575b600080fd5b600754600160a01b90046001600160601b03165b6040516001600160601b0390911681526020015b60405180910390f35b61019961017a366004610d89565b6001600160e01b03191660009081526020819052604090205460ff1690565b6040519015158152602001610163565b6101b1610358565b604051610163929190610e00565b6005546001600160a01b03165b6040516001600160a01b039091168152602001610163565b6101ec6103df565b005b6102157f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30081565b604051908152602001610163565b6006546001600160a01b03166101cc565b6101ec610242366004610ede565b610601565b6101ec610255366004610f2d565b61066a565b6001546001600160a01b03166101cc565b600154600160a01b90046001600160601b031661014f565b600a5460ff16610199565b6101cc6106d2565b6101ec6107f0565b6102a661086d565b6040805182516001600160601b031681526020808401516001600160a01b0390811682840152848401518051948401949094529201516060808301919091528301511515608080830191909152909201511660a082015260c001610163565b610215610313366004610f2d565b610a73565b6007546001600160a01b03166101cc565b610199610337366004610f57565b50600090565b61021561034b366004610f2d565b610a88565b6101ec610b2a565b6040805160e08101825260008082526020820181905291810182905260608082018390526080820183905260a0820183905260c0820181905290918061039c610ba7565b50600a546040805160085460208201526009548183015260ff90921615156060808401919091528151808403909101815260809092019052909590945092505050565b6001546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015273__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af4158015610441573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104659190610f82565b156104ac576001546040516316322c0f60e31b81526001600160a01b0382166004820152600160a01b9091046001600160601b031660248201526044015b60405180910390fd5b6001546001600160a01b03166104d55760405163cf29926160e01b815260040160405180910390fd5b60015460405163c3c5a54760e01b81523060048201819052916001600160a01b03169063c3c5a54790602401602060405180830381865afa15801561051e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105429190610f82565b61056a576040516372657a5160e01b81526001600160a01b03821660048201526024016104a3565b600154604051636939560f60e11b81526001600160a01b0383811660048301529091169063d272ac1e90602401602060405180830381865afa1580156105b4573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105d89190610fb4565b600160146101000a8154816001600160601b0302191690836001600160601b0316021790555050565b600a54604051631fa9607b60e11b81526101009091046001600160a01b031690633f52c0f690610635908490600401610fcf565b600060405180830381600087803b15801561064f57600080fd5b505af1158015610663573d6000803e3d6000fd5b5050505050565b600b546001600160a01b031633146106ce5760405162461bcd60e51b815260206004820152602160248201527f4552524f523a504f4c2d3030323a4e4f545f50524f445543545f5345525649436044820152604560f81b60648201526084016104a3565b5050565b6001546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015260009073__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af4158015610737573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061075b9190610f82565b156107e057600154604051631c5da14d60e11b8152600160a01b82046001600160601b031660048201526001600160a01b03909116906338bb429a90602401602060405180830381865afa1580156107b7573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906107db9190611009565b905090565b506002546001600160a01b031690565b60006107fa6106d2565b90506001600160a01b0381161580159061081d5750336001600160a01b03821614155b1561083d5760405163700dd81160e01b81523360048201526024016104a3565b600354604051630bdb124f60e21b81523060048201526001600160a01b0390911690632f6c493c90602401610635565b610875610d2d565b6001546040805163c4cade9d60e01b8152600160a01b9092046001600160601b03166004830152600060248301525173__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__9163c4cade9d9160448083019260209291908290030181865af41580156108e4573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906109089190610f82565b1561096c57506040805160a081018252600754600160a01b90046001600160601b03168152600060208083018290528351808501855260085481526009549181019190915292820192909252600a5460ff1615156060820152608081019190915290565b600754604080516302cd307160e01b815290516000926001600160a01b0316916302cd30719160048083019260209291908290030181865afa1580156109b6573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906109da9190611009565b9050806001600160a01b0316639ad69c67610a056001546001600160601b03600160a01b9091041690565b6040516001600160e01b031960e084901b1681526001600160601b03909116600482015260240160c060405180830381865afa158015610a49573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a6d9190611026565b91505090565b6000610a7f82826110e8565b90505b92915050565b600080610a9361086d565b604081810151905163012ebd8360e21b81528151600482015260208201516024820152604481018690529192509073__$a23651848365a6a5ca15f07b4331037f48$__906304baf60c906064016040805180830381865af4158015610afc573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610b20919061110d565b5095945050505050565b6000610b346106d2565b90506001600160a01b03811615801590610b575750336001600160a01b03821614155b15610b775760405163700dd81160e01b81523360048201526024016104a3565b60035460405163f435f5a760e01b81523060048201526001600160a01b039091169063f435f5a790602401610635565b6040805160e08101825260008082526020820181905291810182905260608082018390526080820183905260a082019290925260c0810191909152606060007f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30090506040518060e00160405280610c2e6001546001600160601b03600160a01b9091041690565b6001600160601b0390811682528354908116602083015260ff600160601b820481166040840152600160681b909104161515606082015230608082015260a001610c766106d2565b6001600160a01b03168152602001826001018054610c9390611131565b80601f0160208091040260200160405190810160405280929190818152602001828054610cbf90611131565b8015610d0c5780601f10610ce157610100808354040283529160200191610d0c565b820191906000526020600020905b815481529060010190602001808311610cef57829003601f168201915b50505050508152506040518060200160405280600081525092509250509091565b6040518060a0016040528060006001600160601b0316815260200160006001600160a01b03168152602001610d75604051806040016040528060008152602001600081525090565b815260006020820181905260409091015290565b600060208284031215610d9b57600080fd5b81356001600160e01b031981168114610db357600080fd5b9392505050565b6000815180845260005b81811015610de057602081850181015186830182015201610dc4565b506000602082860101526020601f19601f83011685010191505092915050565b6040815260006001600160601b038085511660408401528060208601511660608401525060ff60408501511660808301526060840151610e4460a084018215159052565b5060808401516001600160a01b03811660c08401525060a08401516001600160a01b03811660e08401525060c084015160e0610100840152610e8a610120840182610dba565b90508281036020840152610e9e8185610dba565b95945050505050565b6040805190810167ffffffffffffffff81118282101715610ed857634e487b7160e01b600052604160045260246000fd5b60405290565b600060408284031215610ef057600080fd5b610ef8610ea7565b82358152602083013560208201528091505092915050565b80356001600160c01b031981168114610f2857600080fd5b919050565b60008060408385031215610f4057600080fd5b610f4983610f10565b946020939093013593505050565b600060208284031215610f6957600080fd5b610a7f82610f10565b80518015158114610f2857600080fd5b600060208284031215610f9457600080fd5b610a7f82610f72565b80516001600160601b0381168114610f2857600080fd5b600060208284031215610fc657600080fd5b610a7f82610f9d565b815181526020808301519082015260408101610a82565b6001600160a01b0381168114610ffb57600080fd5b50565b8051610f2881610fe6565b60006020828403121561101b57600080fd5b8151610db381610fe6565b600081830360c081121561103957600080fd5b60405160a0810181811067ffffffffffffffff8211171561106a57634e487b7160e01b600052604160045260246000fd5b60405261107684610f9d565b8152602084015161108681610fe6565b60208201526040603f198301121561109d57600080fd5b6110a5610ea7565b915060408401518252606084015160208301528160408201526110ca60808501610f72565b60608201526110db60a08501610ffe565b6080820152949350505050565b8082028115828204841417610a8257634e487b7160e01b600052601160045260246000fd5b6000806040838503121561112057600080fd5b505080516020909101519092909150565b600181811c9082168061114557607f821691505b60208210810361116557634e487b7160e01b600052602260045260246000fd5b5091905056fea2646970667358221220d3776ca6e93e2cf2ca54cd30c0f4b4be0200a147c401cbe7ed76421c9785a43e64736f6c63430008140033",
-  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106101365760003560e01c8063644c45e0116100b8578063d16d0fe81161007c578063d16d0fe814610305578063de7b5d1414610318578063e214756714610329578063f7d39dea1461033d578063f80e207214610247578063f83d08ba1461035057600080fd5b8063644c45e01461026b57806387ef9ba014610283578063893d20e81461028e578063a69df4b514610296578063c200b8091461029e57600080fd5b80631eff4b22116100ff5780631eff4b22146101ee57806321df0da7146102235780633f52c0f6146102345780634cf30a84146102475780635ab1bd531461025a57600080fd5b806251884a1461013b57806301ffc9a71461016c5780630fec111c146101a957806313299604146101bf578063138461e0146101e4575b600080fd5b600754600160a01b90046001600160601b03165b6040516001600160601b0390911681526020015b60405180910390f35b61019961017a366004610d89565b6001600160e01b03191660009081526020819052604090205460ff1690565b6040519015158152602001610163565b6101b1610358565b604051610163929190610e00565b6005546001600160a01b03165b6040516001600160a01b039091168152602001610163565b6101ec6103df565b005b6102157f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30081565b604051908152602001610163565b6006546001600160a01b03166101cc565b6101ec610242366004610ede565b610601565b6101ec610255366004610f2d565b61066a565b6001546001600160a01b03166101cc565b600154600160a01b90046001600160601b031661014f565b600a5460ff16610199565b6101cc6106d2565b6101ec6107f0565b6102a661086d565b6040805182516001600160601b031681526020808401516001600160a01b0390811682840152848401518051948401949094529201516060808301919091528301511515608080830191909152909201511660a082015260c001610163565b610215610313366004610f2d565b610a73565b6007546001600160a01b03166101cc565b610199610337366004610f57565b50600090565b61021561034b366004610f2d565b610a88565b6101ec610b2a565b6040805160e08101825260008082526020820181905291810182905260608082018390526080820183905260a0820183905260c0820181905290918061039c610ba7565b50600a546040805160085460208201526009548183015260ff90921615156060808401919091528151808403909101815260809092019052909590945092505050565b6001546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015273__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af4158015610441573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104659190610f82565b156104ac576001546040516316322c0f60e31b81526001600160a01b0382166004820152600160a01b9091046001600160601b031660248201526044015b60405180910390fd5b6001546001600160a01b03166104d55760405163cf29926160e01b815260040160405180910390fd5b60015460405163c3c5a54760e01b81523060048201819052916001600160a01b03169063c3c5a54790602401602060405180830381865afa15801561051e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105429190610f82565b61056a576040516372657a5160e01b81526001600160a01b03821660048201526024016104a3565b600154604051636939560f60e11b81526001600160a01b0383811660048301529091169063d272ac1e90602401602060405180830381865afa1580156105b4573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105d89190610fb4565b600160146101000a8154816001600160601b0302191690836001600160601b0316021790555050565b600a54604051631fa9607b60e11b81526101009091046001600160a01b031690633f52c0f690610635908490600401610fcf565b600060405180830381600087803b15801561064f57600080fd5b505af1158015610663573d6000803e3d6000fd5b5050505050565b600b546001600160a01b031633146106ce5760405162461bcd60e51b815260206004820152602160248201527f4552524f523a504f4c2d3030323a4e4f545f50524f445543545f5345525649436044820152604560f81b60648201526084016104a3565b5050565b6001546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015260009073__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af4158015610737573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061075b9190610f82565b156107e057600154604051631c5da14d60e11b8152600160a01b82046001600160601b031660048201526001600160a01b03909116906338bb429a90602401602060405180830381865afa1580156107b7573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906107db9190611009565b905090565b506002546001600160a01b031690565b60006107fa6106d2565b90506001600160a01b0381161580159061081d5750336001600160a01b03821614155b1561083d5760405163700dd81160e01b81523360048201526024016104a3565b600354604051630bdb124f60e21b81523060048201526001600160a01b0390911690632f6c493c90602401610635565b610875610d2d565b6001546040805163c4cade9d60e01b8152600160a01b9092046001600160601b03166004830152600060248301525173__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__9163c4cade9d9160448083019260209291908290030181865af41580156108e4573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906109089190610f82565b1561096c57506040805160a081018252600754600160a01b90046001600160601b03168152600060208083018290528351808501855260085481526009549181019190915292820192909252600a5460ff1615156060820152608081019190915290565b600754604080516302cd307160e01b815290516000926001600160a01b0316916302cd30719160048083019260209291908290030181865afa1580156109b6573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906109da9190611009565b9050806001600160a01b0316639ad69c67610a056001546001600160601b03600160a01b9091041690565b6040516001600160e01b031960e084901b1681526001600160601b03909116600482015260240160c060405180830381865afa158015610a49573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a6d9190611026565b91505090565b6000610a7f82826110e8565b90505b92915050565b600080610a9361086d565b604081810151905163012ebd8360e21b81528151600482015260208201516024820152604481018690529192509073__$a23651848365a6a5ca15f07b4331037f48$__906304baf60c906064016040805180830381865af4158015610afc573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610b20919061110d565b5095945050505050565b6000610b346106d2565b90506001600160a01b03811615801590610b575750336001600160a01b03821614155b15610b775760405163700dd81160e01b81523360048201526024016104a3565b60035460405163f435f5a760e01b81523060048201526001600160a01b039091169063f435f5a790602401610635565b6040805160e08101825260008082526020820181905291810182905260608082018390526080820183905260a082019290925260c0810191909152606060007f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30090506040518060e00160405280610c2e6001546001600160601b03600160a01b9091041690565b6001600160601b0390811682528354908116602083015260ff600160601b820481166040840152600160681b909104161515606082015230608082015260a001610c766106d2565b6001600160a01b03168152602001826001018054610c9390611131565b80601f0160208091040260200160405190810160405280929190818152602001828054610cbf90611131565b8015610d0c5780601f10610ce157610100808354040283529160200191610d0c565b820191906000526020600020905b815481529060010190602001808311610cef57829003601f168201915b50505050508152506040518060200160405280600081525092509250509091565b6040518060a0016040528060006001600160601b0316815260200160006001600160a01b03168152602001610d75604051806040016040528060008152602001600081525090565b815260006020820181905260409091015290565b600060208284031215610d9b57600080fd5b81356001600160e01b031981168114610db357600080fd5b9392505050565b6000815180845260005b81811015610de057602081850181015186830182015201610dc4565b506000602082860101526020601f19601f83011685010191505092915050565b6040815260006001600160601b038085511660408401528060208601511660608401525060ff60408501511660808301526060840151610e4460a084018215159052565b5060808401516001600160a01b03811660c08401525060a08401516001600160a01b03811660e08401525060c084015160e0610100840152610e8a610120840182610dba565b90508281036020840152610e9e8185610dba565b95945050505050565b6040805190810167ffffffffffffffff81118282101715610ed857634e487b7160e01b600052604160045260246000fd5b60405290565b600060408284031215610ef057600080fd5b610ef8610ea7565b82358152602083013560208201528091505092915050565b80356001600160c01b031981168114610f2857600080fd5b919050565b60008060408385031215610f4057600080fd5b610f4983610f10565b946020939093013593505050565b600060208284031215610f6957600080fd5b610a7f82610f10565b80518015158114610f2857600080fd5b600060208284031215610f9457600080fd5b610a7f82610f72565b80516001600160601b0381168114610f2857600080fd5b600060208284031215610fc657600080fd5b610a7f82610f9d565b815181526020808301519082015260408101610a82565b6001600160a01b0381168114610ffb57600080fd5b50565b8051610f2881610fe6565b60006020828403121561101b57600080fd5b8151610db381610fe6565b600081830360c081121561103957600080fd5b60405160a0810181811067ffffffffffffffff8211171561106a57634e487b7160e01b600052604160045260246000fd5b60405261107684610f9d565b8152602084015161108681610fe6565b60208201526040603f198301121561109d57600080fd5b6110a5610ea7565b915060408401518252606084015160208301528160408201526110ca60808501610f72565b60608201526110db60a08501610ffe565b6080820152949350505050565b8082028115828204841417610a8257634e487b7160e01b600052601160045260246000fd5b6000806040838503121561112057600080fd5b505080516020909101519092909150565b600181811c9082168061114557607f821691505b60208210810361116557634e487b7160e01b600052602260045260246000fd5b5091905056fea2646970667358221220d3776ca6e93e2cf2ca54cd30c0f4b4be0200a147c401cbe7ed76421c9785a43e64736f6c63430008140033",
+  "bytecode": "0x60806040523480156200001157600080fd5b506040516200240e3803806200240e833981016040819052620000349162000824565b85858560786001856200006d6301ffc9a760e01b6000908152602052600080516020620023ee833981519152805460ff19166001179055565b600280546001600160a01b031916331790556040805160208101909152600081526200009e8787868686866200046b565b6000620000b36001546001600160a01b031690565b6040516305247a1760e51b81526001600160601b03891660048201526001600160a01b03919091169063a48f42e090602401600060405180830381865afa15801562000103573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526200012d91908101906200098d565b6080810151600780546001600160a01b0319166001600160a01b0390921691821790556040516301ffc9a760e01b815263cb92195b60e01b6004820152919250906301ffc9a790602401602060405180830381865afa15801562000195573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620001bb919062000a73565b620001e75760405162461bcd60e51b815260206004820152600060248201526044015b60405180910390fd5b600760009054906101000a90046001600160a01b03166001600160a01b0316636fa298536040518163ffffffff1660e01b8152600401602060405180830381865afa1580156200023b573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019062000261919062000a98565b600380546001600160a01b039283166001600160a01b0319918216179091556005805482163017905560068054988316989091169790971790965550506346b32da560e01b600090815260209081527f0c74615b9065379cafc5e4e9d82ac4cbed23f75e35c2545793f8045351389f6c805460ff19166001179055600a80548a516008558a8301516009556001600160a81b0319168b1515610100600160a81b031916176101008d8816021790556007546040805163329802c760e21b8152905191909616975063ca600b1c96506004808701969295509093509083900301905081865afa15801562000358573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906200037e919062000a98565b600b80546001600160a01b0319166001600160a01b0392831617905560075460408051634288121d60e01b815290519190921691634288121d9160048083019260209291908290030181865afa158015620003dd573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019062000403919062000a98565b600c80546001600160a01b0319166001600160a01b039290921691909117905563c8ea96c560e01b60009081526020527f358bf83baf6613c2def0011c88aae44093f6c2a350167255c9453fdf96405794805460ff1916600117905550505050505062000c13565b6200049c6301ffc9a760e01b6000908152602052600080516020620023ee833981519152805460ff19166001179055565b620004a882876200056d565b60007f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30080546001600160601b0388166001600160681b0319909116176c0100000000000000000000000060ff8816021760ff60681b19166d01000000000000000000000000008615150217815590506001810162000527838262000b47565b506303fb044760e21b60009081526020527fb43e4f3791bfcdefa3a0fbe2a5555f8d6490b90e01de0ff40c66f18b49b562c5805460ff1916600117905550505050505050565b6001600160a01b038216620005c55760405162461bcd60e51b815260206004820152601e60248201527f4e66744f776e61626c653a20696e697469616c206f776e6572206973203000006044820152606401620001de565b600280546001600160a01b0319166001600160a01b038416179055620005eb81620005ef565b5050565b6001546001600160a01b0316156200062a5760015460405163fcdbf2d960e01b81526001600160a01b039091166004820152602401620001de565b6001600160a01b038116620006525760405163f5c4d07d60e01b815260040160405180910390fd5b806001600160a01b03163b6000036200068a5760405163fdeac91f60e01b81526001600160a01b0382166004820152602401620001de565b600180546001600160a01b0319166001600160a01b0383169081179091556040516301ffc9a760e01b8152632eaf856d60e11b60048201526301ffc9a790602401602060405180830381865afa92505050801562000707575060408051601f3d908101601f19168201909252620007049181019062000a73565b60015b620007315760405163fdeac91f60e01b81526001600160a01b0382166004820152602401620001de565b80620005eb5760405163fdeac91f60e01b81526001600160a01b0383166004820152602401620001de565b50565b6001600160a01b03811681146200075c57600080fd5b805162000782816200075f565b919050565b80516001600160601b03811681146200078257600080fd5b805180151581146200078257600080fd5b634e487b7160e01b600052604160045260246000fd5b60405160e081016001600160401b0381118282101715620007eb57620007eb620007b0565b60405290565b604051601f8201601f191681016001600160401b03811182821017156200081c576200081c620007b0565b604052919050565b60008060008060008086880360e08112156200083f57600080fd5b87516200084c816200075f565b96506200085c6020890162000787565b955060408801516200086e816200075f565b94506200087e606089016200079f565b93506040607f19820112156200089357600080fd5b50604080519081016001600160401b0381118282101715620008b957620008b9620007b0565b6040526080880151815260a0880151602082015260c0880151909250620008e0816200075f565b809150509295509295509295565b805160ff811681146200078257600080fd5b600082601f8301126200091257600080fd5b81516001600160401b038111156200092e576200092e620007b0565b602062000944601f8301601f19168201620007f1565b82815285828487010111156200095957600080fd5b60005b83811015620009795785810183015182820184015282016200095c565b506000928101909101919091529392505050565b600060208284031215620009a057600080fd5b81516001600160401b0380821115620009b857600080fd5b9083019060e08286031215620009cd57600080fd5b620009d7620007c6565b620009e28362000787565b8152620009f26020840162000787565b602082015262000a0560408401620008ee565b604082015262000a18606084016200079f565b606082015262000a2b6080840162000775565b608082015262000a3e60a0840162000775565b60a082015260c08301518281111562000a5657600080fd5b62000a648782860162000900565b60c08301525095945050505050565b60006020828403121562000a8657600080fd5b62000a91826200079f565b9392505050565b60006020828403121562000aab57600080fd5b815162000a91816200075f565b600181811c9082168062000acd57607f821691505b60208210810362000aee57634e487b7160e01b600052602260045260246000fd5b50919050565b601f82111562000b4257600081815260208120601f850160051c8101602086101562000b1d5750805b601f850160051c820191505b8181101562000b3e5782815560010162000b29565b5050505b505050565b81516001600160401b0381111562000b635762000b63620007b0565b62000b7b8162000b74845462000ab8565b8462000af4565b602080601f83116001811462000bb3576000841562000b9a5750858301515b600019600386901b1c1916600185901b17855562000b3e565b600085815260208120601f198616915b8281101562000be45788860151825594840194600190910190840162000bc3565b508582101562000c035787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b6117cb8062000c236000396000f3fe608060405234801561001057600080fd5b506004361061014c5760003560e01c8063644c45e0116100c3578063de7b5d141161007c578063de7b5d14146102ef578063deaa59df14610300578063e214756714610313578063f7d39dea14610327578063f80e207214610270578063f83d08ba1461033a57600080fd5b8063644c45e01461029457806387ef9ba0146102ac578063893d20e8146102b7578063a69df4b5146102bf578063c200b809146102c7578063d16d0fe8146102dc57600080fd5b80631eff4b22116101155780631eff4b221461020457806321df0da7146102395780632a65c6881461024a5780633f52c0f61461025d5780634cf30a84146102705780635ab1bd531461028357600080fd5b806251884a1461015157806301ffc9a7146101825780630fec111c146101bf57806313299604146101d5578063138461e0146101fa575b600080fd5b600754600160a01b90046001600160601b03165b6040516001600160601b0390911681526020015b60405180910390f35b6101af6101903660046112e2565b6001600160e01b03191660009081526020819052604090205460ff1690565b6040519015158152602001610179565b6101c7610342565b60405161017992919061135c565b6005546001600160a01b03165b6040516001600160a01b039091168152602001610179565b610202610411565b005b61022b7f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30081565b604051908152602001610179565b6006546001600160a01b03166101e2565b610202610258366004611418565b610633565b61020261026b36600461146c565b610782565b61020261027e3660046114bb565b6107e7565b6001546001600160a01b03166101e2565b600154600160a01b90046001600160601b0316610165565b600a5460ff166101af565b6101e261084f565b61020261096d565b6102cf610a08565b60405161017991906114e5565b61022b6102ea3660046114bb565b610b17565b6007546001600160a01b03166101e2565b61020261030e36600461155a565b610b2c565b6101af610321366004611577565b50600090565b61022b6103353660046114bb565b610e33565b610202610ed5565b6040805160e08101825260008082526020820181905291810182905260608082018390526080820183905260a0820183905260c082018190529091610385610f40565b506040805160a081018252600754600160a01b90046001600160601b03168152600a5461010081046001600160a01b0316602080840191909152835180850185526008548152600954818301528385015260ff90911615156060830152306080830152915192935083926103f992016114e5565b60405160208183030381529060405292509250509091565b6001546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015273__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af4158015610473573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061049791906115a2565b156104de576001546040516316322c0f60e31b81526001600160a01b0382166004820152600160a01b9091046001600160601b031660248201526044015b60405180910390fd5b6001546001600160a01b03166105075760405163cf29926160e01b815260040160405180910390fd5b60015460405163c3c5a54760e01b81523060048201819052916001600160a01b03169063c3c5a54790602401602060405180830381865afa158015610550573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061057491906115a2565b61059c576040516372657a5160e01b81526001600160a01b03821660048201526024016104d5565b600154604051636939560f60e11b81526001600160a01b0383811660048301529091169063d272ac1e90602401602060405180830381865afa1580156105e6573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061060a91906115bd565b600160146101000a8154816001600160601b0302191690836001600160601b0316021790555050565b61063b61084f565b6001600160a01b0316336001600160a01b03161461066e5760405163700dd81160e01b81523360048201526024016104d5565b60075473__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__9063c4cade9d90600160a01b90046001600160601b031660006040516001600160e01b031960e085901b1681526001600160601b03928316600482015291166024820152604401602060405180830381865af41580156106ea573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061070e91906115a2565b61075a5760405162461bcd60e51b815260206004820152601a60248201527f70726f64756374206e667420696420616c72656164792073657400000000000060448201526064016104d5565b600780546001600160601b03909216600160a01b026001600160a01b03909216919091179055565b600b54604051631fa9607b60e11b81526001600160a01b0390911690633f52c0f6906107b29084906004016115da565b600060405180830381600087803b1580156107cc57600080fd5b505af11580156107e0573d6000803e3d6000fd5b5050505050565b600c546001600160a01b0316331461084b5760405162461bcd60e51b815260206004820152602160248201527f4552524f523a504f4c2d3030323a4e4f545f50524f445543545f5345525649436044820152604560f81b60648201526084016104d5565b5050565b6001546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015260009073__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af41580156108b4573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108d891906115a2565b1561095d57600154604051631c5da14d60e11b8152600160a01b82046001600160601b031660048201526001600160a01b03909116906338bb429a90602401602060405180830381865afa158015610934573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061095891906115fc565b905090565b506002546001600160a01b031690565b61097561084f565b6001600160a01b0316336001600160a01b0316146109a85760405163700dd81160e01b81523360048201526024016104d5565b600354604051630bdb124f60e21b81523060048201526001600160a01b0390911690632f6c493c906024015b600060405180830381600087803b1580156109ee57600080fd5b505af1158015610a02573d6000803e3d6000fd5b50505050565b610a10611286565b600754604080516302cd307160e01b815290516000926001600160a01b0316916302cd30719160048083019260209291908290030181865afa158015610a5a573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a7e91906115fc565b9050806001600160a01b0316639ad69c67610aa96001546001600160601b03600160a01b9091041690565b6040516001600160e01b031960e084901b1681526001600160601b03909116600482015260240160c060405180830381865afa158015610aed573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610b119190611619565b91505090565b6000610b2382826116dd565b90505b92915050565b610b3461084f565b6001600160a01b0316336001600160a01b031614610b675760405163700dd81160e01b81523360048201526024016104d5565b6005546006546040516370a0823160e01b81526001600160a01b03928316600482018190529260009216906370a0823190602401602060405180830381865afa158015610bb8573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610bdc9190611702565b9050816001600160a01b0316836001600160a01b031603610c1b57604051637c739a9960e11b81526001600160a01b03841660048201526024016104d5565b8015610cec576001600160a01b0382163014610cec57600654604051636eb1769f60e11b81526001600160a01b038481166004830152306024830152600092169063dd62ed3e90604401602060405180830381865afa158015610c82573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610ca69190611702565b905081811015610cea57604051633945c9b360e01b81526001600160a01b0380851660048301528516602482015260448101829052606481018390526084016104d5565b505b600580546001600160a01b0319166001600160a01b0385169081179091556040519081527f7a6b70c9759bfc6df8d6267688169ed308c6efabc985cf7d02df268733f8ec059060200160405180910390a18015610e2e57306001600160a01b03831603610dca5760065460405163095ea7b360e01b8152306004820152602481018390526001600160a01b039091169063095ea7b3906044016020604051808303816000875af1158015610da4573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610dc891906115a2565b505b600654610de2906001600160a01b03168385846110c6565b604080516001600160a01b038085168252851660208201529081018290527f40b3f633f2d28d6e514f9789ade3c5ddfab85e6731dda38dcb69206d3272c71b9060600160405180910390a15b505050565b600080610e3e610a08565b604081810151905163012ebd8360e21b81528151600482015260208201516024820152604481018690529192509073__$a23651848365a6a5ca15f07b4331037f48$__906304baf60c906064016040805180830381865af4158015610ea7573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610ecb919061171b565b5095945050505050565b610edd61084f565b6001600160a01b0316336001600160a01b031614610f105760405163700dd81160e01b81523360048201526024016104d5565b60035460405163f435f5a760e01b81523060048201526001600160a01b039091169063f435f5a7906024016109d4565b6040805160e08101825260008082526020820181905291810182905260608082018390526080820183905260a082019290925260c0810191909152606060007f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30090506040518060e00160405280610fc76001546001600160601b03600160a01b9091041690565b6001600160601b0390811682528354908116602083015260ff600160601b820481166040840152600160681b909104161515606082015230608082015260a00161100f61084f565b6001600160a01b0316815260200182600101805461102c9061173f565b80601f01602080910402602001604051908101604052809291908181526020018280546110589061173f565b80156110a55780601f1061107a576101008083540402835291602001916110a5565b820191906000526020600020905b81548152906001019060200180831161108857829003601f168201915b50505050508152506040518060200160405280600081525092509250509091565b604080516001600160a01b038581166024830152848116604483015260648083018590528351808403909101815260849092019092526020810180516001600160e01b03166323b872dd60e01b179052610a029186919060009061112c9084168361117a565b9050805160001415801561115157508080602001905181019061114f91906115a2565b155b15610e2e57604051635274afe760e01b81526001600160a01b03841660048201526024016104d5565b6060610b238383600084600080856001600160a01b031684866040516111a09190611779565b60006040518083038185875af1925050503d80600081146111dd576040519150601f19603f3d011682016040523d82523d6000602084013e6111e2565b606091505b50915091506111f28683836111fe565b925050505b9392505050565b6060826112135761120e8261125a565b6111f7565b815115801561122a57506001600160a01b0384163b155b1561125357604051639996b31560e01b81526001600160a01b03851660048201526024016104d5565b50806111f7565b80511561126a5780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b50565b6040518060a0016040528060006001600160601b0316815260200160006001600160a01b031681526020016112ce604051806040016040528060008152602001600081525090565b815260006020820181905260409091015290565b6000602082840312156112f457600080fd5b81356001600160e01b0319811681146111f757600080fd5b60005b8381101561132757818101518382015260200161130f565b50506000910152565b6000815180845261134881602086016020860161130c565b601f01601f19169290920160200192915050565b6040815260006001600160601b038085511660408401528060208601511660608401525060ff604085015116608083015260608401516113a060a084018215159052565b5060808401516001600160a01b03811660c08401525060a08401516001600160a01b03811660e08401525060c084015160e06101008401526113e6610120840182611330565b905082810360208401526113fa8185611330565b95945050505050565b6001600160601b038116811461128357600080fd5b60006020828403121561142a57600080fd5b81356111f781611403565b6040805190810167ffffffffffffffff8111828210171561146657634e487b7160e01b600052604160045260246000fd5b60405290565b60006040828403121561147e57600080fd5b611486611435565b82358152602083013560208201528091505092915050565b80356001600160c01b0319811681146114b657600080fd5b919050565b600080604083850312156114ce57600080fd5b6114d78361149e565b946020939093013593505050565b81516001600160601b031681526020808301516001600160a01b039081168284015260408085015180519185019190915291820151606084015260c0830191906060850151151560808501528060808601511660a0850152505092915050565b6001600160a01b038116811461128357600080fd5b60006020828403121561156c57600080fd5b81356111f781611545565b60006020828403121561158957600080fd5b610b238261149e565b805180151581146114b657600080fd5b6000602082840312156115b457600080fd5b610b2382611592565b6000602082840312156115cf57600080fd5b81516111f781611403565b815181526020808301519082015260408101610b26565b80516114b681611545565b60006020828403121561160e57600080fd5b81516111f781611545565b600081830360c081121561162c57600080fd5b60405160a0810181811067ffffffffffffffff8211171561165d57634e487b7160e01b600052604160045260246000fd5b604052835161166b81611403565b8152602084015161167b81611545565b60208201526040603f198301121561169257600080fd5b61169a611435565b915060408401518252606084015160208301528160408201526116bf60808501611592565b60608201526116d060a085016115f1565b6080820152949350505050565b8082028115828204841417610b2657634e487b7160e01b600052601160045260246000fd5b60006020828403121561171457600080fd5b5051919050565b6000806040838503121561172e57600080fd5b505080516020909101519092909150565b600181811c9082168061175357607f821691505b60208210810361177357634e487b7160e01b600052602260045260246000fd5b50919050565b6000825161178b81846020870161130c565b919091019291505056fea26469706673582212207eacd80439cc72e6f578afb2e1d47dac6e61b28d108a1f783eb8664b20fe06c464736f6c6343000814003367be87c3ff9960ca1e9cfac5cab2ff4747269cf9ed20c9b7306235ac35a491c5",
+  "deployedBytecode": "0x608060405234801561001057600080fd5b506004361061014c5760003560e01c8063644c45e0116100c3578063de7b5d141161007c578063de7b5d14146102ef578063deaa59df14610300578063e214756714610313578063f7d39dea14610327578063f80e207214610270578063f83d08ba1461033a57600080fd5b8063644c45e01461029457806387ef9ba0146102ac578063893d20e8146102b7578063a69df4b5146102bf578063c200b809146102c7578063d16d0fe8146102dc57600080fd5b80631eff4b22116101155780631eff4b221461020457806321df0da7146102395780632a65c6881461024a5780633f52c0f61461025d5780634cf30a84146102705780635ab1bd531461028357600080fd5b806251884a1461015157806301ffc9a7146101825780630fec111c146101bf57806313299604146101d5578063138461e0146101fa575b600080fd5b600754600160a01b90046001600160601b03165b6040516001600160601b0390911681526020015b60405180910390f35b6101af6101903660046112e2565b6001600160e01b03191660009081526020819052604090205460ff1690565b6040519015158152602001610179565b6101c7610342565b60405161017992919061135c565b6005546001600160a01b03165b6040516001600160a01b039091168152602001610179565b610202610411565b005b61022b7f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30081565b604051908152602001610179565b6006546001600160a01b03166101e2565b610202610258366004611418565b610633565b61020261026b36600461146c565b610782565b61020261027e3660046114bb565b6107e7565b6001546001600160a01b03166101e2565b600154600160a01b90046001600160601b0316610165565b600a5460ff166101af565b6101e261084f565b61020261096d565b6102cf610a08565b60405161017991906114e5565b61022b6102ea3660046114bb565b610b17565b6007546001600160a01b03166101e2565b61020261030e36600461155a565b610b2c565b6101af610321366004611577565b50600090565b61022b6103353660046114bb565b610e33565b610202610ed5565b6040805160e08101825260008082526020820181905291810182905260608082018390526080820183905260a0820183905260c082018190529091610385610f40565b506040805160a081018252600754600160a01b90046001600160601b03168152600a5461010081046001600160a01b0316602080840191909152835180850185526008548152600954818301528385015260ff90911615156060830152306080830152915192935083926103f992016114e5565b60405160208183030381529060405292509250509091565b6001546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015273__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af4158015610473573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061049791906115a2565b156104de576001546040516316322c0f60e31b81526001600160a01b0382166004820152600160a01b9091046001600160601b031660248201526044015b60405180910390fd5b6001546001600160a01b03166105075760405163cf29926160e01b815260040160405180910390fd5b60015460405163c3c5a54760e01b81523060048201819052916001600160a01b03169063c3c5a54790602401602060405180830381865afa158015610550573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061057491906115a2565b61059c576040516372657a5160e01b81526001600160a01b03821660048201526024016104d5565b600154604051636939560f60e11b81526001600160a01b0383811660048301529091169063d272ac1e90602401602060405180830381865afa1580156105e6573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061060a91906115bd565b600160146101000a8154816001600160601b0302191690836001600160601b0316021790555050565b61063b61084f565b6001600160a01b0316336001600160a01b03161461066e5760405163700dd81160e01b81523360048201526024016104d5565b60075473__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__9063c4cade9d90600160a01b90046001600160601b031660006040516001600160e01b031960e085901b1681526001600160601b03928316600482015291166024820152604401602060405180830381865af41580156106ea573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061070e91906115a2565b61075a5760405162461bcd60e51b815260206004820152601a60248201527f70726f64756374206e667420696420616c72656164792073657400000000000060448201526064016104d5565b600780546001600160601b03909216600160a01b026001600160a01b03909216919091179055565b600b54604051631fa9607b60e11b81526001600160a01b0390911690633f52c0f6906107b29084906004016115da565b600060405180830381600087803b1580156107cc57600080fd5b505af11580156107e0573d6000803e3d6000fd5b5050505050565b600c546001600160a01b0316331461084b5760405162461bcd60e51b815260206004820152602160248201527f4552524f523a504f4c2d3030323a4e4f545f50524f445543545f5345525649436044820152604560f81b60648201526084016104d5565b5050565b6001546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015260009073__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af41580156108b4573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108d891906115a2565b1561095d57600154604051631c5da14d60e11b8152600160a01b82046001600160601b031660048201526001600160a01b03909116906338bb429a90602401602060405180830381865afa158015610934573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061095891906115fc565b905090565b506002546001600160a01b031690565b61097561084f565b6001600160a01b0316336001600160a01b0316146109a85760405163700dd81160e01b81523360048201526024016104d5565b600354604051630bdb124f60e21b81523060048201526001600160a01b0390911690632f6c493c906024015b600060405180830381600087803b1580156109ee57600080fd5b505af1158015610a02573d6000803e3d6000fd5b50505050565b610a10611286565b600754604080516302cd307160e01b815290516000926001600160a01b0316916302cd30719160048083019260209291908290030181865afa158015610a5a573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a7e91906115fc565b9050806001600160a01b0316639ad69c67610aa96001546001600160601b03600160a01b9091041690565b6040516001600160e01b031960e084901b1681526001600160601b03909116600482015260240160c060405180830381865afa158015610aed573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610b119190611619565b91505090565b6000610b2382826116dd565b90505b92915050565b610b3461084f565b6001600160a01b0316336001600160a01b031614610b675760405163700dd81160e01b81523360048201526024016104d5565b6005546006546040516370a0823160e01b81526001600160a01b03928316600482018190529260009216906370a0823190602401602060405180830381865afa158015610bb8573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610bdc9190611702565b9050816001600160a01b0316836001600160a01b031603610c1b57604051637c739a9960e11b81526001600160a01b03841660048201526024016104d5565b8015610cec576001600160a01b0382163014610cec57600654604051636eb1769f60e11b81526001600160a01b038481166004830152306024830152600092169063dd62ed3e90604401602060405180830381865afa158015610c82573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610ca69190611702565b905081811015610cea57604051633945c9b360e01b81526001600160a01b0380851660048301528516602482015260448101829052606481018390526084016104d5565b505b600580546001600160a01b0319166001600160a01b0385169081179091556040519081527f7a6b70c9759bfc6df8d6267688169ed308c6efabc985cf7d02df268733f8ec059060200160405180910390a18015610e2e57306001600160a01b03831603610dca5760065460405163095ea7b360e01b8152306004820152602481018390526001600160a01b039091169063095ea7b3906044016020604051808303816000875af1158015610da4573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610dc891906115a2565b505b600654610de2906001600160a01b03168385846110c6565b604080516001600160a01b038085168252851660208201529081018290527f40b3f633f2d28d6e514f9789ade3c5ddfab85e6731dda38dcb69206d3272c71b9060600160405180910390a15b505050565b600080610e3e610a08565b604081810151905163012ebd8360e21b81528151600482015260208201516024820152604481018690529192509073__$a23651848365a6a5ca15f07b4331037f48$__906304baf60c906064016040805180830381865af4158015610ea7573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610ecb919061171b565b5095945050505050565b610edd61084f565b6001600160a01b0316336001600160a01b031614610f105760405163700dd81160e01b81523360048201526024016104d5565b60035460405163f435f5a760e01b81523060048201526001600160a01b039091169063f435f5a7906024016109d4565b6040805160e08101825260008082526020820181905291810182905260608082018390526080820183905260a082019290925260c0810191909152606060007f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30090506040518060e00160405280610fc76001546001600160601b03600160a01b9091041690565b6001600160601b0390811682528354908116602083015260ff600160601b820481166040840152600160681b909104161515606082015230608082015260a00161100f61084f565b6001600160a01b0316815260200182600101805461102c9061173f565b80601f01602080910402602001604051908101604052809291908181526020018280546110589061173f565b80156110a55780601f1061107a576101008083540402835291602001916110a5565b820191906000526020600020905b81548152906001019060200180831161108857829003601f168201915b50505050508152506040518060200160405280600081525092509250509091565b604080516001600160a01b038581166024830152848116604483015260648083018590528351808403909101815260849092019092526020810180516001600160e01b03166323b872dd60e01b179052610a029186919060009061112c9084168361117a565b9050805160001415801561115157508080602001905181019061114f91906115a2565b155b15610e2e57604051635274afe760e01b81526001600160a01b03841660048201526024016104d5565b6060610b238383600084600080856001600160a01b031684866040516111a09190611779565b60006040518083038185875af1925050503d80600081146111dd576040519150601f19603f3d011682016040523d82523d6000602084013e6111e2565b606091505b50915091506111f28683836111fe565b925050505b9392505050565b6060826112135761120e8261125a565b6111f7565b815115801561122a57506001600160a01b0384163b155b1561125357604051639996b31560e01b81526001600160a01b03851660048201526024016104d5565b50806111f7565b80511561126a5780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b50565b6040518060a0016040528060006001600160601b0316815260200160006001600160a01b031681526020016112ce604051806040016040528060008152602001600081525090565b815260006020820181905260409091015290565b6000602082840312156112f457600080fd5b81356001600160e01b0319811681146111f757600080fd5b60005b8381101561132757818101518382015260200161130f565b50506000910152565b6000815180845261134881602086016020860161130c565b601f01601f19169290920160200192915050565b6040815260006001600160601b038085511660408401528060208601511660608401525060ff604085015116608083015260608401516113a060a084018215159052565b5060808401516001600160a01b03811660c08401525060a08401516001600160a01b03811660e08401525060c084015160e06101008401526113e6610120840182611330565b905082810360208401526113fa8185611330565b95945050505050565b6001600160601b038116811461128357600080fd5b60006020828403121561142a57600080fd5b81356111f781611403565b6040805190810167ffffffffffffffff8111828210171561146657634e487b7160e01b600052604160045260246000fd5b60405290565b60006040828403121561147e57600080fd5b611486611435565b82358152602083013560208201528091505092915050565b80356001600160c01b0319811681146114b657600080fd5b919050565b600080604083850312156114ce57600080fd5b6114d78361149e565b946020939093013593505050565b81516001600160601b031681526020808301516001600160a01b039081168284015260408085015180519185019190915291820151606084015260c0830191906060850151151560808501528060808601511660a0850152505092915050565b6001600160a01b038116811461128357600080fd5b60006020828403121561156c57600080fd5b81356111f781611545565b60006020828403121561158957600080fd5b610b238261149e565b805180151581146114b657600080fd5b6000602082840312156115b457600080fd5b610b2382611592565b6000602082840312156115cf57600080fd5b81516111f781611403565b815181526020808301519082015260408101610b26565b80516114b681611545565b60006020828403121561160e57600080fd5b81516111f781611545565b600081830360c081121561162c57600080fd5b60405160a0810181811067ffffffffffffffff8211171561165d57634e487b7160e01b600052604160045260246000fd5b604052835161166b81611403565b8152602084015161167b81611545565b60208201526040603f198301121561169257600080fd5b61169a611435565b915060408401518252606084015160208301528160408201526116bf60808501611592565b60608201526116d060a085016115f1565b6080820152949350505050565b8082028115828204841417610b2657634e487b7160e01b600052601160045260246000fd5b60006020828403121561171457600080fd5b5051919050565b6000806040838503121561172e57600080fd5b505080516020909101519092909150565b600181811c9082168061175357607f821691505b60208210810361177357634e487b7160e01b600052602260045260246000fd5b50919050565b6000825161178b81846020870161130c565b919091019291505056fea26469706673582212207eacd80439cc72e6f578afb2e1d47dac6e61b28d108a1f783eb8664b20fe06c464736f6c63430008140033",
   "linkReferences": {
     "contracts/types/Fee.sol": {
       "FeeLib": [
         {
           "length": 20,
-          "start": 5496
+          "start": 6801
         }
       ]
     },
@@ -568,15 +702,15 @@
       "NftIdLib": [
         {
           "length": 20,
-          "start": 3772
+          "start": 4188
         },
         {
           "length": 20,
-          "start": 4530
+          "start": 4758
         },
         {
           "length": 20,
-          "start": 4955
+          "start": 5277
         }
       ]
     }
@@ -586,7 +720,7 @@
       "FeeLib": [
         {
           "length": 20,
-          "start": 2755
+          "start": 3694
         }
       ]
     },
@@ -594,15 +728,15 @@
       "NftIdLib": [
         {
           "length": 20,
-          "start": 1031
+          "start": 1081
         },
         {
           "length": 20,
-          "start": 1789
+          "start": 1651
         },
         {
           "length": 20,
-          "start": 2214
+          "start": 2170
         }
       ]
     }

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

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