diff --git a/src/utils/blockchain.ts b/src/utils/blockchain.ts index 945f33e..8a8239a 100644 --- a/src/utils/blockchain.ts +++ b/src/utils/blockchain.ts @@ -178,7 +178,9 @@ const updateDepositAddedEvents = async () => { const filterDeposits = p2pContract.filters.DepositAdded(null); const eventsDeposits = await p2pContract.queryFilter(filterDeposits); + etherStore.setDepositsAddedList(eventsDeposits); + console.log("DEPOSITS", eventsDeposits); }; const updateLockAddedEvents = async () => { @@ -196,6 +198,7 @@ const updateLockAddedEvents = async () => { const filterLocks = p2pContract.filters.LockAdded(null); const eventsLocks = await p2pContract.queryFilter(filterLocks); etherStore.setLocksAddedList(eventsLocks); + console.log("LOCKS", eventsLocks); }; const updateLockReleasedEvents = async () => { @@ -210,9 +213,10 @@ const updateLockReleasedEvents = async () => { const signer = provider.getSigner(); const p2pContract = new ethers.Contract(addresses.p2pix, p2pix.abi, signer); - const filterLocks = p2pContract.filters.LockReleased(null); - const eventsLocks = await p2pContract.queryFilter(filterLocks); - etherStore.setLocksReleasedList(eventsLocks); + const filterReleases = p2pContract.filters.LockReleased(null); + const eventsReleases = await p2pContract.queryFilter(filterReleases); + etherStore.setLocksReleasedList(eventsReleases); + console.log("RELEASES", eventsReleases); }; // Provider methods @@ -272,7 +276,8 @@ const addDeposit = async (tokenQty: Number, pixKey: String) => { const deposit = await p2pContract.deposit( addresses.token, formatEther(String(tokenQty)), - pixKey + pixKey, + ethers.utils.formatBytes32String("") ); await deposit.wait(); @@ -304,7 +309,8 @@ const mockDeposit = async (tokenQty: Number, pixKey: String) => { const deposit = await p2pContract.deposit( addresses.token, formatEther(String(tokenQty)), - pixKey + pixKey, + ethers.utils.formatBytes32String("") ); await deposit.wait(); @@ -344,6 +350,7 @@ const addLock = async (depositId: BigNumber, amount: Number) => { ethers.constants.AddressZero, // String "0x0000000000000000000000000000000000000000" 0, formatEther(String(amount)), // BigNumber + [], [] ); lock.wait(); @@ -384,8 +391,12 @@ const releaseLock = async ( ); const messageToSign = ethers.utils.solidityKeccak256( - ["string", "uint256", "uint256"], - [pixKey, formatEther(String(amount)), formatEther(e2eId)] + ["string", "uint256", "bytes32"], + [ + pixKey, + formatEther(String(amount)), + ethers.utils.formatBytes32String(e2eId), + ] ); const messageHashBytes = ethers.utils.arrayify(messageToSign); @@ -397,7 +408,8 @@ const releaseLock = async ( const release = await p2pContract.release( lockId, - formatEther(e2eId), + ethers.constants.AddressZero, + ethers.utils.formatBytes32String(e2eId), sig.r, sig.s, sig.v diff --git a/src/utils/smart_contract_files/MockToken.json b/src/utils/smart_contract_files/MockToken.json index 52181f5..c3da5c1 100644 --- a/src/utils/smart_contract_files/MockToken.json +++ b/src/utils/smart_contract_files/MockToken.json @@ -157,6 +157,24 @@ "stateMutability": "view", "type": "function" }, + { + "inputs": [ + { + "internalType": "address[]", + "name": "to", + "type": "address[]" + }, + { + "internalType": "uint256", + "name": "value", + "type": "uint256" + } + ], + "name": "mint", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, { "inputs": [], "name": "name", @@ -312,8 +330,8 @@ "type": "function" } ], - "bytecode": "0x60e06040523480156200001157600080fd5b5060405162000e5138038062000e51833981016040819052620000349162000279565b6040805180820182526007815266135bd8dad0949360ca1b6020808301918252835180850190945260048452631350949360e21b908401528151919291601291620000839160009190620001d3565b50815162000099906001906020850190620001d3565b5060ff81166080524660a052620000af620000ca565b60c05250620000c391503390508262000166565b506200039b565b60007f8b73c3c69bb8fe3d512ecc4cf759cc79239f7b179b0ffacaa9a75d522b39400f6000604051620000fe9190620002d0565b6040805191829003822060208301939093528101919091527fc89efdaa54c0f20c7adf612882df0950f5a951637e0307cdcb4c672f298b8bc660608201524660808201523060a082015260c00160405160208183030381529060405280519060200120905090565b80600260008282546200017a919062000374565b90915550506001600160a01b0382166000818152600360209081526040808320805486019055518481527fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef910160405180910390a35050565b828054620001e19062000293565b90600052602060002090601f01602090048101928262000205576000855562000250565b82601f106200022057805160ff191683800117855562000250565b8280016001018555821562000250579182015b828111156200025057825182559160200191906001019062000233565b506200025e92915062000262565b5090565b5b808211156200025e576000815560010162000263565b6000602082840312156200028c57600080fd5b5051919050565b600181811c90821680620002a857607f821691505b60208210811415620002ca57634e487b7160e01b600052602260045260246000fd5b50919050565b600080835481600182811c915080831680620002ed57607f831692505b60208084108214156200030e57634e487b7160e01b86526022600452602486fd5b818015620003255760018114620003375762000366565b60ff1986168952848901965062000366565b60008a81526020902060005b868110156200035e5781548b82015290850190830162000343565b505084890196505b509498975050505050505050565b600082198211156200039657634e487b7160e01b600052601160045260246000fd5b500190565b60805160a05160c051610a86620003cb600039600061044501526000610410015260006101490152610a866000f3fe608060405234801561001057600080fd5b50600436106100d45760003560e01c806370a0823111610081578063a9059cbb1161005b578063a9059cbb146101cd578063d505accf146101e0578063dd62ed3e146101f557600080fd5b806370a08231146101855780637ecebe00146101a557806395d89b41146101c557600080fd5b806323b872dd116100b257806323b872dd14610131578063313ce567146101445780633644e5151461017d57600080fd5b806306fdde03146100d9578063095ea7b3146100f757806318160ddd1461011a575b600080fd5b6100e1610220565b6040516100ee91906107de565b60405180910390f35b61010a61010536600461084f565b6102ae565b60405190151581526020016100ee565b61012360025481565b6040519081526020016100ee565b61010a61013f366004610879565b61031a565b61016b7f000000000000000000000000000000000000000000000000000000000000000081565b60405160ff90911681526020016100ee565b61012361040c565b6101236101933660046108b5565b60036020526000908152604090205481565b6101236101b33660046108b5565b60056020526000908152604090205481565b6100e1610467565b61010a6101db36600461084f565b610474565b6101f36101ee3660046108d7565b6104ec565b005b61012361020336600461094a565b600460209081526000928352604080842090915290825290205481565b6000805461022d9061097d565b80601f01602080910402602001604051908101604052809291908181526020018280546102599061097d565b80156102a65780601f1061027b576101008083540402835291602001916102a6565b820191906000526020600020905b81548152906001019060200180831161028957829003601f168201915b505050505081565b3360008181526004602090815260408083206001600160a01b038716808552925280832085905551919290917f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925906103099086815260200190565b60405180910390a350600192915050565b6001600160a01b038316600090815260046020908152604080832033845290915281205460001981146103765761035183826109b8565b6001600160a01b03861660009081526004602090815260408083203384529091529020555b6001600160a01b0385166000908152600360205260408120805485929061039e9084906109b8565b90915550506001600160a01b03808516600081815260036020526040908190208054870190555190918716907fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef906103f99087815260200190565b60405180910390a3506001949350505050565b60007f000000000000000000000000000000000000000000000000000000000000000046146104425761043d610744565b905090565b507f000000000000000000000000000000000000000000000000000000000000000090565b6001805461022d9061097d565b336000908152600360205260408120805483919083906104959084906109b8565b90915550506001600160a01b038316600081815260036020526040908190208054850190555133907fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef906103099086815260200190565b428410156105415760405162461bcd60e51b815260206004820152601760248201527f5045524d49545f444541444c494e455f4558504952454400000000000000000060448201526064015b60405180910390fd5b6000600161054d61040c565b6001600160a01b038a811660008181526005602090815260409182902080546001810190915582517f6e71edae12b1b97f4d1f60370fef10105fa2faae0126114a169c64845d6126c98184015280840194909452938d166060840152608083018c905260a083019390935260c08083018b90528151808403909101815260e08301909152805192019190912061190160f01b6101008301526101028201929092526101228101919091526101420160408051601f198184030181528282528051602091820120600084529083018083525260ff871690820152606081018590526080810184905260a0016020604051602081039080840390855afa158015610659573d6000803e3d6000fd5b5050604051601f1901519150506001600160a01b0381161580159061068f5750876001600160a01b0316816001600160a01b0316145b6106db5760405162461bcd60e51b815260206004820152600e60248201527f494e56414c49445f5349474e45520000000000000000000000000000000000006044820152606401610538565b6001600160a01b0390811660009081526004602090815260408083208a8516808552908352928190208990555188815291928a16917f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925910160405180910390a350505050505050565b60007f8b73c3c69bb8fe3d512ecc4cf759cc79239f7b179b0ffacaa9a75d522b39400f600060405161077691906109dd565b6040805191829003822060208301939093528101919091527fc89efdaa54c0f20c7adf612882df0950f5a951637e0307cdcb4c672f298b8bc660608201524660808201523060a082015260c00160405160208183030381529060405280519060200120905090565b600060208083528351808285015260005b8181101561080b578581018301518582016040015282016107ef565b8181111561081d576000604083870101525b50601f01601f1916929092016040019392505050565b80356001600160a01b038116811461084a57600080fd5b919050565b6000806040838503121561086257600080fd5b61086b83610833565b946020939093013593505050565b60008060006060848603121561088e57600080fd5b61089784610833565b92506108a560208501610833565b9150604084013590509250925092565b6000602082840312156108c757600080fd5b6108d082610833565b9392505050565b600080600080600080600060e0888a0312156108f257600080fd5b6108fb88610833565b965061090960208901610833565b95506040880135945060608801359350608088013560ff8116811461092d57600080fd5b9699959850939692959460a0840135945060c09093013592915050565b6000806040838503121561095d57600080fd5b61096683610833565b915061097460208401610833565b90509250929050565b600181811c9082168061099157607f821691505b602082108114156109b257634e487b7160e01b600052602260045260246000fd5b50919050565b6000828210156109d857634e487b7160e01b600052601160045260246000fd5b500390565b600080835481600182811c9150808316806109f957607f831692505b6020808410821415610a1957634e487b7160e01b86526022600452602486fd5b818015610a2d5760018114610a3e57610a6b565b60ff19861689528489019650610a6b565b60008a81526020902060005b86811015610a635781548b820152908501908301610a4a565b505084890196505b50949897505050505050505056fea164736f6c6343000809000a", - "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100d45760003560e01c806370a0823111610081578063a9059cbb1161005b578063a9059cbb146101cd578063d505accf146101e0578063dd62ed3e146101f557600080fd5b806370a08231146101855780637ecebe00146101a557806395d89b41146101c557600080fd5b806323b872dd116100b257806323b872dd14610131578063313ce567146101445780633644e5151461017d57600080fd5b806306fdde03146100d9578063095ea7b3146100f757806318160ddd1461011a575b600080fd5b6100e1610220565b6040516100ee91906107de565b60405180910390f35b61010a61010536600461084f565b6102ae565b60405190151581526020016100ee565b61012360025481565b6040519081526020016100ee565b61010a61013f366004610879565b61031a565b61016b7f000000000000000000000000000000000000000000000000000000000000000081565b60405160ff90911681526020016100ee565b61012361040c565b6101236101933660046108b5565b60036020526000908152604090205481565b6101236101b33660046108b5565b60056020526000908152604090205481565b6100e1610467565b61010a6101db36600461084f565b610474565b6101f36101ee3660046108d7565b6104ec565b005b61012361020336600461094a565b600460209081526000928352604080842090915290825290205481565b6000805461022d9061097d565b80601f01602080910402602001604051908101604052809291908181526020018280546102599061097d565b80156102a65780601f1061027b576101008083540402835291602001916102a6565b820191906000526020600020905b81548152906001019060200180831161028957829003601f168201915b505050505081565b3360008181526004602090815260408083206001600160a01b038716808552925280832085905551919290917f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925906103099086815260200190565b60405180910390a350600192915050565b6001600160a01b038316600090815260046020908152604080832033845290915281205460001981146103765761035183826109b8565b6001600160a01b03861660009081526004602090815260408083203384529091529020555b6001600160a01b0385166000908152600360205260408120805485929061039e9084906109b8565b90915550506001600160a01b03808516600081815260036020526040908190208054870190555190918716907fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef906103f99087815260200190565b60405180910390a3506001949350505050565b60007f000000000000000000000000000000000000000000000000000000000000000046146104425761043d610744565b905090565b507f000000000000000000000000000000000000000000000000000000000000000090565b6001805461022d9061097d565b336000908152600360205260408120805483919083906104959084906109b8565b90915550506001600160a01b038316600081815260036020526040908190208054850190555133907fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef906103099086815260200190565b428410156105415760405162461bcd60e51b815260206004820152601760248201527f5045524d49545f444541444c494e455f4558504952454400000000000000000060448201526064015b60405180910390fd5b6000600161054d61040c565b6001600160a01b038a811660008181526005602090815260409182902080546001810190915582517f6e71edae12b1b97f4d1f60370fef10105fa2faae0126114a169c64845d6126c98184015280840194909452938d166060840152608083018c905260a083019390935260c08083018b90528151808403909101815260e08301909152805192019190912061190160f01b6101008301526101028201929092526101228101919091526101420160408051601f198184030181528282528051602091820120600084529083018083525260ff871690820152606081018590526080810184905260a0016020604051602081039080840390855afa158015610659573d6000803e3d6000fd5b5050604051601f1901519150506001600160a01b0381161580159061068f5750876001600160a01b0316816001600160a01b0316145b6106db5760405162461bcd60e51b815260206004820152600e60248201527f494e56414c49445f5349474e45520000000000000000000000000000000000006044820152606401610538565b6001600160a01b0390811660009081526004602090815260408083208a8516808552908352928190208990555188815291928a16917f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925910160405180910390a350505050505050565b60007f8b73c3c69bb8fe3d512ecc4cf759cc79239f7b179b0ffacaa9a75d522b39400f600060405161077691906109dd565b6040805191829003822060208301939093528101919091527fc89efdaa54c0f20c7adf612882df0950f5a951637e0307cdcb4c672f298b8bc660608201524660808201523060a082015260c00160405160208183030381529060405280519060200120905090565b600060208083528351808285015260005b8181101561080b578581018301518582016040015282016107ef565b8181111561081d576000604083870101525b50601f01601f1916929092016040019392505050565b80356001600160a01b038116811461084a57600080fd5b919050565b6000806040838503121561086257600080fd5b61086b83610833565b946020939093013593505050565b60008060006060848603121561088e57600080fd5b61089784610833565b92506108a560208501610833565b9150604084013590509250925092565b6000602082840312156108c757600080fd5b6108d082610833565b9392505050565b600080600080600080600060e0888a0312156108f257600080fd5b6108fb88610833565b965061090960208901610833565b95506040880135945060608801359350608088013560ff8116811461092d57600080fd5b9699959850939692959460a0840135945060c09093013592915050565b6000806040838503121561095d57600080fd5b61096683610833565b915061097460208401610833565b90509250929050565b600181811c9082168061099157607f821691505b602082108114156109b257634e487b7160e01b600052602260045260246000fd5b50919050565b6000828210156109d857634e487b7160e01b600052601160045260246000fd5b500390565b600080835481600182811c9150808316806109f957607f831692505b6020808410821415610a1957634e487b7160e01b86526022600452602486fd5b818015610a2d5760018114610a3e57610a6b565b60ff19861689528489019650610a6b565b60008a81526020902060005b86811015610a635781548b820152908501908301610a4a565b505084890196505b50949897505050505050505056fea164736f6c6343000809000a", + "bytecode": "0x60e06040523480156200001157600080fd5b506040516200105238038062001052833981016040819052620000349162000279565b6040805180820182526007815266135bd8dad0949360ca1b6020808301918252835180850190945260048452631350949360e21b908401528151919291601291620000839160009190620001d3565b50815162000099906001906020850190620001d3565b5060ff81166080524660a052620000af620000ca565b60c05250620000c391503390508262000166565b506200039b565b60007f8b73c3c69bb8fe3d512ecc4cf759cc79239f7b179b0ffacaa9a75d522b39400f6000604051620000fe9190620002d0565b6040805191829003822060208301939093528101919091527fc89efdaa54c0f20c7adf612882df0950f5a951637e0307cdcb4c672f298b8bc660608201524660808201523060a082015260c00160405160208183030381529060405280519060200120905090565b80600260008282546200017a919062000374565b90915550506001600160a01b0382166000818152600360209081526040808320805486019055518481527fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef910160405180910390a35050565b828054620001e19062000293565b90600052602060002090601f01602090048101928262000205576000855562000250565b82601f106200022057805160ff191683800117855562000250565b8280016001018555821562000250579182015b828111156200025057825182559160200191906001019062000233565b506200025e92915062000262565b5090565b5b808211156200025e576000815560010162000263565b6000602082840312156200028c57600080fd5b5051919050565b600181811c90821680620002a857607f821691505b60208210811415620002ca57634e487b7160e01b600052602260045260246000fd5b50919050565b600080835481600182811c915080831680620002ed57607f831692505b60208084108214156200030e57634e487b7160e01b86526022600452602486fd5b818015620003255760018114620003375762000366565b60ff1986168952848901965062000366565b60008a81526020902060005b868110156200035e5781548b82015290850190830162000343565b505084890196505b509498975050505050505050565b600082198211156200039657634e487b7160e01b600052601160045260246000fd5b500190565b60805160a05160c051610c87620003cb60003960006104630152600061042e015260006101540152610c876000f3fe608060405234801561001057600080fd5b50600436106100df5760003560e01c806370a082311161008c578063a9059cbb11610066578063a9059cbb146101d8578063d505accf146101eb578063dd62ed3e14610200578063ea66696c1461022b57600080fd5b806370a08231146101905780637ecebe00146101b057806395d89b41146101d057600080fd5b806323b872dd116100bd57806323b872dd1461013c578063313ce5671461014f5780633644e5151461018857600080fd5b806306fdde03146100e4578063095ea7b31461010257806318160ddd14610125575b600080fd5b6100ec61023e565b6040516100f991906108ad565b60405180910390f35b61011561011036600461091e565b6102cc565b60405190151581526020016100f9565b61012e60025481565b6040519081526020016100f9565b61011561014a366004610948565b610338565b6101767f000000000000000000000000000000000000000000000000000000000000000081565b60405160ff90911681526020016100f9565b61012e61042a565b61012e61019e366004610984565b60036020526000908152604090205481565b61012e6101be366004610984565b60056020526000908152604090205481565b6100ec610485565b6101156101e636600461091e565b610492565b6101fe6101f93660046109a6565b61050a565b005b61012e61020e366004610a19565b600460209081526000928352604080842090915290825290205481565b6101fe610239366004610a62565b610762565b6000805461024b90610b2d565b80601f016020809104026020016040519081016040528092919081815260200182805461027790610b2d565b80156102c45780601f10610299576101008083540402835291602001916102c4565b820191906000526020600020905b8154815290600101906020018083116102a757829003601f168201915b505050505081565b3360008181526004602090815260408083206001600160a01b038716808552925280832085905551919290917f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925906103279086815260200190565b60405180910390a350600192915050565b6001600160a01b038316600090815260046020908152604080832033845290915281205460001981146103945761036f8382610b7e565b6001600160a01b03861660009081526004602090815260408083203384529091529020555b6001600160a01b038516600090815260036020526040812080548592906103bc908490610b7e565b90915550506001600160a01b03808516600081815260036020526040908190208054870190555190918716907fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef906104179087815260200190565b60405180910390a3506001949350505050565b60007f000000000000000000000000000000000000000000000000000000000000000046146104605761045b6107a8565b905090565b507f000000000000000000000000000000000000000000000000000000000000000090565b6001805461024b90610b2d565b336000908152600360205260408120805483919083906104b3908490610b7e565b90915550506001600160a01b038316600081815260036020526040908190208054850190555133907fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef906103279086815260200190565b4284101561055f5760405162461bcd60e51b815260206004820152601760248201527f5045524d49545f444541444c494e455f4558504952454400000000000000000060448201526064015b60405180910390fd5b6000600161056b61042a565b6001600160a01b038a811660008181526005602090815260409182902080546001810190915582517f6e71edae12b1b97f4d1f60370fef10105fa2faae0126114a169c64845d6126c98184015280840194909452938d166060840152608083018c905260a083019390935260c08083018b90528151808403909101815260e08301909152805192019190912061190160f01b6101008301526101028201929092526101228101919091526101420160408051601f198184030181528282528051602091820120600084529083018083525260ff871690820152606081018590526080810184905260a0016020604051602081039080840390855afa158015610677573d6000803e3d6000fd5b5050604051601f1901519150506001600160a01b038116158015906106ad5750876001600160a01b0316816001600160a01b0316145b6106f95760405162461bcd60e51b815260206004820152600e60248201527f494e56414c49445f5349474e45520000000000000000000000000000000000006044820152606401610556565b6001600160a01b0390811660009081526004602090815260408083208a8516808552908352928190208990555188815291928a16917f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925910160405180910390a350505050505050565b815160005b818110156107a25761079284828151811061078457610784610b95565b602002602001015184610842565b61079b81610bab565b9050610767565b50505050565b60007f8b73c3c69bb8fe3d512ecc4cf759cc79239f7b179b0ffacaa9a75d522b39400f60006040516107da9190610bc6565b6040805191829003822060208301939093528101919091527fc89efdaa54c0f20c7adf612882df0950f5a951637e0307cdcb4c672f298b8bc660608201524660808201523060a082015260c00160405160208183030381529060405280519060200120905090565b80600260008282546108549190610c62565b90915550506001600160a01b0382166000818152600360209081526040808320805486019055518481527fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef910160405180910390a35050565b600060208083528351808285015260005b818110156108da578581018301518582016040015282016108be565b818111156108ec576000604083870101525b50601f01601f1916929092016040019392505050565b80356001600160a01b038116811461091957600080fd5b919050565b6000806040838503121561093157600080fd5b61093a83610902565b946020939093013593505050565b60008060006060848603121561095d57600080fd5b61096684610902565b925061097460208501610902565b9150604084013590509250925092565b60006020828403121561099657600080fd5b61099f82610902565b9392505050565b600080600080600080600060e0888a0312156109c157600080fd5b6109ca88610902565b96506109d860208901610902565b95506040880135945060608801359350608088013560ff811681146109fc57600080fd5b9699959850939692959460a0840135945060c09093013592915050565b60008060408385031215610a2c57600080fd5b610a3583610902565b9150610a4360208401610902565b90509250929050565b634e487b7160e01b600052604160045260246000fd5b60008060408385031215610a7557600080fd5b823567ffffffffffffffff80821115610a8d57600080fd5b818501915085601f830112610aa157600080fd5b8135602082821115610ab557610ab5610a4c565b8160051b604051601f19603f83011681018181108682111715610ada57610ada610a4c565b604052928352818301935084810182019289841115610af857600080fd5b948201945b83861015610b1d57610b0e86610902565b85529482019493820193610afd565b9997909101359750505050505050565b600181811c90821680610b4157607f821691505b60208210811415610b6257634e487b7160e01b600052602260045260246000fd5b50919050565b634e487b7160e01b600052601160045260246000fd5b600082821015610b9057610b90610b68565b500390565b634e487b7160e01b600052603260045260246000fd5b6000600019821415610bbf57610bbf610b68565b5060010190565b600080835481600182811c915080831680610be257607f831692505b6020808410821415610c0257634e487b7160e01b86526022600452602486fd5b818015610c165760018114610c2757610c54565b60ff19861689528489019650610c54565b60008a81526020902060005b86811015610c4c5781548b820152908501908301610c33565b505084890196505b509498975050505050505050565b60008219821115610c7557610c75610b68565b50019056fea164736f6c6343000809000a", + "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100df5760003560e01c806370a082311161008c578063a9059cbb11610066578063a9059cbb146101d8578063d505accf146101eb578063dd62ed3e14610200578063ea66696c1461022b57600080fd5b806370a08231146101905780637ecebe00146101b057806395d89b41146101d057600080fd5b806323b872dd116100bd57806323b872dd1461013c578063313ce5671461014f5780633644e5151461018857600080fd5b806306fdde03146100e4578063095ea7b31461010257806318160ddd14610125575b600080fd5b6100ec61023e565b6040516100f991906108ad565b60405180910390f35b61011561011036600461091e565b6102cc565b60405190151581526020016100f9565b61012e60025481565b6040519081526020016100f9565b61011561014a366004610948565b610338565b6101767f000000000000000000000000000000000000000000000000000000000000000081565b60405160ff90911681526020016100f9565b61012e61042a565b61012e61019e366004610984565b60036020526000908152604090205481565b61012e6101be366004610984565b60056020526000908152604090205481565b6100ec610485565b6101156101e636600461091e565b610492565b6101fe6101f93660046109a6565b61050a565b005b61012e61020e366004610a19565b600460209081526000928352604080842090915290825290205481565b6101fe610239366004610a62565b610762565b6000805461024b90610b2d565b80601f016020809104026020016040519081016040528092919081815260200182805461027790610b2d565b80156102c45780601f10610299576101008083540402835291602001916102c4565b820191906000526020600020905b8154815290600101906020018083116102a757829003601f168201915b505050505081565b3360008181526004602090815260408083206001600160a01b038716808552925280832085905551919290917f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925906103279086815260200190565b60405180910390a350600192915050565b6001600160a01b038316600090815260046020908152604080832033845290915281205460001981146103945761036f8382610b7e565b6001600160a01b03861660009081526004602090815260408083203384529091529020555b6001600160a01b038516600090815260036020526040812080548592906103bc908490610b7e565b90915550506001600160a01b03808516600081815260036020526040908190208054870190555190918716907fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef906104179087815260200190565b60405180910390a3506001949350505050565b60007f000000000000000000000000000000000000000000000000000000000000000046146104605761045b6107a8565b905090565b507f000000000000000000000000000000000000000000000000000000000000000090565b6001805461024b90610b2d565b336000908152600360205260408120805483919083906104b3908490610b7e565b90915550506001600160a01b038316600081815260036020526040908190208054850190555133907fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef906103279086815260200190565b4284101561055f5760405162461bcd60e51b815260206004820152601760248201527f5045524d49545f444541444c494e455f4558504952454400000000000000000060448201526064015b60405180910390fd5b6000600161056b61042a565b6001600160a01b038a811660008181526005602090815260409182902080546001810190915582517f6e71edae12b1b97f4d1f60370fef10105fa2faae0126114a169c64845d6126c98184015280840194909452938d166060840152608083018c905260a083019390935260c08083018b90528151808403909101815260e08301909152805192019190912061190160f01b6101008301526101028201929092526101228101919091526101420160408051601f198184030181528282528051602091820120600084529083018083525260ff871690820152606081018590526080810184905260a0016020604051602081039080840390855afa158015610677573d6000803e3d6000fd5b5050604051601f1901519150506001600160a01b038116158015906106ad5750876001600160a01b0316816001600160a01b0316145b6106f95760405162461bcd60e51b815260206004820152600e60248201527f494e56414c49445f5349474e45520000000000000000000000000000000000006044820152606401610556565b6001600160a01b0390811660009081526004602090815260408083208a8516808552908352928190208990555188815291928a16917f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925910160405180910390a350505050505050565b815160005b818110156107a25761079284828151811061078457610784610b95565b602002602001015184610842565b61079b81610bab565b9050610767565b50505050565b60007f8b73c3c69bb8fe3d512ecc4cf759cc79239f7b179b0ffacaa9a75d522b39400f60006040516107da9190610bc6565b6040805191829003822060208301939093528101919091527fc89efdaa54c0f20c7adf612882df0950f5a951637e0307cdcb4c672f298b8bc660608201524660808201523060a082015260c00160405160208183030381529060405280519060200120905090565b80600260008282546108549190610c62565b90915550506001600160a01b0382166000818152600360209081526040808320805486019055518481527fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef910160405180910390a35050565b600060208083528351808285015260005b818110156108da578581018301518582016040015282016108be565b818111156108ec576000604083870101525b50601f01601f1916929092016040019392505050565b80356001600160a01b038116811461091957600080fd5b919050565b6000806040838503121561093157600080fd5b61093a83610902565b946020939093013593505050565b60008060006060848603121561095d57600080fd5b61096684610902565b925061097460208501610902565b9150604084013590509250925092565b60006020828403121561099657600080fd5b61099f82610902565b9392505050565b600080600080600080600060e0888a0312156109c157600080fd5b6109ca88610902565b96506109d860208901610902565b95506040880135945060608801359350608088013560ff811681146109fc57600080fd5b9699959850939692959460a0840135945060c09093013592915050565b60008060408385031215610a2c57600080fd5b610a3583610902565b9150610a4360208401610902565b90509250929050565b634e487b7160e01b600052604160045260246000fd5b60008060408385031215610a7557600080fd5b823567ffffffffffffffff80821115610a8d57600080fd5b818501915085601f830112610aa157600080fd5b8135602082821115610ab557610ab5610a4c565b8160051b604051601f19603f83011681018181108682111715610ada57610ada610a4c565b604052928352818301935084810182019289841115610af857600080fd5b948201945b83861015610b1d57610b0e86610902565b85529482019493820193610afd565b9997909101359750505050505050565b600181811c90821680610b4157607f821691505b60208210811415610b6257634e487b7160e01b600052602260045260246000fd5b50919050565b634e487b7160e01b600052601160045260246000fd5b600082821015610b9057610b90610b68565b500390565b634e487b7160e01b600052603260045260246000fd5b6000600019821415610bbf57610bbf610b68565b5060010190565b600080835481600182811c915080831680610be257607f831692505b6020808410821415610c0257634e487b7160e01b86526022600452602486fd5b818015610c165760018114610c2757610c54565b60ff19861689528489019650610c54565b60008a81526020902060005b86811015610c4c5781548b820152908501908301610c33565b505084890196505b509498975050505050505050565b60008219821115610c7557610c75610b68565b50019056fea164736f6c6343000809000a", "linkReferences": {}, "deployedLinkReferences": {} } diff --git a/src/utils/smart_contract_files/P2PIX.json b/src/utils/smart_contract_files/P2PIX.json index 34e712f..2edec46 100644 --- a/src/utils/smart_contract_files/P2PIX.json +++ b/src/utils/smart_contract_files/P2PIX.json @@ -14,16 +14,41 @@ "internalType": "address[]", "name": "validSigners", "type": "address[]" + }, + { + "internalType": "contract IReputation", + "name": "_reputation", + "type": "address" + }, + { + "internalType": "address[]", + "name": "tokens", + "type": "address[]" + }, + { + "internalType": "bool[]", + "name": "tokenStates", + "type": "bool[]" } ], "stateMutability": "payable", "type": "constructor" }, + { + "inputs": [], + "name": "AddressDenied", + "type": "error" + }, { "inputs": [], "name": "AlreadyReleased", "type": "error" }, + { + "inputs": [], + "name": "AmountNotAllowed", + "type": "error" + }, { "inputs": [], "name": "DepositAlreadyExists", @@ -39,11 +64,26 @@ "name": "InvalidSigner", "type": "error" }, + { + "inputs": [], + "name": "LengthMismatch", + "type": "error" + }, + { + "inputs": [], + "name": "LockExpired", + "type": "error" + }, { "inputs": [], "name": "LoopOverflow", "type": "error" }, + { + "inputs": [], + "name": "NoTokens", + "type": "error" + }, { "inputs": [], "name": "NotEnoughTokens", @@ -64,11 +104,40 @@ "name": "Reentrancy", "type": "error" }, + { + "inputs": [], + "name": "StaticCallFailed", + "type": "error" + }, + { + "inputs": [], + "name": "TokenDenied", + "type": "error" + }, { "inputs": [], "name": "TxAlreadyUsed", "type": "error" }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "token", + "type": "address" + }, + { + "indexed": true, + "internalType": "bool", + "name": "state", + "type": "bool" + } + ], + "name": "AllowedERC20Updated", + "type": "event" + }, { "anonymous": false, "inputs": [ @@ -194,6 +263,19 @@ "name": "LockAdded", "type": "event" }, + { + "anonymous": false, + "inputs": [ + { + "indexed": false, + "internalType": "uint256", + "name": "blocks", + "type": "uint256" + } + ], + "name": "LockBlocksUpdated", + "type": "event" + }, { "anonymous": false, "inputs": [ @@ -208,6 +290,12 @@ "internalType": "bytes32", "name": "lockId", "type": "bytes32" + }, + { + "indexed": false, + "internalType": "uint256", + "name": "amount", + "type": "uint256" } ], "name": "LockReleased", @@ -251,6 +339,64 @@ "name": "OwnerUpdated", "type": "event" }, + { + "anonymous": false, + "inputs": [ + { + "indexed": false, + "internalType": "address", + "name": "reputation", + "type": "address" + } + ], + "name": "ReputationUpdated", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": false, + "internalType": "address", + "name": "seller", + "type": "address" + }, + { + "indexed": false, + "internalType": "bytes32", + "name": "merkleRoot", + "type": "bytes32" + } + ], + "name": "RootUpdated", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": false, + "internalType": "address[]", + "name": "signers", + "type": "address[]" + } + ], + "name": "ValidSignersUpdated", + "type": "event" + }, + { + "inputs": [], + "name": "WAD", + "outputs": [ + { + "internalType": "uint256", + "name": "", + "type": "uint256" + } + ], + "stateMutability": "view", + "type": "function" + }, { "inputs": [ { @@ -270,6 +416,25 @@ "stateMutability": "pure", "type": "function" }, + { + "inputs": [ + { + "internalType": "contract ERC20", + "name": "", + "type": "address" + } + ], + "name": "allowedERC20s", + "outputs": [ + { + "internalType": "bool", + "name": "", + "type": "bool" + } + ], + "stateMutability": "view", + "type": "function" + }, { "inputs": [ { @@ -312,6 +477,11 @@ "internalType": "string", "name": "_pixTarget", "type": "string" + }, + { + "internalType": "bytes32", + "name": "allowlistRoot", + "type": "bytes32" } ], "name": "deposit", @@ -347,12 +517,12 @@ }, { "internalType": "address", - "name": "_targetAddress", + "name": "_buyerAddress", "type": "address" }, { "internalType": "address", - "name": "_relayerAddress", + "name": "_relayerTarget", "type": "address" }, { @@ -365,6 +535,11 @@ "name": "_amount", "type": "uint256" }, + { + "internalType": "bytes32[]", + "name": "merkleProof", + "type": "bytes32[]" + }, { "internalType": "bytes32[]", "name": "expiredLocks", @@ -453,7 +628,12 @@ }, { "internalType": "address", - "name": "targetAddress", + "name": "buyerAddress", + "type": "address" + }, + { + "internalType": "address", + "name": "relayerTarget", "type": "address" }, { @@ -486,9 +666,14 @@ "type": "bytes32" }, { - "internalType": "uint256", + "internalType": "address", + "name": "_relayerTarget", + "type": "address" + }, + { + "internalType": "bytes32", "name": "pixTimestamp", - "type": "uint256" + "type": "bytes32" }, { "internalType": "bytes32", @@ -511,6 +696,51 @@ "stateMutability": "nonpayable", "type": "function" }, + { + "inputs": [], + "name": "reputation", + "outputs": [ + { + "internalType": "contract IReputation", + "name": "", + "type": "address" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "uint256", + "name": "", + "type": "uint256" + } + ], + "name": "sellerAllowList", + "outputs": [ + { + "internalType": "bytes32", + "name": "", + "type": "bytes32" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "uint256", + "name": "_blocks", + "type": "uint256" + } + ], + "name": "setDefaultLockBlocks", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, { "inputs": [ { @@ -524,6 +754,68 @@ "stateMutability": "nonpayable", "type": "function" }, + { + "inputs": [ + { + "internalType": "contract IReputation", + "name": "_reputation", + "type": "address" + } + ], + "name": "setReputation", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "address", + "name": "addr", + "type": "address" + }, + { + "internalType": "bytes32", + "name": "merkleroot", + "type": "bytes32" + } + ], + "name": "setRoot", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "address[]", + "name": "_validSigners", + "type": "address[]" + } + ], + "name": "setValidSigners", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "address[]", + "name": "_tokens", + "type": "address[]" + }, + { + "internalType": "bool[]", + "name": "_states", + "type": "bool[]" + } + ], + "name": "tokenSettings", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, { "inputs": [ { @@ -537,6 +829,44 @@ "stateMutability": "nonpayable", "type": "function" }, + { + "inputs": [ + { + "internalType": "bytes32", + "name": "", + "type": "bytes32" + } + ], + "name": "usedTransactions", + "outputs": [ + { + "internalType": "bool", + "name": "", + "type": "bool" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "uint256", + "name": "", + "type": "uint256" + } + ], + "name": "userRecord", + "outputs": [ + { + "internalType": "uint256", + "name": "", + "type": "uint256" + } + ], + "stateMutability": "view", + "type": "function" + }, { "inputs": [ { @@ -586,8 +916,8 @@ "type": "receive" } ], - "bytecode": "0x60806040526001805560405162001807380380620018078339810160408190526200002a9162000123565b600080546001600160a01b031916339081178255604051909182917f8292fce18fa69edf4db7b94ea2e58241df0ae57f97e0a6c9b29067028bf92d76908290a350600382905580516000905b80821015620000d6576000620000ae8484815181106200009a576200009a62000203565b6020026020010151620000e060201b60201c565b6000908152600460205260409020805460ff1916600190811790915592909201915062000076565b5050505062000219565b600c1b611000600160ac1b031690565b634e487b7160e01b600052604160045260246000fd5b80516001600160a01b03811681146200011e57600080fd5b919050565b600080604083850312156200013757600080fd5b8251602080850151919350906001600160401b03808211156200015957600080fd5b818601915086601f8301126200016e57600080fd5b815181811115620001835762000183620000f0565b8060051b604051601f19603f83011681018181108582111715620001ab57620001ab620000f0565b604052918252848201925083810185019189831115620001ca57600080fd5b938501935b82851015620001f357620001e38562000106565b84529385019392850192620001cf565b8096505050505050509250929050565b634e487b7160e01b600052603260045260246000fd5b6115de80620002296000396000f3fe6080604052600436106100ec5760003560e01c80635fd8c7101161008a5780638e2a3d36116100595780638e2a3d36146103005780639872dbfe1461033157806398a2687114610347578063bfe07da61461038757600080fd5b80635fd8c7101461027357806372fada5c146102885780638da5cb5b146102a85780638e2749d6146102e057600080fd5b80632dfdf0b5116100c65780632dfdf0b5146101e357806336317972146101fa5780634b2ae9801461021a5780634e1389ed1461025357600080fd5b806303aaf306146100f857806313af40351461012b57806316d722401461014d57600080fd5b366100f357005b600080fd5b34801561010457600080fd5b506101186101133660046111e9565b6103a7565b6040519081526020015b60405180910390f35b34801561013757600080fd5b5061014b61014636600461126b565b610551565b005b34801561015957600080fd5b506101aa610168366004611286565b60066020526000908152604090208054600182015460028301546003840154600485015460059095015493949293919290916001600160a01b03918216911686565b6040805196875260208701959095529385019290925260608401526001600160a01b0390811660808401521660a082015260c001610122565b3480156101ef57600080fd5b506002546101189081565b34801561020657600080fd5b5061014b61021536600461129f565b6105f7565b34801561022657600080fd5b5061011861023536600461126b565b600c1b750ffffffffffffffffffffffffffffffffffffffff0001690565b34801561025f57600080fd5b5061014b61026e3660046112eb565b6106b7565b34801561027f57600080fd5b5061014b61097a565b34801561029457600080fd5b5061014b6102a3366004611286565b610a0a565b3480156102b457600080fd5b506000546102c8906001600160a01b031681565b6040516001600160a01b039091168152602001610122565b3480156102ec57600080fd5b5061014b6102fb36600461133e565b610a92565b34801561030c57600080fd5b5061032061031b366004611286565b610b8e565b604051610122959493929190611380565b34801561033d57600080fd5b5061011860035481565b34801561035357600080fd5b50610377610362366004611286565b60046020526000908152604090205460ff1681565b6040519015158152602001610122565b34801561039357600080fd5b506101186103a236600461140d565b610c58565b60006103b1610e02565b6103bb8383610a92565b60008881526005602052604090206003810154600160a01b900460ff166103f557604051635972996f60e11b815260040160405180910390fd5b8054851115610417576040516308aeed0f60e21b815260040160405180910390fd5b61042289868a610e2d565b915060006040518060c001604052808b81526020018881526020018781526020016003544361045191906114aa565b81526001600160a01b03808c166020808401919091528b82166040938401526000878152600682528381208551815591850151600183015592840151600282015560608401516003820155608084015160048201805491841673ffffffffffffffffffffffffffffffffffffffff1992831617905560a085015160059092018054929093169116179055835491925087918491906104f09084906114c2565b9091555050604080518b81526020810188905284916001600160a01b038c16917f2a28b2ae47b0bd4b104e7cd29b1dfa72846af8c4cfdc009da2ae29db68cb67ea910160405180910390a3505061054660018055565b979650505050505050565b6000546001600160a01b0316331461059f5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064015b60405180910390fd5b6000805473ffffffffffffffffffffffffffffffffffffffff19166001600160a01b0383169081178255604051909133917f8292fce18fa69edf4db7b94ea2e58241df0ae57f97e0a6c9b29067028bf92d769190a350565b6105ff610e02565b61060883610eb1565b6106128282610a92565b60008381526005602052604090206003810154600160a01b900460ff161515600114156106425761064284610a0a565b600381015481546000835560028301546001600160a01b039283169261066b9184911683610eee565b604080518781526020810183905233917f7719804546c0185709e60c90d164447ff251a5ba29af0216faa921350f6bebf7910160405180910390a25050506106b260018055565b505050565b6106bf610e02565b60008581526006602052604090206003810154431015806106e257506002810154155b15610700576040516331da482760e11b815260040160405180910390fd5b805460009081526005602090815260408083206002850154915190939261073092600186019290918b9101611514565b60405160208183030381529060405280519060200120905060008160405160200161078791907f19457468657265756d205369676e6564204d6573736167653a0a3332000000008152601c810191909152603c0190565b60408051601f1981840301815291815281516020928301206000858152600790935291205490915060ff161515600114156107d557604051637a48537560e11b815260040160405180910390fd5b6040805160008082526020820180845284905260ff88169282019290925260608101899052608081018890526108579060019060a0016020604051602081039080840390855afa15801561082d573d6000803e3d6000fd5b5050604051601f190151600c1b750ffffffffffffffffffffffffffffffffffffffff00016919050565b60008181526004602052604090205490915060ff1661088957604051632057875960e21b815260040160405180910390fd5b6003840154600186015460028701546001600160a01b03909216916000916108b0916114c2565b60006002890181905560038901819055868152600760205260409020805460ff1916600117905560048801549091506108f49083906001600160a01b031683610eee565b60018701541561091f576005870154600188015461091f9184916001600160a01b0390911690610eee565b60048701546040518d81526001600160a01b03909116907f5e420822d2f7281fdc4b763c62c8b7874bf22108a35efe93144d79296aacc67d9060200160405180910390a25050505050505061097360018055565b5050505050565b6000546001600160a01b031633146109c35760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401610596565b476109ce3382610f7a565b60408051338152602081018390527feaff4b37086828766ad3268786972c0cd24259d4c87a80f9d3963a3c3d999b0d910160405180910390a150565b610a1381610eb1565b6000818152600560209081526040918290206003810180547fffffffffffffffffffffff00ffffffffffffffffffffffffffffffffffffffff1690556002015491518381526001600160a01b03909216917fb4d98b272597e828d9b172c0d44390d5b267040e918088eac8a0a0fadcb81c70910160405180910390a250565b6000815b80821015610b7257600060066000868686818110610ab657610ab66115bb565b9050602002013581526020019081526020016000209050610ad681610fd5565b6002810154815460009081526005602052604081208054909190610afb9084906114aa565b90915550506000600282015560048101546001600160a01b03167f67e089478e21dd12c98e69331c4152f6c9b2038b91e0f28268ffa01558c0b4ff868686818110610b4857610b486115bb565b90506020020135604051610b5e91815260200190565b60405180910390a282600101925050610a96565b80821015610b885763dfb035c96000526004601cfd5b50505050565b60056020526000908152604090208054600182018054919291610bb0906114d9565b80601f0160208091040260200160405190810160405280929190818152602001828054610bdc906114d9565b8015610c295780601f10610bfe57610100808354040283529160200191610c29565b820191906000526020600020905b815481529060010190602001808311610c0c57829003601f168201915b50505050600283015460039093015491926001600160a01b03908116929081169150600160a01b900460ff1685565b6000610c62611008565b9050600085905060006040518060a0016040528087815260200186868080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152505050908252503360208201526001600160a01b038916604082015260016060909101529050610cdc610e02565b6000838152600560209081526040909120825181558183015180518493610d0a9260018501929101906110e8565b506040820151600280830180546001600160a01b0393841673ffffffffffffffffffffffffffffffffffffffff199091161790556060840151600390930180546080909501511515600160a01b027fffffffffffffffffffffff000000000000000000000000000000000000000000909516939092169290921792909217909155610d989080546001019055565b610da482333089611058565b610dad60018055565b604080518481526001600160a01b038916602082015290810187905233907f25ac57b911b0f66b64c294827f539545fbc3ddd002cafab117776274f3241e4c9060600160405180910390a25050949350505050565b60015460021415610e265760405163558a1e0360e11b815260040160405180910390fd5b6002600155565b6040805160208101859052908101839052606082811b6bffffffffffffffffffffffff19169082015260009060740160405160208183030381529060405280519060200120905043600660008381526020019081526020016000206003015410610eaa5760405163d0404f8560e01b815260040160405180910390fd5b9392505050565b6000818152600560205260409020600201546001600160a01b03163314610eeb576040516342e8fb9360e11b815260040160405180910390fd5b50565b600060405163a9059cbb60e01b6000528360045282602452602060006044600080895af13d15601f3d1160016000511416171691506000606052806040525080610b885760405162461bcd60e51b815260206004820152600f60248201527f5452414e534645525f4641494c454400000000000000000000000000000000006044820152606401610596565b600080600080600085875af19050806106b25760405162461bcd60e51b815260206004820152601360248201527f4554485f5452414e534645525f4641494c4544000000000000000000000000006044820152606401610596565b438160030154101580610fea57506002810154155b15610eeb5760405163d0404f8560e01b815260040160405180910390fd5b600061101360025490565b600081815260056020526040902060030154909150600160a01b900460ff161515600114156110555760405163c44bd76560e01b815260040160405180910390fd5b90565b60006040516323b872dd60e01b6000528460045283602452826044526020600060646000808a5af13d15601f3d11600160005114161716915060006060528060405250806109735760405162461bcd60e51b815260206004820152601460248201527f5452414e534645525f46524f4d5f4641494c45440000000000000000000000006044820152606401610596565b8280546110f4906114d9565b90600052602060002090601f016020900481019282611116576000855561115c565b82601f1061112f57805160ff191683800117855561115c565b8280016001018555821561115c579182015b8281111561115c578251825591602001919060010190611141565b5061116892915061116c565b5090565b5b80821115611168576000815560010161116d565b80356001600160a01b038116811461119857600080fd5b919050565b60008083601f8401126111af57600080fd5b50813567ffffffffffffffff8111156111c757600080fd5b6020830191508360208260051b85010111156111e257600080fd5b9250929050565b600080600080600080600060c0888a03121561120457600080fd5b8735965061121460208901611181565b955061122260408901611181565b9450606088013593506080880135925060a088013567ffffffffffffffff81111561124c57600080fd5b6112588a828b0161119d565b989b979a50959850939692959293505050565b60006020828403121561127d57600080fd5b610eaa82611181565b60006020828403121561129857600080fd5b5035919050565b6000806000604084860312156112b457600080fd5b83359250602084013567ffffffffffffffff8111156112d257600080fd5b6112de8682870161119d565b9497909650939450505050565b600080600080600060a0868803121561130357600080fd5b85359450602086013593506040860135925060608601359150608086013560ff8116811461133057600080fd5b809150509295509295909350565b6000806020838503121561135157600080fd5b823567ffffffffffffffff81111561136857600080fd5b6113748582860161119d565b90969095509350505050565b8581526000602060a08184015286518060a085015260005b818110156113b45788810183015185820160c001528201611398565b818111156113c657600060c083870101525b50601f01601f1916830160c00191506113ec905060408301866001600160a01b03169052565b6001600160a01b038416606083015282151560808301529695505050505050565b6000806000806060858703121561142357600080fd5b61142c85611181565b935060208501359250604085013567ffffffffffffffff8082111561145057600080fd5b818701915087601f83011261146457600080fd5b81358181111561147357600080fd5b88602082850101111561148557600080fd5b95989497505060200194505050565b634e487b7160e01b600052601160045260246000fd5b600082198211156114bd576114bd611494565b500190565b6000828210156114d4576114d4611494565b500390565b600181811c908216806114ed57607f821691505b6020821081141561150e57634e487b7160e01b600052602260045260246000fd5b50919050565b600080855481600182811c91508083168061153057607f831692505b602080841082141561155057634e487b7160e01b86526022600452602486fd5b8180156115645760018114611575576115a2565b60ff198616895284890196506115a2565b60008c81526020902060005b8681101561159a5781548b820152908501908301611581565b505084890196505b5098855250505050938401929092525050604001919050565b634e487b7160e01b600052603260045260246000fdfea164736f6c6343000809000a", - "deployedBytecode": "0x6080604052600436106100ec5760003560e01c80635fd8c7101161008a5780638e2a3d36116100595780638e2a3d36146103005780639872dbfe1461033157806398a2687114610347578063bfe07da61461038757600080fd5b80635fd8c7101461027357806372fada5c146102885780638da5cb5b146102a85780638e2749d6146102e057600080fd5b80632dfdf0b5116100c65780632dfdf0b5146101e357806336317972146101fa5780634b2ae9801461021a5780634e1389ed1461025357600080fd5b806303aaf306146100f857806313af40351461012b57806316d722401461014d57600080fd5b366100f357005b600080fd5b34801561010457600080fd5b506101186101133660046111e9565b6103a7565b6040519081526020015b60405180910390f35b34801561013757600080fd5b5061014b61014636600461126b565b610551565b005b34801561015957600080fd5b506101aa610168366004611286565b60066020526000908152604090208054600182015460028301546003840154600485015460059095015493949293919290916001600160a01b03918216911686565b6040805196875260208701959095529385019290925260608401526001600160a01b0390811660808401521660a082015260c001610122565b3480156101ef57600080fd5b506002546101189081565b34801561020657600080fd5b5061014b61021536600461129f565b6105f7565b34801561022657600080fd5b5061011861023536600461126b565b600c1b750ffffffffffffffffffffffffffffffffffffffff0001690565b34801561025f57600080fd5b5061014b61026e3660046112eb565b6106b7565b34801561027f57600080fd5b5061014b61097a565b34801561029457600080fd5b5061014b6102a3366004611286565b610a0a565b3480156102b457600080fd5b506000546102c8906001600160a01b031681565b6040516001600160a01b039091168152602001610122565b3480156102ec57600080fd5b5061014b6102fb36600461133e565b610a92565b34801561030c57600080fd5b5061032061031b366004611286565b610b8e565b604051610122959493929190611380565b34801561033d57600080fd5b5061011860035481565b34801561035357600080fd5b50610377610362366004611286565b60046020526000908152604090205460ff1681565b6040519015158152602001610122565b34801561039357600080fd5b506101186103a236600461140d565b610c58565b60006103b1610e02565b6103bb8383610a92565b60008881526005602052604090206003810154600160a01b900460ff166103f557604051635972996f60e11b815260040160405180910390fd5b8054851115610417576040516308aeed0f60e21b815260040160405180910390fd5b61042289868a610e2d565b915060006040518060c001604052808b81526020018881526020018781526020016003544361045191906114aa565b81526001600160a01b03808c166020808401919091528b82166040938401526000878152600682528381208551815591850151600183015592840151600282015560608401516003820155608084015160048201805491841673ffffffffffffffffffffffffffffffffffffffff1992831617905560a085015160059092018054929093169116179055835491925087918491906104f09084906114c2565b9091555050604080518b81526020810188905284916001600160a01b038c16917f2a28b2ae47b0bd4b104e7cd29b1dfa72846af8c4cfdc009da2ae29db68cb67ea910160405180910390a3505061054660018055565b979650505050505050565b6000546001600160a01b0316331461059f5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064015b60405180910390fd5b6000805473ffffffffffffffffffffffffffffffffffffffff19166001600160a01b0383169081178255604051909133917f8292fce18fa69edf4db7b94ea2e58241df0ae57f97e0a6c9b29067028bf92d769190a350565b6105ff610e02565b61060883610eb1565b6106128282610a92565b60008381526005602052604090206003810154600160a01b900460ff161515600114156106425761064284610a0a565b600381015481546000835560028301546001600160a01b039283169261066b9184911683610eee565b604080518781526020810183905233917f7719804546c0185709e60c90d164447ff251a5ba29af0216faa921350f6bebf7910160405180910390a25050506106b260018055565b505050565b6106bf610e02565b60008581526006602052604090206003810154431015806106e257506002810154155b15610700576040516331da482760e11b815260040160405180910390fd5b805460009081526005602090815260408083206002850154915190939261073092600186019290918b9101611514565b60405160208183030381529060405280519060200120905060008160405160200161078791907f19457468657265756d205369676e6564204d6573736167653a0a3332000000008152601c810191909152603c0190565b60408051601f1981840301815291815281516020928301206000858152600790935291205490915060ff161515600114156107d557604051637a48537560e11b815260040160405180910390fd5b6040805160008082526020820180845284905260ff88169282019290925260608101899052608081018890526108579060019060a0016020604051602081039080840390855afa15801561082d573d6000803e3d6000fd5b5050604051601f190151600c1b750ffffffffffffffffffffffffffffffffffffffff00016919050565b60008181526004602052604090205490915060ff1661088957604051632057875960e21b815260040160405180910390fd5b6003840154600186015460028701546001600160a01b03909216916000916108b0916114c2565b60006002890181905560038901819055868152600760205260409020805460ff1916600117905560048801549091506108f49083906001600160a01b031683610eee565b60018701541561091f576005870154600188015461091f9184916001600160a01b0390911690610eee565b60048701546040518d81526001600160a01b03909116907f5e420822d2f7281fdc4b763c62c8b7874bf22108a35efe93144d79296aacc67d9060200160405180910390a25050505050505061097360018055565b5050505050565b6000546001600160a01b031633146109c35760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401610596565b476109ce3382610f7a565b60408051338152602081018390527feaff4b37086828766ad3268786972c0cd24259d4c87a80f9d3963a3c3d999b0d910160405180910390a150565b610a1381610eb1565b6000818152600560209081526040918290206003810180547fffffffffffffffffffffff00ffffffffffffffffffffffffffffffffffffffff1690556002015491518381526001600160a01b03909216917fb4d98b272597e828d9b172c0d44390d5b267040e918088eac8a0a0fadcb81c70910160405180910390a250565b6000815b80821015610b7257600060066000868686818110610ab657610ab66115bb565b9050602002013581526020019081526020016000209050610ad681610fd5565b6002810154815460009081526005602052604081208054909190610afb9084906114aa565b90915550506000600282015560048101546001600160a01b03167f67e089478e21dd12c98e69331c4152f6c9b2038b91e0f28268ffa01558c0b4ff868686818110610b4857610b486115bb565b90506020020135604051610b5e91815260200190565b60405180910390a282600101925050610a96565b80821015610b885763dfb035c96000526004601cfd5b50505050565b60056020526000908152604090208054600182018054919291610bb0906114d9565b80601f0160208091040260200160405190810160405280929190818152602001828054610bdc906114d9565b8015610c295780601f10610bfe57610100808354040283529160200191610c29565b820191906000526020600020905b815481529060010190602001808311610c0c57829003601f168201915b50505050600283015460039093015491926001600160a01b03908116929081169150600160a01b900460ff1685565b6000610c62611008565b9050600085905060006040518060a0016040528087815260200186868080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152505050908252503360208201526001600160a01b038916604082015260016060909101529050610cdc610e02565b6000838152600560209081526040909120825181558183015180518493610d0a9260018501929101906110e8565b506040820151600280830180546001600160a01b0393841673ffffffffffffffffffffffffffffffffffffffff199091161790556060840151600390930180546080909501511515600160a01b027fffffffffffffffffffffff000000000000000000000000000000000000000000909516939092169290921792909217909155610d989080546001019055565b610da482333089611058565b610dad60018055565b604080518481526001600160a01b038916602082015290810187905233907f25ac57b911b0f66b64c294827f539545fbc3ddd002cafab117776274f3241e4c9060600160405180910390a25050949350505050565b60015460021415610e265760405163558a1e0360e11b815260040160405180910390fd5b6002600155565b6040805160208101859052908101839052606082811b6bffffffffffffffffffffffff19169082015260009060740160405160208183030381529060405280519060200120905043600660008381526020019081526020016000206003015410610eaa5760405163d0404f8560e01b815260040160405180910390fd5b9392505050565b6000818152600560205260409020600201546001600160a01b03163314610eeb576040516342e8fb9360e11b815260040160405180910390fd5b50565b600060405163a9059cbb60e01b6000528360045282602452602060006044600080895af13d15601f3d1160016000511416171691506000606052806040525080610b885760405162461bcd60e51b815260206004820152600f60248201527f5452414e534645525f4641494c454400000000000000000000000000000000006044820152606401610596565b600080600080600085875af19050806106b25760405162461bcd60e51b815260206004820152601360248201527f4554485f5452414e534645525f4641494c4544000000000000000000000000006044820152606401610596565b438160030154101580610fea57506002810154155b15610eeb5760405163d0404f8560e01b815260040160405180910390fd5b600061101360025490565b600081815260056020526040902060030154909150600160a01b900460ff161515600114156110555760405163c44bd76560e01b815260040160405180910390fd5b90565b60006040516323b872dd60e01b6000528460045283602452826044526020600060646000808a5af13d15601f3d11600160005114161716915060006060528060405250806109735760405162461bcd60e51b815260206004820152601460248201527f5452414e534645525f46524f4d5f4641494c45440000000000000000000000006044820152606401610596565b8280546110f4906114d9565b90600052602060002090601f016020900481019282611116576000855561115c565b82601f1061112f57805160ff191683800117855561115c565b8280016001018555821561115c579182015b8281111561115c578251825591602001919060010190611141565b5061116892915061116c565b5090565b5b80821115611168576000815560010161116d565b80356001600160a01b038116811461119857600080fd5b919050565b60008083601f8401126111af57600080fd5b50813567ffffffffffffffff8111156111c757600080fd5b6020830191508360208260051b85010111156111e257600080fd5b9250929050565b600080600080600080600060c0888a03121561120457600080fd5b8735965061121460208901611181565b955061122260408901611181565b9450606088013593506080880135925060a088013567ffffffffffffffff81111561124c57600080fd5b6112588a828b0161119d565b989b979a50959850939692959293505050565b60006020828403121561127d57600080fd5b610eaa82611181565b60006020828403121561129857600080fd5b5035919050565b6000806000604084860312156112b457600080fd5b83359250602084013567ffffffffffffffff8111156112d257600080fd5b6112de8682870161119d565b9497909650939450505050565b600080600080600060a0868803121561130357600080fd5b85359450602086013593506040860135925060608601359150608086013560ff8116811461133057600080fd5b809150509295509295909350565b6000806020838503121561135157600080fd5b823567ffffffffffffffff81111561136857600080fd5b6113748582860161119d565b90969095509350505050565b8581526000602060a08184015286518060a085015260005b818110156113b45788810183015185820160c001528201611398565b818111156113c657600060c083870101525b50601f01601f1916830160c00191506113ec905060408301866001600160a01b03169052565b6001600160a01b038416606083015282151560808301529695505050505050565b6000806000806060858703121561142357600080fd5b61142c85611181565b935060208501359250604085013567ffffffffffffffff8082111561145057600080fd5b818701915087601f83011261146457600080fd5b81358181111561147357600080fd5b88602082850101111561148557600080fd5b95989497505060200194505050565b634e487b7160e01b600052601160045260246000fd5b600082198211156114bd576114bd611494565b500190565b6000828210156114d4576114d4611494565b500390565b600181811c908216806114ed57607f821691505b6020821081141561150e57634e487b7160e01b600052602260045260246000fd5b50919050565b600080855481600182811c91508083168061153057607f831692505b602080841082141561155057634e487b7160e01b86526022600452602486fd5b8180156115645760018114611575576115a2565b60ff198616895284890196506115a2565b60008c81526020902060005b8681101561159a5781548b820152908501908301611581565b505084890196505b5098855250505050938401929092525050604001919050565b634e487b7160e01b600052603260045260246000fdfea164736f6c6343000809000a", + "bytecode": "0x608060405260018055604051620028c0380380620028c08339810160408190526200002a916200049d565b600080546001600160a01b031916339081178255604051909182917f8292fce18fa69edf4db7b94ea2e58241df0ae57f97e0a6c9b29067028bf92d76908290a3506200007685620000a3565b620000818362000133565b6200008c84620001bd565b620000988282620002a1565b505050505062000620565b6000546001600160a01b03163314620000f25760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064015b60405180910390fd5b806004557f70fa43ca70216ad905ade86b9e650a691b2ce5a01980d0a81bdd8324141b8511816040516200012891815260200190565b60405180910390a150565b6000546001600160a01b031633146200017e5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401620000e9565b60028190556040516001600160a01b03821681527fe127cf589a3879da0156d4a24f43b44f65cfa3570de594806b0bfa2fcf06884f9060200162000128565b6000546001600160a01b03163314620002085760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401620000e9565b80516000905b808210156200026e57600062000246848481518110620002325762000232620005bb565b60200260200101516200038760201b60201c565b6000908152600660205260409020805460ff191660019081179091559290920191506200020e565b50507f14a422d2412784a5749d03da98921fe468c98577b767851389a9f58ea5a363d781604051620001289190620005d1565b6000546001600160a01b03163314620002ec5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401620000e9565b815180620003025763df9578836000526004601cfd5b81518114620003195763ff633a386000526004601cfd5b60208301602083016020830282015b8083146200037f578251600052600b60205260406000208251815550815183517f5d6e86e5341d57a92c49934296c51542a25015c9b1782a1c2722a940131c3d9a600080a360208301925060208201915062000328565b505050505050565b600c1b611000600160ac1b031690565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b0381118282101715620003d857620003d862000397565b604052919050565b60006001600160401b03821115620003fc57620003fc62000397565b5060051b60200190565b6001600160a01b03811681146200041c57600080fd5b50565b600082601f8301126200043157600080fd5b815160206200044a6200044483620003e0565b620003ad565b82815260059290921b840181019181810190868411156200046a57600080fd5b8286015b8481101562000492578051620004848162000406565b83529183019183016200046e565b509695505050505050565b600080600080600060a08688031215620004b657600080fd5b8551602080880151919650906001600160401b0380821115620004d857600080fd5b620004e68a838b016200041f565b965060408901519150620004fa8262000406565b6060890151919550808211156200051057600080fd5b6200051e8a838b016200041f565b945060808901519150808211156200053557600080fd5b508701601f810189136200054857600080fd5b8051620005596200044482620003e0565b81815260059190911b8201830190838101908b8311156200057957600080fd5b928401925b82841015620005a95783518015158114620005995760008081fd5b825292840192908401906200057e565b80955050505050509295509295909350565b634e487b7160e01b600052603260045260246000fd5b6020808252825182820181905260009190848201906040850190845b81811015620006145783516001600160a01b031683529284019291840191600101620005ed565b50909695505050505050565b61229080620006306000396000f3fe6080604052600436106101a55760003560e01c806372fada5c116100e15780638e2749d61161008a57806398a268711161006457806398a268711461056b578063c52164c61461059b578063d6e8b973146105bb578063f7d0e04b146105db57600080fd5b80638e2749d6146105045780638e2a3d36146105245780639872dbfe1461055557600080fd5b80637f94f65d116100bb5780637f94f65d1461048c5780638652b37e146104ac5780638da5cb5b146104cc57600080fd5b806372fada5c1461041f578063758d77d41461043f57806377cd38a41461045f57600080fd5b8063363179721161014e578063574983c811610128578063574983c81461039e5780635fd8c710146103be57806369cc6af4146103d35780636a1460241461040357600080fd5b80633631797214610313578063461f3120146103335780634b2ae9801461037357600080fd5b806316d722401161017f57806316d722401461023357806329cc7d10146102dc5780632dfdf0b5146102fc57600080fd5b806304937320146101b15780630d2a2d44146101f157806313af40351461021357600080fd5b366101ac57005b600080fd5b3480156101bd57600080fd5b506101de6101cc366004611b4b565b60056020526000908152604090205481565b6040519081526020015b60405180910390f35b3480156101fd57600080fd5b5061021161020c366004611c58565b6105fb565b005b34801561021f57600080fd5b5061021161022e366004611c95565b6106ec565b34801561023f57600080fd5b5061029861024e366004611b4b565b600860205260009081526040902080546001820154600283015460038401546004850154600586015460069096015494959394929391926001600160a01b03918216928216911687565b6040805197885260208801969096529486019390935260608501919091526001600160a01b03908116608085015290811660a08401521660c082015260e0016101e8565b3480156102e857600080fd5b506101de6102f7366004611cb2565b61078d565b34801561030857600080fd5b506003546101de9081565b34801561031f57600080fd5b5061021161032e366004611d8f565b610978565b34801561033f57600080fd5b5061036361034e366004611b4b565b60096020526000908152604090205460ff1681565b60405190151581526020016101e8565b34801561037f57600080fd5b506101de61038e366004611c95565b600c1b611000600160ac1b031690565b3480156103aa57600080fd5b506102116103b9366004611b4b565b610a38565b3480156103ca57600080fd5b50610211610ab6565b3480156103df57600080fd5b506103636103ee366004611c95565b600b6020526000908152604090205460ff1681565b34801561040f57600080fd5b506101de670de0b6b3a764000081565b34801561042b57600080fd5b5061021161043a366004611b4b565b610b40565b34801561044b57600080fd5b5061021161045a366004611ddb565b610bc8565b34801561046b57600080fd5b506101de61047a366004611b4b565b600a6020526000908152604090205481565b34801561049857600080fd5b506102116104a7366004611e3f565b610fbd565b3480156104b857600080fd5b506101de6104c7366004611e6b565b611050565b3480156104d857600080fd5b506000546104ec906001600160a01b031681565b6040516001600160a01b0390911681526020016101e8565b34801561051057600080fd5b5061021161051f366004611f1f565b611230565b34801561053057600080fd5b5061054461053f366004611b4b565b611398565b6040516101e8959493929190611f61565b34801561056157600080fd5b506101de60045481565b34801561057757600080fd5b50610363610586366004611b4b565b60066020526000908152604090205460ff1681565b3480156105a757600080fd5b506002546104ec906001600160a01b031681565b3480156105c757600080fd5b506102116105d6366004611fee565b611462565b3480156105e757600080fd5b506102116105f6366004611c95565b61153a565b6000546001600160a01b031633146106495760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064015b60405180910390fd5b80516000905b808210156106b057600061068984848151811061066e5761066e6120b8565b6020026020010151611000600160ac1b03600c9190911b1690565b6000908152600660205260409020805460ff1916600190811790915592909201915061064f565b50507f14a422d2412784a5749d03da98921fe468c98577b767851389a9f58ea5a363d7816040516106e191906120ce565b60405180910390a150565b6000546001600160a01b031633146107355760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401610640565b6000805473ffffffffffffffffffffffffffffffffffffffff19166001600160a01b0383169081178255604051909133917f8292fce18fa69edf4db7b94ea2e58241df0ae57f97e0a6c9b29067028bf92d769190a350565b6001600160a01b0385166000908152600b6020526040812054869060ff166107c857604051630abc194760e11b815260040160405180910390fd5b6107d06115c1565b915060006040518060a0016040528088815260200187878080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152505050908252503360208201526001600160a01b038a166040820152600160609091015290506108456115d1565b8315610855576108553385610fbd565b6000838152600760209081526040909120825181558183015180518493610883926001850192910190611ab2565b5060408201516002820180546001600160a01b0392831673ffffffffffffffffffffffffffffffffffffffff199091161790556060830151600392830180546080909501511515600160a01b027fffffffffffffffffffffff00000000000000000000000000000000000000000090951691909216179290921790915561090d9080546001019055565b6109198233308a6115fc565b61092260018055565b604080518481526001600160a01b038a16602082015290810188905233907f25ac57b911b0f66b64c294827f539545fbc3ddd002cafab117776274f3241e4c9060600160405180910390a2505095945050505050565b6109806115d1565b61098983611693565b6109938282611230565b60008381526007602052604090206003810154600160a01b900460ff161515600114156109c3576109c384610b40565b600381015481546000835560028301546001600160a01b03928316926109ec91849116836116d0565b604080518781526020810183905233917f7719804546c0185709e60c90d164447ff251a5ba29af0216faa921350f6bebf7910160405180910390a2505050610a3360018055565b505050565b6000546001600160a01b03163314610a815760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401610640565b806004557f70fa43ca70216ad905ade86b9e650a691b2ce5a01980d0a81bdd8324141b8511816040516106e191815260200190565b6000546001600160a01b03163314610aff5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401610640565b47610b0a338261175c565b60408051338152602081018390527feaff4b37086828766ad3268786972c0cd24259d4c87a80f9d3963a3c3d999b0d91016106e1565b610b4981611693565b6000818152600760209081526040918290206003810180547fffffffffffffffffffffff00ffffffffffffffffffffffffffffffffffffffff1690556002015491518381526001600160a01b03909216917fb4d98b272597e828d9b172c0d44390d5b267040e918088eac8a0a0fadcb81c70910160405180910390a250565b610bd06115d1565b60008681526008602052604090206002810154610c00576040516331da482760e11b815260040160405180910390fd5b4381600301541015610c25576040516307b7d7dd60e51b815260040160405180910390fd5b8054600090815260076020908152604080832060028501549151909392610c5592600186019290918b9101612156565b604051602081830303815290604052805190602001209050600081604051602001610cac91907f19457468657265756d205369676e6564204d6573736167653a0a3332000000008152601c810191909152603c0190565b60408051601f1981840301815291815281516020928301206000858152600990935291205490915060ff16151560011415610cfa57604051637a48537560e11b815260040160405180910390fd5b6040805160008082526020820180845284905260ff8816928201929092526060810189905260808101889052610d6e9060019060a0016020604051602081039080840390855afa158015610d52573d6000803e3d6000fd5b5050604051601f190151600c1b611000600160ac1b0316919050565b60008181526006602052604090205490915060ff16610da057604051632057875960e21b815260040160405180910390fd5b6003840154600286015460018701546001600160a01b0390921691600090610dc89083612213565b600060028a0181905560038a01819055878152600960205260409020805460ff191660011790556006890154909150336001600160a01b0390911614610e79576001880154611000600160ac1b0333600c1b1660009081526005602052604081208054909190610e3990849061222a565b90915550506006880154600c1b611000600160ac1b031660009081526005602052604081208054849290610e6e90849061222a565b90915550610ebb9050565b818860010154610e89919061222a565b611000600160ac1b0333600c1b1660009081526005602052604081208054909190610eb590849061222a565b90915550505b6004880154610ed59084906001600160a01b0316836116d0565b600188015415610f415760058801546001600160a01b038e8116911614610f325760058801546001808a0154610f1a9286926001600160a01b0390911691901c6116d0565b610f2d838e60018b60010154901c6116d0565b610f41565b610f41838e8a600101546116d0565b8760040160009054906101000a90046001600160a01b03166001600160a01b03167f3fd2eee5028b09fa70abe3da4f6023ea41bfde24cfcb9c167f17d6fbe79eece38f84604051610f9c929190918252602082015260400190565b60405180910390a25050505050505050610fb560018055565b505050505050565b6001600160a01b03821633141561103757611000600160ac1b03600c83901b166000908152600a602090815260409182902083905581516001600160a01b038516815290810183905281517f0b294da292f26e55fd442b5c0164fbb9013036ff00c5cfdde0efd01c1baaf632929181900390910190a15050565b6040516342e8fb9360e11b815260040160405180910390fd5b600061105a6115d1565b6110648383611230565b60008a81526007602052604090206003810154600160a01b900460ff1661109e57604051635972996f60e11b815260040160405180910390fd5b80548711156110c0576040516308aeed0f60e21b815260040160405180910390fd5b6110cb8b888c6117b7565b915060006040518060e001604052808d81526020018a8152602001898152602001600454436110fa919061222a565b81526001600160a01b03808e1660208301528c1660408201523360609091015290508515611163576002820154600c1b611000600160ac1b03166000908152600a602052604090205461115190889088903361183b565b61115c83828461186d565b505061121a565b68056bc75e2d631000008160400151116111825761115c83828461186d565b611000600160ac1b0333600c1b16600090815260056020526040812054906111ba6111b5670de0b6b3a764000084612242565b61196b565b90506111ce670de0b6b3a764000082612264565b836040015111806111ec575069d3c21bcecceda10000008360400151115b1561120a57604051630e0c7c2360e11b815260040160405180910390fd5b61121585848661186d565b505050505b61122360018055565b9998505050505050505050565b6000815b8082101561137c57600060086000868686818110611254576112546120b8565b905060200201358152602001908152602001600020905061127481611a27565b600281015481546000908152600760205260408120805490919061129990849061222a565b90915550506000600282018190556006820154600c1b611000600160ac1b031660008181526005602052604090205490915060011c68056bc75e2d6310000081116112fd57600082815260056020526040902068056bc75e2d63100000905561130f565b60008281526005602052604090208190555b60048301546001600160a01b03167f67e089478e21dd12c98e69331c4152f6c9b2038b91e0f28268ffa01558c0b4ff888888818110611350576113506120b8565b9050602002013560405161136691815260200190565b60405180910390a2846001019450505050611234565b808210156113925763dfb035c96000526004601cfd5b50505050565b600760205260009081526040902080546001820180549192916113ba9061211b565b80601f01602080910402602001604051908101604052809291908181526020018280546113e69061211b565b80156114335780601f1061140857610100808354040283529160200191611433565b820191906000526020600020905b81548152906001019060200180831161141657829003601f168201915b50505050600283015460039093015491926001600160a01b03908116929081169150600160a01b900460ff1685565b6000546001600160a01b031633146114ab5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401610640565b8151806114c05763df9578836000526004601cfd5b815181146114d65763ff633a386000526004601cfd5b60208301602083016020830282015b808314610fb5578251600052600b60205260406000208251815550815183517f5d6e86e5341d57a92c49934296c51542a25015c9b1782a1c2722a940131c3d9a600080a36020830192506020820191506114e5565b6000546001600160a01b031633146115835760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401610640565b60028190556040516001600160a01b03821681527fe127cf589a3879da0156d4a24f43b44f65cfa3570de594806b0bfa2fcf06884f906020016106e1565b60006115cc60035490565b905090565b600154600214156115f55760405163558a1e0360e11b815260040160405180910390fd5b6002600155565b60006040516323b872dd60e01b6000528460045283602452826044526020600060646000808a5af13d15601f3d116001600051141617169150600060605280604052508061168c5760405162461bcd60e51b815260206004820152601460248201527f5452414e534645525f46524f4d5f4641494c45440000000000000000000000006044820152606401610640565b5050505050565b6000818152600760205260409020600201546001600160a01b031633146116cd576040516342e8fb9360e11b815260040160405180910390fd5b50565b600060405163a9059cbb60e01b6000528360045282602452602060006044600080895af13d15601f3d11600160005114161716915060006060528060405250806113925760405162461bcd60e51b815260206004820152600f60248201527f5452414e534645525f4641494c454400000000000000000000000000000000006044820152606401610640565b600080600080600085875af1905080610a335760405162461bcd60e51b815260206004820152601360248201527f4554485f5452414e534645525f4641494c4544000000000000000000000000006044820152606401610640565b6040805160208101859052908101839052606082811b6bffffffffffffffffffffffff191690820152600090607401604051602081830303815290604052805190602001209050436008600083815260200190815260200160002060030154106118345760405163d0404f8560e01b815260040160405180910390fd5b9392505050565b6118508484846001600160a01b038516611a6e565b61139257604051631dc23a5f60e11b815260040160405180910390fd5b600083815260086020908152604080832085518155918501516001830155840151600282018190556060850151600383015560808501516004830180546001600160a01b0392831673ffffffffffffffffffffffffffffffffffffffff199182161790915560a087015160058501805491841691831691909117905560c08701516006909401805494909216931692909217909155825490918391611913908490612213565b9091555050608082015182516040808501518151928352602083015285926001600160a01b0316917f2a28b2ae47b0bd4b104e7cd29b1dfa72846af8c4cfdc009da2ae29db68cb67ea910160405180910390a3505050565b600080634d2b179160e01b8360405160240161198991815260200190565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050509050600080600060206000855160208701600254617530fa92503d9150600051905080945082611a1e5763e10bf1cc6000526004601cfd5b50505050919050565b4381600301541115611a4c5760405163d0404f8560e01b815260040160405180910390fd5b60028101546116cd576040516331da482760e11b815260040160405180910390fd5b60008315611aaa578360051b8501855b803580851160051b94855260209485185260406000209301818110611aa257611aa7565b611a7e565b50505b501492915050565b828054611abe9061211b565b90600052602060002090601f016020900481019282611ae05760008555611b26565b82601f10611af957805160ff1916838001178555611b26565b82800160010185558215611b26579182015b82811115611b26578251825591602001919060010190611b0b565b50611b32929150611b36565b5090565b5b80821115611b325760008155600101611b37565b600060208284031215611b5d57600080fd5b5035919050565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f1916810167ffffffffffffffff81118282101715611ba357611ba3611b64565b604052919050565b600067ffffffffffffffff821115611bc557611bc5611b64565b5060051b60200190565b6001600160a01b03811681146116cd57600080fd5b600082601f830112611bf557600080fd5b81356020611c0a611c0583611bab565b611b7a565b82815260059290921b84018101918181019086841115611c2957600080fd5b8286015b84811015611c4d578035611c4081611bcf565b8352918301918301611c2d565b509695505050505050565b600060208284031215611c6a57600080fd5b813567ffffffffffffffff811115611c8157600080fd5b611c8d84828501611be4565b949350505050565b600060208284031215611ca757600080fd5b813561183481611bcf565b600080600080600060808688031215611cca57600080fd5b8535611cd581611bcf565b945060208601359350604086013567ffffffffffffffff80821115611cf957600080fd5b818801915088601f830112611d0d57600080fd5b813581811115611d1c57600080fd5b896020828501011115611d2e57600080fd5b96999598505060200195606001359392505050565b60008083601f840112611d5557600080fd5b50813567ffffffffffffffff811115611d6d57600080fd5b6020830191508360208260051b8501011115611d8857600080fd5b9250929050565b600080600060408486031215611da457600080fd5b83359250602084013567ffffffffffffffff811115611dc257600080fd5b611dce86828701611d43565b9497909650939450505050565b60008060008060008060c08789031215611df457600080fd5b863595506020870135611e0681611bcf565b945060408701359350606087013592506080870135915060a087013560ff81168114611e3157600080fd5b809150509295509295509295565b60008060408385031215611e5257600080fd5b8235611e5d81611bcf565b946020939093013593505050565b600080600080600080600080600060e08a8c031215611e8957600080fd5b8935985060208a0135611e9b81611bcf565b975060408a0135611eab81611bcf565b965060608a0135955060808a0135945060a08a013567ffffffffffffffff80821115611ed657600080fd5b611ee28d838e01611d43565b909650945060c08c0135915080821115611efb57600080fd5b50611f088c828d01611d43565b915080935050809150509295985092959850929598565b60008060208385031215611f3257600080fd5b823567ffffffffffffffff811115611f4957600080fd5b611f5585828601611d43565b90969095509350505050565b8581526000602060a08184015286518060a085015260005b81811015611f955788810183015185820160c001528201611f79565b81811115611fa757600060c083870101525b50601f01601f1916830160c0019150611fcd905060408301866001600160a01b03169052565b6001600160a01b038416606083015282151560808301529695505050505050565b6000806040838503121561200157600080fd5b823567ffffffffffffffff8082111561201957600080fd5b61202586838701611be4565b935060209150818501358181111561203c57600080fd5b85019050601f8101861361204f57600080fd5b803561205d611c0582611bab565b81815260059190911b8201830190838101908883111561207c57600080fd5b928401925b828410156120a9578335801515811461209a5760008081fd5b82529284019290840190612081565b80955050505050509250929050565b634e487b7160e01b600052603260045260246000fd5b6020808252825182820181905260009190848201906040850190845b8181101561210f5783516001600160a01b0316835292840192918401916001016120ea565b50909695505050505050565b600181811c9082168061212f57607f821691505b6020821081141561215057634e487b7160e01b600052602260045260246000fd5b50919050565b600080855481600182811c91508083168061217257607f831692505b602080841082141561219257634e487b7160e01b86526022600452602486fd5b8180156121a657600181146121b7576121e4565b60ff198616895284890196506121e4565b60008c81526020902060005b868110156121dc5781548b8201529085019083016121c3565b505084890196505b5098855250505050938401929092525050604001919050565b634e487b7160e01b600052601160045260246000fd5b600082821015612225576122256121fd565b500390565b6000821982111561223d5761223d6121fd565b500190565b60008261225f57634e487b7160e01b600052601260045260246000fd5b500490565b600081600019048311821515161561227e5761227e6121fd565b50029056fea164736f6c6343000809000a", + "deployedBytecode": "0x6080604052600436106101a55760003560e01c806372fada5c116100e15780638e2749d61161008a57806398a268711161006457806398a268711461056b578063c52164c61461059b578063d6e8b973146105bb578063f7d0e04b146105db57600080fd5b80638e2749d6146105045780638e2a3d36146105245780639872dbfe1461055557600080fd5b80637f94f65d116100bb5780637f94f65d1461048c5780638652b37e146104ac5780638da5cb5b146104cc57600080fd5b806372fada5c1461041f578063758d77d41461043f57806377cd38a41461045f57600080fd5b8063363179721161014e578063574983c811610128578063574983c81461039e5780635fd8c710146103be57806369cc6af4146103d35780636a1460241461040357600080fd5b80633631797214610313578063461f3120146103335780634b2ae9801461037357600080fd5b806316d722401161017f57806316d722401461023357806329cc7d10146102dc5780632dfdf0b5146102fc57600080fd5b806304937320146101b15780630d2a2d44146101f157806313af40351461021357600080fd5b366101ac57005b600080fd5b3480156101bd57600080fd5b506101de6101cc366004611b4b565b60056020526000908152604090205481565b6040519081526020015b60405180910390f35b3480156101fd57600080fd5b5061021161020c366004611c58565b6105fb565b005b34801561021f57600080fd5b5061021161022e366004611c95565b6106ec565b34801561023f57600080fd5b5061029861024e366004611b4b565b600860205260009081526040902080546001820154600283015460038401546004850154600586015460069096015494959394929391926001600160a01b03918216928216911687565b6040805197885260208801969096529486019390935260608501919091526001600160a01b03908116608085015290811660a08401521660c082015260e0016101e8565b3480156102e857600080fd5b506101de6102f7366004611cb2565b61078d565b34801561030857600080fd5b506003546101de9081565b34801561031f57600080fd5b5061021161032e366004611d8f565b610978565b34801561033f57600080fd5b5061036361034e366004611b4b565b60096020526000908152604090205460ff1681565b60405190151581526020016101e8565b34801561037f57600080fd5b506101de61038e366004611c95565b600c1b611000600160ac1b031690565b3480156103aa57600080fd5b506102116103b9366004611b4b565b610a38565b3480156103ca57600080fd5b50610211610ab6565b3480156103df57600080fd5b506103636103ee366004611c95565b600b6020526000908152604090205460ff1681565b34801561040f57600080fd5b506101de670de0b6b3a764000081565b34801561042b57600080fd5b5061021161043a366004611b4b565b610b40565b34801561044b57600080fd5b5061021161045a366004611ddb565b610bc8565b34801561046b57600080fd5b506101de61047a366004611b4b565b600a6020526000908152604090205481565b34801561049857600080fd5b506102116104a7366004611e3f565b610fbd565b3480156104b857600080fd5b506101de6104c7366004611e6b565b611050565b3480156104d857600080fd5b506000546104ec906001600160a01b031681565b6040516001600160a01b0390911681526020016101e8565b34801561051057600080fd5b5061021161051f366004611f1f565b611230565b34801561053057600080fd5b5061054461053f366004611b4b565b611398565b6040516101e8959493929190611f61565b34801561056157600080fd5b506101de60045481565b34801561057757600080fd5b50610363610586366004611b4b565b60066020526000908152604090205460ff1681565b3480156105a757600080fd5b506002546104ec906001600160a01b031681565b3480156105c757600080fd5b506102116105d6366004611fee565b611462565b3480156105e757600080fd5b506102116105f6366004611c95565b61153a565b6000546001600160a01b031633146106495760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b60448201526064015b60405180910390fd5b80516000905b808210156106b057600061068984848151811061066e5761066e6120b8565b6020026020010151611000600160ac1b03600c9190911b1690565b6000908152600660205260409020805460ff1916600190811790915592909201915061064f565b50507f14a422d2412784a5749d03da98921fe468c98577b767851389a9f58ea5a363d7816040516106e191906120ce565b60405180910390a150565b6000546001600160a01b031633146107355760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401610640565b6000805473ffffffffffffffffffffffffffffffffffffffff19166001600160a01b0383169081178255604051909133917f8292fce18fa69edf4db7b94ea2e58241df0ae57f97e0a6c9b29067028bf92d769190a350565b6001600160a01b0385166000908152600b6020526040812054869060ff166107c857604051630abc194760e11b815260040160405180910390fd5b6107d06115c1565b915060006040518060a0016040528088815260200187878080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152505050908252503360208201526001600160a01b038a166040820152600160609091015290506108456115d1565b8315610855576108553385610fbd565b6000838152600760209081526040909120825181558183015180518493610883926001850192910190611ab2565b5060408201516002820180546001600160a01b0392831673ffffffffffffffffffffffffffffffffffffffff199091161790556060830151600392830180546080909501511515600160a01b027fffffffffffffffffffffff00000000000000000000000000000000000000000090951691909216179290921790915561090d9080546001019055565b6109198233308a6115fc565b61092260018055565b604080518481526001600160a01b038a16602082015290810188905233907f25ac57b911b0f66b64c294827f539545fbc3ddd002cafab117776274f3241e4c9060600160405180910390a2505095945050505050565b6109806115d1565b61098983611693565b6109938282611230565b60008381526007602052604090206003810154600160a01b900460ff161515600114156109c3576109c384610b40565b600381015481546000835560028301546001600160a01b03928316926109ec91849116836116d0565b604080518781526020810183905233917f7719804546c0185709e60c90d164447ff251a5ba29af0216faa921350f6bebf7910160405180910390a2505050610a3360018055565b505050565b6000546001600160a01b03163314610a815760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401610640565b806004557f70fa43ca70216ad905ade86b9e650a691b2ce5a01980d0a81bdd8324141b8511816040516106e191815260200190565b6000546001600160a01b03163314610aff5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401610640565b47610b0a338261175c565b60408051338152602081018390527feaff4b37086828766ad3268786972c0cd24259d4c87a80f9d3963a3c3d999b0d91016106e1565b610b4981611693565b6000818152600760209081526040918290206003810180547fffffffffffffffffffffff00ffffffffffffffffffffffffffffffffffffffff1690556002015491518381526001600160a01b03909216917fb4d98b272597e828d9b172c0d44390d5b267040e918088eac8a0a0fadcb81c70910160405180910390a250565b610bd06115d1565b60008681526008602052604090206002810154610c00576040516331da482760e11b815260040160405180910390fd5b4381600301541015610c25576040516307b7d7dd60e51b815260040160405180910390fd5b8054600090815260076020908152604080832060028501549151909392610c5592600186019290918b9101612156565b604051602081830303815290604052805190602001209050600081604051602001610cac91907f19457468657265756d205369676e6564204d6573736167653a0a3332000000008152601c810191909152603c0190565b60408051601f1981840301815291815281516020928301206000858152600990935291205490915060ff16151560011415610cfa57604051637a48537560e11b815260040160405180910390fd5b6040805160008082526020820180845284905260ff8816928201929092526060810189905260808101889052610d6e9060019060a0016020604051602081039080840390855afa158015610d52573d6000803e3d6000fd5b5050604051601f190151600c1b611000600160ac1b0316919050565b60008181526006602052604090205490915060ff16610da057604051632057875960e21b815260040160405180910390fd5b6003840154600286015460018701546001600160a01b0390921691600090610dc89083612213565b600060028a0181905560038a01819055878152600960205260409020805460ff191660011790556006890154909150336001600160a01b0390911614610e79576001880154611000600160ac1b0333600c1b1660009081526005602052604081208054909190610e3990849061222a565b90915550506006880154600c1b611000600160ac1b031660009081526005602052604081208054849290610e6e90849061222a565b90915550610ebb9050565b818860010154610e89919061222a565b611000600160ac1b0333600c1b1660009081526005602052604081208054909190610eb590849061222a565b90915550505b6004880154610ed59084906001600160a01b0316836116d0565b600188015415610f415760058801546001600160a01b038e8116911614610f325760058801546001808a0154610f1a9286926001600160a01b0390911691901c6116d0565b610f2d838e60018b60010154901c6116d0565b610f41565b610f41838e8a600101546116d0565b8760040160009054906101000a90046001600160a01b03166001600160a01b03167f3fd2eee5028b09fa70abe3da4f6023ea41bfde24cfcb9c167f17d6fbe79eece38f84604051610f9c929190918252602082015260400190565b60405180910390a25050505050505050610fb560018055565b505050505050565b6001600160a01b03821633141561103757611000600160ac1b03600c83901b166000908152600a602090815260409182902083905581516001600160a01b038516815290810183905281517f0b294da292f26e55fd442b5c0164fbb9013036ff00c5cfdde0efd01c1baaf632929181900390910190a15050565b6040516342e8fb9360e11b815260040160405180910390fd5b600061105a6115d1565b6110648383611230565b60008a81526007602052604090206003810154600160a01b900460ff1661109e57604051635972996f60e11b815260040160405180910390fd5b80548711156110c0576040516308aeed0f60e21b815260040160405180910390fd5b6110cb8b888c6117b7565b915060006040518060e001604052808d81526020018a8152602001898152602001600454436110fa919061222a565b81526001600160a01b03808e1660208301528c1660408201523360609091015290508515611163576002820154600c1b611000600160ac1b03166000908152600a602052604090205461115190889088903361183b565b61115c83828461186d565b505061121a565b68056bc75e2d631000008160400151116111825761115c83828461186d565b611000600160ac1b0333600c1b16600090815260056020526040812054906111ba6111b5670de0b6b3a764000084612242565b61196b565b90506111ce670de0b6b3a764000082612264565b836040015111806111ec575069d3c21bcecceda10000008360400151115b1561120a57604051630e0c7c2360e11b815260040160405180910390fd5b61121585848661186d565b505050505b61122360018055565b9998505050505050505050565b6000815b8082101561137c57600060086000868686818110611254576112546120b8565b905060200201358152602001908152602001600020905061127481611a27565b600281015481546000908152600760205260408120805490919061129990849061222a565b90915550506000600282018190556006820154600c1b611000600160ac1b031660008181526005602052604090205490915060011c68056bc75e2d6310000081116112fd57600082815260056020526040902068056bc75e2d63100000905561130f565b60008281526005602052604090208190555b60048301546001600160a01b03167f67e089478e21dd12c98e69331c4152f6c9b2038b91e0f28268ffa01558c0b4ff888888818110611350576113506120b8565b9050602002013560405161136691815260200190565b60405180910390a2846001019450505050611234565b808210156113925763dfb035c96000526004601cfd5b50505050565b600760205260009081526040902080546001820180549192916113ba9061211b565b80601f01602080910402602001604051908101604052809291908181526020018280546113e69061211b565b80156114335780601f1061140857610100808354040283529160200191611433565b820191906000526020600020905b81548152906001019060200180831161141657829003601f168201915b50505050600283015460039093015491926001600160a01b03908116929081169150600160a01b900460ff1685565b6000546001600160a01b031633146114ab5760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401610640565b8151806114c05763df9578836000526004601cfd5b815181146114d65763ff633a386000526004601cfd5b60208301602083016020830282015b808314610fb5578251600052600b60205260406000208251815550815183517f5d6e86e5341d57a92c49934296c51542a25015c9b1782a1c2722a940131c3d9a600080a36020830192506020820191506114e5565b6000546001600160a01b031633146115835760405162461bcd60e51b815260206004820152600c60248201526b15539055551213d49256915160a21b6044820152606401610640565b60028190556040516001600160a01b03821681527fe127cf589a3879da0156d4a24f43b44f65cfa3570de594806b0bfa2fcf06884f906020016106e1565b60006115cc60035490565b905090565b600154600214156115f55760405163558a1e0360e11b815260040160405180910390fd5b6002600155565b60006040516323b872dd60e01b6000528460045283602452826044526020600060646000808a5af13d15601f3d116001600051141617169150600060605280604052508061168c5760405162461bcd60e51b815260206004820152601460248201527f5452414e534645525f46524f4d5f4641494c45440000000000000000000000006044820152606401610640565b5050505050565b6000818152600760205260409020600201546001600160a01b031633146116cd576040516342e8fb9360e11b815260040160405180910390fd5b50565b600060405163a9059cbb60e01b6000528360045282602452602060006044600080895af13d15601f3d11600160005114161716915060006060528060405250806113925760405162461bcd60e51b815260206004820152600f60248201527f5452414e534645525f4641494c454400000000000000000000000000000000006044820152606401610640565b600080600080600085875af1905080610a335760405162461bcd60e51b815260206004820152601360248201527f4554485f5452414e534645525f4641494c4544000000000000000000000000006044820152606401610640565b6040805160208101859052908101839052606082811b6bffffffffffffffffffffffff191690820152600090607401604051602081830303815290604052805190602001209050436008600083815260200190815260200160002060030154106118345760405163d0404f8560e01b815260040160405180910390fd5b9392505050565b6118508484846001600160a01b038516611a6e565b61139257604051631dc23a5f60e11b815260040160405180910390fd5b600083815260086020908152604080832085518155918501516001830155840151600282018190556060850151600383015560808501516004830180546001600160a01b0392831673ffffffffffffffffffffffffffffffffffffffff199182161790915560a087015160058501805491841691831691909117905560c08701516006909401805494909216931692909217909155825490918391611913908490612213565b9091555050608082015182516040808501518151928352602083015285926001600160a01b0316917f2a28b2ae47b0bd4b104e7cd29b1dfa72846af8c4cfdc009da2ae29db68cb67ea910160405180910390a3505050565b600080634d2b179160e01b8360405160240161198991815260200190565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050509050600080600060206000855160208701600254617530fa92503d9150600051905080945082611a1e5763e10bf1cc6000526004601cfd5b50505050919050565b4381600301541115611a4c5760405163d0404f8560e01b815260040160405180910390fd5b60028101546116cd576040516331da482760e11b815260040160405180910390fd5b60008315611aaa578360051b8501855b803580851160051b94855260209485185260406000209301818110611aa257611aa7565b611a7e565b50505b501492915050565b828054611abe9061211b565b90600052602060002090601f016020900481019282611ae05760008555611b26565b82601f10611af957805160ff1916838001178555611b26565b82800160010185558215611b26579182015b82811115611b26578251825591602001919060010190611b0b565b50611b32929150611b36565b5090565b5b80821115611b325760008155600101611b37565b600060208284031215611b5d57600080fd5b5035919050565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f1916810167ffffffffffffffff81118282101715611ba357611ba3611b64565b604052919050565b600067ffffffffffffffff821115611bc557611bc5611b64565b5060051b60200190565b6001600160a01b03811681146116cd57600080fd5b600082601f830112611bf557600080fd5b81356020611c0a611c0583611bab565b611b7a565b82815260059290921b84018101918181019086841115611c2957600080fd5b8286015b84811015611c4d578035611c4081611bcf565b8352918301918301611c2d565b509695505050505050565b600060208284031215611c6a57600080fd5b813567ffffffffffffffff811115611c8157600080fd5b611c8d84828501611be4565b949350505050565b600060208284031215611ca757600080fd5b813561183481611bcf565b600080600080600060808688031215611cca57600080fd5b8535611cd581611bcf565b945060208601359350604086013567ffffffffffffffff80821115611cf957600080fd5b818801915088601f830112611d0d57600080fd5b813581811115611d1c57600080fd5b896020828501011115611d2e57600080fd5b96999598505060200195606001359392505050565b60008083601f840112611d5557600080fd5b50813567ffffffffffffffff811115611d6d57600080fd5b6020830191508360208260051b8501011115611d8857600080fd5b9250929050565b600080600060408486031215611da457600080fd5b83359250602084013567ffffffffffffffff811115611dc257600080fd5b611dce86828701611d43565b9497909650939450505050565b60008060008060008060c08789031215611df457600080fd5b863595506020870135611e0681611bcf565b945060408701359350606087013592506080870135915060a087013560ff81168114611e3157600080fd5b809150509295509295509295565b60008060408385031215611e5257600080fd5b8235611e5d81611bcf565b946020939093013593505050565b600080600080600080600080600060e08a8c031215611e8957600080fd5b8935985060208a0135611e9b81611bcf565b975060408a0135611eab81611bcf565b965060608a0135955060808a0135945060a08a013567ffffffffffffffff80821115611ed657600080fd5b611ee28d838e01611d43565b909650945060c08c0135915080821115611efb57600080fd5b50611f088c828d01611d43565b915080935050809150509295985092959850929598565b60008060208385031215611f3257600080fd5b823567ffffffffffffffff811115611f4957600080fd5b611f5585828601611d43565b90969095509350505050565b8581526000602060a08184015286518060a085015260005b81811015611f955788810183015185820160c001528201611f79565b81811115611fa757600060c083870101525b50601f01601f1916830160c0019150611fcd905060408301866001600160a01b03169052565b6001600160a01b038416606083015282151560808301529695505050505050565b6000806040838503121561200157600080fd5b823567ffffffffffffffff8082111561201957600080fd5b61202586838701611be4565b935060209150818501358181111561203c57600080fd5b85019050601f8101861361204f57600080fd5b803561205d611c0582611bab565b81815260059190911b8201830190838101908883111561207c57600080fd5b928401925b828410156120a9578335801515811461209a5760008081fd5b82529284019290840190612081565b80955050505050509250929050565b634e487b7160e01b600052603260045260246000fd5b6020808252825182820181905260009190848201906040850190845b8181101561210f5783516001600160a01b0316835292840192918401916001016120ea565b50909695505050505050565b600181811c9082168061212f57607f821691505b6020821081141561215057634e487b7160e01b600052602260045260246000fd5b50919050565b600080855481600182811c91508083168061217257607f831692505b602080841082141561219257634e487b7160e01b86526022600452602486fd5b8180156121a657600181146121b7576121e4565b60ff198616895284890196506121e4565b60008c81526020902060005b868110156121dc5781548b8201529085019083016121c3565b505084890196505b5098855250505050938401929092525050604001919050565b634e487b7160e01b600052601160045260246000fd5b600082821015612225576122256121fd565b500390565b6000821982111561223d5761223d6121fd565b500190565b60008261225f57634e487b7160e01b600052601260045260246000fd5b500490565b600081600019048311821515161561227e5761227e6121fd565b50029056fea164736f6c6343000809000a", "linkReferences": {}, "deployedLinkReferences": {} } diff --git a/src/utils/smart_contract_files/localhost.json b/src/utils/smart_contract_files/localhost.json index cf0e5d8..d334d4a 100644 --- a/src/utils/smart_contract_files/localhost.json +++ b/src/utils/smart_contract_files/localhost.json @@ -3,6 +3,6 @@ "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266", "0x70997970C51812dc3A010C7d01b50e0d17dc79C8" ], - "p2pix": "0x5FbDB2315678afecb367f032d93F642f64180aa3", - "token": "0xe7f1725E7734CE288F8367e1Bb143E90bb3F0512" + "p2pix": "0x9fE46736679d2D9a65F0992F2272dE9f3c7fa6e0", + "token": "0x5FbDB2315678afecb367f032d93F642f64180aa3" } \ No newline at end of file diff --git a/src/views/SellerView.vue b/src/views/SellerView.vue index 3f6d5d7..30aeb19 100644 --- a/src/views/SellerView.vue +++ b/src/views/SellerView.vue @@ -34,6 +34,7 @@ const approveOffer = async ({ offer, pixKey }: any) => { }; const sendNetwork = async () => { + console.log("OIOI"); loading.value = true; try { if (offerValue.value && pixKeyBuyer.value) { @@ -41,7 +42,9 @@ const sendNetwork = async () => { flowStep.value = Step.Sell; loading.value = false; } - } catch { + } catch (err) { + console.log("Erro"); + console.log(err); flowStep.value = Step.Network; loading.value = false; }