@etherisc/gif-next 0.0.2-ccfa4c7-304 → 0.0.2-cd48412-522

package/README.md

@@ -28,6 +28,12 @@ This repository uses submodules. To checkout or update to the latest submodules,
 git submodule update --recursive
 ```
 
+For initial checkout call
+
+```shell
+git submodule update --init --recursive
+```
+
 ## Example components
 
 A (very early) example of a product and a pool can be found in the [gif-next-sandbox repository](https://github.com/etherisc/gif-next-sandbox). 
@@ -154,7 +160,7 @@ https://hardhat.org/hardhat-runner/docs/guides/compile-contracts
 #### find methods missing the `restricted` modifier
 
 ```bash
-hh run scripts/find_unrestricted_methods.ts.ts
+hh run scripts/find_unrestricted_methods.ts
 ```
 
 Checks all public/external methods in services and components for methods that are missing the `restricted` modifier but should have one.
@@ -209,9 +215,12 @@ forge coverage --report lcov
 | ft | forge test |
 | ftf | forge test --nmt "_longRunning" |
 | ftt | forge test -vvvv --mt |
+| fttg | forge test -vvvv --gas-report --mt |
 | fttw | forge test -vvvv --watch --mt |
 | ftc | forge test -vvvv --mc |
 | ftcw | forge test -vvvv --watch --mc |
+| fcf | forge coverage --nmt "_longRunning" |
+| fcfr | forge coverage --nmt "_longRunning" --report lcov |
 
 **Important**: All profiles are run using the foundry `ci` profile which disables the optimizer (for speed).
 
@@ -543,3 +552,56 @@ contracts
     NftId.sol
     ObjectType.sol
 
+## Storage layout
+
+### Analysis tool
+
+Command line call
+
+```bash
+hh run scripts/analyze_storage_layout.ts
+```
+
+Analyses contract `MockStorageLayout.sol` and writes the storage layout to `storage_layout.json` and `storage_layout.csv`.
+New structs must be added to `MockStorageLayout` to be included in analysis. 
+
+Storage layout details:
+- Items fill up the current slot if possible
+- If not enough space is left in the current slot, the item is placed in the next slot
+- Stucts and arrays always start a new slot
+- Items following a struct or array always start a new slot
+
+More at https://docs.soliditylang.org/en/latest/internals/layout_in_storage.html
+
+### Custom types sizes
+
+| Type | Size |
+| --- | --- |
+| Amount | 12 bytes |
+| Blocknumber | 4 bytes |
+| ClaimId | 2 bytes |
+| DistributorType | 8 bytes |
+| NftId | 12 bytes |
+| ObjectType | 1 byte |
+| ReferralId | 8 bytes |
+| RoleId | 1 byte |
+| RiskId | 8 bytes |
+| Seconds | 5 bytes |
+| Selector | 4 bytes |
+| StateId | 1 byte |
+| Str | 32 bytes |
+| Timestamp | 5 bytes |
+| Version | 3 byte |
+| VersionPart | 1 byte |
+| UFixed | 20 bytes |
+| address | 20 bytes |
+| uint256 | 32 bytes |
+| uint128 | 16 bytes |
+| uint160 | 20 bytes |
+| uint64 | 8 bytes |
+| uint32 | 4 bytes |
+| uint16  | 2 bytes  |
+| string  | 32 bytes |
+| bytes   | 32 bytes |
+| bytes8  | 8 byte  |
+| bool    | 1 byte  |

package/artifacts/contracts/accounting/AccountingService.sol/AccountingService.dbg.json

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

package/artifacts/contracts/accounting/AccountingService.sol/AccountingService.json

@@ -122,6 +122,16 @@
       "name": "ErrorRegisterableNotActive",
       "type": "error"
     },
+    {
+      "inputs": [],
+      "name": "ErrorVersionableInitializeNotImplemented",
+      "type": "error"
+    },
+    {
+      "inputs": [],
+      "name": "ErrorVersionableUpgradeNotImplemented",
+      "type": "error"
+    },
     {
       "inputs": [],
       "name": "InvalidInitialization",
@@ -182,30 +192,49 @@
           "indexed": false,
           "internalType": "UFixed",
           "name": "previousFractionalFee",
-          "type": "uint256"
+          "type": "uint160"
         },
         {
           "indexed": false,
-          "internalType": "uint256",
+          "internalType": "Amount",
           "name": "previousFixedFee",
-          "type": "uint256"
+          "type": "uint96"
         },
         {
           "indexed": false,
           "internalType": "UFixed",
           "name": "newFractionalFee",
-          "type": "uint256"
+          "type": "uint160"
         },
         {
           "indexed": false,
-          "internalType": "uint256",
+          "internalType": "Amount",
           "name": "newFixedFee",
-          "type": "uint256"
+          "type": "uint96"
         }
       ],
       "name": "LogComponentServiceUpdateFee",
       "type": "event"
     },
+    {
+      "anonymous": false,
+      "inputs": [
+        {
+          "indexed": false,
+          "internalType": "NftId",
+          "name": "nftId",
+          "type": "uint96"
+        },
+        {
+          "indexed": false,
+          "internalType": "address",
+          "name": "owner",
+          "type": "address"
+        }
+      ],
+      "name": "LogNftOwnableNftLinkedToAddress",
+      "type": "event"
+    },
     {
       "inputs": [],
       "name": "NFT_OWNABLE_STORAGE_LOCATION_V1",
@@ -735,6 +764,29 @@
       "stateMutability": "nonpayable",
       "type": "function"
     },
+    {
+      "inputs": [
+        {
+          "internalType": "contract InstanceStore",
+          "name": "instanceStore",
+          "type": "address"
+        },
+        {
+          "internalType": "NftId",
+          "name": "productNftId",
+          "type": "uint96"
+        },
+        {
+          "internalType": "Amount",
+          "name": "feeAmount",
+          "type": "uint96"
+        }
+      ],
+      "name": "increaseProductFeesForPool",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
     {
       "inputs": [
         {
@@ -838,18 +890,18 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x6080604052348015600e575f80fd5b5060156019565b60c9565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a00805468010000000000000000900460ff161560685760405163f92ee8a960e01b815260040160405180910390fd5b80546001600160401b039081161460c65780546001600160401b0319166001600160401b0390811782556040519081527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a15b50565b6123e0806100d65f395ff3fe608060405234801561000f575f80fd5b50600436106101dc575f3560e01c806367438c501161010957806389fad8a21161009e578063bf7e214f1161006e578063bf7e214f14610455578063d165cb641461045d578063d56cd3d514610470578063e618053f146103f3575f80fd5b806389fad8a2146104065780638fb3603714610419578063ada9652e1461043a578063b68d18091461044e575f80fd5b806376b707b7116100d957806376b707b7146103be5780637a9e5e4b146103d8578063893d20e8146103eb578063899cc04c146103f3575f80fd5b806367438c50146103655780636c741e78146103785780636e1728071461039857806374933c2f146103ab575f80fd5b806325e451d31161017f5780635ab1bd531161014f5780635ab1bd53146103105780635eec0264146102c4578063644c45e0146103355780636610178114610352575f80fd5b806325e451d3146102c4578063329d6e74146102d7578063346696cc146102ea57806349bb9e4b146102fd575f80fd5b806311a14677116101ba57806311a1467714610252578063138461e0146102675780631eff4b221461028757806322f3e2d4146102bc575f80fd5b806301ffc9a7146101e05780630d8e6e2c146102215780630fec111c1461023d575b5f80fd5b61020c6101ee366004611d34565b6001600160e01b0319165f9081526020819052604090205460ff1690565b60405190151581526020015b60405180910390f35b610229610483565b60405162ffffff9091168152602001610218565b61024561050a565b6040516102189190611d89565b610265610260366004611e45565b6106c4565b005b61026f6106ee565b6040516001600160601b039091168152602001610218565b6102ae7f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30081565b604051908152602001610218565b61020c6106f8565b6102656102d2366004611e45565b61076f565b6102656102e5366004611f3b565b610791565b6102656102f8366004611f6c565b6108db565b61026561030b366004611fb4565b610960565b6001546001600160a01b03165b6040516001600160a01b039091168152602001610218565b5f8051602061234b833981519152546001600160601b031661026f565b610265610360366004611e45565b610a5c565b610265610373366004611f6c565b610a70565b610380610ad2565b6040516001600160401b039091168152602001610218565b6102656103a6366004611f6c565b610b5e565b6102656103b9366004611e45565b610b72565b6103c6610b86565b60405160ff9091168152602001610218565b6102656103e6366004612000565b610bee565b61031d610c79565b610265610401366004611e45565b610daa565b610265610414366004611e45565b610dbe565b610421610dc9565b6040516001600160e01b03199091168152602001610218565b6102ae5f8051602061234b83398151915281565b60286103c6565b61031d610dfe565b61026561046b366004611e45565b610e19565b61026561047e366004611e45565b610e2d565b604051632efe011360e01b8152600360048201525f60248201819052604482018190529073__$8eede297b65ed5a56eb3f84d8232ae93f5$__90632efe011390606401602060405180830381865af41580156104e1573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610505919061201b565b905090565b6040805160e0810182525f8082526020820181905291810182905260608082018390526080820183905260a0820183905260c0820152907f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30090506040518060e0016040528073__$94a2c899be079b00d952d0d84fffaa5c34$__63bc1b392d6040518163ffffffff1660e01b8152600401602060405180830381865af41580156105b6573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906105da919061203d565b6001600160601b0390811682528354908116602083015260ff600160601b820481166040840152600160681b909104161515606082015230608082015260a001610622610c79565b6001600160a01b0316815260200182600101805461063f90612058565b80601f016020809104026020016040519081016040528092919081815260200182805461066b90612058565b80156106b65780601f1061068d576101008083540402835291602001916106b6565b820191905f5260205f20905b81548152906001019060200180831161069957829003601f168201915b505050505081525091505090565b6106d0335b5f36610e41565b6106db83600e610f3f565b6106e85f85858585610ff6565b50505050565b5f610505306113f0565b5f610701610dfe565b60405163a166aa8960e01b81523060048201526001600160a01b03919091169063a166aa8990602401602060405180830381865afa158015610745573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061076991906120a4565b15905090565b610778336106c9565b610783836016610f3f565b6106e8600185858585610ff6565b73__$8eede297b65ed5a56eb3f84d8232ae93f5$__63a123b37c6107b3610483565b6040516001600160e01b031960e084901b16815262ffffff9091166004820152602401602060405180830381865af41580156107f1573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061081591906120d1565b5f8051602061238b8339815191528054600160401b900460ff1680610847575080546001600160401b03808416911610155b156108655760405163f92ee8a960e01b815260040160405180910390fd5b805468ffffffffffffffffff19166001600160401b03831617600160401b17815561088f836115e9565b805460ff60401b191681556040516001600160401b03831681527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a1505050565b6108e4336106c9565b61095b5f848473__$3bac17678db7ae928afa209f2f44deec9c$__63bc1b392d6040518163ffffffff1660e01b8152600401602060405180830381865af4158015610931573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610955919061203d565b85610ff6565b505050565b5f8051602061238b8339815191528054600160401b810460ff1615906001600160401b03165f811580156109915750825b90505f826001600160401b031660011480156109ac5750303b155b9050811580156109ba575080155b156109d85760405163f92ee8a960e01b815260040160405180910390fd5b845467ffffffffffffffff191660011785558315610a0257845460ff60401b1916600160401b1785555b610a0c87876115f1565b8315610a5357845460ff60401b19168555604051600181527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d2906020015b60405180910390a15b50505050505050565b610a65336106c9565b6106db836017610f3f565b610a79336106c9565b610a8482600c610f3f565b61095b6001848473__$3bac17678db7ae928afa209f2f44deec9c$__63bc1b392d6040518163ffffffff1660e01b8152600401602060405180830381865af4158015610931573d5f803e3d5ffd5b5f73__$1d92393fa9ccd763988368ce8a1cb90d26$__63dda777d36028610af7610b86565b6040516001600160e01b031960e085901b16815260ff928316600482015291166024820152604401602060405180830381865af4158015610b3a573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061050591906120d1565b610b67336106c9565b6108e482600c610f3f565b610b7b336106c9565b61078383600e610f3f565b5f610b8f610dfe565b6001600160a01b03166376b707b76040518163ffffffff1660e01b8152600401602060405180830381865afa158015610bca573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061050591906120ec565b33610bf7610dfe565b6001600160a01b0316816001600160a01b031614610c375760405162d1953b60e31b81526001600160a01b03821660048201526024015b60405180910390fd5b816001600160a01b03163b5f03610c6c576040516361798f2f60e11b81526001600160a01b0383166004820152602401610c2e565b610c758261170c565b5050565b5f805f8051602061234b83398151915280546040516330b8415f60e01b81526001600160601b03909116600482015290915073__$94a2c899be079b00d952d0d84fffaa5c34$__906330b8415f90602401602060405180830381865af4158015610ce5573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610d0991906120a4565b15610d94576001546001600160a01b03168154604051631c5da14d60e11b81526001600160601b0390911660048201526001600160a01b0391909116906338bb429a90602401602060405180830381865afa158015610d6a573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610d8e919061210c565b91505090565b54600160601b90046001600160a01b0316919050565b610db3336106c9565b6106db836016610f3f565b6106db83600f610f3f565b5f8051602061236b83398151915280545f9190600160a01b900460ff16610df0575f610d8e565b638fb3603760e01b91505090565b5f8051602061236b833981519152546001600160a01b031690565b610e22336106c9565b610783836017610f3f565b610e36336106c9565b61078383600f610f3f565b5f8051602061236b8339815191525f80610e79610e5c610dfe565b8730610e6b60045f8a8c612127565b610e749161214e565b61176c565b9150915081610f375763ffffffff811615610f1457825460ff60a01b1916600160a01b178355610ea7610dfe565b6001600160a01b03166394c7d7ee8787876040518463ffffffff1660e01b8152600401610ed693929190612186565b5f604051808303815f87803b158015610eed575f80fd5b505af1158015610eff573d5f803e3d5ffd5b5050845460ff60a01b1916855550610f379050565b60405162d1953b60e31b81526001600160a01b0387166004820152602401610c2e565b505050505050565b6001546001600160a01b0316604051635b12715d60e11b81526001600160601b038416600482015260ff831660248201526001600160a01b03919091169063b624e2ba90604401602060405180830381865afa158015610fa1573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610fc591906120a4565b610c755760405163d711af7560e01b81526001600160601b038316600482015260ff82166024820152604401610c2e565b5f6110018383611874565b90508515611200576040516330b8415f60e01b81526001600160601b038216600482015273__$3bac17678db7ae928afa209f2f44deec9c$__906330b8415f90602401602060405180830381865af415801561105f573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061108391906120a4565b1561110257604051639f8151e560e01b81526001600160601b038086166004830152821660248201526001600160a01b03861690639f8151e5906044016020604051808303815f875af11580156110dc573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190611100919061203d565b505b6040516330b8415f60e01b81526001600160601b038316600482015273__$3bac17678db7ae928afa209f2f44deec9c$__906330b8415f90602401602060405180830381865af4158015611158573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061117c91906120a4565b156111fb5760405163e80c61ed60e01b81526001600160601b038086166004830152831660248201526001600160a01b0386169063e80c61ed906044016020604051808303815f875af11580156111d5573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906111f9919061203d565b505b610f37565b6040516330b8415f60e01b81526001600160601b038216600482015273__$3bac17678db7ae928afa209f2f44deec9c$__906330b8415f90602401602060405180830381865af4158015611256573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061127a91906120a4565b156112f95760405163b0628dc360e01b81526001600160601b038086166004830152821660248201526001600160a01b0386169063b0628dc3906044016020604051808303815f875af11580156112d3573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906112f7919061203d565b505b6040516330b8415f60e01b81526001600160601b038316600482015273__$3bac17678db7ae928afa209f2f44deec9c$__906330b8415f90602401602060405180830381865af415801561134f573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061137391906120a4565b15610f37576040516314cc21b560e21b81526001600160601b038086166004830152831660248201526001600160a01b0386169063533086d4906044016020604051808303815f875af11580156113cc573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610a53919061203d565b5f805f8051602061234b83398151915280546040516330b8415f60e01b81526001600160601b03909116600482015290915073__$94a2c899be079b00d952d0d84fffaa5c34$__906330b8415f90602401602060405180830381865af415801561145c573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061148091906120a4565b156114ac5780546040516301ab8b6760e21b81526001600160601b039091166004820152602401610c2e565b6001546001600160a01b031660405163c3c5a54760e01b81526001600160a01b038581166004830152919091169063c3c5a54790602401602060405180830381865afa1580156114fe573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061152291906120a4565b61154a5760405163b9304b0d60e01b81526001600160a01b0384166004820152602401610c2e565b6001546001600160a01b0316604051632f2a35f760e11b81526001600160a01b0385811660048301529190911690635e546bee90602401602060405180830381865afa15801561159c573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906115c0919061203d565b81546bffffffffffffffffffffffff19166001600160601b039190911690811790915592915050565b6101dc6118ff565b5f8051602061238b8339815191528054600160401b810460ff1615906001600160401b03165f811580156116225750825b90505f826001600160401b0316600114801561163d5750303b155b90508115801561164b575080155b156116695760405163f92ee8a960e01b815260040160405180910390fd5b845467ffffffffffffffff19166001178555831561169357845460ff60401b1916600160401b1785555b5f80878060200190518101906116a991906121c5565b915091506116b882828b611937565b6116c863a76f099560e01b6119d0565b50508315610a5357845460ff60401b19168555604051600181527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d290602001610a4a565b5f8051602061236b83398151915280546001600160a01b0383166001600160a01b03199091168117825560408051918252517f2f658b440c35314f52658ea8a740e05b284cdc84dc9ae01e891f21b8933e7cad9181900360200190a15050565b6040516001600160a01b03848116602483015283811660448301526001600160e01b0319831660648301525f9182918291829189169060840160408051601f198184030181529181526020820180516001600160e01b031663b700961360e01b179052516117da91906121fd565b5f60405180830381855afa9150503d805f8114611812576040519150601f19603f3d011682016040523d82523d5f602084013e611817565b606091505b50915091508115611869576040815110611849578080602001905181019061183f9190612213565b9094509250611869565b6020815110611869578080602001905181019061186691906120a4565b93505b505094509492505050565b60405163274acb3560e01b81526001600160601b038084166004830152821660248201525f9073__$3bac17678db7ae928afa209f2f44deec9c$__9063274acb3590604401602060405180830381865af41580156118d4573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906118f8919061203d565b9392505050565b5f8051602061238b83398151915254600160401b900460ff1661193557604051631afcd79f60e31b815260040160405180910390fd5b565b61193f6118ff565b611947611a03565b6119c48383846001600160a01b031663644c45e06040518163ffffffff1660e01b8152600401602060405180830381865afa158015611988573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906119ac919061203d565b60085f8660405180602001604052805f815250611a13565b61095b63daf9067160e01b5b6119d86118ff565b611a00816001600160e01b0319165f908152602081905260409020805460ff19166001179055565b50565b611a0b6118ff565b611935611b5a565b611a1b6118ff565b604051632330f24760e01b81526001600160a01b038816600482015273__$fb599632d08395912d9d70eb2f0f93b5e2$__90632330f24790602401602060405180830381865af4158015611a71573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190611a9591906120a4565b611abd5760405163cf6935e560e01b81526001600160a01b0388166004820152602401610c2e565b611ac687611b88565b611ad08683611b99565b5f7f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30080546001600160601b0388166cffffffffffffffffffffffffff1990911617600160601b60ff8816021760ff60681b1916600160681b86151502178155905060018101611b3f8382612290565b50611b50634a531f3360e01b6119d0565b5050505050505050565b611b626118ff565b60017f9b779b17422d0df92223018b32b4d1fa46e071723d6817e2486d003becc55f0055565b611b906118ff565b611a0081611c0f565b611ba16118ff565b611ba9611c20565b611bb282611c68565b6001600160a01b038116611bd95760405163f17ef42d60e01b815260040160405180910390fd5b5f8051602061234b83398151915280546001600160601b0316600160601b6001600160a01b039093169290920291909117905550565b611c176118ff565b611a008161170c565b611c286118ff565b6119356301ffc9a760e01b5f9081526020527f67be87c3ff9960ca1e9cfac5cab2ff4747269cf9ed20c9b7306235ac35a491c5805460ff19166001179055565b611c706118ff565b604051633334d16b60e01b81526001600160a01b038216600482015273__$fb599632d08395912d9d70eb2f0f93b5e2$__90633334d16b90602401602060405180830381865af4158015611cc6573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190611cea91906120a4565b611d125760405163fdeac91f60e01b81526001600160a01b0382166004820152602401610c2e565b600180546001600160a01b0319166001600160a01b0392909216919091179055565b5f60208284031215611d44575f80fd5b81356001600160e01b0319811681146118f8575f80fd5b5f81518084528060208401602086015e5f602082860101526020601f19601f83011685010191505092915050565b602081526001600160601b0382511660208201526001600160601b03602083015116604082015260ff60408301511660608201525f6060830151611dd1608084018215159052565b5060808301516001600160a01b03811660a08401525060a08301516001600160a01b03811660c08401525060c083015160e080840152611e15610100840182611d5b565b949350505050565b6001600160a01b0381168114611a00575f80fd5b6001600160601b0381168114611a00575f80fd5b5f805f8060808587031215611e58575f80fd5b8435611e6381611e1d565b93506020850135611e7381611e31565b92506040850135611e8381611e31565b91506060850135611e9381611e31565b939692955090935050565b634e487b7160e01b5f52604160045260245ffd5b5f82601f830112611ec1575f80fd5b81356001600160401b03811115611eda57611eda611e9e565b604051601f8201601f19908116603f011681016001600160401b0381118282101715611f0857611f08611e9e565b604052818152838201602001851015611f1f575f80fd5b816020850160208301375f918101602001919091529392505050565b5f60208284031215611f4b575f80fd5b81356001600160401b03811115611f60575f80fd5b611e1584828501611eb2565b5f805f60608486031215611f7e575f80fd5b8335611f8981611e1d565b92506020840135611f9981611e31565b91506040840135611fa981611e31565b809150509250925092565b5f8060408385031215611fc5575f80fd5b8235611fd081611e1d565b915060208301356001600160401b03811115611fea575f80fd5b611ff685828601611eb2565b9150509250929050565b5f60208284031215612010575f80fd5b81356118f881611e1d565b5f6020828403121561202b575f80fd5b815162ffffff811681146118f8575f80fd5b5f6020828403121561204d575f80fd5b81516118f881611e31565b600181811c9082168061206c57607f821691505b60208210810361208a57634e487b7160e01b5f52602260045260245ffd5b50919050565b8051801515811461209f575f80fd5b919050565b5f602082840312156120b4575f80fd5b6118f882612090565b6001600160401b0381168114611a00575f80fd5b5f602082840312156120e1575f80fd5b81516118f8816120bd565b5f602082840312156120fc575f80fd5b815160ff811681146118f8575f80fd5b5f6020828403121561211c575f80fd5b81516118f881611e1d565b5f8085851115612135575f80fd5b83861115612141575f80fd5b5050820193919092039150565b80356001600160e01b0319811690600484101561217f576001600160e01b0319600485900360031b81901b82161691505b5092915050565b6001600160a01b03841681526040602082018190528101829052818360608301375f818301606090810191909152601f909201601f1916010192915050565b5f80604083850312156121d6575f80fd5b82516121e181611e1d565b60208401519092506121f281611e1d565b809150509250929050565b5f82518060208501845e5f920191825250919050565b5f8060408385031215612224575f80fd5b61222d83612090565b9150602083015163ffffffff811681146121f2575f80fd5b601f82111561095b57805f5260205f20601f840160051c8101602085101561226a5750805b601f840160051c820191505b81811015612289575f8155600101612276565b5050505050565b81516001600160401b038111156122a9576122a9611e9e565b6122bd816122b78454612058565b84612245565b6020601f8211600181146122ef575f83156122d85750848201515b5f19600385901b1c1916600184901b178455612289565b5f84815260208120601f198516915b8281101561231e57878501518255602094850194600190920191016122fe565b508482101561233b57868401515f19600387901b60f8161c191681555b50505050600190811b0190555056fe07ebcf49758b6ed3af50fa146bec0abe157c0218fe65dc0874c286e9d5da4f00f3177357ab46d8af007ab3fdb9af81da189e1068fefdc0073dca88a2cab40a00f0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a00a26469706673582212206d174786d18ce66503a4a759a3cbe8c6b3ecec7a4c21e6b7eda6992555e51b0364736f6c634300081a0033",
-  "deployedBytecode": "0x608060405234801561000f575f80fd5b50600436106101dc575f3560e01c806367438c501161010957806389fad8a21161009e578063bf7e214f1161006e578063bf7e214f14610455578063d165cb641461045d578063d56cd3d514610470578063e618053f146103f3575f80fd5b806389fad8a2146104065780638fb3603714610419578063ada9652e1461043a578063b68d18091461044e575f80fd5b806376b707b7116100d957806376b707b7146103be5780637a9e5e4b146103d8578063893d20e8146103eb578063899cc04c146103f3575f80fd5b806367438c50146103655780636c741e78146103785780636e1728071461039857806374933c2f146103ab575f80fd5b806325e451d31161017f5780635ab1bd531161014f5780635ab1bd53146103105780635eec0264146102c4578063644c45e0146103355780636610178114610352575f80fd5b806325e451d3146102c4578063329d6e74146102d7578063346696cc146102ea57806349bb9e4b146102fd575f80fd5b806311a14677116101ba57806311a1467714610252578063138461e0146102675780631eff4b221461028757806322f3e2d4146102bc575f80fd5b806301ffc9a7146101e05780630d8e6e2c146102215780630fec111c1461023d575b5f80fd5b61020c6101ee366004611d34565b6001600160e01b0319165f9081526020819052604090205460ff1690565b60405190151581526020015b60405180910390f35b610229610483565b60405162ffffff9091168152602001610218565b61024561050a565b6040516102189190611d89565b610265610260366004611e45565b6106c4565b005b61026f6106ee565b6040516001600160601b039091168152602001610218565b6102ae7f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30081565b604051908152602001610218565b61020c6106f8565b6102656102d2366004611e45565b61076f565b6102656102e5366004611f3b565b610791565b6102656102f8366004611f6c565b6108db565b61026561030b366004611fb4565b610960565b6001546001600160a01b03165b6040516001600160a01b039091168152602001610218565b5f8051602061234b833981519152546001600160601b031661026f565b610265610360366004611e45565b610a5c565b610265610373366004611f6c565b610a70565b610380610ad2565b6040516001600160401b039091168152602001610218565b6102656103a6366004611f6c565b610b5e565b6102656103b9366004611e45565b610b72565b6103c6610b86565b60405160ff9091168152602001610218565b6102656103e6366004612000565b610bee565b61031d610c79565b610265610401366004611e45565b610daa565b610265610414366004611e45565b610dbe565b610421610dc9565b6040516001600160e01b03199091168152602001610218565b6102ae5f8051602061234b83398151915281565b60286103c6565b61031d610dfe565b61026561046b366004611e45565b610e19565b61026561047e366004611e45565b610e2d565b604051632efe011360e01b8152600360048201525f60248201819052604482018190529073__$8eede297b65ed5a56eb3f84d8232ae93f5$__90632efe011390606401602060405180830381865af41580156104e1573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610505919061201b565b905090565b6040805160e0810182525f8082526020820181905291810182905260608082018390526080820183905260a0820183905260c0820152907f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30090506040518060e0016040528073__$94a2c899be079b00d952d0d84fffaa5c34$__63bc1b392d6040518163ffffffff1660e01b8152600401602060405180830381865af41580156105b6573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906105da919061203d565b6001600160601b0390811682528354908116602083015260ff600160601b820481166040840152600160681b909104161515606082015230608082015260a001610622610c79565b6001600160a01b0316815260200182600101805461063f90612058565b80601f016020809104026020016040519081016040528092919081815260200182805461066b90612058565b80156106b65780601f1061068d576101008083540402835291602001916106b6565b820191905f5260205f20905b81548152906001019060200180831161069957829003601f168201915b505050505081525091505090565b6106d0335b5f36610e41565b6106db83600e610f3f565b6106e85f85858585610ff6565b50505050565b5f610505306113f0565b5f610701610dfe565b60405163a166aa8960e01b81523060048201526001600160a01b03919091169063a166aa8990602401602060405180830381865afa158015610745573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061076991906120a4565b15905090565b610778336106c9565b610783836016610f3f565b6106e8600185858585610ff6565b73__$8eede297b65ed5a56eb3f84d8232ae93f5$__63a123b37c6107b3610483565b6040516001600160e01b031960e084901b16815262ffffff9091166004820152602401602060405180830381865af41580156107f1573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061081591906120d1565b5f8051602061238b8339815191528054600160401b900460ff1680610847575080546001600160401b03808416911610155b156108655760405163f92ee8a960e01b815260040160405180910390fd5b805468ffffffffffffffffff19166001600160401b03831617600160401b17815561088f836115e9565b805460ff60401b191681556040516001600160401b03831681527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a1505050565b6108e4336106c9565b61095b5f848473__$3bac17678db7ae928afa209f2f44deec9c$__63bc1b392d6040518163ffffffff1660e01b8152600401602060405180830381865af4158015610931573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610955919061203d565b85610ff6565b505050565b5f8051602061238b8339815191528054600160401b810460ff1615906001600160401b03165f811580156109915750825b90505f826001600160401b031660011480156109ac5750303b155b9050811580156109ba575080155b156109d85760405163f92ee8a960e01b815260040160405180910390fd5b845467ffffffffffffffff191660011785558315610a0257845460ff60401b1916600160401b1785555b610a0c87876115f1565b8315610a5357845460ff60401b19168555604051600181527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d2906020015b60405180910390a15b50505050505050565b610a65336106c9565b6106db836017610f3f565b610a79336106c9565b610a8482600c610f3f565b61095b6001848473__$3bac17678db7ae928afa209f2f44deec9c$__63bc1b392d6040518163ffffffff1660e01b8152600401602060405180830381865af4158015610931573d5f803e3d5ffd5b5f73__$1d92393fa9ccd763988368ce8a1cb90d26$__63dda777d36028610af7610b86565b6040516001600160e01b031960e085901b16815260ff928316600482015291166024820152604401602060405180830381865af4158015610b3a573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061050591906120d1565b610b67336106c9565b6108e482600c610f3f565b610b7b336106c9565b61078383600e610f3f565b5f610b8f610dfe565b6001600160a01b03166376b707b76040518163ffffffff1660e01b8152600401602060405180830381865afa158015610bca573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061050591906120ec565b33610bf7610dfe565b6001600160a01b0316816001600160a01b031614610c375760405162d1953b60e31b81526001600160a01b03821660048201526024015b60405180910390fd5b816001600160a01b03163b5f03610c6c576040516361798f2f60e11b81526001600160a01b0383166004820152602401610c2e565b610c758261170c565b5050565b5f805f8051602061234b83398151915280546040516330b8415f60e01b81526001600160601b03909116600482015290915073__$94a2c899be079b00d952d0d84fffaa5c34$__906330b8415f90602401602060405180830381865af4158015610ce5573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610d0991906120a4565b15610d94576001546001600160a01b03168154604051631c5da14d60e11b81526001600160601b0390911660048201526001600160a01b0391909116906338bb429a90602401602060405180830381865afa158015610d6a573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610d8e919061210c565b91505090565b54600160601b90046001600160a01b0316919050565b610db3336106c9565b6106db836016610f3f565b6106db83600f610f3f565b5f8051602061236b83398151915280545f9190600160a01b900460ff16610df0575f610d8e565b638fb3603760e01b91505090565b5f8051602061236b833981519152546001600160a01b031690565b610e22336106c9565b610783836017610f3f565b610e36336106c9565b61078383600f610f3f565b5f8051602061236b8339815191525f80610e79610e5c610dfe565b8730610e6b60045f8a8c612127565b610e749161214e565b61176c565b9150915081610f375763ffffffff811615610f1457825460ff60a01b1916600160a01b178355610ea7610dfe565b6001600160a01b03166394c7d7ee8787876040518463ffffffff1660e01b8152600401610ed693929190612186565b5f604051808303815f87803b158015610eed575f80fd5b505af1158015610eff573d5f803e3d5ffd5b5050845460ff60a01b1916855550610f379050565b60405162d1953b60e31b81526001600160a01b0387166004820152602401610c2e565b505050505050565b6001546001600160a01b0316604051635b12715d60e11b81526001600160601b038416600482015260ff831660248201526001600160a01b03919091169063b624e2ba90604401602060405180830381865afa158015610fa1573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610fc591906120a4565b610c755760405163d711af7560e01b81526001600160601b038316600482015260ff82166024820152604401610c2e565b5f6110018383611874565b90508515611200576040516330b8415f60e01b81526001600160601b038216600482015273__$3bac17678db7ae928afa209f2f44deec9c$__906330b8415f90602401602060405180830381865af415801561105f573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061108391906120a4565b1561110257604051639f8151e560e01b81526001600160601b038086166004830152821660248201526001600160a01b03861690639f8151e5906044016020604051808303815f875af11580156110dc573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190611100919061203d565b505b6040516330b8415f60e01b81526001600160601b038316600482015273__$3bac17678db7ae928afa209f2f44deec9c$__906330b8415f90602401602060405180830381865af4158015611158573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061117c91906120a4565b156111fb5760405163e80c61ed60e01b81526001600160601b038086166004830152831660248201526001600160a01b0386169063e80c61ed906044016020604051808303815f875af11580156111d5573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906111f9919061203d565b505b610f37565b6040516330b8415f60e01b81526001600160601b038216600482015273__$3bac17678db7ae928afa209f2f44deec9c$__906330b8415f90602401602060405180830381865af4158015611256573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061127a91906120a4565b156112f95760405163b0628dc360e01b81526001600160601b038086166004830152821660248201526001600160a01b0386169063b0628dc3906044016020604051808303815f875af11580156112d3573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906112f7919061203d565b505b6040516330b8415f60e01b81526001600160601b038316600482015273__$3bac17678db7ae928afa209f2f44deec9c$__906330b8415f90602401602060405180830381865af415801561134f573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061137391906120a4565b15610f37576040516314cc21b560e21b81526001600160601b038086166004830152831660248201526001600160a01b0386169063533086d4906044016020604051808303815f875af11580156113cc573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610a53919061203d565b5f805f8051602061234b83398151915280546040516330b8415f60e01b81526001600160601b03909116600482015290915073__$94a2c899be079b00d952d0d84fffaa5c34$__906330b8415f90602401602060405180830381865af415801561145c573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061148091906120a4565b156114ac5780546040516301ab8b6760e21b81526001600160601b039091166004820152602401610c2e565b6001546001600160a01b031660405163c3c5a54760e01b81526001600160a01b038581166004830152919091169063c3c5a54790602401602060405180830381865afa1580156114fe573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061152291906120a4565b61154a5760405163b9304b0d60e01b81526001600160a01b0384166004820152602401610c2e565b6001546001600160a01b0316604051632f2a35f760e11b81526001600160a01b0385811660048301529190911690635e546bee90602401602060405180830381865afa15801561159c573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906115c0919061203d565b81546bffffffffffffffffffffffff19166001600160601b039190911690811790915592915050565b6101dc6118ff565b5f8051602061238b8339815191528054600160401b810460ff1615906001600160401b03165f811580156116225750825b90505f826001600160401b0316600114801561163d5750303b155b90508115801561164b575080155b156116695760405163f92ee8a960e01b815260040160405180910390fd5b845467ffffffffffffffff19166001178555831561169357845460ff60401b1916600160401b1785555b5f80878060200190518101906116a991906121c5565b915091506116b882828b611937565b6116c863a76f099560e01b6119d0565b50508315610a5357845460ff60401b19168555604051600181527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d290602001610a4a565b5f8051602061236b83398151915280546001600160a01b0383166001600160a01b03199091168117825560408051918252517f2f658b440c35314f52658ea8a740e05b284cdc84dc9ae01e891f21b8933e7cad9181900360200190a15050565b6040516001600160a01b03848116602483015283811660448301526001600160e01b0319831660648301525f9182918291829189169060840160408051601f198184030181529181526020820180516001600160e01b031663b700961360e01b179052516117da91906121fd565b5f60405180830381855afa9150503d805f8114611812576040519150601f19603f3d011682016040523d82523d5f602084013e611817565b606091505b50915091508115611869576040815110611849578080602001905181019061183f9190612213565b9094509250611869565b6020815110611869578080602001905181019061186691906120a4565b93505b505094509492505050565b60405163274acb3560e01b81526001600160601b038084166004830152821660248201525f9073__$3bac17678db7ae928afa209f2f44deec9c$__9063274acb3590604401602060405180830381865af41580156118d4573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906118f8919061203d565b9392505050565b5f8051602061238b83398151915254600160401b900460ff1661193557604051631afcd79f60e31b815260040160405180910390fd5b565b61193f6118ff565b611947611a03565b6119c48383846001600160a01b031663644c45e06040518163ffffffff1660e01b8152600401602060405180830381865afa158015611988573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906119ac919061203d565b60085f8660405180602001604052805f815250611a13565b61095b63daf9067160e01b5b6119d86118ff565b611a00816001600160e01b0319165f908152602081905260409020805460ff19166001179055565b50565b611a0b6118ff565b611935611b5a565b611a1b6118ff565b604051632330f24760e01b81526001600160a01b038816600482015273__$fb599632d08395912d9d70eb2f0f93b5e2$__90632330f24790602401602060405180830381865af4158015611a71573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190611a9591906120a4565b611abd5760405163cf6935e560e01b81526001600160a01b0388166004820152602401610c2e565b611ac687611b88565b611ad08683611b99565b5f7f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30080546001600160601b0388166cffffffffffffffffffffffffff1990911617600160601b60ff8816021760ff60681b1916600160681b86151502178155905060018101611b3f8382612290565b50611b50634a531f3360e01b6119d0565b5050505050505050565b611b626118ff565b60017f9b779b17422d0df92223018b32b4d1fa46e071723d6817e2486d003becc55f0055565b611b906118ff565b611a0081611c0f565b611ba16118ff565b611ba9611c20565b611bb282611c68565b6001600160a01b038116611bd95760405163f17ef42d60e01b815260040160405180910390fd5b5f8051602061234b83398151915280546001600160601b0316600160601b6001600160a01b039093169290920291909117905550565b611c176118ff565b611a008161170c565b611c286118ff565b6119356301ffc9a760e01b5f9081526020527f67be87c3ff9960ca1e9cfac5cab2ff4747269cf9ed20c9b7306235ac35a491c5805460ff19166001179055565b611c706118ff565b604051633334d16b60e01b81526001600160a01b038216600482015273__$fb599632d08395912d9d70eb2f0f93b5e2$__90633334d16b90602401602060405180830381865af4158015611cc6573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190611cea91906120a4565b611d125760405163fdeac91f60e01b81526001600160a01b0382166004820152602401610c2e565b600180546001600160a01b0319166001600160a01b0392909216919091179055565b5f60208284031215611d44575f80fd5b81356001600160e01b0319811681146118f8575f80fd5b5f81518084528060208401602086015e5f602082860101526020601f19601f83011685010191505092915050565b602081526001600160601b0382511660208201526001600160601b03602083015116604082015260ff60408301511660608201525f6060830151611dd1608084018215159052565b5060808301516001600160a01b03811660a08401525060a08301516001600160a01b03811660c08401525060c083015160e080840152611e15610100840182611d5b565b949350505050565b6001600160a01b0381168114611a00575f80fd5b6001600160601b0381168114611a00575f80fd5b5f805f8060808587031215611e58575f80fd5b8435611e6381611e1d565b93506020850135611e7381611e31565b92506040850135611e8381611e31565b91506060850135611e9381611e31565b939692955090935050565b634e487b7160e01b5f52604160045260245ffd5b5f82601f830112611ec1575f80fd5b81356001600160401b03811115611eda57611eda611e9e565b604051601f8201601f19908116603f011681016001600160401b0381118282101715611f0857611f08611e9e565b604052818152838201602001851015611f1f575f80fd5b816020850160208301375f918101602001919091529392505050565b5f60208284031215611f4b575f80fd5b81356001600160401b03811115611f60575f80fd5b611e1584828501611eb2565b5f805f60608486031215611f7e575f80fd5b8335611f8981611e1d565b92506020840135611f9981611e31565b91506040840135611fa981611e31565b809150509250925092565b5f8060408385031215611fc5575f80fd5b8235611fd081611e1d565b915060208301356001600160401b03811115611fea575f80fd5b611ff685828601611eb2565b9150509250929050565b5f60208284031215612010575f80fd5b81356118f881611e1d565b5f6020828403121561202b575f80fd5b815162ffffff811681146118f8575f80fd5b5f6020828403121561204d575f80fd5b81516118f881611e31565b600181811c9082168061206c57607f821691505b60208210810361208a57634e487b7160e01b5f52602260045260245ffd5b50919050565b8051801515811461209f575f80fd5b919050565b5f602082840312156120b4575f80fd5b6118f882612090565b6001600160401b0381168114611a00575f80fd5b5f602082840312156120e1575f80fd5b81516118f8816120bd565b5f602082840312156120fc575f80fd5b815160ff811681146118f8575f80fd5b5f6020828403121561211c575f80fd5b81516118f881611e1d565b5f8085851115612135575f80fd5b83861115612141575f80fd5b5050820193919092039150565b80356001600160e01b0319811690600484101561217f576001600160e01b0319600485900360031b81901b82161691505b5092915050565b6001600160a01b03841681526040602082018190528101829052818360608301375f818301606090810191909152601f909201601f1916010192915050565b5f80604083850312156121d6575f80fd5b82516121e181611e1d565b60208401519092506121f281611e1d565b809150509250929050565b5f82518060208501845e5f920191825250919050565b5f8060408385031215612224575f80fd5b61222d83612090565b9150602083015163ffffffff811681146121f2575f80fd5b601f82111561095b57805f5260205f20601f840160051c8101602085101561226a5750805b601f840160051c820191505b81811015612289575f8155600101612276565b5050505050565b81516001600160401b038111156122a9576122a9611e9e565b6122bd816122b78454612058565b84612245565b6020601f8211600181146122ef575f83156122d85750848201515b5f19600385901b1c1916600184901b178455612289565b5f84815260208120601f198516915b8281101561231e57878501518255602094850194600190920191016122fe565b508482101561233b57868401515f19600387901b60f8161c191681555b50505050600190811b0190555056fe07ebcf49758b6ed3af50fa146bec0abe157c0218fe65dc0874c286e9d5da4f00f3177357ab46d8af007ab3fdb9af81da189e1068fefdc0073dca88a2cab40a00f0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a00a26469706673582212206d174786d18ce66503a4a759a3cbe8c6b3ecec7a4c21e6b7eda6992555e51b0364736f6c634300081a0033",
+  "bytecode": "0x6080604052348015600e575f80fd5b5060156019565b60c9565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a00805468010000000000000000900460ff161560685760405163f92ee8a960e01b815260040160405180910390fd5b80546001600160401b039081161460c65780546001600160401b0319166001600160401b0390811782556040519081527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a15b50565b6124e7806100d65f395ff3fe608060405234801561000f575f80fd5b50600436106101e7575f3560e01c80636c741e78116101095780638fb360371161009e578063d165cb641161006e578063d165cb6414610468578063d56cd3d51461047b578063dd94be6814610370578063e618053f146103fe575f80fd5b80638fb3603714610424578063ada9652e14610445578063b68d180914610459578063bf7e214f14610460575f80fd5b80637a9e5e4b116100d95780637a9e5e4b146103e3578063893d20e8146103f6578063899cc04c146103fe57806389fad8a214610411575f80fd5b80636c741e78146103835780636e172807146103a357806374933c2f146103b657806376b707b7146103c9575f80fd5b8063329d6e741161017f5780635eec02641161014f5780635eec0264146102cf578063644c45e014610340578063661017811461035d57806367438c5014610370575f80fd5b8063329d6e74146102e2578063346696cc146102f557806349bb9e4b146103085780635ab1bd531461031b575f80fd5b8063138461e0116101ba578063138461e0146102725780631eff4b221461029257806322f3e2d4146102c757806325e451d3146102cf575f80fd5b806301ffc9a7146101eb5780630d8e6e2c1461022c5780630fec111c1461024857806311a146771461025d575b5f80fd5b6102176101f9366004611e3b565b6001600160e01b0319165f9081526020819052604090205460ff1690565b60405190151581526020015b60405180910390f35b61023461048e565b60405162ffffff9091168152602001610223565b610250610515565b6040516102239190611e90565b61027061026b366004611f4c565b6106cf565b005b61027a6106f9565b6040516001600160601b039091168152602001610223565b6102b97f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30081565b604051908152602001610223565b610217610703565b6102706102dd366004611f4c565b61077a565b6102706102f0366004612042565b61079c565b610270610303366004612073565b6108e6565b6102706103163660046120bb565b61096b565b6001546001600160a01b03165b6040516001600160a01b039091168152602001610223565b5f80516020612452833981519152546001600160601b031661027a565b61027061036b366004611f4c565b610a67565b61027061037e366004612073565b610a7b565b61038b610add565b6040516001600160401b039091168152602001610223565b6102706103b1366004612073565b610b69565b6102706103c4366004611f4c565b610b7d565b6103d1610b91565b60405160ff9091168152602001610223565b6102706103f1366004612107565b610bf9565b610328610c84565b61027061040c366004611f4c565b610db5565b61027061041f366004611f4c565b610dc9565b61042c610ddd565b6040516001600160e01b03199091168152602001610223565b6102b95f8051602061245283398151915281565b60286103d1565b610328610e12565b610270610476366004611f4c565b610e2d565b610270610489366004611f4c565b610e41565b604051632efe011360e01b8152600360048201525f60248201819052604482018190529073__$8eede297b65ed5a56eb3f84d8232ae93f5$__90632efe011390606401602060405180830381865af41580156104ec573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906105109190612122565b905090565b6040805160e0810182525f8082526020820181905291810182905260608082018390526080820183905260a0820183905260c0820152907f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30090506040518060e0016040528073__$94a2c899be079b00d952d0d84fffaa5c34$__63bc1b392d6040518163ffffffff1660e01b8152600401602060405180830381865af41580156105c1573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906105e59190612144565b6001600160601b0390811682528354908116602083015260ff600160601b820481166040840152600160681b909104161515606082015230608082015260a00161062d610c84565b6001600160a01b0316815260200182600101805461064a9061215f565b80601f01602080910402602001604051908101604052809291908181526020018280546106769061215f565b80156106c15780601f10610698576101008083540402835291602001916106c1565b820191905f5260205f20905b8154815290600101906020018083116106a457829003601f168201915b505050505081525091505090565b6106db335b5f36610e55565b6106e683600e610f53565b6106f35f85858585611087565b50505050565b5f61051030611481565b5f61070c610e12565b60405163a166aa8960e01b81523060048201526001600160a01b03919091169063a166aa8990602401602060405180830381865afa158015610750573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061077491906121ab565b15905090565b610783336106d4565b61078e836016610f53565b6106f3600185858585611087565b73__$8eede297b65ed5a56eb3f84d8232ae93f5$__63a123b37c6107be61048e565b6040516001600160e01b031960e084901b16815262ffffff9091166004820152602401602060405180830381865af41580156107fc573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061082091906121d8565b5f805160206124928339815191528054600160401b900460ff1680610852575080546001600160401b03808416911610155b156108705760405163f92ee8a960e01b815260040160405180910390fd5b805468ffffffffffffffffff19166001600160401b03831617600160401b17815561089a836116d7565b805460ff60401b191681556040516001600160401b03831681527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a1505050565b6108ef336106d4565b6109665f848473__$3bac17678db7ae928afa209f2f44deec9c$__63bc1b392d6040518163ffffffff1660e01b8152600401602060405180830381865af415801561093c573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906109609190612144565b85611087565b505050565b5f805160206124928339815191528054600160401b810460ff1615906001600160401b03165f8115801561099c5750825b90505f826001600160401b031660011480156109b75750303b155b9050811580156109c5575080155b156109e35760405163f92ee8a960e01b815260040160405180910390fd5b845467ffffffffffffffff191660011785558315610a0d57845460ff60401b1916600160401b1785555b610a1787876116f8565b8315610a5e57845460ff60401b19168555604051600181527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d2906020015b60405180910390a15b50505050505050565b610a70336106d4565b6106e6836017610f53565b610a84336106d4565b610a8f82600c610f53565b6109666001848473__$3bac17678db7ae928afa209f2f44deec9c$__63bc1b392d6040518163ffffffff1660e01b8152600401602060405180830381865af415801561093c573d5f803e3d5ffd5b5f73__$1d92393fa9ccd763988368ce8a1cb90d26$__63645ceefe6028610b02610b91565b6040516001600160e01b031960e085901b16815260ff928316600482015291166024820152604401602060405180830381865af4158015610b45573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061051091906121d8565b610b72336106d4565b6108ef82600c610f53565b610b86336106d4565b61078e83600e610f53565b5f610b9a610e12565b6001600160a01b03166376b707b76040518163ffffffff1660e01b8152600401602060405180830381865afa158015610bd5573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061051091906121f3565b33610c02610e12565b6001600160a01b0316816001600160a01b031614610c425760405162d1953b60e31b81526001600160a01b03821660048201526024015b60405180910390fd5b816001600160a01b03163b5f03610c77576040516361798f2f60e11b81526001600160a01b0383166004820152602401610c39565b610c8082611813565b5050565b5f805f8051602061245283398151915280546040516330b8415f60e01b81526001600160601b03909116600482015290915073__$94a2c899be079b00d952d0d84fffaa5c34$__906330b8415f90602401602060405180830381865af4158015610cf0573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610d1491906121ab565b15610d9f576001546001600160a01b03168154604051631c5da14d60e11b81526001600160601b0390911660048201526001600160a01b0391909116906338bb429a90602401602060405180830381865afa158015610d75573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610d999190612213565b91505090565b54600160601b90046001600160a01b0316919050565b610dbe336106d4565b6106e6836016610f53565b610dd2336106d4565b6106e683600f610f53565b5f8051602061247283398151915280545f9190600160a01b900460ff16610e04575f610d99565b638fb3603760e01b91505090565b5f80516020612472833981519152546001600160a01b031690565b610e36336106d4565b61078e836017610f53565b610e4a336106d4565b61078e83600f610f53565b5f805160206124728339815191525f80610e8d610e70610e12565b8730610e7f60045f8a8c61222e565b610e8891612255565b611873565b9150915081610f4b5763ffffffff811615610f2857825460ff60a01b1916600160a01b178355610ebb610e12565b6001600160a01b03166394c7d7ee8787876040518463ffffffff1660e01b8152600401610eea9392919061228d565b5f604051808303815f87803b158015610f01575f80fd5b505af1158015610f13573d5f803e3d5ffd5b5050845460ff60a01b1916855550610f4b9050565b60405162d1953b60e31b81526001600160a01b0387166004820152602401610c39565b505050505050565b60405163037c8cb160e51b815260ff8216600482015273__$0d958e68cba84670b8f4a3f2f2686b1c6b$__90636f91962090602401602060405180830381865af4158015610fa3573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610fc791906121ab565b8061105557506001546001600160a01b0316604051635b12715d60e11b81526001600160601b038416600482015260ff831660248201526001600160a01b03919091169063b624e2ba90604401602060405180830381865afa15801561102f573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061105391906121ab565b155b15610c805760405163d711af7560e01b81526001600160601b038316600482015260ff82166024820152604401610c39565b5f611092838361197b565b90508515611291576040516330b8415f60e01b81526001600160601b038216600482015273__$3bac17678db7ae928afa209f2f44deec9c$__906330b8415f90602401602060405180830381865af41580156110f0573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061111491906121ab565b1561119357604051639f8151e560e01b81526001600160601b038086166004830152821660248201526001600160a01b03861690639f8151e5906044016020604051808303815f875af115801561116d573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906111919190612144565b505b6040516330b8415f60e01b81526001600160601b038316600482015273__$3bac17678db7ae928afa209f2f44deec9c$__906330b8415f90602401602060405180830381865af41580156111e9573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061120d91906121ab565b1561128c5760405163e80c61ed60e01b81526001600160601b038086166004830152831660248201526001600160a01b0386169063e80c61ed906044016020604051808303815f875af1158015611266573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061128a9190612144565b505b610f4b565b6040516330b8415f60e01b81526001600160601b038216600482015273__$3bac17678db7ae928afa209f2f44deec9c$__906330b8415f90602401602060405180830381865af41580156112e7573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061130b91906121ab565b1561138a5760405163b0628dc360e01b81526001600160601b038086166004830152821660248201526001600160a01b0386169063b0628dc3906044016020604051808303815f875af1158015611364573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906113889190612144565b505b6040516330b8415f60e01b81526001600160601b038316600482015273__$3bac17678db7ae928afa209f2f44deec9c$__906330b8415f90602401602060405180830381865af41580156113e0573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061140491906121ab565b15610f4b576040516314cc21b560e21b81526001600160601b038086166004830152831660248201526001600160a01b0386169063533086d4906044016020604051808303815f875af115801561145d573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610a5e9190612144565b5f805f8051602061245283398151915280546040516330b8415f60e01b81526001600160601b03909116600482015290915073__$94a2c899be079b00d952d0d84fffaa5c34$__906330b8415f90602401602060405180830381865af41580156114ed573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061151191906121ab565b1561153d5780546040516301ab8b6760e21b81526001600160601b039091166004820152602401610c39565b6001546001600160a01b031660405163c3c5a54760e01b81526001600160a01b038581166004830152919091169063c3c5a54790602401602060405180830381865afa15801561158f573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906115b391906121ab565b6115db5760405163b9304b0d60e01b81526001600160a01b0384166004820152602401610c39565b6001546001600160a01b0316604051632f2a35f760e11b81526001600160a01b0385811660048301529190911690635e546bee90602401602060405180830381865afa15801561162d573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906116519190612144565b81546bffffffffffffffffffffffff19166001600160601b039190911690811782557f88857b75cbef7f257c9d5a473e28aaf6a91cc28f717f60f2cda3bcf5623d7b549061169d610c84565b604080516001600160601b0390931683526001600160a01b0390911660208301520160405180910390a1546001600160601b031692915050565b6116df611a06565b60405163502ec37160e01b815260040160405180910390fd5b5f805160206124928339815191528054600160401b810460ff1615906001600160401b03165f811580156117295750825b90505f826001600160401b031660011480156117445750303b155b905081158015611752575080155b156117705760405163f92ee8a960e01b815260040160405180910390fd5b845467ffffffffffffffff19166001178555831561179a57845460ff60401b1916600160401b1785555b5f80878060200190518101906117b091906122cc565b915091506117bf82828b611a3e565b6117cf637afbb7fd60e01b611ad7565b50508315610a5e57845460ff60401b19168555604051600181527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d290602001610a55565b5f8051602061247283398151915280546001600160a01b0383166001600160a01b03199091168117825560408051918252517f2f658b440c35314f52658ea8a740e05b284cdc84dc9ae01e891f21b8933e7cad9181900360200190a15050565b6040516001600160a01b03848116602483015283811660448301526001600160e01b0319831660648301525f9182918291829189169060840160408051601f198184030181529181526020820180516001600160e01b031663b700961360e01b179052516118e19190612304565b5f60405180830381855afa9150503d805f8114611919576040519150601f19603f3d011682016040523d82523d5f602084013e61191e565b606091505b509150915081156119705760408151106119505780806020019051810190611946919061231a565b9094509250611970565b6020815110611970578080602001905181019061196d91906121ab565b93505b505094509492505050565b60405163274acb3560e01b81526001600160601b038084166004830152821660248201525f9073__$3bac17678db7ae928afa209f2f44deec9c$__9063274acb3590604401602060405180830381865af41580156119db573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906119ff9190612144565b9392505050565b5f8051602061249283398151915254600160401b900460ff16611a3c57604051631afcd79f60e31b815260040160405180910390fd5b565b611a46611a06565b611a4e611b0a565b611acb8383846001600160a01b031663644c45e06040518163ffffffff1660e01b8152600401602060405180830381865afa158015611a8f573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190611ab39190612144565b60085f8660405180602001604052805f815250611b1a565b61096663daf9067160e01b5b611adf611a06565b611b07816001600160e01b0319165f908152602081905260409020805460ff19166001179055565b50565b611b12611a06565b611a3c611c61565b611b22611a06565b604051632330f24760e01b81526001600160a01b038816600482015273__$fb599632d08395912d9d70eb2f0f93b5e2$__90632330f24790602401602060405180830381865af4158015611b78573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190611b9c91906121ab565b611bc45760405163cf6935e560e01b81526001600160a01b0388166004820152602401610c39565b611bcd87611c8f565b611bd78683611ca0565b5f7f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30080546001600160601b0388166cffffffffffffffffffffffffff1990911617600160601b60ff8816021760ff60681b1916600160681b86151502178155905060018101611c468382612397565b50611c57634a531f3360e01b611ad7565b5050505050505050565b611c69611a06565b60017f9b779b17422d0df92223018b32b4d1fa46e071723d6817e2486d003becc55f0055565b611c97611a06565b611b0781611d16565b611ca8611a06565b611cb0611d27565b611cb982611d6f565b6001600160a01b038116611ce05760405163f17ef42d60e01b815260040160405180910390fd5b5f8051602061245283398151915280546001600160601b0316600160601b6001600160a01b039093169290920291909117905550565b611d1e611a06565b611b0781611813565b611d2f611a06565b611a3c6301ffc9a760e01b5f9081526020527f67be87c3ff9960ca1e9cfac5cab2ff4747269cf9ed20c9b7306235ac35a491c5805460ff19166001179055565b611d77611a06565b604051633334d16b60e01b81526001600160a01b038216600482015273__$fb599632d08395912d9d70eb2f0f93b5e2$__90633334d16b90602401602060405180830381865af4158015611dcd573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190611df191906121ab565b611e195760405163fdeac91f60e01b81526001600160a01b0382166004820152602401610c39565b600180546001600160a01b0319166001600160a01b0392909216919091179055565b5f60208284031215611e4b575f80fd5b81356001600160e01b0319811681146119ff575f80fd5b5f81518084528060208401602086015e5f602082860101526020601f19601f83011685010191505092915050565b602081526001600160601b0382511660208201526001600160601b03602083015116604082015260ff60408301511660608201525f6060830151611ed8608084018215159052565b5060808301516001600160a01b03811660a08401525060a08301516001600160a01b03811660c08401525060c083015160e080840152611f1c610100840182611e62565b949350505050565b6001600160a01b0381168114611b07575f80fd5b6001600160601b0381168114611b07575f80fd5b5f805f8060808587031215611f5f575f80fd5b8435611f6a81611f24565b93506020850135611f7a81611f38565b92506040850135611f8a81611f38565b91506060850135611f9a81611f38565b939692955090935050565b634e487b7160e01b5f52604160045260245ffd5b5f82601f830112611fc8575f80fd5b81356001600160401b03811115611fe157611fe1611fa5565b604051601f8201601f19908116603f011681016001600160401b038111828210171561200f5761200f611fa5565b604052818152838201602001851015612026575f80fd5b816020850160208301375f918101602001919091529392505050565b5f60208284031215612052575f80fd5b81356001600160401b03811115612067575f80fd5b611f1c84828501611fb9565b5f805f60608486031215612085575f80fd5b833561209081611f24565b925060208401356120a081611f38565b915060408401356120b081611f38565b809150509250925092565b5f80604083850312156120cc575f80fd5b82356120d781611f24565b915060208301356001600160401b038111156120f1575f80fd5b6120fd85828601611fb9565b9150509250929050565b5f60208284031215612117575f80fd5b81356119ff81611f24565b5f60208284031215612132575f80fd5b815162ffffff811681146119ff575f80fd5b5f60208284031215612154575f80fd5b81516119ff81611f38565b600181811c9082168061217357607f821691505b60208210810361219157634e487b7160e01b5f52602260045260245ffd5b50919050565b805180151581146121a6575f80fd5b919050565b5f602082840312156121bb575f80fd5b6119ff82612197565b6001600160401b0381168114611b07575f80fd5b5f602082840312156121e8575f80fd5b81516119ff816121c4565b5f60208284031215612203575f80fd5b815160ff811681146119ff575f80fd5b5f60208284031215612223575f80fd5b81516119ff81611f24565b5f808585111561223c575f80fd5b83861115612248575f80fd5b5050820193919092039150565b80356001600160e01b03198116906004841015612286576001600160e01b0319600485900360031b81901b82161691505b5092915050565b6001600160a01b03841681526040602082018190528101829052818360608301375f818301606090810191909152601f909201601f1916010192915050565b5f80604083850312156122dd575f80fd5b82516122e881611f24565b60208401519092506122f981611f24565b809150509250929050565b5f82518060208501845e5f920191825250919050565b5f806040838503121561232b575f80fd5b61233483612197565b9150602083015163ffffffff811681146122f9575f80fd5b601f82111561096657805f5260205f20601f840160051c810160208510156123715750805b601f840160051c820191505b81811015612390575f815560010161237d565b5050505050565b81516001600160401b038111156123b0576123b0611fa5565b6123c4816123be845461215f565b8461234c565b6020601f8211600181146123f6575f83156123df5750848201515b5f19600385901b1c1916600184901b178455612390565b5f84815260208120601f198516915b828110156124255787850151825560209485019460019092019101612405565b508482101561244257868401515f19600387901b60f8161c191681555b50505050600190811b0190555056fe07ebcf49758b6ed3af50fa146bec0abe157c0218fe65dc0874c286e9d5da4f00f3177357ab46d8af007ab3fdb9af81da189e1068fefdc0073dca88a2cab40a00f0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a00a2646970667358221220ac951e184904fa487716baa3028f00fe69ca47576a1d1bec87bb8c17162f806664736f6c634300081a0033",
+  "deployedBytecode": "0x608060405234801561000f575f80fd5b50600436106101e7575f3560e01c80636c741e78116101095780638fb360371161009e578063d165cb641161006e578063d165cb6414610468578063d56cd3d51461047b578063dd94be6814610370578063e618053f146103fe575f80fd5b80638fb3603714610424578063ada9652e14610445578063b68d180914610459578063bf7e214f14610460575f80fd5b80637a9e5e4b116100d95780637a9e5e4b146103e3578063893d20e8146103f6578063899cc04c146103fe57806389fad8a214610411575f80fd5b80636c741e78146103835780636e172807146103a357806374933c2f146103b657806376b707b7146103c9575f80fd5b8063329d6e741161017f5780635eec02641161014f5780635eec0264146102cf578063644c45e014610340578063661017811461035d57806367438c5014610370575f80fd5b8063329d6e74146102e2578063346696cc146102f557806349bb9e4b146103085780635ab1bd531461031b575f80fd5b8063138461e0116101ba578063138461e0146102725780631eff4b221461029257806322f3e2d4146102c757806325e451d3146102cf575f80fd5b806301ffc9a7146101eb5780630d8e6e2c1461022c5780630fec111c1461024857806311a146771461025d575b5f80fd5b6102176101f9366004611e3b565b6001600160e01b0319165f9081526020819052604090205460ff1690565b60405190151581526020015b60405180910390f35b61023461048e565b60405162ffffff9091168152602001610223565b610250610515565b6040516102239190611e90565b61027061026b366004611f4c565b6106cf565b005b61027a6106f9565b6040516001600160601b039091168152602001610223565b6102b97f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30081565b604051908152602001610223565b610217610703565b6102706102dd366004611f4c565b61077a565b6102706102f0366004612042565b61079c565b610270610303366004612073565b6108e6565b6102706103163660046120bb565b61096b565b6001546001600160a01b03165b6040516001600160a01b039091168152602001610223565b5f80516020612452833981519152546001600160601b031661027a565b61027061036b366004611f4c565b610a67565b61027061037e366004612073565b610a7b565b61038b610add565b6040516001600160401b039091168152602001610223565b6102706103b1366004612073565b610b69565b6102706103c4366004611f4c565b610b7d565b6103d1610b91565b60405160ff9091168152602001610223565b6102706103f1366004612107565b610bf9565b610328610c84565b61027061040c366004611f4c565b610db5565b61027061041f366004611f4c565b610dc9565b61042c610ddd565b6040516001600160e01b03199091168152602001610223565b6102b95f8051602061245283398151915281565b60286103d1565b610328610e12565b610270610476366004611f4c565b610e2d565b610270610489366004611f4c565b610e41565b604051632efe011360e01b8152600360048201525f60248201819052604482018190529073__$8eede297b65ed5a56eb3f84d8232ae93f5$__90632efe011390606401602060405180830381865af41580156104ec573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906105109190612122565b905090565b6040805160e0810182525f8082526020820181905291810182905260608082018390526080820183905260a0820183905260c0820152907f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30090506040518060e0016040528073__$94a2c899be079b00d952d0d84fffaa5c34$__63bc1b392d6040518163ffffffff1660e01b8152600401602060405180830381865af41580156105c1573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906105e59190612144565b6001600160601b0390811682528354908116602083015260ff600160601b820481166040840152600160681b909104161515606082015230608082015260a00161062d610c84565b6001600160a01b0316815260200182600101805461064a9061215f565b80601f01602080910402602001604051908101604052809291908181526020018280546106769061215f565b80156106c15780601f10610698576101008083540402835291602001916106c1565b820191905f5260205f20905b8154815290600101906020018083116106a457829003601f168201915b505050505081525091505090565b6106db335b5f36610e55565b6106e683600e610f53565b6106f35f85858585611087565b50505050565b5f61051030611481565b5f61070c610e12565b60405163a166aa8960e01b81523060048201526001600160a01b03919091169063a166aa8990602401602060405180830381865afa158015610750573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061077491906121ab565b15905090565b610783336106d4565b61078e836016610f53565b6106f3600185858585611087565b73__$8eede297b65ed5a56eb3f84d8232ae93f5$__63a123b37c6107be61048e565b6040516001600160e01b031960e084901b16815262ffffff9091166004820152602401602060405180830381865af41580156107fc573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061082091906121d8565b5f805160206124928339815191528054600160401b900460ff1680610852575080546001600160401b03808416911610155b156108705760405163f92ee8a960e01b815260040160405180910390fd5b805468ffffffffffffffffff19166001600160401b03831617600160401b17815561089a836116d7565b805460ff60401b191681556040516001600160401b03831681527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a1505050565b6108ef336106d4565b6109665f848473__$3bac17678db7ae928afa209f2f44deec9c$__63bc1b392d6040518163ffffffff1660e01b8152600401602060405180830381865af415801561093c573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906109609190612144565b85611087565b505050565b5f805160206124928339815191528054600160401b810460ff1615906001600160401b03165f8115801561099c5750825b90505f826001600160401b031660011480156109b75750303b155b9050811580156109c5575080155b156109e35760405163f92ee8a960e01b815260040160405180910390fd5b845467ffffffffffffffff191660011785558315610a0d57845460ff60401b1916600160401b1785555b610a1787876116f8565b8315610a5e57845460ff60401b19168555604051600181527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d2906020015b60405180910390a15b50505050505050565b610a70336106d4565b6106e6836017610f53565b610a84336106d4565b610a8f82600c610f53565b6109666001848473__$3bac17678db7ae928afa209f2f44deec9c$__63bc1b392d6040518163ffffffff1660e01b8152600401602060405180830381865af415801561093c573d5f803e3d5ffd5b5f73__$1d92393fa9ccd763988368ce8a1cb90d26$__63645ceefe6028610b02610b91565b6040516001600160e01b031960e085901b16815260ff928316600482015291166024820152604401602060405180830381865af4158015610b45573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061051091906121d8565b610b72336106d4565b6108ef82600c610f53565b610b86336106d4565b61078e83600e610f53565b5f610b9a610e12565b6001600160a01b03166376b707b76040518163ffffffff1660e01b8152600401602060405180830381865afa158015610bd5573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061051091906121f3565b33610c02610e12565b6001600160a01b0316816001600160a01b031614610c425760405162d1953b60e31b81526001600160a01b03821660048201526024015b60405180910390fd5b816001600160a01b03163b5f03610c77576040516361798f2f60e11b81526001600160a01b0383166004820152602401610c39565b610c8082611813565b5050565b5f805f8051602061245283398151915280546040516330b8415f60e01b81526001600160601b03909116600482015290915073__$94a2c899be079b00d952d0d84fffaa5c34$__906330b8415f90602401602060405180830381865af4158015610cf0573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610d1491906121ab565b15610d9f576001546001600160a01b03168154604051631c5da14d60e11b81526001600160601b0390911660048201526001600160a01b0391909116906338bb429a90602401602060405180830381865afa158015610d75573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610d999190612213565b91505090565b54600160601b90046001600160a01b0316919050565b610dbe336106d4565b6106e6836016610f53565b610dd2336106d4565b6106e683600f610f53565b5f8051602061247283398151915280545f9190600160a01b900460ff16610e04575f610d99565b638fb3603760e01b91505090565b5f80516020612472833981519152546001600160a01b031690565b610e36336106d4565b61078e836017610f53565b610e4a336106d4565b61078e83600f610f53565b5f805160206124728339815191525f80610e8d610e70610e12565b8730610e7f60045f8a8c61222e565b610e8891612255565b611873565b9150915081610f4b5763ffffffff811615610f2857825460ff60a01b1916600160a01b178355610ebb610e12565b6001600160a01b03166394c7d7ee8787876040518463ffffffff1660e01b8152600401610eea9392919061228d565b5f604051808303815f87803b158015610f01575f80fd5b505af1158015610f13573d5f803e3d5ffd5b5050845460ff60a01b1916855550610f4b9050565b60405162d1953b60e31b81526001600160a01b0387166004820152602401610c39565b505050505050565b60405163037c8cb160e51b815260ff8216600482015273__$0d958e68cba84670b8f4a3f2f2686b1c6b$__90636f91962090602401602060405180830381865af4158015610fa3573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610fc791906121ab565b8061105557506001546001600160a01b0316604051635b12715d60e11b81526001600160601b038416600482015260ff831660248201526001600160a01b03919091169063b624e2ba90604401602060405180830381865afa15801561102f573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061105391906121ab565b155b15610c805760405163d711af7560e01b81526001600160601b038316600482015260ff82166024820152604401610c39565b5f611092838361197b565b90508515611291576040516330b8415f60e01b81526001600160601b038216600482015273__$3bac17678db7ae928afa209f2f44deec9c$__906330b8415f90602401602060405180830381865af41580156110f0573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061111491906121ab565b1561119357604051639f8151e560e01b81526001600160601b038086166004830152821660248201526001600160a01b03861690639f8151e5906044016020604051808303815f875af115801561116d573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906111919190612144565b505b6040516330b8415f60e01b81526001600160601b038316600482015273__$3bac17678db7ae928afa209f2f44deec9c$__906330b8415f90602401602060405180830381865af41580156111e9573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061120d91906121ab565b1561128c5760405163e80c61ed60e01b81526001600160601b038086166004830152831660248201526001600160a01b0386169063e80c61ed906044016020604051808303815f875af1158015611266573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061128a9190612144565b505b610f4b565b6040516330b8415f60e01b81526001600160601b038216600482015273__$3bac17678db7ae928afa209f2f44deec9c$__906330b8415f90602401602060405180830381865af41580156112e7573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061130b91906121ab565b1561138a5760405163b0628dc360e01b81526001600160601b038086166004830152821660248201526001600160a01b0386169063b0628dc3906044016020604051808303815f875af1158015611364573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906113889190612144565b505b6040516330b8415f60e01b81526001600160601b038316600482015273__$3bac17678db7ae928afa209f2f44deec9c$__906330b8415f90602401602060405180830381865af41580156113e0573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061140491906121ab565b15610f4b576040516314cc21b560e21b81526001600160601b038086166004830152831660248201526001600160a01b0386169063533086d4906044016020604051808303815f875af115801561145d573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610a5e9190612144565b5f805f8051602061245283398151915280546040516330b8415f60e01b81526001600160601b03909116600482015290915073__$94a2c899be079b00d952d0d84fffaa5c34$__906330b8415f90602401602060405180830381865af41580156114ed573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061151191906121ab565b1561153d5780546040516301ab8b6760e21b81526001600160601b039091166004820152602401610c39565b6001546001600160a01b031660405163c3c5a54760e01b81526001600160a01b038581166004830152919091169063c3c5a54790602401602060405180830381865afa15801561158f573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906115b391906121ab565b6115db5760405163b9304b0d60e01b81526001600160a01b0384166004820152602401610c39565b6001546001600160a01b0316604051632f2a35f760e11b81526001600160a01b0385811660048301529190911690635e546bee90602401602060405180830381865afa15801561162d573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906116519190612144565b81546bffffffffffffffffffffffff19166001600160601b039190911690811782557f88857b75cbef7f257c9d5a473e28aaf6a91cc28f717f60f2cda3bcf5623d7b549061169d610c84565b604080516001600160601b0390931683526001600160a01b0390911660208301520160405180910390a1546001600160601b031692915050565b6116df611a06565b60405163502ec37160e01b815260040160405180910390fd5b5f805160206124928339815191528054600160401b810460ff1615906001600160401b03165f811580156117295750825b90505f826001600160401b031660011480156117445750303b155b905081158015611752575080155b156117705760405163f92ee8a960e01b815260040160405180910390fd5b845467ffffffffffffffff19166001178555831561179a57845460ff60401b1916600160401b1785555b5f80878060200190518101906117b091906122cc565b915091506117bf82828b611a3e565b6117cf637afbb7fd60e01b611ad7565b50508315610a5e57845460ff60401b19168555604051600181527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d290602001610a55565b5f8051602061247283398151915280546001600160a01b0383166001600160a01b03199091168117825560408051918252517f2f658b440c35314f52658ea8a740e05b284cdc84dc9ae01e891f21b8933e7cad9181900360200190a15050565b6040516001600160a01b03848116602483015283811660448301526001600160e01b0319831660648301525f9182918291829189169060840160408051601f198184030181529181526020820180516001600160e01b031663b700961360e01b179052516118e19190612304565b5f60405180830381855afa9150503d805f8114611919576040519150601f19603f3d011682016040523d82523d5f602084013e61191e565b606091505b509150915081156119705760408151106119505780806020019051810190611946919061231a565b9094509250611970565b6020815110611970578080602001905181019061196d91906121ab565b93505b505094509492505050565b60405163274acb3560e01b81526001600160601b038084166004830152821660248201525f9073__$3bac17678db7ae928afa209f2f44deec9c$__9063274acb3590604401602060405180830381865af41580156119db573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906119ff9190612144565b9392505050565b5f8051602061249283398151915254600160401b900460ff16611a3c57604051631afcd79f60e31b815260040160405180910390fd5b565b611a46611a06565b611a4e611b0a565b611acb8383846001600160a01b031663644c45e06040518163ffffffff1660e01b8152600401602060405180830381865afa158015611a8f573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190611ab39190612144565b60085f8660405180602001604052805f815250611b1a565b61096663daf9067160e01b5b611adf611a06565b611b07816001600160e01b0319165f908152602081905260409020805460ff19166001179055565b50565b611b12611a06565b611a3c611c61565b611b22611a06565b604051632330f24760e01b81526001600160a01b038816600482015273__$fb599632d08395912d9d70eb2f0f93b5e2$__90632330f24790602401602060405180830381865af4158015611b78573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190611b9c91906121ab565b611bc45760405163cf6935e560e01b81526001600160a01b0388166004820152602401610c39565b611bcd87611c8f565b611bd78683611ca0565b5f7f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30080546001600160601b0388166cffffffffffffffffffffffffff1990911617600160601b60ff8816021760ff60681b1916600160681b86151502178155905060018101611c468382612397565b50611c57634a531f3360e01b611ad7565b5050505050505050565b611c69611a06565b60017f9b779b17422d0df92223018b32b4d1fa46e071723d6817e2486d003becc55f0055565b611c97611a06565b611b0781611d16565b611ca8611a06565b611cb0611d27565b611cb982611d6f565b6001600160a01b038116611ce05760405163f17ef42d60e01b815260040160405180910390fd5b5f8051602061245283398151915280546001600160601b0316600160601b6001600160a01b039093169290920291909117905550565b611d1e611a06565b611b0781611813565b611d2f611a06565b611a3c6301ffc9a760e01b5f9081526020527f67be87c3ff9960ca1e9cfac5cab2ff4747269cf9ed20c9b7306235ac35a491c5805460ff19166001179055565b611d77611a06565b604051633334d16b60e01b81526001600160a01b038216600482015273__$fb599632d08395912d9d70eb2f0f93b5e2$__90633334d16b90602401602060405180830381865af4158015611dcd573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190611df191906121ab565b611e195760405163fdeac91f60e01b81526001600160a01b0382166004820152602401610c39565b600180546001600160a01b0319166001600160a01b0392909216919091179055565b5f60208284031215611e4b575f80fd5b81356001600160e01b0319811681146119ff575f80fd5b5f81518084528060208401602086015e5f602082860101526020601f19601f83011685010191505092915050565b602081526001600160601b0382511660208201526001600160601b03602083015116604082015260ff60408301511660608201525f6060830151611ed8608084018215159052565b5060808301516001600160a01b03811660a08401525060a08301516001600160a01b03811660c08401525060c083015160e080840152611f1c610100840182611e62565b949350505050565b6001600160a01b0381168114611b07575f80fd5b6001600160601b0381168114611b07575f80fd5b5f805f8060808587031215611f5f575f80fd5b8435611f6a81611f24565b93506020850135611f7a81611f38565b92506040850135611f8a81611f38565b91506060850135611f9a81611f38565b939692955090935050565b634e487b7160e01b5f52604160045260245ffd5b5f82601f830112611fc8575f80fd5b81356001600160401b03811115611fe157611fe1611fa5565b604051601f8201601f19908116603f011681016001600160401b038111828210171561200f5761200f611fa5565b604052818152838201602001851015612026575f80fd5b816020850160208301375f918101602001919091529392505050565b5f60208284031215612052575f80fd5b81356001600160401b03811115612067575f80fd5b611f1c84828501611fb9565b5f805f60608486031215612085575f80fd5b833561209081611f24565b925060208401356120a081611f38565b915060408401356120b081611f38565b809150509250925092565b5f80604083850312156120cc575f80fd5b82356120d781611f24565b915060208301356001600160401b038111156120f1575f80fd5b6120fd85828601611fb9565b9150509250929050565b5f60208284031215612117575f80fd5b81356119ff81611f24565b5f60208284031215612132575f80fd5b815162ffffff811681146119ff575f80fd5b5f60208284031215612154575f80fd5b81516119ff81611f38565b600181811c9082168061217357607f821691505b60208210810361219157634e487b7160e01b5f52602260045260245ffd5b50919050565b805180151581146121a6575f80fd5b919050565b5f602082840312156121bb575f80fd5b6119ff82612197565b6001600160401b0381168114611b07575f80fd5b5f602082840312156121e8575f80fd5b81516119ff816121c4565b5f60208284031215612203575f80fd5b815160ff811681146119ff575f80fd5b5f60208284031215612223575f80fd5b81516119ff81611f24565b5f808585111561223c575f80fd5b83861115612248575f80fd5b5050820193919092039150565b80356001600160e01b03198116906004841015612286576001600160e01b0319600485900360031b81901b82161691505b5092915050565b6001600160a01b03841681526040602082018190528101829052818360608301375f818301606090810191909152601f909201601f1916010192915050565b5f80604083850312156122dd575f80fd5b82516122e881611f24565b60208401519092506122f981611f24565b809150509250929050565b5f82518060208501845e5f920191825250919050565b5f806040838503121561232b575f80fd5b61233483612197565b9150602083015163ffffffff811681146122f9575f80fd5b601f82111561096657805f5260205f20601f840160051c810160208510156123715750805b601f840160051c820191505b81811015612390575f815560010161237d565b5050505050565b81516001600160401b038111156123b0576123b0611fa5565b6123c4816123be845461215f565b8461234c565b6020601f8211600181146123f6575f83156123df5750848201515b5f19600385901b1c1916600184901b178455612390565b5f84815260208120601f198516915b828110156124255787850151825560209485019460019092019101612405565b508482101561244257868401515f19600387901b60f8161c191681555b50505050600190811b0190555056fe07ebcf49758b6ed3af50fa146bec0abe157c0218fe65dc0874c286e9d5da4f00f3177357ab46d8af007ab3fdb9af81da189e1068fefdc0073dca88a2cab40a00f0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a00a2646970667358221220ac951e184904fa487716baa3028f00fe69ca47576a1d1bec87bb8c17162f806664736f6c634300081a0033",
   "linkReferences": {
     "contracts/shared/ContractLib.sol": {
       "ContractLib": [
         {
           "length": 20,
-          "start": 6927
+          "start": 7190
         },
         {
           "length": 20,
-          "start": 7524
+          "start": 7787
         }
       ]
     },
@@ -857,31 +909,31 @@
       "AmountLib": [
         {
           "length": 20,
-          "start": 2498
+          "start": 2509
         },
         {
           "length": 20,
-          "start": 2915
+          "start": 2926
         },
         {
           "length": 20,
-          "start": 4349
+          "start": 4494
         },
         {
           "length": 20,
-          "start": 4598
+          "start": 4743
         },
         {
           "length": 20,
-          "start": 4852
+          "start": 4997
         },
         {
           "length": 20,
-          "start": 5101
+          "start": 5246
         },
         {
           "length": 20,
-          "start": 6514
+          "start": 6777
         }
       ]
     },
@@ -889,15 +941,23 @@
       "NftIdLib": [
         {
           "length": 20,
-          "start": 1607
+          "start": 1618
         },
         {
           "length": 20,
-          "start": 3459
+          "start": 3470
         },
         {
           "length": 20,
-          "start": 5370
+          "start": 5515
+        }
+      ]
+    },
+    "contracts/type/ObjectType.sol": {
+      "ObjectTypeLib": [
+        {
+          "length": 20,
+          "start": 4161
         }
       ]
     },
@@ -905,7 +965,7 @@
       "RoleIdLib": [
         {
           "length": 20,
-          "start": 2987
+          "start": 2998
         }
       ]
     },
@@ -913,11 +973,11 @@
       "VersionLib": [
         {
           "length": 20,
-          "start": 1407
+          "start": 1418
         },
         {
           "length": 20,
-          "start": 2153
+          "start": 2164
         }
       ]
     }
@@ -927,11 +987,11 @@
       "ContractLib": [
         {
           "length": 20,
-          "start": 6713
+          "start": 6976
         },
         {
           "length": 20,
-          "start": 7310
+          "start": 7573
         }
       ]
     },
@@ -939,31 +999,31 @@
       "AmountLib": [
         {
           "length": 20,
-          "start": 2284
+          "start": 2295
         },
         {
           "length": 20,
-          "start": 2701
+          "start": 2712
         },
         {
           "length": 20,
-          "start": 4135
+          "start": 4280
         },
         {
           "length": 20,
-          "start": 4384
+          "start": 4529
         },
         {
           "length": 20,
-          "start": 4638
+          "start": 4783
         },
         {
           "length": 20,
-          "start": 4887
+          "start": 5032
         },
         {
           "length": 20,
-          "start": 6300
+          "start": 6563
         }
       ]
     },
@@ -971,15 +1031,23 @@
       "NftIdLib": [
         {
           "length": 20,
-          "start": 1393
+          "start": 1404
         },
         {
           "length": 20,
-          "start": 3245
+          "start": 3256
         },
         {
           "length": 20,
-          "start": 5156
+          "start": 5301
+        }
+      ]
+    },
+    "contracts/type/ObjectType.sol": {
+      "ObjectTypeLib": [
+        {
+          "length": 20,
+          "start": 3947
         }
       ]
     },
@@ -987,7 +1055,7 @@
       "RoleIdLib": [
         {
           "length": 20,
-          "start": 2773
+          "start": 2784
         }
       ]
     },
@@ -995,11 +1063,11 @@
       "VersionLib": [
         {
           "length": 20,
-          "start": 1193
+          "start": 1204
         },
         {
           "length": 20,
-          "start": 1939
+          "start": 1950
         }
       ]
     }

package/artifacts/contracts/accounting/AccountingServiceManager.sol/AccountingServiceManager.dbg.json

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