@venusprotocol/isolated-pools 0.0.7 → 0.0.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (13) hide show
  1. package/artifacts/build-info/25692fa4dbff4aa0f36fdb6d3ab0ceac.json +1 -0
  2. package/artifacts/contracts/Lens/PoolLens.sol/PoolLens.dbg.json +1 -1
  3. package/artifacts/contracts/Lens/PoolLens.sol/PoolLens.json +2 -7
  4. package/artifacts/contracts/Pool/PoolRegistry.sol/PoolRegistry.dbg.json +1 -1
  5. package/artifacts/contracts/Pool/PoolRegistry.sol/PoolRegistry.json +2 -17
  6. package/artifacts/contracts/Pool/PoolRegistryInterface.sol/PoolRegistryInterface.dbg.json +1 -1
  7. package/artifacts/contracts/Pool/PoolRegistryInterface.sol/PoolRegistryInterface.json +0 -10
  8. package/artifacts/contracts/RiskFund/RiskFund.sol/RiskFund.dbg.json +1 -1
  9. package/artifacts/contracts/RiskFund/RiskFund.sol/RiskFund.json +2 -7
  10. package/contracts/Lens/PoolLens.sol +0 -1
  11. package/contracts/Pool/PoolRegistry.sol +0 -2
  12. package/deploy/003-deploy-pools.js +6 -6
  13. package/package.json +2 -2
package/artifacts/contracts/RiskFund/RiskFund.sol/RiskFund.json CHANGED
@@ -189,11 +189,6 @@
189
189
  "inputs": [
190
190
  {
191
191
  "components": [
192
- {
193
- "internalType": "uint256",
194
- "name": "poolId",
195
- "type": "uint256"
196
- },
197
192
  {
198
193
  "internalType": "string",
199
194
  "name": "name",
@@ -274,8 +269,8 @@
274
269
  "type": "function"
275
270
  }
276
271
  ],
277
- "bytecode": "0x608060405234801561001057600080fd5b50611cc4806100206000396000f3fe608060405234801561001057600080fd5b50600436106100cf5760003560e01c80635bfc52ad1161008c5780637b77cd6a116100665780637b77cd6a1461019457806381fe4d2e146101a75780638da5cb5b146101ba578063f2fde38b146101d557600080fd5b80635bfc52ad14610171578063715018a614610179578063746460a91461018157600080fd5b806303b54d52146100d45780630a9837c5146100e95780631496e0bf1461010f5780632c6ea6681461012257806331d8e4551461014b5780634dd9584a1461015e575b600080fd5b6100e76100e2366004611457565b6101e8565b005b6100fc6100f73660046114b6565b6103e6565b6040519081526020015b60405180910390f35b6100e761011d3660046114e2565b610645565b6100fc6101303660046114fb565b6001600160a01b03166000908152606c602052604090205490565b6100e76101593660046114fb565b610652565b6100e761016c3660046114fb565b6106e6565b6100fc610736565b6100e7610826565b6100e761018f3660046114e2565b61083a565b6100e76101a23660046114fb565b610867565b6100fc6101b53660046115d4565b6108f8565b6033546040516001600160a01b039091168152602001610106565b6100e76101e33660046114fb565b610a97565b600054610100900460ff16158080156102085750600054600160ff909116105b806102225750303b158015610222575060005460ff166001145b61028a5760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b60648201526084015b60405180910390fd5b6000805460ff1916600117905580156102ad576000805461ff0019166101001790555b6001600160a01b0386166102d35760405162461bcd60e51b815260040161028190611740565b6001600160a01b0383166103295760405162461bcd60e51b815260206004820152601f60248201527f5269736b2046756e643a2042555344206164647265737320696e76616c6964006044820152606401610281565b600084116103495760405162461bcd60e51b815260040161028190611787565b610351610b10565b606680546001600160a01b038089166001600160a01b0319928316179092556068879055606786905560698054868416908316179055606b80549285169290911691909117905580156103de576000805461ff0019169055604051600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15b505050505050565b606b54604080516318c5e8ab60e01b81523360048201526024810191909152602a60448201527f7472616e7366657252657365727665466f7241756374696f6e2875696e743235606482015269362c75696e743235362960b01b608482015260009182916001600160a01b03909116906318c5e8ab9060a401602060405180830381865afa15801561047c573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104a091906117ce565b9050806105045760405162461bcd60e51b815260206004820152602c60248201527f5269736b2066756e643a204e6f7420617574686f72697a656420746f2074726160448201526b3739b332b910333ab732399760a11b6064820152608401610281565b606a546001600160a01b03166105715760405162461bcd60e51b815260206004820152602c60248201527f5269736b2046756e643a2041756374696f6e20636f6e747261637420696e766160448201526b3634b21030b2323932b9b99760a11b6064820152608401610281565b6001600160a01b0384166000908152606c60205260409020548311156105e75760405162461bcd60e51b815260206004820152602560248201527f5269736b2046756e643a20496e73756666696369656e7420706f6f6c2072657360448201526432b93b329760d91b6064820152608401610281565b6001600160a01b0384166000908152606c602052604090205461060b908490611806565b6001600160a01b038086166000908152606c6020526040902091909155606a5460695461063d92908116911685610b3f565b509092915050565b61064d610ba7565b606855565b61065a610ba7565b6001600160a01b0381166106c45760405162461bcd60e51b815260206004820152602b60248201527f5269736b2046756e643a2041756374696f6e20636f6e7472616374206164647260448201526a195cdcc81a5b9d985b1a5960aa1b6064820152608401610281565b606a80546001600160a01b0319166001600160a01b0392909216919091179055565b6106ee610ba7565b6001600160a01b0381166107145760405162461bcd60e51b815260040161028190611740565b606680546001600160a01b0319166001600160a01b0392909216919091179055565b6065546000906001600160a01b031661079b5760405162461bcd60e51b815260206004820152602160248201527f5269736b2066756e643a20496e76616c696420706f6f6c2072656769737472796044820152601760f91b6064820152608401610281565b60655460408051633623fc7d60e21b815290516001600160a01b0390921691600091839163d88ff1f49160048082019286929091908290030181865afa1580156107e9573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526108119190810190611858565b9050600061081e826108f8565b949350505050565b61082e610ba7565b6108386000610c01565b565b610842610ba7565b600081116108625760405162461bcd60e51b815260040161028190611787565b606755565b61086f610ba7565b6001600160a01b0381166108d65760405162461bcd60e51b815260206004820152602860248201527f5269736b2046756e643a20506f6f6c2072656769737472792061646472657373604482015267081a5b9d985b1a5960c21b6064820152608401610281565b606580546001600160a01b0319166001600160a01b0392909216919091179055565b60008060005b8351811015610a905760006001600160a01b0316848281518110610924576109246119b0565b6020026020010151606001516001600160a01b031614610a80576000848281518110610952576109526119b0565b6020026020010151606001516001600160a01b031663b0772d0b6040518163ffffffff1660e01b8152600401600060405180830381865afa15801561099b573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526109c391908101906119c6565b905060005b8151811015610a7d5760008684815181106109e5576109e56119b0565b60200260200101516060015190506000838381518110610a0757610a076119b0565b602002602001015190506000610a1d8284610c53565b6001600160a01b0384166000908152606c6020526040902054909150610a44908290611a55565b6001600160a01b0384166000908152606c6020526040902055610a678188611a55565b965050505080610a7690611a6d565b90506109c8565b50505b610a8981611a6d565b90506108fe565b5092915050565b610a9f610ba7565b6001600160a01b038116610b045760405162461bcd60e51b815260206004820152602660248201527f4f776e61626c653a206e6577206f776e657220697320746865207a65726f206160448201526564647265737360d01b6064820152608401610281565b610b0d81610c01565b50565b600054610100900460ff16610b375760405162461bcd60e51b815260040161028190611a86565b610838611025565b6040516001600160a01b038316602482015260448101829052610ba290849063a9059cbb60e01b906064015b60408051601f198184030181529190526020810180516001600160e01b03166001600160e01b031990931692909217909152611055565b505050565b6033546001600160a01b031633146108385760405162461bcd60e51b815260206004820181905260248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e65726044820152606401610281565b603380546001600160a01b038381166001600160a01b0319831681179093556040519116919082907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a35050565b6000806000846001600160a01b0316636f307dc36040518163ffffffff1660e01b8152600401602060405180830381865afa158015610c96573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610cba9190611ad1565b6040516370a0823160e01b81523060048201529091506000906001600160a01b038316906370a0823190602401602060405180830381865afa158015610d04573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610d289190611aee565b9050846001600160a01b0316637dc0d1d06040518163ffffffff1660e01b8152600401602060405180830381865afa158015610d68573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610d8c9190611ad1565b6040516396e85ced60e01b81526001600160a01b03888116600483015291909116906396e85ced90602401600060405180830381600087803b158015610dd157600080fd5b505af1158015610de5573d6000803e3d6000fd5b505050506000856001600160a01b0316637dc0d1d06040518163ffffffff1660e01b8152600401602060405180830381865afa158015610e29573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610e4d9190611ad1565b60405163fc57d4df60e01b81526001600160a01b038981166004830152919091169063fc57d4df90602401602060405180830381865afa158015610e95573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610eb99190611aee565b9050811561101a5760408051602081019091528181526000610edb8285611127565b90506067548110611017576040805160028082526060820183526000926020830190803683370190505090508581600081518110610f1b57610f1b6119b0565b6001600160a01b039283166020918202929092010152606954825191169082906001908110610f4c57610f4c6119b0565b6001600160a01b039283166020918202929092010152606654610f749188811691168761113f565b6066546068546040516338ed173960e01b81526000926001600160a01b0316916338ed173991610fae918a91879030904290600401611b07565b6000604051808303816000875af1158015610fcd573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610ff59190810190611b78565b90508060018151811061100a5761100a6119b0565b6020026020010151975050505b50505b509195945050505050565b600054610100900460ff1661104c5760405162461bcd60e51b815260040161028190611a86565b61083833610c01565b60006110aa826040518060400160405280602081526020017f5361666545524332303a206c6f772d6c6576656c2063616c6c206661696c6564815250856001600160a01b03166112549092919063ffffffff16565b805190915015610ba257808060200190518101906110c891906117ce565b610ba25760405162461bcd60e51b815260206004820152602a60248201527f5361666545524332303a204552433230206f7065726174696f6e20646964206e6044820152691bdd081cdd58d8d9595960b21b6064820152608401610281565b600080611134848461126d565b905061081e8161129e565b8015806111b95750604051636eb1769f60e11b81523060048201526001600160a01b03838116602483015284169063dd62ed3e90604401602060405180830381865afa158015611193573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906111b79190611aee565b155b6112245760405162461bcd60e51b815260206004820152603660248201527f5361666545524332303a20617070726f76652066726f6d206e6f6e2d7a65726f60448201527520746f206e6f6e2d7a65726f20616c6c6f77616e636560501b6064820152608401610281565b6040516001600160a01b038316602482015260448101829052610ba290849063095ea7b360e01b90606401610b6b565b606061126384846000856112bc565b90505b9392505050565b60408051602081019091526000815260405180602001604052806112958560000151856113ed565b90529392505050565b80516000906112b690670de0b6b3a764000090611bfe565b92915050565b60608247101561131d5760405162461bcd60e51b815260206004820152602660248201527f416464726573733a20696e73756666696369656e742062616c616e636520666f6044820152651c8818d85b1b60d21b6064820152608401610281565b6001600160a01b0385163b6113745760405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e74726163740000006044820152606401610281565b600080866001600160a01b031685876040516113909190611c20565b60006040518083038185875af1925050503d80600081146113cd576040519150601f19603f3d011682016040523d82523d6000602084013e6113d2565b606091505b50915091506113e28282866113f9565b979650505050505050565b60006112668284611c3c565b60608315611408575081611266565b8251156114185782518084602001fd5b8160405162461bcd60e51b81526004016102819190611c5b565b6001600160a01b0381168114610b0d57600080fd5b803561145281611432565b919050565b600080600080600060a0868803121561146f57600080fd5b853561147a81611432565b94506020860135935060408601359250606086013561149881611432565b915060808601356114a881611432565b809150509295509295909350565b600080604083850312156114c957600080fd5b82356114d481611432565b946020939093013593505050565b6000602082840312156114f457600080fd5b5035919050565b60006020828403121561150d57600080fd5b813561126681611432565b634e487b7160e01b600052604160045260246000fd5b60405160c0810167ffffffffffffffff8111828210171561155157611551611518565b60405290565b604051601f8201601f1916810167ffffffffffffffff8111828210171561158057611580611518565b604052919050565b600067ffffffffffffffff8211156115a2576115a2611518565b5060051b60200190565b600067ffffffffffffffff8211156115c6576115c6611518565b50601f01601f191660200190565b600060208083850312156115e757600080fd5b823567ffffffffffffffff808211156115ff57600080fd5b818501915085601f83011261161357600080fd5b813561162661162182611588565b611557565b81815260059190911b8301840190848101908883111561164557600080fd5b8585015b838110156117335780358581111561166057600080fd5b860160c0818c03601f190112156116775760008081fd5b61167f61152e565b888201358152604080830135888111156116995760008081fd5b8301603f81018e136116ab5760008081fd5b8a8101356116bb611621826115ac565b8181528f848385010111156116d05760008081fd5b818484018e83013760008d8383010152808d86015250505060606116f5818501611447565b8284015260809150611708828501611447565b9083015260a0838101359183019190915260c090920135918101919091528352918601918601611649565b5098975050505050505050565b60208082526027908201527f5269736b2046756e643a2050616e63616b6520737761702061646472657373206040820152661a5b9d985b1a5960ca1b606082015260800190565b60208082526027908201527f5269736b2046756e643a20496e76616c6964206d696e20616d6f757420746f2060408201526618dbdb9d995c9d60ca1b606082015260800190565b6000602082840312156117e057600080fd5b8151801515811461126657600080fd5b634e487b7160e01b600052601160045260246000fd5b600082821015611818576118186117f0565b500390565b60005b83811015611838578181015183820152602001611820565b83811115611847576000848401525b50505050565b805161145281611432565b6000602080838503121561186b57600080fd5b825167ffffffffffffffff8082111561188357600080fd5b818501915085601f83011261189757600080fd5b81516118a561162182611588565b81815260059190911b830184019084810190888311156118c457600080fd5b8585015b83811015611733578051858111156118df57600080fd5b860160c0818c03601f190112156118f65760008081fd5b6118fe61152e565b888201518152604080830151888111156119185760008081fd5b8301603f81018e1361192a5760008081fd5b8a81015161193a611621826115ac565b8181528f8483850101111561194f5760008081fd5b61195e828e830186860161181d565b848d0152506060905061197284820161184d565b828401526080915061198582850161184d565b9083015260a0838101519183019190915260c0909201519181019190915283529186019186016118c8565b634e487b7160e01b600052603260045260246000fd5b600060208083850312156119d957600080fd5b825167ffffffffffffffff8111156119f057600080fd5b8301601f81018513611a0157600080fd5b8051611a0f61162182611588565b81815260059190911b82018301908381019087831115611a2e57600080fd5b928401925b828410156113e2578351611a4681611432565b82529284019290840190611a33565b60008219821115611a6857611a686117f0565b500190565b600060018201611a7f57611a7f6117f0565b5060010190565b6020808252602b908201527f496e697469616c697a61626c653a20636f6e7472616374206973206e6f74206960408201526a6e697469616c697a696e6760a81b606082015260800190565b600060208284031215611ae357600080fd5b815161126681611432565b600060208284031215611b0057600080fd5b5051919050565b600060a082018783526020878185015260a0604085015281875180845260c086019150828901935060005b81811015611b575784516001600160a01b031683529383019391830191600101611b32565b50506001600160a01b03969096166060850152505050608001529392505050565b60006020808385031215611b8b57600080fd5b825167ffffffffffffffff811115611ba257600080fd5b8301601f81018513611bb357600080fd5b8051611bc161162182611588565b81815260059190911b82018301908381019087831115611be057600080fd5b928401925b828410156113e257835182529284019290840190611be5565b600082611c1b57634e487b7160e01b600052601260045260246000fd5b500490565b60008251611c3281846020870161181d565b9190910192915050565b6000816000190483118215151615611c5657611c566117f0565b500290565b6020815260008251806020840152611c7a81604085016020870161181d565b601f01601f1916919091016040019291505056fea26469706673582212204738bb77af4536a43630ced6695818886ca5d0a945ec550cb0d3eba2c9398e4d64736f6c634300080d0033",
278
- "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100cf5760003560e01c80635bfc52ad1161008c5780637b77cd6a116100665780637b77cd6a1461019457806381fe4d2e146101a75780638da5cb5b146101ba578063f2fde38b146101d557600080fd5b80635bfc52ad14610171578063715018a614610179578063746460a91461018157600080fd5b806303b54d52146100d45780630a9837c5146100e95780631496e0bf1461010f5780632c6ea6681461012257806331d8e4551461014b5780634dd9584a1461015e575b600080fd5b6100e76100e2366004611457565b6101e8565b005b6100fc6100f73660046114b6565b6103e6565b6040519081526020015b60405180910390f35b6100e761011d3660046114e2565b610645565b6100fc6101303660046114fb565b6001600160a01b03166000908152606c602052604090205490565b6100e76101593660046114fb565b610652565b6100e761016c3660046114fb565b6106e6565b6100fc610736565b6100e7610826565b6100e761018f3660046114e2565b61083a565b6100e76101a23660046114fb565b610867565b6100fc6101b53660046115d4565b6108f8565b6033546040516001600160a01b039091168152602001610106565b6100e76101e33660046114fb565b610a97565b600054610100900460ff16158080156102085750600054600160ff909116105b806102225750303b158015610222575060005460ff166001145b61028a5760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b60648201526084015b60405180910390fd5b6000805460ff1916600117905580156102ad576000805461ff0019166101001790555b6001600160a01b0386166102d35760405162461bcd60e51b815260040161028190611740565b6001600160a01b0383166103295760405162461bcd60e51b815260206004820152601f60248201527f5269736b2046756e643a2042555344206164647265737320696e76616c6964006044820152606401610281565b600084116103495760405162461bcd60e51b815260040161028190611787565b610351610b10565b606680546001600160a01b038089166001600160a01b0319928316179092556068879055606786905560698054868416908316179055606b80549285169290911691909117905580156103de576000805461ff0019169055604051600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15b505050505050565b606b54604080516318c5e8ab60e01b81523360048201526024810191909152602a60448201527f7472616e7366657252657365727665466f7241756374696f6e2875696e743235606482015269362c75696e743235362960b01b608482015260009182916001600160a01b03909116906318c5e8ab9060a401602060405180830381865afa15801561047c573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104a091906117ce565b9050806105045760405162461bcd60e51b815260206004820152602c60248201527f5269736b2066756e643a204e6f7420617574686f72697a656420746f2074726160448201526b3739b332b910333ab732399760a11b6064820152608401610281565b606a546001600160a01b03166105715760405162461bcd60e51b815260206004820152602c60248201527f5269736b2046756e643a2041756374696f6e20636f6e747261637420696e766160448201526b3634b21030b2323932b9b99760a11b6064820152608401610281565b6001600160a01b0384166000908152606c60205260409020548311156105e75760405162461bcd60e51b815260206004820152602560248201527f5269736b2046756e643a20496e73756666696369656e7420706f6f6c2072657360448201526432b93b329760d91b6064820152608401610281565b6001600160a01b0384166000908152606c602052604090205461060b908490611806565b6001600160a01b038086166000908152606c6020526040902091909155606a5460695461063d92908116911685610b3f565b509092915050565b61064d610ba7565b606855565b61065a610ba7565b6001600160a01b0381166106c45760405162461bcd60e51b815260206004820152602b60248201527f5269736b2046756e643a2041756374696f6e20636f6e7472616374206164647260448201526a195cdcc81a5b9d985b1a5960aa1b6064820152608401610281565b606a80546001600160a01b0319166001600160a01b0392909216919091179055565b6106ee610ba7565b6001600160a01b0381166107145760405162461bcd60e51b815260040161028190611740565b606680546001600160a01b0319166001600160a01b0392909216919091179055565b6065546000906001600160a01b031661079b5760405162461bcd60e51b815260206004820152602160248201527f5269736b2066756e643a20496e76616c696420706f6f6c2072656769737472796044820152601760f91b6064820152608401610281565b60655460408051633623fc7d60e21b815290516001600160a01b0390921691600091839163d88ff1f49160048082019286929091908290030181865afa1580156107e9573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526108119190810190611858565b9050600061081e826108f8565b949350505050565b61082e610ba7565b6108386000610c01565b565b610842610ba7565b600081116108625760405162461bcd60e51b815260040161028190611787565b606755565b61086f610ba7565b6001600160a01b0381166108d65760405162461bcd60e51b815260206004820152602860248201527f5269736b2046756e643a20506f6f6c2072656769737472792061646472657373604482015267081a5b9d985b1a5960c21b6064820152608401610281565b606580546001600160a01b0319166001600160a01b0392909216919091179055565b60008060005b8351811015610a905760006001600160a01b0316848281518110610924576109246119b0565b6020026020010151606001516001600160a01b031614610a80576000848281518110610952576109526119b0565b6020026020010151606001516001600160a01b031663b0772d0b6040518163ffffffff1660e01b8152600401600060405180830381865afa15801561099b573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526109c391908101906119c6565b905060005b8151811015610a7d5760008684815181106109e5576109e56119b0565b60200260200101516060015190506000838381518110610a0757610a076119b0565b602002602001015190506000610a1d8284610c53565b6001600160a01b0384166000908152606c6020526040902054909150610a44908290611a55565b6001600160a01b0384166000908152606c6020526040902055610a678188611a55565b965050505080610a7690611a6d565b90506109c8565b50505b610a8981611a6d565b90506108fe565b5092915050565b610a9f610ba7565b6001600160a01b038116610b045760405162461bcd60e51b815260206004820152602660248201527f4f776e61626c653a206e6577206f776e657220697320746865207a65726f206160448201526564647265737360d01b6064820152608401610281565b610b0d81610c01565b50565b600054610100900460ff16610b375760405162461bcd60e51b815260040161028190611a86565b610838611025565b6040516001600160a01b038316602482015260448101829052610ba290849063a9059cbb60e01b906064015b60408051601f198184030181529190526020810180516001600160e01b03166001600160e01b031990931692909217909152611055565b505050565b6033546001600160a01b031633146108385760405162461bcd60e51b815260206004820181905260248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e65726044820152606401610281565b603380546001600160a01b038381166001600160a01b0319831681179093556040519116919082907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a35050565b6000806000846001600160a01b0316636f307dc36040518163ffffffff1660e01b8152600401602060405180830381865afa158015610c96573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610cba9190611ad1565b6040516370a0823160e01b81523060048201529091506000906001600160a01b038316906370a0823190602401602060405180830381865afa158015610d04573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610d289190611aee565b9050846001600160a01b0316637dc0d1d06040518163ffffffff1660e01b8152600401602060405180830381865afa158015610d68573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610d8c9190611ad1565b6040516396e85ced60e01b81526001600160a01b03888116600483015291909116906396e85ced90602401600060405180830381600087803b158015610dd157600080fd5b505af1158015610de5573d6000803e3d6000fd5b505050506000856001600160a01b0316637dc0d1d06040518163ffffffff1660e01b8152600401602060405180830381865afa158015610e29573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610e4d9190611ad1565b60405163fc57d4df60e01b81526001600160a01b038981166004830152919091169063fc57d4df90602401602060405180830381865afa158015610e95573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610eb99190611aee565b9050811561101a5760408051602081019091528181526000610edb8285611127565b90506067548110611017576040805160028082526060820183526000926020830190803683370190505090508581600081518110610f1b57610f1b6119b0565b6001600160a01b039283166020918202929092010152606954825191169082906001908110610f4c57610f4c6119b0565b6001600160a01b039283166020918202929092010152606654610f749188811691168761113f565b6066546068546040516338ed173960e01b81526000926001600160a01b0316916338ed173991610fae918a91879030904290600401611b07565b6000604051808303816000875af1158015610fcd573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610ff59190810190611b78565b90508060018151811061100a5761100a6119b0565b6020026020010151975050505b50505b509195945050505050565b600054610100900460ff1661104c5760405162461bcd60e51b815260040161028190611a86565b61083833610c01565b60006110aa826040518060400160405280602081526020017f5361666545524332303a206c6f772d6c6576656c2063616c6c206661696c6564815250856001600160a01b03166112549092919063ffffffff16565b805190915015610ba257808060200190518101906110c891906117ce565b610ba25760405162461bcd60e51b815260206004820152602a60248201527f5361666545524332303a204552433230206f7065726174696f6e20646964206e6044820152691bdd081cdd58d8d9595960b21b6064820152608401610281565b600080611134848461126d565b905061081e8161129e565b8015806111b95750604051636eb1769f60e11b81523060048201526001600160a01b03838116602483015284169063dd62ed3e90604401602060405180830381865afa158015611193573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906111b79190611aee565b155b6112245760405162461bcd60e51b815260206004820152603660248201527f5361666545524332303a20617070726f76652066726f6d206e6f6e2d7a65726f60448201527520746f206e6f6e2d7a65726f20616c6c6f77616e636560501b6064820152608401610281565b6040516001600160a01b038316602482015260448101829052610ba290849063095ea7b360e01b90606401610b6b565b606061126384846000856112bc565b90505b9392505050565b60408051602081019091526000815260405180602001604052806112958560000151856113ed565b90529392505050565b80516000906112b690670de0b6b3a764000090611bfe565b92915050565b60608247101561131d5760405162461bcd60e51b815260206004820152602660248201527f416464726573733a20696e73756666696369656e742062616c616e636520666f6044820152651c8818d85b1b60d21b6064820152608401610281565b6001600160a01b0385163b6113745760405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e74726163740000006044820152606401610281565b600080866001600160a01b031685876040516113909190611c20565b60006040518083038185875af1925050503d80600081146113cd576040519150601f19603f3d011682016040523d82523d6000602084013e6113d2565b606091505b50915091506113e28282866113f9565b979650505050505050565b60006112668284611c3c565b60608315611408575081611266565b8251156114185782518084602001fd5b8160405162461bcd60e51b81526004016102819190611c5b565b6001600160a01b0381168114610b0d57600080fd5b803561145281611432565b919050565b600080600080600060a0868803121561146f57600080fd5b853561147a81611432565b94506020860135935060408601359250606086013561149881611432565b915060808601356114a881611432565b809150509295509295909350565b600080604083850312156114c957600080fd5b82356114d481611432565b946020939093013593505050565b6000602082840312156114f457600080fd5b5035919050565b60006020828403121561150d57600080fd5b813561126681611432565b634e487b7160e01b600052604160045260246000fd5b60405160c0810167ffffffffffffffff8111828210171561155157611551611518565b60405290565b604051601f8201601f1916810167ffffffffffffffff8111828210171561158057611580611518565b604052919050565b600067ffffffffffffffff8211156115a2576115a2611518565b5060051b60200190565b600067ffffffffffffffff8211156115c6576115c6611518565b50601f01601f191660200190565b600060208083850312156115e757600080fd5b823567ffffffffffffffff808211156115ff57600080fd5b818501915085601f83011261161357600080fd5b813561162661162182611588565b611557565b81815260059190911b8301840190848101908883111561164557600080fd5b8585015b838110156117335780358581111561166057600080fd5b860160c0818c03601f190112156116775760008081fd5b61167f61152e565b888201358152604080830135888111156116995760008081fd5b8301603f81018e136116ab5760008081fd5b8a8101356116bb611621826115ac565b8181528f848385010111156116d05760008081fd5b818484018e83013760008d8383010152808d86015250505060606116f5818501611447565b8284015260809150611708828501611447565b9083015260a0838101359183019190915260c090920135918101919091528352918601918601611649565b5098975050505050505050565b60208082526027908201527f5269736b2046756e643a2050616e63616b6520737761702061646472657373206040820152661a5b9d985b1a5960ca1b606082015260800190565b60208082526027908201527f5269736b2046756e643a20496e76616c6964206d696e20616d6f757420746f2060408201526618dbdb9d995c9d60ca1b606082015260800190565b6000602082840312156117e057600080fd5b8151801515811461126657600080fd5b634e487b7160e01b600052601160045260246000fd5b600082821015611818576118186117f0565b500390565b60005b83811015611838578181015183820152602001611820565b83811115611847576000848401525b50505050565b805161145281611432565b6000602080838503121561186b57600080fd5b825167ffffffffffffffff8082111561188357600080fd5b818501915085601f83011261189757600080fd5b81516118a561162182611588565b81815260059190911b830184019084810190888311156118c457600080fd5b8585015b83811015611733578051858111156118df57600080fd5b860160c0818c03601f190112156118f65760008081fd5b6118fe61152e565b888201518152604080830151888111156119185760008081fd5b8301603f81018e1361192a5760008081fd5b8a81015161193a611621826115ac565b8181528f8483850101111561194f5760008081fd5b61195e828e830186860161181d565b848d0152506060905061197284820161184d565b828401526080915061198582850161184d565b9083015260a0838101519183019190915260c0909201519181019190915283529186019186016118c8565b634e487b7160e01b600052603260045260246000fd5b600060208083850312156119d957600080fd5b825167ffffffffffffffff8111156119f057600080fd5b8301601f81018513611a0157600080fd5b8051611a0f61162182611588565b81815260059190911b82018301908381019087831115611a2e57600080fd5b928401925b828410156113e2578351611a4681611432565b82529284019290840190611a33565b60008219821115611a6857611a686117f0565b500190565b600060018201611a7f57611a7f6117f0565b5060010190565b6020808252602b908201527f496e697469616c697a61626c653a20636f6e7472616374206973206e6f74206960408201526a6e697469616c697a696e6760a81b606082015260800190565b600060208284031215611ae357600080fd5b815161126681611432565b600060208284031215611b0057600080fd5b5051919050565b600060a082018783526020878185015260a0604085015281875180845260c086019150828901935060005b81811015611b575784516001600160a01b031683529383019391830191600101611b32565b50506001600160a01b03969096166060850152505050608001529392505050565b60006020808385031215611b8b57600080fd5b825167ffffffffffffffff811115611ba257600080fd5b8301601f81018513611bb357600080fd5b8051611bc161162182611588565b81815260059190911b82018301908381019087831115611be057600080fd5b928401925b828410156113e257835182529284019290840190611be5565b600082611c1b57634e487b7160e01b600052601260045260246000fd5b500490565b60008251611c3281846020870161181d565b9190910192915050565b6000816000190483118215151615611c5657611c566117f0565b500290565b6020815260008251806020840152611c7a81604085016020870161181d565b601f01601f1916919091016040019291505056fea26469706673582212204738bb77af4536a43630ced6695818886ca5d0a945ec550cb0d3eba2c9398e4d64736f6c634300080d0033",
272
+ "bytecode": "0x608060405234801561001057600080fd5b50611cab806100206000396000f3fe608060405234801561001057600080fd5b50600436106100cf5760003560e01c80635bfc52ad1161008c5780637b77cd6a116100665780637b77cd6a146101945780638da5cb5b146101a7578063ea6a76c1146101c2578063f2fde38b146101d557600080fd5b80635bfc52ad14610171578063715018a614610179578063746460a91461018157600080fd5b806303b54d52146100d45780630a9837c5146100e95780631496e0bf1461010f5780632c6ea6681461012257806331d8e4551461014b5780634dd9584a1461015e575b600080fd5b6100e76100e2366004611457565b6101e8565b005b6100fc6100f73660046114b6565b6103e6565b6040519081526020015b60405180910390f35b6100e761011d3660046114e2565b610645565b6100fc6101303660046114fb565b6001600160a01b03166000908152606c602052604090205490565b6100e76101593660046114fb565b610652565b6100e761016c3660046114fb565b6106e6565b6100fc610736565b6100e7610826565b6100e761018f3660046114e2565b61083a565b6100e76101a23660046114fb565b610867565b6033546040516001600160a01b039091168152602001610106565b6100fc6101d03660046115d4565b6108f8565b6100e76101e33660046114fb565b610a97565b600054610100900460ff16158080156102085750600054600160ff909116105b806102225750303b158015610222575060005460ff166001145b61028a5760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b60648201526084015b60405180910390fd5b6000805460ff1916600117905580156102ad576000805461ff0019166101001790555b6001600160a01b0386166102d35760405162461bcd60e51b815260040161028190611733565b6001600160a01b0383166103295760405162461bcd60e51b815260206004820152601f60248201527f5269736b2046756e643a2042555344206164647265737320696e76616c6964006044820152606401610281565b600084116103495760405162461bcd60e51b81526004016102819061177a565b610351610b10565b606680546001600160a01b038089166001600160a01b0319928316179092556068879055606786905560698054868416908316179055606b80549285169290911691909117905580156103de576000805461ff0019169055604051600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15b505050505050565b606b54604080516318c5e8ab60e01b81523360048201526024810191909152602a60448201527f7472616e7366657252657365727665466f7241756374696f6e2875696e743235606482015269362c75696e743235362960b01b608482015260009182916001600160a01b03909116906318c5e8ab9060a401602060405180830381865afa15801561047c573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104a091906117c1565b9050806105045760405162461bcd60e51b815260206004820152602c60248201527f5269736b2066756e643a204e6f7420617574686f72697a656420746f2074726160448201526b3739b332b910333ab732399760a11b6064820152608401610281565b606a546001600160a01b03166105715760405162461bcd60e51b815260206004820152602c60248201527f5269736b2046756e643a2041756374696f6e20636f6e747261637420696e766160448201526b3634b21030b2323932b9b99760a11b6064820152608401610281565b6001600160a01b0384166000908152606c60205260409020548311156105e75760405162461bcd60e51b815260206004820152602560248201527f5269736b2046756e643a20496e73756666696369656e7420706f6f6c2072657360448201526432b93b329760d91b6064820152608401610281565b6001600160a01b0384166000908152606c602052604090205461060b9084906117f9565b6001600160a01b038086166000908152606c6020526040902091909155606a5460695461063d92908116911685610b3f565b509092915050565b61064d610ba7565b606855565b61065a610ba7565b6001600160a01b0381166106c45760405162461bcd60e51b815260206004820152602b60248201527f5269736b2046756e643a2041756374696f6e20636f6e7472616374206164647260448201526a195cdcc81a5b9d985b1a5960aa1b6064820152608401610281565b606a80546001600160a01b0319166001600160a01b0392909216919091179055565b6106ee610ba7565b6001600160a01b0381166107145760405162461bcd60e51b815260040161028190611733565b606680546001600160a01b0319166001600160a01b0392909216919091179055565b6065546000906001600160a01b031661079b5760405162461bcd60e51b815260206004820152602160248201527f5269736b2066756e643a20496e76616c696420706f6f6c2072656769737472796044820152601760f91b6064820152608401610281565b60655460408051633623fc7d60e21b815290516001600160a01b0390921691600091839163d88ff1f49160048082019286929091908290030181865afa1580156107e9573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610811919081019061184b565b9050600061081e826108f8565b949350505050565b61082e610ba7565b6108386000610c01565b565b610842610ba7565b600081116108625760405162461bcd60e51b81526004016102819061177a565b606755565b61086f610ba7565b6001600160a01b0381166108d65760405162461bcd60e51b815260206004820152602860248201527f5269736b2046756e643a20506f6f6c2072656769737472792061646472657373604482015267081a5b9d985b1a5960c21b6064820152608401610281565b606580546001600160a01b0319166001600160a01b0392909216919091179055565b60008060005b8351811015610a905760006001600160a01b031684828151811061092457610924611997565b6020026020010151604001516001600160a01b031614610a8057600084828151811061095257610952611997565b6020026020010151604001516001600160a01b031663b0772d0b6040518163ffffffff1660e01b8152600401600060405180830381865afa15801561099b573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526109c391908101906119ad565b905060005b8151811015610a7d5760008684815181106109e5576109e5611997565b60200260200101516040015190506000838381518110610a0757610a07611997565b602002602001015190506000610a1d8284610c53565b6001600160a01b0384166000908152606c6020526040902054909150610a44908290611a3c565b6001600160a01b0384166000908152606c6020526040902055610a678188611a3c565b965050505080610a7690611a54565b90506109c8565b50505b610a8981611a54565b90506108fe565b5092915050565b610a9f610ba7565b6001600160a01b038116610b045760405162461bcd60e51b815260206004820152602660248201527f4f776e61626c653a206e6577206f776e657220697320746865207a65726f206160448201526564647265737360d01b6064820152608401610281565b610b0d81610c01565b50565b600054610100900460ff16610b375760405162461bcd60e51b815260040161028190611a6d565b610838611025565b6040516001600160a01b038316602482015260448101829052610ba290849063a9059cbb60e01b906064015b60408051601f198184030181529190526020810180516001600160e01b03166001600160e01b031990931692909217909152611055565b505050565b6033546001600160a01b031633146108385760405162461bcd60e51b815260206004820181905260248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e65726044820152606401610281565b603380546001600160a01b038381166001600160a01b0319831681179093556040519116919082907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a35050565b6000806000846001600160a01b0316636f307dc36040518163ffffffff1660e01b8152600401602060405180830381865afa158015610c96573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610cba9190611ab8565b6040516370a0823160e01b81523060048201529091506000906001600160a01b038316906370a0823190602401602060405180830381865afa158015610d04573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610d289190611ad5565b9050846001600160a01b0316637dc0d1d06040518163ffffffff1660e01b8152600401602060405180830381865afa158015610d68573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610d8c9190611ab8565b6040516396e85ced60e01b81526001600160a01b03888116600483015291909116906396e85ced90602401600060405180830381600087803b158015610dd157600080fd5b505af1158015610de5573d6000803e3d6000fd5b505050506000856001600160a01b0316637dc0d1d06040518163ffffffff1660e01b8152600401602060405180830381865afa158015610e29573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610e4d9190611ab8565b60405163fc57d4df60e01b81526001600160a01b038981166004830152919091169063fc57d4df90602401602060405180830381865afa158015610e95573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610eb99190611ad5565b9050811561101a5760408051602081019091528181526000610edb8285611127565b90506067548110611017576040805160028082526060820183526000926020830190803683370190505090508581600081518110610f1b57610f1b611997565b6001600160a01b039283166020918202929092010152606954825191169082906001908110610f4c57610f4c611997565b6001600160a01b039283166020918202929092010152606654610f749188811691168761113f565b6066546068546040516338ed173960e01b81526000926001600160a01b0316916338ed173991610fae918a91879030904290600401611aee565b6000604051808303816000875af1158015610fcd573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610ff59190810190611b5f565b90508060018151811061100a5761100a611997565b6020026020010151975050505b50505b509195945050505050565b600054610100900460ff1661104c5760405162461bcd60e51b815260040161028190611a6d565b61083833610c01565b60006110aa826040518060400160405280602081526020017f5361666545524332303a206c6f772d6c6576656c2063616c6c206661696c6564815250856001600160a01b03166112549092919063ffffffff16565b805190915015610ba257808060200190518101906110c891906117c1565b610ba25760405162461bcd60e51b815260206004820152602a60248201527f5361666545524332303a204552433230206f7065726174696f6e20646964206e6044820152691bdd081cdd58d8d9595960b21b6064820152608401610281565b600080611134848461126d565b905061081e8161129e565b8015806111b95750604051636eb1769f60e11b81523060048201526001600160a01b03838116602483015284169063dd62ed3e90604401602060405180830381865afa158015611193573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906111b79190611ad5565b155b6112245760405162461bcd60e51b815260206004820152603660248201527f5361666545524332303a20617070726f76652066726f6d206e6f6e2d7a65726f60448201527520746f206e6f6e2d7a65726f20616c6c6f77616e636560501b6064820152608401610281565b6040516001600160a01b038316602482015260448101829052610ba290849063095ea7b360e01b90606401610b6b565b606061126384846000856112bc565b90505b9392505050565b60408051602081019091526000815260405180602001604052806112958560000151856113ed565b90529392505050565b80516000906112b690670de0b6b3a764000090611be5565b92915050565b60608247101561131d5760405162461bcd60e51b815260206004820152602660248201527f416464726573733a20696e73756666696369656e742062616c616e636520666f6044820152651c8818d85b1b60d21b6064820152608401610281565b6001600160a01b0385163b6113745760405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e74726163740000006044820152606401610281565b600080866001600160a01b031685876040516113909190611c07565b60006040518083038185875af1925050503d80600081146113cd576040519150601f19603f3d011682016040523d82523d6000602084013e6113d2565b606091505b50915091506113e28282866113f9565b979650505050505050565b60006112668284611c23565b60608315611408575081611266565b8251156114185782518084602001fd5b8160405162461bcd60e51b81526004016102819190611c42565b6001600160a01b0381168114610b0d57600080fd5b803561145281611432565b919050565b600080600080600060a0868803121561146f57600080fd5b853561147a81611432565b94506020860135935060408601359250606086013561149881611432565b915060808601356114a881611432565b809150509295509295909350565b600080604083850312156114c957600080fd5b82356114d481611432565b946020939093013593505050565b6000602082840312156114f457600080fd5b5035919050565b60006020828403121561150d57600080fd5b813561126681611432565b634e487b7160e01b600052604160045260246000fd5b60405160a0810167ffffffffffffffff8111828210171561155157611551611518565b60405290565b604051601f8201601f1916810167ffffffffffffffff8111828210171561158057611580611518565b604052919050565b600067ffffffffffffffff8211156115a2576115a2611518565b5060051b60200190565b600067ffffffffffffffff8211156115c6576115c6611518565b50601f01601f191660200190565b600060208083850312156115e757600080fd5b823567ffffffffffffffff808211156115ff57600080fd5b818501915085601f83011261161357600080fd5b813561162661162182611588565b611557565b81815260059190911b8301840190848101908883111561164557600080fd5b8585015b838110156117265780358581111561166057600080fd5b860160a0818c03601f190112156116775760008081fd5b61167f61152e565b88820135878111156116915760008081fd5b8201603f81018d136116a35760008081fd5b8981013560406116b5611621836115ac565b8281528f828486010111156116ca5760008081fd5b828285018e83013760008184018e015284526116e7858201611447565b8c850152606092506116fa838601611447565b90840152506080838101359183019190915260a090920135918101919091528352918601918601611649565b5098975050505050505050565b60208082526027908201527f5269736b2046756e643a2050616e63616b6520737761702061646472657373206040820152661a5b9d985b1a5960ca1b606082015260800190565b60208082526027908201527f5269736b2046756e643a20496e76616c6964206d696e20616d6f757420746f2060408201526618dbdb9d995c9d60ca1b606082015260800190565b6000602082840312156117d357600080fd5b8151801515811461126657600080fd5b634e487b7160e01b600052601160045260246000fd5b60008282101561180b5761180b6117e3565b500390565b60005b8381101561182b578181015183820152602001611813565b8381111561183a576000848401525b50505050565b805161145281611432565b6000602080838503121561185e57600080fd5b825167ffffffffffffffff8082111561187657600080fd5b818501915085601f83011261188a57600080fd5b815161189861162182611588565b81815260059190911b830184019084810190888311156118b757600080fd5b8585015b83811015611726578051858111156118d257600080fd5b860160a0818c03601f190112156118e95760008081fd5b6118f161152e565b88820151878111156119035760008081fd5b8201603f81018d136119155760008081fd5b898101516040611927611621836115ac565b8281528f8284860101111561193c5760008081fd5b61194b838e8301848701611810565b8452611958858201611840565b8c8501526060925061196b838601611840565b90840152506080838101519183019190915260a0909201519181019190915283529186019186016118bb565b634e487b7160e01b600052603260045260246000fd5b600060208083850312156119c057600080fd5b825167ffffffffffffffff8111156119d757600080fd5b8301601f810185136119e857600080fd5b80516119f661162182611588565b81815260059190911b82018301908381019087831115611a1557600080fd5b928401925b828410156113e2578351611a2d81611432565b82529284019290840190611a1a565b60008219821115611a4f57611a4f6117e3565b500190565b600060018201611a6657611a666117e3565b5060010190565b6020808252602b908201527f496e697469616c697a61626c653a20636f6e7472616374206973206e6f74206960408201526a6e697469616c697a696e6760a81b606082015260800190565b600060208284031215611aca57600080fd5b815161126681611432565b600060208284031215611ae757600080fd5b5051919050565b600060a082018783526020878185015260a0604085015281875180845260c086019150828901935060005b81811015611b3e5784516001600160a01b031683529383019391830191600101611b19565b50506001600160a01b03969096166060850152505050608001529392505050565b60006020808385031215611b7257600080fd5b825167ffffffffffffffff811115611b8957600080fd5b8301601f81018513611b9a57600080fd5b8051611ba861162182611588565b81815260059190911b82018301908381019087831115611bc757600080fd5b928401925b828410156113e257835182529284019290840190611bcc565b600082611c0257634e487b7160e01b600052601260045260246000fd5b500490565b60008251611c19818460208701611810565b9190910192915050565b6000816000190483118215151615611c3d57611c3d6117e3565b500290565b6020815260008251806020840152611c61816040850160208701611810565b601f01601f1916919091016040019291505056fea264697066735822122008f66af9ecb30a4ede7a30f1ee6fe555b34cd2b5c015c6f15796c97d8e0376e564736f6c634300080d0033",
273
+ "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100cf5760003560e01c80635bfc52ad1161008c5780637b77cd6a116100665780637b77cd6a146101945780638da5cb5b146101a7578063ea6a76c1146101c2578063f2fde38b146101d557600080fd5b80635bfc52ad14610171578063715018a614610179578063746460a91461018157600080fd5b806303b54d52146100d45780630a9837c5146100e95780631496e0bf1461010f5780632c6ea6681461012257806331d8e4551461014b5780634dd9584a1461015e575b600080fd5b6100e76100e2366004611457565b6101e8565b005b6100fc6100f73660046114b6565b6103e6565b6040519081526020015b60405180910390f35b6100e761011d3660046114e2565b610645565b6100fc6101303660046114fb565b6001600160a01b03166000908152606c602052604090205490565b6100e76101593660046114fb565b610652565b6100e761016c3660046114fb565b6106e6565b6100fc610736565b6100e7610826565b6100e761018f3660046114e2565b61083a565b6100e76101a23660046114fb565b610867565b6033546040516001600160a01b039091168152602001610106565b6100fc6101d03660046115d4565b6108f8565b6100e76101e33660046114fb565b610a97565b600054610100900460ff16158080156102085750600054600160ff909116105b806102225750303b158015610222575060005460ff166001145b61028a5760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b60648201526084015b60405180910390fd5b6000805460ff1916600117905580156102ad576000805461ff0019166101001790555b6001600160a01b0386166102d35760405162461bcd60e51b815260040161028190611733565b6001600160a01b0383166103295760405162461bcd60e51b815260206004820152601f60248201527f5269736b2046756e643a2042555344206164647265737320696e76616c6964006044820152606401610281565b600084116103495760405162461bcd60e51b81526004016102819061177a565b610351610b10565b606680546001600160a01b038089166001600160a01b0319928316179092556068879055606786905560698054868416908316179055606b80549285169290911691909117905580156103de576000805461ff0019169055604051600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15b505050505050565b606b54604080516318c5e8ab60e01b81523360048201526024810191909152602a60448201527f7472616e7366657252657365727665466f7241756374696f6e2875696e743235606482015269362c75696e743235362960b01b608482015260009182916001600160a01b03909116906318c5e8ab9060a401602060405180830381865afa15801561047c573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104a091906117c1565b9050806105045760405162461bcd60e51b815260206004820152602c60248201527f5269736b2066756e643a204e6f7420617574686f72697a656420746f2074726160448201526b3739b332b910333ab732399760a11b6064820152608401610281565b606a546001600160a01b03166105715760405162461bcd60e51b815260206004820152602c60248201527f5269736b2046756e643a2041756374696f6e20636f6e747261637420696e766160448201526b3634b21030b2323932b9b99760a11b6064820152608401610281565b6001600160a01b0384166000908152606c60205260409020548311156105e75760405162461bcd60e51b815260206004820152602560248201527f5269736b2046756e643a20496e73756666696369656e7420706f6f6c2072657360448201526432b93b329760d91b6064820152608401610281565b6001600160a01b0384166000908152606c602052604090205461060b9084906117f9565b6001600160a01b038086166000908152606c6020526040902091909155606a5460695461063d92908116911685610b3f565b509092915050565b61064d610ba7565b606855565b61065a610ba7565b6001600160a01b0381166106c45760405162461bcd60e51b815260206004820152602b60248201527f5269736b2046756e643a2041756374696f6e20636f6e7472616374206164647260448201526a195cdcc81a5b9d985b1a5960aa1b6064820152608401610281565b606a80546001600160a01b0319166001600160a01b0392909216919091179055565b6106ee610ba7565b6001600160a01b0381166107145760405162461bcd60e51b815260040161028190611733565b606680546001600160a01b0319166001600160a01b0392909216919091179055565b6065546000906001600160a01b031661079b5760405162461bcd60e51b815260206004820152602160248201527f5269736b2066756e643a20496e76616c696420706f6f6c2072656769737472796044820152601760f91b6064820152608401610281565b60655460408051633623fc7d60e21b815290516001600160a01b0390921691600091839163d88ff1f49160048082019286929091908290030181865afa1580156107e9573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610811919081019061184b565b9050600061081e826108f8565b949350505050565b61082e610ba7565b6108386000610c01565b565b610842610ba7565b600081116108625760405162461bcd60e51b81526004016102819061177a565b606755565b61086f610ba7565b6001600160a01b0381166108d65760405162461bcd60e51b815260206004820152602860248201527f5269736b2046756e643a20506f6f6c2072656769737472792061646472657373604482015267081a5b9d985b1a5960c21b6064820152608401610281565b606580546001600160a01b0319166001600160a01b0392909216919091179055565b60008060005b8351811015610a905760006001600160a01b031684828151811061092457610924611997565b6020026020010151604001516001600160a01b031614610a8057600084828151811061095257610952611997565b6020026020010151604001516001600160a01b031663b0772d0b6040518163ffffffff1660e01b8152600401600060405180830381865afa15801561099b573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526109c391908101906119ad565b905060005b8151811015610a7d5760008684815181106109e5576109e5611997565b60200260200101516040015190506000838381518110610a0757610a07611997565b602002602001015190506000610a1d8284610c53565b6001600160a01b0384166000908152606c6020526040902054909150610a44908290611a3c565b6001600160a01b0384166000908152606c6020526040902055610a678188611a3c565b965050505080610a7690611a54565b90506109c8565b50505b610a8981611a54565b90506108fe565b5092915050565b610a9f610ba7565b6001600160a01b038116610b045760405162461bcd60e51b815260206004820152602660248201527f4f776e61626c653a206e6577206f776e657220697320746865207a65726f206160448201526564647265737360d01b6064820152608401610281565b610b0d81610c01565b50565b600054610100900460ff16610b375760405162461bcd60e51b815260040161028190611a6d565b610838611025565b6040516001600160a01b038316602482015260448101829052610ba290849063a9059cbb60e01b906064015b60408051601f198184030181529190526020810180516001600160e01b03166001600160e01b031990931692909217909152611055565b505050565b6033546001600160a01b031633146108385760405162461bcd60e51b815260206004820181905260248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e65726044820152606401610281565b603380546001600160a01b038381166001600160a01b0319831681179093556040519116919082907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a35050565b6000806000846001600160a01b0316636f307dc36040518163ffffffff1660e01b8152600401602060405180830381865afa158015610c96573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610cba9190611ab8565b6040516370a0823160e01b81523060048201529091506000906001600160a01b038316906370a0823190602401602060405180830381865afa158015610d04573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610d289190611ad5565b9050846001600160a01b0316637dc0d1d06040518163ffffffff1660e01b8152600401602060405180830381865afa158015610d68573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610d8c9190611ab8565b6040516396e85ced60e01b81526001600160a01b03888116600483015291909116906396e85ced90602401600060405180830381600087803b158015610dd157600080fd5b505af1158015610de5573d6000803e3d6000fd5b505050506000856001600160a01b0316637dc0d1d06040518163ffffffff1660e01b8152600401602060405180830381865afa158015610e29573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610e4d9190611ab8565b60405163fc57d4df60e01b81526001600160a01b038981166004830152919091169063fc57d4df90602401602060405180830381865afa158015610e95573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610eb99190611ad5565b9050811561101a5760408051602081019091528181526000610edb8285611127565b90506067548110611017576040805160028082526060820183526000926020830190803683370190505090508581600081518110610f1b57610f1b611997565b6001600160a01b039283166020918202929092010152606954825191169082906001908110610f4c57610f4c611997565b6001600160a01b039283166020918202929092010152606654610f749188811691168761113f565b6066546068546040516338ed173960e01b81526000926001600160a01b0316916338ed173991610fae918a91879030904290600401611aee565b6000604051808303816000875af1158015610fcd573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610ff59190810190611b5f565b90508060018151811061100a5761100a611997565b6020026020010151975050505b50505b509195945050505050565b600054610100900460ff1661104c5760405162461bcd60e51b815260040161028190611a6d565b61083833610c01565b60006110aa826040518060400160405280602081526020017f5361666545524332303a206c6f772d6c6576656c2063616c6c206661696c6564815250856001600160a01b03166112549092919063ffffffff16565b805190915015610ba257808060200190518101906110c891906117c1565b610ba25760405162461bcd60e51b815260206004820152602a60248201527f5361666545524332303a204552433230206f7065726174696f6e20646964206e6044820152691bdd081cdd58d8d9595960b21b6064820152608401610281565b600080611134848461126d565b905061081e8161129e565b8015806111b95750604051636eb1769f60e11b81523060048201526001600160a01b03838116602483015284169063dd62ed3e90604401602060405180830381865afa158015611193573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906111b79190611ad5565b155b6112245760405162461bcd60e51b815260206004820152603660248201527f5361666545524332303a20617070726f76652066726f6d206e6f6e2d7a65726f60448201527520746f206e6f6e2d7a65726f20616c6c6f77616e636560501b6064820152608401610281565b6040516001600160a01b038316602482015260448101829052610ba290849063095ea7b360e01b90606401610b6b565b606061126384846000856112bc565b90505b9392505050565b60408051602081019091526000815260405180602001604052806112958560000151856113ed565b90529392505050565b80516000906112b690670de0b6b3a764000090611be5565b92915050565b60608247101561131d5760405162461bcd60e51b815260206004820152602660248201527f416464726573733a20696e73756666696369656e742062616c616e636520666f6044820152651c8818d85b1b60d21b6064820152608401610281565b6001600160a01b0385163b6113745760405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e74726163740000006044820152606401610281565b600080866001600160a01b031685876040516113909190611c07565b60006040518083038185875af1925050503d80600081146113cd576040519150601f19603f3d011682016040523d82523d6000602084013e6113d2565b606091505b50915091506113e28282866113f9565b979650505050505050565b60006112668284611c23565b60608315611408575081611266565b8251156114185782518084602001fd5b8160405162461bcd60e51b81526004016102819190611c42565b6001600160a01b0381168114610b0d57600080fd5b803561145281611432565b919050565b600080600080600060a0868803121561146f57600080fd5b853561147a81611432565b94506020860135935060408601359250606086013561149881611432565b915060808601356114a881611432565b809150509295509295909350565b600080604083850312156114c957600080fd5b82356114d481611432565b946020939093013593505050565b6000602082840312156114f457600080fd5b5035919050565b60006020828403121561150d57600080fd5b813561126681611432565b634e487b7160e01b600052604160045260246000fd5b60405160a0810167ffffffffffffffff8111828210171561155157611551611518565b60405290565b604051601f8201601f1916810167ffffffffffffffff8111828210171561158057611580611518565b604052919050565b600067ffffffffffffffff8211156115a2576115a2611518565b5060051b60200190565b600067ffffffffffffffff8211156115c6576115c6611518565b50601f01601f191660200190565b600060208083850312156115e757600080fd5b823567ffffffffffffffff808211156115ff57600080fd5b818501915085601f83011261161357600080fd5b813561162661162182611588565b611557565b81815260059190911b8301840190848101908883111561164557600080fd5b8585015b838110156117265780358581111561166057600080fd5b860160a0818c03601f190112156116775760008081fd5b61167f61152e565b88820135878111156116915760008081fd5b8201603f81018d136116a35760008081fd5b8981013560406116b5611621836115ac565b8281528f828486010111156116ca5760008081fd5b828285018e83013760008184018e015284526116e7858201611447565b8c850152606092506116fa838601611447565b90840152506080838101359183019190915260a090920135918101919091528352918601918601611649565b5098975050505050505050565b60208082526027908201527f5269736b2046756e643a2050616e63616b6520737761702061646472657373206040820152661a5b9d985b1a5960ca1b606082015260800190565b60208082526027908201527f5269736b2046756e643a20496e76616c6964206d696e20616d6f757420746f2060408201526618dbdb9d995c9d60ca1b606082015260800190565b6000602082840312156117d357600080fd5b8151801515811461126657600080fd5b634e487b7160e01b600052601160045260246000fd5b60008282101561180b5761180b6117e3565b500390565b60005b8381101561182b578181015183820152602001611813565b8381111561183a576000848401525b50505050565b805161145281611432565b6000602080838503121561185e57600080fd5b825167ffffffffffffffff8082111561187657600080fd5b818501915085601f83011261188a57600080fd5b815161189861162182611588565b81815260059190911b830184019084810190888311156118b757600080fd5b8585015b83811015611726578051858111156118d257600080fd5b860160a0818c03601f190112156118e95760008081fd5b6118f161152e565b88820151878111156119035760008081fd5b8201603f81018d136119155760008081fd5b898101516040611927611621836115ac565b8281528f8284860101111561193c5760008081fd5b61194b838e8301848701611810565b8452611958858201611840565b8c8501526060925061196b838601611840565b90840152506080838101519183019190915260a0909201519181019190915283529186019186016118bb565b634e487b7160e01b600052603260045260246000fd5b600060208083850312156119c057600080fd5b825167ffffffffffffffff8111156119d757600080fd5b8301601f810185136119e857600080fd5b80516119f661162182611588565b81815260059190911b82018301908381019087831115611a1557600080fd5b928401925b828410156113e2578351611a2d81611432565b82529284019290840190611a1a565b60008219821115611a4f57611a4f6117e3565b500190565b600060018201611a6657611a666117e3565b5060010190565b6020808252602b908201527f496e697469616c697a61626c653a20636f6e7472616374206973206e6f74206960408201526a6e697469616c697a696e6760a81b606082015260800190565b600060208284031215611aca57600080fd5b815161126681611432565b600060208284031215611ae757600080fd5b5051919050565b600060a082018783526020878185015260a0604085015281875180845260c086019150828901935060005b81811015611b3e5784516001600160a01b031683529383019391830191600101611b19565b50506001600160a01b03969096166060850152505050608001529392505050565b60006020808385031215611b7257600080fd5b825167ffffffffffffffff811115611b8957600080fd5b8301601f81018513611b9a57600080fd5b8051611ba861162182611588565b81815260059190911b82018301908381019087831115611bc757600080fd5b928401925b828410156113e257835182529284019290840190611bcc565b600082611c0257634e487b7160e01b600052601260045260246000fd5b500490565b60008251611c19818460208701611810565b9190910192915050565b6000816000190483118215151615611c3d57611c3d6117e3565b500290565b6020815260008251806020840152611c61816040850160208701611810565b601f01601f1916919091016040019291505056fea264697066735822122008f66af9ecb30a4ede7a30f1ee6fe555b34cd2b5c015c6f15796c97d8e0376e564736f6c634300080d0033",
279
274
  "linkReferences": {},
280
275
  "deployedLinkReferences": {}
281
276
  }
package/contracts/Lens/PoolLens.sol CHANGED
@@ -67,7 +67,6 @@ contract PoolLens is ExponentialNoError {
67
67
 
68
68
  PoolRegistryInterface poolRegistryInterface = PoolRegistryInterface(poolRegistryAddress);
69
69
 
70
- //get PoolMetada via lookup on comptrollerAddress to poolId and then poolId to poolMetadata
71
70
  PoolRegistry.VenusPoolMetaData memory venusPoolMetaData = poolRegistryInterface.getVenusPoolMetadata(venusPool.comptroller);
72
71
 
73
72
  ComptrollerViewInterface comptrollerViewInstance = ComptrollerViewInterface(venusPool.comptroller);
package/contracts/Pool/PoolRegistry.sol CHANGED
@@ -61,7 +61,6 @@ contract PoolRegistry is OwnableUpgradeable {
61
61
  * @dev Struct for a Venus interest rate pool.
62
62
  */
63
63
  struct VenusPool {
64
- uint256 poolId;
65
64
  string name;
66
65
  address creator;
67
66
  address comptroller;
@@ -190,7 +189,6 @@ contract PoolRegistry is OwnableUpgradeable {
190
189
  _numberOfPools++;
191
190
 
192
191
  VenusPool memory pool = VenusPool(
193
- _numberOfPools,
194
192
  name,
195
193
  msg.sender,
196
194
  comptroller,
package/deploy/003-deploy-pools.js CHANGED
@@ -5,7 +5,7 @@ const utils_1 = require("../helpers/utils");
5
5
  const func = async function (hre) {
6
6
  const { deployments, getNamedAccounts } = hre;
7
7
  const { deploy } = deployments;
8
- const { deployer } = await getNamedAccounts();
8
+ const { deployer, acc1 } = await getNamedAccounts();
9
9
  //=======================
10
10
  // DEPLOY MOCK TOKENS
11
11
  //========================
@@ -53,7 +53,7 @@ const func = async function (hre) {
53
53
  tx = await poolRegistry.createRegistryPool("Pool 1", Pool1Comptroller.address, closeFactor, liquidationIncentive, priceOracle.address);
54
54
  await tx.wait();
55
55
  const pools = await poolRegistry.callStatic.getAllPools();
56
- await hardhat_1.ethers.getContractAt("Comptroller", pools[0].comptroller);
56
+ const comptroller1Proxy = await hardhat_1.ethers.getContractAt("Comptroller", pools[0].comptroller);
57
57
  const unitroller = await hardhat_1.ethers.getContractAt("Unitroller", pools[0].comptroller);
58
58
  tx = await unitroller._acceptAdmin();
59
59
  await tx.wait();
@@ -61,7 +61,7 @@ const func = async function (hre) {
61
61
  const tokenImplementation = await VBep20Immutable.deploy();
62
62
  await tokenImplementation.deployed();
63
63
  tx = await poolRegistry.addMarket({
64
- poolId: 1,
64
+ comptroller: comptroller1Proxy.address,
65
65
  asset: wBTC.address,
66
66
  decimals: 8,
67
67
  name: 'Venus WBTC',
@@ -74,12 +74,12 @@ const func = async function (hre) {
74
74
  collateralFactor: (0, utils_1.convertToUnit)(0.7, 18),
75
75
  liquidationThreshold: (0, utils_1.convertToUnit)(0.7, 18),
76
76
  accessControlManager: accessControlManager.address,
77
- vTokenProxyAdmin: deployer,
77
+ vTokenProxyAdmin: acc1,
78
78
  tokenImplementation_: tokenImplementation.address,
79
79
  });
80
80
  await tx.wait();
81
81
  tx = await poolRegistry.addMarket({
82
- poolId: 1,
82
+ comptroller: comptroller1Proxy.address,
83
83
  asset: DAI.address,
84
84
  decimals: 18,
85
85
  name: "Compound DAI",
@@ -92,7 +92,7 @@ const func = async function (hre) {
92
92
  collateralFactor: (0, utils_1.convertToUnit)(0.7, 18),
93
93
  liquidationThreshold: (0, utils_1.convertToUnit)(0.7, 18),
94
94
  accessControlManager: accessControlManager.address,
95
- vTokenProxyAdmin: deployer,
95
+ vTokenProxyAdmin: acc1,
96
96
  tokenImplementation_: tokenImplementation.address,
97
97
  });
98
98
  await tx.wait();
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@venusprotocol/isolated-pools",
3
- "version": "0.0.7",
3
+ "version": "0.0.9",
4
4
  "description": "",
5
5
  "files": [
6
6
  "artifacts",
@@ -17,7 +17,7 @@
17
17
  "hardhat:coverage": "hardhat coverage",
18
18
  "lint:sol": "solhint --max-warnings 0 \"contracts/**/*.sol\"",
19
19
  "lint:sol:fix": "prettier --write \"contracts/**/*.sol\"",
20
- "build": "rm -rf dist && tsc --declaration && hardhat compile && cp -r ./{package.json,yarn.lock,artifacts,networks,contracts,deployments} dist/",
20
+ "build": "rm -rf dist && tsc --declaration && hardhat compile && cp -r ./{package.json,yarn.lock,artifacts,networks,contracts,deployments,copy_contracts.sh} dist/",
21
21
  "publish:dist": "yarn build && yarn publish dist -f --access public",
22
22
  "postinstall": "./copy_contracts.sh"
23
23
  },