diff --git a/artifacts/contracts/DataTypes.sol/DataTypes.dbg.json b/artifacts/contracts/DataTypes.sol/DataTypes.dbg.json index 910c92b..8274933 100644 --- a/artifacts/contracts/DataTypes.sol/DataTypes.dbg.json +++ b/artifacts/contracts/DataTypes.sol/DataTypes.dbg.json @@ -1,4 +1,4 @@ { "_format": "hh-sol-dbg-1", - "buildInfo": "../../build-info/ce60783a904758b510bc61bc47947601.json" + "buildInfo": "../../build-info/8b1c16bb48b706a49fa1987390ca36fd.json" } diff --git a/artifacts/contracts/EventAndErrors.sol/EventAndErrors.dbg.json b/artifacts/contracts/EventAndErrors.sol/EventAndErrors.dbg.json index 2bd7854..8274933 100644 --- a/artifacts/contracts/EventAndErrors.sol/EventAndErrors.dbg.json +++ b/artifacts/contracts/EventAndErrors.sol/EventAndErrors.dbg.json @@ -1,4 +1,4 @@ { "_format": "hh-sol-dbg-1", - "buildInfo": "../../build-info/4a0f142c7439e90ed9431fa5c0d6c0c6.json" + "buildInfo": "../../build-info/8b1c16bb48b706a49fa1987390ca36fd.json" } diff --git a/artifacts/contracts/Reputation.sol/Reputation.dbg.json b/artifacts/contracts/Reputation.sol/Reputation.dbg.json index 2fd74a9..8274933 100644 --- a/artifacts/contracts/Reputation.sol/Reputation.dbg.json +++ b/artifacts/contracts/Reputation.sol/Reputation.dbg.json @@ -1,4 +1,4 @@ { "_format": "hh-sol-dbg-1", - "buildInfo": "../../build-info/ba59382ab04b2124c4bb550173fdda55.json" + "buildInfo": "../../build-info/8b1c16bb48b706a49fa1987390ca36fd.json" } diff --git a/artifacts/contracts/lib/auth/Owned.sol/Owned.dbg.json b/artifacts/contracts/lib/auth/Owned.sol/Owned.dbg.json index 3bdc17c..0ff5a8a 100644 --- a/artifacts/contracts/lib/auth/Owned.sol/Owned.dbg.json +++ b/artifacts/contracts/lib/auth/Owned.sol/Owned.dbg.json @@ -1,4 +1,4 @@ { "_format": "hh-sol-dbg-1", - "buildInfo": "../../../../build-info/ce60783a904758b510bc61bc47947601.json" + "buildInfo": "../../../../build-info/8b1c16bb48b706a49fa1987390ca36fd.json" } diff --git a/artifacts/contracts/lib/interfaces/IReputation.sol/IReputation.dbg.json b/artifacts/contracts/lib/interfaces/IReputation.sol/IReputation.dbg.json index 3bdc17c..0ff5a8a 100644 --- a/artifacts/contracts/lib/interfaces/IReputation.sol/IReputation.dbg.json +++ b/artifacts/contracts/lib/interfaces/IReputation.sol/IReputation.dbg.json @@ -1,4 +1,4 @@ { "_format": "hh-sol-dbg-1", - "buildInfo": "../../../../build-info/ce60783a904758b510bc61bc47947601.json" + "buildInfo": "../../../../build-info/8b1c16bb48b706a49fa1987390ca36fd.json" } diff --git a/artifacts/contracts/lib/mock/mockToken.sol/MockToken.dbg.json b/artifacts/contracts/lib/mock/mockToken.sol/MockToken.dbg.json index 9130955..0ff5a8a 100644 --- a/artifacts/contracts/lib/mock/mockToken.sol/MockToken.dbg.json +++ b/artifacts/contracts/lib/mock/mockToken.sol/MockToken.dbg.json @@ -1,4 +1,4 @@ { "_format": "hh-sol-dbg-1", - "buildInfo": "../../../../build-info/e5d5971d8e129f0e49fa041ef3572fed.json" + "buildInfo": "../../../../build-info/8b1c16bb48b706a49fa1987390ca36fd.json" } diff --git a/artifacts/contracts/lib/tokens/ERC20.sol/ERC20.dbg.json b/artifacts/contracts/lib/tokens/ERC20.sol/ERC20.dbg.json index 3bdc17c..0ff5a8a 100644 --- a/artifacts/contracts/lib/tokens/ERC20.sol/ERC20.dbg.json +++ b/artifacts/contracts/lib/tokens/ERC20.sol/ERC20.dbg.json @@ -1,4 +1,4 @@ { "_format": "hh-sol-dbg-1", - "buildInfo": "../../../../build-info/ce60783a904758b510bc61bc47947601.json" + "buildInfo": "../../../../build-info/8b1c16bb48b706a49fa1987390ca36fd.json" } diff --git a/artifacts/contracts/lib/utils/Counters.sol/Counters.dbg.json b/artifacts/contracts/lib/utils/Counters.sol/Counters.dbg.json index 3bdc17c..0ff5a8a 100644 --- a/artifacts/contracts/lib/utils/Counters.sol/Counters.dbg.json +++ b/artifacts/contracts/lib/utils/Counters.sol/Counters.dbg.json @@ -1,4 +1,4 @@ { "_format": "hh-sol-dbg-1", - "buildInfo": "../../../../build-info/ce60783a904758b510bc61bc47947601.json" + "buildInfo": "../../../../build-info/8b1c16bb48b706a49fa1987390ca36fd.json" } diff --git a/artifacts/contracts/lib/utils/MerkleProofLib.sol/MerkleProofLib.dbg.json b/artifacts/contracts/lib/utils/MerkleProofLib.sol/MerkleProofLib.dbg.json index 3bdc17c..0ff5a8a 100644 --- a/artifacts/contracts/lib/utils/MerkleProofLib.sol/MerkleProofLib.dbg.json +++ b/artifacts/contracts/lib/utils/MerkleProofLib.sol/MerkleProofLib.dbg.json @@ -1,4 +1,4 @@ { "_format": "hh-sol-dbg-1", - "buildInfo": "../../../../build-info/ce60783a904758b510bc61bc47947601.json" + "buildInfo": "../../../../build-info/8b1c16bb48b706a49fa1987390ca36fd.json" } diff --git a/artifacts/contracts/lib/utils/ReentrancyGuard.sol/ReentrancyGuard.dbg.json b/artifacts/contracts/lib/utils/ReentrancyGuard.sol/ReentrancyGuard.dbg.json index 3bdc17c..0ff5a8a 100644 --- a/artifacts/contracts/lib/utils/ReentrancyGuard.sol/ReentrancyGuard.dbg.json +++ b/artifacts/contracts/lib/utils/ReentrancyGuard.sol/ReentrancyGuard.dbg.json @@ -1,4 +1,4 @@ { "_format": "hh-sol-dbg-1", - "buildInfo": "../../../../build-info/ce60783a904758b510bc61bc47947601.json" + "buildInfo": "../../../../build-info/8b1c16bb48b706a49fa1987390ca36fd.json" } diff --git a/artifacts/contracts/lib/utils/SafeTransferLib.sol/SafeTransferLib.dbg.json b/artifacts/contracts/lib/utils/SafeTransferLib.sol/SafeTransferLib.dbg.json index 3bdc17c..0ff5a8a 100644 --- a/artifacts/contracts/lib/utils/SafeTransferLib.sol/SafeTransferLib.dbg.json +++ b/artifacts/contracts/lib/utils/SafeTransferLib.sol/SafeTransferLib.dbg.json @@ -1,4 +1,4 @@ { "_format": "hh-sol-dbg-1", - "buildInfo": "../../../../build-info/ce60783a904758b510bc61bc47947601.json" + "buildInfo": "../../../../build-info/8b1c16bb48b706a49fa1987390ca36fd.json" } diff --git a/artifacts/contracts/p2pix.sol/P2PIX.dbg.json b/artifacts/contracts/p2pix.sol/P2PIX.dbg.json index 2bd7854..a27cfb1 100644 --- a/artifacts/contracts/p2pix.sol/P2PIX.dbg.json +++ b/artifacts/contracts/p2pix.sol/P2PIX.dbg.json @@ -1,4 +1,4 @@ { "_format": "hh-sol-dbg-1", - "buildInfo": "../../build-info/4a0f142c7439e90ed9431fa5c0d6c0c6.json" + "buildInfo": "../../build-info/43c90b4df62900d52ce9b2809e9d7089.json" } diff --git a/artifacts/contracts/p2pix.sol/P2PIX.json b/artifacts/contracts/p2pix.sol/P2PIX.json index 8838dde..6e1ec8e 100644 --- a/artifacts/contracts/p2pix.sol/P2PIX.json +++ b/artifacts/contracts/p2pix.sol/P2PIX.json @@ -873,8 +873,8 @@ "type": "receive" } ], - "bytecode": "0x608060405260018055604051620027e1380380620027e18339810160408190526200002a916200049d565b600080546001600160a01b031916339081178255604051909182917f8292fce18fa69edf4db7b94ea2e58241df0ae57f97e0a6c9b29067028bf92d76908290a3506200007685620000a3565b620000818362000133565b6200008c84620001bd565b620000988282620002a1565b505050505062000620565b6000546001600160a01b03163314620000f25760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064015b60405180910390fd5b806004557f70fa43ca70216ad905ade86b9e650a691b2ce5a01980d0a81bdd8324141b8511816040516200012891815260200190565b60405180910390a150565b6000546001600160a01b031633146200017e5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401620000e9565b60028190556040516001600160a01b03821681527fe127cf589a3879da0156d4a24f43b44f65cfa3570de594806b0bfa2fcf06884f9060200162000128565b6000546001600160a01b03163314620002085760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401620000e9565b80516000905b808210156200026e57600062000246848481518110620002325762000232620005bb565b60200260200101516200038760201b60201c565b6000908152600660205260409020805460ff191660019081179091559290920191506200020e565b50507f14a422d2412784a5749d03da98921fe468c98577b767851389a9f58ea5a363d781604051620001289190620005d1565b6000546001600160a01b03163314620002ec5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401620000e9565b815180620003025763df9578836000526004601cfd5b81518114620003195763ff633a386000526004601cfd5b60208301602083016020830282015b8083146200037f578251600052600b60205260406000208251815550815183517f5d6e86e5341d57a92c49934296c51542a25015c9b1782a1c2722a940131c3d9a600080a360208301925060208201915062000328565b505050505050565b600c1b611000600160ac1b031690565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b0381118282101715620003d857620003d862000397565b604052919050565b60006001600160401b03821115620003fc57620003fc62000397565b5060051b60200190565b6001600160a01b03811681146200041c57600080fd5b50565b600082601f8301126200043157600080fd5b815160206200044a6200044483620003e0565b620003ad565b82815260059290921b840181019181810190868411156200046a57600080fd5b8286015b8481101562000492578051620004848162000406565b83529183019183016200046e565b509695505050505050565b600080600080600060a08688031215620004b657600080fd5b8551602080880151919650906001600160401b0380821115620004d857600080fd5b620004e68a838b016200041f565b965060408901519150620004fa8262000406565b6060890151919550808211156200051057600080fd5b6200051e8a838b016200041f565b945060808901519150808211156200053557600080fd5b508701601f810189136200054857600080fd5b8051620005596200044482620003e0565b81815260059190911b8201830190838101908b8311156200057957600080fd5b928401925b82841015620005a95783518015158114620005995760008081fd5b825292840192908401906200057e565b80955050505050509295509295909350565b634e487b7160e01b600052603260045260246000fd5b6020808252825182820181905260009190848201906040850190845b81811015620006145783516001600160a01b031683529284019291840191600101620005ed565b50909695505050505050565b6121b180620006306000396000f3fe60806040526004361061018f5760003560e01c806377cd38a4116100d65780638e2a3d361161007f578063c52164c611610059578063c52164c614610539578063d6e8b97314610559578063f7d0e04b1461057957600080fd5b80638e2a3d36146104c25780639872dbfe146104f357806398a268711461050957600080fd5b80638652b37e116100b05780638652b37e1461044a5780638da5cb5b1461046a5780638e2749d6146104a257600080fd5b806377cd38a4146103dd5780637f94f65d1461040a5780638642b5c31461042a57600080fd5b806336317972116101385780635fd8c710116101125780635fd8c7101461036857806369cc6af41461037d57806372fada5c146103bd57600080fd5b806336317972146102fd5780634b2ae9801461031d578063574983c81461034857600080fd5b806316d722401161016957806316d722401461021d57806329cc7d10146102c65780632dfdf0b5146102e657600080fd5b8063049373201461019b5780630d2a2d44146101db57806313af4035146101fd57600080fd5b3661019657005b600080fd5b3480156101a757600080fd5b506101c86101b6366004611aad565b60056020526000908152604090205481565b6040519081526020015b60405180910390f35b3480156101e757600080fd5b506101fb6101f6366004611bba565b610599565b005b34801561020957600080fd5b506101fb610218366004611bf7565b61068a565b34801561022957600080fd5b50610282610238366004611aad565b600860205260009081526040902080546001820154600283015460038401546004850154600586015460069096015494959394929391926001600160a01b03918216928216911687565b6040805197885260208801969096529486019390935260608501919091526001600160a01b03908116608085015290811660a08401521660c082015260e0016101d2565b3480156102d257600080fd5b506101c86102e1366004611c14565b61072b565b3480156102f257600080fd5b506003546101c89081565b34801561030957600080fd5b506101fb610318366004611cf1565b610916565b34801561032957600080fd5b506101c8610338366004611bf7565b600c1b611000600160ac1b031690565b34801561035457600080fd5b506101fb610363366004611aad565b6109d6565b34801561037457600080fd5b506101fb610a54565b34801561038957600080fd5b506103ad610398366004611bf7565b600b6020526000908152604090205460ff1681565b60405190151581526020016101d2565b3480156103c957600080fd5b506101fb6103d8366004611aad565b610ade565b3480156103e957600080fd5b506101c86103f8366004611aad565b600a6020526000908152604090205481565b34801561041657600080fd5b506101fb610425366004611d3d565b610b66565b34801561043657600080fd5b506101fb610445366004611d69565b610bf9565b34801561045657600080fd5b506101c8610465366004611dcd565b610fc7565b34801561047657600080fd5b5060005461048a906001600160a01b031681565b6040516001600160a01b0390911681526020016101d2565b3480156104ae57600080fd5b506101fb6104bd366004611e81565b611176565b3480156104ce57600080fd5b506104e26104dd366004611aad565b6112ce565b6040516101d2959493929190611ec3565b3480156104ff57600080fd5b506101c860045481565b34801561051557600080fd5b506103ad610524366004611aad565b60066020526000908152604090205460ff1681565b34801561054557600080fd5b5060025461048a906001600160a01b031681565b34801561056557600080fd5b506101fb610574366004611f50565b611398565b34801561058557600080fd5b506101fb610594366004611bf7565b611470565b6000546001600160a01b031633146105e75760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064015b60405180910390fd5b80516000905b8082101561064e57600061062784848151811061060c5761060c61201a565b6020026020010151611000600160ac1b03600c9190911b1690565b6000908152600660205260409020805460ff191660019081179091559290920191506105ed565b50507f14a422d2412784a5749d03da98921fe468c98577b767851389a9f58ea5a363d78160405161067f9190612030565b60405180910390a150565b6000546001600160a01b031633146106d35760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064016105de565b6000805473ffffffffffffffffffffffffffffffffffffffff19166001600160a01b0383169081178255604051909133917f8292fce18fa69edf4db7b94ea2e58241df0ae57f97e0a6c9b29067028bf92d769190a350565b6001600160a01b0385166000908152600b6020526040812054869060ff1661076657604051630abc194760e11b815260040160405180910390fd5b61076e6114f7565b915060006040518060a0016040528088815260200187878080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152505050908252503360208201526001600160a01b038a166040820152600160609091015290506107e3611547565b83156107f3576107f33385610b66565b6000838152600760209081526040909120825181558183015180518493610821926001850192910190611a14565b5060408201516002820180546001600160a01b0392831673ffffffffffffffffffffffffffffffffffffffff199091161790556060830151600392830180546080909501511515600160a01b027fffffffffffffffffffffff0000000000000000000000000000000000000000009095169190921617929092179091556108ab9080546001019055565b6108b78233308a611572565b6108c060018055565b604080518481526001600160a01b038a16602082015290810188905233907f25ac57b911b0f66b64c294827f539545fbc3ddd002cafab117776274f3241e4c9060600160405180910390a2505095945050505050565b61091e611547565b61092783611609565b6109318282611176565b60008381526007602052604090206003810154600160a01b900460ff161515600114156109615761096184610ade565b600381015481546000835560028301546001600160a01b039283169261098a9184911683611646565b604080518781526020810183905233917f7719804546c0185709e60c90d164447ff251a5ba29af0216faa921350f6bebf7910160405180910390a25050506109d160018055565b505050565b6000546001600160a01b03163314610a1f5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064016105de565b806004557f70fa43ca70216ad905ade86b9e650a691b2ce5a01980d0a81bdd8324141b85118160405161067f91815260200190565b6000546001600160a01b03163314610a9d5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064016105de565b47610aa833826116d2565b60408051338152602081018390527feaff4b37086828766ad3268786972c0cd24259d4c87a80f9d3963a3c3d999b0d910161067f565b610ae781611609565b6000818152600760209081526040918290206003810180547fffffffffffffffffffffff00ffffffffffffffffffffffffffffffffffffffff1690556002015491518381526001600160a01b03909216917fb4d98b272597e828d9b172c0d44390d5b267040e918088eac8a0a0fadcb81c70910160405180910390a250565b6001600160a01b038216331415610be057611000600160ac1b03600c83901b166000908152600a602090815260409182902083905581516001600160a01b038516815290810183905281517f0b294da292f26e55fd442b5c0164fbb9013036ff00c5cfdde0efd01c1baaf632929181900390910190a15050565b6040516342e8fb9360e11b815260040160405180910390fd5b610c01611547565b6000868152600860205260409020600381015443101580610c2457506002810154155b15610c42576040516331da482760e11b815260040160405180910390fd5b8054600090815260076020908152604080832060028501549151909392610c7292600186019290918b91016120b8565b604051602081830303815290604052805190602001209050600081604051602001610cc991907f19457468657265756d205369676e6564204d6573736167653a0a3332000000008152601c810191909152603c0190565b60408051601f1981840301815291815281516020928301206000858152600990935291205490915060ff16151560011415610d1757604051637a48537560e11b815260040160405180910390fd5b6040805160008082526020820180845284905260ff8816928201929092526060810189905260808101889052610d8b9060019060a0016020604051602081039080840390855afa158015610d6f573d6000803e3d6000fd5b5050604051601f190151600c1b611000600160ac1b0316919050565b60008181526006602052604090205490915060ff16610dbd57604051632057875960e21b815260040160405180910390fd5b6003840154600186015460028701546001600160a01b0390921691600091610de491612175565b60006002890181905560038901819055868152600960205260409020805460ff191660011790556006880154909150336001600160a01b0390911614610e9f576001870154611000600160ac1b0333600c1b1660009081526005602052604081208054909190610e5590849061218c565b909155505060028701546006880154600590600090600c1b611000600160ac1b031681526020019081526020016000206000828254610e94919061218c565b90915550610ee59050565b86600201548760010154610eb3919061218c565b611000600160ac1b0333600c1b1660009081526005602052604081208054909190610edf90849061218c565b90915550505b6004870154610eff9083906001600160a01b031683611646565b600187015415610f6b5760058701546001600160a01b038d8116911614610f5c576005870154600180890154610f449285926001600160a01b0390911691901c611646565b610f57828d60018a60010154901c611646565b610f6b565b610f6b828d8960010154611646565b60048701546040518e81526001600160a01b03909116907f5e420822d2f7281fdc4b763c62c8b7874bf22108a35efe93144d79296aacc67d9060200160405180910390a250505050505050610fbf60018055565b505050505050565b6000610fd1611547565b610fdb8383611176565b60008a81526007602052604090206003810154600160a01b900460ff1661101557604051635972996f60e11b815260040160405180910390fd5b8054871115611037576040516308aeed0f60e21b815260040160405180910390fd5b6110428b888c61172d565b915060006040518060e001604052808d81526020018a815260200189815260200160045443611071919061218c565b81526001600160a01b03808e1660208301528c16604082015233606090910152905085156110da576002820154600c1b611000600160ac1b03166000908152600a60205260409020546110c89088908890336117b1565b6110d38382846117e3565b5050611160565b60648160400151116110f1576110d38382846117e3565b611000600160ac1b0333600c1b1660009081526005602052604081205490611118826118e1565b905080836040015111806111325750620f42408360400151115b1561115057604051630e0c7c2360e11b815260040160405180910390fd5b61115b8584866117e3565b505050505b61116960018055565b9998505050505050505050565b6000815b808210156112b25760006008600086868681811061119a5761119a61201a565b90506020020135815260200190815260200160002090506111ba8161199d565b60028101548154600090815260076020526040812080549091906111df90849061218c565b90915550506000600282018190556006820154600c1b611000600160ac1b031660008181526005602052604090205490915060011c6064811161123357600082815260056020526040902060649055611245565b60008281526005602052604090208190555b60048301546001600160a01b03167f67e089478e21dd12c98e69331c4152f6c9b2038b91e0f28268ffa01558c0b4ff8888888181106112865761128661201a565b9050602002013560405161129c91815260200190565b60405180910390a284600101945050505061117a565b808210156112c85763dfb035c96000526004601cfd5b50505050565b600760205260009081526040902080546001820180549192916112f09061207d565b80601f016020809104026020016040519081016040528092919081815260200182805461131c9061207d565b80156113695780601f1061133e57610100808354040283529160200191611369565b820191906000526020600020905b81548152906001019060200180831161134c57829003601f168201915b50505050600283015460039093015491926001600160a01b03908116929081169150600160a01b900460ff1685565b6000546001600160a01b031633146113e15760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064016105de565b8151806113f65763df9578836000526004601cfd5b8151811461140c5763ff633a386000526004601cfd5b60208301602083016020830282015b808314610fbf578251600052600b60205260406000208251815550815183517f5d6e86e5341d57a92c49934296c51542a25015c9b1782a1c2722a940131c3d9a600080a360208301925060208201915061141b565b6000546001600160a01b031633146114b95760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064016105de565b60028190556040516001600160a01b03821681527fe127cf589a3879da0156d4a24f43b44f65cfa3570de594806b0bfa2fcf06884f9060200161067f565b600061150260035490565b600081815260076020526040902060030154909150600160a01b900460ff161515600114156115445760405163c44bd76560e01b815260040160405180910390fd5b90565b6001546002141561156b5760405163558a1e0360e11b815260040160405180910390fd5b6002600155565b60006040516323b872dd60e01b6000528460045283602452826044526020600060646000808a5af13d15601f3d11600160005114161716915060006060528060405250806116025760405162461bcd60e51b815260206004820152601460248201527f5452414e534645525f46524f4d5f4641494c454400000000000000000000000060448201526064016105de565b5050505050565b6000818152600760205260409020600201546001600160a01b03163314611643576040516342e8fb9360e11b815260040160405180910390fd5b50565b600060405163a9059cbb60e01b6000528360045282602452602060006044600080895af13d15601f3d11600160005114161716915060006060528060405250806112c85760405162461bcd60e51b815260206004820152600f60248201527f5452414e534645525f4641494c4544000000000000000000000000000000000060448201526064016105de565b600080600080600085875af19050806109d15760405162461bcd60e51b815260206004820152601360248201527f4554485f5452414e534645525f4641494c45440000000000000000000000000060448201526064016105de565b6040805160208101859052908101839052606082811b6bffffffffffffffffffffffff191690820152600090607401604051602081830303815290604052805190602001209050436008600083815260200190815260200160002060030154106117aa5760405163d0404f8560e01b815260040160405180910390fd5b9392505050565b6117c68484846001600160a01b0385166119d0565b6112c857604051631dc23a5f60e11b815260040160405180910390fd5b600083815260086020908152604080832085518155918501516001830155840151600282018190556060850151600383015560808501516004830180546001600160a01b0392831673ffffffffffffffffffffffffffffffffffffffff199182161790915560a087015160058501805491841691831691909117905560c08701516006909401805494909216931692909217909155825490918391611889908490612175565b9091555050608082015182516040808501518151928352602083015285926001600160a01b0316917f2a28b2ae47b0bd4b104e7cd29b1dfa72846af8c4cfdc009da2ae29db68cb67ea910160405180910390a3505050565b600080634d2b179160e01b836040516024016118ff91815260200190565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050509050600080600060206000855160208701600254617530fa92503d91506000519050809450826119945763e10bf1cc6000526004601cfd5b50505050919050565b4381600301541015806119b257506002810154155b156116435760405163d0404f8560e01b815260040160405180910390fd5b60008315611a0c578360051b8501855b803580851160051b94855260209485185260406000209301818110611a0457611a09565b6119e0565b50505b501492915050565b828054611a209061207d565b90600052602060002090601f016020900481019282611a425760008555611a88565b82601f10611a5b57805160ff1916838001178555611a88565b82800160010185558215611a88579182015b82811115611a88578251825591602001919060010190611a6d565b50611a94929150611a98565b5090565b5b80821115611a945760008155600101611a99565b600060208284031215611abf57600080fd5b5035919050565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f1916810167ffffffffffffffff81118282101715611b0557611b05611ac6565b604052919050565b600067ffffffffffffffff821115611b2757611b27611ac6565b5060051b60200190565b6001600160a01b038116811461164357600080fd5b600082601f830112611b5757600080fd5b81356020611b6c611b6783611b0d565b611adc565b82815260059290921b84018101918181019086841115611b8b57600080fd5b8286015b84811015611baf578035611ba281611b31565b8352918301918301611b8f565b509695505050505050565b600060208284031215611bcc57600080fd5b813567ffffffffffffffff811115611be357600080fd5b611bef84828501611b46565b949350505050565b600060208284031215611c0957600080fd5b81356117aa81611b31565b600080600080600060808688031215611c2c57600080fd5b8535611c3781611b31565b945060208601359350604086013567ffffffffffffffff80821115611c5b57600080fd5b818801915088601f830112611c6f57600080fd5b813581811115611c7e57600080fd5b896020828501011115611c9057600080fd5b96999598505060200195606001359392505050565b60008083601f840112611cb757600080fd5b50813567ffffffffffffffff811115611ccf57600080fd5b6020830191508360208260051b8501011115611cea57600080fd5b9250929050565b600080600060408486031215611d0657600080fd5b83359250602084013567ffffffffffffffff811115611d2457600080fd5b611d3086828701611ca5565b9497909650939450505050565b60008060408385031215611d5057600080fd5b8235611d5b81611b31565b946020939093013593505050565b60008060008060008060c08789031215611d8257600080fd5b863595506020870135611d9481611b31565b945060408701359350606087013592506080870135915060a087013560ff81168114611dbf57600080fd5b809150509295509295509295565b600080600080600080600080600060e08a8c031215611deb57600080fd5b8935985060208a0135611dfd81611b31565b975060408a0135611e0d81611b31565b965060608a0135955060808a0135945060a08a013567ffffffffffffffff80821115611e3857600080fd5b611e448d838e01611ca5565b909650945060c08c0135915080821115611e5d57600080fd5b50611e6a8c828d01611ca5565b915080935050809150509295985092959850929598565b60008060208385031215611e9457600080fd5b823567ffffffffffffffff811115611eab57600080fd5b611eb785828601611ca5565b90969095509350505050565b8581526000602060a08184015286518060a085015260005b81811015611ef75788810183015185820160c001528201611edb565b81811115611f0957600060c083870101525b50601f01601f1916830160c0019150611f2f905060408301866001600160a01b03169052565b6001600160a01b038416606083015282151560808301529695505050505050565b60008060408385031215611f6357600080fd5b823567ffffffffffffffff80821115611f7b57600080fd5b611f8786838701611b46565b9350602091508185013581811115611f9e57600080fd5b85019050601f81018613611fb157600080fd5b8035611fbf611b6782611b0d565b81815260059190911b82018301908381019088831115611fde57600080fd5b928401925b8284101561200b5783358015158114611ffc5760008081fd5b82529284019290840190611fe3565b80955050505050509250929050565b634e487b7160e01b600052603260045260246000fd5b6020808252825182820181905260009190848201906040850190845b818110156120715783516001600160a01b03168352928401929184019160010161204c565b50909695505050505050565b600181811c9082168061209157607f821691505b602082108114156120b257634e487b7160e01b600052602260045260246000fd5b50919050565b600080855481600182811c9150808316806120d457607f831692505b60208084108214156120f457634e487b7160e01b86526022600452602486fd5b818015612108576001811461211957612146565b60ff19861689528489019650612146565b60008c81526020902060005b8681101561213e5781548b820152908501908301612125565b505084890196505b5098855250505050938401929092525050604001919050565b634e487b7160e01b600052601160045260246000fd5b6000828210156121875761218761215f565b500390565b6000821982111561219f5761219f61215f565b50019056fea164736f6c6343000809000a", - "deployedBytecode": "0x60806040526004361061018f5760003560e01c806377cd38a4116100d65780638e2a3d361161007f578063c52164c611610059578063c52164c614610539578063d6e8b97314610559578063f7d0e04b1461057957600080fd5b80638e2a3d36146104c25780639872dbfe146104f357806398a268711461050957600080fd5b80638652b37e116100b05780638652b37e1461044a5780638da5cb5b1461046a5780638e2749d6146104a257600080fd5b806377cd38a4146103dd5780637f94f65d1461040a5780638642b5c31461042a57600080fd5b806336317972116101385780635fd8c710116101125780635fd8c7101461036857806369cc6af41461037d57806372fada5c146103bd57600080fd5b806336317972146102fd5780634b2ae9801461031d578063574983c81461034857600080fd5b806316d722401161016957806316d722401461021d57806329cc7d10146102c65780632dfdf0b5146102e657600080fd5b8063049373201461019b5780630d2a2d44146101db57806313af4035146101fd57600080fd5b3661019657005b600080fd5b3480156101a757600080fd5b506101c86101b6366004611aad565b60056020526000908152604090205481565b6040519081526020015b60405180910390f35b3480156101e757600080fd5b506101fb6101f6366004611bba565b610599565b005b34801561020957600080fd5b506101fb610218366004611bf7565b61068a565b34801561022957600080fd5b50610282610238366004611aad565b600860205260009081526040902080546001820154600283015460038401546004850154600586015460069096015494959394929391926001600160a01b03918216928216911687565b6040805197885260208801969096529486019390935260608501919091526001600160a01b03908116608085015290811660a08401521660c082015260e0016101d2565b3480156102d257600080fd5b506101c86102e1366004611c14565b61072b565b3480156102f257600080fd5b506003546101c89081565b34801561030957600080fd5b506101fb610318366004611cf1565b610916565b34801561032957600080fd5b506101c8610338366004611bf7565b600c1b611000600160ac1b031690565b34801561035457600080fd5b506101fb610363366004611aad565b6109d6565b34801561037457600080fd5b506101fb610a54565b34801561038957600080fd5b506103ad610398366004611bf7565b600b6020526000908152604090205460ff1681565b60405190151581526020016101d2565b3480156103c957600080fd5b506101fb6103d8366004611aad565b610ade565b3480156103e957600080fd5b506101c86103f8366004611aad565b600a6020526000908152604090205481565b34801561041657600080fd5b506101fb610425366004611d3d565b610b66565b34801561043657600080fd5b506101fb610445366004611d69565b610bf9565b34801561045657600080fd5b506101c8610465366004611dcd565b610fc7565b34801561047657600080fd5b5060005461048a906001600160a01b031681565b6040516001600160a01b0390911681526020016101d2565b3480156104ae57600080fd5b506101fb6104bd366004611e81565b611176565b3480156104ce57600080fd5b506104e26104dd366004611aad565b6112ce565b6040516101d2959493929190611ec3565b3480156104ff57600080fd5b506101c860045481565b34801561051557600080fd5b506103ad610524366004611aad565b60066020526000908152604090205460ff1681565b34801561054557600080fd5b5060025461048a906001600160a01b031681565b34801561056557600080fd5b506101fb610574366004611f50565b611398565b34801561058557600080fd5b506101fb610594366004611bf7565b611470565b6000546001600160a01b031633146105e75760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064015b60405180910390fd5b80516000905b8082101561064e57600061062784848151811061060c5761060c61201a565b6020026020010151611000600160ac1b03600c9190911b1690565b6000908152600660205260409020805460ff191660019081179091559290920191506105ed565b50507f14a422d2412784a5749d03da98921fe468c98577b767851389a9f58ea5a363d78160405161067f9190612030565b60405180910390a150565b6000546001600160a01b031633146106d35760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064016105de565b6000805473ffffffffffffffffffffffffffffffffffffffff19166001600160a01b0383169081178255604051909133917f8292fce18fa69edf4db7b94ea2e58241df0ae57f97e0a6c9b29067028bf92d769190a350565b6001600160a01b0385166000908152600b6020526040812054869060ff1661076657604051630abc194760e11b815260040160405180910390fd5b61076e6114f7565b915060006040518060a0016040528088815260200187878080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152505050908252503360208201526001600160a01b038a166040820152600160609091015290506107e3611547565b83156107f3576107f33385610b66565b6000838152600760209081526040909120825181558183015180518493610821926001850192910190611a14565b5060408201516002820180546001600160a01b0392831673ffffffffffffffffffffffffffffffffffffffff199091161790556060830151600392830180546080909501511515600160a01b027fffffffffffffffffffffff0000000000000000000000000000000000000000009095169190921617929092179091556108ab9080546001019055565b6108b78233308a611572565b6108c060018055565b604080518481526001600160a01b038a16602082015290810188905233907f25ac57b911b0f66b64c294827f539545fbc3ddd002cafab117776274f3241e4c9060600160405180910390a2505095945050505050565b61091e611547565b61092783611609565b6109318282611176565b60008381526007602052604090206003810154600160a01b900460ff161515600114156109615761096184610ade565b600381015481546000835560028301546001600160a01b039283169261098a9184911683611646565b604080518781526020810183905233917f7719804546c0185709e60c90d164447ff251a5ba29af0216faa921350f6bebf7910160405180910390a25050506109d160018055565b505050565b6000546001600160a01b03163314610a1f5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064016105de565b806004557f70fa43ca70216ad905ade86b9e650a691b2ce5a01980d0a81bdd8324141b85118160405161067f91815260200190565b6000546001600160a01b03163314610a9d5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064016105de565b47610aa833826116d2565b60408051338152602081018390527feaff4b37086828766ad3268786972c0cd24259d4c87a80f9d3963a3c3d999b0d910161067f565b610ae781611609565b6000818152600760209081526040918290206003810180547fffffffffffffffffffffff00ffffffffffffffffffffffffffffffffffffffff1690556002015491518381526001600160a01b03909216917fb4d98b272597e828d9b172c0d44390d5b267040e918088eac8a0a0fadcb81c70910160405180910390a250565b6001600160a01b038216331415610be057611000600160ac1b03600c83901b166000908152600a602090815260409182902083905581516001600160a01b038516815290810183905281517f0b294da292f26e55fd442b5c0164fbb9013036ff00c5cfdde0efd01c1baaf632929181900390910190a15050565b6040516342e8fb9360e11b815260040160405180910390fd5b610c01611547565b6000868152600860205260409020600381015443101580610c2457506002810154155b15610c42576040516331da482760e11b815260040160405180910390fd5b8054600090815260076020908152604080832060028501549151909392610c7292600186019290918b91016120b8565b604051602081830303815290604052805190602001209050600081604051602001610cc991907f19457468657265756d205369676e6564204d6573736167653a0a3332000000008152601c810191909152603c0190565b60408051601f1981840301815291815281516020928301206000858152600990935291205490915060ff16151560011415610d1757604051637a48537560e11b815260040160405180910390fd5b6040805160008082526020820180845284905260ff8816928201929092526060810189905260808101889052610d8b9060019060a0016020604051602081039080840390855afa158015610d6f573d6000803e3d6000fd5b5050604051601f190151600c1b611000600160ac1b0316919050565b60008181526006602052604090205490915060ff16610dbd57604051632057875960e21b815260040160405180910390fd5b6003840154600186015460028701546001600160a01b0390921691600091610de491612175565b60006002890181905560038901819055868152600960205260409020805460ff191660011790556006880154909150336001600160a01b0390911614610e9f576001870154611000600160ac1b0333600c1b1660009081526005602052604081208054909190610e5590849061218c565b909155505060028701546006880154600590600090600c1b611000600160ac1b031681526020019081526020016000206000828254610e94919061218c565b90915550610ee59050565b86600201548760010154610eb3919061218c565b611000600160ac1b0333600c1b1660009081526005602052604081208054909190610edf90849061218c565b90915550505b6004870154610eff9083906001600160a01b031683611646565b600187015415610f6b5760058701546001600160a01b038d8116911614610f5c576005870154600180890154610f449285926001600160a01b0390911691901c611646565b610f57828d60018a60010154901c611646565b610f6b565b610f6b828d8960010154611646565b60048701546040518e81526001600160a01b03909116907f5e420822d2f7281fdc4b763c62c8b7874bf22108a35efe93144d79296aacc67d9060200160405180910390a250505050505050610fbf60018055565b505050505050565b6000610fd1611547565b610fdb8383611176565b60008a81526007602052604090206003810154600160a01b900460ff1661101557604051635972996f60e11b815260040160405180910390fd5b8054871115611037576040516308aeed0f60e21b815260040160405180910390fd5b6110428b888c61172d565b915060006040518060e001604052808d81526020018a815260200189815260200160045443611071919061218c565b81526001600160a01b03808e1660208301528c16604082015233606090910152905085156110da576002820154600c1b611000600160ac1b03166000908152600a60205260409020546110c89088908890336117b1565b6110d38382846117e3565b5050611160565b60648160400151116110f1576110d38382846117e3565b611000600160ac1b0333600c1b1660009081526005602052604081205490611118826118e1565b905080836040015111806111325750620f42408360400151115b1561115057604051630e0c7c2360e11b815260040160405180910390fd5b61115b8584866117e3565b505050505b61116960018055565b9998505050505050505050565b6000815b808210156112b25760006008600086868681811061119a5761119a61201a565b90506020020135815260200190815260200160002090506111ba8161199d565b60028101548154600090815260076020526040812080549091906111df90849061218c565b90915550506000600282018190556006820154600c1b611000600160ac1b031660008181526005602052604090205490915060011c6064811161123357600082815260056020526040902060649055611245565b60008281526005602052604090208190555b60048301546001600160a01b03167f67e089478e21dd12c98e69331c4152f6c9b2038b91e0f28268ffa01558c0b4ff8888888181106112865761128661201a565b9050602002013560405161129c91815260200190565b60405180910390a284600101945050505061117a565b808210156112c85763dfb035c96000526004601cfd5b50505050565b600760205260009081526040902080546001820180549192916112f09061207d565b80601f016020809104026020016040519081016040528092919081815260200182805461131c9061207d565b80156113695780601f1061133e57610100808354040283529160200191611369565b820191906000526020600020905b81548152906001019060200180831161134c57829003601f168201915b50505050600283015460039093015491926001600160a01b03908116929081169150600160a01b900460ff1685565b6000546001600160a01b031633146113e15760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064016105de565b8151806113f65763df9578836000526004601cfd5b8151811461140c5763ff633a386000526004601cfd5b60208301602083016020830282015b808314610fbf578251600052600b60205260406000208251815550815183517f5d6e86e5341d57a92c49934296c51542a25015c9b1782a1c2722a940131c3d9a600080a360208301925060208201915061141b565b6000546001600160a01b031633146114b95760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064016105de565b60028190556040516001600160a01b03821681527fe127cf589a3879da0156d4a24f43b44f65cfa3570de594806b0bfa2fcf06884f9060200161067f565b600061150260035490565b600081815260076020526040902060030154909150600160a01b900460ff161515600114156115445760405163c44bd76560e01b815260040160405180910390fd5b90565b6001546002141561156b5760405163558a1e0360e11b815260040160405180910390fd5b6002600155565b60006040516323b872dd60e01b6000528460045283602452826044526020600060646000808a5af13d15601f3d11600160005114161716915060006060528060405250806116025760405162461bcd60e51b815260206004820152601460248201527f5452414e534645525f46524f4d5f4641494c454400000000000000000000000060448201526064016105de565b5050505050565b6000818152600760205260409020600201546001600160a01b03163314611643576040516342e8fb9360e11b815260040160405180910390fd5b50565b600060405163a9059cbb60e01b6000528360045282602452602060006044600080895af13d15601f3d11600160005114161716915060006060528060405250806112c85760405162461bcd60e51b815260206004820152600f60248201527f5452414e534645525f4641494c4544000000000000000000000000000000000060448201526064016105de565b600080600080600085875af19050806109d15760405162461bcd60e51b815260206004820152601360248201527f4554485f5452414e534645525f4641494c45440000000000000000000000000060448201526064016105de565b6040805160208101859052908101839052606082811b6bffffffffffffffffffffffff191690820152600090607401604051602081830303815290604052805190602001209050436008600083815260200190815260200160002060030154106117aa5760405163d0404f8560e01b815260040160405180910390fd5b9392505050565b6117c68484846001600160a01b0385166119d0565b6112c857604051631dc23a5f60e11b815260040160405180910390fd5b600083815260086020908152604080832085518155918501516001830155840151600282018190556060850151600383015560808501516004830180546001600160a01b0392831673ffffffffffffffffffffffffffffffffffffffff199182161790915560a087015160058501805491841691831691909117905560c08701516006909401805494909216931692909217909155825490918391611889908490612175565b9091555050608082015182516040808501518151928352602083015285926001600160a01b0316917f2a28b2ae47b0bd4b104e7cd29b1dfa72846af8c4cfdc009da2ae29db68cb67ea910160405180910390a3505050565b600080634d2b179160e01b836040516024016118ff91815260200190565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050509050600080600060206000855160208701600254617530fa92503d91506000519050809450826119945763e10bf1cc6000526004601cfd5b50505050919050565b4381600301541015806119b257506002810154155b156116435760405163d0404f8560e01b815260040160405180910390fd5b60008315611a0c578360051b8501855b803580851160051b94855260209485185260406000209301818110611a0457611a09565b6119e0565b50505b501492915050565b828054611a209061207d565b90600052602060002090601f016020900481019282611a425760008555611a88565b82601f10611a5b57805160ff1916838001178555611a88565b82800160010185558215611a88579182015b82811115611a88578251825591602001919060010190611a6d565b50611a94929150611a98565b5090565b5b80821115611a945760008155600101611a99565b600060208284031215611abf57600080fd5b5035919050565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f1916810167ffffffffffffffff81118282101715611b0557611b05611ac6565b604052919050565b600067ffffffffffffffff821115611b2757611b27611ac6565b5060051b60200190565b6001600160a01b038116811461164357600080fd5b600082601f830112611b5757600080fd5b81356020611b6c611b6783611b0d565b611adc565b82815260059290921b84018101918181019086841115611b8b57600080fd5b8286015b84811015611baf578035611ba281611b31565b8352918301918301611b8f565b509695505050505050565b600060208284031215611bcc57600080fd5b813567ffffffffffffffff811115611be357600080fd5b611bef84828501611b46565b949350505050565b600060208284031215611c0957600080fd5b81356117aa81611b31565b600080600080600060808688031215611c2c57600080fd5b8535611c3781611b31565b945060208601359350604086013567ffffffffffffffff80821115611c5b57600080fd5b818801915088601f830112611c6f57600080fd5b813581811115611c7e57600080fd5b896020828501011115611c9057600080fd5b96999598505060200195606001359392505050565b60008083601f840112611cb757600080fd5b50813567ffffffffffffffff811115611ccf57600080fd5b6020830191508360208260051b8501011115611cea57600080fd5b9250929050565b600080600060408486031215611d0657600080fd5b83359250602084013567ffffffffffffffff811115611d2457600080fd5b611d3086828701611ca5565b9497909650939450505050565b60008060408385031215611d5057600080fd5b8235611d5b81611b31565b946020939093013593505050565b60008060008060008060c08789031215611d8257600080fd5b863595506020870135611d9481611b31565b945060408701359350606087013592506080870135915060a087013560ff81168114611dbf57600080fd5b809150509295509295509295565b600080600080600080600080600060e08a8c031215611deb57600080fd5b8935985060208a0135611dfd81611b31565b975060408a0135611e0d81611b31565b965060608a0135955060808a0135945060a08a013567ffffffffffffffff80821115611e3857600080fd5b611e448d838e01611ca5565b909650945060c08c0135915080821115611e5d57600080fd5b50611e6a8c828d01611ca5565b915080935050809150509295985092959850929598565b60008060208385031215611e9457600080fd5b823567ffffffffffffffff811115611eab57600080fd5b611eb785828601611ca5565b90969095509350505050565b8581526000602060a08184015286518060a085015260005b81811015611ef75788810183015185820160c001528201611edb565b81811115611f0957600060c083870101525b50601f01601f1916830160c0019150611f2f905060408301866001600160a01b03169052565b6001600160a01b038416606083015282151560808301529695505050505050565b60008060408385031215611f6357600080fd5b823567ffffffffffffffff80821115611f7b57600080fd5b611f8786838701611b46565b9350602091508185013581811115611f9e57600080fd5b85019050601f81018613611fb157600080fd5b8035611fbf611b6782611b0d565b81815260059190911b82018301908381019088831115611fde57600080fd5b928401925b8284101561200b5783358015158114611ffc5760008081fd5b82529284019290840190611fe3565b80955050505050509250929050565b634e487b7160e01b600052603260045260246000fd5b6020808252825182820181905260009190848201906040850190845b818110156120715783516001600160a01b03168352928401929184019160010161204c565b50909695505050505050565b600181811c9082168061209157607f821691505b602082108114156120b257634e487b7160e01b600052602260045260246000fd5b50919050565b600080855481600182811c9150808316806120d457607f831692505b60208084108214156120f457634e487b7160e01b86526022600452602486fd5b818015612108576001811461211957612146565b60ff19861689528489019650612146565b60008c81526020902060005b8681101561213e5781548b820152908501908301612125565b505084890196505b5098855250505050938401929092525050604001919050565b634e487b7160e01b600052601160045260246000fd5b6000828210156121875761218761215f565b500390565b6000821982111561219f5761219f61215f565b50019056fea164736f6c6343000809000a", + "bytecode": "0x608060405260018055604051620027b5380380620027b58339810160408190526200002a916200049d565b600080546001600160a01b031916339081178255604051909182917f8292fce18fa69edf4db7b94ea2e58241df0ae57f97e0a6c9b29067028bf92d76908290a3506200007685620000a3565b620000818362000133565b6200008c84620001bd565b620000988282620002a1565b505050505062000620565b6000546001600160a01b03163314620000f25760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064015b60405180910390fd5b806004557f70fa43ca70216ad905ade86b9e650a691b2ce5a01980d0a81bdd8324141b8511816040516200012891815260200190565b60405180910390a150565b6000546001600160a01b031633146200017e5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401620000e9565b60028190556040516001600160a01b03821681527fe127cf589a3879da0156d4a24f43b44f65cfa3570de594806b0bfa2fcf06884f9060200162000128565b6000546001600160a01b03163314620002085760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401620000e9565b80516000905b808210156200026e57600062000246848481518110620002325762000232620005bb565b60200260200101516200038760201b60201c565b6000908152600660205260409020805460ff191660019081179091559290920191506200020e565b50507f14a422d2412784a5749d03da98921fe468c98577b767851389a9f58ea5a363d781604051620001289190620005d1565b6000546001600160a01b03163314620002ec5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401620000e9565b815180620003025763df9578836000526004601cfd5b81518114620003195763ff633a386000526004601cfd5b60208301602083016020830282015b8083146200037f578251600052600b60205260406000208251815550815183517f5d6e86e5341d57a92c49934296c51542a25015c9b1782a1c2722a940131c3d9a600080a360208301925060208201915062000328565b505050505050565b600c1b611000600160ac1b031690565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b0381118282101715620003d857620003d862000397565b604052919050565b60006001600160401b03821115620003fc57620003fc62000397565b5060051b60200190565b6001600160a01b03811681146200041c57600080fd5b50565b600082601f8301126200043157600080fd5b815160206200044a6200044483620003e0565b620003ad565b82815260059290921b840181019181810190868411156200046a57600080fd5b8286015b8481101562000492578051620004848162000406565b83529183019183016200046e565b509695505050505050565b600080600080600060a08688031215620004b657600080fd5b8551602080880151919650906001600160401b0380821115620004d857600080fd5b620004e68a838b016200041f565b965060408901519150620004fa8262000406565b6060890151919550808211156200051057600080fd5b6200051e8a838b016200041f565b945060808901519150808211156200053557600080fd5b508701601f810189136200054857600080fd5b8051620005596200044482620003e0565b81815260059190911b8201830190838101908b8311156200057957600080fd5b928401925b82841015620005a95783518015158114620005995760008081fd5b825292840192908401906200057e565b80955050505050509295509295909350565b634e487b7160e01b600052603260045260246000fd5b6020808252825182820181905260009190848201906040850190845b81811015620006145783516001600160a01b031683529284019291840191600101620005ed565b50909695505050505050565b61218580620006306000396000f3fe60806040526004361061018f5760003560e01c806377cd38a4116100d65780638e2a3d361161007f578063c52164c611610059578063c52164c614610539578063d6e8b97314610559578063f7d0e04b1461057957600080fd5b80638e2a3d36146104c25780639872dbfe146104f357806398a268711461050957600080fd5b80638652b37e116100b05780638652b37e1461044a5780638da5cb5b1461046a5780638e2749d6146104a257600080fd5b806377cd38a4146103dd5780637f94f65d1461040a5780638642b5c31461042a57600080fd5b806336317972116101385780635fd8c710116101125780635fd8c7101461036857806369cc6af41461037d57806372fada5c146103bd57600080fd5b806336317972146102fd5780634b2ae9801461031d578063574983c81461034857600080fd5b806316d722401161016957806316d722401461021d57806329cc7d10146102c65780632dfdf0b5146102e657600080fd5b8063049373201461019b5780630d2a2d44146101db57806313af4035146101fd57600080fd5b3661019657005b600080fd5b3480156101a757600080fd5b506101c86101b6366004611a81565b60056020526000908152604090205481565b6040519081526020015b60405180910390f35b3480156101e757600080fd5b506101fb6101f6366004611b8e565b610599565b005b34801561020957600080fd5b506101fb610218366004611bcb565b61068a565b34801561022957600080fd5b50610282610238366004611a81565b600860205260009081526040902080546001820154600283015460038401546004850154600586015460069096015494959394929391926001600160a01b03918216928216911687565b6040805197885260208801969096529486019390935260608501919091526001600160a01b03908116608085015290811660a08401521660c082015260e0016101d2565b3480156102d257600080fd5b506101c86102e1366004611be8565b61072b565b3480156102f257600080fd5b506003546101c89081565b34801561030957600080fd5b506101fb610318366004611cc5565b610916565b34801561032957600080fd5b506101c8610338366004611bcb565b600c1b611000600160ac1b031690565b34801561035457600080fd5b506101fb610363366004611a81565b6109d6565b34801561037457600080fd5b506101fb610a54565b34801561038957600080fd5b506103ad610398366004611bcb565b600b6020526000908152604090205460ff1681565b60405190151581526020016101d2565b3480156103c957600080fd5b506101fb6103d8366004611a81565b610ade565b3480156103e957600080fd5b506101c86103f8366004611a81565b600a6020526000908152604090205481565b34801561041657600080fd5b506101fb610425366004611d11565b610b66565b34801561043657600080fd5b506101fb610445366004611d3d565b610bf9565b34801561045657600080fd5b506101c8610465366004611da1565b610fc7565b34801561047657600080fd5b5060005461048a906001600160a01b031681565b6040516001600160a01b0390911681526020016101d2565b3480156104ae57600080fd5b506101fb6104bd366004611e55565b611176565b3480156104ce57600080fd5b506104e26104dd366004611a81565b6112ce565b6040516101d2959493929190611e97565b3480156104ff57600080fd5b506101c860045481565b34801561051557600080fd5b506103ad610524366004611a81565b60066020526000908152604090205460ff1681565b34801561054557600080fd5b5060025461048a906001600160a01b031681565b34801561056557600080fd5b506101fb610574366004611f24565b611398565b34801561058557600080fd5b506101fb610594366004611bcb565b611470565b6000546001600160a01b031633146105e75760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064015b60405180910390fd5b80516000905b8082101561064e57600061062784848151811061060c5761060c611fee565b6020026020010151611000600160ac1b03600c9190911b1690565b6000908152600660205260409020805460ff191660019081179091559290920191506105ed565b50507f14a422d2412784a5749d03da98921fe468c98577b767851389a9f58ea5a363d78160405161067f9190612004565b60405180910390a150565b6000546001600160a01b031633146106d35760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064016105de565b6000805473ffffffffffffffffffffffffffffffffffffffff19166001600160a01b0383169081178255604051909133917f8292fce18fa69edf4db7b94ea2e58241df0ae57f97e0a6c9b29067028bf92d769190a350565b6001600160a01b0385166000908152600b6020526040812054869060ff1661076657604051630abc194760e11b815260040160405180910390fd5b61076e6114f7565b915060006040518060a0016040528088815260200187878080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152505050908252503360208201526001600160a01b038a166040820152600160609091015290506107e3611507565b83156107f3576107f33385610b66565b60008381526007602090815260409091208251815581830151805184936108219260018501929101906119e8565b5060408201516002820180546001600160a01b0392831673ffffffffffffffffffffffffffffffffffffffff199091161790556060830151600392830180546080909501511515600160a01b027fffffffffffffffffffffff0000000000000000000000000000000000000000009095169190921617929092179091556108ab9080546001019055565b6108b78233308a611532565b6108c060018055565b604080518481526001600160a01b038a16602082015290810188905233907f25ac57b911b0f66b64c294827f539545fbc3ddd002cafab117776274f3241e4c9060600160405180910390a2505095945050505050565b61091e611507565b610927836115c9565b6109318282611176565b60008381526007602052604090206003810154600160a01b900460ff161515600114156109615761096184610ade565b600381015481546000835560028301546001600160a01b039283169261098a9184911683611606565b604080518781526020810183905233917f7719804546c0185709e60c90d164447ff251a5ba29af0216faa921350f6bebf7910160405180910390a25050506109d160018055565b505050565b6000546001600160a01b03163314610a1f5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064016105de565b806004557f70fa43ca70216ad905ade86b9e650a691b2ce5a01980d0a81bdd8324141b85118160405161067f91815260200190565b6000546001600160a01b03163314610a9d5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064016105de565b47610aa83382611692565b60408051338152602081018390527feaff4b37086828766ad3268786972c0cd24259d4c87a80f9d3963a3c3d999b0d910161067f565b610ae7816115c9565b6000818152600760209081526040918290206003810180547fffffffffffffffffffffff00ffffffffffffffffffffffffffffffffffffffff1690556002015491518381526001600160a01b03909216917fb4d98b272597e828d9b172c0d44390d5b267040e918088eac8a0a0fadcb81c70910160405180910390a250565b6001600160a01b038216331415610be057611000600160ac1b03600c83901b166000908152600a602090815260409182902083905581516001600160a01b038516815290810183905281517f0b294da292f26e55fd442b5c0164fbb9013036ff00c5cfdde0efd01c1baaf632929181900390910190a15050565b6040516342e8fb9360e11b815260040160405180910390fd5b610c01611507565b6000868152600860205260409020600381015443101580610c2457506002810154155b15610c42576040516331da482760e11b815260040160405180910390fd5b8054600090815260076020908152604080832060028501549151909392610c7292600186019290918b910161208c565b604051602081830303815290604052805190602001209050600081604051602001610cc991907f19457468657265756d205369676e6564204d6573736167653a0a3332000000008152601c810191909152603c0190565b60408051601f1981840301815291815281516020928301206000858152600990935291205490915060ff16151560011415610d1757604051637a48537560e11b815260040160405180910390fd5b6040805160008082526020820180845284905260ff8816928201929092526060810189905260808101889052610d8b9060019060a0016020604051602081039080840390855afa158015610d6f573d6000803e3d6000fd5b5050604051601f190151600c1b611000600160ac1b0316919050565b60008181526006602052604090205490915060ff16610dbd57604051632057875960e21b815260040160405180910390fd5b6003840154600186015460028701546001600160a01b0390921691600091610de491612149565b60006002890181905560038901819055868152600960205260409020805460ff191660011790556006880154909150336001600160a01b0390911614610e9f576001870154611000600160ac1b0333600c1b1660009081526005602052604081208054909190610e55908490612160565b909155505060028701546006880154600590600090600c1b611000600160ac1b031681526020019081526020016000206000828254610e949190612160565b90915550610ee59050565b86600201548760010154610eb39190612160565b611000600160ac1b0333600c1b1660009081526005602052604081208054909190610edf908490612160565b90915550505b6004870154610eff9083906001600160a01b031683611606565b600187015415610f6b5760058701546001600160a01b038d8116911614610f5c576005870154600180890154610f449285926001600160a01b0390911691901c611606565b610f57828d60018a60010154901c611606565b610f6b565b610f6b828d8960010154611606565b60048701546040518e81526001600160a01b03909116907f5e420822d2f7281fdc4b763c62c8b7874bf22108a35efe93144d79296aacc67d9060200160405180910390a250505050505050610fbf60018055565b505050505050565b6000610fd1611507565b610fdb8383611176565b60008a81526007602052604090206003810154600160a01b900460ff1661101557604051635972996f60e11b815260040160405180910390fd5b8054871115611037576040516308aeed0f60e21b815260040160405180910390fd5b6110428b888c6116ed565b915060006040518060e001604052808d81526020018a8152602001898152602001600454436110719190612160565b81526001600160a01b03808e1660208301528c16604082015233606090910152905085156110da576002820154600c1b611000600160ac1b03166000908152600a60205260409020546110c8908890889033611771565b6110d38382846117a3565b5050611160565b60648160400151116110f1576110d38382846117a3565b611000600160ac1b0333600c1b1660009081526005602052604081205490611118826118a1565b905080836040015111806111325750620f42408360400151115b1561115057604051630e0c7c2360e11b815260040160405180910390fd5b61115b8584866117a3565b505050505b61116960018055565b9998505050505050505050565b6000815b808210156112b25760006008600086868681811061119a5761119a611fee565b90506020020135815260200190815260200160002090506111ba8161195d565b60028101548154600090815260076020526040812080549091906111df908490612160565b90915550506000600282018190556006820154600c1b611000600160ac1b031660008181526005602052604090205490915060011c6064811161123357600082815260056020526040902060649055611245565b60008281526005602052604090208190555b60048301546001600160a01b03167f67e089478e21dd12c98e69331c4152f6c9b2038b91e0f28268ffa01558c0b4ff88888881811061128657611286611fee565b9050602002013560405161129c91815260200190565b60405180910390a284600101945050505061117a565b808210156112c85763dfb035c96000526004601cfd5b50505050565b600760205260009081526040902080546001820180549192916112f090612051565b80601f016020809104026020016040519081016040528092919081815260200182805461131c90612051565b80156113695780601f1061133e57610100808354040283529160200191611369565b820191906000526020600020905b81548152906001019060200180831161134c57829003601f168201915b50505050600283015460039093015491926001600160a01b03908116929081169150600160a01b900460ff1685565b6000546001600160a01b031633146113e15760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064016105de565b8151806113f65763df9578836000526004601cfd5b8151811461140c5763ff633a386000526004601cfd5b60208301602083016020830282015b808314610fbf578251600052600b60205260406000208251815550815183517f5d6e86e5341d57a92c49934296c51542a25015c9b1782a1c2722a940131c3d9a600080a360208301925060208201915061141b565b6000546001600160a01b031633146114b95760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064016105de565b60028190556040516001600160a01b03821681527fe127cf589a3879da0156d4a24f43b44f65cfa3570de594806b0bfa2fcf06884f9060200161067f565b600061150260035490565b905090565b6001546002141561152b5760405163558a1e0360e11b815260040160405180910390fd5b6002600155565b60006040516323b872dd60e01b6000528460045283602452826044526020600060646000808a5af13d15601f3d11600160005114161716915060006060528060405250806115c25760405162461bcd60e51b815260206004820152601460248201527f5452414e534645525f46524f4d5f4641494c454400000000000000000000000060448201526064016105de565b5050505050565b6000818152600760205260409020600201546001600160a01b03163314611603576040516342e8fb9360e11b815260040160405180910390fd5b50565b600060405163a9059cbb60e01b6000528360045282602452602060006044600080895af13d15601f3d11600160005114161716915060006060528060405250806112c85760405162461bcd60e51b815260206004820152600f60248201527f5452414e534645525f4641494c4544000000000000000000000000000000000060448201526064016105de565b600080600080600085875af19050806109d15760405162461bcd60e51b815260206004820152601360248201527f4554485f5452414e534645525f4641494c45440000000000000000000000000060448201526064016105de565b6040805160208101859052908101839052606082811b6bffffffffffffffffffffffff1916908201526000906074016040516020818303038152906040528051906020012090504360086000838152602001908152602001600020600301541061176a5760405163d0404f8560e01b815260040160405180910390fd5b9392505050565b6117868484846001600160a01b0385166119a4565b6112c857604051631dc23a5f60e11b815260040160405180910390fd5b600083815260086020908152604080832085518155918501516001830155840151600282018190556060850151600383015560808501516004830180546001600160a01b0392831673ffffffffffffffffffffffffffffffffffffffff199182161790915560a087015160058501805491841691831691909117905560c08701516006909401805494909216931692909217909155825490918391611849908490612149565b9091555050608082015182516040808501518151928352602083015285926001600160a01b0316917f2a28b2ae47b0bd4b104e7cd29b1dfa72846af8c4cfdc009da2ae29db68cb67ea910160405180910390a3505050565b600080634d2b179160e01b836040516024016118bf91815260200190565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050509050600080600060206000855160208701600254617530fa92503d91506000519050809450826119545763e10bf1cc6000526004601cfd5b50505050919050565b43816003015411156119825760405163d0404f8560e01b815260040160405180910390fd5b6002810154611603576040516331da482760e11b815260040160405180910390fd5b600083156119e0578360051b8501855b803580851160051b948552602094851852604060002093018181106119d8576119dd565b6119b4565b50505b501492915050565b8280546119f490612051565b90600052602060002090601f016020900481019282611a165760008555611a5c565b82601f10611a2f57805160ff1916838001178555611a5c565b82800160010185558215611a5c579182015b82811115611a5c578251825591602001919060010190611a41565b50611a68929150611a6c565b5090565b5b80821115611a685760008155600101611a6d565b600060208284031215611a9357600080fd5b5035919050565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f1916810167ffffffffffffffff81118282101715611ad957611ad9611a9a565b604052919050565b600067ffffffffffffffff821115611afb57611afb611a9a565b5060051b60200190565b6001600160a01b038116811461160357600080fd5b600082601f830112611b2b57600080fd5b81356020611b40611b3b83611ae1565b611ab0565b82815260059290921b84018101918181019086841115611b5f57600080fd5b8286015b84811015611b83578035611b7681611b05565b8352918301918301611b63565b509695505050505050565b600060208284031215611ba057600080fd5b813567ffffffffffffffff811115611bb757600080fd5b611bc384828501611b1a565b949350505050565b600060208284031215611bdd57600080fd5b813561176a81611b05565b600080600080600060808688031215611c0057600080fd5b8535611c0b81611b05565b945060208601359350604086013567ffffffffffffffff80821115611c2f57600080fd5b818801915088601f830112611c4357600080fd5b813581811115611c5257600080fd5b896020828501011115611c6457600080fd5b96999598505060200195606001359392505050565b60008083601f840112611c8b57600080fd5b50813567ffffffffffffffff811115611ca357600080fd5b6020830191508360208260051b8501011115611cbe57600080fd5b9250929050565b600080600060408486031215611cda57600080fd5b83359250602084013567ffffffffffffffff811115611cf857600080fd5b611d0486828701611c79565b9497909650939450505050565b60008060408385031215611d2457600080fd5b8235611d2f81611b05565b946020939093013593505050565b60008060008060008060c08789031215611d5657600080fd5b863595506020870135611d6881611b05565b945060408701359350606087013592506080870135915060a087013560ff81168114611d9357600080fd5b809150509295509295509295565b600080600080600080600080600060e08a8c031215611dbf57600080fd5b8935985060208a0135611dd181611b05565b975060408a0135611de181611b05565b965060608a0135955060808a0135945060a08a013567ffffffffffffffff80821115611e0c57600080fd5b611e188d838e01611c79565b909650945060c08c0135915080821115611e3157600080fd5b50611e3e8c828d01611c79565b915080935050809150509295985092959850929598565b60008060208385031215611e6857600080fd5b823567ffffffffffffffff811115611e7f57600080fd5b611e8b85828601611c79565b90969095509350505050565b8581526000602060a08184015286518060a085015260005b81811015611ecb5788810183015185820160c001528201611eaf565b81811115611edd57600060c083870101525b50601f01601f1916830160c0019150611f03905060408301866001600160a01b03169052565b6001600160a01b038416606083015282151560808301529695505050505050565b60008060408385031215611f3757600080fd5b823567ffffffffffffffff80821115611f4f57600080fd5b611f5b86838701611b1a565b9350602091508185013581811115611f7257600080fd5b85019050601f81018613611f8557600080fd5b8035611f93611b3b82611ae1565b81815260059190911b82018301908381019088831115611fb257600080fd5b928401925b82841015611fdf5783358015158114611fd05760008081fd5b82529284019290840190611fb7565b80955050505050509250929050565b634e487b7160e01b600052603260045260246000fd5b6020808252825182820181905260009190848201906040850190845b818110156120455783516001600160a01b031683529284019291840191600101612020565b50909695505050505050565b600181811c9082168061206557607f821691505b6020821081141561208657634e487b7160e01b600052602260045260246000fd5b50919050565b600080855481600182811c9150808316806120a857607f831692505b60208084108214156120c857634e487b7160e01b86526022600452602486fd5b8180156120dc57600181146120ed5761211a565b60ff1986168952848901965061211a565b60008c81526020902060005b868110156121125781548b8201529085019083016120f9565b505084890196505b5098855250505050938401929092525050604001919050565b634e487b7160e01b600052601160045260246000fd5b60008282101561215b5761215b612133565b500390565b6000821982111561217357612173612133565b50019056fea164736f6c6343000809000a", + "deployedBytecode": "0x60806040526004361061018f5760003560e01c806377cd38a4116100d65780638e2a3d361161007f578063c52164c611610059578063c52164c614610539578063d6e8b97314610559578063f7d0e04b1461057957600080fd5b80638e2a3d36146104c25780639872dbfe146104f357806398a268711461050957600080fd5b80638652b37e116100b05780638652b37e1461044a5780638da5cb5b1461046a5780638e2749d6146104a257600080fd5b806377cd38a4146103dd5780637f94f65d1461040a5780638642b5c31461042a57600080fd5b806336317972116101385780635fd8c710116101125780635fd8c7101461036857806369cc6af41461037d57806372fada5c146103bd57600080fd5b806336317972146102fd5780634b2ae9801461031d578063574983c81461034857600080fd5b806316d722401161016957806316d722401461021d57806329cc7d10146102c65780632dfdf0b5146102e657600080fd5b8063049373201461019b5780630d2a2d44146101db57806313af4035146101fd57600080fd5b3661019657005b600080fd5b3480156101a757600080fd5b506101c86101b6366004611a81565b60056020526000908152604090205481565b6040519081526020015b60405180910390f35b3480156101e757600080fd5b506101fb6101f6366004611b8e565b610599565b005b34801561020957600080fd5b506101fb610218366004611bcb565b61068a565b34801561022957600080fd5b50610282610238366004611a81565b600860205260009081526040902080546001820154600283015460038401546004850154600586015460069096015494959394929391926001600160a01b03918216928216911687565b6040805197885260208801969096529486019390935260608501919091526001600160a01b03908116608085015290811660a08401521660c082015260e0016101d2565b3480156102d257600080fd5b506101c86102e1366004611be8565b61072b565b3480156102f257600080fd5b506003546101c89081565b34801561030957600080fd5b506101fb610318366004611cc5565b610916565b34801561032957600080fd5b506101c8610338366004611bcb565b600c1b611000600160ac1b031690565b34801561035457600080fd5b506101fb610363366004611a81565b6109d6565b34801561037457600080fd5b506101fb610a54565b34801561038957600080fd5b506103ad610398366004611bcb565b600b6020526000908152604090205460ff1681565b60405190151581526020016101d2565b3480156103c957600080fd5b506101fb6103d8366004611a81565b610ade565b3480156103e957600080fd5b506101c86103f8366004611a81565b600a6020526000908152604090205481565b34801561041657600080fd5b506101fb610425366004611d11565b610b66565b34801561043657600080fd5b506101fb610445366004611d3d565b610bf9565b34801561045657600080fd5b506101c8610465366004611da1565b610fc7565b34801561047657600080fd5b5060005461048a906001600160a01b031681565b6040516001600160a01b0390911681526020016101d2565b3480156104ae57600080fd5b506101fb6104bd366004611e55565b611176565b3480156104ce57600080fd5b506104e26104dd366004611a81565b6112ce565b6040516101d2959493929190611e97565b3480156104ff57600080fd5b506101c860045481565b34801561051557600080fd5b506103ad610524366004611a81565b60066020526000908152604090205460ff1681565b34801561054557600080fd5b5060025461048a906001600160a01b031681565b34801561056557600080fd5b506101fb610574366004611f24565b611398565b34801561058557600080fd5b506101fb610594366004611bcb565b611470565b6000546001600160a01b031633146105e75760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064015b60405180910390fd5b80516000905b8082101561064e57600061062784848151811061060c5761060c611fee565b6020026020010151611000600160ac1b03600c9190911b1690565b6000908152600660205260409020805460ff191660019081179091559290920191506105ed565b50507f14a422d2412784a5749d03da98921fe468c98577b767851389a9f58ea5a363d78160405161067f9190612004565b60405180910390a150565b6000546001600160a01b031633146106d35760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064016105de565b6000805473ffffffffffffffffffffffffffffffffffffffff19166001600160a01b0383169081178255604051909133917f8292fce18fa69edf4db7b94ea2e58241df0ae57f97e0a6c9b29067028bf92d769190a350565b6001600160a01b0385166000908152600b6020526040812054869060ff1661076657604051630abc194760e11b815260040160405180910390fd5b61076e6114f7565b915060006040518060a0016040528088815260200187878080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152505050908252503360208201526001600160a01b038a166040820152600160609091015290506107e3611507565b83156107f3576107f33385610b66565b60008381526007602090815260409091208251815581830151805184936108219260018501929101906119e8565b5060408201516002820180546001600160a01b0392831673ffffffffffffffffffffffffffffffffffffffff199091161790556060830151600392830180546080909501511515600160a01b027fffffffffffffffffffffff0000000000000000000000000000000000000000009095169190921617929092179091556108ab9080546001019055565b6108b78233308a611532565b6108c060018055565b604080518481526001600160a01b038a16602082015290810188905233907f25ac57b911b0f66b64c294827f539545fbc3ddd002cafab117776274f3241e4c9060600160405180910390a2505095945050505050565b61091e611507565b610927836115c9565b6109318282611176565b60008381526007602052604090206003810154600160a01b900460ff161515600114156109615761096184610ade565b600381015481546000835560028301546001600160a01b039283169261098a9184911683611606565b604080518781526020810183905233917f7719804546c0185709e60c90d164447ff251a5ba29af0216faa921350f6bebf7910160405180910390a25050506109d160018055565b505050565b6000546001600160a01b03163314610a1f5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064016105de565b806004557f70fa43ca70216ad905ade86b9e650a691b2ce5a01980d0a81bdd8324141b85118160405161067f91815260200190565b6000546001600160a01b03163314610a9d5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064016105de565b47610aa83382611692565b60408051338152602081018390527feaff4b37086828766ad3268786972c0cd24259d4c87a80f9d3963a3c3d999b0d910161067f565b610ae7816115c9565b6000818152600760209081526040918290206003810180547fffffffffffffffffffffff00ffffffffffffffffffffffffffffffffffffffff1690556002015491518381526001600160a01b03909216917fb4d98b272597e828d9b172c0d44390d5b267040e918088eac8a0a0fadcb81c70910160405180910390a250565b6001600160a01b038216331415610be057611000600160ac1b03600c83901b166000908152600a602090815260409182902083905581516001600160a01b038516815290810183905281517f0b294da292f26e55fd442b5c0164fbb9013036ff00c5cfdde0efd01c1baaf632929181900390910190a15050565b6040516342e8fb9360e11b815260040160405180910390fd5b610c01611507565b6000868152600860205260409020600381015443101580610c2457506002810154155b15610c42576040516331da482760e11b815260040160405180910390fd5b8054600090815260076020908152604080832060028501549151909392610c7292600186019290918b910161208c565b604051602081830303815290604052805190602001209050600081604051602001610cc991907f19457468657265756d205369676e6564204d6573736167653a0a3332000000008152601c810191909152603c0190565b60408051601f1981840301815291815281516020928301206000858152600990935291205490915060ff16151560011415610d1757604051637a48537560e11b815260040160405180910390fd5b6040805160008082526020820180845284905260ff8816928201929092526060810189905260808101889052610d8b9060019060a0016020604051602081039080840390855afa158015610d6f573d6000803e3d6000fd5b5050604051601f190151600c1b611000600160ac1b0316919050565b60008181526006602052604090205490915060ff16610dbd57604051632057875960e21b815260040160405180910390fd5b6003840154600186015460028701546001600160a01b0390921691600091610de491612149565b60006002890181905560038901819055868152600960205260409020805460ff191660011790556006880154909150336001600160a01b0390911614610e9f576001870154611000600160ac1b0333600c1b1660009081526005602052604081208054909190610e55908490612160565b909155505060028701546006880154600590600090600c1b611000600160ac1b031681526020019081526020016000206000828254610e949190612160565b90915550610ee59050565b86600201548760010154610eb39190612160565b611000600160ac1b0333600c1b1660009081526005602052604081208054909190610edf908490612160565b90915550505b6004870154610eff9083906001600160a01b031683611606565b600187015415610f6b5760058701546001600160a01b038d8116911614610f5c576005870154600180890154610f449285926001600160a01b0390911691901c611606565b610f57828d60018a60010154901c611606565b610f6b565b610f6b828d8960010154611606565b60048701546040518e81526001600160a01b03909116907f5e420822d2f7281fdc4b763c62c8b7874bf22108a35efe93144d79296aacc67d9060200160405180910390a250505050505050610fbf60018055565b505050505050565b6000610fd1611507565b610fdb8383611176565b60008a81526007602052604090206003810154600160a01b900460ff1661101557604051635972996f60e11b815260040160405180910390fd5b8054871115611037576040516308aeed0f60e21b815260040160405180910390fd5b6110428b888c6116ed565b915060006040518060e001604052808d81526020018a8152602001898152602001600454436110719190612160565b81526001600160a01b03808e1660208301528c16604082015233606090910152905085156110da576002820154600c1b611000600160ac1b03166000908152600a60205260409020546110c8908890889033611771565b6110d38382846117a3565b5050611160565b60648160400151116110f1576110d38382846117a3565b611000600160ac1b0333600c1b1660009081526005602052604081205490611118826118a1565b905080836040015111806111325750620f42408360400151115b1561115057604051630e0c7c2360e11b815260040160405180910390fd5b61115b8584866117a3565b505050505b61116960018055565b9998505050505050505050565b6000815b808210156112b25760006008600086868681811061119a5761119a611fee565b90506020020135815260200190815260200160002090506111ba8161195d565b60028101548154600090815260076020526040812080549091906111df908490612160565b90915550506000600282018190556006820154600c1b611000600160ac1b031660008181526005602052604090205490915060011c6064811161123357600082815260056020526040902060649055611245565b60008281526005602052604090208190555b60048301546001600160a01b03167f67e089478e21dd12c98e69331c4152f6c9b2038b91e0f28268ffa01558c0b4ff88888881811061128657611286611fee565b9050602002013560405161129c91815260200190565b60405180910390a284600101945050505061117a565b808210156112c85763dfb035c96000526004601cfd5b50505050565b600760205260009081526040902080546001820180549192916112f090612051565b80601f016020809104026020016040519081016040528092919081815260200182805461131c90612051565b80156113695780601f1061133e57610100808354040283529160200191611369565b820191906000526020600020905b81548152906001019060200180831161134c57829003601f168201915b50505050600283015460039093015491926001600160a01b03908116929081169150600160a01b900460ff1685565b6000546001600160a01b031633146113e15760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064016105de565b8151806113f65763df9578836000526004601cfd5b8151811461140c5763ff633a386000526004601cfd5b60208301602083016020830282015b808314610fbf578251600052600b60205260406000208251815550815183517f5d6e86e5341d57a92c49934296c51542a25015c9b1782a1c2722a940131c3d9a600080a360208301925060208201915061141b565b6000546001600160a01b031633146114b95760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064016105de565b60028190556040516001600160a01b03821681527fe127cf589a3879da0156d4a24f43b44f65cfa3570de594806b0bfa2fcf06884f9060200161067f565b600061150260035490565b905090565b6001546002141561152b5760405163558a1e0360e11b815260040160405180910390fd5b6002600155565b60006040516323b872dd60e01b6000528460045283602452826044526020600060646000808a5af13d15601f3d11600160005114161716915060006060528060405250806115c25760405162461bcd60e51b815260206004820152601460248201527f5452414e534645525f46524f4d5f4641494c454400000000000000000000000060448201526064016105de565b5050505050565b6000818152600760205260409020600201546001600160a01b03163314611603576040516342e8fb9360e11b815260040160405180910390fd5b50565b600060405163a9059cbb60e01b6000528360045282602452602060006044600080895af13d15601f3d11600160005114161716915060006060528060405250806112c85760405162461bcd60e51b815260206004820152600f60248201527f5452414e534645525f4641494c4544000000000000000000000000000000000060448201526064016105de565b600080600080600085875af19050806109d15760405162461bcd60e51b815260206004820152601360248201527f4554485f5452414e534645525f4641494c45440000000000000000000000000060448201526064016105de565b6040805160208101859052908101839052606082811b6bffffffffffffffffffffffff1916908201526000906074016040516020818303038152906040528051906020012090504360086000838152602001908152602001600020600301541061176a5760405163d0404f8560e01b815260040160405180910390fd5b9392505050565b6117868484846001600160a01b0385166119a4565b6112c857604051631dc23a5f60e11b815260040160405180910390fd5b600083815260086020908152604080832085518155918501516001830155840151600282018190556060850151600383015560808501516004830180546001600160a01b0392831673ffffffffffffffffffffffffffffffffffffffff199182161790915560a087015160058501805491841691831691909117905560c08701516006909401805494909216931692909217909155825490918391611849908490612149565b9091555050608082015182516040808501518151928352602083015285926001600160a01b0316917f2a28b2ae47b0bd4b104e7cd29b1dfa72846af8c4cfdc009da2ae29db68cb67ea910160405180910390a3505050565b600080634d2b179160e01b836040516024016118bf91815260200190565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050509050600080600060206000855160208701600254617530fa92503d91506000519050809450826119545763e10bf1cc6000526004601cfd5b50505050919050565b43816003015411156119825760405163d0404f8560e01b815260040160405180910390fd5b6002810154611603576040516331da482760e11b815260040160405180910390fd5b600083156119e0578360051b8501855b803580851160051b948552602094851852604060002093018181106119d8576119dd565b6119b4565b50505b501492915050565b8280546119f490612051565b90600052602060002090601f016020900481019282611a165760008555611a5c565b82601f10611a2f57805160ff1916838001178555611a5c565b82800160010185558215611a5c579182015b82811115611a5c578251825591602001919060010190611a41565b50611a68929150611a6c565b5090565b5b80821115611a685760008155600101611a6d565b600060208284031215611a9357600080fd5b5035919050565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f1916810167ffffffffffffffff81118282101715611ad957611ad9611a9a565b604052919050565b600067ffffffffffffffff821115611afb57611afb611a9a565b5060051b60200190565b6001600160a01b038116811461160357600080fd5b600082601f830112611b2b57600080fd5b81356020611b40611b3b83611ae1565b611ab0565b82815260059290921b84018101918181019086841115611b5f57600080fd5b8286015b84811015611b83578035611b7681611b05565b8352918301918301611b63565b509695505050505050565b600060208284031215611ba057600080fd5b813567ffffffffffffffff811115611bb757600080fd5b611bc384828501611b1a565b949350505050565b600060208284031215611bdd57600080fd5b813561176a81611b05565b600080600080600060808688031215611c0057600080fd5b8535611c0b81611b05565b945060208601359350604086013567ffffffffffffffff80821115611c2f57600080fd5b818801915088601f830112611c4357600080fd5b813581811115611c5257600080fd5b896020828501011115611c6457600080fd5b96999598505060200195606001359392505050565b60008083601f840112611c8b57600080fd5b50813567ffffffffffffffff811115611ca357600080fd5b6020830191508360208260051b8501011115611cbe57600080fd5b9250929050565b600080600060408486031215611cda57600080fd5b83359250602084013567ffffffffffffffff811115611cf857600080fd5b611d0486828701611c79565b9497909650939450505050565b60008060408385031215611d2457600080fd5b8235611d2f81611b05565b946020939093013593505050565b60008060008060008060c08789031215611d5657600080fd5b863595506020870135611d6881611b05565b945060408701359350606087013592506080870135915060a087013560ff81168114611d9357600080fd5b809150509295509295509295565b600080600080600080600080600060e08a8c031215611dbf57600080fd5b8935985060208a0135611dd181611b05565b975060408a0135611de181611b05565b965060608a0135955060808a0135945060a08a013567ffffffffffffffff80821115611e0c57600080fd5b611e188d838e01611c79565b909650945060c08c0135915080821115611e3157600080fd5b50611e3e8c828d01611c79565b915080935050809150509295985092959850929598565b60008060208385031215611e6857600080fd5b823567ffffffffffffffff811115611e7f57600080fd5b611e8b85828601611c79565b90969095509350505050565b8581526000602060a08184015286518060a085015260005b81811015611ecb5788810183015185820160c001528201611eaf565b81811115611edd57600060c083870101525b50601f01601f1916830160c0019150611f03905060408301866001600160a01b03169052565b6001600160a01b038416606083015282151560808301529695505050505050565b60008060408385031215611f3757600080fd5b823567ffffffffffffffff80821115611f4f57600080fd5b611f5b86838701611b1a565b9350602091508185013581811115611f7257600080fd5b85019050601f81018613611f8557600080fd5b8035611f93611b3b82611ae1565b81815260059190911b82018301908381019088831115611fb257600080fd5b928401925b82841015611fdf5783358015158114611fd05760008081fd5b82529284019290840190611fb7565b80955050505050509250929050565b634e487b7160e01b600052603260045260246000fd5b6020808252825182820181905260009190848201906040850190845b818110156120455783516001600160a01b031683529284019291840191600101612020565b50909695505050505050565b600181811c9082168061206557607f821691505b6020821081141561208657634e487b7160e01b600052602260045260246000fd5b50919050565b600080855481600182811c9150808316806120a857607f831692505b60208084108214156120c857634e487b7160e01b86526022600452602486fd5b8180156120dc57600181146120ed5761211a565b60ff1986168952848901965061211a565b60008c81526020902060005b868110156121125781548b8201529085019083016120f9565b505084890196505b5098855250505050938401929092525050604001919050565b634e487b7160e01b600052601160045260246000fd5b60008282101561215b5761215b612133565b500390565b6000821982111561217357612173612133565b50019056fea164736f6c6343000809000a", "linkReferences": {}, "deployedLinkReferences": {} } diff --git a/contracts/p2pix.sol b/contracts/p2pix.sol index 89156eb..44005bc 100644 --- a/contracts/p2pix.sol +++ b/contracts/p2pix.sol @@ -348,8 +348,8 @@ contract P2PIX is uint256 _newUserRecord = (userRecord[userKey] >> 1); - if (_newUserRecord <= 100) { - userRecord[userKey] = 100; + if (_newUserRecord <= 1e2) { + userRecord[userKey] = 1e2; } else { userRecord[userKey] = _newUserRecord; } @@ -406,10 +406,7 @@ contract P2PIX is sellerAllowList[ _castAddrToKey(addr) ] = merkleroot; - emit RootUpdated( - addr, - merkleroot - ); + emit RootUpdated(addr, merkleroot); } else revert OnlySeller(); } @@ -536,11 +533,11 @@ contract P2PIX is /// @dev Called exclusively by the `unlockExpired` method. /// @dev Function sighash: 0x74e2a0bb. function _notExpired(DT.Lock storage _l) private view { + // not expired or released // Custom Error Solidity Impl - if ( - _l.expirationBlock >= block.number || - _l.amount <= 0 - ) revert NotExpired(); + if (_l.expirationBlock > block.number) + revert NotExpired(); + if (_l.amount == 0) revert AlreadyReleased(); /* // Custom Error Yul Impl assembly { @@ -558,13 +555,13 @@ contract P2PIX is } } - // Require Error Solidity Impl - require( - _l.expirationBlock < block.number && - _l.amount > 0, - "P2PIX: Lock not expired or already released" - ); */ + // Require Error Solidity Impl + // require( + // _l.expirationBlock > block.number && + // _l.amount > 0, + // "P2PIX: Lock not expired or already released" + // ); } /// @notice Internal view auxiliar logic that returns a new valid `_depositID`. @@ -576,8 +573,9 @@ contract P2PIX is returns (uint256 _depositID) { (_depositID) = depositCount.current(); - if (mapDeposits[_depositID].valid == true) - revert DepositAlreadyExists(); + /// @todo remove this for good + // if (mapDeposits[_depositID].valid == true) + // revert DepositAlreadyExists(); } function _addLock( @@ -648,7 +646,7 @@ contract P2PIX is assembly { success := staticcall( // gas - 30000, + 0x7530, // address sload(reputation.slot), // argsOffset diff --git a/scripts/1-deploy-mockToken.ts b/scripts/1-deploy-mockToken.ts index d8d4cd8..f4db7ea 100644 --- a/scripts/1-deploy-mockToken.ts +++ b/scripts/1-deploy-mockToken.ts @@ -4,13 +4,9 @@ import { BigNumber } from "ethers"; import * as fs from "fs"; import { ethers, network } from "hardhat"; -// import hre from "hardhat"; +import { Deploys } from "../test/utils/fixtures"; -interface Deploys { - signers: string[]; - p2pix: string; - token: string; -} +// import hre from "hardhat"; let deploysJson: Deploys; const supply: BigNumber = ethers.utils.parseEther("20000000"); diff --git a/scripts/2-deploy-p2pix.ts b/scripts/2-deploy-p2pix.ts index 32b8741..b5208e6 100644 --- a/scripts/2-deploy-p2pix.ts +++ b/scripts/2-deploy-p2pix.ts @@ -2,8 +2,8 @@ import "@nomiclabs/hardhat-ethers"; import "@nomiclabs/hardhat-etherscan"; import * as fs from "fs"; import { ethers, network } from "hardhat"; -import { Deploys } from "../test/utils/fixtures"; +import { Deploys } from "../test/utils/fixtures"; let deploysJson: Deploys; @@ -22,17 +22,19 @@ const main = async () => { const [deployer] = await ethers.getSigners(); console.log(`Deploying contracts with ${deployer.address}`); - const Reputation = await ethers.getContractFactory("Reputation"); + const Reputation = await ethers.getContractFactory( + "Reputation", + ); const reputation = await Reputation.deploy(); await reputation.deployed(); const P2PIX = await ethers.getContractFactory("P2PIX"); const p2pix = await P2PIX.deploy( - 10, + 10, deploysJson.signers, reputation.address, [deploysJson.token], - [true] + [true], ); await p2pix.deployed(); diff --git a/src/types/factories/p2pix.sol/P2PIX__factory.ts b/src/types/factories/p2pix.sol/P2PIX__factory.ts index f9717b2..b882e19 100644 --- a/src/types/factories/p2pix.sol/P2PIX__factory.ts +++ b/src/types/factories/p2pix.sol/P2PIX__factory.ts @@ -886,7 +886,7 @@ const _abi = [ ]; const _bytecode = - "0x608060405260018055604051620027e1380380620027e18339810160408190526200002a916200049d565b600080546001600160a01b031916339081178255604051909182917f8292fce18fa69edf4db7b94ea2e58241df0ae57f97e0a6c9b29067028bf92d76908290a3506200007685620000a3565b620000818362000133565b6200008c84620001bd565b620000988282620002a1565b505050505062000620565b6000546001600160a01b03163314620000f25760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064015b60405180910390fd5b806004557f70fa43ca70216ad905ade86b9e650a691b2ce5a01980d0a81bdd8324141b8511816040516200012891815260200190565b60405180910390a150565b6000546001600160a01b031633146200017e5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401620000e9565b60028190556040516001600160a01b03821681527fe127cf589a3879da0156d4a24f43b44f65cfa3570de594806b0bfa2fcf06884f9060200162000128565b6000546001600160a01b03163314620002085760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401620000e9565b80516000905b808210156200026e57600062000246848481518110620002325762000232620005bb565b60200260200101516200038760201b60201c565b6000908152600660205260409020805460ff191660019081179091559290920191506200020e565b50507f14a422d2412784a5749d03da98921fe468c98577b767851389a9f58ea5a363d781604051620001289190620005d1565b6000546001600160a01b03163314620002ec5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401620000e9565b815180620003025763df9578836000526004601cfd5b81518114620003195763ff633a386000526004601cfd5b60208301602083016020830282015b8083146200037f578251600052600b60205260406000208251815550815183517f5d6e86e5341d57a92c49934296c51542a25015c9b1782a1c2722a940131c3d9a600080a360208301925060208201915062000328565b505050505050565b600c1b611000600160ac1b031690565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b0381118282101715620003d857620003d862000397565b604052919050565b60006001600160401b03821115620003fc57620003fc62000397565b5060051b60200190565b6001600160a01b03811681146200041c57600080fd5b50565b600082601f8301126200043157600080fd5b815160206200044a6200044483620003e0565b620003ad565b82815260059290921b840181019181810190868411156200046a57600080fd5b8286015b8481101562000492578051620004848162000406565b83529183019183016200046e565b509695505050505050565b600080600080600060a08688031215620004b657600080fd5b8551602080880151919650906001600160401b0380821115620004d857600080fd5b620004e68a838b016200041f565b965060408901519150620004fa8262000406565b6060890151919550808211156200051057600080fd5b6200051e8a838b016200041f565b945060808901519150808211156200053557600080fd5b508701601f810189136200054857600080fd5b8051620005596200044482620003e0565b81815260059190911b8201830190838101908b8311156200057957600080fd5b928401925b82841015620005a95783518015158114620005995760008081fd5b825292840192908401906200057e565b80955050505050509295509295909350565b634e487b7160e01b600052603260045260246000fd5b6020808252825182820181905260009190848201906040850190845b81811015620006145783516001600160a01b031683529284019291840191600101620005ed565b50909695505050505050565b6121b180620006306000396000f3fe60806040526004361061018f5760003560e01c806377cd38a4116100d65780638e2a3d361161007f578063c52164c611610059578063c52164c614610539578063d6e8b97314610559578063f7d0e04b1461057957600080fd5b80638e2a3d36146104c25780639872dbfe146104f357806398a268711461050957600080fd5b80638652b37e116100b05780638652b37e1461044a5780638da5cb5b1461046a5780638e2749d6146104a257600080fd5b806377cd38a4146103dd5780637f94f65d1461040a5780638642b5c31461042a57600080fd5b806336317972116101385780635fd8c710116101125780635fd8c7101461036857806369cc6af41461037d57806372fada5c146103bd57600080fd5b806336317972146102fd5780634b2ae9801461031d578063574983c81461034857600080fd5b806316d722401161016957806316d722401461021d57806329cc7d10146102c65780632dfdf0b5146102e657600080fd5b8063049373201461019b5780630d2a2d44146101db57806313af4035146101fd57600080fd5b3661019657005b600080fd5b3480156101a757600080fd5b506101c86101b6366004611aad565b60056020526000908152604090205481565b6040519081526020015b60405180910390f35b3480156101e757600080fd5b506101fb6101f6366004611bba565b610599565b005b34801561020957600080fd5b506101fb610218366004611bf7565b61068a565b34801561022957600080fd5b50610282610238366004611aad565b600860205260009081526040902080546001820154600283015460038401546004850154600586015460069096015494959394929391926001600160a01b03918216928216911687565b6040805197885260208801969096529486019390935260608501919091526001600160a01b03908116608085015290811660a08401521660c082015260e0016101d2565b3480156102d257600080fd5b506101c86102e1366004611c14565b61072b565b3480156102f257600080fd5b506003546101c89081565b34801561030957600080fd5b506101fb610318366004611cf1565b610916565b34801561032957600080fd5b506101c8610338366004611bf7565b600c1b611000600160ac1b031690565b34801561035457600080fd5b506101fb610363366004611aad565b6109d6565b34801561037457600080fd5b506101fb610a54565b34801561038957600080fd5b506103ad610398366004611bf7565b600b6020526000908152604090205460ff1681565b60405190151581526020016101d2565b3480156103c957600080fd5b506101fb6103d8366004611aad565b610ade565b3480156103e957600080fd5b506101c86103f8366004611aad565b600a6020526000908152604090205481565b34801561041657600080fd5b506101fb610425366004611d3d565b610b66565b34801561043657600080fd5b506101fb610445366004611d69565b610bf9565b34801561045657600080fd5b506101c8610465366004611dcd565b610fc7565b34801561047657600080fd5b5060005461048a906001600160a01b031681565b6040516001600160a01b0390911681526020016101d2565b3480156104ae57600080fd5b506101fb6104bd366004611e81565b611176565b3480156104ce57600080fd5b506104e26104dd366004611aad565b6112ce565b6040516101d2959493929190611ec3565b3480156104ff57600080fd5b506101c860045481565b34801561051557600080fd5b506103ad610524366004611aad565b60066020526000908152604090205460ff1681565b34801561054557600080fd5b5060025461048a906001600160a01b031681565b34801561056557600080fd5b506101fb610574366004611f50565b611398565b34801561058557600080fd5b506101fb610594366004611bf7565b611470565b6000546001600160a01b031633146105e75760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064015b60405180910390fd5b80516000905b8082101561064e57600061062784848151811061060c5761060c61201a565b6020026020010151611000600160ac1b03600c9190911b1690565b6000908152600660205260409020805460ff191660019081179091559290920191506105ed565b50507f14a422d2412784a5749d03da98921fe468c98577b767851389a9f58ea5a363d78160405161067f9190612030565b60405180910390a150565b6000546001600160a01b031633146106d35760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064016105de565b6000805473ffffffffffffffffffffffffffffffffffffffff19166001600160a01b0383169081178255604051909133917f8292fce18fa69edf4db7b94ea2e58241df0ae57f97e0a6c9b29067028bf92d769190a350565b6001600160a01b0385166000908152600b6020526040812054869060ff1661076657604051630abc194760e11b815260040160405180910390fd5b61076e6114f7565b915060006040518060a0016040528088815260200187878080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152505050908252503360208201526001600160a01b038a166040820152600160609091015290506107e3611547565b83156107f3576107f33385610b66565b6000838152600760209081526040909120825181558183015180518493610821926001850192910190611a14565b5060408201516002820180546001600160a01b0392831673ffffffffffffffffffffffffffffffffffffffff199091161790556060830151600392830180546080909501511515600160a01b027fffffffffffffffffffffff0000000000000000000000000000000000000000009095169190921617929092179091556108ab9080546001019055565b6108b78233308a611572565b6108c060018055565b604080518481526001600160a01b038a16602082015290810188905233907f25ac57b911b0f66b64c294827f539545fbc3ddd002cafab117776274f3241e4c9060600160405180910390a2505095945050505050565b61091e611547565b61092783611609565b6109318282611176565b60008381526007602052604090206003810154600160a01b900460ff161515600114156109615761096184610ade565b600381015481546000835560028301546001600160a01b039283169261098a9184911683611646565b604080518781526020810183905233917f7719804546c0185709e60c90d164447ff251a5ba29af0216faa921350f6bebf7910160405180910390a25050506109d160018055565b505050565b6000546001600160a01b03163314610a1f5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064016105de565b806004557f70fa43ca70216ad905ade86b9e650a691b2ce5a01980d0a81bdd8324141b85118160405161067f91815260200190565b6000546001600160a01b03163314610a9d5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064016105de565b47610aa833826116d2565b60408051338152602081018390527feaff4b37086828766ad3268786972c0cd24259d4c87a80f9d3963a3c3d999b0d910161067f565b610ae781611609565b6000818152600760209081526040918290206003810180547fffffffffffffffffffffff00ffffffffffffffffffffffffffffffffffffffff1690556002015491518381526001600160a01b03909216917fb4d98b272597e828d9b172c0d44390d5b267040e918088eac8a0a0fadcb81c70910160405180910390a250565b6001600160a01b038216331415610be057611000600160ac1b03600c83901b166000908152600a602090815260409182902083905581516001600160a01b038516815290810183905281517f0b294da292f26e55fd442b5c0164fbb9013036ff00c5cfdde0efd01c1baaf632929181900390910190a15050565b6040516342e8fb9360e11b815260040160405180910390fd5b610c01611547565b6000868152600860205260409020600381015443101580610c2457506002810154155b15610c42576040516331da482760e11b815260040160405180910390fd5b8054600090815260076020908152604080832060028501549151909392610c7292600186019290918b91016120b8565b604051602081830303815290604052805190602001209050600081604051602001610cc991907f19457468657265756d205369676e6564204d6573736167653a0a3332000000008152601c810191909152603c0190565b60408051601f1981840301815291815281516020928301206000858152600990935291205490915060ff16151560011415610d1757604051637a48537560e11b815260040160405180910390fd5b6040805160008082526020820180845284905260ff8816928201929092526060810189905260808101889052610d8b9060019060a0016020604051602081039080840390855afa158015610d6f573d6000803e3d6000fd5b5050604051601f190151600c1b611000600160ac1b0316919050565b60008181526006602052604090205490915060ff16610dbd57604051632057875960e21b815260040160405180910390fd5b6003840154600186015460028701546001600160a01b0390921691600091610de491612175565b60006002890181905560038901819055868152600960205260409020805460ff191660011790556006880154909150336001600160a01b0390911614610e9f576001870154611000600160ac1b0333600c1b1660009081526005602052604081208054909190610e5590849061218c565b909155505060028701546006880154600590600090600c1b611000600160ac1b031681526020019081526020016000206000828254610e94919061218c565b90915550610ee59050565b86600201548760010154610eb3919061218c565b611000600160ac1b0333600c1b1660009081526005602052604081208054909190610edf90849061218c565b90915550505b6004870154610eff9083906001600160a01b031683611646565b600187015415610f6b5760058701546001600160a01b038d8116911614610f5c576005870154600180890154610f449285926001600160a01b0390911691901c611646565b610f57828d60018a60010154901c611646565b610f6b565b610f6b828d8960010154611646565b60048701546040518e81526001600160a01b03909116907f5e420822d2f7281fdc4b763c62c8b7874bf22108a35efe93144d79296aacc67d9060200160405180910390a250505050505050610fbf60018055565b505050505050565b6000610fd1611547565b610fdb8383611176565b60008a81526007602052604090206003810154600160a01b900460ff1661101557604051635972996f60e11b815260040160405180910390fd5b8054871115611037576040516308aeed0f60e21b815260040160405180910390fd5b6110428b888c61172d565b915060006040518060e001604052808d81526020018a815260200189815260200160045443611071919061218c565b81526001600160a01b03808e1660208301528c16604082015233606090910152905085156110da576002820154600c1b611000600160ac1b03166000908152600a60205260409020546110c89088908890336117b1565b6110d38382846117e3565b5050611160565b60648160400151116110f1576110d38382846117e3565b611000600160ac1b0333600c1b1660009081526005602052604081205490611118826118e1565b905080836040015111806111325750620f42408360400151115b1561115057604051630e0c7c2360e11b815260040160405180910390fd5b61115b8584866117e3565b505050505b61116960018055565b9998505050505050505050565b6000815b808210156112b25760006008600086868681811061119a5761119a61201a565b90506020020135815260200190815260200160002090506111ba8161199d565b60028101548154600090815260076020526040812080549091906111df90849061218c565b90915550506000600282018190556006820154600c1b611000600160ac1b031660008181526005602052604090205490915060011c6064811161123357600082815260056020526040902060649055611245565b60008281526005602052604090208190555b60048301546001600160a01b03167f67e089478e21dd12c98e69331c4152f6c9b2038b91e0f28268ffa01558c0b4ff8888888181106112865761128661201a565b9050602002013560405161129c91815260200190565b60405180910390a284600101945050505061117a565b808210156112c85763dfb035c96000526004601cfd5b50505050565b600760205260009081526040902080546001820180549192916112f09061207d565b80601f016020809104026020016040519081016040528092919081815260200182805461131c9061207d565b80156113695780601f1061133e57610100808354040283529160200191611369565b820191906000526020600020905b81548152906001019060200180831161134c57829003601f168201915b50505050600283015460039093015491926001600160a01b03908116929081169150600160a01b900460ff1685565b6000546001600160a01b031633146113e15760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064016105de565b8151806113f65763df9578836000526004601cfd5b8151811461140c5763ff633a386000526004601cfd5b60208301602083016020830282015b808314610fbf578251600052600b60205260406000208251815550815183517f5d6e86e5341d57a92c49934296c51542a25015c9b1782a1c2722a940131c3d9a600080a360208301925060208201915061141b565b6000546001600160a01b031633146114b95760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064016105de565b60028190556040516001600160a01b03821681527fe127cf589a3879da0156d4a24f43b44f65cfa3570de594806b0bfa2fcf06884f9060200161067f565b600061150260035490565b600081815260076020526040902060030154909150600160a01b900460ff161515600114156115445760405163c44bd76560e01b815260040160405180910390fd5b90565b6001546002141561156b5760405163558a1e0360e11b815260040160405180910390fd5b6002600155565b60006040516323b872dd60e01b6000528460045283602452826044526020600060646000808a5af13d15601f3d11600160005114161716915060006060528060405250806116025760405162461bcd60e51b815260206004820152601460248201527f5452414e534645525f46524f4d5f4641494c454400000000000000000000000060448201526064016105de565b5050505050565b6000818152600760205260409020600201546001600160a01b03163314611643576040516342e8fb9360e11b815260040160405180910390fd5b50565b600060405163a9059cbb60e01b6000528360045282602452602060006044600080895af13d15601f3d11600160005114161716915060006060528060405250806112c85760405162461bcd60e51b815260206004820152600f60248201527f5452414e534645525f4641494c4544000000000000000000000000000000000060448201526064016105de565b600080600080600085875af19050806109d15760405162461bcd60e51b815260206004820152601360248201527f4554485f5452414e534645525f4641494c45440000000000000000000000000060448201526064016105de565b6040805160208101859052908101839052606082811b6bffffffffffffffffffffffff191690820152600090607401604051602081830303815290604052805190602001209050436008600083815260200190815260200160002060030154106117aa5760405163d0404f8560e01b815260040160405180910390fd5b9392505050565b6117c68484846001600160a01b0385166119d0565b6112c857604051631dc23a5f60e11b815260040160405180910390fd5b600083815260086020908152604080832085518155918501516001830155840151600282018190556060850151600383015560808501516004830180546001600160a01b0392831673ffffffffffffffffffffffffffffffffffffffff199182161790915560a087015160058501805491841691831691909117905560c08701516006909401805494909216931692909217909155825490918391611889908490612175565b9091555050608082015182516040808501518151928352602083015285926001600160a01b0316917f2a28b2ae47b0bd4b104e7cd29b1dfa72846af8c4cfdc009da2ae29db68cb67ea910160405180910390a3505050565b600080634d2b179160e01b836040516024016118ff91815260200190565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050509050600080600060206000855160208701600254617530fa92503d91506000519050809450826119945763e10bf1cc6000526004601cfd5b50505050919050565b4381600301541015806119b257506002810154155b156116435760405163d0404f8560e01b815260040160405180910390fd5b60008315611a0c578360051b8501855b803580851160051b94855260209485185260406000209301818110611a0457611a09565b6119e0565b50505b501492915050565b828054611a209061207d565b90600052602060002090601f016020900481019282611a425760008555611a88565b82601f10611a5b57805160ff1916838001178555611a88565b82800160010185558215611a88579182015b82811115611a88578251825591602001919060010190611a6d565b50611a94929150611a98565b5090565b5b80821115611a945760008155600101611a99565b600060208284031215611abf57600080fd5b5035919050565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f1916810167ffffffffffffffff81118282101715611b0557611b05611ac6565b604052919050565b600067ffffffffffffffff821115611b2757611b27611ac6565b5060051b60200190565b6001600160a01b038116811461164357600080fd5b600082601f830112611b5757600080fd5b81356020611b6c611b6783611b0d565b611adc565b82815260059290921b84018101918181019086841115611b8b57600080fd5b8286015b84811015611baf578035611ba281611b31565b8352918301918301611b8f565b509695505050505050565b600060208284031215611bcc57600080fd5b813567ffffffffffffffff811115611be357600080fd5b611bef84828501611b46565b949350505050565b600060208284031215611c0957600080fd5b81356117aa81611b31565b600080600080600060808688031215611c2c57600080fd5b8535611c3781611b31565b945060208601359350604086013567ffffffffffffffff80821115611c5b57600080fd5b818801915088601f830112611c6f57600080fd5b813581811115611c7e57600080fd5b896020828501011115611c9057600080fd5b96999598505060200195606001359392505050565b60008083601f840112611cb757600080fd5b50813567ffffffffffffffff811115611ccf57600080fd5b6020830191508360208260051b8501011115611cea57600080fd5b9250929050565b600080600060408486031215611d0657600080fd5b83359250602084013567ffffffffffffffff811115611d2457600080fd5b611d3086828701611ca5565b9497909650939450505050565b60008060408385031215611d5057600080fd5b8235611d5b81611b31565b946020939093013593505050565b60008060008060008060c08789031215611d8257600080fd5b863595506020870135611d9481611b31565b945060408701359350606087013592506080870135915060a087013560ff81168114611dbf57600080fd5b809150509295509295509295565b600080600080600080600080600060e08a8c031215611deb57600080fd5b8935985060208a0135611dfd81611b31565b975060408a0135611e0d81611b31565b965060608a0135955060808a0135945060a08a013567ffffffffffffffff80821115611e3857600080fd5b611e448d838e01611ca5565b909650945060c08c0135915080821115611e5d57600080fd5b50611e6a8c828d01611ca5565b915080935050809150509295985092959850929598565b60008060208385031215611e9457600080fd5b823567ffffffffffffffff811115611eab57600080fd5b611eb785828601611ca5565b90969095509350505050565b8581526000602060a08184015286518060a085015260005b81811015611ef75788810183015185820160c001528201611edb565b81811115611f0957600060c083870101525b50601f01601f1916830160c0019150611f2f905060408301866001600160a01b03169052565b6001600160a01b038416606083015282151560808301529695505050505050565b60008060408385031215611f6357600080fd5b823567ffffffffffffffff80821115611f7b57600080fd5b611f8786838701611b46565b9350602091508185013581811115611f9e57600080fd5b85019050601f81018613611fb157600080fd5b8035611fbf611b6782611b0d565b81815260059190911b82018301908381019088831115611fde57600080fd5b928401925b8284101561200b5783358015158114611ffc5760008081fd5b82529284019290840190611fe3565b80955050505050509250929050565b634e487b7160e01b600052603260045260246000fd5b6020808252825182820181905260009190848201906040850190845b818110156120715783516001600160a01b03168352928401929184019160010161204c565b50909695505050505050565b600181811c9082168061209157607f821691505b602082108114156120b257634e487b7160e01b600052602260045260246000fd5b50919050565b600080855481600182811c9150808316806120d457607f831692505b60208084108214156120f457634e487b7160e01b86526022600452602486fd5b818015612108576001811461211957612146565b60ff19861689528489019650612146565b60008c81526020902060005b8681101561213e5781548b820152908501908301612125565b505084890196505b5098855250505050938401929092525050604001919050565b634e487b7160e01b600052601160045260246000fd5b6000828210156121875761218761215f565b500390565b6000821982111561219f5761219f61215f565b50019056fea164736f6c6343000809000a"; + "0x608060405260018055604051620027b5380380620027b58339810160408190526200002a916200049d565b600080546001600160a01b031916339081178255604051909182917f8292fce18fa69edf4db7b94ea2e58241df0ae57f97e0a6c9b29067028bf92d76908290a3506200007685620000a3565b620000818362000133565b6200008c84620001bd565b620000988282620002a1565b505050505062000620565b6000546001600160a01b03163314620000f25760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064015b60405180910390fd5b806004557f70fa43ca70216ad905ade86b9e650a691b2ce5a01980d0a81bdd8324141b8511816040516200012891815260200190565b60405180910390a150565b6000546001600160a01b031633146200017e5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401620000e9565b60028190556040516001600160a01b03821681527fe127cf589a3879da0156d4a24f43b44f65cfa3570de594806b0bfa2fcf06884f9060200162000128565b6000546001600160a01b03163314620002085760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401620000e9565b80516000905b808210156200026e57600062000246848481518110620002325762000232620005bb565b60200260200101516200038760201b60201c565b6000908152600660205260409020805460ff191660019081179091559290920191506200020e565b50507f14a422d2412784a5749d03da98921fe468c98577b767851389a9f58ea5a363d781604051620001289190620005d1565b6000546001600160a01b03163314620002ec5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401620000e9565b815180620003025763df9578836000526004601cfd5b81518114620003195763ff633a386000526004601cfd5b60208301602083016020830282015b8083146200037f578251600052600b60205260406000208251815550815183517f5d6e86e5341d57a92c49934296c51542a25015c9b1782a1c2722a940131c3d9a600080a360208301925060208201915062000328565b505050505050565b600c1b611000600160ac1b031690565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b0381118282101715620003d857620003d862000397565b604052919050565b60006001600160401b03821115620003fc57620003fc62000397565b5060051b60200190565b6001600160a01b03811681146200041c57600080fd5b50565b600082601f8301126200043157600080fd5b815160206200044a6200044483620003e0565b620003ad565b82815260059290921b840181019181810190868411156200046a57600080fd5b8286015b8481101562000492578051620004848162000406565b83529183019183016200046e565b509695505050505050565b600080600080600060a08688031215620004b657600080fd5b8551602080880151919650906001600160401b0380821115620004d857600080fd5b620004e68a838b016200041f565b965060408901519150620004fa8262000406565b6060890151919550808211156200051057600080fd5b6200051e8a838b016200041f565b945060808901519150808211156200053557600080fd5b508701601f810189136200054857600080fd5b8051620005596200044482620003e0565b81815260059190911b8201830190838101908b8311156200057957600080fd5b928401925b82841015620005a95783518015158114620005995760008081fd5b825292840192908401906200057e565b80955050505050509295509295909350565b634e487b7160e01b600052603260045260246000fd5b6020808252825182820181905260009190848201906040850190845b81811015620006145783516001600160a01b031683529284019291840191600101620005ed565b50909695505050505050565b61218580620006306000396000f3fe60806040526004361061018f5760003560e01c806377cd38a4116100d65780638e2a3d361161007f578063c52164c611610059578063c52164c614610539578063d6e8b97314610559578063f7d0e04b1461057957600080fd5b80638e2a3d36146104c25780639872dbfe146104f357806398a268711461050957600080fd5b80638652b37e116100b05780638652b37e1461044a5780638da5cb5b1461046a5780638e2749d6146104a257600080fd5b806377cd38a4146103dd5780637f94f65d1461040a5780638642b5c31461042a57600080fd5b806336317972116101385780635fd8c710116101125780635fd8c7101461036857806369cc6af41461037d57806372fada5c146103bd57600080fd5b806336317972146102fd5780634b2ae9801461031d578063574983c81461034857600080fd5b806316d722401161016957806316d722401461021d57806329cc7d10146102c65780632dfdf0b5146102e657600080fd5b8063049373201461019b5780630d2a2d44146101db57806313af4035146101fd57600080fd5b3661019657005b600080fd5b3480156101a757600080fd5b506101c86101b6366004611a81565b60056020526000908152604090205481565b6040519081526020015b60405180910390f35b3480156101e757600080fd5b506101fb6101f6366004611b8e565b610599565b005b34801561020957600080fd5b506101fb610218366004611bcb565b61068a565b34801561022957600080fd5b50610282610238366004611a81565b600860205260009081526040902080546001820154600283015460038401546004850154600586015460069096015494959394929391926001600160a01b03918216928216911687565b6040805197885260208801969096529486019390935260608501919091526001600160a01b03908116608085015290811660a08401521660c082015260e0016101d2565b3480156102d257600080fd5b506101c86102e1366004611be8565b61072b565b3480156102f257600080fd5b506003546101c89081565b34801561030957600080fd5b506101fb610318366004611cc5565b610916565b34801561032957600080fd5b506101c8610338366004611bcb565b600c1b611000600160ac1b031690565b34801561035457600080fd5b506101fb610363366004611a81565b6109d6565b34801561037457600080fd5b506101fb610a54565b34801561038957600080fd5b506103ad610398366004611bcb565b600b6020526000908152604090205460ff1681565b60405190151581526020016101d2565b3480156103c957600080fd5b506101fb6103d8366004611a81565b610ade565b3480156103e957600080fd5b506101c86103f8366004611a81565b600a6020526000908152604090205481565b34801561041657600080fd5b506101fb610425366004611d11565b610b66565b34801561043657600080fd5b506101fb610445366004611d3d565b610bf9565b34801561045657600080fd5b506101c8610465366004611da1565b610fc7565b34801561047657600080fd5b5060005461048a906001600160a01b031681565b6040516001600160a01b0390911681526020016101d2565b3480156104ae57600080fd5b506101fb6104bd366004611e55565b611176565b3480156104ce57600080fd5b506104e26104dd366004611a81565b6112ce565b6040516101d2959493929190611e97565b3480156104ff57600080fd5b506101c860045481565b34801561051557600080fd5b506103ad610524366004611a81565b60066020526000908152604090205460ff1681565b34801561054557600080fd5b5060025461048a906001600160a01b031681565b34801561056557600080fd5b506101fb610574366004611f24565b611398565b34801561058557600080fd5b506101fb610594366004611bcb565b611470565b6000546001600160a01b031633146105e75760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064015b60405180910390fd5b80516000905b8082101561064e57600061062784848151811061060c5761060c611fee565b6020026020010151611000600160ac1b03600c9190911b1690565b6000908152600660205260409020805460ff191660019081179091559290920191506105ed565b50507f14a422d2412784a5749d03da98921fe468c98577b767851389a9f58ea5a363d78160405161067f9190612004565b60405180910390a150565b6000546001600160a01b031633146106d35760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064016105de565b6000805473ffffffffffffffffffffffffffffffffffffffff19166001600160a01b0383169081178255604051909133917f8292fce18fa69edf4db7b94ea2e58241df0ae57f97e0a6c9b29067028bf92d769190a350565b6001600160a01b0385166000908152600b6020526040812054869060ff1661076657604051630abc194760e11b815260040160405180910390fd5b61076e6114f7565b915060006040518060a0016040528088815260200187878080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152505050908252503360208201526001600160a01b038a166040820152600160609091015290506107e3611507565b83156107f3576107f33385610b66565b60008381526007602090815260409091208251815581830151805184936108219260018501929101906119e8565b5060408201516002820180546001600160a01b0392831673ffffffffffffffffffffffffffffffffffffffff199091161790556060830151600392830180546080909501511515600160a01b027fffffffffffffffffffffff0000000000000000000000000000000000000000009095169190921617929092179091556108ab9080546001019055565b6108b78233308a611532565b6108c060018055565b604080518481526001600160a01b038a16602082015290810188905233907f25ac57b911b0f66b64c294827f539545fbc3ddd002cafab117776274f3241e4c9060600160405180910390a2505095945050505050565b61091e611507565b610927836115c9565b6109318282611176565b60008381526007602052604090206003810154600160a01b900460ff161515600114156109615761096184610ade565b600381015481546000835560028301546001600160a01b039283169261098a9184911683611606565b604080518781526020810183905233917f7719804546c0185709e60c90d164447ff251a5ba29af0216faa921350f6bebf7910160405180910390a25050506109d160018055565b505050565b6000546001600160a01b03163314610a1f5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064016105de565b806004557f70fa43ca70216ad905ade86b9e650a691b2ce5a01980d0a81bdd8324141b85118160405161067f91815260200190565b6000546001600160a01b03163314610a9d5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064016105de565b47610aa83382611692565b60408051338152602081018390527feaff4b37086828766ad3268786972c0cd24259d4c87a80f9d3963a3c3d999b0d910161067f565b610ae7816115c9565b6000818152600760209081526040918290206003810180547fffffffffffffffffffffff00ffffffffffffffffffffffffffffffffffffffff1690556002015491518381526001600160a01b03909216917fb4d98b272597e828d9b172c0d44390d5b267040e918088eac8a0a0fadcb81c70910160405180910390a250565b6001600160a01b038216331415610be057611000600160ac1b03600c83901b166000908152600a602090815260409182902083905581516001600160a01b038516815290810183905281517f0b294da292f26e55fd442b5c0164fbb9013036ff00c5cfdde0efd01c1baaf632929181900390910190a15050565b6040516342e8fb9360e11b815260040160405180910390fd5b610c01611507565b6000868152600860205260409020600381015443101580610c2457506002810154155b15610c42576040516331da482760e11b815260040160405180910390fd5b8054600090815260076020908152604080832060028501549151909392610c7292600186019290918b910161208c565b604051602081830303815290604052805190602001209050600081604051602001610cc991907f19457468657265756d205369676e6564204d6573736167653a0a3332000000008152601c810191909152603c0190565b60408051601f1981840301815291815281516020928301206000858152600990935291205490915060ff16151560011415610d1757604051637a48537560e11b815260040160405180910390fd5b6040805160008082526020820180845284905260ff8816928201929092526060810189905260808101889052610d8b9060019060a0016020604051602081039080840390855afa158015610d6f573d6000803e3d6000fd5b5050604051601f190151600c1b611000600160ac1b0316919050565b60008181526006602052604090205490915060ff16610dbd57604051632057875960e21b815260040160405180910390fd5b6003840154600186015460028701546001600160a01b0390921691600091610de491612149565b60006002890181905560038901819055868152600960205260409020805460ff191660011790556006880154909150336001600160a01b0390911614610e9f576001870154611000600160ac1b0333600c1b1660009081526005602052604081208054909190610e55908490612160565b909155505060028701546006880154600590600090600c1b611000600160ac1b031681526020019081526020016000206000828254610e949190612160565b90915550610ee59050565b86600201548760010154610eb39190612160565b611000600160ac1b0333600c1b1660009081526005602052604081208054909190610edf908490612160565b90915550505b6004870154610eff9083906001600160a01b031683611606565b600187015415610f6b5760058701546001600160a01b038d8116911614610f5c576005870154600180890154610f449285926001600160a01b0390911691901c611606565b610f57828d60018a60010154901c611606565b610f6b565b610f6b828d8960010154611606565b60048701546040518e81526001600160a01b03909116907f5e420822d2f7281fdc4b763c62c8b7874bf22108a35efe93144d79296aacc67d9060200160405180910390a250505050505050610fbf60018055565b505050505050565b6000610fd1611507565b610fdb8383611176565b60008a81526007602052604090206003810154600160a01b900460ff1661101557604051635972996f60e11b815260040160405180910390fd5b8054871115611037576040516308aeed0f60e21b815260040160405180910390fd5b6110428b888c6116ed565b915060006040518060e001604052808d81526020018a8152602001898152602001600454436110719190612160565b81526001600160a01b03808e1660208301528c16604082015233606090910152905085156110da576002820154600c1b611000600160ac1b03166000908152600a60205260409020546110c8908890889033611771565b6110d38382846117a3565b5050611160565b60648160400151116110f1576110d38382846117a3565b611000600160ac1b0333600c1b1660009081526005602052604081205490611118826118a1565b905080836040015111806111325750620f42408360400151115b1561115057604051630e0c7c2360e11b815260040160405180910390fd5b61115b8584866117a3565b505050505b61116960018055565b9998505050505050505050565b6000815b808210156112b25760006008600086868681811061119a5761119a611fee565b90506020020135815260200190815260200160002090506111ba8161195d565b60028101548154600090815260076020526040812080549091906111df908490612160565b90915550506000600282018190556006820154600c1b611000600160ac1b031660008181526005602052604090205490915060011c6064811161123357600082815260056020526040902060649055611245565b60008281526005602052604090208190555b60048301546001600160a01b03167f67e089478e21dd12c98e69331c4152f6c9b2038b91e0f28268ffa01558c0b4ff88888881811061128657611286611fee565b9050602002013560405161129c91815260200190565b60405180910390a284600101945050505061117a565b808210156112c85763dfb035c96000526004601cfd5b50505050565b600760205260009081526040902080546001820180549192916112f090612051565b80601f016020809104026020016040519081016040528092919081815260200182805461131c90612051565b80156113695780601f1061133e57610100808354040283529160200191611369565b820191906000526020600020905b81548152906001019060200180831161134c57829003601f168201915b50505050600283015460039093015491926001600160a01b03908116929081169150600160a01b900460ff1685565b6000546001600160a01b031633146113e15760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064016105de565b8151806113f65763df9578836000526004601cfd5b8151811461140c5763ff633a386000526004601cfd5b60208301602083016020830282015b808314610fbf578251600052600b60205260406000208251815550815183517f5d6e86e5341d57a92c49934296c51542a25015c9b1782a1c2722a940131c3d9a600080a360208301925060208201915061141b565b6000546001600160a01b031633146114b95760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064016105de565b60028190556040516001600160a01b03821681527fe127cf589a3879da0156d4a24f43b44f65cfa3570de594806b0bfa2fcf06884f9060200161067f565b600061150260035490565b905090565b6001546002141561152b5760405163558a1e0360e11b815260040160405180910390fd5b6002600155565b60006040516323b872dd60e01b6000528460045283602452826044526020600060646000808a5af13d15601f3d11600160005114161716915060006060528060405250806115c25760405162461bcd60e51b815260206004820152601460248201527f5452414e534645525f46524f4d5f4641494c454400000000000000000000000060448201526064016105de565b5050505050565b6000818152600760205260409020600201546001600160a01b03163314611603576040516342e8fb9360e11b815260040160405180910390fd5b50565b600060405163a9059cbb60e01b6000528360045282602452602060006044600080895af13d15601f3d11600160005114161716915060006060528060405250806112c85760405162461bcd60e51b815260206004820152600f60248201527f5452414e534645525f4641494c4544000000000000000000000000000000000060448201526064016105de565b600080600080600085875af19050806109d15760405162461bcd60e51b815260206004820152601360248201527f4554485f5452414e534645525f4641494c45440000000000000000000000000060448201526064016105de565b6040805160208101859052908101839052606082811b6bffffffffffffffffffffffff1916908201526000906074016040516020818303038152906040528051906020012090504360086000838152602001908152602001600020600301541061176a5760405163d0404f8560e01b815260040160405180910390fd5b9392505050565b6117868484846001600160a01b0385166119a4565b6112c857604051631dc23a5f60e11b815260040160405180910390fd5b600083815260086020908152604080832085518155918501516001830155840151600282018190556060850151600383015560808501516004830180546001600160a01b0392831673ffffffffffffffffffffffffffffffffffffffff199182161790915560a087015160058501805491841691831691909117905560c08701516006909401805494909216931692909217909155825490918391611849908490612149565b9091555050608082015182516040808501518151928352602083015285926001600160a01b0316917f2a28b2ae47b0bd4b104e7cd29b1dfa72846af8c4cfdc009da2ae29db68cb67ea910160405180910390a3505050565b600080634d2b179160e01b836040516024016118bf91815260200190565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050509050600080600060206000855160208701600254617530fa92503d91506000519050809450826119545763e10bf1cc6000526004601cfd5b50505050919050565b43816003015411156119825760405163d0404f8560e01b815260040160405180910390fd5b6002810154611603576040516331da482760e11b815260040160405180910390fd5b600083156119e0578360051b8501855b803580851160051b948552602094851852604060002093018181106119d8576119dd565b6119b4565b50505b501492915050565b8280546119f490612051565b90600052602060002090601f016020900481019282611a165760008555611a5c565b82601f10611a2f57805160ff1916838001178555611a5c565b82800160010185558215611a5c579182015b82811115611a5c578251825591602001919060010190611a41565b50611a68929150611a6c565b5090565b5b80821115611a685760008155600101611a6d565b600060208284031215611a9357600080fd5b5035919050565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f1916810167ffffffffffffffff81118282101715611ad957611ad9611a9a565b604052919050565b600067ffffffffffffffff821115611afb57611afb611a9a565b5060051b60200190565b6001600160a01b038116811461160357600080fd5b600082601f830112611b2b57600080fd5b81356020611b40611b3b83611ae1565b611ab0565b82815260059290921b84018101918181019086841115611b5f57600080fd5b8286015b84811015611b83578035611b7681611b05565b8352918301918301611b63565b509695505050505050565b600060208284031215611ba057600080fd5b813567ffffffffffffffff811115611bb757600080fd5b611bc384828501611b1a565b949350505050565b600060208284031215611bdd57600080fd5b813561176a81611b05565b600080600080600060808688031215611c0057600080fd5b8535611c0b81611b05565b945060208601359350604086013567ffffffffffffffff80821115611c2f57600080fd5b818801915088601f830112611c4357600080fd5b813581811115611c5257600080fd5b896020828501011115611c6457600080fd5b96999598505060200195606001359392505050565b60008083601f840112611c8b57600080fd5b50813567ffffffffffffffff811115611ca357600080fd5b6020830191508360208260051b8501011115611cbe57600080fd5b9250929050565b600080600060408486031215611cda57600080fd5b83359250602084013567ffffffffffffffff811115611cf857600080fd5b611d0486828701611c79565b9497909650939450505050565b60008060408385031215611d2457600080fd5b8235611d2f81611b05565b946020939093013593505050565b60008060008060008060c08789031215611d5657600080fd5b863595506020870135611d6881611b05565b945060408701359350606087013592506080870135915060a087013560ff81168114611d9357600080fd5b809150509295509295509295565b600080600080600080600080600060e08a8c031215611dbf57600080fd5b8935985060208a0135611dd181611b05565b975060408a0135611de181611b05565b965060608a0135955060808a0135945060a08a013567ffffffffffffffff80821115611e0c57600080fd5b611e188d838e01611c79565b909650945060c08c0135915080821115611e3157600080fd5b50611e3e8c828d01611c79565b915080935050809150509295985092959850929598565b60008060208385031215611e6857600080fd5b823567ffffffffffffffff811115611e7f57600080fd5b611e8b85828601611c79565b90969095509350505050565b8581526000602060a08184015286518060a085015260005b81811015611ecb5788810183015185820160c001528201611eaf565b81811115611edd57600060c083870101525b50601f01601f1916830160c0019150611f03905060408301866001600160a01b03169052565b6001600160a01b038416606083015282151560808301529695505050505050565b60008060408385031215611f3757600080fd5b823567ffffffffffffffff80821115611f4f57600080fd5b611f5b86838701611b1a565b9350602091508185013581811115611f7257600080fd5b85019050601f81018613611f8557600080fd5b8035611f93611b3b82611ae1565b81815260059190911b82018301908381019088831115611fb257600080fd5b928401925b82841015611fdf5783358015158114611fd05760008081fd5b82529284019290840190611fb7565b80955050505050509250929050565b634e487b7160e01b600052603260045260246000fd5b6020808252825182820181905260009190848201906040850190845b818110156120455783516001600160a01b031683529284019291840191600101612020565b50909695505050505050565b600181811c9082168061206557607f821691505b6020821081141561208657634e487b7160e01b600052602260045260246000fd5b50919050565b600080855481600182811c9150808316806120a857607f831692505b60208084108214156120c857634e487b7160e01b86526022600452602486fd5b8180156120dc57600181146120ed5761211a565b60ff1986168952848901965061211a565b60008c81526020902060005b868110156121125781548b8201529085019083016120f9565b505084890196505b5098855250505050938401929092525050604001919050565b634e487b7160e01b600052601160045260246000fd5b60008282101561215b5761215b612133565b500390565b6000821982111561217357612173612133565b50019056fea164736f6c6343000809000a"; type P2PIXConstructorParams = | [signer?: Signer] diff --git a/test/p2pix.test.ts b/test/p2pix.test.ts index b53b3f4..0e7fede 100644 --- a/test/p2pix.test.ts +++ b/test/p2pix.test.ts @@ -1,15 +1,23 @@ import "@nomicfoundation/hardhat-chai-matchers"; -import { loadFixture } from "@nomicfoundation/hardhat-network-helpers"; +import { + loadFixture, + mine, +} from "@nomicfoundation/hardhat-network-helpers"; import { SignerWithAddress } from "@nomiclabs/hardhat-ethers/signers"; import { expect } from "chai"; -import { BigNumber, ContractReceipt, Wallet } from "ethers"; +import { + BigNumber, + ContractReceipt, + ContractTransaction, + Wallet, +} from "ethers"; import { ethers, network, /* , tracer */ } from "hardhat"; -// import keccak256 from "keccak256"; +// import keccak256 from "keccak256"; import { MockToken, P2PIX, Reputation } from "../src/types"; import { P2PixErrors } from "./utils/errors"; import { @@ -276,25 +284,6 @@ describe("P2PIX", () => { P2PixErrors.TokenDenied, ); }); - /// @todo DepositAlreadyExists() seems to be unreacheable - // it("should revert if deposit already exists", async () => { - // const pTarget = ethers.utils.keccak256( - // ethers.utils.toUtf8Bytes("_pixTarget"), - // ); - // const root = ethers.utils.keccak256( - // ethers.utils.toUtf8Bytes("0"), - // ); - // await erc20.approve(p2pix.address, 1); - // const tx = await p2pix.deposit( - // erc20.address, - // 1, - // pTarget, - // root, - // ); - // const info: Deposit = await p2pix.mapDeposits(0); - // // console.log(info) - // // console.log(info.valid); - // }); it("should create deposit, update storage and emit event", async () => { const pTarget = ethers.utils.keccak256( ethers.utils.toUtf8Bytes("_pixTarget"), @@ -955,18 +944,69 @@ describe("P2PIX", () => { expect(newState3.valid).to.be.false; }); }); - describe("Release", async () => { - // it("should revert if lock has expired or has already been released") - // it("should revert if signed message has already been used") - // it("should revert if ecrecovered signer is invalid") - // it("should release lock, update storage and emit events") - // it("should release multiple locks") - EDGE CASE TEST { - // TEST 3 CASES ( - // EMPTY PREMIUM, - // LOCK RELAYER != RELEASE RELAYER, (check userRecord storage update) - // LOCK RELAYER == RELEASE RELAYER (check userRecord storage update) - // )} - }); + // describe("Release", async () => { + // // it("should revert if lock has expired or has already been released") + // // it("should revert if signed message has already been used") + // // it("should revert if ecrecovered signer is invalid") + // // // @todo Finish storage and event checks + // // it("should release lock, update storage and emit events", async () => { + // // const endtoendID = "124"; + // // const pixTarget = "pixTarget"; + // // const messageToSign = ethers.utils.solidityKeccak256( + // // ["string", "uint256", "uint256"], + // // [pixTarget, 100, endtoendID], + // // ); + // // const messageHashBytes = + // // ethers.utils.arrayify(messageToSign); + // // const flatSig = await acc01.signMessage( + // // messageHashBytes, + // // ); + // // const sig = ethers.utils.splitSignature(flatSig); + // // const root = ethers.constants.HashZero; + + // // await erc20.approve(p2pix.address, price); + // // await p2pix.deposit( + // // erc20.address, + // // price, + // // pixTarget, + // // root, + // // ); + // // await p2pix + // // .connect(acc01) + // // .lock( + // // 0, + // // acc02.address, + // // acc03.address, + // // 0, + // // 100, + // // [], + // // [], + // // ); + // // const lockID = ethers.utils.solidityKeccak256( + // // ["uint256", "uint256", "address"], + // // [0, 100, acc02.address], + // // ); + // // const storage1: Lock = await p2pix.callStatic.mapLocks( + // // lockID, + // // ); + // // const tx = await p2pix + // // .connect(acc01) + // // .release( + // // lockID, + // // acc03.address, + // // endtoendID, + // // sig.r, + // // sig.s, + // // sig.v, + // // ); + // // }); + // // it("should release multiple locks") - EDGE CASE TEST { + // // TEST 3 CASES ( + // // EMPTY PREMIUM, + // // LOCK RELAYER != RELEASE RELAYER, (check userRecord storage update) + // // LOCK RELAYER == RELEASE RELAYER (check userRecord storage update) + // // )} + // }); describe("Unexpire Locks", async () => { it("should revert if lock isn't expired", async () => { await erc20.approve(p2pix.address, price); @@ -990,10 +1030,203 @@ describe("P2PIX", () => { P2PixErrors.NotExpired, ); }); + it("should revert if lock has already been released", async () => { + const endtoendID = "124"; + const pixTarget = "pixTarget"; + const messageToSign = ethers.utils.solidityKeccak256( + ["string", "uint256", "uint256"], + [pixTarget, 1, endtoendID], + ); + const messageHashBytes = + ethers.utils.arrayify(messageToSign); + const flatSig = await acc01.signMessage( + messageHashBytes, + ); + const sig = ethers.utils.splitSignature(flatSig); + await erc20.approve(p2pix.address, price); + await p2pix.deposit( + erc20.address, + price, + pixTarget, + merkleRoot, + ); + await p2pix + .connect(acc02) + .lock(0, acc02.address, acc03.address, 0, 1, [], []); + const lockID = ethers.utils.solidityKeccak256( + ["uint256", "uint256", "address"], + [0, 1, acc02.address], + ); + // await mine(10); + await p2pix.release( + lockID, + acc03.address, + endtoendID, + sig.r, + sig.s, + sig.v, + ); + const fail = p2pix.unlockExpired([lockID]); + + await expect(fail).to.be.revertedWithCustomError( + p2pix, + P2PixErrors.AlreadyReleased, + ); + }); it("should unlock expired locks, update storage and emit events", async () => { - // CHECK FOR userRecord STORAGE UPDATE + await erc20.approve(p2pix.address, price); + await p2pix.deposit( + erc20.address, + price, + "pixTarget", + merkleRoot, + ); + await p2pix + .connect(acc02) + .lock(0, acc02.address, acc03.address, 0, 1, [], []); + const lockID = ethers.utils.solidityKeccak256( + ["uint256", "uint256", "address"], + [0, 1, acc02.address], + ); + await mine(11); + const storage: Lock = await p2pix.callStatic.mapLocks( + lockID, + ); + const userKey = await p2pix.callStatic._castAddrToKey( + acc02.address, + ); + const record1 = await p2pix.callStatic.userRecord( + userKey, + ); + const tx = await p2pix.unlockExpired([lockID]); + const storage2: Lock = await p2pix.callStatic.mapLocks( + lockID, + ); + const record2 = await p2pix.callStatic.userRecord( + userKey, + ); + + expect(tx).to.be.ok; + await expect(tx) + .to.emit(p2pix, "LockReturned") + .withArgs(acc02.address, lockID); + expect(storage.amount).to.eq(ethers.constants.One); + expect(storage2.amount).to.eq(ethers.constants.Zero); + expect(record1).to.eq(0); + expect(record2).to.eq(100); + }); + it("should unlock expired through lock function", async () => { // test method through lock fx + await erc20.approve(p2pix.address, price); + await p2pix.deposit( + erc20.address, + price, + "pixTarget", + merkleRoot, + ); + const lock1: ContractTransaction = await p2pix + .connect(acc01) + .lock( + 0, + acc02.address, + acc03.address, + 0, + price, + proof, + [], + ); + // as return values of non view functions can't be accessed + // outside the evm, we fetch the lockID from the emitted event. + const rc: ContractReceipt = await lock1.wait(); + const event = rc.events?.find( + event => event.event === "LockAdded", + ); + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + const emittedLockID = event?.args!["lockID"]; + const lockID = ethers.utils.solidityKeccak256( + ["uint256", "uint256", "address"], + [0, price, acc02.address], + ); + + // mine blocks to expire lock + await mine(12); + // const blocknum = await p2pix.provider.getBlockNumber(); + // console.log("bn = 6 + 12 ( i.e., %s )", blocknum); + // console.log( + // "\n", + // " 2 blocks past the expiration block", + // ); + // const struct2: Lock = await p2pix.callStatic.mapLocks( + // emittedLockID, + // ); + // console.log( + // "\n", + // "Current state of the lock:", + // "\n", + // struct2, + // ); + + expect(emittedLockID).to.eq(lockID); + + // create another lock by freeing the price value + // back to `l.remamining` and lock 100 again. + const tx1 = await p2pix.lock( + 0, + acc02.address, + acc03.address, + 0, + 100, + [], + [lockID], + ); + const dep: Deposit = await p2pix.callStatic.mapDeposits( + 0, + ); + + expect(tx1).to.be.ok; + await expect(tx1) + .to.emit(p2pix, "LockReturned") + .withArgs(acc02.address, lockID); + expect(dep.remaining).to.eq( + price.sub(ethers.BigNumber.from(100)), + ); + }); + it("should unlock expired through withdraw function", async () => { // test method through withdraw fx + await erc20.approve(p2pix.address, price); + await p2pix.deposit( + erc20.address, + price, + "pixTarget", + merkleRoot, + ); + await p2pix + .connect(acc01) + .lock( + 0, + acc02.address, + acc03.address, + 0, + price, + proof, + [], + ); + const lockID = ethers.utils.solidityKeccak256( + ["uint256", "uint256", "address"], + [0, price, acc02.address], + ); + // mine blocks to expire lock + await mine(11); + const tx = await p2pix.withdraw(0, [lockID]); + const dep: Deposit = await p2pix.callStatic.mapDeposits( + 0, + ); + + expect(tx).to.be.ok; + await expect(tx) + .to.emit(p2pix, "LockReturned") + .withArgs(acc02.address, lockID); + expect(dep.remaining).to.eq(0); }); }); describe("Seller Withdraw", async () => { @@ -1051,19 +1284,34 @@ describe("P2PIX", () => { it(" should revert if the msg.sender differs from deposit's seller", async () => { const root = ethers.utils.keccak256( ethers.utils.toUtf8Bytes("root"), - ); - const fail = p2pix.connect(acc02).setRoot(owner.address, root); + ); + const fail = p2pix + .connect(acc02) + .setRoot(owner.address, root); - await expect(fail).to.be.revertedWithCustomError(p2pix, P2PixErrors.OnlySeller); + await expect(fail).to.be.revertedWithCustomError( + p2pix, + P2PixErrors.OnlySeller, + ); }); it("should set root of seller's allowlist, update storage and emit event", async () => { - const ownerKey = await p2pix.callStatic._castAddrToKey(owner.address); - const oldState = await p2pix.callStatic.sellerAllowList(ownerKey); - const tx = await p2pix.connect(owner).setRoot(owner.address, merkleRoot); - const newState = await p2pix.callStatic.sellerAllowList(ownerKey); - + const ownerKey = await p2pix.callStatic._castAddrToKey( + owner.address, + ); + const oldState = await p2pix.callStatic.sellerAllowList( + ownerKey, + ); + const tx = await p2pix + .connect(owner) + .setRoot(owner.address, merkleRoot); + const newState = await p2pix.callStatic.sellerAllowList( + ownerKey, + ); + expect(tx).to.be.ok; - await expect(tx).to.emit(p2pix, "RootUpdated").withArgs(owner.address, merkleRoot); + await expect(tx) + .to.emit(p2pix, "RootUpdated") + .withArgs(owner.address, merkleRoot); expect(oldState).to.eq(ethers.constants.HashZero); expect(newState).to.eq(merkleRoot); });