From 0d612572c6e67e93c6ee087e77e9f35073ad95dd Mon Sep 17 00:00:00 2001 From: PedroCailleret Date: Tue, 20 Dec 2022 01:39:35 -0300 Subject: [PATCH] feat: :construction: Deposit struct replaced for packed uint --- .../DataTypes.sol/DataTypes.dbg.json | 2 +- .../EventAndErrors.dbg.json | 2 +- .../EventAndErrors.sol/EventAndErrors.json | 80 +- artifacts/contracts/p2pix.sol/P2PIX.dbg.json | 2 +- artifacts/contracts/p2pix.sol/P2PIX.json | 318 +- contracts/DataTypes.sol | 27 +- contracts/EventAndErrors.sol | 21 +- contracts/p2pix.sol | 458 ++- src/types/EventAndErrors.ts | 87 +- .../factories/EventAndErrors__factory.ts | 80 +- .../factories/p2pix.sol/P2PIX__factory.ts | 316 +- src/types/p2pix.sol/P2PIX.ts | 516 ++- test/Reputation.test.ts | 2 - test/p2pix.test.ts | 3558 ++++++++--------- 14 files changed, 3092 insertions(+), 2377 deletions(-) diff --git a/artifacts/contracts/DataTypes.sol/DataTypes.dbg.json b/artifacts/contracts/DataTypes.sol/DataTypes.dbg.json index 5e2cce7..e79a018 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/0043b38db58c3ff291cf622f3b61e1a3.json" + "buildInfo": "../../build-info/f807a312b7619f2547c334c76d81a8da.json" } diff --git a/artifacts/contracts/EventAndErrors.sol/EventAndErrors.dbg.json b/artifacts/contracts/EventAndErrors.sol/EventAndErrors.dbg.json index 5e2cce7..e79a018 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/0043b38db58c3ff291cf622f3b61e1a3.json" + "buildInfo": "../../build-info/f807a312b7619f2547c334c76d81a8da.json" } diff --git a/artifacts/contracts/EventAndErrors.sol/EventAndErrors.json b/artifacts/contracts/EventAndErrors.sol/EventAndErrors.json index 0679a99..a2428ef 100644 --- a/artifacts/contracts/EventAndErrors.sol/EventAndErrors.json +++ b/artifacts/contracts/EventAndErrors.sol/EventAndErrors.json @@ -18,11 +18,21 @@ "name": "AmountNotAllowed", "type": "error" }, + { + "inputs": [], + "name": "DecOverflow", + "type": "error" + }, { "inputs": [], "name": "DepositAlreadyExists", "type": "error" }, + { + "inputs": [], + "name": "EmptyPixTarget", + "type": "error" + }, { "inputs": [], "name": "InvalidDeposit", @@ -48,6 +58,11 @@ "name": "LoopOverflow", "type": "error" }, + { + "inputs": [], + "name": "MaxBalExceeded", + "type": "error" + }, { "inputs": [], "name": "NoTokens", @@ -63,6 +78,11 @@ "name": "NotExpired", "type": "error" }, + { + "inputs": [], + "name": "NotInitialized", + "type": "error" + }, { "inputs": [], "name": "OnlySeller", @@ -111,12 +131,6 @@ "name": "seller", "type": "address" }, - { - "indexed": false, - "internalType": "uint256", - "name": "depositID", - "type": "uint256" - }, { "indexed": false, "internalType": "address", @@ -144,29 +158,10 @@ }, { "indexed": false, - "internalType": "uint256", - "name": "depositID", - "type": "uint256" - } - ], - "name": "DepositClosed", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, "internalType": "address", - "name": "seller", + "name": "token", "type": "address" }, - { - "indexed": false, - "internalType": "uint256", - "name": "depositID", - "type": "uint256" - }, { "indexed": false, "internalType": "uint256", @@ -214,7 +209,7 @@ { "indexed": false, "internalType": "uint256", - "name": "depositID", + "name": "seller", "type": "uint256" }, { @@ -254,6 +249,12 @@ "internalType": "bytes32", "name": "lockId", "type": "bytes32" + }, + { + "indexed": false, + "internalType": "uint256", + "name": "amount", + "type": "uint256" } ], "name": "LockReleased", @@ -310,6 +311,31 @@ "name": "RootUpdated", "type": "event" }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "seller", + "type": "address" + }, + { + "indexed": false, + "internalType": "address", + "name": "token", + "type": "address" + }, + { + "indexed": false, + "internalType": "bool", + "name": "state", + "type": "bool" + } + ], + "name": "ValidSet", + "type": "event" + }, { "anonymous": false, "inputs": [ diff --git a/artifacts/contracts/p2pix.sol/P2PIX.dbg.json b/artifacts/contracts/p2pix.sol/P2PIX.dbg.json index 0081d48..0df3fc6 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/948b888bf726ea051449ea823f31e46a.json" + "buildInfo": "../../build-info/a89635dd94b1e537327e1582c6d97eb3.json" } diff --git a/artifacts/contracts/p2pix.sol/P2PIX.json b/artifacts/contracts/p2pix.sol/P2PIX.json index e2d2365..1c83664 100644 --- a/artifacts/contracts/p2pix.sol/P2PIX.json +++ b/artifacts/contracts/p2pix.sol/P2PIX.json @@ -49,11 +49,21 @@ "name": "AmountNotAllowed", "type": "error" }, + { + "inputs": [], + "name": "DecOverflow", + "type": "error" + }, { "inputs": [], "name": "DepositAlreadyExists", "type": "error" }, + { + "inputs": [], + "name": "EmptyPixTarget", + "type": "error" + }, { "inputs": [], "name": "InvalidDeposit", @@ -79,6 +89,11 @@ "name": "LoopOverflow", "type": "error" }, + { + "inputs": [], + "name": "MaxBalExceeded", + "type": "error" + }, { "inputs": [], "name": "NoTokens", @@ -94,6 +109,11 @@ "name": "NotExpired", "type": "error" }, + { + "inputs": [], + "name": "NotInitialized", + "type": "error" + }, { "inputs": [], "name": "OnlySeller", @@ -147,12 +167,6 @@ "name": "seller", "type": "address" }, - { - "indexed": false, - "internalType": "uint256", - "name": "depositID", - "type": "uint256" - }, { "indexed": false, "internalType": "address", @@ -180,29 +194,10 @@ }, { "indexed": false, - "internalType": "uint256", - "name": "depositID", - "type": "uint256" - } - ], - "name": "DepositClosed", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, "internalType": "address", - "name": "seller", + "name": "token", "type": "address" }, - { - "indexed": false, - "internalType": "uint256", - "name": "depositID", - "type": "uint256" - }, { "indexed": false, "internalType": "uint256", @@ -250,7 +245,7 @@ { "indexed": false, "internalType": "uint256", - "name": "depositID", + "name": "seller", "type": "uint256" }, { @@ -290,6 +285,12 @@ "internalType": "bytes32", "name": "lockId", "type": "bytes32" + }, + { + "indexed": false, + "internalType": "uint256", + "name": "amount", + "type": "uint256" } ], "name": "LockReleased", @@ -365,6 +366,31 @@ "name": "RootUpdated", "type": "event" }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "seller", + "type": "address" + }, + { + "indexed": false, + "internalType": "address", + "name": "token", + "type": "address" + }, + { + "indexed": false, + "internalType": "bool", + "name": "state", + "type": "bool" + } + ], + "name": "ValidSet", + "type": "event" + }, { "anonymous": false, "inputs": [ @@ -410,6 +436,25 @@ "stateMutability": "pure", "type": "function" }, + { + "inputs": [ + { + "internalType": "uint256", + "name": "_key", + "type": "uint256" + } + ], + "name": "_castKeyToAddr", + "outputs": [ + { + "internalType": "address", + "name": "_addr", + "type": "address" + } + ], + "stateMutability": "pure", + "type": "function" + }, { "inputs": [ { @@ -429,19 +474,6 @@ "stateMutability": "view", "type": "function" }, - { - "inputs": [ - { - "internalType": "uint256", - "name": "depositID", - "type": "uint256" - } - ], - "name": "cancelDeposit", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, { "inputs": [], "name": "defaultLockBlocks", @@ -463,14 +495,19 @@ "type": "address" }, { - "internalType": "uint256", + "internalType": "uint96", "name": "_amount", - "type": "uint256" + "type": "uint96" }, { - "internalType": "string", + "internalType": "uint160", "name": "_pixTarget", - "type": "string" + "type": "uint160" + }, + { + "internalType": "bool", + "name": "_valid", + "type": "bool" }, { "internalType": "bytes32", @@ -479,23 +516,28 @@ } ], "name": "deposit", - "outputs": [ - { - "internalType": "uint256", - "name": "depositID", - "type": "uint256" - } - ], + "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { - "inputs": [], - "name": "depositCount", + "inputs": [ + { + "internalType": "address", + "name": "seller", + "type": "address" + }, + { + "internalType": "contract ERC20", + "name": "token", + "type": "address" + } + ], + "name": "getBalance", "outputs": [ { "internalType": "uint256", - "name": "_val", + "name": "bal", "type": "uint256" } ], @@ -505,9 +547,62 @@ { "inputs": [ { - "internalType": "uint256", - "name": "_depositID", - "type": "uint256" + "internalType": "address", + "name": "seller", + "type": "address" + }, + { + "internalType": "contract ERC20", + "name": "token", + "type": "address" + } + ], + "name": "getPixTarget", + "outputs": [ + { + "internalType": "uint160", + "name": "pixTarget", + "type": "uint160" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "address", + "name": "seller", + "type": "address" + }, + { + "internalType": "contract ERC20", + "name": "token", + "type": "address" + } + ], + "name": "getValid", + "outputs": [ + { + "internalType": "bool", + "name": "valid", + "type": "bool" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "address", + "name": "_seller", + "type": "address" + }, + { + "internalType": "address", + "name": "_token", + "type": "address" }, { "internalType": "address", @@ -552,41 +647,15 @@ "type": "function" }, { - "inputs": [ + "inputs": [], + "name": "lockCounter", + "outputs": [ { "internalType": "uint256", "name": "", "type": "uint256" } ], - "name": "mapDeposits", - "outputs": [ - { - "internalType": "uint256", - "name": "remaining", - "type": "uint256" - }, - { - "internalType": "string", - "name": "pixTarget", - "type": "string" - }, - { - "internalType": "address", - "name": "seller", - "type": "address" - }, - { - "internalType": "address", - "name": "token", - "type": "address" - }, - { - "internalType": "bool", - "name": "valid", - "type": "bool" - } - ], "stateMutability": "view", "type": "function" }, @@ -602,7 +671,12 @@ "outputs": [ { "internalType": "uint256", - "name": "depositID", + "name": "sellerKey", + "type": "uint256" + }, + { + "internalType": "uint256", + "name": "counter", "type": "uint256" }, { @@ -620,6 +694,11 @@ "name": "expirationBlock", "type": "uint256" }, + { + "internalType": "uint160", + "name": "pixTarget", + "type": "uint160" + }, { "internalType": "address", "name": "buyerAddress", @@ -634,6 +713,11 @@ "internalType": "address", "name": "relayerAddress", "type": "address" + }, + { + "internalType": "address", + "name": "token", + "type": "address" } ], "stateMutability": "view", @@ -722,6 +806,30 @@ "stateMutability": "view", "type": "function" }, + { + "inputs": [ + { + "internalType": "uint256", + "name": "", + "type": "uint256" + }, + { + "internalType": "contract ERC20", + "name": "", + "type": "address" + } + ], + "name": "sellerBalance", + "outputs": [ + { + "internalType": "uint256", + "name": "", + "type": "uint256" + } + ], + "stateMutability": "view", + "type": "function" + }, { "inputs": [ { @@ -792,6 +900,24 @@ "stateMutability": "nonpayable", "type": "function" }, + { + "inputs": [ + { + "internalType": "contract ERC20", + "name": "token", + "type": "address" + }, + { + "internalType": "bool", + "name": "state", + "type": "bool" + } + ], + "name": "setValidState", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, { "inputs": [ { @@ -883,9 +1009,9 @@ { "inputs": [ { - "internalType": "uint256", - "name": "depositID", - "type": "uint256" + "internalType": "contract ERC20", + "name": "token", + "type": "address" }, { "internalType": "bytes32[]", @@ -894,7 +1020,13 @@ } ], "name": "withdraw", - "outputs": [], + "outputs": [ + { + "internalType": "uint256", + "name": "_sellerBalance", + "type": "uint256" + } + ], "stateMutability": "nonpayable", "type": "function" }, @@ -910,8 +1042,8 @@ "type": "receive" } ], - "bytecode": "0x608060405260018055604051620028a1380380620028a18339810160408190526200002a916200049d565b600080546001600160a01b031916339081178255604051909182917f8292fce18fa69edf4db7b94ea2e58241df0ae57f97e0a6c9b29067028bf92d76908290a3506200007685620000a3565b620000818362000133565b6200008c84620001bd565b620000988282620002a1565b505050505062000620565b6000546001600160a01b03163314620000f25760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064015b60405180910390fd5b806004557f70fa43ca70216ad905ade86b9e650a691b2ce5a01980d0a81bdd8324141b8511816040516200012891815260200190565b60405180910390a150565b6000546001600160a01b031633146200017e5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401620000e9565b60028190556040516001600160a01b03821681527fe127cf589a3879da0156d4a24f43b44f65cfa3570de594806b0bfa2fcf06884f9060200162000128565b6000546001600160a01b03163314620002085760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401620000e9565b80516000905b808210156200026e57600062000246848481518110620002325762000232620005bb565b60200260200101516200038760201b60201c565b6000908152600660205260409020805460ff191660019081179091559290920191506200020e565b50507f14a422d2412784a5749d03da98921fe468c98577b767851389a9f58ea5a363d781604051620001289190620005d1565b6000546001600160a01b03163314620002ec5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401620000e9565b815180620003025763df9578836000526004601cfd5b81518114620003195763ff633a386000526004601cfd5b60208301602083016020830282015b8083146200037f578251600052600b60205260406000208251815550815183517f5d6e86e5341d57a92c49934296c51542a25015c9b1782a1c2722a940131c3d9a600080a360208301925060208201915062000328565b505050505050565b600c1b611000600160ac1b031690565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b0381118282101715620003d857620003d862000397565b604052919050565b60006001600160401b03821115620003fc57620003fc62000397565b5060051b60200190565b6001600160a01b03811681146200041c57600080fd5b50565b600082601f8301126200043157600080fd5b815160206200044a6200044483620003e0565b620003ad565b82815260059290921b840181019181810190868411156200046a57600080fd5b8286015b8481101562000492578051620004848162000406565b83529183019183016200046e565b509695505050505050565b600080600080600060a08688031215620004b657600080fd5b8551602080880151919650906001600160401b0380821115620004d857600080fd5b620004e68a838b016200041f565b965060408901519150620004fa8262000406565b6060890151919550808211156200051057600080fd5b6200051e8a838b016200041f565b945060808901519150808211156200053557600080fd5b508701601f810189136200054857600080fd5b8051620005596200044482620003e0565b81815260059190911b8201830190838101908b8311156200057957600080fd5b928401925b82841015620005a95783518015158114620005995760008081fd5b825292840192908401906200057e565b80955050505050509295509295909350565b634e487b7160e01b600052603260045260246000fd5b6020808252825182820181905260009190848201906040850190845b81811015620006145783516001600160a01b031683529284019291840191600101620005ed565b50909695505050505050565b61227180620006306000396000f3fe6080604052600436106101a55760003560e01c806372fada5c116100e15780638e2749d61161008a57806398a268711161006457806398a268711461056b578063c52164c61461059b578063d6e8b973146105bb578063f7d0e04b146105db57600080fd5b80638e2749d6146105045780638e2a3d36146105245780639872dbfe1461055557600080fd5b80637f94f65d116100bb5780637f94f65d1461048c5780638652b37e146104ac5780638da5cb5b146104cc57600080fd5b806372fada5c1461041f578063758d77d41461043f57806377cd38a41461045f57600080fd5b8063363179721161014e578063574983c811610128578063574983c81461039e5780635fd8c710146103be57806369cc6af4146103d35780636a1460241461040357600080fd5b80633631797214610313578063461f3120146103335780634b2ae9801461037357600080fd5b806316d722401161017f57806316d722401461023357806329cc7d10146102dc5780632dfdf0b5146102fc57600080fd5b806304937320146101b15780630d2a2d44146101f157806313af40351461021357600080fd5b366101ac57005b600080fd5b3480156101bd57600080fd5b506101de6101cc366004611b2c565b60056020526000908152604090205481565b6040519081526020015b60405180910390f35b3480156101fd57600080fd5b5061021161020c366004611c39565b6105fb565b005b34801561021f57600080fd5b5061021161022e366004611c76565b6106ec565b34801561023f57600080fd5b5061029861024e366004611b2c565b600860205260009081526040902080546001820154600283015460038401546004850154600586015460069096015494959394929391926001600160a01b03918216928216911687565b6040805197885260208801969096529486019390935260608501919091526001600160a01b03908116608085015290811660a08401521660c082015260e0016101e8565b3480156102e857600080fd5b506101de6102f7366004611c93565b61078d565b34801561030857600080fd5b506003546101de9081565b34801561031f57600080fd5b5061021161032e366004611d70565b610978565b34801561033f57600080fd5b5061036361034e366004611b2c565b60096020526000908152604090205460ff1681565b60405190151581526020016101e8565b34801561037f57600080fd5b506101de61038e366004611c76565b600c1b611000600160ac1b031690565b3480156103aa57600080fd5b506102116103b9366004611b2c565b610a38565b3480156103ca57600080fd5b50610211610ab6565b3480156103df57600080fd5b506103636103ee366004611c76565b600b6020526000908152604090205460ff1681565b34801561040f57600080fd5b506101de670de0b6b3a764000081565b34801561042b57600080fd5b5061021161043a366004611b2c565b610b40565b34801561044b57600080fd5b5061021161045a366004611dbc565b610bc8565b34801561046b57600080fd5b506101de61047a366004611b2c565b600a6020526000908152604090205481565b34801561049857600080fd5b506102116104a7366004611e20565b610f9e565b3480156104b857600080fd5b506101de6104c7366004611e4c565b611031565b3480156104d857600080fd5b506000546104ec906001600160a01b031681565b6040516001600160a01b0390911681526020016101e8565b34801561051057600080fd5b5061021161051f366004611f00565b611211565b34801561053057600080fd5b5061054461053f366004611b2c565b611379565b6040516101e8959493929190611f42565b34801561056157600080fd5b506101de60045481565b34801561057757600080fd5b50610363610586366004611b2c565b60066020526000908152604090205460ff1681565b3480156105a757600080fd5b506002546104ec906001600160a01b031681565b3480156105c757600080fd5b506102116105d6366004611fcf565b611443565b3480156105e757600080fd5b506102116105f6366004611c76565b61151b565b6000546001600160a01b031633146106495760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064015b60405180910390fd5b80516000905b808210156106b057600061068984848151811061066e5761066e612099565b6020026020010151611000600160ac1b03600c9190911b1690565b6000908152600660205260409020805460ff1916600190811790915592909201915061064f565b50507f14a422d2412784a5749d03da98921fe468c98577b767851389a9f58ea5a363d7816040516106e191906120af565b60405180910390a150565b6000546001600160a01b031633146107355760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401610640565b6000805473ffffffffffffffffffffffffffffffffffffffff19166001600160a01b0383169081178255604051909133917f8292fce18fa69edf4db7b94ea2e58241df0ae57f97e0a6c9b29067028bf92d769190a350565b6001600160a01b0385166000908152600b6020526040812054869060ff166107c857604051630abc194760e11b815260040160405180910390fd5b6107d06115a2565b915060006040518060a0016040528088815260200187878080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152505050908252503360208201526001600160a01b038a166040820152600160609091015290506108456115b2565b8315610855576108553385610f9e565b6000838152600760209081526040909120825181558183015180518493610883926001850192910190611a93565b5060408201516002820180546001600160a01b0392831673ffffffffffffffffffffffffffffffffffffffff199091161790556060830151600392830180546080909501511515600160a01b027fffffffffffffffffffffff00000000000000000000000000000000000000000090951691909216179290921790915561090d9080546001019055565b6109198233308a6115dd565b61092260018055565b604080518481526001600160a01b038a16602082015290810188905233907f25ac57b911b0f66b64c294827f539545fbc3ddd002cafab117776274f3241e4c9060600160405180910390a2505095945050505050565b6109806115b2565b61098983611674565b6109938282611211565b60008381526007602052604090206003810154600160a01b900460ff161515600114156109c3576109c384610b40565b600381015481546000835560028301546001600160a01b03928316926109ec91849116836116b1565b604080518781526020810183905233917f7719804546c0185709e60c90d164447ff251a5ba29af0216faa921350f6bebf7910160405180910390a2505050610a3360018055565b505050565b6000546001600160a01b03163314610a815760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401610640565b806004557f70fa43ca70216ad905ade86b9e650a691b2ce5a01980d0a81bdd8324141b8511816040516106e191815260200190565b6000546001600160a01b03163314610aff5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401610640565b47610b0a338261173d565b60408051338152602081018390527feaff4b37086828766ad3268786972c0cd24259d4c87a80f9d3963a3c3d999b0d91016106e1565b610b4981611674565b6000818152600760209081526040918290206003810180547fffffffffffffffffffffff00ffffffffffffffffffffffffffffffffffffffff1690556002015491518381526001600160a01b03909216917fb4d98b272597e828d9b172c0d44390d5b267040e918088eac8a0a0fadcb81c70910160405180910390a250565b610bd06115b2565b60008681526008602052604090206002810154610c00576040516331da482760e11b815260040160405180910390fd5b4381600301541015610c25576040516307b7d7dd60e51b815260040160405180910390fd5b8054600090815260076020908152604080832060028501549151909392610c5592600186019290918b9101612137565b604051602081830303815290604052805190602001209050600081604051602001610cac91907f19457468657265756d205369676e6564204d6573736167653a0a3332000000008152601c810191909152603c0190565b60408051601f1981840301815291815281516020928301206000858152600990935291205490915060ff16151560011415610cfa57604051637a48537560e11b815260040160405180910390fd5b6040805160008082526020820180845284905260ff8816928201929092526060810189905260808101889052610d6e9060019060a0016020604051602081039080840390855afa158015610d52573d6000803e3d6000fd5b5050604051601f190151600c1b611000600160ac1b0316919050565b60008181526006602052604090205490915060ff16610da057604051632057875960e21b815260040160405180910390fd5b6003840154600286015460018701546001600160a01b0390921691600090610dc890836121f4565b600060028a0181905560038a01819055878152600960205260409020805460ff191660011790556006890154909150336001600160a01b0390911614610e79576001880154611000600160ac1b0333600c1b1660009081526005602052604081208054909190610e3990849061220b565b90915550506006880154600c1b611000600160ac1b031660009081526005602052604081208054849290610e6e90849061220b565b90915550610ebb9050565b818860010154610e89919061220b565b611000600160ac1b0333600c1b1660009081526005602052604081208054909190610eb590849061220b565b90915550505b6004880154610ed59084906001600160a01b0316836116b1565b600188015415610f415760058801546001600160a01b038e8116911614610f325760058801546001808a0154610f1a9286926001600160a01b0390911691901c6116b1565b610f2d838e60018b60010154901c6116b1565b610f41565b610f41838e8a600101546116b1565b60048801546040518f81526001600160a01b03909116907f5e420822d2f7281fdc4b763c62c8b7874bf22108a35efe93144d79296aacc67d9060200160405180910390a25050505050505050610f9660018055565b505050505050565b6001600160a01b03821633141561101857611000600160ac1b03600c83901b166000908152600a602090815260409182902083905581516001600160a01b038516815290810183905281517f0b294da292f26e55fd442b5c0164fbb9013036ff00c5cfdde0efd01c1baaf632929181900390910190a15050565b6040516342e8fb9360e11b815260040160405180910390fd5b600061103b6115b2565b6110458383611211565b60008a81526007602052604090206003810154600160a01b900460ff1661107f57604051635972996f60e11b815260040160405180910390fd5b80548711156110a1576040516308aeed0f60e21b815260040160405180910390fd5b6110ac8b888c611798565b915060006040518060e001604052808d81526020018a8152602001898152602001600454436110db919061220b565b81526001600160a01b03808e1660208301528c1660408201523360609091015290508515611144576002820154600c1b611000600160ac1b03166000908152600a602052604090205461113290889088903361181c565b61113d83828461184e565b50506111fb565b68056bc75e2d631000008160400151116111635761113d83828461184e565b611000600160ac1b0333600c1b166000908152600560205260408120549061119b611196670de0b6b3a764000084612223565b61194c565b90506111af670de0b6b3a764000082612245565b836040015111806111cd575069d3c21bcecceda10000008360400151115b156111eb57604051630e0c7c2360e11b815260040160405180910390fd5b6111f685848661184e565b505050505b61120460018055565b9998505050505050505050565b6000815b8082101561135d5760006008600086868681811061123557611235612099565b905060200201358152602001908152602001600020905061125581611a08565b600281015481546000908152600760205260408120805490919061127a90849061220b565b90915550506000600282018190556006820154600c1b611000600160ac1b031660008181526005602052604090205490915060011c68056bc75e2d6310000081116112de57600082815260056020526040902068056bc75e2d6310000090556112f0565b60008281526005602052604090208190555b60048301546001600160a01b03167f67e089478e21dd12c98e69331c4152f6c9b2038b91e0f28268ffa01558c0b4ff88888881811061133157611331612099565b9050602002013560405161134791815260200190565b60405180910390a2846001019450505050611215565b808210156113735763dfb035c96000526004601cfd5b50505050565b6007602052600090815260409020805460018201805491929161139b906120fc565b80601f01602080910402602001604051908101604052809291908181526020018280546113c7906120fc565b80156114145780601f106113e957610100808354040283529160200191611414565b820191906000526020600020905b8154815290600101906020018083116113f757829003601f168201915b50505050600283015460039093015491926001600160a01b03908116929081169150600160a01b900460ff1685565b6000546001600160a01b0316331461148c5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401610640565b8151806114a15763df9578836000526004601cfd5b815181146114b75763ff633a386000526004601cfd5b60208301602083016020830282015b808314610f96578251600052600b60205260406000208251815550815183517f5d6e86e5341d57a92c49934296c51542a25015c9b1782a1c2722a940131c3d9a600080a36020830192506020820191506114c6565b6000546001600160a01b031633146115645760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401610640565b60028190556040516001600160a01b03821681527fe127cf589a3879da0156d4a24f43b44f65cfa3570de594806b0bfa2fcf06884f906020016106e1565b60006115ad60035490565b905090565b600154600214156115d65760405163558a1e0360e11b815260040160405180910390fd5b6002600155565b60006040516323b872dd60e01b6000528460045283602452826044526020600060646000808a5af13d15601f3d116001600051141617169150600060605280604052508061166d5760405162461bcd60e51b815260206004820152601460248201527f5452414e534645525f46524f4d5f4641494c45440000000000000000000000006044820152606401610640565b5050505050565b6000818152600760205260409020600201546001600160a01b031633146116ae576040516342e8fb9360e11b815260040160405180910390fd5b50565b600060405163a9059cbb60e01b6000528360045282602452602060006044600080895af13d15601f3d11600160005114161716915060006060528060405250806113735760405162461bcd60e51b815260206004820152600f60248201527f5452414e534645525f4641494c454400000000000000000000000000000000006044820152606401610640565b600080600080600085875af1905080610a335760405162461bcd60e51b815260206004820152601360248201527f4554485f5452414e534645525f4641494c4544000000000000000000000000006044820152606401610640565b6040805160208101859052908101839052606082811b6bffffffffffffffffffffffff191690820152600090607401604051602081830303815290604052805190602001209050436008600083815260200190815260200160002060030154106118155760405163d0404f8560e01b815260040160405180910390fd5b9392505050565b6118318484846001600160a01b038516611a4f565b61137357604051631dc23a5f60e11b815260040160405180910390fd5b600083815260086020908152604080832085518155918501516001830155840151600282018190556060850151600383015560808501516004830180546001600160a01b0392831673ffffffffffffffffffffffffffffffffffffffff199182161790915560a087015160058501805491841691831691909117905560c087015160069094018054949092169316929092179091558254909183916118f49084906121f4565b9091555050608082015182516040808501518151928352602083015285926001600160a01b0316917f2a28b2ae47b0bd4b104e7cd29b1dfa72846af8c4cfdc009da2ae29db68cb67ea910160405180910390a3505050565b600080634d2b179160e01b8360405160240161196a91815260200190565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050509050600080600060206000855160208701600254617530fa92503d91506000519050809450826119ff5763e10bf1cc6000526004601cfd5b50505050919050565b4381600301541115611a2d5760405163d0404f8560e01b815260040160405180910390fd5b60028101546116ae576040516331da482760e11b815260040160405180910390fd5b60008315611a8b578360051b8501855b803580851160051b94855260209485185260406000209301818110611a8357611a88565b611a5f565b50505b501492915050565b828054611a9f906120fc565b90600052602060002090601f016020900481019282611ac15760008555611b07565b82601f10611ada57805160ff1916838001178555611b07565b82800160010185558215611b07579182015b82811115611b07578251825591602001919060010190611aec565b50611b13929150611b17565b5090565b5b80821115611b135760008155600101611b18565b600060208284031215611b3e57600080fd5b5035919050565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f1916810167ffffffffffffffff81118282101715611b8457611b84611b45565b604052919050565b600067ffffffffffffffff821115611ba657611ba6611b45565b5060051b60200190565b6001600160a01b03811681146116ae57600080fd5b600082601f830112611bd657600080fd5b81356020611beb611be683611b8c565b611b5b565b82815260059290921b84018101918181019086841115611c0a57600080fd5b8286015b84811015611c2e578035611c2181611bb0565b8352918301918301611c0e565b509695505050505050565b600060208284031215611c4b57600080fd5b813567ffffffffffffffff811115611c6257600080fd5b611c6e84828501611bc5565b949350505050565b600060208284031215611c8857600080fd5b813561181581611bb0565b600080600080600060808688031215611cab57600080fd5b8535611cb681611bb0565b945060208601359350604086013567ffffffffffffffff80821115611cda57600080fd5b818801915088601f830112611cee57600080fd5b813581811115611cfd57600080fd5b896020828501011115611d0f57600080fd5b96999598505060200195606001359392505050565b60008083601f840112611d3657600080fd5b50813567ffffffffffffffff811115611d4e57600080fd5b6020830191508360208260051b8501011115611d6957600080fd5b9250929050565b600080600060408486031215611d8557600080fd5b83359250602084013567ffffffffffffffff811115611da357600080fd5b611daf86828701611d24565b9497909650939450505050565b60008060008060008060c08789031215611dd557600080fd5b863595506020870135611de781611bb0565b945060408701359350606087013592506080870135915060a087013560ff81168114611e1257600080fd5b809150509295509295509295565b60008060408385031215611e3357600080fd5b8235611e3e81611bb0565b946020939093013593505050565b600080600080600080600080600060e08a8c031215611e6a57600080fd5b8935985060208a0135611e7c81611bb0565b975060408a0135611e8c81611bb0565b965060608a0135955060808a0135945060a08a013567ffffffffffffffff80821115611eb757600080fd5b611ec38d838e01611d24565b909650945060c08c0135915080821115611edc57600080fd5b50611ee98c828d01611d24565b915080935050809150509295985092959850929598565b60008060208385031215611f1357600080fd5b823567ffffffffffffffff811115611f2a57600080fd5b611f3685828601611d24565b90969095509350505050565b8581526000602060a08184015286518060a085015260005b81811015611f765788810183015185820160c001528201611f5a565b81811115611f8857600060c083870101525b50601f01601f1916830160c0019150611fae905060408301866001600160a01b03169052565b6001600160a01b038416606083015282151560808301529695505050505050565b60008060408385031215611fe257600080fd5b823567ffffffffffffffff80821115611ffa57600080fd5b61200686838701611bc5565b935060209150818501358181111561201d57600080fd5b85019050601f8101861361203057600080fd5b803561203e611be682611b8c565b81815260059190911b8201830190838101908883111561205d57600080fd5b928401925b8284101561208a578335801515811461207b5760008081fd5b82529284019290840190612062565b80955050505050509250929050565b634e487b7160e01b600052603260045260246000fd5b6020808252825182820181905260009190848201906040850190845b818110156120f05783516001600160a01b0316835292840192918401916001016120cb565b50909695505050505050565b600181811c9082168061211057607f821691505b6020821081141561213157634e487b7160e01b600052602260045260246000fd5b50919050565b600080855481600182811c91508083168061215357607f831692505b602080841082141561217357634e487b7160e01b86526022600452602486fd5b8180156121875760018114612198576121c5565b60ff198616895284890196506121c5565b60008c81526020902060005b868110156121bd5781548b8201529085019083016121a4565b505084890196505b5098855250505050938401929092525050604001919050565b634e487b7160e01b600052601160045260246000fd5b600082821015612206576122066121de565b500390565b6000821982111561221e5761221e6121de565b500190565b60008261224057634e487b7160e01b600052601260045260246000fd5b500490565b600081600019048311821515161561225f5761225f6121de565b50029056fea164736f6c6343000809000a", - "deployedBytecode": "0x6080604052600436106101a55760003560e01c806372fada5c116100e15780638e2749d61161008a57806398a268711161006457806398a268711461056b578063c52164c61461059b578063d6e8b973146105bb578063f7d0e04b146105db57600080fd5b80638e2749d6146105045780638e2a3d36146105245780639872dbfe1461055557600080fd5b80637f94f65d116100bb5780637f94f65d1461048c5780638652b37e146104ac5780638da5cb5b146104cc57600080fd5b806372fada5c1461041f578063758d77d41461043f57806377cd38a41461045f57600080fd5b8063363179721161014e578063574983c811610128578063574983c81461039e5780635fd8c710146103be57806369cc6af4146103d35780636a1460241461040357600080fd5b80633631797214610313578063461f3120146103335780634b2ae9801461037357600080fd5b806316d722401161017f57806316d722401461023357806329cc7d10146102dc5780632dfdf0b5146102fc57600080fd5b806304937320146101b15780630d2a2d44146101f157806313af40351461021357600080fd5b366101ac57005b600080fd5b3480156101bd57600080fd5b506101de6101cc366004611b2c565b60056020526000908152604090205481565b6040519081526020015b60405180910390f35b3480156101fd57600080fd5b5061021161020c366004611c39565b6105fb565b005b34801561021f57600080fd5b5061021161022e366004611c76565b6106ec565b34801561023f57600080fd5b5061029861024e366004611b2c565b600860205260009081526040902080546001820154600283015460038401546004850154600586015460069096015494959394929391926001600160a01b03918216928216911687565b6040805197885260208801969096529486019390935260608501919091526001600160a01b03908116608085015290811660a08401521660c082015260e0016101e8565b3480156102e857600080fd5b506101de6102f7366004611c93565b61078d565b34801561030857600080fd5b506003546101de9081565b34801561031f57600080fd5b5061021161032e366004611d70565b610978565b34801561033f57600080fd5b5061036361034e366004611b2c565b60096020526000908152604090205460ff1681565b60405190151581526020016101e8565b34801561037f57600080fd5b506101de61038e366004611c76565b600c1b611000600160ac1b031690565b3480156103aa57600080fd5b506102116103b9366004611b2c565b610a38565b3480156103ca57600080fd5b50610211610ab6565b3480156103df57600080fd5b506103636103ee366004611c76565b600b6020526000908152604090205460ff1681565b34801561040f57600080fd5b506101de670de0b6b3a764000081565b34801561042b57600080fd5b5061021161043a366004611b2c565b610b40565b34801561044b57600080fd5b5061021161045a366004611dbc565b610bc8565b34801561046b57600080fd5b506101de61047a366004611b2c565b600a6020526000908152604090205481565b34801561049857600080fd5b506102116104a7366004611e20565b610f9e565b3480156104b857600080fd5b506101de6104c7366004611e4c565b611031565b3480156104d857600080fd5b506000546104ec906001600160a01b031681565b6040516001600160a01b0390911681526020016101e8565b34801561051057600080fd5b5061021161051f366004611f00565b611211565b34801561053057600080fd5b5061054461053f366004611b2c565b611379565b6040516101e8959493929190611f42565b34801561056157600080fd5b506101de60045481565b34801561057757600080fd5b50610363610586366004611b2c565b60066020526000908152604090205460ff1681565b3480156105a757600080fd5b506002546104ec906001600160a01b031681565b3480156105c757600080fd5b506102116105d6366004611fcf565b611443565b3480156105e757600080fd5b506102116105f6366004611c76565b61151b565b6000546001600160a01b031633146106495760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064015b60405180910390fd5b80516000905b808210156106b057600061068984848151811061066e5761066e612099565b6020026020010151611000600160ac1b03600c9190911b1690565b6000908152600660205260409020805460ff1916600190811790915592909201915061064f565b50507f14a422d2412784a5749d03da98921fe468c98577b767851389a9f58ea5a363d7816040516106e191906120af565b60405180910390a150565b6000546001600160a01b031633146107355760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401610640565b6000805473ffffffffffffffffffffffffffffffffffffffff19166001600160a01b0383169081178255604051909133917f8292fce18fa69edf4db7b94ea2e58241df0ae57f97e0a6c9b29067028bf92d769190a350565b6001600160a01b0385166000908152600b6020526040812054869060ff166107c857604051630abc194760e11b815260040160405180910390fd5b6107d06115a2565b915060006040518060a0016040528088815260200187878080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152505050908252503360208201526001600160a01b038a166040820152600160609091015290506108456115b2565b8315610855576108553385610f9e565b6000838152600760209081526040909120825181558183015180518493610883926001850192910190611a93565b5060408201516002820180546001600160a01b0392831673ffffffffffffffffffffffffffffffffffffffff199091161790556060830151600392830180546080909501511515600160a01b027fffffffffffffffffffffff00000000000000000000000000000000000000000090951691909216179290921790915561090d9080546001019055565b6109198233308a6115dd565b61092260018055565b604080518481526001600160a01b038a16602082015290810188905233907f25ac57b911b0f66b64c294827f539545fbc3ddd002cafab117776274f3241e4c9060600160405180910390a2505095945050505050565b6109806115b2565b61098983611674565b6109938282611211565b60008381526007602052604090206003810154600160a01b900460ff161515600114156109c3576109c384610b40565b600381015481546000835560028301546001600160a01b03928316926109ec91849116836116b1565b604080518781526020810183905233917f7719804546c0185709e60c90d164447ff251a5ba29af0216faa921350f6bebf7910160405180910390a2505050610a3360018055565b505050565b6000546001600160a01b03163314610a815760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401610640565b806004557f70fa43ca70216ad905ade86b9e650a691b2ce5a01980d0a81bdd8324141b8511816040516106e191815260200190565b6000546001600160a01b03163314610aff5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401610640565b47610b0a338261173d565b60408051338152602081018390527feaff4b37086828766ad3268786972c0cd24259d4c87a80f9d3963a3c3d999b0d91016106e1565b610b4981611674565b6000818152600760209081526040918290206003810180547fffffffffffffffffffffff00ffffffffffffffffffffffffffffffffffffffff1690556002015491518381526001600160a01b03909216917fb4d98b272597e828d9b172c0d44390d5b267040e918088eac8a0a0fadcb81c70910160405180910390a250565b610bd06115b2565b60008681526008602052604090206002810154610c00576040516331da482760e11b815260040160405180910390fd5b4381600301541015610c25576040516307b7d7dd60e51b815260040160405180910390fd5b8054600090815260076020908152604080832060028501549151909392610c5592600186019290918b9101612137565b604051602081830303815290604052805190602001209050600081604051602001610cac91907f19457468657265756d205369676e6564204d6573736167653a0a3332000000008152601c810191909152603c0190565b60408051601f1981840301815291815281516020928301206000858152600990935291205490915060ff16151560011415610cfa57604051637a48537560e11b815260040160405180910390fd5b6040805160008082526020820180845284905260ff8816928201929092526060810189905260808101889052610d6e9060019060a0016020604051602081039080840390855afa158015610d52573d6000803e3d6000fd5b5050604051601f190151600c1b611000600160ac1b0316919050565b60008181526006602052604090205490915060ff16610da057604051632057875960e21b815260040160405180910390fd5b6003840154600286015460018701546001600160a01b0390921691600090610dc890836121f4565b600060028a0181905560038a01819055878152600960205260409020805460ff191660011790556006890154909150336001600160a01b0390911614610e79576001880154611000600160ac1b0333600c1b1660009081526005602052604081208054909190610e3990849061220b565b90915550506006880154600c1b611000600160ac1b031660009081526005602052604081208054849290610e6e90849061220b565b90915550610ebb9050565b818860010154610e89919061220b565b611000600160ac1b0333600c1b1660009081526005602052604081208054909190610eb590849061220b565b90915550505b6004880154610ed59084906001600160a01b0316836116b1565b600188015415610f415760058801546001600160a01b038e8116911614610f325760058801546001808a0154610f1a9286926001600160a01b0390911691901c6116b1565b610f2d838e60018b60010154901c6116b1565b610f41565b610f41838e8a600101546116b1565b60048801546040518f81526001600160a01b03909116907f5e420822d2f7281fdc4b763c62c8b7874bf22108a35efe93144d79296aacc67d9060200160405180910390a25050505050505050610f9660018055565b505050505050565b6001600160a01b03821633141561101857611000600160ac1b03600c83901b166000908152600a602090815260409182902083905581516001600160a01b038516815290810183905281517f0b294da292f26e55fd442b5c0164fbb9013036ff00c5cfdde0efd01c1baaf632929181900390910190a15050565b6040516342e8fb9360e11b815260040160405180910390fd5b600061103b6115b2565b6110458383611211565b60008a81526007602052604090206003810154600160a01b900460ff1661107f57604051635972996f60e11b815260040160405180910390fd5b80548711156110a1576040516308aeed0f60e21b815260040160405180910390fd5b6110ac8b888c611798565b915060006040518060e001604052808d81526020018a8152602001898152602001600454436110db919061220b565b81526001600160a01b03808e1660208301528c1660408201523360609091015290508515611144576002820154600c1b611000600160ac1b03166000908152600a602052604090205461113290889088903361181c565b61113d83828461184e565b50506111fb565b68056bc75e2d631000008160400151116111635761113d83828461184e565b611000600160ac1b0333600c1b166000908152600560205260408120549061119b611196670de0b6b3a764000084612223565b61194c565b90506111af670de0b6b3a764000082612245565b836040015111806111cd575069d3c21bcecceda10000008360400151115b156111eb57604051630e0c7c2360e11b815260040160405180910390fd5b6111f685848661184e565b505050505b61120460018055565b9998505050505050505050565b6000815b8082101561135d5760006008600086868681811061123557611235612099565b905060200201358152602001908152602001600020905061125581611a08565b600281015481546000908152600760205260408120805490919061127a90849061220b565b90915550506000600282018190556006820154600c1b611000600160ac1b031660008181526005602052604090205490915060011c68056bc75e2d6310000081116112de57600082815260056020526040902068056bc75e2d6310000090556112f0565b60008281526005602052604090208190555b60048301546001600160a01b03167f67e089478e21dd12c98e69331c4152f6c9b2038b91e0f28268ffa01558c0b4ff88888881811061133157611331612099565b9050602002013560405161134791815260200190565b60405180910390a2846001019450505050611215565b808210156113735763dfb035c96000526004601cfd5b50505050565b6007602052600090815260409020805460018201805491929161139b906120fc565b80601f01602080910402602001604051908101604052809291908181526020018280546113c7906120fc565b80156114145780601f106113e957610100808354040283529160200191611414565b820191906000526020600020905b8154815290600101906020018083116113f757829003601f168201915b50505050600283015460039093015491926001600160a01b03908116929081169150600160a01b900460ff1685565b6000546001600160a01b0316331461148c5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401610640565b8151806114a15763df9578836000526004601cfd5b815181146114b75763ff633a386000526004601cfd5b60208301602083016020830282015b808314610f96578251600052600b60205260406000208251815550815183517f5d6e86e5341d57a92c49934296c51542a25015c9b1782a1c2722a940131c3d9a600080a36020830192506020820191506114c6565b6000546001600160a01b031633146115645760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401610640565b60028190556040516001600160a01b03821681527fe127cf589a3879da0156d4a24f43b44f65cfa3570de594806b0bfa2fcf06884f906020016106e1565b60006115ad60035490565b905090565b600154600214156115d65760405163558a1e0360e11b815260040160405180910390fd5b6002600155565b60006040516323b872dd60e01b6000528460045283602452826044526020600060646000808a5af13d15601f3d116001600051141617169150600060605280604052508061166d5760405162461bcd60e51b815260206004820152601460248201527f5452414e534645525f46524f4d5f4641494c45440000000000000000000000006044820152606401610640565b5050505050565b6000818152600760205260409020600201546001600160a01b031633146116ae576040516342e8fb9360e11b815260040160405180910390fd5b50565b600060405163a9059cbb60e01b6000528360045282602452602060006044600080895af13d15601f3d11600160005114161716915060006060528060405250806113735760405162461bcd60e51b815260206004820152600f60248201527f5452414e534645525f4641494c454400000000000000000000000000000000006044820152606401610640565b600080600080600085875af1905080610a335760405162461bcd60e51b815260206004820152601360248201527f4554485f5452414e534645525f4641494c4544000000000000000000000000006044820152606401610640565b6040805160208101859052908101839052606082811b6bffffffffffffffffffffffff191690820152600090607401604051602081830303815290604052805190602001209050436008600083815260200190815260200160002060030154106118155760405163d0404f8560e01b815260040160405180910390fd5b9392505050565b6118318484846001600160a01b038516611a4f565b61137357604051631dc23a5f60e11b815260040160405180910390fd5b600083815260086020908152604080832085518155918501516001830155840151600282018190556060850151600383015560808501516004830180546001600160a01b0392831673ffffffffffffffffffffffffffffffffffffffff199182161790915560a087015160058501805491841691831691909117905560c087015160069094018054949092169316929092179091558254909183916118f49084906121f4565b9091555050608082015182516040808501518151928352602083015285926001600160a01b0316917f2a28b2ae47b0bd4b104e7cd29b1dfa72846af8c4cfdc009da2ae29db68cb67ea910160405180910390a3505050565b600080634d2b179160e01b8360405160240161196a91815260200190565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050509050600080600060206000855160208701600254617530fa92503d91506000519050809450826119ff5763e10bf1cc6000526004601cfd5b50505050919050565b4381600301541115611a2d5760405163d0404f8560e01b815260040160405180910390fd5b60028101546116ae576040516331da482760e11b815260040160405180910390fd5b60008315611a8b578360051b8501855b803580851160051b94855260209485185260406000209301818110611a8357611a88565b611a5f565b50505b501492915050565b828054611a9f906120fc565b90600052602060002090601f016020900481019282611ac15760008555611b07565b82601f10611ada57805160ff1916838001178555611b07565b82800160010185558215611b07579182015b82811115611b07578251825591602001919060010190611aec565b50611b13929150611b17565b5090565b5b80821115611b135760008155600101611b18565b600060208284031215611b3e57600080fd5b5035919050565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f1916810167ffffffffffffffff81118282101715611b8457611b84611b45565b604052919050565b600067ffffffffffffffff821115611ba657611ba6611b45565b5060051b60200190565b6001600160a01b03811681146116ae57600080fd5b600082601f830112611bd657600080fd5b81356020611beb611be683611b8c565b611b5b565b82815260059290921b84018101918181019086841115611c0a57600080fd5b8286015b84811015611c2e578035611c2181611bb0565b8352918301918301611c0e565b509695505050505050565b600060208284031215611c4b57600080fd5b813567ffffffffffffffff811115611c6257600080fd5b611c6e84828501611bc5565b949350505050565b600060208284031215611c8857600080fd5b813561181581611bb0565b600080600080600060808688031215611cab57600080fd5b8535611cb681611bb0565b945060208601359350604086013567ffffffffffffffff80821115611cda57600080fd5b818801915088601f830112611cee57600080fd5b813581811115611cfd57600080fd5b896020828501011115611d0f57600080fd5b96999598505060200195606001359392505050565b60008083601f840112611d3657600080fd5b50813567ffffffffffffffff811115611d4e57600080fd5b6020830191508360208260051b8501011115611d6957600080fd5b9250929050565b600080600060408486031215611d8557600080fd5b83359250602084013567ffffffffffffffff811115611da357600080fd5b611daf86828701611d24565b9497909650939450505050565b60008060008060008060c08789031215611dd557600080fd5b863595506020870135611de781611bb0565b945060408701359350606087013592506080870135915060a087013560ff81168114611e1257600080fd5b809150509295509295509295565b60008060408385031215611e3357600080fd5b8235611e3e81611bb0565b946020939093013593505050565b600080600080600080600080600060e08a8c031215611e6a57600080fd5b8935985060208a0135611e7c81611bb0565b975060408a0135611e8c81611bb0565b965060608a0135955060808a0135945060a08a013567ffffffffffffffff80821115611eb757600080fd5b611ec38d838e01611d24565b909650945060c08c0135915080821115611edc57600080fd5b50611ee98c828d01611d24565b915080935050809150509295985092959850929598565b60008060208385031215611f1357600080fd5b823567ffffffffffffffff811115611f2a57600080fd5b611f3685828601611d24565b90969095509350505050565b8581526000602060a08184015286518060a085015260005b81811015611f765788810183015185820160c001528201611f5a565b81811115611f8857600060c083870101525b50601f01601f1916830160c0019150611fae905060408301866001600160a01b03169052565b6001600160a01b038416606083015282151560808301529695505050505050565b60008060408385031215611fe257600080fd5b823567ffffffffffffffff80821115611ffa57600080fd5b61200686838701611bc5565b935060209150818501358181111561201d57600080fd5b85019050601f8101861361203057600080fd5b803561203e611be682611b8c565b81815260059190911b8201830190838101908883111561205d57600080fd5b928401925b8284101561208a578335801515811461207b5760008081fd5b82529284019290840190612062565b80955050505050509250929050565b634e487b7160e01b600052603260045260246000fd5b6020808252825182820181905260009190848201906040850190845b818110156120f05783516001600160a01b0316835292840192918401916001016120cb565b50909695505050505050565b600181811c9082168061211057607f821691505b6020821081141561213157634e487b7160e01b600052602260045260246000fd5b50919050565b600080855481600182811c91508083168061215357607f831692505b602080841082141561217357634e487b7160e01b86526022600452602486fd5b8180156121875760018114612198576121c5565b60ff198616895284890196506121c5565b60008c81526020902060005b868110156121bd5781548b8201529085019083016121a4565b505084890196505b5098855250505050938401929092525050604001919050565b634e487b7160e01b600052601160045260246000fd5b600082821015612206576122066121de565b500390565b6000821982111561221e5761221e6121de565b500190565b60008261224057634e487b7160e01b600052601260045260246000fd5b500490565b600081600019048311821515161561225f5761225f6121de565b50029056fea164736f6c6343000809000a", + "bytecode": "0x60806040526001805560405162002aa438038062002aa48339810160408190526200002a916200049d565b600080546001600160a01b031916339081178255604051909182917f8292fce18fa69edf4db7b94ea2e58241df0ae57f97e0a6c9b29067028bf92d76908290a3506200007685620000a3565b620000818362000133565b6200008c84620001bd565b620000988282620002a1565b505050505062000620565b6000546001600160a01b03163314620000f25760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064015b60405180910390fd5b806003557f70fa43ca70216ad905ade86b9e650a691b2ce5a01980d0a81bdd8324141b8511816040516200012891815260200190565b60405180910390a150565b6000546001600160a01b031633146200017e5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401620000e9565b60028190556040516001600160a01b03821681527fe127cf589a3879da0156d4a24f43b44f65cfa3570de594806b0bfa2fcf06884f9060200162000128565b6000546001600160a01b03163314620002085760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401620000e9565b80516000905b808210156200026e57600062000246848481518110620002325762000232620005bb565b60200260200101516200038760201b60201c565b6000908152600860205260409020805460ff191660019081179091559290920191506200020e565b50507f14a422d2412784a5749d03da98921fe468c98577b767851389a9f58ea5a363d781604051620001289190620005d1565b6000546001600160a01b03163314620002ec5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401620000e9565b815180620003025763df9578836000526004601cfd5b81518114620003195763ff633a386000526004601cfd5b60208301602083018260051b82015b8083146200037f578251600052600a60205260406000208251815550815183517f5d6e86e5341d57a92c49934296c51542a25015c9b1782a1c2722a940131c3d9a600080a360208301925060208201915062000328565b505050505050565b600c1b611000600160ac1b031690565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b0381118282101715620003d857620003d862000397565b604052919050565b60006001600160401b03821115620003fc57620003fc62000397565b5060051b60200190565b6001600160a01b03811681146200041c57600080fd5b50565b600082601f8301126200043157600080fd5b815160206200044a6200044483620003e0565b620003ad565b82815260059290921b840181019181810190868411156200046a57600080fd5b8286015b8481101562000492578051620004848162000406565b83529183019183016200046e565b509695505050505050565b600080600080600060a08688031215620004b657600080fd5b8551602080880151919650906001600160401b0380821115620004d857600080fd5b620004e68a838b016200041f565b965060408901519150620004fa8262000406565b6060890151919550808211156200051057600080fd5b6200051e8a838b016200041f565b945060808901519150808211156200053557600080fd5b508701601f810189136200054857600080fd5b8051620005596200044482620003e0565b81815260059190911b8201830190838101908b8311156200057957600080fd5b928401925b82841015620005a95783518015158114620005995760008081fd5b825292840192908401906200057e565b80955050505050509295509295909350565b634e487b7160e01b600052603260045260246000fd5b6020808252825182820181905260009190848201906040850190845b81811015620006145783516001600160a01b031683529284019291840191600101620005ed565b50909695505050505050565b61247480620006306000396000f3fe6080604052600436106101d15760003560e01c80637f94f65d116100f75780639872dbfe11610095578063c52164c611610064578063c52164c6146106cc578063d4fac45d146106ec578063d6e8b9731461074b578063f7d0e04b1461076b57600080fd5b80639872dbfe146105fa57806398a26871146106105780639eee8d4b14610640578063ad8f2eed1461067857600080fd5b806385313e73116100d157806385313e73146105845780638da5cb5b146105a45780638db564c2146105c45780638e2749d6146105da57600080fd5b80637f94f65d146104d757806380e1d302146104f757806384ab1d281461054b57600080fd5b80634b2ae9801161016f5780636a1460241161013e5780636a1460241461044e5780636d82d9e01461046a578063758d77d41461048a57806377cd38a4146104aa57600080fd5b80634b2ae980146103be578063574983c8146103e95780635fd8c7101461040957806369cc6af41461041e57600080fd5b806316d72240116101ab57806316d722401461025f5780632b9f00e91461033e578063328a71811461035e578063461f31201461037e57600080fd5b806304937320146101dd5780630d2a2d441461021d57806313af40351461023f57600080fd5b366101d857005b600080fd5b3480156101e957600080fd5b5061020a6101f8366004611ddb565b60076020526000908152604090205481565b6040519081526020015b60405180910390f35b34801561022957600080fd5b5061023d610238366004611ee8565b61078b565b005b34801561024b57600080fd5b5061023d61025a366004611f25565b61087c565b34801561026b57600080fd5b506102df61027a366004611ddb565b600560208190526000918252604090912080546001820154600283015460038401546004850154958501546006860154600787015460088801546009909801549698959794969395946001600160a01b0393841694928416939182169290821691168a565b604080519a8b5260208b019990995297890196909652606088019490945260808701929092526001600160a01b0390811660a087015290811660c086015290811660e08501529081166101008401521661012082015261014001610214565b34801561034a57600080fd5b5061020a610359366004611f8e565b61091d565b34801561036a57600080fd5b5061023d610379366004612074565b610c90565b34801561038a57600080fd5b506103ae610399366004611ddb565b60096020526000908152604090205460ff1681565b6040519015158152602001610214565b3480156103ca57600080fd5b5061020a6103d9366004611f25565b600c1b611000600160ac1b031690565b3480156103f557600080fd5b5061023d610404366004611ddb565b610e4f565b34801561041557600080fd5b5061023d610ecd565b34801561042a57600080fd5b506103ae610439366004611f25565b600a6020526000908152604090205460ff1681565b34801561045a57600080fd5b5061020a670de0b6b3a764000081565b34801561047657600080fd5b5061023d6104853660046120e7565b610f57565b34801561049657600080fd5b5061023d6104a536600461211c565b611045565b3480156104b657600080fd5b5061020a6104c5366004611ddb565b60066020526000908152604090205481565b3480156104e357600080fd5b5061023d6104f2366004612180565b611429565b34801561050357600080fd5b506103ae6105123660046121ac565b600c9190911b611000600160ac1b03166000908152600b602090815260408083206001600160a01b039094168352929052205460ff1c90565b34801561055757600080fd5b5061056c610566366004611ddb565b600c1c90565b6040516001600160a01b039091168152602001610214565b34801561059057600080fd5b5061020a61059f3660046121e5565b6114bc565b3480156105b057600080fd5b5060005461056c906001600160a01b031681565b3480156105d057600080fd5b5061020a60045481565b3480156105e657600080fd5b5061023d6105f536600461223a565b6115ee565b34801561060657600080fd5b5061020a60035481565b34801561061c57600080fd5b506103ae61062b366004611ddb565b60086020526000908152604090205460ff1681565b34801561064c57600080fd5b5061020a61065b36600461227c565b600b60209081526000928352604080842090915290825290205481565b34801561068457600080fd5b5061056c6106933660046121ac565b600c9190911b611000600160ac1b03166000908152600b602090815260408083206001600160a01b0390941683529290522054605f1c90565b3480156106d857600080fd5b5060025461056c906001600160a01b031681565b3480156106f857600080fd5b5061020a6107073660046121ac565b600c9190911b611000600160ac1b03166000908152600b602090815260408083206001600160a01b03909416835292905220546b3fffffffffffffffffffffff1690565b34801561075757600080fd5b5061023d6107663660046122a1565b6117de565b34801561077757600080fd5b5061023d610786366004611f25565b6118b6565b6000546001600160a01b031633146107d95760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064015b60405180910390fd5b80516000905b808210156108405760006108198484815181106107fe576107fe612363565b6020026020010151611000600160ac1b03600c9190911b1690565b6000908152600860205260409020805460ff191660019081179091559290920191506107df565b50507f14a422d2412784a5749d03da98921fe468c98577b767851389a9f58ea5a363d7816040516108719190612379565b60405180910390a150565b6000546001600160a01b031633146108c55760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064016107d0565b6000805473ffffffffffffffffffffffffffffffffffffffff19166001600160a01b0383169081178255604051909133917f8292fce18fa69edf4db7b94ea2e58241df0ae57f97e0a6c9b29067028bf92d769190a350565b600061092761193d565b61093183836115ee565b600c8b901b611000600160ac1b03166000908152600b602090815260408083206001600160a01b038e1684529091529020548a9060ff1c61098557604051635972996f60e11b815260040160405180910390fd5b611000600160ac1b03600c8d901b166000908152600b602090815260408083206001600160a01b03851684529091529020546b3fffffffffffffffffffffff16878110156109e6576040516308aeed0f60e21b815260040160405180910390fd5b600454611000600160ac1b03600c8f901b1690600090610a079060016123dc565b90506004548a8e604051602001610a4393929190928352602083019190915260601b6bffffffffffffffffffffffff1916604082015260540190565b60405160208183030381529060405280519060200120945043600560008781526020019081526020016000206004015410610a915760405163d0404f8560e01b815260040160405180910390fd5b60006040518061014001604052808481526020018381526020018d81526020018c815260200160035443610ac591906123dc565b8152602001605f600b60008781526020019081526020016000206000896001600160a01b03166001600160a01b0316815260200190815260200160002054901c6001600160a01b031681526020018f6001600160a01b031681526020018e6001600160a01b03168152602001336001600160a01b03168152602001866001600160a01b0316815250905089899050600014610ba457600083815260066020526040902054610b77908b908b9033611968565b610b85848c8884898861199a565b60048054906000610b95836123f4565b91905055505050505050610c79565b68056bc75e2d63100000816060015111610bc657610b85848c8884898861199a565b611000600160ac1b0333600c1b1660009081526007602052604081205490610bfe610bf9670de0b6b3a76400008461240f565b611b0e565b9050610c12670de0b6b3a764000082612431565b83606001511180610c30575069d3c21bcecceda10000008360600151115b15610c4e57604051630e0c7c2360e11b815260040160405180910390fd5b610c5c868e8a868b8a61199a565b60048054906000610c6c836123f4565b9190505550505050505050505b610c8260018055565b9a9950505050505050505050565b84611000600160ac1b0333600c1b166001600160a01b038516610cc65760405163351de29f60e11b815260040160405180910390fd5b6001600160a01b0382166000908152600a602052604090205460ff16610cff57604051630abc194760e11b815260040160405180910390fd5b6000818152600b602090815260408083206001600160a01b03861684529091529020546b3fffffffffffffffffffffff81166a52b7d2dcc80cd2e4000000610d556bffffffffffffffffffffffff8a16836123dc565b1115610d745760405163f3fb0eb960e01b815260040160405180910390fd5b610d7c61193d565b8415610d8c57610d8c3386611429565b87878760ff81901b605f83901b610da385876123dc565b6000898152600b602090815260408083206001600160a01b038e16845290915290209117919091179055610de78733306bffffffffffffffffffffffff8f16611bca565b610df060018055565b604080516001600160a01b038e1681526bffffffffffffffffffffffff8d16602082015233917f63d8d7d5e63e9840ec91a12a160d27b7cfab294f6ba070b7359692acfe6b03bf910160405180910390a2505050505050505050505050565b6000546001600160a01b03163314610e985760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064016107d0565b806003557f70fa43ca70216ad905ade86b9e650a691b2ce5a01980d0a81bdd8324141b85118160405161087191815260200190565b6000546001600160a01b03163314610f165760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064016107d0565b47610f213382611c61565b60408051338152602081018390527feaff4b37086828766ad3268786972c0cd24259d4c87a80f9d3963a3c3d999b0d9101610871565b611000600160ac1b0333600c1b166000818152600b602090815260408083206001600160a01b03871684529091529020548015611026576000828152600b602090815260408083206001600160a01b038816808552908352928190207f7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9490941660ff87901b1793849055805192835285151591830191909152849133917fca585721b6b442dc9183932f7c84dc2880efb67c4da52cc06873e78971105d49910160405180910390a25061103f565b6040516321c4e35760e21b815260040160405180910390fd5b50505050565b61104d61193d565b6000868152600560205260409020600381015461107d576040516331da482760e11b815260040160405180910390fd5b43816004015410156110a2576040516307b7d7dd60e51b815260040160405180910390fd5b6005810154600382015460405160609290921b6bffffffffffffffffffffffff1916602083015260348201526054810186905260009060740160405160208183030381529060405280519060200120905060008160405160200161113291907f19457468657265756d205369676e6564204d6573736167653a0a3332000000008152601c810191909152603c0190565b60408051601f1981840301815291815281516020928301206000858152600990935291205490915060ff1615156001141561118057604051637a48537560e11b815260040160405180910390fd5b6040805160008082526020820180845284905260ff87169282019290925260608101889052608081018790526111f49060019060a0016020604051602081039080840390855afa1580156111d8573d6000803e3d6000fd5b5050604051601f190151600c1b611000600160ac1b0316919050565b60008181526008602052604090205490915060ff1661122657604051632057875960e21b815260040160405180910390fd5b6009840154600385015460028601546001600160a01b039092169160009061124e9083612450565b60006003890181905560048901819055878152600960205260409020805460ff191660011790556008880154909150336001600160a01b03909116146112ff576002870154611000600160ac1b0333600c1b16600090815260076020526040812080549091906112bf9084906123dc565b90915550506008870154600c1b611000600160ac1b0316600090815260076020526040812080548492906112f49084906123dc565b909155506113419050565b81876002015461130f91906123dc565b611000600160ac1b0333600c1b166000908152600760205260408120805490919061133b9084906123dc565b90915550505b600687015461135b9084906001600160a01b031683611cc1565b6002870154156113c75760078701546001600160a01b038d81169116146113b857600787015460028801546113a09185916001600160a01b039091169060011c611cc1565b6113b3838d60018a60020154901c611cc1565b6113c7565b6113c7838d8960020154611cc1565b6006870154604080518f8152602081018590526001600160a01b03909216917f3fd2eee5028b09fa70abe3da4f6023ea41bfde24cfcb9c167f17d6fbe79eece3910160405180910390a25050505050505061142160018055565b505050505050565b6001600160a01b0382163314156114a357611000600160ac1b03600c83901b1660009081526006602090815260409182902083905581516001600160a01b038516815290810183905281517f0b294da292f26e55fd442b5c0164fbb9013036ff00c5cfdde0efd01c1baaf632929181900390910190a15050565b6040516342e8fb9360e11b815260040160405180910390fd5b60006114c661193d565b6114d083836115ee565b33600c1b611000600160ac1b03166000908152600b602090815260408083206001600160a01b038816845290915290205460ff1c15156001141561151957611519846000610f57565b50611000600160ac1b0333600c1b166000818152600b602090815260408083206001600160a01b0388168452909152812080546b3fffffffffffffffffffffff8116939284929161156b908490612450565b90915550508161158e57604051635972996f60e11b815260040160405180910390fd5b611599853384611cc1565b604080516001600160a01b03871681526020810184905233917f2cd6435b1b961c13f55202979edd0765a809f69a539d8a477436c94c1211e43e910160405180910390a2506115e760018055565b9392505050565b6000815b808210156117c85760006005600086868681811061161257611612612363565b905060200201358152602001908152602001600020905061163281611d4d565b80546000908152600b6020908152604080832060098501546001600160a01b0316845290915290205460038201546b3fffffffffffffffffffffff909116906a52b7d2dcc80cd2e40000009061168890836123dc565b11156116a75760405163f3fb0eb960e01b815260040160405180910390fd5b600382015482546000908152600b6020908152604080832060098701546001600160a01b03168452909152812080549091906116e49084906123dc565b90915550506000600383018190556008830154600c1b611000600160ac1b031660008181526007602052604090205490915060011c68056bc75e2d63100000811161174857600082815260076020526040902068056bc75e2d63100000905561175a565b60008281526007602052604090208190555b60068401546001600160a01b03167f67e089478e21dd12c98e69331c4152f6c9b2038b91e0f28268ffa01558c0b4ff89898981811061179b5761179b612363565b905060200201356040516117b191815260200190565b60405180910390a2856001019550505050506115f2565b8082101561103f5763dfb035c96000526004601cfd5b6000546001600160a01b031633146118275760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064016107d0565b81518061183c5763df9578836000526004601cfd5b815181146118525763ff633a386000526004601cfd5b60208301602083018260051b82015b808314611421578251600052600a60205260406000208251815550815183517f5d6e86e5341d57a92c49934296c51542a25015c9b1782a1c2722a940131c3d9a600080a3602083019250602082019150611861565b6000546001600160a01b031633146118ff5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064016107d0565b60028190556040516001600160a01b03821681527fe127cf589a3879da0156d4a24f43b44f65cfa3570de594806b0bfa2fcf06884f90602001610871565b600154600214156119615760405163558a1e0360e11b815260040160405180910390fd5b6002600155565b61197d8484846001600160a01b038516611d97565b61103f57604051631dc23a5f60e11b815260040160405180910390fd5b60008481526005602081815260409283902086518155908601516001820155918501516002830155606085015160038301556080850151600483015560a0850151908201805473ffffffffffffffffffffffffffffffffffffffff199081166001600160a01b039384161790915560c0860151600684018054831691841691909117905560e086015160078401805483169184169190911790556101008601516008840180548316918416919091179055610120860151600990930180549091169290911691909117905585611a785763ce3a3d376000526004601cfd5b6000818152600b602090815260408083206001600160a01b038616845290915281208054879290611aaa908490612450565b909155505060c08301518351606085015160405187936001600160a01b0316927f2a28b2ae47b0bd4b104e7cd29b1dfa72846af8c4cfdc009da2ae29db68cb67ea92611afe92918252602082015260400190565b60405180910390a3505050505050565b600080634d2b179160e01b83604051602401611b2c91815260200190565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050509050600080600060206000855160208701600254617530fa92503d9150600051905080945082611bc15763e10bf1cc6000526004601cfd5b50505050919050565b60006040516323b872dd60e01b6000528460045283602452826044526020600060646000808a5af13d15601f3d1160016000511416171691506000606052806040525080611c5a5760405162461bcd60e51b815260206004820152601460248201527f5452414e534645525f46524f4d5f4641494c454400000000000000000000000060448201526064016107d0565b5050505050565b600080600080600085875af1905080611cbc5760405162461bcd60e51b815260206004820152601360248201527f4554485f5452414e534645525f4641494c45440000000000000000000000000060448201526064016107d0565b505050565b600060405163a9059cbb60e01b6000528360045282602452602060006044600080895af13d15601f3d116001600051141617169150600060605280604052508061103f5760405162461bcd60e51b815260206004820152600f60248201527f5452414e534645525f4641494c4544000000000000000000000000000000000060448201526064016107d0565b4381600401541115611d725760405163d0404f8560e01b815260040160405180910390fd5b6003810154611d94576040516331da482760e11b815260040160405180910390fd5b50565b60008315611dd3578360051b8501855b803580851160051b94855260209485185260406000209301818110611dcb57611dd0565b611da7565b50505b501492915050565b600060208284031215611ded57600080fd5b5035919050565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f1916810167ffffffffffffffff81118282101715611e3357611e33611df4565b604052919050565b600067ffffffffffffffff821115611e5557611e55611df4565b5060051b60200190565b6001600160a01b0381168114611d9457600080fd5b600082601f830112611e8557600080fd5b81356020611e9a611e9583611e3b565b611e0a565b82815260059290921b84018101918181019086841115611eb957600080fd5b8286015b84811015611edd578035611ed081611e5f565b8352918301918301611ebd565b509695505050505050565b600060208284031215611efa57600080fd5b813567ffffffffffffffff811115611f1157600080fd5b611f1d84828501611e74565b949350505050565b600060208284031215611f3757600080fd5b81356115e781611e5f565b60008083601f840112611f5457600080fd5b50813567ffffffffffffffff811115611f6c57600080fd5b6020830191508360208260051b8501011115611f8757600080fd5b9250929050565b6000806000806000806000806000806101008b8d031215611fae57600080fd5b8a35611fb981611e5f565b995060208b0135611fc981611e5f565b985060408b0135611fd981611e5f565b975060608b0135611fe981611e5f565b965060808b0135955060a08b0135945060c08b013567ffffffffffffffff8082111561201457600080fd5b6120208e838f01611f42565b909650945060e08d013591508082111561203957600080fd5b506120468d828e01611f42565b915080935050809150509295989b9194979a5092959850565b8035801515811461206f57600080fd5b919050565b600080600080600060a0868803121561208c57600080fd5b853561209781611e5f565b945060208601356bffffffffffffffffffffffff811681146120b857600080fd5b935060408601356120c881611e5f565b92506120d66060870161205f565b949793965091946080013592915050565b600080604083850312156120fa57600080fd5b823561210581611e5f565b91506121136020840161205f565b90509250929050565b60008060008060008060c0878903121561213557600080fd5b86359550602087013561214781611e5f565b945060408701359350606087013592506080870135915060a087013560ff8116811461217257600080fd5b809150509295509295509295565b6000806040838503121561219357600080fd5b823561219e81611e5f565b946020939093013593505050565b600080604083850312156121bf57600080fd5b82356121ca81611e5f565b915060208301356121da81611e5f565b809150509250929050565b6000806000604084860312156121fa57600080fd5b833561220581611e5f565b9250602084013567ffffffffffffffff81111561222157600080fd5b61222d86828701611f42565b9497909650939450505050565b6000806020838503121561224d57600080fd5b823567ffffffffffffffff81111561226457600080fd5b61227085828601611f42565b90969095509350505050565b6000806040838503121561228f57600080fd5b8235915060208301356121da81611e5f565b600080604083850312156122b457600080fd5b823567ffffffffffffffff808211156122cc57600080fd5b6122d886838701611e74565b93506020915081850135818111156122ef57600080fd5b85019050601f8101861361230257600080fd5b8035612310611e9582611e3b565b81815260059190911b8201830190838101908883111561232f57600080fd5b928401925b82841015612354576123458461205f565b82529284019290840190612334565b80955050505050509250929050565b634e487b7160e01b600052603260045260246000fd5b6020808252825182820181905260009190848201906040850190845b818110156123ba5783516001600160a01b031683529284019291840191600101612395565b50909695505050505050565b634e487b7160e01b600052601160045260246000fd5b600082198211156123ef576123ef6123c6565b500190565b6000600019821415612408576124086123c6565b5060010190565b60008261242c57634e487b7160e01b600052601260045260246000fd5b500490565b600081600019048311821515161561244b5761244b6123c6565b500290565b600082821015612462576124626123c6565b50039056fea164736f6c6343000809000a", + "deployedBytecode": "0x6080604052600436106101d15760003560e01c80637f94f65d116100f75780639872dbfe11610095578063c52164c611610064578063c52164c6146106cc578063d4fac45d146106ec578063d6e8b9731461074b578063f7d0e04b1461076b57600080fd5b80639872dbfe146105fa57806398a26871146106105780639eee8d4b14610640578063ad8f2eed1461067857600080fd5b806385313e73116100d157806385313e73146105845780638da5cb5b146105a45780638db564c2146105c45780638e2749d6146105da57600080fd5b80637f94f65d146104d757806380e1d302146104f757806384ab1d281461054b57600080fd5b80634b2ae9801161016f5780636a1460241161013e5780636a1460241461044e5780636d82d9e01461046a578063758d77d41461048a57806377cd38a4146104aa57600080fd5b80634b2ae980146103be578063574983c8146103e95780635fd8c7101461040957806369cc6af41461041e57600080fd5b806316d72240116101ab57806316d722401461025f5780632b9f00e91461033e578063328a71811461035e578063461f31201461037e57600080fd5b806304937320146101dd5780630d2a2d441461021d57806313af40351461023f57600080fd5b366101d857005b600080fd5b3480156101e957600080fd5b5061020a6101f8366004611ddb565b60076020526000908152604090205481565b6040519081526020015b60405180910390f35b34801561022957600080fd5b5061023d610238366004611ee8565b61078b565b005b34801561024b57600080fd5b5061023d61025a366004611f25565b61087c565b34801561026b57600080fd5b506102df61027a366004611ddb565b600560208190526000918252604090912080546001820154600283015460038401546004850154958501546006860154600787015460088801546009909801549698959794969395946001600160a01b0393841694928416939182169290821691168a565b604080519a8b5260208b019990995297890196909652606088019490945260808701929092526001600160a01b0390811660a087015290811660c086015290811660e08501529081166101008401521661012082015261014001610214565b34801561034a57600080fd5b5061020a610359366004611f8e565b61091d565b34801561036a57600080fd5b5061023d610379366004612074565b610c90565b34801561038a57600080fd5b506103ae610399366004611ddb565b60096020526000908152604090205460ff1681565b6040519015158152602001610214565b3480156103ca57600080fd5b5061020a6103d9366004611f25565b600c1b611000600160ac1b031690565b3480156103f557600080fd5b5061023d610404366004611ddb565b610e4f565b34801561041557600080fd5b5061023d610ecd565b34801561042a57600080fd5b506103ae610439366004611f25565b600a6020526000908152604090205460ff1681565b34801561045a57600080fd5b5061020a670de0b6b3a764000081565b34801561047657600080fd5b5061023d6104853660046120e7565b610f57565b34801561049657600080fd5b5061023d6104a536600461211c565b611045565b3480156104b657600080fd5b5061020a6104c5366004611ddb565b60066020526000908152604090205481565b3480156104e357600080fd5b5061023d6104f2366004612180565b611429565b34801561050357600080fd5b506103ae6105123660046121ac565b600c9190911b611000600160ac1b03166000908152600b602090815260408083206001600160a01b039094168352929052205460ff1c90565b34801561055757600080fd5b5061056c610566366004611ddb565b600c1c90565b6040516001600160a01b039091168152602001610214565b34801561059057600080fd5b5061020a61059f3660046121e5565b6114bc565b3480156105b057600080fd5b5060005461056c906001600160a01b031681565b3480156105d057600080fd5b5061020a60045481565b3480156105e657600080fd5b5061023d6105f536600461223a565b6115ee565b34801561060657600080fd5b5061020a60035481565b34801561061c57600080fd5b506103ae61062b366004611ddb565b60086020526000908152604090205460ff1681565b34801561064c57600080fd5b5061020a61065b36600461227c565b600b60209081526000928352604080842090915290825290205481565b34801561068457600080fd5b5061056c6106933660046121ac565b600c9190911b611000600160ac1b03166000908152600b602090815260408083206001600160a01b0390941683529290522054605f1c90565b3480156106d857600080fd5b5060025461056c906001600160a01b031681565b3480156106f857600080fd5b5061020a6107073660046121ac565b600c9190911b611000600160ac1b03166000908152600b602090815260408083206001600160a01b03909416835292905220546b3fffffffffffffffffffffff1690565b34801561075757600080fd5b5061023d6107663660046122a1565b6117de565b34801561077757600080fd5b5061023d610786366004611f25565b6118b6565b6000546001600160a01b031633146107d95760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064015b60405180910390fd5b80516000905b808210156108405760006108198484815181106107fe576107fe612363565b6020026020010151611000600160ac1b03600c9190911b1690565b6000908152600860205260409020805460ff191660019081179091559290920191506107df565b50507f14a422d2412784a5749d03da98921fe468c98577b767851389a9f58ea5a363d7816040516108719190612379565b60405180910390a150565b6000546001600160a01b031633146108c55760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064016107d0565b6000805473ffffffffffffffffffffffffffffffffffffffff19166001600160a01b0383169081178255604051909133917f8292fce18fa69edf4db7b94ea2e58241df0ae57f97e0a6c9b29067028bf92d769190a350565b600061092761193d565b61093183836115ee565b600c8b901b611000600160ac1b03166000908152600b602090815260408083206001600160a01b038e1684529091529020548a9060ff1c61098557604051635972996f60e11b815260040160405180910390fd5b611000600160ac1b03600c8d901b166000908152600b602090815260408083206001600160a01b03851684529091529020546b3fffffffffffffffffffffff16878110156109e6576040516308aeed0f60e21b815260040160405180910390fd5b600454611000600160ac1b03600c8f901b1690600090610a079060016123dc565b90506004548a8e604051602001610a4393929190928352602083019190915260601b6bffffffffffffffffffffffff1916604082015260540190565b60405160208183030381529060405280519060200120945043600560008781526020019081526020016000206004015410610a915760405163d0404f8560e01b815260040160405180910390fd5b60006040518061014001604052808481526020018381526020018d81526020018c815260200160035443610ac591906123dc565b8152602001605f600b60008781526020019081526020016000206000896001600160a01b03166001600160a01b0316815260200190815260200160002054901c6001600160a01b031681526020018f6001600160a01b031681526020018e6001600160a01b03168152602001336001600160a01b03168152602001866001600160a01b0316815250905089899050600014610ba457600083815260066020526040902054610b77908b908b9033611968565b610b85848c8884898861199a565b60048054906000610b95836123f4565b91905055505050505050610c79565b68056bc75e2d63100000816060015111610bc657610b85848c8884898861199a565b611000600160ac1b0333600c1b1660009081526007602052604081205490610bfe610bf9670de0b6b3a76400008461240f565b611b0e565b9050610c12670de0b6b3a764000082612431565b83606001511180610c30575069d3c21bcecceda10000008360600151115b15610c4e57604051630e0c7c2360e11b815260040160405180910390fd5b610c5c868e8a868b8a61199a565b60048054906000610c6c836123f4565b9190505550505050505050505b610c8260018055565b9a9950505050505050505050565b84611000600160ac1b0333600c1b166001600160a01b038516610cc65760405163351de29f60e11b815260040160405180910390fd5b6001600160a01b0382166000908152600a602052604090205460ff16610cff57604051630abc194760e11b815260040160405180910390fd5b6000818152600b602090815260408083206001600160a01b03861684529091529020546b3fffffffffffffffffffffff81166a52b7d2dcc80cd2e4000000610d556bffffffffffffffffffffffff8a16836123dc565b1115610d745760405163f3fb0eb960e01b815260040160405180910390fd5b610d7c61193d565b8415610d8c57610d8c3386611429565b87878760ff81901b605f83901b610da385876123dc565b6000898152600b602090815260408083206001600160a01b038e16845290915290209117919091179055610de78733306bffffffffffffffffffffffff8f16611bca565b610df060018055565b604080516001600160a01b038e1681526bffffffffffffffffffffffff8d16602082015233917f63d8d7d5e63e9840ec91a12a160d27b7cfab294f6ba070b7359692acfe6b03bf910160405180910390a2505050505050505050505050565b6000546001600160a01b03163314610e985760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064016107d0565b806003557f70fa43ca70216ad905ade86b9e650a691b2ce5a01980d0a81bdd8324141b85118160405161087191815260200190565b6000546001600160a01b03163314610f165760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064016107d0565b47610f213382611c61565b60408051338152602081018390527feaff4b37086828766ad3268786972c0cd24259d4c87a80f9d3963a3c3d999b0d9101610871565b611000600160ac1b0333600c1b166000818152600b602090815260408083206001600160a01b03871684529091529020548015611026576000828152600b602090815260408083206001600160a01b038816808552908352928190207f7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9490941660ff87901b1793849055805192835285151591830191909152849133917fca585721b6b442dc9183932f7c84dc2880efb67c4da52cc06873e78971105d49910160405180910390a25061103f565b6040516321c4e35760e21b815260040160405180910390fd5b50505050565b61104d61193d565b6000868152600560205260409020600381015461107d576040516331da482760e11b815260040160405180910390fd5b43816004015410156110a2576040516307b7d7dd60e51b815260040160405180910390fd5b6005810154600382015460405160609290921b6bffffffffffffffffffffffff1916602083015260348201526054810186905260009060740160405160208183030381529060405280519060200120905060008160405160200161113291907f19457468657265756d205369676e6564204d6573736167653a0a3332000000008152601c810191909152603c0190565b60408051601f1981840301815291815281516020928301206000858152600990935291205490915060ff1615156001141561118057604051637a48537560e11b815260040160405180910390fd5b6040805160008082526020820180845284905260ff87169282019290925260608101889052608081018790526111f49060019060a0016020604051602081039080840390855afa1580156111d8573d6000803e3d6000fd5b5050604051601f190151600c1b611000600160ac1b0316919050565b60008181526008602052604090205490915060ff1661122657604051632057875960e21b815260040160405180910390fd5b6009840154600385015460028601546001600160a01b039092169160009061124e9083612450565b60006003890181905560048901819055878152600960205260409020805460ff191660011790556008880154909150336001600160a01b03909116146112ff576002870154611000600160ac1b0333600c1b16600090815260076020526040812080549091906112bf9084906123dc565b90915550506008870154600c1b611000600160ac1b0316600090815260076020526040812080548492906112f49084906123dc565b909155506113419050565b81876002015461130f91906123dc565b611000600160ac1b0333600c1b166000908152600760205260408120805490919061133b9084906123dc565b90915550505b600687015461135b9084906001600160a01b031683611cc1565b6002870154156113c75760078701546001600160a01b038d81169116146113b857600787015460028801546113a09185916001600160a01b039091169060011c611cc1565b6113b3838d60018a60020154901c611cc1565b6113c7565b6113c7838d8960020154611cc1565b6006870154604080518f8152602081018590526001600160a01b03909216917f3fd2eee5028b09fa70abe3da4f6023ea41bfde24cfcb9c167f17d6fbe79eece3910160405180910390a25050505050505061142160018055565b505050505050565b6001600160a01b0382163314156114a357611000600160ac1b03600c83901b1660009081526006602090815260409182902083905581516001600160a01b038516815290810183905281517f0b294da292f26e55fd442b5c0164fbb9013036ff00c5cfdde0efd01c1baaf632929181900390910190a15050565b6040516342e8fb9360e11b815260040160405180910390fd5b60006114c661193d565b6114d083836115ee565b33600c1b611000600160ac1b03166000908152600b602090815260408083206001600160a01b038816845290915290205460ff1c15156001141561151957611519846000610f57565b50611000600160ac1b0333600c1b166000818152600b602090815260408083206001600160a01b0388168452909152812080546b3fffffffffffffffffffffff8116939284929161156b908490612450565b90915550508161158e57604051635972996f60e11b815260040160405180910390fd5b611599853384611cc1565b604080516001600160a01b03871681526020810184905233917f2cd6435b1b961c13f55202979edd0765a809f69a539d8a477436c94c1211e43e910160405180910390a2506115e760018055565b9392505050565b6000815b808210156117c85760006005600086868681811061161257611612612363565b905060200201358152602001908152602001600020905061163281611d4d565b80546000908152600b6020908152604080832060098501546001600160a01b0316845290915290205460038201546b3fffffffffffffffffffffff909116906a52b7d2dcc80cd2e40000009061168890836123dc565b11156116a75760405163f3fb0eb960e01b815260040160405180910390fd5b600382015482546000908152600b6020908152604080832060098701546001600160a01b03168452909152812080549091906116e49084906123dc565b90915550506000600383018190556008830154600c1b611000600160ac1b031660008181526007602052604090205490915060011c68056bc75e2d63100000811161174857600082815260076020526040902068056bc75e2d63100000905561175a565b60008281526007602052604090208190555b60068401546001600160a01b03167f67e089478e21dd12c98e69331c4152f6c9b2038b91e0f28268ffa01558c0b4ff89898981811061179b5761179b612363565b905060200201356040516117b191815260200190565b60405180910390a2856001019550505050506115f2565b8082101561103f5763dfb035c96000526004601cfd5b6000546001600160a01b031633146118275760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064016107d0565b81518061183c5763df9578836000526004601cfd5b815181146118525763ff633a386000526004601cfd5b60208301602083018260051b82015b808314611421578251600052600a60205260406000208251815550815183517f5d6e86e5341d57a92c49934296c51542a25015c9b1782a1c2722a940131c3d9a600080a3602083019250602082019150611861565b6000546001600160a01b031633146118ff5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064016107d0565b60028190556040516001600160a01b03821681527fe127cf589a3879da0156d4a24f43b44f65cfa3570de594806b0bfa2fcf06884f90602001610871565b600154600214156119615760405163558a1e0360e11b815260040160405180910390fd5b6002600155565b61197d8484846001600160a01b038516611d97565b61103f57604051631dc23a5f60e11b815260040160405180910390fd5b60008481526005602081815260409283902086518155908601516001820155918501516002830155606085015160038301556080850151600483015560a0850151908201805473ffffffffffffffffffffffffffffffffffffffff199081166001600160a01b039384161790915560c0860151600684018054831691841691909117905560e086015160078401805483169184169190911790556101008601516008840180548316918416919091179055610120860151600990930180549091169290911691909117905585611a785763ce3a3d376000526004601cfd5b6000818152600b602090815260408083206001600160a01b038616845290915281208054879290611aaa908490612450565b909155505060c08301518351606085015160405187936001600160a01b0316927f2a28b2ae47b0bd4b104e7cd29b1dfa72846af8c4cfdc009da2ae29db68cb67ea92611afe92918252602082015260400190565b60405180910390a3505050505050565b600080634d2b179160e01b83604051602401611b2c91815260200190565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050509050600080600060206000855160208701600254617530fa92503d9150600051905080945082611bc15763e10bf1cc6000526004601cfd5b50505050919050565b60006040516323b872dd60e01b6000528460045283602452826044526020600060646000808a5af13d15601f3d1160016000511416171691506000606052806040525080611c5a5760405162461bcd60e51b815260206004820152601460248201527f5452414e534645525f46524f4d5f4641494c454400000000000000000000000060448201526064016107d0565b5050505050565b600080600080600085875af1905080611cbc5760405162461bcd60e51b815260206004820152601360248201527f4554485f5452414e534645525f4641494c45440000000000000000000000000060448201526064016107d0565b505050565b600060405163a9059cbb60e01b6000528360045282602452602060006044600080895af13d15601f3d116001600051141617169150600060605280604052508061103f5760405162461bcd60e51b815260206004820152600f60248201527f5452414e534645525f4641494c4544000000000000000000000000000000000060448201526064016107d0565b4381600401541115611d725760405163d0404f8560e01b815260040160405180910390fd5b6003810154611d94576040516331da482760e11b815260040160405180910390fd5b50565b60008315611dd3578360051b8501855b803580851160051b94855260209485185260406000209301818110611dcb57611dd0565b611da7565b50505b501492915050565b600060208284031215611ded57600080fd5b5035919050565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f1916810167ffffffffffffffff81118282101715611e3357611e33611df4565b604052919050565b600067ffffffffffffffff821115611e5557611e55611df4565b5060051b60200190565b6001600160a01b0381168114611d9457600080fd5b600082601f830112611e8557600080fd5b81356020611e9a611e9583611e3b565b611e0a565b82815260059290921b84018101918181019086841115611eb957600080fd5b8286015b84811015611edd578035611ed081611e5f565b8352918301918301611ebd565b509695505050505050565b600060208284031215611efa57600080fd5b813567ffffffffffffffff811115611f1157600080fd5b611f1d84828501611e74565b949350505050565b600060208284031215611f3757600080fd5b81356115e781611e5f565b60008083601f840112611f5457600080fd5b50813567ffffffffffffffff811115611f6c57600080fd5b6020830191508360208260051b8501011115611f8757600080fd5b9250929050565b6000806000806000806000806000806101008b8d031215611fae57600080fd5b8a35611fb981611e5f565b995060208b0135611fc981611e5f565b985060408b0135611fd981611e5f565b975060608b0135611fe981611e5f565b965060808b0135955060a08b0135945060c08b013567ffffffffffffffff8082111561201457600080fd5b6120208e838f01611f42565b909650945060e08d013591508082111561203957600080fd5b506120468d828e01611f42565b915080935050809150509295989b9194979a5092959850565b8035801515811461206f57600080fd5b919050565b600080600080600060a0868803121561208c57600080fd5b853561209781611e5f565b945060208601356bffffffffffffffffffffffff811681146120b857600080fd5b935060408601356120c881611e5f565b92506120d66060870161205f565b949793965091946080013592915050565b600080604083850312156120fa57600080fd5b823561210581611e5f565b91506121136020840161205f565b90509250929050565b60008060008060008060c0878903121561213557600080fd5b86359550602087013561214781611e5f565b945060408701359350606087013592506080870135915060a087013560ff8116811461217257600080fd5b809150509295509295509295565b6000806040838503121561219357600080fd5b823561219e81611e5f565b946020939093013593505050565b600080604083850312156121bf57600080fd5b82356121ca81611e5f565b915060208301356121da81611e5f565b809150509250929050565b6000806000604084860312156121fa57600080fd5b833561220581611e5f565b9250602084013567ffffffffffffffff81111561222157600080fd5b61222d86828701611f42565b9497909650939450505050565b6000806020838503121561224d57600080fd5b823567ffffffffffffffff81111561226457600080fd5b61227085828601611f42565b90969095509350505050565b6000806040838503121561228f57600080fd5b8235915060208301356121da81611e5f565b600080604083850312156122b457600080fd5b823567ffffffffffffffff808211156122cc57600080fd5b6122d886838701611e74565b93506020915081850135818111156122ef57600080fd5b85019050601f8101861361230257600080fd5b8035612310611e9582611e3b565b81815260059190911b8201830190838101908883111561232f57600080fd5b928401925b82841015612354576123458461205f565b82529284019290840190612334565b80955050505050509250929050565b634e487b7160e01b600052603260045260246000fd5b6020808252825182820181905260009190848201906040850190845b818110156123ba5783516001600160a01b031683529284019291840191600101612395565b50909695505050505050565b634e487b7160e01b600052601160045260246000fd5b600082198211156123ef576123ef6123c6565b500190565b6000600019821415612408576124086123c6565b5060010190565b60008261242c57634e487b7160e01b600052601260045260246000fd5b500490565b600081600019048311821515161561244b5761244b6123c6565b500290565b600082821015612462576124626123c6565b50039056fea164736f6c6343000809000a", "linkReferences": {}, "deployedLinkReferences": {} } diff --git a/contracts/DataTypes.sol b/contracts/DataTypes.sol index 345301f..4d7a4bd 100644 --- a/contracts/DataTypes.sol +++ b/contracts/DataTypes.sol @@ -2,26 +2,28 @@ pragma solidity 0.8.9; library DataTypes { - struct Deposit { - /// @dev Remaining tokens available. - uint256 remaining; - /// @dev The PIX account for the seller receive transactions. - string pixTarget; - address seller; - /// @dev ERC20 stable token address. - address token; - /// @dev Could be invalidated by the seller. - bool valid; - } + // struct Deposit { + // /// @dev Remaining tokens available. + // uint256 remaining; + // /// @dev The PIX account for the seller receive transactions. + // string pixTarget; + // address seller; + // /// @dev ERC20 stable token address. + // address token; + // /// @dev Could be invalidated by the seller. + // bool valid; + // } struct Lock { - uint256 depositID; + uint256 sellerKey; + uint256 counter; /// @dev Amount to be paid for relayer. uint256 relayerPremium; /// @dev Amount to be tranfered via PIX. uint256 amount; /// @dev If not paid at this block will be expired. uint256 expirationBlock; + uint160 pixTarget; /// @dev Where the tokens are sent the when order gets validated. address buyerAddress; /// @dev Relayer's target address that receives `relayerPremium` funds. @@ -29,5 +31,6 @@ library DataTypes { /// @dev Relayer address (msg.sender) that facilitated this transaction. /// @dev Reputation points accruer. address relayerAddress; + address token; } } diff --git a/contracts/EventAndErrors.sol b/contracts/EventAndErrors.sol index 20359c6..606c451 100644 --- a/contracts/EventAndErrors.sol +++ b/contracts/EventAndErrors.sol @@ -7,28 +7,30 @@ interface EventAndErrors { event DepositAdded( address indexed seller, - uint256 depositID, + // uint256 depositID, address token, uint256 amount ); - event DepositClosed( + event ValidSet( address indexed seller, - uint256 depositID + address token, + bool state ); event DepositWithdrawn( address indexed seller, - uint256 depositID, + address token, uint256 amount ); event LockAdded( address indexed buyer, bytes32 indexed lockID, - uint256 depositID, + uint256 seller, uint256 amount ); event LockReleased( address indexed buyer, - bytes32 lockId + bytes32 lockId, + uint256 amount ); event LockReturned( address indexed buyer, @@ -103,4 +105,11 @@ interface EventAndErrors { /// @dev Reverts on an expired lock. /// @dev 0xf6fafba0 error LockExpired(); + + /// @dev 0xce3a3d37 + error DecOverflow(); + /// @dev 0x + error MaxBalExceeded(); + error EmptyPixTarget(); + error NotInitialized(); } diff --git a/contracts/p2pix.sol b/contracts/p2pix.sol index ac18658..11121ba 100644 --- a/contracts/p2pix.sol +++ b/contracts/p2pix.sol @@ -9,7 +9,7 @@ pragma solidity 0.8.9; /// import { Owned } from "./lib/auth/Owned.sol"; -import { Counters } from "./lib/utils/Counters.sol"; +// import { Counters } from "./lib/utils/Counters.sol"; import { ERC20, SafeTransferLib } from "./lib/utils/SafeTransferLib.sol"; import { IReputation } from "./lib/interfaces/IReputation.sol"; import { MerkleProofLib as Merkle } from "./lib/utils/MerkleProofLib.sol"; @@ -25,36 +25,53 @@ contract P2PIX is // solhint-disable use-forbidden-name // solhint-disable no-inline-assembly - using Counters for Counters.Counter; - using DT for DT.Deposit; + // using Counters for Counters.Counter; using DT for DT.Lock; + /// ███ Constants ██████████████████████████████████████████████████████████ + + /// @dev The bitmask of `sellerBalance` entry. + uint256 constant private BITMASK_SB_ENTRY = (1 << 94) - 1; + /// @dev The bit position of `pixTarget` in `sellerBalance`. + uint256 constant private BITPOS_PIXTARGET = 95; + /// @dev The bit position of `valid` in `sellerBalance`. + uint256 constant private BITPOS_VALID = 255; + /// @dev The bitmask of all 256 bits of `sellerBalance` except for the last one. + uint256 constant private BITMASK_VALID = (1 << 255) - 1; + /// @dev The scalar of BRZ token. + uint256 constant public WAD = 1e18; + /// ███ Storage ████████████████████████████████████████████████████████████ IReputation public reputation; - Counters.Counter public depositCount; - + // Counters.Counter public depositCount; /// @dev Default blocks that lock will hold tokens. uint256 public defaultLockBlocks; - /// @dev The scalar of BRZ token. - uint256 constant public WAD = 1e18; + uint256 public lockCounter; + /// @dev List of Locks. + mapping(bytes32 => DT.Lock) public mapLocks; + /// @dev Seller casted to key => Seller's allowlist merkleroot. + mapping(uint256 => bytes32) public sellerAllowList; /// @dev Stores an relayer's last computed credit. mapping(uint256 => uint256) public userRecord; /// @dev List of valid Bacen signature addresses mapping(uint256 => bool) public validBacenSigners; - /// @dev Seller list of deposits - mapping(uint256 => DT.Deposit) public mapDeposits; - /// @dev List of Locks. - mapping(bytes32 => DT.Lock) public mapLocks; /// @dev List of Pix transactions already signed. mapping(bytes32 => bool) public usedTransactions; - /// @dev Seller casted to key => Seller's allowlist merkleroot. - mapping(uint256 => bytes32) public sellerAllowList; /// @dev Tokens allowed to serve as the underlying amount of a deposit. mapping(ERC20 => bool) public allowedERC20s; + // BITS LAYOUT + // `uint96` [0...94] := balance + // `uint160` [95...254] := pixTarget + // `bool` [255] := valid + + /// @dev `balance` max. value = 10**26. + /// @dev `pixTarget` keys are restricted to 160 bits. + mapping(uint256 => mapping(ERC20 => uint256)) public sellerBalance; + /// ███ Constructor ████████████████████████████████████████████████████████ constructor( @@ -77,37 +94,46 @@ contract P2PIX is /// @dev Seller needs to send his tokens to the P2PIX smart contract. /// @param _pixTarget Pix key destination provided by the offer's seller. /// @param allowlistRoot Optional allow list merkleRoot update `bytes32` value. - /// @return depositID The `uint256` return value provided /// as the deposit identifier. /// @dev Function sighash: 0xbfe07da6. function deposit( address _token, - uint256 _amount, - string calldata _pixTarget, + uint96 _amount, + uint160 _pixTarget, + bool _valid, bytes32 allowlistRoot - ) public returns (uint256 depositID) { + ) public { ERC20 t = ERC20(_token); - if (!allowedERC20s[t]) revert TokenDenied(); - - (depositID) = _encodeDepositID(); - - DT.Deposit memory d = DT.Deposit({ - remaining: _amount, - pixTarget: _pixTarget, - seller: msg.sender, - token: _token, - valid: true - }); + uint256 k = _castAddrToKey(msg.sender); + + if(_pixTarget == 0) + revert EmptyPixTarget(); + if (!allowedERC20s[t]) + revert TokenDenied(); + uint256 _sellerBalance = + sellerBalance[k][t]; + + uint256 currBal = + _sellerBalance & BITMASK_SB_ENTRY; + if ((currBal + _amount) > 1e8 ether) + revert MaxBalExceeded(); setReentrancyGuard(); if (allowlistRoot != 0) { setRoot(msg.sender, allowlistRoot); } - - mapDeposits[depositID] = d; - depositCount.increment(); - + + uint256 amountCasted; + uint256 pixTargetCasted; + uint256 validCasted; + (amountCasted, pixTargetCasted, validCasted) = + _castToUint(_amount, _pixTarget, _valid); + sellerBalance[k][t] = + (currBal + amountCasted) | + (pixTargetCasted << BITPOS_PIXTARGET) | + (validCasted << BITPOS_VALID); + SafeTransferLib.safeTransferFrom( t, msg.sender, @@ -119,7 +145,6 @@ contract P2PIX is emit DepositAdded( msg.sender, - depositID, _token, _amount ); @@ -129,14 +154,26 @@ contract P2PIX is /// locks made to his/her token offering order. /// @dev This function does not affect any ongoing active locks. /// @dev Function sighash: 0x72fada5c. - - function cancelDeposit(uint256 depositID) public { - _onlySeller(depositID); - mapDeposits[depositID].valid = false; - emit DepositClosed( - mapDeposits[depositID].seller, - depositID + function setValidState(ERC20 token, bool state) public { + uint256 key = _castAddrToKey(msg.sender); + uint256 _sellerBalance = + sellerBalance[key][token]; + if (_sellerBalance != 0) { + uint256 _valid; + assembly { + _valid := state + } + _sellerBalance = (_sellerBalance & BITMASK_VALID) | + (_valid << BITPOS_VALID); + sellerBalance[key][token] = _sellerBalance; + + emit ValidSet( + msg.sender, + address(token), + state ); + } else + revert NotInitialized(); } /// @notice Public method designed to lock an remaining amount of @@ -159,7 +196,8 @@ contract P2PIX is /// @return lockID The `bytes32` value returned as the lock identifier. /// @dev Function sighash: 0x03aaf306. function lock( - uint256 _depositID, + address _seller, + address _token, address _buyerAddress, address _relayerTarget, uint256 _relayerPremium, @@ -168,44 +206,77 @@ contract P2PIX is bytes32[] calldata expiredLocks ) public nonReentrant returns (bytes32 lockID) { unlockExpired(expiredLocks); - DT.Deposit storage d = mapDeposits[_depositID]; + ERC20 t = ERC20(_token); + if (!getValid(_seller, t)) + revert InvalidDeposit(); + uint256 bal = getBalance(_seller, t); + if (bal < _amount) + revert NotEnoughTokens(); - if (!d.valid) revert InvalidDeposit(); - if (d.remaining < _amount) revert NotEnoughTokens(); + uint256 k = + _castAddrToKey(_seller); - (lockID) = _encodeLockID( - _depositID, - _amount, - _buyerAddress + uint256 cachedCounter = + lockCounter + 1; + + lockID = keccak256( + abi.encodePacked( + lockCounter, + _amount, + _buyerAddress + ) ); + if (mapLocks[lockID].expirationBlock >= block.number) + revert NotExpired(); - DT.Lock memory l = DT.Lock({ - depositID: _depositID, - relayerPremium: _relayerPremium, - amount: _amount, - expirationBlock: (block.number + - defaultLockBlocks), - buyerAddress: _buyerAddress, - relayerTarget: _relayerTarget, - relayerAddress: msg.sender - }); + DT.Lock memory l = DT.Lock( + k, + cachedCounter, + _relayerPremium, + _amount, + (block.number + defaultLockBlocks), + uint160(sellerBalance[k][t] >> BITPOS_PIXTARGET), + _buyerAddress, + _relayerTarget, + msg.sender, + address(t) + ); if (merkleProof.length != 0) { merkleVerify( merkleProof, - sellerAllowList[_castAddrToKey(d.seller)], + sellerAllowList[k], msg.sender ); - _addLock(lockID, l, d); + _addLock( + bal, + _amount, + lockID, + l, + t, + k); + + lockCounter++; // Halt execution and output `lockID`. return lockID; + } else { if (l.amount <= 1e2 ether) { - _addLock(lockID, l, d); - // Halt execution and output `lockID`. - return lockID; + _addLock( + bal, + _amount, + lockID, + l, + t, + k); + + lockCounter++; + + // Halt execution and output `lockID`. + return lockID; + } else { uint256 userCredit = userRecord[ _castAddrToKey(msg.sender) @@ -213,12 +284,22 @@ contract P2PIX is uint256 spendLimit; (spendLimit) = _limiter(userCredit / WAD); - if (l.amount > (spendLimit * WAD) || l.amount > 1e6 ether) - revert AmountNotAllowed(); + if (l.amount > (spendLimit * WAD) || + l.amount > 1e6 ether) + revert AmountNotAllowed(); - _addLock(lockID, l, d); - // Halt execution and output `lockID`. - return lockID; + _addLock( + bal, + _amount, + lockID, + l, + t, + k); + + lockCounter++; + + // Halt execution and output `lockID`. + return lockID; } } } @@ -250,10 +331,9 @@ contract P2PIX is if (l.expirationBlock < block.number) revert LockExpired(); - DT.Deposit storage d = mapDeposits[l.depositID]; bytes32 message = keccak256( abi.encodePacked( - d.pixTarget, + l.pixTarget, l.amount, pixTimestamp ) @@ -275,7 +355,7 @@ contract P2PIX is if (!validBacenSigners[signer]) revert InvalidSigner(); - ERC20 t = ERC20(d.token); + ERC20 t = ERC20(l.token); // We cache values before zeroing them out. uint256 lockAmount = l.amount; @@ -324,7 +404,7 @@ contract P2PIX is } } - emit LockReleased(l.buyerAddress, lockID); + emit LockReleased(l.buyerAddress, lockID, lockAmount); } /// @notice Unlocks expired locks. @@ -344,7 +424,13 @@ contract P2PIX is _notExpired(l); - mapDeposits[l.depositID].remaining += l.amount; + uint256 _sellerBalance = + sellerBalance[l.sellerKey][ERC20(l.token)] & BITMASK_SB_ENTRY; + if((_sellerBalance + l.amount) > 1e8 ether) + revert MaxBalExceeded(); + + sellerBalance[l.sellerKey][ERC20(l.token)] += l.amount; + l.amount = 0; uint256 userKey = _castAddrToKey( @@ -379,28 +465,44 @@ contract P2PIX is /// tokens from expired deposits. /// @dev Function sighash: 0x36317972. function withdraw( - uint256 depositID, + ERC20 token, bytes32[] calldata expiredLocks - ) public nonReentrant { - _onlySeller(depositID); + ) + public + nonReentrant + returns(uint256 _sellerBalance) + { unlockExpired(expiredLocks); - DT.Deposit storage d = mapDeposits[depositID]; + if (getValid(msg.sender, token) + == true + ) { + setValidState(token, false); + } - if (d.valid == true) { - cancelDeposit(depositID); - } + uint256 key = + _castAddrToKey(msg.sender); - ERC20 token = ERC20(d.token); + sellerBalance[key][token] -= + (_sellerBalance = + sellerBalance[key][token] + & BITMASK_SB_ENTRY); + + if(_sellerBalance == 0) + revert InvalidDeposit(); - // Withdraw remaining tokens from mapDeposit[depositID] - uint256 amount = d.remaining; - d.remaining = 0; + // safeTransfer tokens to seller + SafeTransferLib.safeTransfer( + token, + msg.sender, + _sellerBalance + ); - // safeTransfer tokens to seller - SafeTransferLib.safeTransfer(token, d.seller, amount); - - emit DepositWithdrawn(msg.sender, depositID, amount); + emit DepositWithdrawn( + msg.sender, + address(token), + _sellerBalance + ); } function setRoot( @@ -481,7 +583,7 @@ contract P2PIX is let tLoc := add(_tokens, 0x20) let sLoc := add(_states, 0x20) for { - let end := add(tLoc, mul(tLen, 0x20)) + let end := add(tLoc, shl(5, tLen)) } iszero(eq(tLoc, end)) { tLoc := add(tLoc, 0x20) sLoc := add(sLoc, 0x20) @@ -508,14 +610,6 @@ contract P2PIX is // solhint-disable-next-line no-empty-blocks receive() external payable {} - /// @notice Access control private view method that - /// performs auth check on an deposit's seller. - /// @dev Function sighash: 0x4125a4d9. - function _onlySeller(uint256 _depositID) private view { - if (mapDeposits[_depositID].seller != msg.sender) - revert OnlySeller(); - } - /// @notice Private view auxiliar logic that reverts /// on a not expired lock passed as argument of the function. /// @dev Called exclusively by the `unlockExpired` method. @@ -526,31 +620,74 @@ contract P2PIX is if (_l.amount == 0) revert AlreadyReleased(); } - /// @notice Internal view auxiliar logic that returns a new valid `_depositID`. - /// @dev It reverts on an already valid counter (`uint256`) value. - /// @dev Function sighash: 0xdb51d697. - function _encodeDepositID() - internal - view - returns (uint256 _depositID) - { - (_depositID) = depositCount.current(); - } - function _addLock( + uint256 _bal, + uint256 _amount, bytes32 _lockID, DT.Lock memory _l, - DT.Deposit storage _d + ERC20 _t, + uint256 _k ) internal { + mapLocks[_lockID] = _l; - _d.remaining -= _l.amount; + + assembly { + if iszero( + iszero( + or( + iszero(_bal), + lt( + sub( + _bal, + _amount), + 0x0 + )))) { + // DecOverflow() + mstore(0x00, 0xce3a3d37) + revert(0x1c, 0x04) + } + } + + // we can directly dec from packed uint entry value + sellerBalance[_k][_t] -= _amount; emit LockAdded( _l.buyerAddress, _lockID, - _l.depositID, + _l.sellerKey, _l.amount ); + + /// @todo + // assembly { + // // sstore(mp.slot, _l) + // mstore(0x00, _k) + // mstore(0x20, sellerBalance.slot) + // let sbkslot := keccak256(0x00, 0x40) + // mstore(0x00, _t) + // mstore(0x20, sbkslot) + // let sbslot := keccak256(0x00,0x40) + // let oldsb := sload(sbslot) + // sstore( + // sbslot, + // or( + // or( + // _newBal, + // shr( + // oldsb, + // BITPOS_PIXTARGET + // )), + // and( + // shr( + // oldsb, + // BITPOS_VALID + // ), + // BITMASK_SB_ENTRY + // ) + // ) + // ) + // } + } /// @notice Private view auxiliar logic that encodes/returns @@ -559,21 +696,21 @@ contract P2PIX is /// as argument of the function. /// @dev Called exclusively by the `lock` method. /// @dev Function sighash: 0x3fc5fb52. - function _encodeLockID( - uint256 _depositID, - uint256 _amount, - address _buyerAddress - ) private view returns (bytes32 _lockID) { - _lockID = keccak256( - abi.encodePacked( - _depositID, - _amount, - _buyerAddress - ) - ); - if (mapLocks[_lockID].expirationBlock >= block.number) - revert NotExpired(); - } + // function _encodeLockID( + // uint256 _lockCounter, + // uint256 _amount, + // address _buyerAddress + // ) private view returns (bytes32 _lockID) { + // _lockID = keccak256( + // abi.encodePacked( + // _lockCounter, + // _amount, + // _buyerAddress + // ) + // ); + // if (mapLocks[_lockID].expirationBlock >= block.number) + // revert NotExpired(); + // } function merkleVerify( bytes32[] calldata _merkleProof, @@ -628,6 +765,69 @@ contract P2PIX is } } + function _castToUint( + uint96 _amount, + uint160 _pixTarget, + bool _valid) + private + pure + returns ( + uint256 _amountCasted, + uint256 _pixTargetCasted, + uint256 _validCasted + ) { + assembly { + _amountCasted := _amount + _pixTargetCasted := _pixTarget + _validCasted := _valid + } + } + + function getBalance( + address seller, + ERC20 token + ) + public + view + returns(uint256 bal) + { + bal = + sellerBalance[ + _castAddrToKey(seller) + ][token] & BITMASK_SB_ENTRY; + } + + function getValid( + address seller, + ERC20 token + ) + public + view + returns(bool valid) + { + uint256 b = + (sellerBalance[ + _castAddrToKey(seller) + ][token] >> BITPOS_VALID) & BITMASK_SB_ENTRY; + assembly { valid := b } + } + + function getPixTarget( + address seller, + ERC20 token + ) + public + view + returns(uint160 pixTarget) + { + pixTarget = + uint160( + sellerBalance[ + _castAddrToKey(seller) + ][token] >> BITPOS_PIXTARGET + ); + } + /// @notice Public method that handles `address` /// to `uint256` safe type casting. /// @dev Function sighash: 0x4b2ae980. @@ -636,4 +836,10 @@ contract P2PIX is ) public pure returns (uint256 _key) { _key = uint256(uint160(address(_addr))) << 12; } + + function _castKeyToAddr( + uint256 _key + ) public pure returns (address _addr) { + _addr = address(uint160(uint256(_key >> 12))); + } } diff --git a/src/types/EventAndErrors.ts b/src/types/EventAndErrors.ts index 0e4e70c..666505b 100644 --- a/src/types/EventAndErrors.ts +++ b/src/types/EventAndErrors.ts @@ -17,22 +17,21 @@ export interface EventAndErrorsInterface extends utils.Interface { events: { "AllowedERC20Updated(address,bool)": EventFragment; - "DepositAdded(address,uint256,address,uint256)": EventFragment; - "DepositClosed(address,uint256)": EventFragment; - "DepositWithdrawn(address,uint256,uint256)": EventFragment; + "DepositAdded(address,address,uint256)": EventFragment; + "DepositWithdrawn(address,address,uint256)": EventFragment; "FundsWithdrawn(address,uint256)": EventFragment; "LockAdded(address,bytes32,uint256,uint256)": EventFragment; "LockBlocksUpdated(uint256)": EventFragment; - "LockReleased(address,bytes32)": EventFragment; + "LockReleased(address,bytes32,uint256)": EventFragment; "LockReturned(address,bytes32)": EventFragment; "ReputationUpdated(address)": EventFragment; "RootUpdated(address,bytes32)": EventFragment; + "ValidSet(address,address,bool)": EventFragment; "ValidSignersUpdated(address[])": EventFragment; }; getEvent(nameOrSignatureOrTopic: "AllowedERC20Updated"): EventFragment; getEvent(nameOrSignatureOrTopic: "DepositAdded"): EventFragment; - getEvent(nameOrSignatureOrTopic: "DepositClosed"): EventFragment; getEvent(nameOrSignatureOrTopic: "DepositWithdrawn"): EventFragment; getEvent(nameOrSignatureOrTopic: "FundsWithdrawn"): EventFragment; getEvent(nameOrSignatureOrTopic: "LockAdded"): EventFragment; @@ -41,6 +40,7 @@ export interface EventAndErrorsInterface extends utils.Interface { getEvent(nameOrSignatureOrTopic: "LockReturned"): EventFragment; getEvent(nameOrSignatureOrTopic: "ReputationUpdated"): EventFragment; getEvent(nameOrSignatureOrTopic: "RootUpdated"): EventFragment; + getEvent(nameOrSignatureOrTopic: "ValidSet"): EventFragment; getEvent(nameOrSignatureOrTopic: "ValidSignersUpdated"): EventFragment; } @@ -58,35 +58,23 @@ export type AllowedERC20UpdatedEventFilter = export interface DepositAddedEventObject { seller: string; - depositID: BigNumber; token: string; amount: BigNumber; } export type DepositAddedEvent = TypedEvent< - [string, BigNumber, string, BigNumber], + [string, string, BigNumber], DepositAddedEventObject >; export type DepositAddedEventFilter = TypedEventFilter; -export interface DepositClosedEventObject { - seller: string; - depositID: BigNumber; -} -export type DepositClosedEvent = TypedEvent< - [string, BigNumber], - DepositClosedEventObject ->; - -export type DepositClosedEventFilter = TypedEventFilter; - export interface DepositWithdrawnEventObject { seller: string; - depositID: BigNumber; + token: string; amount: BigNumber; } export type DepositWithdrawnEvent = TypedEvent< - [string, BigNumber, BigNumber], + [string, string, BigNumber], DepositWithdrawnEventObject >; @@ -107,7 +95,7 @@ export type FundsWithdrawnEventFilter = TypedEventFilter; export interface LockAddedEventObject { buyer: string; lockID: string; - depositID: BigNumber; + seller: BigNumber; amount: BigNumber; } export type LockAddedEvent = TypedEvent< @@ -131,9 +119,10 @@ export type LockBlocksUpdatedEventFilter = export interface LockReleasedEventObject { buyer: string; lockId: string; + amount: BigNumber; } export type LockReleasedEvent = TypedEvent< - [string, string], + [string, string, BigNumber], LockReleasedEventObject >; @@ -172,6 +161,18 @@ export type RootUpdatedEvent = TypedEvent< export type RootUpdatedEventFilter = TypedEventFilter; +export interface ValidSetEventObject { + seller: string; + token: string; + state: boolean; +} +export type ValidSetEvent = TypedEvent< + [string, string, boolean], + ValidSetEventObject +>; + +export type ValidSetEventFilter = TypedEventFilter; + export interface ValidSignersUpdatedEventObject { signers: string[]; } @@ -223,36 +224,25 @@ export interface EventAndErrors extends BaseContract { state?: PromiseOrValue | null ): AllowedERC20UpdatedEventFilter; - "DepositAdded(address,uint256,address,uint256)"( + "DepositAdded(address,address,uint256)"( seller?: PromiseOrValue | null, - depositID?: null, token?: null, amount?: null ): DepositAddedEventFilter; DepositAdded( seller?: PromiseOrValue | null, - depositID?: null, token?: null, amount?: null ): DepositAddedEventFilter; - "DepositClosed(address,uint256)"( + "DepositWithdrawn(address,address,uint256)"( seller?: PromiseOrValue | null, - depositID?: null - ): DepositClosedEventFilter; - DepositClosed( - seller?: PromiseOrValue | null, - depositID?: null - ): DepositClosedEventFilter; - - "DepositWithdrawn(address,uint256,uint256)"( - seller?: PromiseOrValue | null, - depositID?: null, + token?: null, amount?: null ): DepositWithdrawnEventFilter; DepositWithdrawn( seller?: PromiseOrValue | null, - depositID?: null, + token?: null, amount?: null ): DepositWithdrawnEventFilter; @@ -265,26 +255,28 @@ export interface EventAndErrors extends BaseContract { "LockAdded(address,bytes32,uint256,uint256)"( buyer?: PromiseOrValue | null, lockID?: PromiseOrValue | null, - depositID?: null, + seller?: null, amount?: null ): LockAddedEventFilter; LockAdded( buyer?: PromiseOrValue | null, lockID?: PromiseOrValue | null, - depositID?: null, + seller?: null, amount?: null ): LockAddedEventFilter; "LockBlocksUpdated(uint256)"(blocks?: null): LockBlocksUpdatedEventFilter; LockBlocksUpdated(blocks?: null): LockBlocksUpdatedEventFilter; - "LockReleased(address,bytes32)"( + "LockReleased(address,bytes32,uint256)"( buyer?: PromiseOrValue | null, - lockId?: null + lockId?: null, + amount?: null ): LockReleasedEventFilter; LockReleased( buyer?: PromiseOrValue | null, - lockId?: null + lockId?: null, + amount?: null ): LockReleasedEventFilter; "LockReturned(address,bytes32)"( @@ -307,6 +299,17 @@ export interface EventAndErrors extends BaseContract { ): RootUpdatedEventFilter; RootUpdated(seller?: null, merkleRoot?: null): RootUpdatedEventFilter; + "ValidSet(address,address,bool)"( + seller?: PromiseOrValue | null, + token?: null, + state?: null + ): ValidSetEventFilter; + ValidSet( + seller?: PromiseOrValue | null, + token?: null, + state?: null + ): ValidSetEventFilter; + "ValidSignersUpdated(address[])"( signers?: null ): ValidSignersUpdatedEventFilter; diff --git a/src/types/factories/EventAndErrors__factory.ts b/src/types/factories/EventAndErrors__factory.ts index 817b9b2..853c096 100644 --- a/src/types/factories/EventAndErrors__factory.ts +++ b/src/types/factories/EventAndErrors__factory.ts @@ -25,11 +25,21 @@ const _abi = [ name: "AmountNotAllowed", type: "error", }, + { + inputs: [], + name: "DecOverflow", + type: "error", + }, { inputs: [], name: "DepositAlreadyExists", type: "error", }, + { + inputs: [], + name: "EmptyPixTarget", + type: "error", + }, { inputs: [], name: "InvalidDeposit", @@ -55,6 +65,11 @@ const _abi = [ name: "LoopOverflow", type: "error", }, + { + inputs: [], + name: "MaxBalExceeded", + type: "error", + }, { inputs: [], name: "NoTokens", @@ -70,6 +85,11 @@ const _abi = [ name: "NotExpired", type: "error", }, + { + inputs: [], + name: "NotInitialized", + type: "error", + }, { inputs: [], name: "OnlySeller", @@ -118,12 +138,6 @@ const _abi = [ name: "seller", type: "address", }, - { - indexed: false, - internalType: "uint256", - name: "depositID", - type: "uint256", - }, { indexed: false, internalType: "address", @@ -151,29 +165,10 @@ const _abi = [ }, { indexed: false, - internalType: "uint256", - name: "depositID", - type: "uint256", - }, - ], - name: "DepositClosed", - type: "event", - }, - { - anonymous: false, - inputs: [ - { - indexed: true, internalType: "address", - name: "seller", + name: "token", type: "address", }, - { - indexed: false, - internalType: "uint256", - name: "depositID", - type: "uint256", - }, { indexed: false, internalType: "uint256", @@ -221,7 +216,7 @@ const _abi = [ { indexed: false, internalType: "uint256", - name: "depositID", + name: "seller", type: "uint256", }, { @@ -262,6 +257,12 @@ const _abi = [ name: "lockId", type: "bytes32", }, + { + indexed: false, + internalType: "uint256", + name: "amount", + type: "uint256", + }, ], name: "LockReleased", type: "event", @@ -317,6 +318,31 @@ const _abi = [ name: "RootUpdated", type: "event", }, + { + anonymous: false, + inputs: [ + { + indexed: true, + internalType: "address", + name: "seller", + type: "address", + }, + { + indexed: false, + internalType: "address", + name: "token", + type: "address", + }, + { + indexed: false, + internalType: "bool", + name: "state", + type: "bool", + }, + ], + name: "ValidSet", + type: "event", + }, { anonymous: false, inputs: [ diff --git a/src/types/factories/p2pix.sol/P2PIX__factory.ts b/src/types/factories/p2pix.sol/P2PIX__factory.ts index 56e5edd..1a7a162 100644 --- a/src/types/factories/p2pix.sol/P2PIX__factory.ts +++ b/src/types/factories/p2pix.sol/P2PIX__factory.ts @@ -60,11 +60,21 @@ const _abi = [ name: "AmountNotAllowed", type: "error", }, + { + inputs: [], + name: "DecOverflow", + type: "error", + }, { inputs: [], name: "DepositAlreadyExists", type: "error", }, + { + inputs: [], + name: "EmptyPixTarget", + type: "error", + }, { inputs: [], name: "InvalidDeposit", @@ -90,6 +100,11 @@ const _abi = [ name: "LoopOverflow", type: "error", }, + { + inputs: [], + name: "MaxBalExceeded", + type: "error", + }, { inputs: [], name: "NoTokens", @@ -105,6 +120,11 @@ const _abi = [ name: "NotExpired", type: "error", }, + { + inputs: [], + name: "NotInitialized", + type: "error", + }, { inputs: [], name: "OnlySeller", @@ -158,12 +178,6 @@ const _abi = [ name: "seller", type: "address", }, - { - indexed: false, - internalType: "uint256", - name: "depositID", - type: "uint256", - }, { indexed: false, internalType: "address", @@ -191,29 +205,10 @@ const _abi = [ }, { indexed: false, - internalType: "uint256", - name: "depositID", - type: "uint256", - }, - ], - name: "DepositClosed", - type: "event", - }, - { - anonymous: false, - inputs: [ - { - indexed: true, internalType: "address", - name: "seller", + name: "token", type: "address", }, - { - indexed: false, - internalType: "uint256", - name: "depositID", - type: "uint256", - }, { indexed: false, internalType: "uint256", @@ -261,7 +256,7 @@ const _abi = [ { indexed: false, internalType: "uint256", - name: "depositID", + name: "seller", type: "uint256", }, { @@ -302,6 +297,12 @@ const _abi = [ name: "lockId", type: "bytes32", }, + { + indexed: false, + internalType: "uint256", + name: "amount", + type: "uint256", + }, ], name: "LockReleased", type: "event", @@ -376,6 +377,31 @@ const _abi = [ name: "RootUpdated", type: "event", }, + { + anonymous: false, + inputs: [ + { + indexed: true, + internalType: "address", + name: "seller", + type: "address", + }, + { + indexed: false, + internalType: "address", + name: "token", + type: "address", + }, + { + indexed: false, + internalType: "bool", + name: "state", + type: "bool", + }, + ], + name: "ValidSet", + type: "event", + }, { anonymous: false, inputs: [ @@ -421,6 +447,25 @@ const _abi = [ stateMutability: "pure", type: "function", }, + { + inputs: [ + { + internalType: "uint256", + name: "_key", + type: "uint256", + }, + ], + name: "_castKeyToAddr", + outputs: [ + { + internalType: "address", + name: "_addr", + type: "address", + }, + ], + stateMutability: "pure", + type: "function", + }, { inputs: [ { @@ -440,19 +485,6 @@ const _abi = [ stateMutability: "view", type: "function", }, - { - inputs: [ - { - internalType: "uint256", - name: "depositID", - type: "uint256", - }, - ], - name: "cancelDeposit", - outputs: [], - stateMutability: "nonpayable", - type: "function", - }, { inputs: [], name: "defaultLockBlocks", @@ -474,14 +506,19 @@ const _abi = [ type: "address", }, { - internalType: "uint256", + internalType: "uint96", name: "_amount", - type: "uint256", + type: "uint96", }, { - internalType: "string", + internalType: "uint160", name: "_pixTarget", - type: "string", + type: "uint160", + }, + { + internalType: "bool", + name: "_valid", + type: "bool", }, { internalType: "bytes32", @@ -490,23 +527,28 @@ const _abi = [ }, ], name: "deposit", - outputs: [ - { - internalType: "uint256", - name: "depositID", - type: "uint256", - }, - ], + outputs: [], stateMutability: "nonpayable", type: "function", }, { - inputs: [], - name: "depositCount", + inputs: [ + { + internalType: "address", + name: "seller", + type: "address", + }, + { + internalType: "contract ERC20", + name: "token", + type: "address", + }, + ], + name: "getBalance", outputs: [ { internalType: "uint256", - name: "_val", + name: "bal", type: "uint256", }, ], @@ -516,9 +558,62 @@ const _abi = [ { inputs: [ { - internalType: "uint256", - name: "_depositID", - type: "uint256", + internalType: "address", + name: "seller", + type: "address", + }, + { + internalType: "contract ERC20", + name: "token", + type: "address", + }, + ], + name: "getPixTarget", + outputs: [ + { + internalType: "uint160", + name: "pixTarget", + type: "uint160", + }, + ], + stateMutability: "view", + type: "function", + }, + { + inputs: [ + { + internalType: "address", + name: "seller", + type: "address", + }, + { + internalType: "contract ERC20", + name: "token", + type: "address", + }, + ], + name: "getValid", + outputs: [ + { + internalType: "bool", + name: "valid", + type: "bool", + }, + ], + stateMutability: "view", + type: "function", + }, + { + inputs: [ + { + internalType: "address", + name: "_seller", + type: "address", + }, + { + internalType: "address", + name: "_token", + type: "address", }, { internalType: "address", @@ -563,41 +658,15 @@ const _abi = [ type: "function", }, { - inputs: [ + inputs: [], + name: "lockCounter", + outputs: [ { internalType: "uint256", name: "", type: "uint256", }, ], - name: "mapDeposits", - outputs: [ - { - internalType: "uint256", - name: "remaining", - type: "uint256", - }, - { - internalType: "string", - name: "pixTarget", - type: "string", - }, - { - internalType: "address", - name: "seller", - type: "address", - }, - { - internalType: "address", - name: "token", - type: "address", - }, - { - internalType: "bool", - name: "valid", - type: "bool", - }, - ], stateMutability: "view", type: "function", }, @@ -613,7 +682,12 @@ const _abi = [ outputs: [ { internalType: "uint256", - name: "depositID", + name: "sellerKey", + type: "uint256", + }, + { + internalType: "uint256", + name: "counter", type: "uint256", }, { @@ -631,6 +705,11 @@ const _abi = [ name: "expirationBlock", type: "uint256", }, + { + internalType: "uint160", + name: "pixTarget", + type: "uint160", + }, { internalType: "address", name: "buyerAddress", @@ -646,6 +725,11 @@ const _abi = [ name: "relayerAddress", type: "address", }, + { + internalType: "address", + name: "token", + type: "address", + }, ], stateMutability: "view", type: "function", @@ -733,6 +817,30 @@ const _abi = [ stateMutability: "view", type: "function", }, + { + inputs: [ + { + internalType: "uint256", + name: "", + type: "uint256", + }, + { + internalType: "contract ERC20", + name: "", + type: "address", + }, + ], + name: "sellerBalance", + outputs: [ + { + internalType: "uint256", + name: "", + type: "uint256", + }, + ], + stateMutability: "view", + type: "function", + }, { inputs: [ { @@ -803,6 +911,24 @@ const _abi = [ stateMutability: "nonpayable", type: "function", }, + { + inputs: [ + { + internalType: "contract ERC20", + name: "token", + type: "address", + }, + { + internalType: "bool", + name: "state", + type: "bool", + }, + ], + name: "setValidState", + outputs: [], + stateMutability: "nonpayable", + type: "function", + }, { inputs: [ { @@ -894,9 +1020,9 @@ const _abi = [ { inputs: [ { - internalType: "uint256", - name: "depositID", - type: "uint256", + internalType: "contract ERC20", + name: "token", + type: "address", }, { internalType: "bytes32[]", @@ -905,7 +1031,13 @@ const _abi = [ }, ], name: "withdraw", - outputs: [], + outputs: [ + { + internalType: "uint256", + name: "_sellerBalance", + type: "uint256", + }, + ], stateMutability: "nonpayable", type: "function", }, @@ -923,7 +1055,7 @@ const _abi = [ ]; const _bytecode = - "0x608060405260018055604051620028a1380380620028a18339810160408190526200002a916200049d565b600080546001600160a01b031916339081178255604051909182917f8292fce18fa69edf4db7b94ea2e58241df0ae57f97e0a6c9b29067028bf92d76908290a3506200007685620000a3565b620000818362000133565b6200008c84620001bd565b620000988282620002a1565b505050505062000620565b6000546001600160a01b03163314620000f25760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064015b60405180910390fd5b806004557f70fa43ca70216ad905ade86b9e650a691b2ce5a01980d0a81bdd8324141b8511816040516200012891815260200190565b60405180910390a150565b6000546001600160a01b031633146200017e5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401620000e9565b60028190556040516001600160a01b03821681527fe127cf589a3879da0156d4a24f43b44f65cfa3570de594806b0bfa2fcf06884f9060200162000128565b6000546001600160a01b03163314620002085760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401620000e9565b80516000905b808210156200026e57600062000246848481518110620002325762000232620005bb565b60200260200101516200038760201b60201c565b6000908152600660205260409020805460ff191660019081179091559290920191506200020e565b50507f14a422d2412784a5749d03da98921fe468c98577b767851389a9f58ea5a363d781604051620001289190620005d1565b6000546001600160a01b03163314620002ec5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401620000e9565b815180620003025763df9578836000526004601cfd5b81518114620003195763ff633a386000526004601cfd5b60208301602083016020830282015b8083146200037f578251600052600b60205260406000208251815550815183517f5d6e86e5341d57a92c49934296c51542a25015c9b1782a1c2722a940131c3d9a600080a360208301925060208201915062000328565b505050505050565b600c1b611000600160ac1b031690565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b0381118282101715620003d857620003d862000397565b604052919050565b60006001600160401b03821115620003fc57620003fc62000397565b5060051b60200190565b6001600160a01b03811681146200041c57600080fd5b50565b600082601f8301126200043157600080fd5b815160206200044a6200044483620003e0565b620003ad565b82815260059290921b840181019181810190868411156200046a57600080fd5b8286015b8481101562000492578051620004848162000406565b83529183019183016200046e565b509695505050505050565b600080600080600060a08688031215620004b657600080fd5b8551602080880151919650906001600160401b0380821115620004d857600080fd5b620004e68a838b016200041f565b965060408901519150620004fa8262000406565b6060890151919550808211156200051057600080fd5b6200051e8a838b016200041f565b945060808901519150808211156200053557600080fd5b508701601f810189136200054857600080fd5b8051620005596200044482620003e0565b81815260059190911b8201830190838101908b8311156200057957600080fd5b928401925b82841015620005a95783518015158114620005995760008081fd5b825292840192908401906200057e565b80955050505050509295509295909350565b634e487b7160e01b600052603260045260246000fd5b6020808252825182820181905260009190848201906040850190845b81811015620006145783516001600160a01b031683529284019291840191600101620005ed565b50909695505050505050565b61227180620006306000396000f3fe6080604052600436106101a55760003560e01c806372fada5c116100e15780638e2749d61161008a57806398a268711161006457806398a268711461056b578063c52164c61461059b578063d6e8b973146105bb578063f7d0e04b146105db57600080fd5b80638e2749d6146105045780638e2a3d36146105245780639872dbfe1461055557600080fd5b80637f94f65d116100bb5780637f94f65d1461048c5780638652b37e146104ac5780638da5cb5b146104cc57600080fd5b806372fada5c1461041f578063758d77d41461043f57806377cd38a41461045f57600080fd5b8063363179721161014e578063574983c811610128578063574983c81461039e5780635fd8c710146103be57806369cc6af4146103d35780636a1460241461040357600080fd5b80633631797214610313578063461f3120146103335780634b2ae9801461037357600080fd5b806316d722401161017f57806316d722401461023357806329cc7d10146102dc5780632dfdf0b5146102fc57600080fd5b806304937320146101b15780630d2a2d44146101f157806313af40351461021357600080fd5b366101ac57005b600080fd5b3480156101bd57600080fd5b506101de6101cc366004611b2c565b60056020526000908152604090205481565b6040519081526020015b60405180910390f35b3480156101fd57600080fd5b5061021161020c366004611c39565b6105fb565b005b34801561021f57600080fd5b5061021161022e366004611c76565b6106ec565b34801561023f57600080fd5b5061029861024e366004611b2c565b600860205260009081526040902080546001820154600283015460038401546004850154600586015460069096015494959394929391926001600160a01b03918216928216911687565b6040805197885260208801969096529486019390935260608501919091526001600160a01b03908116608085015290811660a08401521660c082015260e0016101e8565b3480156102e857600080fd5b506101de6102f7366004611c93565b61078d565b34801561030857600080fd5b506003546101de9081565b34801561031f57600080fd5b5061021161032e366004611d70565b610978565b34801561033f57600080fd5b5061036361034e366004611b2c565b60096020526000908152604090205460ff1681565b60405190151581526020016101e8565b34801561037f57600080fd5b506101de61038e366004611c76565b600c1b611000600160ac1b031690565b3480156103aa57600080fd5b506102116103b9366004611b2c565b610a38565b3480156103ca57600080fd5b50610211610ab6565b3480156103df57600080fd5b506103636103ee366004611c76565b600b6020526000908152604090205460ff1681565b34801561040f57600080fd5b506101de670de0b6b3a764000081565b34801561042b57600080fd5b5061021161043a366004611b2c565b610b40565b34801561044b57600080fd5b5061021161045a366004611dbc565b610bc8565b34801561046b57600080fd5b506101de61047a366004611b2c565b600a6020526000908152604090205481565b34801561049857600080fd5b506102116104a7366004611e20565b610f9e565b3480156104b857600080fd5b506101de6104c7366004611e4c565b611031565b3480156104d857600080fd5b506000546104ec906001600160a01b031681565b6040516001600160a01b0390911681526020016101e8565b34801561051057600080fd5b5061021161051f366004611f00565b611211565b34801561053057600080fd5b5061054461053f366004611b2c565b611379565b6040516101e8959493929190611f42565b34801561056157600080fd5b506101de60045481565b34801561057757600080fd5b50610363610586366004611b2c565b60066020526000908152604090205460ff1681565b3480156105a757600080fd5b506002546104ec906001600160a01b031681565b3480156105c757600080fd5b506102116105d6366004611fcf565b611443565b3480156105e757600080fd5b506102116105f6366004611c76565b61151b565b6000546001600160a01b031633146106495760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064015b60405180910390fd5b80516000905b808210156106b057600061068984848151811061066e5761066e612099565b6020026020010151611000600160ac1b03600c9190911b1690565b6000908152600660205260409020805460ff1916600190811790915592909201915061064f565b50507f14a422d2412784a5749d03da98921fe468c98577b767851389a9f58ea5a363d7816040516106e191906120af565b60405180910390a150565b6000546001600160a01b031633146107355760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401610640565b6000805473ffffffffffffffffffffffffffffffffffffffff19166001600160a01b0383169081178255604051909133917f8292fce18fa69edf4db7b94ea2e58241df0ae57f97e0a6c9b29067028bf92d769190a350565b6001600160a01b0385166000908152600b6020526040812054869060ff166107c857604051630abc194760e11b815260040160405180910390fd5b6107d06115a2565b915060006040518060a0016040528088815260200187878080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152505050908252503360208201526001600160a01b038a166040820152600160609091015290506108456115b2565b8315610855576108553385610f9e565b6000838152600760209081526040909120825181558183015180518493610883926001850192910190611a93565b5060408201516002820180546001600160a01b0392831673ffffffffffffffffffffffffffffffffffffffff199091161790556060830151600392830180546080909501511515600160a01b027fffffffffffffffffffffff00000000000000000000000000000000000000000090951691909216179290921790915561090d9080546001019055565b6109198233308a6115dd565b61092260018055565b604080518481526001600160a01b038a16602082015290810188905233907f25ac57b911b0f66b64c294827f539545fbc3ddd002cafab117776274f3241e4c9060600160405180910390a2505095945050505050565b6109806115b2565b61098983611674565b6109938282611211565b60008381526007602052604090206003810154600160a01b900460ff161515600114156109c3576109c384610b40565b600381015481546000835560028301546001600160a01b03928316926109ec91849116836116b1565b604080518781526020810183905233917f7719804546c0185709e60c90d164447ff251a5ba29af0216faa921350f6bebf7910160405180910390a2505050610a3360018055565b505050565b6000546001600160a01b03163314610a815760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401610640565b806004557f70fa43ca70216ad905ade86b9e650a691b2ce5a01980d0a81bdd8324141b8511816040516106e191815260200190565b6000546001600160a01b03163314610aff5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401610640565b47610b0a338261173d565b60408051338152602081018390527feaff4b37086828766ad3268786972c0cd24259d4c87a80f9d3963a3c3d999b0d91016106e1565b610b4981611674565b6000818152600760209081526040918290206003810180547fffffffffffffffffffffff00ffffffffffffffffffffffffffffffffffffffff1690556002015491518381526001600160a01b03909216917fb4d98b272597e828d9b172c0d44390d5b267040e918088eac8a0a0fadcb81c70910160405180910390a250565b610bd06115b2565b60008681526008602052604090206002810154610c00576040516331da482760e11b815260040160405180910390fd5b4381600301541015610c25576040516307b7d7dd60e51b815260040160405180910390fd5b8054600090815260076020908152604080832060028501549151909392610c5592600186019290918b9101612137565b604051602081830303815290604052805190602001209050600081604051602001610cac91907f19457468657265756d205369676e6564204d6573736167653a0a3332000000008152601c810191909152603c0190565b60408051601f1981840301815291815281516020928301206000858152600990935291205490915060ff16151560011415610cfa57604051637a48537560e11b815260040160405180910390fd5b6040805160008082526020820180845284905260ff8816928201929092526060810189905260808101889052610d6e9060019060a0016020604051602081039080840390855afa158015610d52573d6000803e3d6000fd5b5050604051601f190151600c1b611000600160ac1b0316919050565b60008181526006602052604090205490915060ff16610da057604051632057875960e21b815260040160405180910390fd5b6003840154600286015460018701546001600160a01b0390921691600090610dc890836121f4565b600060028a0181905560038a01819055878152600960205260409020805460ff191660011790556006890154909150336001600160a01b0390911614610e79576001880154611000600160ac1b0333600c1b1660009081526005602052604081208054909190610e3990849061220b565b90915550506006880154600c1b611000600160ac1b031660009081526005602052604081208054849290610e6e90849061220b565b90915550610ebb9050565b818860010154610e89919061220b565b611000600160ac1b0333600c1b1660009081526005602052604081208054909190610eb590849061220b565b90915550505b6004880154610ed59084906001600160a01b0316836116b1565b600188015415610f415760058801546001600160a01b038e8116911614610f325760058801546001808a0154610f1a9286926001600160a01b0390911691901c6116b1565b610f2d838e60018b60010154901c6116b1565b610f41565b610f41838e8a600101546116b1565b60048801546040518f81526001600160a01b03909116907f5e420822d2f7281fdc4b763c62c8b7874bf22108a35efe93144d79296aacc67d9060200160405180910390a25050505050505050610f9660018055565b505050505050565b6001600160a01b03821633141561101857611000600160ac1b03600c83901b166000908152600a602090815260409182902083905581516001600160a01b038516815290810183905281517f0b294da292f26e55fd442b5c0164fbb9013036ff00c5cfdde0efd01c1baaf632929181900390910190a15050565b6040516342e8fb9360e11b815260040160405180910390fd5b600061103b6115b2565b6110458383611211565b60008a81526007602052604090206003810154600160a01b900460ff1661107f57604051635972996f60e11b815260040160405180910390fd5b80548711156110a1576040516308aeed0f60e21b815260040160405180910390fd5b6110ac8b888c611798565b915060006040518060e001604052808d81526020018a8152602001898152602001600454436110db919061220b565b81526001600160a01b03808e1660208301528c1660408201523360609091015290508515611144576002820154600c1b611000600160ac1b03166000908152600a602052604090205461113290889088903361181c565b61113d83828461184e565b50506111fb565b68056bc75e2d631000008160400151116111635761113d83828461184e565b611000600160ac1b0333600c1b166000908152600560205260408120549061119b611196670de0b6b3a764000084612223565b61194c565b90506111af670de0b6b3a764000082612245565b836040015111806111cd575069d3c21bcecceda10000008360400151115b156111eb57604051630e0c7c2360e11b815260040160405180910390fd5b6111f685848661184e565b505050505b61120460018055565b9998505050505050505050565b6000815b8082101561135d5760006008600086868681811061123557611235612099565b905060200201358152602001908152602001600020905061125581611a08565b600281015481546000908152600760205260408120805490919061127a90849061220b565b90915550506000600282018190556006820154600c1b611000600160ac1b031660008181526005602052604090205490915060011c68056bc75e2d6310000081116112de57600082815260056020526040902068056bc75e2d6310000090556112f0565b60008281526005602052604090208190555b60048301546001600160a01b03167f67e089478e21dd12c98e69331c4152f6c9b2038b91e0f28268ffa01558c0b4ff88888881811061133157611331612099565b9050602002013560405161134791815260200190565b60405180910390a2846001019450505050611215565b808210156113735763dfb035c96000526004601cfd5b50505050565b6007602052600090815260409020805460018201805491929161139b906120fc565b80601f01602080910402602001604051908101604052809291908181526020018280546113c7906120fc565b80156114145780601f106113e957610100808354040283529160200191611414565b820191906000526020600020905b8154815290600101906020018083116113f757829003601f168201915b50505050600283015460039093015491926001600160a01b03908116929081169150600160a01b900460ff1685565b6000546001600160a01b0316331461148c5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401610640565b8151806114a15763df9578836000526004601cfd5b815181146114b75763ff633a386000526004601cfd5b60208301602083016020830282015b808314610f96578251600052600b60205260406000208251815550815183517f5d6e86e5341d57a92c49934296c51542a25015c9b1782a1c2722a940131c3d9a600080a36020830192506020820191506114c6565b6000546001600160a01b031633146115645760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401610640565b60028190556040516001600160a01b03821681527fe127cf589a3879da0156d4a24f43b44f65cfa3570de594806b0bfa2fcf06884f906020016106e1565b60006115ad60035490565b905090565b600154600214156115d65760405163558a1e0360e11b815260040160405180910390fd5b6002600155565b60006040516323b872dd60e01b6000528460045283602452826044526020600060646000808a5af13d15601f3d116001600051141617169150600060605280604052508061166d5760405162461bcd60e51b815260206004820152601460248201527f5452414e534645525f46524f4d5f4641494c45440000000000000000000000006044820152606401610640565b5050505050565b6000818152600760205260409020600201546001600160a01b031633146116ae576040516342e8fb9360e11b815260040160405180910390fd5b50565b600060405163a9059cbb60e01b6000528360045282602452602060006044600080895af13d15601f3d11600160005114161716915060006060528060405250806113735760405162461bcd60e51b815260206004820152600f60248201527f5452414e534645525f4641494c454400000000000000000000000000000000006044820152606401610640565b600080600080600085875af1905080610a335760405162461bcd60e51b815260206004820152601360248201527f4554485f5452414e534645525f4641494c4544000000000000000000000000006044820152606401610640565b6040805160208101859052908101839052606082811b6bffffffffffffffffffffffff191690820152600090607401604051602081830303815290604052805190602001209050436008600083815260200190815260200160002060030154106118155760405163d0404f8560e01b815260040160405180910390fd5b9392505050565b6118318484846001600160a01b038516611a4f565b61137357604051631dc23a5f60e11b815260040160405180910390fd5b600083815260086020908152604080832085518155918501516001830155840151600282018190556060850151600383015560808501516004830180546001600160a01b0392831673ffffffffffffffffffffffffffffffffffffffff199182161790915560a087015160058501805491841691831691909117905560c087015160069094018054949092169316929092179091558254909183916118f49084906121f4565b9091555050608082015182516040808501518151928352602083015285926001600160a01b0316917f2a28b2ae47b0bd4b104e7cd29b1dfa72846af8c4cfdc009da2ae29db68cb67ea910160405180910390a3505050565b600080634d2b179160e01b8360405160240161196a91815260200190565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050509050600080600060206000855160208701600254617530fa92503d91506000519050809450826119ff5763e10bf1cc6000526004601cfd5b50505050919050565b4381600301541115611a2d5760405163d0404f8560e01b815260040160405180910390fd5b60028101546116ae576040516331da482760e11b815260040160405180910390fd5b60008315611a8b578360051b8501855b803580851160051b94855260209485185260406000209301818110611a8357611a88565b611a5f565b50505b501492915050565b828054611a9f906120fc565b90600052602060002090601f016020900481019282611ac15760008555611b07565b82601f10611ada57805160ff1916838001178555611b07565b82800160010185558215611b07579182015b82811115611b07578251825591602001919060010190611aec565b50611b13929150611b17565b5090565b5b80821115611b135760008155600101611b18565b600060208284031215611b3e57600080fd5b5035919050565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f1916810167ffffffffffffffff81118282101715611b8457611b84611b45565b604052919050565b600067ffffffffffffffff821115611ba657611ba6611b45565b5060051b60200190565b6001600160a01b03811681146116ae57600080fd5b600082601f830112611bd657600080fd5b81356020611beb611be683611b8c565b611b5b565b82815260059290921b84018101918181019086841115611c0a57600080fd5b8286015b84811015611c2e578035611c2181611bb0565b8352918301918301611c0e565b509695505050505050565b600060208284031215611c4b57600080fd5b813567ffffffffffffffff811115611c6257600080fd5b611c6e84828501611bc5565b949350505050565b600060208284031215611c8857600080fd5b813561181581611bb0565b600080600080600060808688031215611cab57600080fd5b8535611cb681611bb0565b945060208601359350604086013567ffffffffffffffff80821115611cda57600080fd5b818801915088601f830112611cee57600080fd5b813581811115611cfd57600080fd5b896020828501011115611d0f57600080fd5b96999598505060200195606001359392505050565b60008083601f840112611d3657600080fd5b50813567ffffffffffffffff811115611d4e57600080fd5b6020830191508360208260051b8501011115611d6957600080fd5b9250929050565b600080600060408486031215611d8557600080fd5b83359250602084013567ffffffffffffffff811115611da357600080fd5b611daf86828701611d24565b9497909650939450505050565b60008060008060008060c08789031215611dd557600080fd5b863595506020870135611de781611bb0565b945060408701359350606087013592506080870135915060a087013560ff81168114611e1257600080fd5b809150509295509295509295565b60008060408385031215611e3357600080fd5b8235611e3e81611bb0565b946020939093013593505050565b600080600080600080600080600060e08a8c031215611e6a57600080fd5b8935985060208a0135611e7c81611bb0565b975060408a0135611e8c81611bb0565b965060608a0135955060808a0135945060a08a013567ffffffffffffffff80821115611eb757600080fd5b611ec38d838e01611d24565b909650945060c08c0135915080821115611edc57600080fd5b50611ee98c828d01611d24565b915080935050809150509295985092959850929598565b60008060208385031215611f1357600080fd5b823567ffffffffffffffff811115611f2a57600080fd5b611f3685828601611d24565b90969095509350505050565b8581526000602060a08184015286518060a085015260005b81811015611f765788810183015185820160c001528201611f5a565b81811115611f8857600060c083870101525b50601f01601f1916830160c0019150611fae905060408301866001600160a01b03169052565b6001600160a01b038416606083015282151560808301529695505050505050565b60008060408385031215611fe257600080fd5b823567ffffffffffffffff80821115611ffa57600080fd5b61200686838701611bc5565b935060209150818501358181111561201d57600080fd5b85019050601f8101861361203057600080fd5b803561203e611be682611b8c565b81815260059190911b8201830190838101908883111561205d57600080fd5b928401925b8284101561208a578335801515811461207b5760008081fd5b82529284019290840190612062565b80955050505050509250929050565b634e487b7160e01b600052603260045260246000fd5b6020808252825182820181905260009190848201906040850190845b818110156120f05783516001600160a01b0316835292840192918401916001016120cb565b50909695505050505050565b600181811c9082168061211057607f821691505b6020821081141561213157634e487b7160e01b600052602260045260246000fd5b50919050565b600080855481600182811c91508083168061215357607f831692505b602080841082141561217357634e487b7160e01b86526022600452602486fd5b8180156121875760018114612198576121c5565b60ff198616895284890196506121c5565b60008c81526020902060005b868110156121bd5781548b8201529085019083016121a4565b505084890196505b5098855250505050938401929092525050604001919050565b634e487b7160e01b600052601160045260246000fd5b600082821015612206576122066121de565b500390565b6000821982111561221e5761221e6121de565b500190565b60008261224057634e487b7160e01b600052601260045260246000fd5b500490565b600081600019048311821515161561225f5761225f6121de565b50029056fea164736f6c6343000809000a"; + "0x60806040526001805560405162002aa438038062002aa48339810160408190526200002a916200049d565b600080546001600160a01b031916339081178255604051909182917f8292fce18fa69edf4db7b94ea2e58241df0ae57f97e0a6c9b29067028bf92d76908290a3506200007685620000a3565b620000818362000133565b6200008c84620001bd565b620000988282620002a1565b505050505062000620565b6000546001600160a01b03163314620000f25760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064015b60405180910390fd5b806003557f70fa43ca70216ad905ade86b9e650a691b2ce5a01980d0a81bdd8324141b8511816040516200012891815260200190565b60405180910390a150565b6000546001600160a01b031633146200017e5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401620000e9565b60028190556040516001600160a01b03821681527fe127cf589a3879da0156d4a24f43b44f65cfa3570de594806b0bfa2fcf06884f9060200162000128565b6000546001600160a01b03163314620002085760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401620000e9565b80516000905b808210156200026e57600062000246848481518110620002325762000232620005bb565b60200260200101516200038760201b60201c565b6000908152600860205260409020805460ff191660019081179091559290920191506200020e565b50507f14a422d2412784a5749d03da98921fe468c98577b767851389a9f58ea5a363d781604051620001289190620005d1565b6000546001600160a01b03163314620002ec5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401620000e9565b815180620003025763df9578836000526004601cfd5b81518114620003195763ff633a386000526004601cfd5b60208301602083018260051b82015b8083146200037f578251600052600a60205260406000208251815550815183517f5d6e86e5341d57a92c49934296c51542a25015c9b1782a1c2722a940131c3d9a600080a360208301925060208201915062000328565b505050505050565b600c1b611000600160ac1b031690565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b0381118282101715620003d857620003d862000397565b604052919050565b60006001600160401b03821115620003fc57620003fc62000397565b5060051b60200190565b6001600160a01b03811681146200041c57600080fd5b50565b600082601f8301126200043157600080fd5b815160206200044a6200044483620003e0565b620003ad565b82815260059290921b840181019181810190868411156200046a57600080fd5b8286015b8481101562000492578051620004848162000406565b83529183019183016200046e565b509695505050505050565b600080600080600060a08688031215620004b657600080fd5b8551602080880151919650906001600160401b0380821115620004d857600080fd5b620004e68a838b016200041f565b965060408901519150620004fa8262000406565b6060890151919550808211156200051057600080fd5b6200051e8a838b016200041f565b945060808901519150808211156200053557600080fd5b508701601f810189136200054857600080fd5b8051620005596200044482620003e0565b81815260059190911b8201830190838101908b8311156200057957600080fd5b928401925b82841015620005a95783518015158114620005995760008081fd5b825292840192908401906200057e565b80955050505050509295509295909350565b634e487b7160e01b600052603260045260246000fd5b6020808252825182820181905260009190848201906040850190845b81811015620006145783516001600160a01b031683529284019291840191600101620005ed565b50909695505050505050565b61247480620006306000396000f3fe6080604052600436106101d15760003560e01c80637f94f65d116100f75780639872dbfe11610095578063c52164c611610064578063c52164c6146106cc578063d4fac45d146106ec578063d6e8b9731461074b578063f7d0e04b1461076b57600080fd5b80639872dbfe146105fa57806398a26871146106105780639eee8d4b14610640578063ad8f2eed1461067857600080fd5b806385313e73116100d157806385313e73146105845780638da5cb5b146105a45780638db564c2146105c45780638e2749d6146105da57600080fd5b80637f94f65d146104d757806380e1d302146104f757806384ab1d281461054b57600080fd5b80634b2ae9801161016f5780636a1460241161013e5780636a1460241461044e5780636d82d9e01461046a578063758d77d41461048a57806377cd38a4146104aa57600080fd5b80634b2ae980146103be578063574983c8146103e95780635fd8c7101461040957806369cc6af41461041e57600080fd5b806316d72240116101ab57806316d722401461025f5780632b9f00e91461033e578063328a71811461035e578063461f31201461037e57600080fd5b806304937320146101dd5780630d2a2d441461021d57806313af40351461023f57600080fd5b366101d857005b600080fd5b3480156101e957600080fd5b5061020a6101f8366004611ddb565b60076020526000908152604090205481565b6040519081526020015b60405180910390f35b34801561022957600080fd5b5061023d610238366004611ee8565b61078b565b005b34801561024b57600080fd5b5061023d61025a366004611f25565b61087c565b34801561026b57600080fd5b506102df61027a366004611ddb565b600560208190526000918252604090912080546001820154600283015460038401546004850154958501546006860154600787015460088801546009909801549698959794969395946001600160a01b0393841694928416939182169290821691168a565b604080519a8b5260208b019990995297890196909652606088019490945260808701929092526001600160a01b0390811660a087015290811660c086015290811660e08501529081166101008401521661012082015261014001610214565b34801561034a57600080fd5b5061020a610359366004611f8e565b61091d565b34801561036a57600080fd5b5061023d610379366004612074565b610c90565b34801561038a57600080fd5b506103ae610399366004611ddb565b60096020526000908152604090205460ff1681565b6040519015158152602001610214565b3480156103ca57600080fd5b5061020a6103d9366004611f25565b600c1b611000600160ac1b031690565b3480156103f557600080fd5b5061023d610404366004611ddb565b610e4f565b34801561041557600080fd5b5061023d610ecd565b34801561042a57600080fd5b506103ae610439366004611f25565b600a6020526000908152604090205460ff1681565b34801561045a57600080fd5b5061020a670de0b6b3a764000081565b34801561047657600080fd5b5061023d6104853660046120e7565b610f57565b34801561049657600080fd5b5061023d6104a536600461211c565b611045565b3480156104b657600080fd5b5061020a6104c5366004611ddb565b60066020526000908152604090205481565b3480156104e357600080fd5b5061023d6104f2366004612180565b611429565b34801561050357600080fd5b506103ae6105123660046121ac565b600c9190911b611000600160ac1b03166000908152600b602090815260408083206001600160a01b039094168352929052205460ff1c90565b34801561055757600080fd5b5061056c610566366004611ddb565b600c1c90565b6040516001600160a01b039091168152602001610214565b34801561059057600080fd5b5061020a61059f3660046121e5565b6114bc565b3480156105b057600080fd5b5060005461056c906001600160a01b031681565b3480156105d057600080fd5b5061020a60045481565b3480156105e657600080fd5b5061023d6105f536600461223a565b6115ee565b34801561060657600080fd5b5061020a60035481565b34801561061c57600080fd5b506103ae61062b366004611ddb565b60086020526000908152604090205460ff1681565b34801561064c57600080fd5b5061020a61065b36600461227c565b600b60209081526000928352604080842090915290825290205481565b34801561068457600080fd5b5061056c6106933660046121ac565b600c9190911b611000600160ac1b03166000908152600b602090815260408083206001600160a01b0390941683529290522054605f1c90565b3480156106d857600080fd5b5060025461056c906001600160a01b031681565b3480156106f857600080fd5b5061020a6107073660046121ac565b600c9190911b611000600160ac1b03166000908152600b602090815260408083206001600160a01b03909416835292905220546b3fffffffffffffffffffffff1690565b34801561075757600080fd5b5061023d6107663660046122a1565b6117de565b34801561077757600080fd5b5061023d610786366004611f25565b6118b6565b6000546001600160a01b031633146107d95760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064015b60405180910390fd5b80516000905b808210156108405760006108198484815181106107fe576107fe612363565b6020026020010151611000600160ac1b03600c9190911b1690565b6000908152600860205260409020805460ff191660019081179091559290920191506107df565b50507f14a422d2412784a5749d03da98921fe468c98577b767851389a9f58ea5a363d7816040516108719190612379565b60405180910390a150565b6000546001600160a01b031633146108c55760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064016107d0565b6000805473ffffffffffffffffffffffffffffffffffffffff19166001600160a01b0383169081178255604051909133917f8292fce18fa69edf4db7b94ea2e58241df0ae57f97e0a6c9b29067028bf92d769190a350565b600061092761193d565b61093183836115ee565b600c8b901b611000600160ac1b03166000908152600b602090815260408083206001600160a01b038e1684529091529020548a9060ff1c61098557604051635972996f60e11b815260040160405180910390fd5b611000600160ac1b03600c8d901b166000908152600b602090815260408083206001600160a01b03851684529091529020546b3fffffffffffffffffffffff16878110156109e6576040516308aeed0f60e21b815260040160405180910390fd5b600454611000600160ac1b03600c8f901b1690600090610a079060016123dc565b90506004548a8e604051602001610a4393929190928352602083019190915260601b6bffffffffffffffffffffffff1916604082015260540190565b60405160208183030381529060405280519060200120945043600560008781526020019081526020016000206004015410610a915760405163d0404f8560e01b815260040160405180910390fd5b60006040518061014001604052808481526020018381526020018d81526020018c815260200160035443610ac591906123dc565b8152602001605f600b60008781526020019081526020016000206000896001600160a01b03166001600160a01b0316815260200190815260200160002054901c6001600160a01b031681526020018f6001600160a01b031681526020018e6001600160a01b03168152602001336001600160a01b03168152602001866001600160a01b0316815250905089899050600014610ba457600083815260066020526040902054610b77908b908b9033611968565b610b85848c8884898861199a565b60048054906000610b95836123f4565b91905055505050505050610c79565b68056bc75e2d63100000816060015111610bc657610b85848c8884898861199a565b611000600160ac1b0333600c1b1660009081526007602052604081205490610bfe610bf9670de0b6b3a76400008461240f565b611b0e565b9050610c12670de0b6b3a764000082612431565b83606001511180610c30575069d3c21bcecceda10000008360600151115b15610c4e57604051630e0c7c2360e11b815260040160405180910390fd5b610c5c868e8a868b8a61199a565b60048054906000610c6c836123f4565b9190505550505050505050505b610c8260018055565b9a9950505050505050505050565b84611000600160ac1b0333600c1b166001600160a01b038516610cc65760405163351de29f60e11b815260040160405180910390fd5b6001600160a01b0382166000908152600a602052604090205460ff16610cff57604051630abc194760e11b815260040160405180910390fd5b6000818152600b602090815260408083206001600160a01b03861684529091529020546b3fffffffffffffffffffffff81166a52b7d2dcc80cd2e4000000610d556bffffffffffffffffffffffff8a16836123dc565b1115610d745760405163f3fb0eb960e01b815260040160405180910390fd5b610d7c61193d565b8415610d8c57610d8c3386611429565b87878760ff81901b605f83901b610da385876123dc565b6000898152600b602090815260408083206001600160a01b038e16845290915290209117919091179055610de78733306bffffffffffffffffffffffff8f16611bca565b610df060018055565b604080516001600160a01b038e1681526bffffffffffffffffffffffff8d16602082015233917f63d8d7d5e63e9840ec91a12a160d27b7cfab294f6ba070b7359692acfe6b03bf910160405180910390a2505050505050505050505050565b6000546001600160a01b03163314610e985760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064016107d0565b806003557f70fa43ca70216ad905ade86b9e650a691b2ce5a01980d0a81bdd8324141b85118160405161087191815260200190565b6000546001600160a01b03163314610f165760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064016107d0565b47610f213382611c61565b60408051338152602081018390527feaff4b37086828766ad3268786972c0cd24259d4c87a80f9d3963a3c3d999b0d9101610871565b611000600160ac1b0333600c1b166000818152600b602090815260408083206001600160a01b03871684529091529020548015611026576000828152600b602090815260408083206001600160a01b038816808552908352928190207f7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9490941660ff87901b1793849055805192835285151591830191909152849133917fca585721b6b442dc9183932f7c84dc2880efb67c4da52cc06873e78971105d49910160405180910390a25061103f565b6040516321c4e35760e21b815260040160405180910390fd5b50505050565b61104d61193d565b6000868152600560205260409020600381015461107d576040516331da482760e11b815260040160405180910390fd5b43816004015410156110a2576040516307b7d7dd60e51b815260040160405180910390fd5b6005810154600382015460405160609290921b6bffffffffffffffffffffffff1916602083015260348201526054810186905260009060740160405160208183030381529060405280519060200120905060008160405160200161113291907f19457468657265756d205369676e6564204d6573736167653a0a3332000000008152601c810191909152603c0190565b60408051601f1981840301815291815281516020928301206000858152600990935291205490915060ff1615156001141561118057604051637a48537560e11b815260040160405180910390fd5b6040805160008082526020820180845284905260ff87169282019290925260608101889052608081018790526111f49060019060a0016020604051602081039080840390855afa1580156111d8573d6000803e3d6000fd5b5050604051601f190151600c1b611000600160ac1b0316919050565b60008181526008602052604090205490915060ff1661122657604051632057875960e21b815260040160405180910390fd5b6009840154600385015460028601546001600160a01b039092169160009061124e9083612450565b60006003890181905560048901819055878152600960205260409020805460ff191660011790556008880154909150336001600160a01b03909116146112ff576002870154611000600160ac1b0333600c1b16600090815260076020526040812080549091906112bf9084906123dc565b90915550506008870154600c1b611000600160ac1b0316600090815260076020526040812080548492906112f49084906123dc565b909155506113419050565b81876002015461130f91906123dc565b611000600160ac1b0333600c1b166000908152600760205260408120805490919061133b9084906123dc565b90915550505b600687015461135b9084906001600160a01b031683611cc1565b6002870154156113c75760078701546001600160a01b038d81169116146113b857600787015460028801546113a09185916001600160a01b039091169060011c611cc1565b6113b3838d60018a60020154901c611cc1565b6113c7565b6113c7838d8960020154611cc1565b6006870154604080518f8152602081018590526001600160a01b03909216917f3fd2eee5028b09fa70abe3da4f6023ea41bfde24cfcb9c167f17d6fbe79eece3910160405180910390a25050505050505061142160018055565b505050505050565b6001600160a01b0382163314156114a357611000600160ac1b03600c83901b1660009081526006602090815260409182902083905581516001600160a01b038516815290810183905281517f0b294da292f26e55fd442b5c0164fbb9013036ff00c5cfdde0efd01c1baaf632929181900390910190a15050565b6040516342e8fb9360e11b815260040160405180910390fd5b60006114c661193d565b6114d083836115ee565b33600c1b611000600160ac1b03166000908152600b602090815260408083206001600160a01b038816845290915290205460ff1c15156001141561151957611519846000610f57565b50611000600160ac1b0333600c1b166000818152600b602090815260408083206001600160a01b0388168452909152812080546b3fffffffffffffffffffffff8116939284929161156b908490612450565b90915550508161158e57604051635972996f60e11b815260040160405180910390fd5b611599853384611cc1565b604080516001600160a01b03871681526020810184905233917f2cd6435b1b961c13f55202979edd0765a809f69a539d8a477436c94c1211e43e910160405180910390a2506115e760018055565b9392505050565b6000815b808210156117c85760006005600086868681811061161257611612612363565b905060200201358152602001908152602001600020905061163281611d4d565b80546000908152600b6020908152604080832060098501546001600160a01b0316845290915290205460038201546b3fffffffffffffffffffffff909116906a52b7d2dcc80cd2e40000009061168890836123dc565b11156116a75760405163f3fb0eb960e01b815260040160405180910390fd5b600382015482546000908152600b6020908152604080832060098701546001600160a01b03168452909152812080549091906116e49084906123dc565b90915550506000600383018190556008830154600c1b611000600160ac1b031660008181526007602052604090205490915060011c68056bc75e2d63100000811161174857600082815260076020526040902068056bc75e2d63100000905561175a565b60008281526007602052604090208190555b60068401546001600160a01b03167f67e089478e21dd12c98e69331c4152f6c9b2038b91e0f28268ffa01558c0b4ff89898981811061179b5761179b612363565b905060200201356040516117b191815260200190565b60405180910390a2856001019550505050506115f2565b8082101561103f5763dfb035c96000526004601cfd5b6000546001600160a01b031633146118275760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064016107d0565b81518061183c5763df9578836000526004601cfd5b815181146118525763ff633a386000526004601cfd5b60208301602083018260051b82015b808314611421578251600052600a60205260406000208251815550815183517f5d6e86e5341d57a92c49934296c51542a25015c9b1782a1c2722a940131c3d9a600080a3602083019250602082019150611861565b6000546001600160a01b031633146118ff5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064016107d0565b60028190556040516001600160a01b03821681527fe127cf589a3879da0156d4a24f43b44f65cfa3570de594806b0bfa2fcf06884f90602001610871565b600154600214156119615760405163558a1e0360e11b815260040160405180910390fd5b6002600155565b61197d8484846001600160a01b038516611d97565b61103f57604051631dc23a5f60e11b815260040160405180910390fd5b60008481526005602081815260409283902086518155908601516001820155918501516002830155606085015160038301556080850151600483015560a0850151908201805473ffffffffffffffffffffffffffffffffffffffff199081166001600160a01b039384161790915560c0860151600684018054831691841691909117905560e086015160078401805483169184169190911790556101008601516008840180548316918416919091179055610120860151600990930180549091169290911691909117905585611a785763ce3a3d376000526004601cfd5b6000818152600b602090815260408083206001600160a01b038616845290915281208054879290611aaa908490612450565b909155505060c08301518351606085015160405187936001600160a01b0316927f2a28b2ae47b0bd4b104e7cd29b1dfa72846af8c4cfdc009da2ae29db68cb67ea92611afe92918252602082015260400190565b60405180910390a3505050505050565b600080634d2b179160e01b83604051602401611b2c91815260200190565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050509050600080600060206000855160208701600254617530fa92503d9150600051905080945082611bc15763e10bf1cc6000526004601cfd5b50505050919050565b60006040516323b872dd60e01b6000528460045283602452826044526020600060646000808a5af13d15601f3d1160016000511416171691506000606052806040525080611c5a5760405162461bcd60e51b815260206004820152601460248201527f5452414e534645525f46524f4d5f4641494c454400000000000000000000000060448201526064016107d0565b5050505050565b600080600080600085875af1905080611cbc5760405162461bcd60e51b815260206004820152601360248201527f4554485f5452414e534645525f4641494c45440000000000000000000000000060448201526064016107d0565b505050565b600060405163a9059cbb60e01b6000528360045282602452602060006044600080895af13d15601f3d116001600051141617169150600060605280604052508061103f5760405162461bcd60e51b815260206004820152600f60248201527f5452414e534645525f4641494c4544000000000000000000000000000000000060448201526064016107d0565b4381600401541115611d725760405163d0404f8560e01b815260040160405180910390fd5b6003810154611d94576040516331da482760e11b815260040160405180910390fd5b50565b60008315611dd3578360051b8501855b803580851160051b94855260209485185260406000209301818110611dcb57611dd0565b611da7565b50505b501492915050565b600060208284031215611ded57600080fd5b5035919050565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f1916810167ffffffffffffffff81118282101715611e3357611e33611df4565b604052919050565b600067ffffffffffffffff821115611e5557611e55611df4565b5060051b60200190565b6001600160a01b0381168114611d9457600080fd5b600082601f830112611e8557600080fd5b81356020611e9a611e9583611e3b565b611e0a565b82815260059290921b84018101918181019086841115611eb957600080fd5b8286015b84811015611edd578035611ed081611e5f565b8352918301918301611ebd565b509695505050505050565b600060208284031215611efa57600080fd5b813567ffffffffffffffff811115611f1157600080fd5b611f1d84828501611e74565b949350505050565b600060208284031215611f3757600080fd5b81356115e781611e5f565b60008083601f840112611f5457600080fd5b50813567ffffffffffffffff811115611f6c57600080fd5b6020830191508360208260051b8501011115611f8757600080fd5b9250929050565b6000806000806000806000806000806101008b8d031215611fae57600080fd5b8a35611fb981611e5f565b995060208b0135611fc981611e5f565b985060408b0135611fd981611e5f565b975060608b0135611fe981611e5f565b965060808b0135955060a08b0135945060c08b013567ffffffffffffffff8082111561201457600080fd5b6120208e838f01611f42565b909650945060e08d013591508082111561203957600080fd5b506120468d828e01611f42565b915080935050809150509295989b9194979a5092959850565b8035801515811461206f57600080fd5b919050565b600080600080600060a0868803121561208c57600080fd5b853561209781611e5f565b945060208601356bffffffffffffffffffffffff811681146120b857600080fd5b935060408601356120c881611e5f565b92506120d66060870161205f565b949793965091946080013592915050565b600080604083850312156120fa57600080fd5b823561210581611e5f565b91506121136020840161205f565b90509250929050565b60008060008060008060c0878903121561213557600080fd5b86359550602087013561214781611e5f565b945060408701359350606087013592506080870135915060a087013560ff8116811461217257600080fd5b809150509295509295509295565b6000806040838503121561219357600080fd5b823561219e81611e5f565b946020939093013593505050565b600080604083850312156121bf57600080fd5b82356121ca81611e5f565b915060208301356121da81611e5f565b809150509250929050565b6000806000604084860312156121fa57600080fd5b833561220581611e5f565b9250602084013567ffffffffffffffff81111561222157600080fd5b61222d86828701611f42565b9497909650939450505050565b6000806020838503121561224d57600080fd5b823567ffffffffffffffff81111561226457600080fd5b61227085828601611f42565b90969095509350505050565b6000806040838503121561228f57600080fd5b8235915060208301356121da81611e5f565b600080604083850312156122b457600080fd5b823567ffffffffffffffff808211156122cc57600080fd5b6122d886838701611e74565b93506020915081850135818111156122ef57600080fd5b85019050601f8101861361230257600080fd5b8035612310611e9582611e3b565b81815260059190911b8201830190838101908883111561232f57600080fd5b928401925b82841015612354576123458461205f565b82529284019290840190612334565b80955050505050509250929050565b634e487b7160e01b600052603260045260246000fd5b6020808252825182820181905260009190848201906040850190845b818110156123ba5783516001600160a01b031683529284019291840191600101612395565b50909695505050505050565b634e487b7160e01b600052601160045260246000fd5b600082198211156123ef576123ef6123c6565b500190565b6000600019821415612408576124086123c6565b5060010190565b60008261242c57634e487b7160e01b600052601260045260246000fd5b500490565b600081600019048311821515161561244b5761244b6123c6565b500290565b600082821015612462576124626123c6565b50039056fea164736f6c6343000809000a"; type P2PIXConstructorParams = | [signer?: Signer] diff --git a/src/types/p2pix.sol/P2PIX.ts b/src/types/p2pix.sol/P2PIX.ts index ecbd971..d732e4e 100644 --- a/src/types/p2pix.sol/P2PIX.ts +++ b/src/types/p2pix.sol/P2PIX.ts @@ -31,29 +31,33 @@ export interface P2PIXInterface extends utils.Interface { functions: { "WAD()": FunctionFragment; "_castAddrToKey(address)": FunctionFragment; + "_castKeyToAddr(uint256)": FunctionFragment; "allowedERC20s(address)": FunctionFragment; - "cancelDeposit(uint256)": FunctionFragment; "defaultLockBlocks()": FunctionFragment; - "deposit(address,uint256,string,bytes32)": FunctionFragment; - "depositCount()": FunctionFragment; - "lock(uint256,address,address,uint256,uint256,bytes32[],bytes32[])": FunctionFragment; - "mapDeposits(uint256)": FunctionFragment; + "deposit(address,uint96,uint160,bool,bytes32)": FunctionFragment; + "getBalance(address,address)": FunctionFragment; + "getPixTarget(address,address)": FunctionFragment; + "getValid(address,address)": FunctionFragment; + "lock(address,address,address,address,uint256,uint256,bytes32[],bytes32[])": FunctionFragment; + "lockCounter()": FunctionFragment; "mapLocks(bytes32)": FunctionFragment; "owner()": FunctionFragment; "release(bytes32,address,bytes32,bytes32,bytes32,uint8)": FunctionFragment; "reputation()": FunctionFragment; "sellerAllowList(uint256)": FunctionFragment; + "sellerBalance(uint256,address)": FunctionFragment; "setDefaultLockBlocks(uint256)": FunctionFragment; "setOwner(address)": FunctionFragment; "setReputation(address)": FunctionFragment; "setRoot(address,bytes32)": FunctionFragment; "setValidSigners(address[])": FunctionFragment; + "setValidState(address,bool)": FunctionFragment; "tokenSettings(address[],bool[])": FunctionFragment; "unlockExpired(bytes32[])": FunctionFragment; "usedTransactions(bytes32)": FunctionFragment; "userRecord(uint256)": FunctionFragment; "validBacenSigners(uint256)": FunctionFragment; - "withdraw(uint256,bytes32[])": FunctionFragment; + "withdraw(address,bytes32[])": FunctionFragment; "withdrawBalance()": FunctionFragment; }; @@ -61,23 +65,27 @@ export interface P2PIXInterface extends utils.Interface { nameOrSignatureOrTopic: | "WAD" | "_castAddrToKey" + | "_castKeyToAddr" | "allowedERC20s" - | "cancelDeposit" | "defaultLockBlocks" | "deposit" - | "depositCount" + | "getBalance" + | "getPixTarget" + | "getValid" | "lock" - | "mapDeposits" + | "lockCounter" | "mapLocks" | "owner" | "release" | "reputation" | "sellerAllowList" + | "sellerBalance" | "setDefaultLockBlocks" | "setOwner" | "setReputation" | "setRoot" | "setValidSigners" + | "setValidState" | "tokenSettings" | "unlockExpired" | "usedTransactions" @@ -93,12 +101,12 @@ export interface P2PIXInterface extends utils.Interface { values: [PromiseOrValue] ): string; encodeFunctionData( - functionFragment: "allowedERC20s", - values: [PromiseOrValue] + functionFragment: "_castKeyToAddr", + values: [PromiseOrValue] ): string; encodeFunctionData( - functionFragment: "cancelDeposit", - values: [PromiseOrValue] + functionFragment: "allowedERC20s", + values: [PromiseOrValue] ): string; encodeFunctionData( functionFragment: "defaultLockBlocks", @@ -109,18 +117,28 @@ export interface P2PIXInterface extends utils.Interface { values: [ PromiseOrValue, PromiseOrValue, - PromiseOrValue, + PromiseOrValue, + PromiseOrValue, PromiseOrValue ] ): string; encodeFunctionData( - functionFragment: "depositCount", - values?: undefined + functionFragment: "getBalance", + values: [PromiseOrValue, PromiseOrValue] + ): string; + encodeFunctionData( + functionFragment: "getPixTarget", + values: [PromiseOrValue, PromiseOrValue] + ): string; + encodeFunctionData( + functionFragment: "getValid", + values: [PromiseOrValue, PromiseOrValue] ): string; encodeFunctionData( functionFragment: "lock", values: [ - PromiseOrValue, + PromiseOrValue, + PromiseOrValue, PromiseOrValue, PromiseOrValue, PromiseOrValue, @@ -130,8 +148,8 @@ export interface P2PIXInterface extends utils.Interface { ] ): string; encodeFunctionData( - functionFragment: "mapDeposits", - values: [PromiseOrValue] + functionFragment: "lockCounter", + values?: undefined ): string; encodeFunctionData( functionFragment: "mapLocks", @@ -157,6 +175,10 @@ export interface P2PIXInterface extends utils.Interface { functionFragment: "sellerAllowList", values: [PromiseOrValue] ): string; + encodeFunctionData( + functionFragment: "sellerBalance", + values: [PromiseOrValue, PromiseOrValue] + ): string; encodeFunctionData( functionFragment: "setDefaultLockBlocks", values: [PromiseOrValue] @@ -177,6 +199,10 @@ export interface P2PIXInterface extends utils.Interface { functionFragment: "setValidSigners", values: [PromiseOrValue[]] ): string; + encodeFunctionData( + functionFragment: "setValidState", + values: [PromiseOrValue, PromiseOrValue] + ): string; encodeFunctionData( functionFragment: "tokenSettings", values: [PromiseOrValue[], PromiseOrValue[]] @@ -199,7 +225,7 @@ export interface P2PIXInterface extends utils.Interface { ): string; encodeFunctionData( functionFragment: "withdraw", - values: [PromiseOrValue, PromiseOrValue[]] + values: [PromiseOrValue, PromiseOrValue[]] ): string; encodeFunctionData( functionFragment: "withdrawBalance", @@ -212,11 +238,11 @@ export interface P2PIXInterface extends utils.Interface { data: BytesLike ): Result; decodeFunctionResult( - functionFragment: "allowedERC20s", + functionFragment: "_castKeyToAddr", data: BytesLike ): Result; decodeFunctionResult( - functionFragment: "cancelDeposit", + functionFragment: "allowedERC20s", data: BytesLike ): Result; decodeFunctionResult( @@ -224,13 +250,15 @@ export interface P2PIXInterface extends utils.Interface { data: BytesLike ): Result; decodeFunctionResult(functionFragment: "deposit", data: BytesLike): Result; + decodeFunctionResult(functionFragment: "getBalance", data: BytesLike): Result; decodeFunctionResult( - functionFragment: "depositCount", + functionFragment: "getPixTarget", data: BytesLike ): Result; + decodeFunctionResult(functionFragment: "getValid", data: BytesLike): Result; decodeFunctionResult(functionFragment: "lock", data: BytesLike): Result; decodeFunctionResult( - functionFragment: "mapDeposits", + functionFragment: "lockCounter", data: BytesLike ): Result; decodeFunctionResult(functionFragment: "mapLocks", data: BytesLike): Result; @@ -241,6 +269,10 @@ export interface P2PIXInterface extends utils.Interface { functionFragment: "sellerAllowList", data: BytesLike ): Result; + decodeFunctionResult( + functionFragment: "sellerBalance", + data: BytesLike + ): Result; decodeFunctionResult( functionFragment: "setDefaultLockBlocks", data: BytesLike @@ -255,6 +287,10 @@ export interface P2PIXInterface extends utils.Interface { functionFragment: "setValidSigners", data: BytesLike ): Result; + decodeFunctionResult( + functionFragment: "setValidState", + data: BytesLike + ): Result; decodeFunctionResult( functionFragment: "tokenSettings", data: BytesLike @@ -280,23 +316,22 @@ export interface P2PIXInterface extends utils.Interface { events: { "AllowedERC20Updated(address,bool)": EventFragment; - "DepositAdded(address,uint256,address,uint256)": EventFragment; - "DepositClosed(address,uint256)": EventFragment; - "DepositWithdrawn(address,uint256,uint256)": EventFragment; + "DepositAdded(address,address,uint256)": EventFragment; + "DepositWithdrawn(address,address,uint256)": EventFragment; "FundsWithdrawn(address,uint256)": EventFragment; "LockAdded(address,bytes32,uint256,uint256)": EventFragment; "LockBlocksUpdated(uint256)": EventFragment; - "LockReleased(address,bytes32)": EventFragment; + "LockReleased(address,bytes32,uint256)": EventFragment; "LockReturned(address,bytes32)": EventFragment; "OwnerUpdated(address,address)": EventFragment; "ReputationUpdated(address)": EventFragment; "RootUpdated(address,bytes32)": EventFragment; + "ValidSet(address,address,bool)": EventFragment; "ValidSignersUpdated(address[])": EventFragment; }; getEvent(nameOrSignatureOrTopic: "AllowedERC20Updated"): EventFragment; getEvent(nameOrSignatureOrTopic: "DepositAdded"): EventFragment; - getEvent(nameOrSignatureOrTopic: "DepositClosed"): EventFragment; getEvent(nameOrSignatureOrTopic: "DepositWithdrawn"): EventFragment; getEvent(nameOrSignatureOrTopic: "FundsWithdrawn"): EventFragment; getEvent(nameOrSignatureOrTopic: "LockAdded"): EventFragment; @@ -306,6 +341,7 @@ export interface P2PIXInterface extends utils.Interface { getEvent(nameOrSignatureOrTopic: "OwnerUpdated"): EventFragment; getEvent(nameOrSignatureOrTopic: "ReputationUpdated"): EventFragment; getEvent(nameOrSignatureOrTopic: "RootUpdated"): EventFragment; + getEvent(nameOrSignatureOrTopic: "ValidSet"): EventFragment; getEvent(nameOrSignatureOrTopic: "ValidSignersUpdated"): EventFragment; } @@ -323,35 +359,23 @@ export type AllowedERC20UpdatedEventFilter = export interface DepositAddedEventObject { seller: string; - depositID: BigNumber; token: string; amount: BigNumber; } export type DepositAddedEvent = TypedEvent< - [string, BigNumber, string, BigNumber], + [string, string, BigNumber], DepositAddedEventObject >; export type DepositAddedEventFilter = TypedEventFilter; -export interface DepositClosedEventObject { - seller: string; - depositID: BigNumber; -} -export type DepositClosedEvent = TypedEvent< - [string, BigNumber], - DepositClosedEventObject ->; - -export type DepositClosedEventFilter = TypedEventFilter; - export interface DepositWithdrawnEventObject { seller: string; - depositID: BigNumber; + token: string; amount: BigNumber; } export type DepositWithdrawnEvent = TypedEvent< - [string, BigNumber, BigNumber], + [string, string, BigNumber], DepositWithdrawnEventObject >; @@ -372,7 +396,7 @@ export type FundsWithdrawnEventFilter = TypedEventFilter; export interface LockAddedEventObject { buyer: string; lockID: string; - depositID: BigNumber; + seller: BigNumber; amount: BigNumber; } export type LockAddedEvent = TypedEvent< @@ -396,9 +420,10 @@ export type LockBlocksUpdatedEventFilter = export interface LockReleasedEventObject { buyer: string; lockId: string; + amount: BigNumber; } export type LockReleasedEvent = TypedEvent< - [string, string], + [string, string, BigNumber], LockReleasedEventObject >; @@ -448,6 +473,18 @@ export type RootUpdatedEvent = TypedEvent< export type RootUpdatedEventFilter = TypedEventFilter; +export interface ValidSetEventObject { + seller: string; + token: string; + state: boolean; +} +export type ValidSetEvent = TypedEvent< + [string, string, boolean], + ValidSetEventObject +>; + +export type ValidSetEventFilter = TypedEventFilter; + export interface ValidSignersUpdatedEventObject { signers: string[]; } @@ -493,32 +530,48 @@ export interface P2PIX extends BaseContract { overrides?: CallOverrides ): Promise<[BigNumber] & { _key: BigNumber }>; + _castKeyToAddr( + _key: PromiseOrValue, + overrides?: CallOverrides + ): Promise<[string] & { _addr: string }>; + allowedERC20s( arg0: PromiseOrValue, overrides?: CallOverrides ): Promise<[boolean]>; - cancelDeposit( - depositID: PromiseOrValue, - overrides?: Overrides & { from?: PromiseOrValue } - ): Promise; - defaultLockBlocks(overrides?: CallOverrides): Promise<[BigNumber]>; deposit( _token: PromiseOrValue, _amount: PromiseOrValue, - _pixTarget: PromiseOrValue, + _pixTarget: PromiseOrValue, + _valid: PromiseOrValue, allowlistRoot: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; - depositCount( + getBalance( + seller: PromiseOrValue, + token: PromiseOrValue, overrides?: CallOverrides - ): Promise<[BigNumber] & { _val: BigNumber }>; + ): Promise<[BigNumber] & { bal: BigNumber }>; + + getPixTarget( + seller: PromiseOrValue, + token: PromiseOrValue, + overrides?: CallOverrides + ): Promise<[BigNumber] & { pixTarget: BigNumber }>; + + getValid( + seller: PromiseOrValue, + token: PromiseOrValue, + overrides?: CallOverrides + ): Promise<[boolean] & { valid: boolean }>; lock( - _depositID: PromiseOrValue, + _seller: PromiseOrValue, + _token: PromiseOrValue, _buyerAddress: PromiseOrValue, _relayerTarget: PromiseOrValue, _relayerPremium: PromiseOrValue, @@ -528,31 +581,34 @@ export interface P2PIX extends BaseContract { overrides?: Overrides & { from?: PromiseOrValue } ): Promise; - mapDeposits( - arg0: PromiseOrValue, - overrides?: CallOverrides - ): Promise< - [BigNumber, string, string, string, boolean] & { - remaining: BigNumber; - pixTarget: string; - seller: string; - token: string; - valid: boolean; - } - >; + lockCounter(overrides?: CallOverrides): Promise<[BigNumber]>; mapLocks( arg0: PromiseOrValue, overrides?: CallOverrides ): Promise< - [BigNumber, BigNumber, BigNumber, BigNumber, string, string, string] & { - depositID: BigNumber; + [ + BigNumber, + BigNumber, + BigNumber, + BigNumber, + BigNumber, + BigNumber, + string, + string, + string, + string + ] & { + sellerKey: BigNumber; + counter: BigNumber; relayerPremium: BigNumber; amount: BigNumber; expirationBlock: BigNumber; + pixTarget: BigNumber; buyerAddress: string; relayerTarget: string; relayerAddress: string; + token: string; } >; @@ -575,6 +631,12 @@ export interface P2PIX extends BaseContract { overrides?: CallOverrides ): Promise<[string]>; + sellerBalance( + arg0: PromiseOrValue, + arg1: PromiseOrValue, + overrides?: CallOverrides + ): Promise<[BigNumber]>; + setDefaultLockBlocks( _blocks: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } @@ -601,6 +663,12 @@ export interface P2PIX extends BaseContract { overrides?: Overrides & { from?: PromiseOrValue } ): Promise; + setValidState( + token: PromiseOrValue, + state: PromiseOrValue, + overrides?: Overrides & { from?: PromiseOrValue } + ): Promise; + tokenSettings( _tokens: PromiseOrValue[], _states: PromiseOrValue[], @@ -628,7 +696,7 @@ export interface P2PIX extends BaseContract { ): Promise<[boolean]>; withdraw( - depositID: PromiseOrValue, + token: PromiseOrValue, expiredLocks: PromiseOrValue[], overrides?: Overrides & { from?: PromiseOrValue } ): Promise; @@ -645,30 +713,48 @@ export interface P2PIX extends BaseContract { overrides?: CallOverrides ): Promise; + _castKeyToAddr( + _key: PromiseOrValue, + overrides?: CallOverrides + ): Promise; + allowedERC20s( arg0: PromiseOrValue, overrides?: CallOverrides ): Promise; - cancelDeposit( - depositID: PromiseOrValue, - overrides?: Overrides & { from?: PromiseOrValue } - ): Promise; - defaultLockBlocks(overrides?: CallOverrides): Promise; deposit( _token: PromiseOrValue, _amount: PromiseOrValue, - _pixTarget: PromiseOrValue, + _pixTarget: PromiseOrValue, + _valid: PromiseOrValue, allowlistRoot: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; - depositCount(overrides?: CallOverrides): Promise; + getBalance( + seller: PromiseOrValue, + token: PromiseOrValue, + overrides?: CallOverrides + ): Promise; + + getPixTarget( + seller: PromiseOrValue, + token: PromiseOrValue, + overrides?: CallOverrides + ): Promise; + + getValid( + seller: PromiseOrValue, + token: PromiseOrValue, + overrides?: CallOverrides + ): Promise; lock( - _depositID: PromiseOrValue, + _seller: PromiseOrValue, + _token: PromiseOrValue, _buyerAddress: PromiseOrValue, _relayerTarget: PromiseOrValue, _relayerPremium: PromiseOrValue, @@ -678,31 +764,34 @@ export interface P2PIX extends BaseContract { overrides?: Overrides & { from?: PromiseOrValue } ): Promise; - mapDeposits( - arg0: PromiseOrValue, - overrides?: CallOverrides - ): Promise< - [BigNumber, string, string, string, boolean] & { - remaining: BigNumber; - pixTarget: string; - seller: string; - token: string; - valid: boolean; - } - >; + lockCounter(overrides?: CallOverrides): Promise; mapLocks( arg0: PromiseOrValue, overrides?: CallOverrides ): Promise< - [BigNumber, BigNumber, BigNumber, BigNumber, string, string, string] & { - depositID: BigNumber; + [ + BigNumber, + BigNumber, + BigNumber, + BigNumber, + BigNumber, + BigNumber, + string, + string, + string, + string + ] & { + sellerKey: BigNumber; + counter: BigNumber; relayerPremium: BigNumber; amount: BigNumber; expirationBlock: BigNumber; + pixTarget: BigNumber; buyerAddress: string; relayerTarget: string; relayerAddress: string; + token: string; } >; @@ -725,6 +814,12 @@ export interface P2PIX extends BaseContract { overrides?: CallOverrides ): Promise; + sellerBalance( + arg0: PromiseOrValue, + arg1: PromiseOrValue, + overrides?: CallOverrides + ): Promise; + setDefaultLockBlocks( _blocks: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } @@ -751,6 +846,12 @@ export interface P2PIX extends BaseContract { overrides?: Overrides & { from?: PromiseOrValue } ): Promise; + setValidState( + token: PromiseOrValue, + state: PromiseOrValue, + overrides?: Overrides & { from?: PromiseOrValue } + ): Promise; + tokenSettings( _tokens: PromiseOrValue[], _states: PromiseOrValue[], @@ -778,7 +879,7 @@ export interface P2PIX extends BaseContract { ): Promise; withdraw( - depositID: PromiseOrValue, + token: PromiseOrValue, expiredLocks: PromiseOrValue[], overrides?: Overrides & { from?: PromiseOrValue } ): Promise; @@ -795,30 +896,48 @@ export interface P2PIX extends BaseContract { overrides?: CallOverrides ): Promise; + _castKeyToAddr( + _key: PromiseOrValue, + overrides?: CallOverrides + ): Promise; + allowedERC20s( arg0: PromiseOrValue, overrides?: CallOverrides ): Promise; - cancelDeposit( - depositID: PromiseOrValue, - overrides?: CallOverrides - ): Promise; - defaultLockBlocks(overrides?: CallOverrides): Promise; deposit( _token: PromiseOrValue, _amount: PromiseOrValue, - _pixTarget: PromiseOrValue, + _pixTarget: PromiseOrValue, + _valid: PromiseOrValue, allowlistRoot: PromiseOrValue, overrides?: CallOverrides + ): Promise; + + getBalance( + seller: PromiseOrValue, + token: PromiseOrValue, + overrides?: CallOverrides ): Promise; - depositCount(overrides?: CallOverrides): Promise; + getPixTarget( + seller: PromiseOrValue, + token: PromiseOrValue, + overrides?: CallOverrides + ): Promise; + + getValid( + seller: PromiseOrValue, + token: PromiseOrValue, + overrides?: CallOverrides + ): Promise; lock( - _depositID: PromiseOrValue, + _seller: PromiseOrValue, + _token: PromiseOrValue, _buyerAddress: PromiseOrValue, _relayerTarget: PromiseOrValue, _relayerPremium: PromiseOrValue, @@ -828,31 +947,34 @@ export interface P2PIX extends BaseContract { overrides?: CallOverrides ): Promise; - mapDeposits( - arg0: PromiseOrValue, - overrides?: CallOverrides - ): Promise< - [BigNumber, string, string, string, boolean] & { - remaining: BigNumber; - pixTarget: string; - seller: string; - token: string; - valid: boolean; - } - >; + lockCounter(overrides?: CallOverrides): Promise; mapLocks( arg0: PromiseOrValue, overrides?: CallOverrides ): Promise< - [BigNumber, BigNumber, BigNumber, BigNumber, string, string, string] & { - depositID: BigNumber; + [ + BigNumber, + BigNumber, + BigNumber, + BigNumber, + BigNumber, + BigNumber, + string, + string, + string, + string + ] & { + sellerKey: BigNumber; + counter: BigNumber; relayerPremium: BigNumber; amount: BigNumber; expirationBlock: BigNumber; + pixTarget: BigNumber; buyerAddress: string; relayerTarget: string; relayerAddress: string; + token: string; } >; @@ -875,6 +997,12 @@ export interface P2PIX extends BaseContract { overrides?: CallOverrides ): Promise; + sellerBalance( + arg0: PromiseOrValue, + arg1: PromiseOrValue, + overrides?: CallOverrides + ): Promise; + setDefaultLockBlocks( _blocks: PromiseOrValue, overrides?: CallOverrides @@ -901,6 +1029,12 @@ export interface P2PIX extends BaseContract { overrides?: CallOverrides ): Promise; + setValidState( + token: PromiseOrValue, + state: PromiseOrValue, + overrides?: CallOverrides + ): Promise; + tokenSettings( _tokens: PromiseOrValue[], _states: PromiseOrValue[], @@ -928,10 +1062,10 @@ export interface P2PIX extends BaseContract { ): Promise; withdraw( - depositID: PromiseOrValue, + token: PromiseOrValue, expiredLocks: PromiseOrValue[], overrides?: CallOverrides - ): Promise; + ): Promise; withdrawBalance(overrides?: CallOverrides): Promise; }; @@ -946,36 +1080,25 @@ export interface P2PIX extends BaseContract { state?: PromiseOrValue | null ): AllowedERC20UpdatedEventFilter; - "DepositAdded(address,uint256,address,uint256)"( + "DepositAdded(address,address,uint256)"( seller?: PromiseOrValue | null, - depositID?: null, token?: null, amount?: null ): DepositAddedEventFilter; DepositAdded( seller?: PromiseOrValue | null, - depositID?: null, token?: null, amount?: null ): DepositAddedEventFilter; - "DepositClosed(address,uint256)"( + "DepositWithdrawn(address,address,uint256)"( seller?: PromiseOrValue | null, - depositID?: null - ): DepositClosedEventFilter; - DepositClosed( - seller?: PromiseOrValue | null, - depositID?: null - ): DepositClosedEventFilter; - - "DepositWithdrawn(address,uint256,uint256)"( - seller?: PromiseOrValue | null, - depositID?: null, + token?: null, amount?: null ): DepositWithdrawnEventFilter; DepositWithdrawn( seller?: PromiseOrValue | null, - depositID?: null, + token?: null, amount?: null ): DepositWithdrawnEventFilter; @@ -988,26 +1111,28 @@ export interface P2PIX extends BaseContract { "LockAdded(address,bytes32,uint256,uint256)"( buyer?: PromiseOrValue | null, lockID?: PromiseOrValue | null, - depositID?: null, + seller?: null, amount?: null ): LockAddedEventFilter; LockAdded( buyer?: PromiseOrValue | null, lockID?: PromiseOrValue | null, - depositID?: null, + seller?: null, amount?: null ): LockAddedEventFilter; "LockBlocksUpdated(uint256)"(blocks?: null): LockBlocksUpdatedEventFilter; LockBlocksUpdated(blocks?: null): LockBlocksUpdatedEventFilter; - "LockReleased(address,bytes32)"( + "LockReleased(address,bytes32,uint256)"( buyer?: PromiseOrValue | null, - lockId?: null + lockId?: null, + amount?: null ): LockReleasedEventFilter; LockReleased( buyer?: PromiseOrValue | null, - lockId?: null + lockId?: null, + amount?: null ): LockReleasedEventFilter; "LockReturned(address,bytes32)"( @@ -1039,6 +1164,17 @@ export interface P2PIX extends BaseContract { ): RootUpdatedEventFilter; RootUpdated(seller?: null, merkleRoot?: null): RootUpdatedEventFilter; + "ValidSet(address,address,bool)"( + seller?: PromiseOrValue | null, + token?: null, + state?: null + ): ValidSetEventFilter; + ValidSet( + seller?: PromiseOrValue | null, + token?: null, + state?: null + ): ValidSetEventFilter; + "ValidSignersUpdated(address[])"( signers?: null ): ValidSignersUpdatedEventFilter; @@ -1053,14 +1189,14 @@ export interface P2PIX extends BaseContract { overrides?: CallOverrides ): Promise; - allowedERC20s( - arg0: PromiseOrValue, + _castKeyToAddr( + _key: PromiseOrValue, overrides?: CallOverrides ): Promise; - cancelDeposit( - depositID: PromiseOrValue, - overrides?: Overrides & { from?: PromiseOrValue } + allowedERC20s( + arg0: PromiseOrValue, + overrides?: CallOverrides ): Promise; defaultLockBlocks(overrides?: CallOverrides): Promise; @@ -1068,15 +1204,33 @@ export interface P2PIX extends BaseContract { deposit( _token: PromiseOrValue, _amount: PromiseOrValue, - _pixTarget: PromiseOrValue, + _pixTarget: PromiseOrValue, + _valid: PromiseOrValue, allowlistRoot: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; - depositCount(overrides?: CallOverrides): Promise; + getBalance( + seller: PromiseOrValue, + token: PromiseOrValue, + overrides?: CallOverrides + ): Promise; + + getPixTarget( + seller: PromiseOrValue, + token: PromiseOrValue, + overrides?: CallOverrides + ): Promise; + + getValid( + seller: PromiseOrValue, + token: PromiseOrValue, + overrides?: CallOverrides + ): Promise; lock( - _depositID: PromiseOrValue, + _seller: PromiseOrValue, + _token: PromiseOrValue, _buyerAddress: PromiseOrValue, _relayerTarget: PromiseOrValue, _relayerPremium: PromiseOrValue, @@ -1086,10 +1240,7 @@ export interface P2PIX extends BaseContract { overrides?: Overrides & { from?: PromiseOrValue } ): Promise; - mapDeposits( - arg0: PromiseOrValue, - overrides?: CallOverrides - ): Promise; + lockCounter(overrides?: CallOverrides): Promise; mapLocks( arg0: PromiseOrValue, @@ -1115,6 +1266,12 @@ export interface P2PIX extends BaseContract { overrides?: CallOverrides ): Promise; + sellerBalance( + arg0: PromiseOrValue, + arg1: PromiseOrValue, + overrides?: CallOverrides + ): Promise; + setDefaultLockBlocks( _blocks: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } @@ -1141,6 +1298,12 @@ export interface P2PIX extends BaseContract { overrides?: Overrides & { from?: PromiseOrValue } ): Promise; + setValidState( + token: PromiseOrValue, + state: PromiseOrValue, + overrides?: Overrides & { from?: PromiseOrValue } + ): Promise; + tokenSettings( _tokens: PromiseOrValue[], _states: PromiseOrValue[], @@ -1168,7 +1331,7 @@ export interface P2PIX extends BaseContract { ): Promise; withdraw( - depositID: PromiseOrValue, + token: PromiseOrValue, expiredLocks: PromiseOrValue[], overrides?: Overrides & { from?: PromiseOrValue } ): Promise; @@ -1186,14 +1349,14 @@ export interface P2PIX extends BaseContract { overrides?: CallOverrides ): Promise; - allowedERC20s( - arg0: PromiseOrValue, + _castKeyToAddr( + _key: PromiseOrValue, overrides?: CallOverrides ): Promise; - cancelDeposit( - depositID: PromiseOrValue, - overrides?: Overrides & { from?: PromiseOrValue } + allowedERC20s( + arg0: PromiseOrValue, + overrides?: CallOverrides ): Promise; defaultLockBlocks(overrides?: CallOverrides): Promise; @@ -1201,15 +1364,33 @@ export interface P2PIX extends BaseContract { deposit( _token: PromiseOrValue, _amount: PromiseOrValue, - _pixTarget: PromiseOrValue, + _pixTarget: PromiseOrValue, + _valid: PromiseOrValue, allowlistRoot: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; - depositCount(overrides?: CallOverrides): Promise; + getBalance( + seller: PromiseOrValue, + token: PromiseOrValue, + overrides?: CallOverrides + ): Promise; + + getPixTarget( + seller: PromiseOrValue, + token: PromiseOrValue, + overrides?: CallOverrides + ): Promise; + + getValid( + seller: PromiseOrValue, + token: PromiseOrValue, + overrides?: CallOverrides + ): Promise; lock( - _depositID: PromiseOrValue, + _seller: PromiseOrValue, + _token: PromiseOrValue, _buyerAddress: PromiseOrValue, _relayerTarget: PromiseOrValue, _relayerPremium: PromiseOrValue, @@ -1219,10 +1400,7 @@ export interface P2PIX extends BaseContract { overrides?: Overrides & { from?: PromiseOrValue } ): Promise; - mapDeposits( - arg0: PromiseOrValue, - overrides?: CallOverrides - ): Promise; + lockCounter(overrides?: CallOverrides): Promise; mapLocks( arg0: PromiseOrValue, @@ -1248,6 +1426,12 @@ export interface P2PIX extends BaseContract { overrides?: CallOverrides ): Promise; + sellerBalance( + arg0: PromiseOrValue, + arg1: PromiseOrValue, + overrides?: CallOverrides + ): Promise; + setDefaultLockBlocks( _blocks: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } @@ -1274,6 +1458,12 @@ export interface P2PIX extends BaseContract { overrides?: Overrides & { from?: PromiseOrValue } ): Promise; + setValidState( + token: PromiseOrValue, + state: PromiseOrValue, + overrides?: Overrides & { from?: PromiseOrValue } + ): Promise; + tokenSettings( _tokens: PromiseOrValue[], _states: PromiseOrValue[], @@ -1301,7 +1491,7 @@ export interface P2PIX extends BaseContract { ): Promise; withdraw( - depositID: PromiseOrValue, + token: PromiseOrValue, expiredLocks: PromiseOrValue[], overrides?: Overrides & { from?: PromiseOrValue } ): Promise; diff --git a/test/Reputation.test.ts b/test/Reputation.test.ts index 338120b..395ca5c 100644 --- a/test/Reputation.test.ts +++ b/test/Reputation.test.ts @@ -36,8 +36,6 @@ describe("Reputation", () => { expect(tx2).to.eq(curve(500)); expect(tx3).to.eq(curve(444444)); expect(tx4).to.eq(curve(988700)); - - }); }); }); diff --git a/test/p2pix.test.ts b/test/p2pix.test.ts index 7340082..ab7f92e 100644 --- a/test/p2pix.test.ts +++ b/test/p2pix.test.ts @@ -1,1784 +1,1774 @@ -import "@nomicfoundation/hardhat-chai-matchers"; -import { - loadFixture, - mine, -} from "@nomicfoundation/hardhat-network-helpers"; -import { SignerWithAddress } from "@nomiclabs/hardhat-ethers/signers"; -import { expect } from "chai"; -import { - BigNumber, - ContractReceipt, - ContractTransaction, - Wallet, -} from "ethers"; -import { - ethers, - network, - /* tracer */ -} from "hardhat"; - -// import keccak256 from "keccak256"; -import { MockToken, P2PIX, Reputation } from "../src/types"; -import { P2PixErrors } from "./utils/errors"; -import { - Deposit, - Lock, - getSignerAddrs, - p2pixFixture, - randomSigners, -} from "./utils/fixtures"; - -describe("P2PIX", () => { - type WalletWithAddress = Wallet & SignerWithAddress; - - // contract deployer/admin - let owner: WalletWithAddress; - - // extra EOAs - let acc01: WalletWithAddress; - let acc02: WalletWithAddress; - let acc03: WalletWithAddress; - - // eslint-disable-next-line @typescript-eslint/no-explicit-any - let res: any; - - let p2pix: P2PIX; // Contract instance - let erc20: MockToken; // Token instance - let reputation: Reputation; // Reputation Interface instance - let merkleRoot: string; // MerkleRoot from seller's allowlist - let proof: string[]; // Owner's proof as whitelisted address - - const fundAmount: BigNumber = - ethers.utils.parseEther("10000"); - const price: BigNumber = ethers.utils.parseEther("100"); - - const zero = ethers.constants.AddressZero; - - before("Set signers and reset network", async () => { - [owner, acc01, acc02, acc03] = - await // eslint-disable-next-line @typescript-eslint/no-explicit-any - (ethers as any).getSigners(); - - await network.provider.send("hardhat_reset"); - }); - beforeEach("Load deployment fixtures", async () => { - ({ erc20, p2pix, reputation, merkleRoot, proof } = - await loadFixture(p2pixFixture)); - }); - - describe("Init", async () => { - it("P2PIX, Reputation and ERC20 should initialize", async () => { - // tracer.enabled = true; - await p2pix.deployed(); - // tracer.enabled = false; - await erc20.deployed(); - await reputation.deployed(); - expect(p2pix).to.be.ok; - expect(erc20).to.be.ok; - expect(reputation).to.be.ok; - const ownerKey = await p2pix._castAddrToKey( - owner.address, - ); - const acc01Key = await p2pix._castAddrToKey( - acc01.address, - ); - - // storage checks - expect( - await p2pix.callStatic.defaultLockBlocks(), - ).to.eq(10); - expect(await p2pix.callStatic.reputation()).to.eq( - reputation.address, - ); - expect(await p2pix.callStatic.depositCount()).to.eq(0); - expect( - await p2pix.callStatic.validBacenSigners(ownerKey), - ).to.eq(true); - expect( - await p2pix.callStatic.validBacenSigners(acc01Key), - ).to.eq(true); - expect( - await p2pix.callStatic.allowedERC20s(erc20.address), - ).to.eq(true); - - // event emission - await expect(await p2pix.deployTransaction) - .to.emit(p2pix, "OwnerUpdated") - .withArgs(zero, owner.address) - .and.to.emit(p2pix, "LockBlocksUpdated") - .withArgs(10) - .and.to.emit(p2pix, "ReputationUpdated") - .withArgs(reputation.address) - .and.to.emit(p2pix, "ValidSignersUpdated") - .withArgs([owner.address, acc01.address]) - .and.to.emit(p2pix, "AllowedERC20Updated") - .withArgs(erc20.address, true); - }); - - it("accounts have been funded", async () => { - // can't be eq to fundAmount due to contract deployment cost - res = await ethers.provider.getBalance(owner.address); - expect(res.toString()).to.have.lengthOf(22); - // console.log(res); // lengthOf = 22 - // console.log(fundAmount); // lengthOf = 23 - - // those should eq to hardhat prefunded account's value - expect( - await ethers.provider.getBalance(acc01.address), - ).to.eq(fundAmount); - expect( - await ethers.provider.getBalance(acc02.address), - ).to.eq(fundAmount); - expect( - await ethers.provider.getBalance(acc03.address), - ).to.eq(fundAmount); - }); - }); - - // each describe tests a set of functionalities of the contract's behavior - describe("Owner Functions", async () => { - it("should allow owner to withdraw contract's balance", async () => { - const oldBal = await p2pix.provider.getBalance( - p2pix.address, - ); - // this call also tests p2pix's receive() fallback mechanism. - const tx1 = await acc01.sendTransaction({ - to: p2pix.address, - value: price, - }); - const newBal = await p2pix.provider.getBalance( - p2pix.address, - ); - - expect(tx1).to.be.ok; - expect(oldBal).to.eq(0); - expect(newBal).to.eq(price); - - await expect(p2pix.withdrawBalance()) - .to.changeEtherBalances( - [owner.address, p2pix.address], - [price, "-100000000000000000000"], - ) - .and.to.emit(p2pix, "FundsWithdrawn") - .withArgs(owner.address, price); - - await expect( - p2pix.connect(acc01).withdrawBalance(), - ).to.be.revertedWith(P2PixErrors.UNAUTHORIZED); - }); - it("should allow owner to change reputation instance", async () => { - const tx = await p2pix.setReputation(acc03.address); - const newRep = await p2pix.callStatic.reputation(); - const fail = p2pix - .connect(acc02) - .setReputation(owner.address); - - expect(tx).to.be.ok; - await expect(tx) - .to.emit(p2pix, "ReputationUpdated") - .withArgs(acc03.address); - expect(newRep).to.eq(acc03.address); - await expect(fail).to.be.revertedWith( - P2PixErrors.UNAUTHORIZED, - ); - }); - it("should allow owner to change defaultLockBlocks ", async () => { - const magicVal = 1337; - const tx = await p2pix.setDefaultLockBlocks(magicVal); - const newVal = - await p2pix.callStatic.defaultLockBlocks(); - const fail = p2pix - .connect(acc02) - .setDefaultLockBlocks(0); - - expect(tx).to.be.ok; - await expect(tx) - .to.emit(p2pix, "LockBlocksUpdated") - .withArgs(magicVal); - expect(newVal).to.eq(magicVal); - await expect(fail).to.be.revertedWith( - P2PixErrors.UNAUTHORIZED, - ); - }); - it("should allow owner to add valid Bacen signers", async () => { - const newSigners = randomSigners(2); - const bob = await newSigners[0].getAddress(); - const alice = await newSigners[1].getAddress(); - const bobCasted = await p2pix._castAddrToKey(bob); - const aliceCasted = await p2pix._castAddrToKey(alice); - const tx = await p2pix.setValidSigners([bob, alice]); - const newSigner1 = - await p2pix.callStatic.validBacenSigners(bobCasted); - const newSigner2 = - await p2pix.callStatic.validBacenSigners(aliceCasted); - const fail = p2pix - .connect(acc03) - .setValidSigners([owner.address, acc02.address]); - - expect(tx).to.be.ok; - expect(newSigner1).to.eq(true); - expect(newSigner2).to.eq(true); - await expect(tx) - .to.emit(p2pix, "ValidSignersUpdated") - .withArgs([bob, alice]); - await expect(fail).to.be.revertedWith( - P2PixErrors.UNAUTHORIZED, - ); - }); - it("should allow owner to adjust tokenSettings", async () => { - const tx = await p2pix.tokenSettings( - [erc20.address, owner.address], - [false, true], - ); - const newTokenState1 = - await p2pix.callStatic.allowedERC20s(erc20.address); - const newTokenState2 = - await p2pix.callStatic.allowedERC20s(owner.address); - const fail = p2pix - .connect(acc01) - .tokenSettings([acc01.address], [false]); - const fail2 = p2pix.tokenSettings([], [true, false]); - const fail3 = p2pix.tokenSettings([zero], [true, true]); - - expect(tx).to.be.ok; - await expect(tx) - .to.emit(p2pix, "AllowedERC20Updated") - .withArgs(erc20.address, false) - .and.to.emit(p2pix, "AllowedERC20Updated") - .withArgs(owner.address, true); - expect(newTokenState1).to.eq(false); - expect(newTokenState2).to.eq(true); - await expect(fail).to.be.revertedWith( - P2PixErrors.UNAUTHORIZED, - ); - await expect(fail).to.be.revertedWith( - P2PixErrors.UNAUTHORIZED, - ); - await expect(fail2).to.be.revertedWithCustomError( - p2pix, - P2PixErrors.NoTokens, - ); - await expect(fail3).to.be.revertedWithCustomError( - p2pix, - P2PixErrors.LengthMismatch, - ); - }); - }); - describe("Deposit", async () => { - it("should revert if ERC20 is not allowed", async () => { - const pTarget = ethers.utils.keccak256( - ethers.utils.toUtf8Bytes("_pixTarget"), - ); - const root = ethers.utils.keccak256( - ethers.utils.toUtf8Bytes("root"), - ); - const tx = p2pix.deposit( - owner.address, - 1, - pTarget, - root, - ); - - await expect(tx).to.be.revertedWithCustomError( - p2pix, - P2PixErrors.TokenDenied, - ); - }); - it("should create deposit, update storage and emit event", async () => { - const pTarget = ethers.utils.keccak256( - ethers.utils.toUtf8Bytes("_pixTarget"), - ); - // we use `hashZero` to avoid updating seller's allowlist settings - const root = ethers.constants.HashZero; - await erc20.approve(p2pix.address, price); - const tx = await p2pix.deposit( - erc20.address, - price, - pTarget, - root, - ); - const storage: Deposit = await p2pix.mapDeposits(0); - const ownerKey = await p2pix.callStatic._castAddrToKey( - owner.address, - ); - const allowList = await p2pix.sellerAllowList(ownerKey); - - expect(tx).to.be.ok; - await expect(tx) - .to.emit(p2pix, "DepositAdded") - .withArgs(owner.address, 0, erc20.address, price); - await expect(tx).to.changeTokenBalances( - erc20, - [owner.address, p2pix.address], - ["-100000000000000000000", price], - ); - expect(storage.remaining).to.eq(price); - expect(storage.pixTarget).to.eq(pTarget); - expect(storage.seller).to.eq(owner.address); - expect(storage.token).to.eq(erc20.address); - expect(storage.valid).to.eq(true); - expect(allowList).to.eq(root); - }); - // edge case test - it("should create multiple deposits", async () => { - const ownerKey = await p2pix.callStatic._castAddrToKey( - owner.address, - ); - const acc01Key = await p2pix.callStatic._castAddrToKey( - acc01.address, - ); - const acc02Key = await p2pix.callStatic._castAddrToKey( - acc02.address, - ); - const acc03Key = await p2pix.callStatic._castAddrToKey( - acc03.address, - ); - - const pTarget = ethers.utils.keccak256( - ethers.utils.toUtf8Bytes("_pixTarget"), - ); - const pTarget2 = ethers.utils.keccak256( - ethers.utils.toUtf8Bytes("_pixTarget2"), - ); - const pTarget3 = ethers.utils.keccak256( - ethers.utils.toUtf8Bytes("_pixTarget3"), - ); - // we mock the allowlist root here only to test storage update. In depth - // allowlist test coverage in both "Lock" and "Allowlist Settings" unit tests. - const root = ethers.utils.keccak256( - ethers.utils.toUtf8Bytes("root"), - ); - const nullRoot = ethers.constants.HashZero; - const price2 = price.mul(ethers.BigNumber.from(2)); - const price3 = price.mul(ethers.BigNumber.from(3)); - const price4 = price.mul(ethers.BigNumber.from(4)); - await erc20.mint( - getSignerAddrs(4, await ethers.getSigners()), - price4, - ); - await erc20 - .connect(owner) - .approve(p2pix.address, price); - await erc20 - .connect(acc01) - .approve(p2pix.address, price2); - await erc20 - .connect(acc02) - .approve(p2pix.address, price3); - await erc20 - .connect(acc03) - .approve(p2pix.address, price4); - - const tx = await p2pix - .connect(owner) - .deposit(erc20.address, price, pTarget, root); - const tx2 = await p2pix - .connect(acc01) - .deposit(erc20.address, price2, pTarget2, nullRoot); - const tx3 = await p2pix - .connect(acc02) - .deposit(erc20.address, price3, pTarget3, root); - const tx4 = await p2pix - .connect(acc03) - .deposit(erc20.address, price4, pTarget, nullRoot); - - const storage1: Deposit = await p2pix.mapDeposits(0); - const storage2: Deposit = await p2pix.mapDeposits(1); - const storage3: Deposit = await p2pix.mapDeposits(2); - const storage4: Deposit = await p2pix.mapDeposits(3); - - const allowList1 = await p2pix.sellerAllowList( - ownerKey, - ); - const allowList2 = await p2pix.sellerAllowList( - acc01Key, - ); - const allowList3 = await p2pix.sellerAllowList( - acc02Key, - ); - const allowList4 = await p2pix.sellerAllowList( - acc03Key, - ); - - expect(tx).to.be.ok; - expect(tx2).to.be.ok; - expect(tx3).to.be.ok; - expect(tx4).to.be.ok; - - await expect(tx) - .to.emit(p2pix, "DepositAdded") - .withArgs(owner.address, 0, erc20.address, price); - await expect(tx).to.changeTokenBalances( - erc20, - [owner.address, p2pix.address], - ["-100000000000000000000", price], - ); - - await expect(tx2) - .to.emit(p2pix, "DepositAdded") - .withArgs(acc01.address, 1, erc20.address, price2); - await expect(tx2).to.changeTokenBalances( - erc20, - [acc01.address, p2pix.address], - ["-200000000000000000000", price2], - ); - - await expect(tx3) - .to.emit(p2pix, "DepositAdded") - .withArgs(acc02.address, 2, erc20.address, price3); - await expect(tx3).to.changeTokenBalances( - erc20, - [acc02.address, p2pix.address], - ["-300000000000000000000", price3], - ); - - await expect(tx4) - .to.emit(p2pix, "DepositAdded") - .withArgs(acc03.address, 3, erc20.address, price4); - await expect(tx4).to.changeTokenBalances( - erc20, - [acc03.address, p2pix.address], - ["-400000000000000000000", price4], - ); - - expect(storage1.remaining).to.eq(price); - expect(storage1.pixTarget).to.eq(pTarget); - expect(storage1.seller).to.eq(owner.address); - expect(storage1.token).to.eq(erc20.address); - expect(storage1.valid).to.eq(true); - expect(allowList1).to.eq(root); - - expect(storage2.remaining).to.eq(price2); - expect(storage2.pixTarget).to.eq(pTarget2); - expect(storage2.seller).to.eq(acc01.address); - expect(storage2.token).to.eq(erc20.address); - expect(storage2.valid).to.eq(true); - expect(allowList2).to.eq(nullRoot); - - expect(storage3.remaining).to.eq(price3); - expect(storage3.pixTarget).to.eq(pTarget3); - expect(storage3.seller).to.eq(acc02.address); - expect(storage3.token).to.eq(erc20.address); - expect(storage3.valid).to.eq(true); - expect(allowList3).to.eq(root); - - expect(storage4.remaining).to.eq(price4); - expect(storage4.pixTarget).to.eq(pTarget); - expect(storage4.seller).to.eq(acc03.address); - expect(storage4.token).to.eq(erc20.address); - expect(storage4.valid).to.eq(true); - expect(allowList4).to.eq(nullRoot); - }); - }); - describe("Lock", async () => { - it("should revert if deposit is invalid", async () => { - await erc20.approve(p2pix.address, price); - await p2pix.deposit( - erc20.address, - price, - "pixTarget", - ethers.constants.HashZero, - ); - await p2pix.cancelDeposit(0); - const fail = p2pix - .connect(acc03) - .lock( - 0, - acc02.address, - acc03.address, - 0, - price, - [], - [], - ); - const fail2 = p2pix.lock( - 2, - zero, - zero, - 0, - price, - [], - [], - ); - - await expect(fail).to.be.revertedWithCustomError( - p2pix, - P2PixErrors.InvalidDeposit, - ); - await expect(fail2).to.be.revertedWithCustomError( - p2pix, - P2PixErrors.InvalidDeposit, - ); - }); - it("should revert if wished amount is greater than deposit's remaining amount", async () => { - await erc20.approve(p2pix.address, price); - await p2pix.deposit( - erc20.address, - price, - "pixTarget", - ethers.constants.HashZero, - ); - const fail = p2pix - .connect(acc03) - .lock( - 0, - acc02.address, - acc03.address, - 0, - price.mul(ethers.BigNumber.from(2)), - [], - [], - ); - - await expect(fail).to.be.revertedWithCustomError( - p2pix, - P2PixErrors.NotEnoughTokens, - ); - }); - it("should revert if a non expired lock has the same ID encoded", async () => { - await erc20.approve(p2pix.address, price); - await p2pix.deposit( - erc20.address, - price, - "pixTarget", - ethers.constants.HashZero, - ); - await p2pix - .connect(acc03) - .lock(0, acc02.address, acc03.address, 0, 1, [], []); - const fail = p2pix - .connect(acc03) - .lock(0, acc02.address, acc03.address, 0, 1, [], []); - - await expect(fail).to.be.revertedWithCustomError( - p2pix, - P2PixErrors.NotExpired, - ); - }); - it("should revert if an invalid allowlist merkleproof is provided", async () => { - await erc20.approve(p2pix.address, price); - await p2pix.deposit( - erc20.address, - price, - "pixTarget", - merkleRoot, - ); - const fail = p2pix - .connect(acc02) - .lock( - 0, - acc02.address, - acc03.address, - 0, - 1000, - [ - ethers.utils.keccak256( - ethers.utils.toUtf8Bytes("wrong"), - ), - ], - [], - ); - - await expect(fail).to.be.revertedWithCustomError( - p2pix, - P2PixErrors.AddressDenied, - ); - }); - it("should revert if msg.sender does not have enough credit in his spend limit", async () => { - await erc20.approve(p2pix.address, price.mul(BigNumber.from('3'))); - await p2pix.deposit( - erc20.address, - price.mul(BigNumber.from('3')), - "pixTarget", - merkleRoot, - ); - const fail = p2pix - .connect(acc02) - .lock( - 0, - acc02.address, - acc03.address, - 0, - price.mul(BigNumber.from('2')), - [], - [], - ); - - await expect(fail).to.be.revertedWithCustomError( - p2pix, - P2PixErrors.AmountNotAllowed, - ); - }); - it("should create a lock, update storage and emit events via the allowlist path", async () => { - await erc20.approve(p2pix.address, price); - await p2pix.deposit( - erc20.address, - price, - "pixTarget", - merkleRoot, - ); - const tx = 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], - ); - const storage: Lock = await p2pix.callStatic.mapLocks( - lockID, - ); - - const rc: ContractReceipt = await tx.wait(); - const expiration = rc.blockNumber + 10; - - expect(tx).to.be.ok; - expect(storage.depositID).to.eq(0); - expect(storage.relayerPremium).to.eq( - ethers.constants.Zero, - ); - expect(storage.amount).to.eq(price); - expect(storage.expirationBlock).to.eq(expiration); - expect(storage.buyerAddress).to.eq(acc02.address); - expect(storage.relayerTarget).to.eq(acc03.address); - expect(storage.relayerAddress).to.eq(acc01.address); - await expect(tx) - .to.emit(p2pix, "LockAdded") - .withArgs( - acc02.address, - lockID, - storage.depositID, - storage.amount, - ); - }); - it("should create a lock, update storage and emit events via the reputation path", async () => { - const root = ethers.constants.HashZero; - await erc20.approve(p2pix.address, price); - await p2pix.deposit( - erc20.address, - price, - "pixTarget", - root, - ); - const tx = await p2pix - .connect(acc01) - .lock( - 0, - acc02.address, - acc03.address, - 0, - price, - [], - [], - ); - const lockID = ethers.utils.solidityKeccak256( - ["uint256", "uint256", "address"], - [0, price, acc02.address], - ); - const storage: Lock = await p2pix.callStatic.mapLocks( - lockID, - ); - - const rc: ContractReceipt = await tx.wait(); - const expiration = rc.blockNumber + 10; - - expect(tx).to.be.ok; - expect(storage.depositID).to.eq(0); - expect(storage.relayerPremium).to.eq( - ethers.constants.Zero, - ); - expect(storage.amount).to.eq( - price - ); - expect(storage.expirationBlock).to.eq(expiration); - expect(storage.buyerAddress).to.eq(acc02.address); - expect(storage.relayerTarget).to.eq(acc03.address); - expect(storage.relayerAddress).to.eq(acc01.address); - await expect(tx) - .to.emit(p2pix, "LockAdded") - .withArgs( - acc02.address, - lockID, - storage.depositID, - storage.amount, - ); - }); - // edge case test - it("should create multiple locks", async () => { - const newPrice = price.div(ethers.BigNumber.from(2)); - await erc20.approve(p2pix.address, price); - await p2pix.deposit( - erc20.address, - price, - "pixTarget", - merkleRoot, - ); - const tx1 = await p2pix - .connect(acc01) - .lock( - 0, - acc02.address, - acc03.address, - 0, - newPrice, - proof, - [], - ); - const lockID1 = ethers.utils.solidityKeccak256( - ["uint256", "uint256", "address"], - [0, newPrice, acc02.address], - ); - const storage1: Lock = await p2pix.callStatic.mapLocks( - lockID1, - ); - - const rc1: ContractReceipt = await tx1.wait(); - const expiration1 = rc1.blockNumber + 10; - - const tx2 = await p2pix - .connect(acc01) - .lock( - 0, - acc02.address, - acc03.address, - 0, - 100, - [], - [], - ); - const lockID2 = ethers.utils.solidityKeccak256( - ["uint256", "uint256", "address"], - [0, 100, acc02.address], - ); - const storage2: Lock = await p2pix.callStatic.mapLocks( - lockID2, - ); - - const rc2: ContractReceipt = await tx2.wait(); - const expiration2 = rc2.blockNumber + 10; - - const tx3 = await p2pix - .connect(acc03) - .lock( - 0, - acc03.address, - acc03.address, - 0, - 100, - [], - [], - ); - const lockID3 = ethers.utils.solidityKeccak256( - ["uint256", "uint256", "address"], - [0, 100, acc03.address], - ); - const storage3: Lock = await p2pix.callStatic.mapLocks( - lockID3, - ); - - const rc3: ContractReceipt = await tx3.wait(); - const expiration3 = rc3.blockNumber + 10; - - expect(tx1).to.be.ok; - expect(tx2).to.be.ok; - expect(tx3).to.be.ok; - - expect(0) - .to.eq(storage1.depositID) - .and.to.eq(storage2.depositID) - .and.to.eq(storage3.depositID); - - expect(ethers.constants.Zero) - .to.eq(storage1.relayerPremium) - .and.to.eq(storage2.relayerPremium) - .and.to.eq(storage3.relayerPremium); - - expect(storage1.amount).to.eq(newPrice); - expect(ethers.BigNumber.from(100)) - .to.eq(storage2.amount) - .and.to.eq(storage3.amount); - - expect(storage1.expirationBlock).to.eq(expiration1); - expect(storage2.expirationBlock).to.eq(expiration2); - expect(storage3.expirationBlock).to.eq(expiration3); - - expect(acc02.address) - .to.eq(storage1.buyerAddress) - .and.to.eq(storage2.buyerAddress); - expect(storage3.buyerAddress).to.eq(acc03.address); - - expect(acc03.address) - .to.eq(storage1.relayerTarget) - .and.to.eq(storage2.relayerTarget) - .and.to.eq(storage3.relayerTarget); - - expect(acc01.address) - .to.eq(storage1.relayerAddress) - .and.to.eq(storage2.relayerAddress); - expect(storage3.relayerAddress).to.eq(acc03.address); - - await expect(tx1) - .to.emit(p2pix, "LockAdded") - .withArgs( - acc02.address, - lockID1, - storage1.depositID, - storage1.amount, - ); - await expect(tx2) - .to.emit(p2pix, "LockAdded") - .withArgs( - acc02.address, - lockID2, - storage2.depositID, - storage2.amount, - ); - await expect(tx3) - .to.emit(p2pix, "LockAdded") - .withArgs( - acc03.address, - lockID3, - storage3.depositID, - storage3.amount, - ); - }); - }); - describe("Cancel Deposit", async () => { - it("should revert if the msg.sender isn't the deposit's seller", async () => { - await erc20.approve(p2pix.address, price); - await p2pix.deposit( - erc20.address, - price, - "pixTarget", - merkleRoot, - ); - const fail = p2pix.connect(acc01).cancelDeposit(0); - await expect(fail).to.be.revertedWithCustomError( - p2pix, - P2PixErrors.OnlySeller, - ); - }); - it("should cancel deposit, update storage and emit events", async () => { - await erc20.approve(p2pix.address, price); - await p2pix.deposit( - erc20.address, - price, - "pixTarget", - merkleRoot, - ); - const state1: Deposit = - await p2pix.callStatic.mapDeposits(0); - const tx = await p2pix.cancelDeposit(0); - const state2: Deposit = - await p2pix.callStatic.mapDeposits(0); - - expect(tx).to.be.ok; - await expect(tx) - .to.emit(p2pix, "DepositClosed") - .withArgs(owner.address, 0); - expect(state1.valid).to.be.true; - expect(state2.valid).to.be.false; - }); - it("should cancel multiple deposits", async () => { - await erc20.approve(p2pix.address, price); - await p2pix.deposit( - erc20.address, - price, - "pixTarget", - ethers.constants.HashZero, - ); - await erc20.approve(p2pix.address, price); - await p2pix.deposit( - erc20.address, - price, - "pixTarget", - ethers.constants.HashZero, - ); - await erc20.approve(p2pix.address, price); - await p2pix.deposit( - erc20.address, - price, - "pixTarget", - ethers.constants.HashZero, - ); - const oldState1: Deposit = - await p2pix.callStatic.mapDeposits(0); - const oldState2: Deposit = - await p2pix.callStatic.mapDeposits(1); - const oldState3: Deposit = - await p2pix.callStatic.mapDeposits(2); - const tx1 = await p2pix.cancelDeposit(0); - const tx2 = await p2pix.cancelDeposit(1); - const tx3 = await p2pix.cancelDeposit(2); - const newState1: Deposit = - await p2pix.callStatic.mapDeposits(0); - const newState2: Deposit = - await p2pix.callStatic.mapDeposits(1); - const newState3: Deposit = - await p2pix.callStatic.mapDeposits(2); - - expect(tx1).to.be.ok; - expect(tx2).to.be.ok; - expect(tx3).to.be.ok; - await expect(tx1) - .to.emit(p2pix, "DepositClosed") - .withArgs(owner.address, 0); - await expect(tx2) - .to.emit(p2pix, "DepositClosed") - .withArgs(owner.address, 1); - await expect(tx3) - .to.emit(p2pix, "DepositClosed") - .withArgs(owner.address, 2); - expect(oldState1.valid).to.be.true; - expect(oldState2.valid).to.be.true; - expect(oldState3.valid).to.be.true; - expect(newState1.valid).to.be.false; - expect(newState2.valid).to.be.false; - expect(newState3.valid).to.be.false; - }); - }); - describe("Release", async () => { - it("should revert if lock has expired", async () => { - const messageToSign = ethers.utils.solidityKeccak256( - ["string", "uint256", "bytes32"], - ["pixTarget", 100, ethers.constants.HashZero], - ); - const flatSig = await acc01.signMessage( - ethers.utils.arrayify(messageToSign), - ); - const sig = ethers.utils.splitSignature(flatSig); - await erc20.approve(p2pix.address, price); - await p2pix.deposit( - erc20.address, - price, - "pixTarget", - merkleRoot, - ); - await p2pix - .connect(acc03) - .lock( - 0, - acc02.address, - acc03.address, - 6, - 100, - [], - [], - ); - const lockID = ethers.utils.solidityKeccak256( - ["uint256", "uint256", "address"], - [0, 100, acc02.address], - ); - await mine(13); - const fail = p2pix.release( - lockID, - acc03.address, - ethers.constants.HashZero, - sig.r, - sig.s, - sig.v, - ); - - await expect(fail).to.be.revertedWithCustomError( - p2pix, - P2PixErrors.LockExpired, - ); - }); - it("should revert if lock has already been released", async () => { - const messageToSign = ethers.utils.solidityKeccak256( - ["string", "uint256", "bytes32"], - ["pixTarget", 100, ethers.constants.HashZero], - ); - const flatSig = await acc01.signMessage( - ethers.utils.arrayify(messageToSign), - ); - const sig = ethers.utils.splitSignature(flatSig); - await erc20.approve(p2pix.address, price); - await p2pix.deposit( - erc20.address, - price, - "pixTarget", - merkleRoot, - ); - await p2pix - .connect(acc03) - .lock( - 0, - acc02.address, - acc03.address, - 6, - 100, - [], - [], - ); - const lockID = ethers.utils.solidityKeccak256( - ["uint256", "uint256", "address"], - [0, 100, acc02.address], - ); - await p2pix.release( - lockID, - acc03.address, - ethers.constants.HashZero, - sig.r, - sig.s, - sig.v, - ); - const fail = p2pix.release( - lockID, - acc03.address, - ethers.constants.HashZero, - sig.r, - sig.s, - sig.v, - ); - - await expect(fail).to.be.revertedWithCustomError( - p2pix, - P2PixErrors.AlreadyReleased, - ); - }); - it("should revert if signed message has already been used", async () => { - const messageToSign = ethers.utils.solidityKeccak256( - ["string", "uint256", "bytes32"], - ["pixTarget", 100, ethers.constants.HashZero], - ); - const flatSig = await owner.signMessage( - ethers.utils.arrayify(messageToSign), - ); - const sig = ethers.utils.splitSignature(flatSig); - await erc20.approve(p2pix.address, price); - await p2pix.deposit( - erc20.address, - price, - "pixTarget", - ethers.constants.HashZero, - ); - await p2pix - .connect(acc03) - .lock( - 0, - acc02.address, - acc03.address, - 6, - 100, - [], - [], - ); - const lockID = ethers.utils.solidityKeccak256( - ["uint256", "uint256", "address"], - [0, 100, acc02.address], - ); - await p2pix - .connect(acc01) - .release( - lockID, - acc02.address, - ethers.constants.HashZero, - sig.r, - sig.s, - sig.v, - ); - await p2pix - .connect(acc03) - .lock( - 0, - acc02.address, - acc03.address, - 6, - 100, - [], - [], - ); - const lockID2 = ethers.utils.solidityKeccak256( - ["uint256", "uint256", "address"], - [0, 100, acc02.address], - ); - const fail = p2pix - .connect(acc01) - .release( - lockID2, - acc02.address, - ethers.constants.HashZero, - sig.r, - sig.s, - sig.v, - ); - - await expect(fail).to.be.revertedWithCustomError( - p2pix, - P2PixErrors.TxAlreadyUsed, - ); - }); - it("should revert if ecrecovered signer is invalid", async () => { - const messageToSign = ethers.utils.solidityKeccak256( - ["string", "uint256", "bytes32"], - ["pixTarget", 100, ethers.constants.HashZero], - ); - const flatSig = await acc03.signMessage( - ethers.utils.arrayify(messageToSign), - ); - const sig = ethers.utils.splitSignature(flatSig); - - await erc20.approve(p2pix.address, price); - await p2pix.deposit( - erc20.address, - price, - "pixTarget", - ethers.constants.HashZero, - ); - await p2pix - .connect(acc03) - .lock( - 0, - acc02.address, - acc03.address, - 6, - 100, - [], - [], - ); - const lockID = ethers.utils.solidityKeccak256( - ["uint256", "uint256", "address"], - [0, 100, acc02.address], - ); - const fail = p2pix - .connect(acc01) - .release( - lockID, - acc02.address, - ethers.constants.HashZero, - sig.r, - sig.s, - sig.v, - ); - - await expect(fail).to.be.revertedWithCustomError( - p2pix, - P2PixErrors.InvalidSigner, - ); - }); - it("should release lock, update storage and emit events", async () => { - const endtoendID = ethers.constants.HashZero; - const pixTarget = "pixTarget"; - const messageToSign = ethers.utils.solidityKeccak256( - ["string", "uint256", "bytes32"], - [pixTarget, 100, endtoendID], - ); - // Note: messageToSign is a string, that is 66-bytes long, to sign the - // binary value, we must convert it to the 32 byte Array that - // the string represents - // - // i.e., - // 66-byte string - // "0x592fa743889fc7f92ac2a37bb1f5ba1daf2a5c84741ca0e0061d243a2e6707ba" - // ... vs ... - // 32 entry Uint8Array - // [ 89, 47, 167, 67, 136, 159, ... 103, 7, 186] - 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(acc03) - .lock( - 0, - acc02.address, - acc03.address, - 6, - 100, - [], - [], - ); - const lockID = ethers.utils.solidityKeccak256( - ["uint256", "uint256", "address"], - [0, 100, acc02.address], - ); - const acc01Key = await p2pix.callStatic._castAddrToKey( - acc01.address, - ); - const acc03Key = await p2pix.callStatic._castAddrToKey( - acc03.address, - ); - const userRecordA = await p2pix.callStatic.userRecord( - acc01Key, - ); - const userRecord1 = await p2pix.callStatic.userRecord( - acc03Key, - ); - const storage1: Lock = await p2pix.callStatic.mapLocks( - lockID, - ); - const tx = await p2pix - .connect(acc01) - .release( - lockID, - acc02.address, - endtoendID, - sig.r, - sig.s, - sig.v, - ); - const storage2: Lock = await p2pix.callStatic.mapLocks( - lockID, - ); - const userRecordB = await p2pix.callStatic.userRecord( - acc01Key, - ); - const userRecord2 = await p2pix.callStatic.userRecord( - acc03Key, - ); - const used = await p2pix.callStatic.usedTransactions( - messageHashBytes, - ); - expect(tx).to.be.ok; - await expect(tx) - .to.emit(p2pix, "LockReleased") - .withArgs(acc02.address, lockID); - expect(storage1.expirationBlock).to.eq( - ethers.BigNumber.from(16), - ); - expect(storage1.amount).to.eq( - ethers.BigNumber.from(100), - ); - expect(storage2.expirationBlock).to.eq( - ethers.BigNumber.from(0), - ); - expect(storage2.amount).to.eq(ethers.BigNumber.from(0)); - expect(used).to.eq(true); - expect(userRecordA).to.eq(ethers.constants.Zero); - expect(userRecord1).to.eq(ethers.constants.Zero); - expect(userRecordB).to.eq(ethers.BigNumber.from(6)); - expect(userRecord2).to.eq(ethers.BigNumber.from(100)); - await expect(tx).to.changeTokenBalances( - erc20, - [acc03.address, acc02.address], - [3, 97], - // acc02 is acting both as buyer and relayerTarget - // (i.e., 94 + 3 = 97) - ); - }); - // edge case test - it("should release multiple locks", async () => { - const endtoendID = ethers.constants.HashZero; - const pixTarget = "pixTarget"; - const root = ethers.constants.HashZero; - const acc01Key = - await p2pix.callStatic._castAddrToKey(acc01.address); - const acc03Key = - await p2pix.callStatic._castAddrToKey(acc03.address); - const acc01Record1 = - await p2pix.callStatic.userRecord(acc01Key); - const acc03Record1 = - await p2pix.callStatic.userRecord(acc03Key); - const messageToSign1 = ethers.utils.solidityKeccak256( - ["string", "uint256", "bytes32"], - [pixTarget, 100, endtoendID]); - const flatSig1 = await owner.signMessage( - ethers.utils.arrayify(messageToSign1)); - const sig1 = ethers.utils.splitSignature(flatSig1); - const messageToSign2 = ethers.utils.solidityKeccak256( - ["string", "uint256", "bytes32"], - [pixTarget, 50, endtoendID]); - const flatSig2 = await owner.signMessage( - ethers.utils.arrayify(messageToSign2)); - const sig2 = ethers.utils.splitSignature(flatSig2); - const messageToSign3 = ethers.utils.solidityKeccak256( - ["string", "uint256", "bytes32"], - [pixTarget, 25, endtoendID]); - const flatSig3 = await owner.signMessage( - ethers.utils.arrayify(messageToSign3)); - const sig3 = ethers.utils.splitSignature(flatSig3); - await erc20.approve(p2pix.address, price); - await p2pix.deposit( - erc20.address, - price, - pixTarget, - root, - ); - await p2pix - .connect(acc03) - .lock( - 0, - acc02.address, - acc03.address, - 0, - 100, - [], - [], - ); - await p2pix - .connect(acc03) - .lock( - 0, - acc02.address, - acc03.address, - 6, - 50, - [], - [], - ); - await p2pix - .connect(acc03) - .lock( - 0, - acc02.address, - acc03.address, - 10, - 25, - [], - [], - ); - const lockID = ethers.utils.solidityKeccak256( - ["uint256", "uint256", "address"], - [0, 100, acc02.address], - ); - const lockID2 = ethers.utils.solidityKeccak256( - ["uint256", "uint256", "address"], - [0, 50, acc02.address], - ); - const lockID3 = ethers.utils.solidityKeccak256( - ["uint256", "uint256", "address"], - [0, 25, acc02.address], - ); - // relayerPremium == 0 - const tx = await p2pix - .connect(acc01) - .release( - lockID, - acc02.address, - endtoendID, - sig1.r, - sig1.s, - sig1.v, - ); - // relayerPremium != 0 && - // lock's msg.sender != release's msg.sender - const tx1 = await p2pix - .connect(acc01) - .release( - lockID2, - acc02.address, - endtoendID, - sig2.r, - sig2.s, - sig2.v, - ); - // relayerPremium != 0 && - // lock's msg.sender == release's msg.sender - const tx2 = await p2pix - .connect(acc03) - .release( - lockID3, - acc02.address, - endtoendID, - sig3.r, - sig3.s, - sig3.v, - ); - const used1 = await p2pix.callStatic.usedTransactions( - ethers.utils.arrayify(messageToSign1), - ); - const used2 = await p2pix.callStatic.usedTransactions( - ethers.utils.arrayify(messageToSign2), - ); - const used3 = await p2pix.callStatic.usedTransactions( - ethers.utils.arrayify(messageToSign3), - ); - const acc01Record2 = - await p2pix.callStatic.userRecord(acc01Key); - const acc03Record2 = - await p2pix.callStatic.userRecord(acc03Key); - - expect(tx).to.be.ok; - expect(tx1).to.be.ok; - expect(tx2).to.be.ok; - await expect(tx) - .to.emit(p2pix, "LockReleased") - .withArgs(acc02.address, lockID); - await expect(tx1) - .to.emit(p2pix, "LockReleased") - .withArgs(acc02.address, lockID2); - await expect(tx2) - .to.emit(p2pix, "LockReleased") - .withArgs(acc02.address, lockID3); - expect(used1).to.eq(true); - expect(used2).to.eq(true); - expect(used3).to.eq(true); - expect(0).to.eq(acc01Record1).and.to.eq(acc03Record1); - expect(acc01Record2).to.eq(6); // 0 + 6 - expect(acc03Record2).to.eq(185); // 100 + 50 + 25 + 10 - await expect(tx).to.changeTokenBalances( - erc20, - [ - acc01.address, - acc02.address, - acc03.address, - p2pix.address - ], - [ - 0, - 100, - 0, - "-100" - ], - ); - await expect(tx1).to.changeTokenBalances( - erc20, - [ - acc01.address, - acc02.address, - acc03.address, - p2pix.address - ], - [ - 0, - 47, - 3, - "-50" - ], - ); - await expect(tx2).to.changeTokenBalances( - erc20, - [ - acc01.address, - acc02.address, - acc03.address, - p2pix.address - ], - [ - 0, - 20, - 5, - "-25" - ], - ); - }); - }); - describe("Unexpire Locks", async () => { - it("should revert if lock isn't expired", async () => { - 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], - ); - const fail = p2pix.unlockExpired([lockID]); - - await expect(fail).to.be.revertedWithCustomError( - p2pix, - P2PixErrors.NotExpired, - ); - }); - it("should revert if lock has already been released", async () => { - const endtoendID = ethers.constants.HashZero; - const pixTarget = "pixTarget"; - const messageToSign = ethers.utils.solidityKeccak256( - ["string", "uint256", "bytes32"], - [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 () => { - 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(price); - }); - 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 () => { - it("should revert if the msg.sender isn't the deposit's seller", async () => { - await erc20.approve(p2pix.address, price); - await p2pix.deposit( - erc20.address, - price, - "pixTarget", - merkleRoot, - ); - const fail = p2pix.connect(acc02).withdraw(0, []); - - await expect(fail).to.be.revertedWithCustomError( - p2pix, - P2PixErrors.OnlySeller, - ); - }); - it("should withdraw remaining funds from deposit, update storage and emit event", async () => { - await erc20.approve(p2pix.address, price); - const dep = await p2pix.deposit( - erc20.address, - price, - "pixTarget", - merkleRoot, - ); - const tx = await p2pix.withdraw(0, []); - - expect(tx).to.be.ok; - await expect(dep) - .to.changeTokenBalance( - erc20, - owner.address, - "-100000000000000000000", - ) - .and.to.changeTokenBalance( - erc20, - p2pix.address, - price, - ); - await expect(tx) - .to.changeTokenBalance(erc20, owner.address, price) - .and.to.changeTokenBalance( - erc20, - p2pix.address, - "-100000000000000000000", - ); - - await expect(tx) - .to.emit(p2pix, "DepositWithdrawn") - .withArgs(owner.address, 0, price); - }); - }); - describe("Allowlist Settings", async () => { - 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); - - 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, - ); - - expect(tx).to.be.ok; - await expect(tx) - .to.emit(p2pix, "RootUpdated") - .withArgs(owner.address, merkleRoot); - expect(oldState).to.eq(ethers.constants.HashZero); - expect(newState).to.eq(merkleRoot); - }); - }); -}); +// import "@nomicfoundation/hardhat-chai-matchers"; +// import { +// loadFixture, +// mine, +// } from "@nomicfoundation/hardhat-network-helpers"; +// import { SignerWithAddress } from "@nomiclabs/hardhat-ethers/signers"; +// import { expect } from "chai"; +// import { +// BigNumber, +// ContractReceipt, +// ContractTransaction, +// Wallet, +// } from "ethers"; +// import { +// ethers, +// network, +// /* tracer */ +// } from "hardhat"; + +// // import keccak256 from "keccak256"; +// import { MockToken, P2PIX, Reputation } from "../src/types"; +// import { P2PixErrors } from "./utils/errors"; +// import { +// Deposit, +// Lock, +// getSignerAddrs, +// p2pixFixture, +// randomSigners, +// } from "./utils/fixtures"; + +// describe("P2PIX", () => { +// type WalletWithAddress = Wallet & SignerWithAddress; + +// // contract deployer/admin +// let owner: WalletWithAddress; + +// // extra EOAs +// let acc01: WalletWithAddress; +// let acc02: WalletWithAddress; +// let acc03: WalletWithAddress; + +// // eslint-disable-next-line @typescript-eslint/no-explicit-any +// let res: any; + +// let p2pix: P2PIX; // Contract instance +// let erc20: MockToken; // Token instance +// let reputation: Reputation; // Reputation Interface instance +// let merkleRoot: string; // MerkleRoot from seller's allowlist +// let proof: string[]; // Owner's proof as whitelisted address + +// const fundAmount: BigNumber = +// ethers.utils.parseEther("10000"); +// const price: BigNumber = ethers.utils.parseEther("100"); + +// const zero = ethers.constants.AddressZero; + +// before("Set signers and reset network", async () => { +// [owner, acc01, acc02, acc03] = +// await // eslint-disable-next-line @typescript-eslint/no-explicit-any +// (ethers as any).getSigners(); + +// await network.provider.send("hardhat_reset"); +// }); +// beforeEach("Load deployment fixtures", async () => { +// ({ erc20, p2pix, reputation, merkleRoot, proof } = +// await loadFixture(p2pixFixture)); +// }); + +// describe("Init", async () => { +// it("P2PIX, Reputation and ERC20 should initialize", async () => { +// // tracer.enabled = true; +// await p2pix.deployed(); +// // tracer.enabled = false; +// await erc20.deployed(); +// await reputation.deployed(); +// expect(p2pix).to.be.ok; +// expect(erc20).to.be.ok; +// expect(reputation).to.be.ok; +// const ownerKey = await p2pix._castAddrToKey( +// owner.address, +// ); +// const acc01Key = await p2pix._castAddrToKey( +// acc01.address, +// ); + +// // storage checks +// expect( +// await p2pix.callStatic.defaultLockBlocks(), +// ).to.eq(10); +// expect(await p2pix.callStatic.reputation()).to.eq( +// reputation.address, +// ); +// expect(await p2pix.callStatic.depositCount()).to.eq(0); +// expect( +// await p2pix.callStatic.validBacenSigners(ownerKey), +// ).to.eq(true); +// expect( +// await p2pix.callStatic.validBacenSigners(acc01Key), +// ).to.eq(true); +// expect( +// await p2pix.callStatic.allowedERC20s(erc20.address), +// ).to.eq(true); + +// // event emission +// await expect(await p2pix.deployTransaction) +// .to.emit(p2pix, "OwnerUpdated") +// .withArgs(zero, owner.address) +// .and.to.emit(p2pix, "LockBlocksUpdated") +// .withArgs(10) +// .and.to.emit(p2pix, "ReputationUpdated") +// .withArgs(reputation.address) +// .and.to.emit(p2pix, "ValidSignersUpdated") +// .withArgs([owner.address, acc01.address]) +// .and.to.emit(p2pix, "AllowedERC20Updated") +// .withArgs(erc20.address, true); +// }); + +// it("accounts have been funded", async () => { +// // can't be eq to fundAmount due to contract deployment cost +// res = await ethers.provider.getBalance(owner.address); +// expect(res.toString()).to.have.lengthOf(22); +// // console.log(res); // lengthOf = 22 +// // console.log(fundAmount); // lengthOf = 23 + +// // those should eq to hardhat prefunded account's value +// expect( +// await ethers.provider.getBalance(acc01.address), +// ).to.eq(fundAmount); +// expect( +// await ethers.provider.getBalance(acc02.address), +// ).to.eq(fundAmount); +// expect( +// await ethers.provider.getBalance(acc03.address), +// ).to.eq(fundAmount); +// }); +// }); + +// // each describe tests a set of functionalities of the contract's behavior +// describe("Owner Functions", async () => { +// it("should allow owner to withdraw contract's balance", async () => { +// const oldBal = await p2pix.provider.getBalance( +// p2pix.address, +// ); +// // this call also tests p2pix's receive() fallback mechanism. +// const tx1 = await acc01.sendTransaction({ +// to: p2pix.address, +// value: price, +// }); +// const newBal = await p2pix.provider.getBalance( +// p2pix.address, +// ); + +// expect(tx1).to.be.ok; +// expect(oldBal).to.eq(0); +// expect(newBal).to.eq(price); + +// await expect(p2pix.withdrawBalance()) +// .to.changeEtherBalances( +// [owner.address, p2pix.address], +// [price, "-100000000000000000000"], +// ) +// .and.to.emit(p2pix, "FundsWithdrawn") +// .withArgs(owner.address, price); + +// await expect( +// p2pix.connect(acc01).withdrawBalance(), +// ).to.be.revertedWith(P2PixErrors.UNAUTHORIZED); +// }); +// it("should allow owner to change reputation instance", async () => { +// const tx = await p2pix.setReputation(acc03.address); +// const newRep = await p2pix.callStatic.reputation(); +// const fail = p2pix +// .connect(acc02) +// .setReputation(owner.address); + +// expect(tx).to.be.ok; +// await expect(tx) +// .to.emit(p2pix, "ReputationUpdated") +// .withArgs(acc03.address); +// expect(newRep).to.eq(acc03.address); +// await expect(fail).to.be.revertedWith( +// P2PixErrors.UNAUTHORIZED, +// ); +// }); +// it("should allow owner to change defaultLockBlocks ", async () => { +// const magicVal = 1337; +// const tx = await p2pix.setDefaultLockBlocks(magicVal); +// const newVal = +// await p2pix.callStatic.defaultLockBlocks(); +// const fail = p2pix +// .connect(acc02) +// .setDefaultLockBlocks(0); + +// expect(tx).to.be.ok; +// await expect(tx) +// .to.emit(p2pix, "LockBlocksUpdated") +// .withArgs(magicVal); +// expect(newVal).to.eq(magicVal); +// await expect(fail).to.be.revertedWith( +// P2PixErrors.UNAUTHORIZED, +// ); +// }); +// it("should allow owner to add valid Bacen signers", async () => { +// const newSigners = randomSigners(2); +// const bob = await newSigners[0].getAddress(); +// const alice = await newSigners[1].getAddress(); +// const bobCasted = await p2pix._castAddrToKey(bob); +// const aliceCasted = await p2pix._castAddrToKey(alice); +// const tx = await p2pix.setValidSigners([bob, alice]); +// const newSigner1 = +// await p2pix.callStatic.validBacenSigners(bobCasted); +// const newSigner2 = +// await p2pix.callStatic.validBacenSigners(aliceCasted); +// const fail = p2pix +// .connect(acc03) +// .setValidSigners([owner.address, acc02.address]); + +// expect(tx).to.be.ok; +// expect(newSigner1).to.eq(true); +// expect(newSigner2).to.eq(true); +// await expect(tx) +// .to.emit(p2pix, "ValidSignersUpdated") +// .withArgs([bob, alice]); +// await expect(fail).to.be.revertedWith( +// P2PixErrors.UNAUTHORIZED, +// ); +// }); +// it("should allow owner to adjust tokenSettings", async () => { +// const tx = await p2pix.tokenSettings( +// [erc20.address, owner.address], +// [false, true], +// ); +// const newTokenState1 = +// await p2pix.callStatic.allowedERC20s(erc20.address); +// const newTokenState2 = +// await p2pix.callStatic.allowedERC20s(owner.address); +// const fail = p2pix +// .connect(acc01) +// .tokenSettings([acc01.address], [false]); +// const fail2 = p2pix.tokenSettings([], [true, false]); +// const fail3 = p2pix.tokenSettings([zero], [true, true]); + +// expect(tx).to.be.ok; +// await expect(tx) +// .to.emit(p2pix, "AllowedERC20Updated") +// .withArgs(erc20.address, false) +// .and.to.emit(p2pix, "AllowedERC20Updated") +// .withArgs(owner.address, true); +// expect(newTokenState1).to.eq(false); +// expect(newTokenState2).to.eq(true); +// await expect(fail).to.be.revertedWith( +// P2PixErrors.UNAUTHORIZED, +// ); +// await expect(fail).to.be.revertedWith( +// P2PixErrors.UNAUTHORIZED, +// ); +// await expect(fail2).to.be.revertedWithCustomError( +// p2pix, +// P2PixErrors.NoTokens, +// ); +// await expect(fail3).to.be.revertedWithCustomError( +// p2pix, +// P2PixErrors.LengthMismatch, +// ); +// }); +// }); +// describe("Deposit", async () => { +// it("should revert if ERC20 is not allowed", async () => { +// const pTarget = ethers.utils.keccak256( +// ethers.utils.toUtf8Bytes("_pixTarget"), +// ); +// const root = ethers.utils.keccak256( +// ethers.utils.toUtf8Bytes("root"), +// ); +// const tx = p2pix.deposit( +// owner.address, +// 1, +// pTarget, +// root, +// ); + +// await expect(tx).to.be.revertedWithCustomError( +// p2pix, +// P2PixErrors.TokenDenied, +// ); +// }); +// it("should create deposit, update storage and emit event", async () => { +// const pTarget = ethers.utils.keccak256( +// ethers.utils.toUtf8Bytes("_pixTarget"), +// ); +// // we use `hashZero` to avoid updating seller's allowlist settings +// const root = ethers.constants.HashZero; +// await erc20.approve(p2pix.address, price); +// const tx = await p2pix.deposit( +// erc20.address, +// price, +// pTarget, +// root, +// ); +// const storage: Deposit = await p2pix.mapDeposits(0); +// const ownerKey = await p2pix.callStatic._castAddrToKey( +// owner.address, +// ); +// const allowList = await p2pix.sellerAllowList(ownerKey); + +// expect(tx).to.be.ok; +// await expect(tx) +// .to.emit(p2pix, "DepositAdded") +// .withArgs(owner.address, 0, erc20.address, price); +// await expect(tx).to.changeTokenBalances( +// erc20, +// [owner.address, p2pix.address], +// ["-100000000000000000000", price], +// ); +// expect(storage.remaining).to.eq(price); +// expect(storage.pixTarget).to.eq(pTarget); +// expect(storage.seller).to.eq(owner.address); +// expect(storage.token).to.eq(erc20.address); +// expect(storage.valid).to.eq(true); +// expect(allowList).to.eq(root); +// }); +// // edge case test +// it("should create multiple deposits", async () => { +// const ownerKey = await p2pix.callStatic._castAddrToKey( +// owner.address, +// ); +// const acc01Key = await p2pix.callStatic._castAddrToKey( +// acc01.address, +// ); +// const acc02Key = await p2pix.callStatic._castAddrToKey( +// acc02.address, +// ); +// const acc03Key = await p2pix.callStatic._castAddrToKey( +// acc03.address, +// ); + +// const pTarget = ethers.utils.keccak256( +// ethers.utils.toUtf8Bytes("_pixTarget"), +// ); +// const pTarget2 = ethers.utils.keccak256( +// ethers.utils.toUtf8Bytes("_pixTarget2"), +// ); +// const pTarget3 = ethers.utils.keccak256( +// ethers.utils.toUtf8Bytes("_pixTarget3"), +// ); +// // we mock the allowlist root here only to test storage update. In depth +// // allowlist test coverage in both "Lock" and "Allowlist Settings" unit tests. +// const root = ethers.utils.keccak256( +// ethers.utils.toUtf8Bytes("root"), +// ); +// const nullRoot = ethers.constants.HashZero; +// const price2 = price.mul(ethers.BigNumber.from(2)); +// const price3 = price.mul(ethers.BigNumber.from(3)); +// const price4 = price.mul(ethers.BigNumber.from(4)); +// await erc20.mint( +// getSignerAddrs(4, await ethers.getSigners()), +// price4, +// ); +// await erc20 +// .connect(owner) +// .approve(p2pix.address, price); +// await erc20 +// .connect(acc01) +// .approve(p2pix.address, price2); +// await erc20 +// .connect(acc02) +// .approve(p2pix.address, price3); +// await erc20 +// .connect(acc03) +// .approve(p2pix.address, price4); + +// const tx = await p2pix +// .connect(owner) +// .deposit(erc20.address, price, pTarget, root); +// const tx2 = await p2pix +// .connect(acc01) +// .deposit(erc20.address, price2, pTarget2, nullRoot); +// const tx3 = await p2pix +// .connect(acc02) +// .deposit(erc20.address, price3, pTarget3, root); +// const tx4 = await p2pix +// .connect(acc03) +// .deposit(erc20.address, price4, pTarget, nullRoot); + +// const storage1: Deposit = await p2pix.mapDeposits(0); +// const storage2: Deposit = await p2pix.mapDeposits(1); +// const storage3: Deposit = await p2pix.mapDeposits(2); +// const storage4: Deposit = await p2pix.mapDeposits(3); + +// const allowList1 = await p2pix.sellerAllowList( +// ownerKey, +// ); +// const allowList2 = await p2pix.sellerAllowList( +// acc01Key, +// ); +// const allowList3 = await p2pix.sellerAllowList( +// acc02Key, +// ); +// const allowList4 = await p2pix.sellerAllowList( +// acc03Key, +// ); + +// expect(tx).to.be.ok; +// expect(tx2).to.be.ok; +// expect(tx3).to.be.ok; +// expect(tx4).to.be.ok; + +// await expect(tx) +// .to.emit(p2pix, "DepositAdded") +// .withArgs(owner.address, 0, erc20.address, price); +// await expect(tx).to.changeTokenBalances( +// erc20, +// [owner.address, p2pix.address], +// ["-100000000000000000000", price], +// ); + +// await expect(tx2) +// .to.emit(p2pix, "DepositAdded") +// .withArgs(acc01.address, 1, erc20.address, price2); +// await expect(tx2).to.changeTokenBalances( +// erc20, +// [acc01.address, p2pix.address], +// ["-200000000000000000000", price2], +// ); + +// await expect(tx3) +// .to.emit(p2pix, "DepositAdded") +// .withArgs(acc02.address, 2, erc20.address, price3); +// await expect(tx3).to.changeTokenBalances( +// erc20, +// [acc02.address, p2pix.address], +// ["-300000000000000000000", price3], +// ); + +// await expect(tx4) +// .to.emit(p2pix, "DepositAdded") +// .withArgs(acc03.address, 3, erc20.address, price4); +// await expect(tx4).to.changeTokenBalances( +// erc20, +// [acc03.address, p2pix.address], +// ["-400000000000000000000", price4], +// ); + +// expect(storage1.remaining).to.eq(price); +// expect(storage1.pixTarget).to.eq(pTarget); +// expect(storage1.seller).to.eq(owner.address); +// expect(storage1.token).to.eq(erc20.address); +// expect(storage1.valid).to.eq(true); +// expect(allowList1).to.eq(root); + +// expect(storage2.remaining).to.eq(price2); +// expect(storage2.pixTarget).to.eq(pTarget2); +// expect(storage2.seller).to.eq(acc01.address); +// expect(storage2.token).to.eq(erc20.address); +// expect(storage2.valid).to.eq(true); +// expect(allowList2).to.eq(nullRoot); + +// expect(storage3.remaining).to.eq(price3); +// expect(storage3.pixTarget).to.eq(pTarget3); +// expect(storage3.seller).to.eq(acc02.address); +// expect(storage3.token).to.eq(erc20.address); +// expect(storage3.valid).to.eq(true); +// expect(allowList3).to.eq(root); + +// expect(storage4.remaining).to.eq(price4); +// expect(storage4.pixTarget).to.eq(pTarget); +// expect(storage4.seller).to.eq(acc03.address); +// expect(storage4.token).to.eq(erc20.address); +// expect(storage4.valid).to.eq(true); +// expect(allowList4).to.eq(nullRoot); +// }); +// }); +// describe("Lock", async () => { +// it("should revert if deposit is invalid", async () => { +// await erc20.approve(p2pix.address, price); +// await p2pix.deposit( +// erc20.address, +// price, +// "pixTarget", +// ethers.constants.HashZero, +// ); +// await p2pix.cancelDeposit(0); +// const fail = p2pix +// .connect(acc03) +// .lock( +// 0, +// acc02.address, +// acc03.address, +// 0, +// price, +// [], +// [], +// ); +// const fail2 = p2pix.lock( +// 2, +// zero, +// zero, +// 0, +// price, +// [], +// [], +// ); + +// await expect(fail).to.be.revertedWithCustomError( +// p2pix, +// P2PixErrors.InvalidDeposit, +// ); +// await expect(fail2).to.be.revertedWithCustomError( +// p2pix, +// P2PixErrors.InvalidDeposit, +// ); +// }); +// it("should revert if wished amount is greater than deposit's remaining amount", async () => { +// await erc20.approve(p2pix.address, price); +// await p2pix.deposit( +// erc20.address, +// price, +// "pixTarget", +// ethers.constants.HashZero, +// ); +// const fail = p2pix +// .connect(acc03) +// .lock( +// 0, +// acc02.address, +// acc03.address, +// 0, +// price.mul(ethers.BigNumber.from(2)), +// [], +// [], +// ); + +// await expect(fail).to.be.revertedWithCustomError( +// p2pix, +// P2PixErrors.NotEnoughTokens, +// ); +// }); +// it("should revert if a non expired lock has the same ID encoded", async () => { +// await erc20.approve(p2pix.address, price); +// await p2pix.deposit( +// erc20.address, +// price, +// "pixTarget", +// ethers.constants.HashZero, +// ); +// await p2pix +// .connect(acc03) +// .lock(0, acc02.address, acc03.address, 0, 1, [], []); +// const fail = p2pix +// .connect(acc03) +// .lock(0, acc02.address, acc03.address, 0, 1, [], []); + +// await expect(fail).to.be.revertedWithCustomError( +// p2pix, +// P2PixErrors.NotExpired, +// ); +// }); +// it("should revert if an invalid allowlist merkleproof is provided", async () => { +// await erc20.approve(p2pix.address, price); +// await p2pix.deposit( +// erc20.address, +// price, +// "pixTarget", +// merkleRoot, +// ); +// const fail = p2pix +// .connect(acc02) +// .lock( +// 0, +// acc02.address, +// acc03.address, +// 0, +// 1000, +// [ +// ethers.utils.keccak256( +// ethers.utils.toUtf8Bytes("wrong"), +// ), +// ], +// [], +// ); + +// await expect(fail).to.be.revertedWithCustomError( +// p2pix, +// P2PixErrors.AddressDenied, +// ); +// }); +// it("should revert if msg.sender does not have enough credit in his spend limit", async () => { +// await erc20.approve( +// p2pix.address, +// price.mul(BigNumber.from("3")), +// ); +// await p2pix.deposit( +// erc20.address, +// price.mul(BigNumber.from("3")), +// "pixTarget", +// merkleRoot, +// ); +// const fail = p2pix +// .connect(acc02) +// .lock( +// 0, +// acc02.address, +// acc03.address, +// 0, +// price.mul(BigNumber.from("2")), +// [], +// [], +// ); + +// await expect(fail).to.be.revertedWithCustomError( +// p2pix, +// P2PixErrors.AmountNotAllowed, +// ); +// }); +// it("should create a lock, update storage and emit events via the allowlist path", async () => { +// await erc20.approve(p2pix.address, price); +// await p2pix.deposit( +// erc20.address, +// price, +// "pixTarget", +// merkleRoot, +// ); +// const tx = 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], +// ); +// const storage: Lock = await p2pix.callStatic.mapLocks( +// lockID, +// ); + +// const rc: ContractReceipt = await tx.wait(); +// const expiration = rc.blockNumber + 10; + +// expect(tx).to.be.ok; +// expect(storage.depositID).to.eq(0); +// expect(storage.relayerPremium).to.eq( +// ethers.constants.Zero, +// ); +// expect(storage.amount).to.eq(price); +// expect(storage.expirationBlock).to.eq(expiration); +// expect(storage.buyerAddress).to.eq(acc02.address); +// expect(storage.relayerTarget).to.eq(acc03.address); +// expect(storage.relayerAddress).to.eq(acc01.address); +// await expect(tx) +// .to.emit(p2pix, "LockAdded") +// .withArgs( +// acc02.address, +// lockID, +// storage.depositID, +// storage.amount, +// ); +// }); +// it("should create a lock, update storage and emit events via the reputation path", async () => { +// const root = ethers.constants.HashZero; +// await erc20.approve(p2pix.address, price); +// await p2pix.deposit( +// erc20.address, +// price, +// "pixTarget", +// root, +// ); +// const tx = await p2pix +// .connect(acc01) +// .lock( +// 0, +// acc02.address, +// acc03.address, +// 0, +// price, +// [], +// [], +// ); +// const lockID = ethers.utils.solidityKeccak256( +// ["uint256", "uint256", "address"], +// [0, price, acc02.address], +// ); +// const storage: Lock = await p2pix.callStatic.mapLocks( +// lockID, +// ); + +// const rc: ContractReceipt = await tx.wait(); +// const expiration = rc.blockNumber + 10; + +// expect(tx).to.be.ok; +// expect(storage.depositID).to.eq(0); +// expect(storage.relayerPremium).to.eq( +// ethers.constants.Zero, +// ); +// expect(storage.amount).to.eq(price); +// expect(storage.expirationBlock).to.eq(expiration); +// expect(storage.buyerAddress).to.eq(acc02.address); +// expect(storage.relayerTarget).to.eq(acc03.address); +// expect(storage.relayerAddress).to.eq(acc01.address); +// await expect(tx) +// .to.emit(p2pix, "LockAdded") +// .withArgs( +// acc02.address, +// lockID, +// storage.depositID, +// storage.amount, +// ); +// }); +// // edge case test +// it("should create multiple locks", async () => { +// const newPrice = price.div(ethers.BigNumber.from(2)); +// await erc20.approve(p2pix.address, price); +// await p2pix.deposit( +// erc20.address, +// price, +// "pixTarget", +// merkleRoot, +// ); +// const tx1 = await p2pix +// .connect(acc01) +// .lock( +// 0, +// acc02.address, +// acc03.address, +// 0, +// newPrice, +// proof, +// [], +// ); +// const lockID1 = ethers.utils.solidityKeccak256( +// ["uint256", "uint256", "address"], +// [0, newPrice, acc02.address], +// ); +// const storage1: Lock = await p2pix.callStatic.mapLocks( +// lockID1, +// ); + +// const rc1: ContractReceipt = await tx1.wait(); +// const expiration1 = rc1.blockNumber + 10; + +// const tx2 = await p2pix +// .connect(acc01) +// .lock( +// 0, +// acc02.address, +// acc03.address, +// 0, +// 100, +// [], +// [], +// ); +// const lockID2 = ethers.utils.solidityKeccak256( +// ["uint256", "uint256", "address"], +// [0, 100, acc02.address], +// ); +// const storage2: Lock = await p2pix.callStatic.mapLocks( +// lockID2, +// ); + +// const rc2: ContractReceipt = await tx2.wait(); +// const expiration2 = rc2.blockNumber + 10; + +// const tx3 = await p2pix +// .connect(acc03) +// .lock( +// 0, +// acc03.address, +// acc03.address, +// 0, +// 100, +// [], +// [], +// ); +// const lockID3 = ethers.utils.solidityKeccak256( +// ["uint256", "uint256", "address"], +// [0, 100, acc03.address], +// ); +// const storage3: Lock = await p2pix.callStatic.mapLocks( +// lockID3, +// ); + +// const rc3: ContractReceipt = await tx3.wait(); +// const expiration3 = rc3.blockNumber + 10; + +// expect(tx1).to.be.ok; +// expect(tx2).to.be.ok; +// expect(tx3).to.be.ok; + +// expect(0) +// .to.eq(storage1.depositID) +// .and.to.eq(storage2.depositID) +// .and.to.eq(storage3.depositID); + +// expect(ethers.constants.Zero) +// .to.eq(storage1.relayerPremium) +// .and.to.eq(storage2.relayerPremium) +// .and.to.eq(storage3.relayerPremium); + +// expect(storage1.amount).to.eq(newPrice); +// expect(ethers.BigNumber.from(100)) +// .to.eq(storage2.amount) +// .and.to.eq(storage3.amount); + +// expect(storage1.expirationBlock).to.eq(expiration1); +// expect(storage2.expirationBlock).to.eq(expiration2); +// expect(storage3.expirationBlock).to.eq(expiration3); + +// expect(acc02.address) +// .to.eq(storage1.buyerAddress) +// .and.to.eq(storage2.buyerAddress); +// expect(storage3.buyerAddress).to.eq(acc03.address); + +// expect(acc03.address) +// .to.eq(storage1.relayerTarget) +// .and.to.eq(storage2.relayerTarget) +// .and.to.eq(storage3.relayerTarget); + +// expect(acc01.address) +// .to.eq(storage1.relayerAddress) +// .and.to.eq(storage2.relayerAddress); +// expect(storage3.relayerAddress).to.eq(acc03.address); + +// await expect(tx1) +// .to.emit(p2pix, "LockAdded") +// .withArgs( +// acc02.address, +// lockID1, +// storage1.depositID, +// storage1.amount, +// ); +// await expect(tx2) +// .to.emit(p2pix, "LockAdded") +// .withArgs( +// acc02.address, +// lockID2, +// storage2.depositID, +// storage2.amount, +// ); +// await expect(tx3) +// .to.emit(p2pix, "LockAdded") +// .withArgs( +// acc03.address, +// lockID3, +// storage3.depositID, +// storage3.amount, +// ); +// }); +// }); +// describe("Cancel Deposit", async () => { +// it("should revert if the msg.sender isn't the deposit's seller", async () => { +// await erc20.approve(p2pix.address, price); +// await p2pix.deposit( +// erc20.address, +// price, +// "pixTarget", +// merkleRoot, +// ); +// const fail = p2pix.connect(acc01).cancelDeposit(0); +// await expect(fail).to.be.revertedWithCustomError( +// p2pix, +// P2PixErrors.OnlySeller, +// ); +// }); +// it("should cancel deposit, update storage and emit events", async () => { +// await erc20.approve(p2pix.address, price); +// await p2pix.deposit( +// erc20.address, +// price, +// "pixTarget", +// merkleRoot, +// ); +// const state1: Deposit = +// await p2pix.callStatic.mapDeposits(0); +// const tx = await p2pix.cancelDeposit(0); +// const state2: Deposit = +// await p2pix.callStatic.mapDeposits(0); + +// expect(tx).to.be.ok; +// await expect(tx) +// .to.emit(p2pix, "DepositClosed") +// .withArgs(owner.address, 0); +// expect(state1.valid).to.be.true; +// expect(state2.valid).to.be.false; +// }); +// it("should cancel multiple deposits", async () => { +// await erc20.approve(p2pix.address, price); +// await p2pix.deposit( +// erc20.address, +// price, +// "pixTarget", +// ethers.constants.HashZero, +// ); +// await erc20.approve(p2pix.address, price); +// await p2pix.deposit( +// erc20.address, +// price, +// "pixTarget", +// ethers.constants.HashZero, +// ); +// await erc20.approve(p2pix.address, price); +// await p2pix.deposit( +// erc20.address, +// price, +// "pixTarget", +// ethers.constants.HashZero, +// ); +// const oldState1: Deposit = +// await p2pix.callStatic.mapDeposits(0); +// const oldState2: Deposit = +// await p2pix.callStatic.mapDeposits(1); +// const oldState3: Deposit = +// await p2pix.callStatic.mapDeposits(2); +// const tx1 = await p2pix.cancelDeposit(0); +// const tx2 = await p2pix.cancelDeposit(1); +// const tx3 = await p2pix.cancelDeposit(2); +// const newState1: Deposit = +// await p2pix.callStatic.mapDeposits(0); +// const newState2: Deposit = +// await p2pix.callStatic.mapDeposits(1); +// const newState3: Deposit = +// await p2pix.callStatic.mapDeposits(2); + +// expect(tx1).to.be.ok; +// expect(tx2).to.be.ok; +// expect(tx3).to.be.ok; +// await expect(tx1) +// .to.emit(p2pix, "DepositClosed") +// .withArgs(owner.address, 0); +// await expect(tx2) +// .to.emit(p2pix, "DepositClosed") +// .withArgs(owner.address, 1); +// await expect(tx3) +// .to.emit(p2pix, "DepositClosed") +// .withArgs(owner.address, 2); +// expect(oldState1.valid).to.be.true; +// expect(oldState2.valid).to.be.true; +// expect(oldState3.valid).to.be.true; +// expect(newState1.valid).to.be.false; +// expect(newState2.valid).to.be.false; +// expect(newState3.valid).to.be.false; +// }); +// }); +// describe("Release", async () => { +// it("should revert if lock has expired", async () => { +// const messageToSign = ethers.utils.solidityKeccak256( +// ["string", "uint256", "bytes32"], +// ["pixTarget", 100, ethers.constants.HashZero], +// ); +// const flatSig = await acc01.signMessage( +// ethers.utils.arrayify(messageToSign), +// ); +// const sig = ethers.utils.splitSignature(flatSig); +// await erc20.approve(p2pix.address, price); +// await p2pix.deposit( +// erc20.address, +// price, +// "pixTarget", +// merkleRoot, +// ); +// await p2pix +// .connect(acc03) +// .lock( +// 0, +// acc02.address, +// acc03.address, +// 6, +// 100, +// [], +// [], +// ); +// const lockID = ethers.utils.solidityKeccak256( +// ["uint256", "uint256", "address"], +// [0, 100, acc02.address], +// ); +// await mine(13); +// const fail = p2pix.release( +// lockID, +// acc03.address, +// ethers.constants.HashZero, +// sig.r, +// sig.s, +// sig.v, +// ); + +// await expect(fail).to.be.revertedWithCustomError( +// p2pix, +// P2PixErrors.LockExpired, +// ); +// }); +// it("should revert if lock has already been released", async () => { +// const messageToSign = ethers.utils.solidityKeccak256( +// ["string", "uint256", "bytes32"], +// ["pixTarget", 100, ethers.constants.HashZero], +// ); +// const flatSig = await acc01.signMessage( +// ethers.utils.arrayify(messageToSign), +// ); +// const sig = ethers.utils.splitSignature(flatSig); +// await erc20.approve(p2pix.address, price); +// await p2pix.deposit( +// erc20.address, +// price, +// "pixTarget", +// merkleRoot, +// ); +// await p2pix +// .connect(acc03) +// .lock( +// 0, +// acc02.address, +// acc03.address, +// 6, +// 100, +// [], +// [], +// ); +// const lockID = ethers.utils.solidityKeccak256( +// ["uint256", "uint256", "address"], +// [0, 100, acc02.address], +// ); +// await p2pix.release( +// lockID, +// acc03.address, +// ethers.constants.HashZero, +// sig.r, +// sig.s, +// sig.v, +// ); +// const fail = p2pix.release( +// lockID, +// acc03.address, +// ethers.constants.HashZero, +// sig.r, +// sig.s, +// sig.v, +// ); + +// await expect(fail).to.be.revertedWithCustomError( +// p2pix, +// P2PixErrors.AlreadyReleased, +// ); +// }); +// it("should revert if signed message has already been used", async () => { +// const messageToSign = ethers.utils.solidityKeccak256( +// ["string", "uint256", "bytes32"], +// ["pixTarget", 100, ethers.constants.HashZero], +// ); +// const flatSig = await owner.signMessage( +// ethers.utils.arrayify(messageToSign), +// ); +// const sig = ethers.utils.splitSignature(flatSig); +// await erc20.approve(p2pix.address, price); +// await p2pix.deposit( +// erc20.address, +// price, +// "pixTarget", +// ethers.constants.HashZero, +// ); +// await p2pix +// .connect(acc03) +// .lock( +// 0, +// acc02.address, +// acc03.address, +// 6, +// 100, +// [], +// [], +// ); +// const lockID = ethers.utils.solidityKeccak256( +// ["uint256", "uint256", "address"], +// [0, 100, acc02.address], +// ); +// await p2pix +// .connect(acc01) +// .release( +// lockID, +// acc02.address, +// ethers.constants.HashZero, +// sig.r, +// sig.s, +// sig.v, +// ); +// await p2pix +// .connect(acc03) +// .lock( +// 0, +// acc02.address, +// acc03.address, +// 6, +// 100, +// [], +// [], +// ); +// const lockID2 = ethers.utils.solidityKeccak256( +// ["uint256", "uint256", "address"], +// [0, 100, acc02.address], +// ); +// const fail = p2pix +// .connect(acc01) +// .release( +// lockID2, +// acc02.address, +// ethers.constants.HashZero, +// sig.r, +// sig.s, +// sig.v, +// ); + +// await expect(fail).to.be.revertedWithCustomError( +// p2pix, +// P2PixErrors.TxAlreadyUsed, +// ); +// }); +// it("should revert if ecrecovered signer is invalid", async () => { +// const messageToSign = ethers.utils.solidityKeccak256( +// ["string", "uint256", "bytes32"], +// ["pixTarget", 100, ethers.constants.HashZero], +// ); +// const flatSig = await acc03.signMessage( +// ethers.utils.arrayify(messageToSign), +// ); +// const sig = ethers.utils.splitSignature(flatSig); + +// await erc20.approve(p2pix.address, price); +// await p2pix.deposit( +// erc20.address, +// price, +// "pixTarget", +// ethers.constants.HashZero, +// ); +// await p2pix +// .connect(acc03) +// .lock( +// 0, +// acc02.address, +// acc03.address, +// 6, +// 100, +// [], +// [], +// ); +// const lockID = ethers.utils.solidityKeccak256( +// ["uint256", "uint256", "address"], +// [0, 100, acc02.address], +// ); +// const fail = p2pix +// .connect(acc01) +// .release( +// lockID, +// acc02.address, +// ethers.constants.HashZero, +// sig.r, +// sig.s, +// sig.v, +// ); + +// await expect(fail).to.be.revertedWithCustomError( +// p2pix, +// P2PixErrors.InvalidSigner, +// ); +// }); +// it("should release lock, update storage and emit events", async () => { +// const endtoendID = ethers.constants.HashZero; +// const pixTarget = "pixTarget"; +// const messageToSign = ethers.utils.solidityKeccak256( +// ["string", "uint256", "bytes32"], +// [pixTarget, 100, endtoendID], +// ); +// // Note: messageToSign is a string, that is 66-bytes long, to sign the +// // binary value, we must convert it to the 32 byte Array that +// // the string represents +// // +// // i.e., +// // 66-byte string +// // "0x592fa743889fc7f92ac2a37bb1f5ba1daf2a5c84741ca0e0061d243a2e6707ba" +// // ... vs ... +// // 32 entry Uint8Array +// // [ 89, 47, 167, 67, 136, 159, ... 103, 7, 186] +// 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(acc03) +// .lock( +// 0, +// acc02.address, +// acc03.address, +// 6, +// 100, +// [], +// [], +// ); +// const lockID = ethers.utils.solidityKeccak256( +// ["uint256", "uint256", "address"], +// [0, 100, acc02.address], +// ); +// const acc01Key = await p2pix.callStatic._castAddrToKey( +// acc01.address, +// ); +// const acc03Key = await p2pix.callStatic._castAddrToKey( +// acc03.address, +// ); +// const userRecordA = await p2pix.callStatic.userRecord( +// acc01Key, +// ); +// const userRecord1 = await p2pix.callStatic.userRecord( +// acc03Key, +// ); +// const storage1: Lock = await p2pix.callStatic.mapLocks( +// lockID, +// ); +// const tx = await p2pix +// .connect(acc01) +// .release( +// lockID, +// acc02.address, +// endtoendID, +// sig.r, +// sig.s, +// sig.v, +// ); +// const storage2: Lock = await p2pix.callStatic.mapLocks( +// lockID, +// ); +// const userRecordB = await p2pix.callStatic.userRecord( +// acc01Key, +// ); +// const userRecord2 = await p2pix.callStatic.userRecord( +// acc03Key, +// ); +// const used = await p2pix.callStatic.usedTransactions( +// messageHashBytes, +// ); +// expect(tx).to.be.ok; +// await expect(tx) +// .to.emit(p2pix, "LockReleased") +// .withArgs(acc02.address, lockID); +// expect(storage1.expirationBlock).to.eq( +// ethers.BigNumber.from(16), +// ); +// expect(storage1.amount).to.eq( +// ethers.BigNumber.from(100), +// ); +// expect(storage2.expirationBlock).to.eq( +// ethers.BigNumber.from(0), +// ); +// expect(storage2.amount).to.eq(ethers.BigNumber.from(0)); +// expect(used).to.eq(true); +// expect(userRecordA).to.eq(ethers.constants.Zero); +// expect(userRecord1).to.eq(ethers.constants.Zero); +// expect(userRecordB).to.eq(ethers.BigNumber.from(6)); +// expect(userRecord2).to.eq(ethers.BigNumber.from(100)); +// await expect(tx).to.changeTokenBalances( +// erc20, +// [acc03.address, acc02.address], +// [3, 97], +// // acc02 is acting both as buyer and relayerTarget +// // (i.e., 94 + 3 = 97) +// ); +// }); +// // edge case test +// it("should release multiple locks", async () => { +// const endtoendID = ethers.constants.HashZero; +// const pixTarget = "pixTarget"; +// const root = ethers.constants.HashZero; +// const acc01Key = await p2pix.callStatic._castAddrToKey( +// acc01.address, +// ); +// const acc03Key = await p2pix.callStatic._castAddrToKey( +// acc03.address, +// ); +// const acc01Record1 = await p2pix.callStatic.userRecord( +// acc01Key, +// ); +// const acc03Record1 = await p2pix.callStatic.userRecord( +// acc03Key, +// ); +// const messageToSign1 = ethers.utils.solidityKeccak256( +// ["string", "uint256", "bytes32"], +// [pixTarget, 100, endtoendID], +// ); +// const flatSig1 = await owner.signMessage( +// ethers.utils.arrayify(messageToSign1), +// ); +// const sig1 = ethers.utils.splitSignature(flatSig1); +// const messageToSign2 = ethers.utils.solidityKeccak256( +// ["string", "uint256", "bytes32"], +// [pixTarget, 50, endtoendID], +// ); +// const flatSig2 = await owner.signMessage( +// ethers.utils.arrayify(messageToSign2), +// ); +// const sig2 = ethers.utils.splitSignature(flatSig2); +// const messageToSign3 = ethers.utils.solidityKeccak256( +// ["string", "uint256", "bytes32"], +// [pixTarget, 25, endtoendID], +// ); +// const flatSig3 = await owner.signMessage( +// ethers.utils.arrayify(messageToSign3), +// ); +// const sig3 = ethers.utils.splitSignature(flatSig3); +// await erc20.approve(p2pix.address, price); +// await p2pix.deposit( +// erc20.address, +// price, +// pixTarget, +// root, +// ); +// await p2pix +// .connect(acc03) +// .lock( +// 0, +// acc02.address, +// acc03.address, +// 0, +// 100, +// [], +// [], +// ); +// await p2pix +// .connect(acc03) +// .lock(0, acc02.address, acc03.address, 6, 50, [], []); +// await p2pix +// .connect(acc03) +// .lock( +// 0, +// acc02.address, +// acc03.address, +// 10, +// 25, +// [], +// [], +// ); +// const lockID = ethers.utils.solidityKeccak256( +// ["uint256", "uint256", "address"], +// [0, 100, acc02.address], +// ); +// const lockID2 = ethers.utils.solidityKeccak256( +// ["uint256", "uint256", "address"], +// [0, 50, acc02.address], +// ); +// const lockID3 = ethers.utils.solidityKeccak256( +// ["uint256", "uint256", "address"], +// [0, 25, acc02.address], +// ); +// // relayerPremium == 0 +// const tx = await p2pix +// .connect(acc01) +// .release( +// lockID, +// acc02.address, +// endtoendID, +// sig1.r, +// sig1.s, +// sig1.v, +// ); +// // relayerPremium != 0 && +// // lock's msg.sender != release's msg.sender +// const tx1 = await p2pix +// .connect(acc01) +// .release( +// lockID2, +// acc02.address, +// endtoendID, +// sig2.r, +// sig2.s, +// sig2.v, +// ); +// // relayerPremium != 0 && +// // lock's msg.sender == release's msg.sender +// const tx2 = await p2pix +// .connect(acc03) +// .release( +// lockID3, +// acc02.address, +// endtoendID, +// sig3.r, +// sig3.s, +// sig3.v, +// ); +// const used1 = await p2pix.callStatic.usedTransactions( +// ethers.utils.arrayify(messageToSign1), +// ); +// const used2 = await p2pix.callStatic.usedTransactions( +// ethers.utils.arrayify(messageToSign2), +// ); +// const used3 = await p2pix.callStatic.usedTransactions( +// ethers.utils.arrayify(messageToSign3), +// ); +// const acc01Record2 = await p2pix.callStatic.userRecord( +// acc01Key, +// ); +// const acc03Record2 = await p2pix.callStatic.userRecord( +// acc03Key, +// ); + +// expect(tx).to.be.ok; +// expect(tx1).to.be.ok; +// expect(tx2).to.be.ok; +// await expect(tx) +// .to.emit(p2pix, "LockReleased") +// .withArgs(acc02.address, lockID); +// await expect(tx1) +// .to.emit(p2pix, "LockReleased") +// .withArgs(acc02.address, lockID2); +// await expect(tx2) +// .to.emit(p2pix, "LockReleased") +// .withArgs(acc02.address, lockID3); +// expect(used1).to.eq(true); +// expect(used2).to.eq(true); +// expect(used3).to.eq(true); +// expect(0).to.eq(acc01Record1).and.to.eq(acc03Record1); +// expect(acc01Record2).to.eq(6); // 0 + 6 +// expect(acc03Record2).to.eq(185); // 100 + 50 + 25 + 10 +// await expect(tx).to.changeTokenBalances( +// erc20, +// [ +// acc01.address, +// acc02.address, +// acc03.address, +// p2pix.address, +// ], +// [0, 100, 0, "-100"], +// ); +// await expect(tx1).to.changeTokenBalances( +// erc20, +// [ +// acc01.address, +// acc02.address, +// acc03.address, +// p2pix.address, +// ], +// [0, 47, 3, "-50"], +// ); +// await expect(tx2).to.changeTokenBalances( +// erc20, +// [ +// acc01.address, +// acc02.address, +// acc03.address, +// p2pix.address, +// ], +// [0, 20, 5, "-25"], +// ); +// }); +// }); +// describe("Unexpire Locks", async () => { +// it("should revert if lock isn't expired", async () => { +// 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], +// ); +// const fail = p2pix.unlockExpired([lockID]); + +// await expect(fail).to.be.revertedWithCustomError( +// p2pix, +// P2PixErrors.NotExpired, +// ); +// }); +// it("should revert if lock has already been released", async () => { +// const endtoendID = ethers.constants.HashZero; +// const pixTarget = "pixTarget"; +// const messageToSign = ethers.utils.solidityKeccak256( +// ["string", "uint256", "bytes32"], +// [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 () => { +// 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(price); +// }); +// 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 () => { +// it("should revert if the msg.sender isn't the deposit's seller", async () => { +// await erc20.approve(p2pix.address, price); +// await p2pix.deposit( +// erc20.address, +// price, +// "pixTarget", +// merkleRoot, +// ); +// const fail = p2pix.connect(acc02).withdraw(0, []); + +// await expect(fail).to.be.revertedWithCustomError( +// p2pix, +// P2PixErrors.OnlySeller, +// ); +// }); +// it("should withdraw remaining funds from deposit, update storage and emit event", async () => { +// await erc20.approve(p2pix.address, price); +// const dep = await p2pix.deposit( +// erc20.address, +// price, +// "pixTarget", +// merkleRoot, +// ); +// const tx = await p2pix.withdraw(0, []); + +// expect(tx).to.be.ok; +// await expect(dep) +// .to.changeTokenBalance( +// erc20, +// owner.address, +// "-100000000000000000000", +// ) +// .and.to.changeTokenBalance( +// erc20, +// p2pix.address, +// price, +// ); +// await expect(tx) +// .to.changeTokenBalance(erc20, owner.address, price) +// .and.to.changeTokenBalance( +// erc20, +// p2pix.address, +// "-100000000000000000000", +// ); + +// await expect(tx) +// .to.emit(p2pix, "DepositWithdrawn") +// .withArgs(owner.address, 0, price); +// }); +// }); +// describe("Allowlist Settings", async () => { +// 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); + +// 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, +// ); + +// expect(tx).to.be.ok; +// await expect(tx) +// .to.emit(p2pix, "RootUpdated") +// .withArgs(owner.address, merkleRoot); +// expect(oldState).to.eq(ethers.constants.HashZero); +// expect(newState).to.eq(merkleRoot); +// }); +// }); +// });