commit 725870dfe0da7749dcf1805bf0e5cafa0e87425e
parent 045de919d95e89afccc4c5a872c36458957c0d72
Author: lash <dev@holbrook.no>
Date: Mon, 15 Apr 2024 11:50:49 +0100
Merge remote-tracking branch 'ge/sohail/feat-events' into dev-0.1.0
Diffstat:
8 files changed, 68 insertions(+), 28 deletions(-)
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,4 @@ build/
dist/
solidity/*.json
solidity/*.bin
+.venv
+\ No newline at end of file
diff --git a/python/erc20_pool/data/DecimalQuote.bin b/python/erc20_pool/data/DecimalQuote.bin
@@ -1 +1 @@
-608060405234801561001057600080fd5b50610aff806100206000396000f3fe608060405234801561001057600080fd5b5060043610610053576000357c01000000000000000000000000000000000000000000000000000000009004806301ffc9a714610058578063dbb21d4014610088575b600080fd5b610072600480360381019061006d91906104fa565b6100b8565b60405161007f9190610542565b60405180910390f35b6100a2600480360381019061009d91906105f1565b610168565b6040516100af9190610653565b60405180910390f35b60006301ffc9a77c010000000000000000000000000000000000000000000000000000000002827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19160361010c5760019050610163565b63dbb21d407c010000000000000000000000000000000000000000000000000000000002827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19160361015e5760019050610163565b600090505b919050565b600080600080600060608873ffffffffffffffffffffffffffffffffffffffff166040516024016040516020818303038152906040527f313ce567000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161021991906106df565b6000604051808303816000865af19150503d8060008114610256576040519150601f19603f3d011682016040523d82523d6000602084013e61025b565b606091505b508092508193505050816102a4576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161029b90610753565b60405180910390fd5b808060200190518101906102b891906107ac565b94508773ffffffffffffffffffffffffffffffffffffffff166040516024016040516020818303038152906040527f313ce567000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161036191906106df565b6000604051808303816000865af19150503d806000811461039e576040519150601f19603f3d011682016040523d82523d6000602084013e6103a3565b606091505b508092508193505050816103ec576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016103e390610825565b60405180910390fd5b8080602001905181019061040091906107ac565b93508460ff168460ff160361041c578695505050505050610496565b8460ff168460ff1611156104625784846104369190610874565b60ff16925082600a61044891906109dc565b925082876104569190610a56565b95505050505050610496565b838561046e9190610874565b60ff16925082600a61048091906109dc565b9250828761048e9190610a87565b955050505050505b9392505050565b600080fd5b60007fffffffff0000000000000000000000000000000000000000000000000000000082169050919050565b6104d7816104a2565b81146104e257600080fd5b50565b6000813590506104f4816104ce565b92915050565b6000602082840312156105105761050f61049d565b5b600061051e848285016104e5565b91505092915050565b60008115159050919050565b61053c81610527565b82525050565b60006020820190506105576000830184610533565b92915050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60006105888261055d565b9050919050565b6105988161057d565b81146105a357600080fd5b50565b6000813590506105b58161058f565b92915050565b6000819050919050565b6105ce816105bb565b81146105d957600080fd5b50565b6000813590506105eb816105c5565b92915050565b60008060006060848603121561060a5761060961049d565b5b6000610618868287016105a6565b9350506020610629868287016105a6565b925050604061063a868287016105dc565b9150509250925092565b61064d816105bb565b82525050565b60006020820190506106686000830184610644565b92915050565b600081519050919050565b600081905092915050565b60005b838110156106a2578082015181840152602081019050610687565b60008484015250505050565b60006106b98261066e565b6106c38185610679565b93506106d3818560208601610684565b80840191505092915050565b60006106eb82846106ae565b915081905092915050565b600082825260208201905092915050565b7f4552525f544f4b454e5f4f555400000000000000000000000000000000000000600082015250565b600061073d600d836106f6565b915061074882610707565b602082019050919050565b6000602082019050818103600083015261076c81610730565b9050919050565b600060ff82169050919050565b61078981610773565b811461079457600080fd5b50565b6000815190506107a681610780565b92915050565b6000602082840312156107c2576107c161049d565b5b60006107d084828501610797565b91505092915050565b7f4552525f544f4b454e5f494e0000000000000000000000000000000000000000600082015250565b600061080f600c836106f6565b915061081a826107d9565b602082019050919050565b6000602082019050818103600083015261083e81610802565b9050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b600061087f82610773565b915061088a83610773565b9250828203905060ff8111156108a3576108a2610845565b5b92915050565b6000600282049050919050565b6000808291508390505b6001851115610900578086048111156108dc576108db610845565b5b60018516156108eb5780820291505b80810290506108f9856108a9565b94506108c0565b94509492505050565b60008261091957600190506109d5565b8161092757600090506109d5565b816001811461093d576002811461094757610976565b60019150506109d5565b60ff84111561095957610958610845565b5b8360020a9150848211156109705761096f610845565b5b506109d5565b5060208310610133831016604e8410600b84101617156109ab5782820a9050838111156109a6576109a5610845565b5b6109d5565b6109b884848460016108b6565b925090508184048111156109cf576109ce610845565b5b81810290505b9392505050565b60006109e7826105bb565b91506109f2836105bb565b9250610a1f7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8484610909565b905092915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601260045260246000fd5b6000610a61826105bb565b9150610a6c836105bb565b925082610a7c57610a7b610a27565b5b828204905092915050565b6000610a92826105bb565b9150610a9d836105bb565b9250828202610aab816105bb565b91508282048414831517610ac257610ac1610845565b5b509291505056fea2646970667358221220a6b8fddaa75c73235586d42c8a9005589297f778906457325b66b18ddcebbeed64736f6c63430008130033
-\ No newline at end of file
+6080604052348015600f57600080fd5b50610aaa8061001f6000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c806301ffc9a71461003b578063dbb21d401461006b575b600080fd5b610055600480360381019061005091906104a5565b61009b565b60405161006291906104ed565b60405180910390f35b6100856004803603810190610080919061059c565b610113565b60405161009291906105fe565b60405180910390f35b60006301ffc9a760e01b827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916036100d3576001905061010e565b63dbb21d4060e01b827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff191603610109576001905061010e565b600090505b919050565b600080600080600060608873ffffffffffffffffffffffffffffffffffffffff166040516024016040516020818303038152906040527f313ce567000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516101c4919061068a565b6000604051808303816000865af19150503d8060008114610201576040519150601f19603f3d011682016040523d82523d6000602084013e610206565b606091505b5080925081935050508161024f576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610246906106fe565b60405180910390fd5b808060200190518101906102639190610757565b94508773ffffffffffffffffffffffffffffffffffffffff166040516024016040516020818303038152906040527f313ce567000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161030c919061068a565b6000604051808303816000865af19150503d8060008114610349576040519150601f19603f3d011682016040523d82523d6000602084013e61034e565b606091505b50809250819350505081610397576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161038e906107d0565b60405180910390fd5b808060200190518101906103ab9190610757565b93508460ff168460ff16036103c7578695505050505050610441565b8460ff168460ff16111561040d5784846103e1919061081f565b60ff16925082600a6103f39190610987565b925082876104019190610a01565b95505050505050610441565b8385610419919061081f565b60ff16925082600a61042b9190610987565b925082876104399190610a32565b955050505050505b9392505050565b600080fd5b60007fffffffff0000000000000000000000000000000000000000000000000000000082169050919050565b6104828161044d565b811461048d57600080fd5b50565b60008135905061049f81610479565b92915050565b6000602082840312156104bb576104ba610448565b5b60006104c984828501610490565b91505092915050565b60008115159050919050565b6104e7816104d2565b82525050565b600060208201905061050260008301846104de565b92915050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b600061053382610508565b9050919050565b61054381610528565b811461054e57600080fd5b50565b6000813590506105608161053a565b92915050565b6000819050919050565b61057981610566565b811461058457600080fd5b50565b60008135905061059681610570565b92915050565b6000806000606084860312156105b5576105b4610448565b5b60006105c386828701610551565b93505060206105d486828701610551565b92505060406105e586828701610587565b9150509250925092565b6105f881610566565b82525050565b600060208201905061061360008301846105ef565b92915050565b600081519050919050565b600081905092915050565b60005b8381101561064d578082015181840152602081019050610632565b60008484015250505050565b600061066482610619565b61066e8185610624565b935061067e81856020860161062f565b80840191505092915050565b60006106968284610659565b915081905092915050565b600082825260208201905092915050565b7f4552525f544f4b454e5f4f555400000000000000000000000000000000000000600082015250565b60006106e8600d836106a1565b91506106f3826106b2565b602082019050919050565b60006020820190508181036000830152610717816106db565b9050919050565b600060ff82169050919050565b6107348161071e565b811461073f57600080fd5b50565b6000815190506107518161072b565b92915050565b60006020828403121561076d5761076c610448565b5b600061077b84828501610742565b91505092915050565b7f4552525f544f4b454e5f494e0000000000000000000000000000000000000000600082015250565b60006107ba600c836106a1565b91506107c582610784565b602082019050919050565b600060208201905081810360008301526107e9816107ad565b9050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b600061082a8261071e565b91506108358361071e565b9250828203905060ff81111561084e5761084d6107f0565b5b92915050565b60008160011c9050919050565b6000808291508390505b60018511156108ab57808604811115610887576108866107f0565b5b60018516156108965780820291505b80810290506108a485610854565b945061086b565b94509492505050565b6000826108c45760019050610980565b816108d25760009050610980565b81600181146108e857600281146108f257610921565b6001915050610980565b60ff841115610904576109036107f0565b5b8360020a91508482111561091b5761091a6107f0565b5b50610980565b5060208310610133831016604e8410600b84101617156109565782820a905083811115610951576109506107f0565b5b610980565b6109638484846001610861565b9250905081840481111561097a576109796107f0565b5b81810290505b9392505050565b600061099282610566565b915061099d83610566565b92506109ca7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff84846108b4565b905092915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601260045260246000fd5b6000610a0c82610566565b9150610a1783610566565b925082610a2757610a266109d2565b5b828204905092915050565b6000610a3d82610566565b9150610a4883610566565b9250828202610a5681610566565b91508282048414831517610a6d57610a6c6107f0565b5b509291505056fea26469706673582212200467563bac5ddc57ed952ebe547987881c094cbd6d9c99702dacf1e09184163164736f6c63430008190033
+\ No newline at end of file
diff --git a/python/erc20_pool/data/DecimalQuote.metadata.json b/python/erc20_pool/data/DecimalQuote.metadata.json
@@ -1 +1 @@
-{"compiler":{"version":"0.8.19+commit.7dd6d404"},"language":"Solidity","output":{"abi":[{"inputs":[{"internalType":"bytes4","name":"_sum","type":"bytes4"}],"name":"supportsInterface","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"pure","type":"function"},{"inputs":[{"internalType":"address","name":"_outToken","type":"address"},{"internalType":"address","name":"_inToken","type":"address"},{"internalType":"uint256","name":"_value","type":"uint256"}],"name":"valueFor","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"}],"devdoc":{"kind":"dev","methods":{},"version":1},"userdoc":{"kind":"user","methods":{},"version":1}},"settings":{"compilationTarget":{"DecimalQuote.sol":"DecimalQuote"},"evmVersion":"byzantium","libraries":{},"metadata":{"bytecodeHash":"ipfs"},"optimizer":{"enabled":false,"runs":200},"remappings":[]},"sources":{"DecimalQuote.sol":{"keccak256":"0x4053ab914f5f3b89b17af0e091de359c808058461d12502cf53d495b5abc31b4","license":"AGPL-3.0-or-later","urls":["bzz-raw://496e4f4a2039dc9447d04db14ce8624b4caf2038cf017c56f632157a50f69cae","dweb:/ipfs/QmWDRaBfANxZrKb73AziafrbB5tZkgYjvd1ym1vGje47Ui"]}},"version":1}
+{"compiler":{"version":"0.8.25+commit.b61c2a91"},"language":"Solidity","output":{"abi":[{"inputs":[{"internalType":"bytes4","name":"_sum","type":"bytes4"}],"name":"supportsInterface","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"pure","type":"function"},{"inputs":[{"internalType":"address","name":"_outToken","type":"address"},{"internalType":"address","name":"_inToken","type":"address"},{"internalType":"uint256","name":"_value","type":"uint256"}],"name":"valueFor","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"}],"devdoc":{"kind":"dev","methods":{},"version":1},"userdoc":{"kind":"user","methods":{},"version":1}},"settings":{"compilationTarget":{"DecimalQuote.sol":"DecimalQuote"},"evmVersion":"istanbul","libraries":{},"metadata":{"bytecodeHash":"ipfs"},"optimizer":{"enabled":false,"runs":200},"remappings":[]},"sources":{"DecimalQuote.sol":{"keccak256":"0x4053ab914f5f3b89b17af0e091de359c808058461d12502cf53d495b5abc31b4","license":"AGPL-3.0-or-later","urls":["bzz-raw://496e4f4a2039dc9447d04db14ce8624b4caf2038cf017c56f632157a50f69cae","dweb:/ipfs/QmWDRaBfANxZrKb73AziafrbB5tZkgYjvd1ym1vGje47Ui"]}},"version":1}
diff --git a/python/erc20_pool/data/SwapPool.bin b/python/erc20_pool/data/SwapPool.bin
@@ -1 +1 @@
-60a06040523480156200001157600080fd5b50604051620030bf380380620030bf833981810160405281019062000037919062000369565b846006908162000048919062000680565b5083600790816200005a919062000680565b508260ff166080818152505081600160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555080600260006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550336000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550505050505062000767565b6000604051905090565b600080fd5b600080fd5b600080fd5b600080fd5b6000601f19601f8301169050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b6200019c8262000151565b810181811067ffffffffffffffff82111715620001be57620001bd62000162565b5b80604052505050565b6000620001d362000133565b9050620001e1828262000191565b919050565b600067ffffffffffffffff82111562000204576200020362000162565b5b6200020f8262000151565b9050602081019050919050565b60005b838110156200023c5780820151818401526020810190506200021f565b60008484015250505050565b60006200025f6200025984620001e6565b620001c7565b9050828152602081018484840111156200027e576200027d6200014c565b5b6200028b8482856200021c565b509392505050565b600082601f830112620002ab57620002aa62000147565b5b8151620002bd84826020860162000248565b91505092915050565b600060ff82169050919050565b620002de81620002c6565b8114620002ea57600080fd5b50565b600081519050620002fe81620002d3565b92915050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000620003318262000304565b9050919050565b620003438162000324565b81146200034f57600080fd5b50565b600081519050620003638162000338565b92915050565b600080600080600060a086880312156200038857620003876200013d565b5b600086015167ffffffffffffffff811115620003a957620003a862000142565b5b620003b78882890162000293565b955050602086015167ffffffffffffffff811115620003db57620003da62000142565b5b620003e98882890162000293565b9450506040620003fc88828901620002ed565b93505060606200040f8882890162000352565b9250506080620004228882890162000352565b9150509295509295909350565b600081519050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b600060028204905060018216806200048257607f821691505b6020821081036200049857620004976200043a565b5b50919050565b60008190508160005260206000209050919050565b60006020601f8301049050919050565b60008160020a8302905092915050565b600060088302620005057fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff82620004c3565b620005118683620004c3565b95508019841693508086168417925050509392505050565b6000819050919050565b6000819050919050565b60006200055e62000558620005528462000529565b62000533565b62000529565b9050919050565b6000819050919050565b6200057a836200053d565b62000592620005898262000565565b848454620004d3565b825550505050565b600090565b620005a96200059a565b620005b68184846200056f565b505050565b5b81811015620005de57620005d26000826200059f565b600181019050620005bc565b5050565b601f8211156200062d57620005f7816200049e565b6200060284620004b3565b8101602085101562000612578190505b6200062a6200062185620004b3565b830182620005bb565b50505b505050565b60008160020a8304905092915050565b6000620006556000198460080262000632565b1980831691505092915050565b600062000670838362000642565b9150826002028217905092915050565b6200068b826200042f565b67ffffffffffffffff811115620006a757620006a662000162565b5b620006b3825462000469565b620006c0828285620005e2565b600060209050601f831160018114620006f85760008415620006e3578287015190505b620006ef858262000662565b8655506200075f565b601f19841662000708866200049e565b60005b8281101562000732578489015182556001820191506020850194506020810190506200070b565b868310156200075257848901516200074e601f89168262000642565b8355505b6001600288020188555050505b505050505050565b60805161293c620007836000396000610586015261293c6000f3fe608060405234801561001057600080fd5b5060043610610133576000357c01000000000000000000000000000000000000000000000000000000009004806369fe0e2d116100bf57806395d89b411161008e57806395d89b4114610300578063d9caed121461031e578063f2fde38b1461033a578063f3fef3a31461036a578063f912c64b1461039a57610133565b806369fe0e2d1461027a57806386fe212d146102965780638705fcd4146102c65780638da5cb5b146102e257610133565b80632c1758c1116101065780632c1758c1146101c2578063313ce567146101f257806331a5995d1461021057806347e7ef241461022e57806351cff8d91461024a57610133565b806301ffc9a71461013857806306fdde031461016857806318160ddd1461018657806318cbbcfc146101a4575b600080fd5b610152600480360381019061014d9190611cd4565b6103b6565b60405161015f9190611d1c565b60405180910390f35b6101706104b8565b60405161017d9190611dc7565b60405180910390f35b61018e610546565b60405161019b9190611e02565b60405180910390f35b6101ac61054c565b6040516101b99190611e02565b60405180910390f35b6101dc60048036038101906101d79190611e49565b610551565b6040516101e99190611d1c565b60405180910390f35b6101fa610584565b6040516102079190611e02565b60405180910390f35b6102186105a8565b6040516102259190611e02565b60405180910390f35b61024860048036038101906102439190611ed4565b6105ae565b005b610264600480360381019061025f9190611f14565b61079e565b6040516102719190611e02565b60405180910390f35b610294600480360381019061028f9190611e49565b61083a565b005b6102b060048036038101906102ab9190611e49565b610964565b6040516102bd9190611e02565b60405180910390f35b6102e060048036038101906102db9190611f14565b610a4c565b005b6102ea610b6b565b6040516102f79190611f50565b60405180910390f35b610308610b8f565b6040516103159190611dc7565b60405180910390f35b61033860048036038101906103339190611f6b565b610c1d565b005b610354600480360381019061034f9190611f14565b611043565b6040516103619190611d1c565b60405180910390f35b610384600480360381019061037f9190611ed4565b611185565b6040516103919190611e02565b60405180910390f35b6103b460048036038101906103af9190611f14565b6113dd565b005b60006301ffc9a77c010000000000000000000000000000000000000000000000000000000002827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19160361040a57600190506104b3565b639493f8b27c010000000000000000000000000000000000000000000000000000000002827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19160361045c57600190506104b3565b630d7491f87c010000000000000000000000000000000000000000000000000000000002827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916036104ae57600190506104b3565b600090505b919050565b600680546104c590611fed565b80601f01602080910402602001604051908101604052809291908181526020018280546104f190611fed565b801561053e5780601f106105135761010080835404028352916020019161053e565b820191906000526020600020905b81548152906001019060200180831161052157829003601f168201915b505050505081565b60085481565b600781565b60006007821061056057600080fd5b60008203610575576007600a5414905061057f565b81600a5483161490505b919050565b7f000000000000000000000000000000000000000000000000000000000000000081565b600a5481565b600060606105de84600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff166114fc565b6105e884846116d5565b8373ffffffffffffffffffffffffffffffffffffffff163330856040516024016106149392919061207d565b6040516020818303038152906040527f23b872dd000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161069e91906120fb565b6000604051808303816000865af19150503d80600081146106db576040519150601f19603f3d011682016040523d82523d6000602084013e6106e0565b606091505b50809250819350505081610729576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016107209061215e565b60405180910390fd5b8080602001905181019061073d91906121aa565b91508161077f576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161077690612223565b60405180910390fd5b82600860008282546107919190612272565b9250508190555050505050565b600080600960008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205490506000600960008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506108328382611185565b915050919050565b610847600160ff16610551565b15610887576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161087e906122f2565b60405180910390fd5b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614610915576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161090c9061235e565b60405180910390fd5b620f4240811061095a576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610951906123ca565b60405180910390fd5b8060048190555050565b600060078211156109aa576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016109a190612436565b60405180910390fd5b6000600a548316146109f1576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016109e8906124a2565b60405180910390fd5b81600a600082825417925050819055506007600a541415157f6b7e2e653f93b645d4ed7292d6429f96637084363e477c8aaea1a43ed13c284e600a54604051610a3a9190611e02565b60405180910390a2600a549050919050565b610a59600260ff16610551565b15610a99576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610a90906122f2565b60405180910390fd5b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614610b27576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610b1e9061235e565b60405180910390fd5b80600560006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050565b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60078054610b9c90611fed565b80601f0160208091040260200160405190810160405280929190818152602001828054610bc890611fed565b8015610c155780601f10610bea57610100808354040283529160200191610c15565b820191906000526020600020905b815481529060010190602001808311610bf857829003601f168201915b505050505081565b600060606000806000610c2f86611a5c565b90508086610c3d91906124c2565b9250610c4a888885611a89565b92508773ffffffffffffffffffffffffffffffffffffffff1630604051602401610c7491906124f6565b6040516020818303038152906040527f70a08231000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051610cfe91906120fb565b6000604051808303816000865af19150503d8060008114610d3b576040519150601f19603f3d011682016040523d82523d6000602084013e610d40565b606091505b50809550819650505084610d89576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610d809061215e565b60405180910390fd5b83806020019051810190610d9d9190612526565b91508083610dab9190612272565b821015610ded576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610de49061259f565b60405180910390fd5b610df787876105ae565b8773ffffffffffffffffffffffffffffffffffffffff163384604051602401610e219291906125bf565b6040516020818303038152906040527fa9059cbb000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051610eab91906120fb565b6000604051808303816000865af19150503d8060008114610ee8576040519150601f19603f3d011682016040523d82523d6000602084013e610eed565b606091505b50809550819650505084610f36576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610f2d9061215e565b60405180910390fd5b83806020019051810190610f4a91906121aa565b945084610f8c576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610f8390612223565b60405180910390fd5b600073ffffffffffffffffffffffffffffffffffffffff16600560009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16146110395780600960008a73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008282546110319190612272565b925050819055505b5050505050505050565b60008060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff161461109e57600080fd5b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff169050826000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e060405160405180910390a36001915050919050565b6000806060600073ffffffffffffffffffffffffffffffffffffffff16600560009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff160361121b576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016112129061235e565b60405180910390fd5b8473ffffffffffffffffffffffffffffffffffffffff16600560009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16856040516024016112679291906125bf565b6040516020818303038152906040527fa9059cbb000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516112f191906120fb565b6000604051808303816000865af19150503d806000811461132e576040519150601f19603f3d011682016040523d82523d6000602084013e611333565b606091505b5080925081935050508161137c576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016113739061215e565b60405180910390fd5b8080602001905181019061139091906121aa565b9150816113d2576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016113c990612223565b60405180910390fd5b839250505092915050565b6113ea600460ff16610551565b1561142a576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401611421906122f2565b60405180910390fd5b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16146114b8576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016114af9061235e565b60405180910390fd5b80600360006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050565b60006060600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff160361153b5750506116d1565b8273ffffffffffffffffffffffffffffffffffffffff16846040516024016115639190611f50565b6040516020818303038152906040527f3ef25013000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516115ed91906120fb565b6000604051808303816000865af19150503d806000811461162a576040519150601f19603f3d011682016040523d82523d6000602084013e61162f565b606091505b50809250819350505081611678576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161166f90612634565b60405180910390fd5b8080602001905181019061168c91906121aa565b9150816116ce576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016116c5906126a0565b60405180910390fd5b50505b5050565b60006060600080600073ffffffffffffffffffffffffffffffffffffffff16600260009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff160361173b5750505050611a58565b600260009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1686306040516024016117879291906126c0565b6040516020818303038152906040527f23778613000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161181191906120fb565b6000604051808303816000865af19150503d806000811461184e576040519150601f19603f3d011682016040523d82523d6000602084013e611853565b606091505b5080945081955050508361189c576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161189390612735565b60405180910390fd5b828060200190518101906118b09190612526565b91508573ffffffffffffffffffffffffffffffffffffffff16306040516024016118da91906124f6565b6040516020818303038152906040527f70a08231000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161196491906120fb565b6000604051808303816000865af19150503d80600081146119a1576040519150601f19603f3d011682016040523d82523d6000602084013e6119a6565b606091505b508094508195505050836119ef576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016119e69061215e565b60405180910390fd5b82806020019051810190611a039190612526565b9050818582611a129190612272565b1115611a53576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401611a4a906127a1565b60405180910390fd5b505050505b5050565b60008060045483611a6d91906127c1565b9050620f424081611a7e9190612832565b905080915050919050565b600080606060008073ffffffffffffffffffffffffffffffffffffffff16600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1603611af057849350505050611c70565b600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16878787604051602401611b3e93929190612863565b6040516020818303038152906040527fdbb21d40000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051611bc891906120fb565b6000604051808303816000865af19150503d8060008114611c05576040519150601f19603f3d011682016040523d82523d6000602084013e611c0a565b606091505b50809350819450505082611c53576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401611c4a906128e6565b60405180910390fd5b81806020019051810190611c679190612526565b90508093505050505b9392505050565b600080fd5b60007fffffffff0000000000000000000000000000000000000000000000000000000082169050919050565b611cb181611c7c565b8114611cbc57600080fd5b50565b600081359050611cce81611ca8565b92915050565b600060208284031215611cea57611ce9611c77565b5b6000611cf884828501611cbf565b91505092915050565b60008115159050919050565b611d1681611d01565b82525050565b6000602082019050611d316000830184611d0d565b92915050565b600081519050919050565b600082825260208201905092915050565b60005b83811015611d71578082015181840152602081019050611d56565b60008484015250505050565b6000601f19601f8301169050919050565b6000611d9982611d37565b611da38185611d42565b9350611db3818560208601611d53565b611dbc81611d7d565b840191505092915050565b60006020820190508181036000830152611de18184611d8e565b905092915050565b6000819050919050565b611dfc81611de9565b82525050565b6000602082019050611e176000830184611df3565b92915050565b611e2681611de9565b8114611e3157600080fd5b50565b600081359050611e4381611e1d565b92915050565b600060208284031215611e5f57611e5e611c77565b5b6000611e6d84828501611e34565b91505092915050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000611ea182611e76565b9050919050565b611eb181611e96565b8114611ebc57600080fd5b50565b600081359050611ece81611ea8565b92915050565b60008060408385031215611eeb57611eea611c77565b5b6000611ef985828601611ebf565b9250506020611f0a85828601611e34565b9150509250929050565b600060208284031215611f2a57611f29611c77565b5b6000611f3884828501611ebf565b91505092915050565b611f4a81611e96565b82525050565b6000602082019050611f656000830184611f41565b92915050565b600080600060608486031215611f8457611f83611c77565b5b6000611f9286828701611ebf565b9350506020611fa386828701611ebf565b9250506040611fb486828701611e34565b9150509250925092565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b6000600282049050600182168061200557607f821691505b60208210810361201857612017611fbe565b5b50919050565b6000819050919050565b600061204361203e61203984611e76565b61201e565b611e76565b9050919050565b600061205582612028565b9050919050565b60006120678261204a565b9050919050565b6120778161205c565b82525050565b60006060820190506120926000830186611f41565b61209f602083018561206e565b6120ac6040830184611df3565b949350505050565b600081519050919050565b600081905092915050565b60006120d5826120b4565b6120df81856120bf565b93506120ef818560208601611d53565b80840191505092915050565b600061210782846120ca565b915081905092915050565b7f4552525f544f4b454e0000000000000000000000000000000000000000000000600082015250565b6000612148600983611d42565b915061215382612112565b602082019050919050565b600060208201905081810360008301526121778161213b565b9050919050565b61218781611d01565b811461219257600080fd5b50565b6000815190506121a48161217e565b92915050565b6000602082840312156121c0576121bf611c77565b5b60006121ce84828501612195565b91505092915050565b7f4552525f5452414e534645520000000000000000000000000000000000000000600082015250565b600061220d600c83611d42565b9150612218826121d7565b602082019050919050565b6000602082019050818103600083015261223c81612200565b9050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b600061227d82611de9565b915061228883611de9565b92508282019050808211156122a05761229f612243565b5b92915050565b7f4552525f5345414c000000000000000000000000000000000000000000000000600082015250565b60006122dc600883611d42565b91506122e7826122a6565b602082019050919050565b6000602082019050818103600083015261230b816122cf565b9050919050565b7f4552525f41585800000000000000000000000000000000000000000000000000600082015250565b6000612348600783611d42565b915061235382612312565b602082019050919050565b600060208201905081810360008301526123778161233b565b9050919050565b7f4552525f4645455f544f4f5f4849474800000000000000000000000000000000600082015250565b60006123b4601083611d42565b91506123bf8261237e565b602082019050919050565b600060208201905081810360008301526123e3816123a7565b9050919050565b7f4552525f494e56414c49445f5354415445000000000000000000000000000000600082015250565b6000612420601183611d42565b915061242b826123ea565b602082019050919050565b6000602082019050818103600083015261244f81612413565b9050919050565b7f4552525f414c52454144595f4c4f434b45440000000000000000000000000000600082015250565b600061248c601283611d42565b915061249782612456565b602082019050919050565b600060208201905081810360008301526124bb8161247f565b9050919050565b60006124cd82611de9565b91506124d883611de9565b92508282039050818111156124f0576124ef612243565b5b92915050565b600060208201905061250b600083018461206e565b92915050565b60008151905061252081611e1d565b92915050565b60006020828403121561253c5761253b611c77565b5b600061254a84828501612511565b91505092915050565b7f4552525f42414c414e4345000000000000000000000000000000000000000000600082015250565b6000612589600b83611d42565b915061259482612553565b602082019050919050565b600060208201905081810360008301526125b88161257c565b9050919050565b60006040820190506125d46000830185611f41565b6125e16020830184611df3565b9392505050565b7f4552525f52454749535452590000000000000000000000000000000000000000600082015250565b600061261e600c83611d42565b9150612629826125e8565b602082019050919050565b6000602082019050818103600083015261264d81612611565b9050919050565b7f4552525f554e415554485f544f4b454e00000000000000000000000000000000600082015250565b600061268a601083611d42565b915061269582612654565b602082019050919050565b600060208201905081810360008301526126b98161267d565b9050919050565b60006040820190506126d56000830185611f41565b6126e2602083018461206e565b9392505050565b7f4552525f4c494d49544552000000000000000000000000000000000000000000600082015250565b600061271f600b83611d42565b915061272a826126e9565b602082019050919050565b6000602082019050818103600083015261274e81612712565b9050919050565b7f4552525f4c494d49540000000000000000000000000000000000000000000000600082015250565b600061278b600983611d42565b915061279682612755565b602082019050919050565b600060208201905081810360008301526127ba8161277e565b9050919050565b60006127cc82611de9565b91506127d783611de9565b92508282026127e581611de9565b915082820484148315176127fc576127fb612243565b5b5092915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601260045260246000fd5b600061283d82611de9565b915061284883611de9565b92508261285857612857612803565b5b828204905092915050565b60006060820190506128786000830186611f41565b6128856020830185611f41565b6128926040830184611df3565b949350505050565b7f4552525f51554f54455200000000000000000000000000000000000000000000600082015250565b60006128d0600a83611d42565b91506128db8261289a565b602082019050919050565b600060208201905081810360008301526128ff816128c3565b905091905056fea26469706673582212201f7c2ae121176c113ae06e6b16f823379825d3480ddefc5dcbcd3c98c282bc4f64736f6c63430008130033
-\ No newline at end of file
+60a060405234801561001057600080fd5b5060405161344e38038061344e83398181016040528101906100329190610335565b84600690816100419190610609565b5083600790816100519190610609565b508260ff166080818152505081600160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555080600260006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550336000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050505050506106db565b6000604051905090565b600080fd5b600080fd5b600080fd5b600080fd5b6000601f19601f8301169050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b61019082610147565b810181811067ffffffffffffffff821117156101af576101ae610158565b5b80604052505050565b60006101c2610129565b90506101ce8282610187565b919050565b600067ffffffffffffffff8211156101ee576101ed610158565b5b6101f782610147565b9050602081019050919050565b60005b83811015610222578082015181840152602081019050610207565b60008484015250505050565b600061024161023c846101d3565b6101b8565b90508281526020810184848401111561025d5761025c610142565b5b610268848285610204565b509392505050565b600082601f8301126102855761028461013d565b5b815161029584826020860161022e565b91505092915050565b600060ff82169050919050565b6102b48161029e565b81146102bf57600080fd5b50565b6000815190506102d1816102ab565b92915050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000610302826102d7565b9050919050565b610312816102f7565b811461031d57600080fd5b50565b60008151905061032f81610309565b92915050565b600080600080600060a0868803121561035157610350610133565b5b600086015167ffffffffffffffff81111561036f5761036e610138565b5b61037b88828901610270565b955050602086015167ffffffffffffffff81111561039c5761039b610138565b5b6103a888828901610270565b94505060406103b9888289016102c2565b93505060606103ca88828901610320565b92505060806103db88828901610320565b9150509295509295909350565b600081519050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b6000600282049050600182168061043a57607f821691505b60208210810361044d5761044c6103f3565b5b50919050565b60008190508160005260206000209050919050565b60006020601f8301049050919050565b600082821b905092915050565b6000600883026104b57fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff82610478565b6104bf8683610478565b95508019841693508086168417925050509392505050565b6000819050919050565b6000819050919050565b60006105066105016104fc846104d7565b6104e1565b6104d7565b9050919050565b6000819050919050565b610520836104eb565b61053461052c8261050d565b848454610485565b825550505050565b600090565b61054961053c565b610554818484610517565b505050565b5b818110156105785761056d600082610541565b60018101905061055a565b5050565b601f8211156105bd5761058e81610453565b61059784610468565b810160208510156105a6578190505b6105ba6105b285610468565b830182610559565b50505b505050565b600082821c905092915050565b60006105e0600019846008026105c2565b1980831691505092915050565b60006105f983836105cf565b9150826002028217905092915050565b610612826103e8565b67ffffffffffffffff81111561062b5761062a610158565b5b6106358254610422565b61064082828561057c565b600060209050601f8311600181146106735760008415610661578287015190505b61066b85826105ed565b8655506106d3565b601f19841661068186610453565b60005b828110156106a957848901518255600182019150602085019450602081019050610684565b868310156106c657848901516106c2601f8916826105cf565b8355505b6001600288020188555050505b505050505050565b608051612d586106f660003960006106680152612d586000f3fe608060405234801561001057600080fd5b50600436106101735760003560e01c806386fe212d116100de578063c515ee2311610097578063f2fde38b11610071578063f2fde38b14610440578063f3fef3a314610470578063f912c64b146104a0578063faaebd21146104bc57610173565b8063c515ee23146103d6578063c6bbd5a714610406578063d9caed121461042457610173565b806386fe212d146103125780638705fcd4146103425780638da5cb5b1461035e57806395d89b411461037c5780639d23c4c71461039a578063a534150c146103b857610173565b806331a5995d1161013057806331a5995d14610250578063412753581461026e57806347e7ef241461028c57806351cff8d9146102a857806353799c57146102d857806369fe0e2d146102f657610173565b806301ffc9a71461017857806306fdde03146101a857806318160ddd146101c657806318cbbcfc146101e45780632c1758c114610202578063313ce56714610232575b600080fd5b610192600480360381019061018d919061203f565b6104ec565b60405161019f9190612087565b60405180910390f35b6101b061059a565b6040516101bd9190612132565b60405180910390f35b6101ce610628565b6040516101db919061216d565b60405180910390f35b6101ec61062e565b6040516101f9919061216d565b60405180910390f35b61021c600480360381019061021791906121b4565b610633565b6040516102299190612087565b60405180910390f35b61023a610666565b604051610247919061216d565b60405180910390f35b61025861068a565b604051610265919061216d565b60405180910390f35b610276610690565b6040516102839190612222565b60405180910390f35b6102a660048036038101906102a19190612269565b6106b6565b005b6102c260048036038101906102bd91906122a9565b610729565b6040516102cf919061216d565b60405180910390f35b6102e06107c5565b6040516102ed9190612222565b60405180910390f35b610310600480360381019061030b91906121b4565b6107eb565b005b61032c600480360381019061032791906121b4565b610915565b604051610339919061216d565b60405180910390f35b61035c600480360381019061035791906122a9565b6109fd565b005b610366610b1c565b6040516103739190612222565b60405180910390f35b610384610b40565b6040516103919190612132565b60405180910390f35b6103a2610bce565b6040516103af9190612222565b60405180910390f35b6103c0610bf4565b6040516103cd919061216d565b60405180910390f35b6103f060048036038101906103eb91906122d6565b610bfa565b6040516103fd919061216d565b60405180910390f35b61040e610de8565b60405161041b9190612222565b60405180910390f35b61043e600480360381019061043991906122d6565b610e0e565b005b61045a600480360381019061045591906122a9565b611294565b6040516104679190612087565b60405180910390f35b61048a60048036038101906104859190612269565b6113d6565b604051610497919061216d565b60405180910390f35b6104ba60048036038101906104b591906122a9565b61172e565b005b6104d660048036038101906104d191906122a9565b61184d565b6040516104e3919061216d565b60405180910390f35b60006301ffc9a760e01b827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916036105245760019050610595565b639493f8b260e01b827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19160361055a5760019050610595565b630d7491f860e01b827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916036105905760019050610595565b600090505b919050565b600680546105a790612358565b80601f01602080910402602001604051908101604052809291908181526020018280546105d390612358565b80156106205780601f106105f557610100808354040283529160200191610620565b820191906000526020600020905b81548152906001019060200180831161060357829003601f168201915b505050505081565b60085481565b600781565b60006007821061064257600080fd5b60008203610657576007600a54149050610661565b81600a5483161490505b919050565b7f000000000000000000000000000000000000000000000000000000000000000081565b600a5481565b600560009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b6106c08282611865565b8173ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167f5548c837ab068cf56a2c2479df0882a4922fd203edb7517321831d95078c5f628360405161071d919061216d565b60405180910390a35050565b600080600960008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205490506000600960008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506107bd83826113d6565b915050919050565b600260009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b6107f8600160ff16610633565b15610838576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161082f906123d5565b60405180910390fd5b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16146108c6576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016108bd90612441565b60405180910390fd5b620f4240811061090b576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610902906124ad565b60405180910390fd5b8060048190555050565b6000600782111561095b576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161095290612519565b60405180910390fd5b6000600a548316146109a2576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161099990612585565b60405180910390fd5b81600a600082825417925050819055506007600a541415157f6b7e2e653f93b645d4ed7292d6429f96637084363e477c8aaea1a43ed13c284e600a546040516109eb919061216d565b60405180910390a2600a549050919050565b610a0a600260ff16610633565b15610a4a576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610a41906123d5565b60405180910390fd5b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614610ad8576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610acf90612441565b60405180910390fd5b80600560006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050565b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60078054610b4d90612358565b80601f0160208091040260200160405190810160405280929190818152602001828054610b7990612358565b8015610bc65780601f10610b9b57610100808354040283529160200191610bc6565b820191906000526020600020905b815481529060010190602001808311610ba957829003601f168201915b505050505081565b600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60045481565b600080606060008073ffffffffffffffffffffffffffffffffffffffff16600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1603610c6157849350505050610de1565b600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16878787604051602401610caf939291906125a5565b6040516020818303038152906040527fdbb21d40000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051610d399190612623565b6000604051808303816000865af19150503d8060008114610d76576040519150601f19603f3d011682016040523d82523d6000602084013e610d7b565b606091505b50809350819450505082610dc4576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610dbb90612686565b60405180910390fd5b81806020019051810190610dd891906126bb565b90508093505050505b9392505050565b600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b600060606000806000610e22888888610bfa565b90508773ffffffffffffffffffffffffffffffffffffffff1630604051602401610e4c9190612747565b6040516020818303038152906040527f70a08231000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051610ed69190612623565b6000604051808303816000865af19150503d8060008114610f13576040519150601f19603f3d011682016040523d82523d6000602084013e610f18565b606091505b50809550819650505084610f61576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610f58906127ae565b60405180910390fd5b83806020019051810190610f7591906126bb565b9250610f8081611a55565b91508181610f8e91906127fd565b905080831015610fd3576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610fca9061287d565b60405180910390fd5b610fdd8787611865565b8773ffffffffffffffffffffffffffffffffffffffff16338260405160240161100792919061289d565b6040516020818303038152906040527fa9059cbb000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516110919190612623565b6000604051808303816000865af19150503d80600081146110ce576040519150601f19603f3d011682016040523d82523d6000602084013e6110d3565b606091505b5080955081965050508461111c576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401611113906127ae565b60405180910390fd5b8380602001905181019061113091906128f2565b945084611172576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016111699061296b565b60405180910390fd5b600073ffffffffffffffffffffffffffffffffffffffff16600560009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff161461121f5781600960008a73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206000828254611217919061298b565b925050819055505b8673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fd6d34547c69c5ee3d2667625c188acf1006abb93e0ee7cf03925c67cf77604138a89858760405161128294939291906129bf565b60405180910390a35050505050505050565b60008060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16146112ef57600080fd5b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff169050826000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e060405160405180910390a36001915050919050565b600080606060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614611469576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161146090612a50565b60405180910390fd5b600073ffffffffffffffffffffffffffffffffffffffff16600560009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16036114fa576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016114f190612441565b60405180910390fd5b8473ffffffffffffffffffffffffffffffffffffffff16600560009054906101000a900473ffffffffffffffffffffffffffffffffffffffff168560405160240161154692919061289d565b6040516020818303038152906040527fa9059cbb000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516115d09190612623565b6000604051808303816000865af19150503d806000811461160d576040519150601f19603f3d011682016040523d82523d6000602084013e611612565b606091505b5080925081935050508161165b576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401611652906127ae565b60405180910390fd5b8080602001905181019061166f91906128f2565b9150816116b1576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016116a89061296b565b60405180910390fd5b600560009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff167f1314fd112a381beea61539dbd21ec04afcff2662ac7d1b83273aade1f53d1b97868660405161171b92919061289d565b60405180910390a2839250505092915050565b61173b600460ff16610633565b1561177b576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401611772906123d5565b60405180910390fd5b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614611809576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161180090612441565b60405180910390fd5b80600360006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050565b60096020528060005260406000206000915090505481565b6000606061189584600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16611a82565b61189f8484611c5b565b8373ffffffffffffffffffffffffffffffffffffffff163330856040516024016118cb93929190612a70565b6040516020818303038152906040527f23b872dd000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516119559190612623565b6000604051808303816000865af19150503d8060008114611992576040519150601f19603f3d011682016040523d82523d6000602084013e611997565b606091505b508092508193505050816119e0576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016119d7906127ae565b60405180910390fd5b808060200190518101906119f491906128f2565b915081611a36576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401611a2d9061296b565b60405180910390fd5b8260086000828254611a48919061298b565b9250508190555050505050565b60008060045483611a669190612aa7565b9050620f424081611a779190612b18565b905080915050919050565b60006060600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff1603611ac1575050611c57565b8273ffffffffffffffffffffffffffffffffffffffff1684604051602401611ae99190612222565b6040516020818303038152906040527f3ef25013000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051611b739190612623565b6000604051808303816000865af19150503d8060008114611bb0576040519150601f19603f3d011682016040523d82523d6000602084013e611bb5565b606091505b50809250819350505081611bfe576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401611bf590612b95565b60405180910390fd5b80806020019051810190611c1291906128f2565b915081611c54576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401611c4b90612c01565b60405180910390fd5b50505b5050565b60006060600080600073ffffffffffffffffffffffffffffffffffffffff16600260009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1603611cc15750505050611fde565b600260009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168630604051602401611d0d929190612c21565b6040516020818303038152906040527f23778613000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051611d979190612623565b6000604051808303816000865af19150503d8060008114611dd4576040519150601f19603f3d011682016040523d82523d6000602084013e611dd9565b606091505b50809450819550505083611e22576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401611e1990612c96565b60405180910390fd5b82806020019051810190611e3691906126bb565b91508573ffffffffffffffffffffffffffffffffffffffff1630604051602401611e609190612747565b6040516020818303038152906040527f70a08231000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051611eea9190612623565b6000604051808303816000865af19150503d8060008114611f27576040519150601f19603f3d011682016040523d82523d6000602084013e611f2c565b606091505b50809450819550505083611f75576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401611f6c906127ae565b60405180910390fd5b82806020019051810190611f8991906126bb565b9050818582611f98919061298b565b1115611fd9576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401611fd090612d02565b60405180910390fd5b505050505b5050565b600080fd5b60007fffffffff0000000000000000000000000000000000000000000000000000000082169050919050565b61201c81611fe7565b811461202757600080fd5b50565b60008135905061203981612013565b92915050565b60006020828403121561205557612054611fe2565b5b60006120638482850161202a565b91505092915050565b60008115159050919050565b6120818161206c565b82525050565b600060208201905061209c6000830184612078565b92915050565b600081519050919050565b600082825260208201905092915050565b60005b838110156120dc5780820151818401526020810190506120c1565b60008484015250505050565b6000601f19601f8301169050919050565b6000612104826120a2565b61210e81856120ad565b935061211e8185602086016120be565b612127816120e8565b840191505092915050565b6000602082019050818103600083015261214c81846120f9565b905092915050565b6000819050919050565b61216781612154565b82525050565b6000602082019050612182600083018461215e565b92915050565b61219181612154565b811461219c57600080fd5b50565b6000813590506121ae81612188565b92915050565b6000602082840312156121ca576121c9611fe2565b5b60006121d88482850161219f565b91505092915050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b600061220c826121e1565b9050919050565b61221c81612201565b82525050565b60006020820190506122376000830184612213565b92915050565b61224681612201565b811461225157600080fd5b50565b6000813590506122638161223d565b92915050565b600080604083850312156122805761227f611fe2565b5b600061228e85828601612254565b925050602061229f8582860161219f565b9150509250929050565b6000602082840312156122bf576122be611fe2565b5b60006122cd84828501612254565b91505092915050565b6000806000606084860312156122ef576122ee611fe2565b5b60006122fd86828701612254565b935050602061230e86828701612254565b925050604061231f8682870161219f565b9150509250925092565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b6000600282049050600182168061237057607f821691505b60208210810361238357612382612329565b5b50919050565b7f4552525f5345414c000000000000000000000000000000000000000000000000600082015250565b60006123bf6008836120ad565b91506123ca82612389565b602082019050919050565b600060208201905081810360008301526123ee816123b2565b9050919050565b7f4552525f41585800000000000000000000000000000000000000000000000000600082015250565b600061242b6007836120ad565b9150612436826123f5565b602082019050919050565b6000602082019050818103600083015261245a8161241e565b9050919050565b7f4552525f4645455f544f4f5f4849474800000000000000000000000000000000600082015250565b60006124976010836120ad565b91506124a282612461565b602082019050919050565b600060208201905081810360008301526124c68161248a565b9050919050565b7f4552525f494e56414c49445f5354415445000000000000000000000000000000600082015250565b60006125036011836120ad565b915061250e826124cd565b602082019050919050565b60006020820190508181036000830152612532816124f6565b9050919050565b7f4552525f414c52454144595f4c4f434b45440000000000000000000000000000600082015250565b600061256f6012836120ad565b915061257a82612539565b602082019050919050565b6000602082019050818103600083015261259e81612562565b9050919050565b60006060820190506125ba6000830186612213565b6125c76020830185612213565b6125d4604083018461215e565b949350505050565b600081519050919050565b600081905092915050565b60006125fd826125dc565b61260781856125e7565b93506126178185602086016120be565b80840191505092915050565b600061262f82846125f2565b915081905092915050565b7f4552525f51554f54455200000000000000000000000000000000000000000000600082015250565b6000612670600a836120ad565b915061267b8261263a565b602082019050919050565b6000602082019050818103600083015261269f81612663565b9050919050565b6000815190506126b581612188565b92915050565b6000602082840312156126d1576126d0611fe2565b5b60006126df848285016126a6565b91505092915050565b6000819050919050565b600061270d612708612703846121e1565b6126e8565b6121e1565b9050919050565b600061271f826126f2565b9050919050565b600061273182612714565b9050919050565b61274181612726565b82525050565b600060208201905061275c6000830184612738565b92915050565b7f4552525f544f4b454e0000000000000000000000000000000000000000000000600082015250565b60006127986009836120ad565b91506127a382612762565b602082019050919050565b600060208201905081810360008301526127c78161278b565b9050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b600061280882612154565b915061281383612154565b925082820390508181111561282b5761282a6127ce565b5b92915050565b7f4552525f42414c414e4345000000000000000000000000000000000000000000600082015250565b6000612867600b836120ad565b915061287282612831565b602082019050919050565b600060208201905081810360008301526128968161285a565b9050919050565b60006040820190506128b26000830185612213565b6128bf602083018461215e565b9392505050565b6128cf8161206c565b81146128da57600080fd5b50565b6000815190506128ec816128c6565b92915050565b60006020828403121561290857612907611fe2565b5b6000612916848285016128dd565b91505092915050565b7f4552525f5452414e534645520000000000000000000000000000000000000000600082015250565b6000612955600c836120ad565b91506129608261291f565b602082019050919050565b6000602082019050818103600083015261298481612948565b9050919050565b600061299682612154565b91506129a183612154565b92508282019050808211156129b9576129b86127ce565b5b92915050565b60006080820190506129d46000830187612213565b6129e1602083018661215e565b6129ee604083018561215e565b6129fb606083018461215e565b95945050505050565b7f4552525f4f574e45520000000000000000000000000000000000000000000000600082015250565b6000612a3a6009836120ad565b9150612a4582612a04565b602082019050919050565b60006020820190508181036000830152612a6981612a2d565b9050919050565b6000606082019050612a856000830186612213565b612a926020830185612738565b612a9f604083018461215e565b949350505050565b6000612ab282612154565b9150612abd83612154565b9250828202612acb81612154565b91508282048414831517612ae257612ae16127ce565b5b5092915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601260045260246000fd5b6000612b2382612154565b9150612b2e83612154565b925082612b3e57612b3d612ae9565b5b828204905092915050565b7f4552525f52454749535452590000000000000000000000000000000000000000600082015250565b6000612b7f600c836120ad565b9150612b8a82612b49565b602082019050919050565b60006020820190508181036000830152612bae81612b72565b9050919050565b7f4552525f554e415554485f544f4b454e00000000000000000000000000000000600082015250565b6000612beb6010836120ad565b9150612bf682612bb5565b602082019050919050565b60006020820190508181036000830152612c1a81612bde565b9050919050565b6000604082019050612c366000830185612213565b612c436020830184612738565b9392505050565b7f4552525f4c494d49544552000000000000000000000000000000000000000000600082015250565b6000612c80600b836120ad565b9150612c8b82612c4a565b602082019050919050565b60006020820190508181036000830152612caf81612c73565b9050919050565b7f4552525f4c494d49540000000000000000000000000000000000000000000000600082015250565b6000612cec6009836120ad565b9150612cf782612cb6565b602082019050919050565b60006020820190508181036000830152612d1b81612cdf565b905091905056fea2646970667358221220a4fb2492a9ae6fc7bbe1da1c16fad8c402355ad8c5d78db2bfbb495d38c6da7a64736f6c63430008190033
+\ No newline at end of file
diff --git a/python/erc20_pool/data/SwapPool.json b/python/erc20_pool/data/SwapPool.json
@@ -1 +1 @@
-[{"inputs":[{"internalType":"string","name":"_name","type":"string"},{"internalType":"string","name":"_symbol","type":"string"},{"internalType":"uint8","name":"_decimals","type":"uint8"},{"internalType":"address","name":"_tokenRegistry","type":"address"},{"internalType":"address","name":"_tokenLimiter","type":"address"}],"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"previousOwner","type":"address"},{"indexed":true,"internalType":"address","name":"newOwner","type":"address"}],"name":"OwnershipTransferred","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"bool","name":"_final","type":"bool"},{"indexed":false,"internalType":"uint256","name":"_sealState","type":"uint256"}],"name":"SealStateChange","type":"event"},{"inputs":[],"name":"decimals","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_token","type":"address"},{"internalType":"uint256","name":"_value","type":"uint256"}],"name":"deposit","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint256","name":"_state","type":"uint256"}],"name":"isSealed","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"maxSealState","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"name","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"owner","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"_state","type":"uint256"}],"name":"seal","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"sealState","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"_fee","type":"uint256"}],"name":"setFee","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_feeAddress","type":"address"}],"name":"setFeeAddress","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_quoter","type":"address"}],"name":"setQuoter","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"bytes4","name":"_sum","type":"bytes4"}],"name":"supportsInterface","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"pure","type":"function"},{"inputs":[],"name":"symbol","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"totalSupply","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_newOwner","type":"address"}],"name":"transferOwnership","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_outToken","type":"address"}],"name":"withdraw","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_outToken","type":"address"},{"internalType":"address","name":"_inToken","type":"address"},{"internalType":"uint256","name":"_value","type":"uint256"}],"name":"withdraw","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_outToken","type":"address"},{"internalType":"uint256","name":"_value","type":"uint256"}],"name":"withdraw","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"}]
+[{"inputs":[{"internalType":"string","name":"_name","type":"string"},{"internalType":"string","name":"_symbol","type":"string"},{"internalType":"uint8","name":"_decimals","type":"uint8"},{"internalType":"address","name":"_tokenRegistry","type":"address"},{"internalType":"address","name":"_tokenLimiter","type":"address"}],"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"feeAddress","type":"address"},{"indexed":false,"internalType":"address","name":"tokenOut","type":"address"},{"indexed":false,"internalType":"uint256","name":"amountOut","type":"uint256"}],"name":"Collect","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"initiator","type":"address"},{"indexed":true,"internalType":"address","name":"tokenIn","type":"address"},{"indexed":false,"internalType":"uint256","name":"amountIn","type":"uint256"}],"name":"Deposit","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"previousOwner","type":"address"},{"indexed":true,"internalType":"address","name":"newOwner","type":"address"}],"name":"OwnershipTransferred","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"bool","name":"_final","type":"bool"},{"indexed":false,"internalType":"uint256","name":"_sealState","type":"uint256"}],"name":"SealStateChange","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"initiator","type":"address"},{"indexed":true,"internalType":"address","name":"tokenIn","type":"address"},{"indexed":false,"internalType":"address","name":"tokenOut","type":"address"},{"indexed":false,"internalType":"uint256","name":"amountIn","type":"uint256"},{"indexed":false,"internalType":"uint256","name":"amountOut","type":"uint256"},{"indexed":false,"internalType":"uint256","name":"fee","type":"uint256"}],"name":"Swap","type":"event"},{"inputs":[],"name":"decimals","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_token","type":"address"},{"internalType":"uint256","name":"_value","type":"uint256"}],"name":"deposit","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"feeAddress","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"feePpm","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"","type":"address"}],"name":"fees","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_outToken","type":"address"},{"internalType":"address","name":"_inToken","type":"address"},{"internalType":"uint256","name":"_value","type":"uint256"}],"name":"getQuote","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint256","name":"_state","type":"uint256"}],"name":"isSealed","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"maxSealState","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"name","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"owner","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"quoter","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"_state","type":"uint256"}],"name":"seal","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"sealState","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"_fee","type":"uint256"}],"name":"setFee","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_feeAddress","type":"address"}],"name":"setFeeAddress","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_quoter","type":"address"}],"name":"setQuoter","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"bytes4","name":"_sum","type":"bytes4"}],"name":"supportsInterface","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"pure","type":"function"},{"inputs":[],"name":"symbol","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"tokenLimiter","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"tokenRegistry","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"totalSupply","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_newOwner","type":"address"}],"name":"transferOwnership","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_outToken","type":"address"}],"name":"withdraw","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_outToken","type":"address"},{"internalType":"address","name":"_inToken","type":"address"},{"internalType":"uint256","name":"_value","type":"uint256"}],"name":"withdraw","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_outToken","type":"address"},{"internalType":"uint256","name":"_value","type":"uint256"}],"name":"withdraw","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"}]
diff --git a/python/erc20_pool/data/SwapPool.metadata.json b/python/erc20_pool/data/SwapPool.metadata.json
@@ -1 +1 @@
-{"compiler":{"version":"0.8.19+commit.7dd6d404"},"language":"Solidity","output":{"abi":[{"inputs":[{"internalType":"string","name":"_name","type":"string"},{"internalType":"string","name":"_symbol","type":"string"},{"internalType":"uint8","name":"_decimals","type":"uint8"},{"internalType":"address","name":"_tokenRegistry","type":"address"},{"internalType":"address","name":"_tokenLimiter","type":"address"}],"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"previousOwner","type":"address"},{"indexed":true,"internalType":"address","name":"newOwner","type":"address"}],"name":"OwnershipTransferred","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"bool","name":"_final","type":"bool"},{"indexed":false,"internalType":"uint256","name":"_sealState","type":"uint256"}],"name":"SealStateChange","type":"event"},{"inputs":[],"name":"decimals","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_token","type":"address"},{"internalType":"uint256","name":"_value","type":"uint256"}],"name":"deposit","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint256","name":"_state","type":"uint256"}],"name":"isSealed","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"maxSealState","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"name","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"owner","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"_state","type":"uint256"}],"name":"seal","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"sealState","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"_fee","type":"uint256"}],"name":"setFee","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_feeAddress","type":"address"}],"name":"setFeeAddress","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_quoter","type":"address"}],"name":"setQuoter","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"bytes4","name":"_sum","type":"bytes4"}],"name":"supportsInterface","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"pure","type":"function"},{"inputs":[],"name":"symbol","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"totalSupply","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_newOwner","type":"address"}],"name":"transferOwnership","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_outToken","type":"address"}],"name":"withdraw","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_outToken","type":"address"},{"internalType":"address","name":"_inToken","type":"address"},{"internalType":"uint256","name":"_value","type":"uint256"}],"name":"withdraw","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_outToken","type":"address"},{"internalType":"uint256","name":"_value","type":"uint256"}],"name":"withdraw","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"}],"devdoc":{"kind":"dev","methods":{},"version":1},"userdoc":{"kind":"user","methods":{},"version":1}},"settings":{"compilationTarget":{"SwapPool.sol":"SwapPool"},"evmVersion":"byzantium","libraries":{},"metadata":{"bytecodeHash":"ipfs"},"optimizer":{"enabled":false,"runs":200},"remappings":[]},"sources":{"SwapPool.sol":{"keccak256":"0xa983b4d156c8caabe2c4ba228769ca472231a4404470ba6e6053aa2fbaa74f70","license":"AGPL-3.0-or-later","urls":["bzz-raw://ea16e2718c27a0780f77c7f79d23d521bac19a3001ec908a245950dc99f20c20","dweb:/ipfs/QmSQ4boJbvYGTyeR9Twv81N51xcusRtpbQv8w9aFPfXSnu"]}},"version":1}
+{"compiler":{"version":"0.8.25+commit.b61c2a91"},"language":"Solidity","output":{"abi":[{"inputs":[{"internalType":"string","name":"_name","type":"string"},{"internalType":"string","name":"_symbol","type":"string"},{"internalType":"uint8","name":"_decimals","type":"uint8"},{"internalType":"address","name":"_tokenRegistry","type":"address"},{"internalType":"address","name":"_tokenLimiter","type":"address"}],"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"feeAddress","type":"address"},{"indexed":false,"internalType":"address","name":"tokenOut","type":"address"},{"indexed":false,"internalType":"uint256","name":"amountOut","type":"uint256"}],"name":"Collect","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"initiator","type":"address"},{"indexed":true,"internalType":"address","name":"tokenIn","type":"address"},{"indexed":false,"internalType":"uint256","name":"amountIn","type":"uint256"}],"name":"Deposit","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"previousOwner","type":"address"},{"indexed":true,"internalType":"address","name":"newOwner","type":"address"}],"name":"OwnershipTransferred","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"bool","name":"_final","type":"bool"},{"indexed":false,"internalType":"uint256","name":"_sealState","type":"uint256"}],"name":"SealStateChange","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"initiator","type":"address"},{"indexed":true,"internalType":"address","name":"tokenIn","type":"address"},{"indexed":false,"internalType":"address","name":"tokenOut","type":"address"},{"indexed":false,"internalType":"uint256","name":"amountIn","type":"uint256"},{"indexed":false,"internalType":"uint256","name":"amountOut","type":"uint256"},{"indexed":false,"internalType":"uint256","name":"fee","type":"uint256"}],"name":"Swap","type":"event"},{"inputs":[],"name":"decimals","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_token","type":"address"},{"internalType":"uint256","name":"_value","type":"uint256"}],"name":"deposit","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"feeAddress","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"feePpm","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"","type":"address"}],"name":"fees","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_outToken","type":"address"},{"internalType":"address","name":"_inToken","type":"address"},{"internalType":"uint256","name":"_value","type":"uint256"}],"name":"getQuote","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint256","name":"_state","type":"uint256"}],"name":"isSealed","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"maxSealState","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"name","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"owner","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"quoter","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"_state","type":"uint256"}],"name":"seal","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"sealState","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"_fee","type":"uint256"}],"name":"setFee","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_feeAddress","type":"address"}],"name":"setFeeAddress","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_quoter","type":"address"}],"name":"setQuoter","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"bytes4","name":"_sum","type":"bytes4"}],"name":"supportsInterface","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"pure","type":"function"},{"inputs":[],"name":"symbol","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"tokenLimiter","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"tokenRegistry","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"totalSupply","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_newOwner","type":"address"}],"name":"transferOwnership","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_outToken","type":"address"}],"name":"withdraw","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_outToken","type":"address"},{"internalType":"address","name":"_inToken","type":"address"},{"internalType":"uint256","name":"_value","type":"uint256"}],"name":"withdraw","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_outToken","type":"address"},{"internalType":"uint256","name":"_value","type":"uint256"}],"name":"withdraw","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"}],"devdoc":{"kind":"dev","methods":{},"version":1},"userdoc":{"kind":"user","methods":{},"version":1}},"settings":{"compilationTarget":{"SwapPool.sol":"SwapPool"},"evmVersion":"istanbul","libraries":{},"metadata":{"bytecodeHash":"ipfs"},"optimizer":{"enabled":false,"runs":200},"remappings":[]},"sources":{"SwapPool.sol":{"keccak256":"0x3dfc6ebc8d007e726a6b4cff3dbf90cc6f108e007ceae407ff0f025009e0ce45","license":"AGPL-3.0-or-later","urls":["bzz-raw://7fb8f6dd21d0704c7145895e7c3aa0541f349d8d84fa9d826afa79016e322aa0","dweb:/ipfs/QmVR8GhA8JHVVMe3MHg1A2QoScecjYi4vKhkBUXKbWRuUK"]}},"version":1}
diff --git a/solidity/Makefile b/solidity/Makefile
@@ -1,13 +1,13 @@
-SOLC = /usr/bin/solc
+SOLC = /usr/local/bin/solc
all:
- $(SOLC) --bin SwapPool.sol --evm-version byzantium | awk 'NR>3' > SwapPool.bin
- $(SOLC) --abi SwapPool.sol --evm-version byzantium | awk 'NR>3' > SwapPool.json
- $(SOLC) --metadata SwapPool.sol --evm-version byzantium | awk 'NR>3' > SwapPool.metadata.json
+ $(SOLC) --bin SwapPool.sol --evm-version istanbul | awk 'NR>3' > SwapPool.bin
+ $(SOLC) --abi SwapPool.sol --evm-version istanbul | awk 'NR>3' > SwapPool.json
+ $(SOLC) --metadata SwapPool.sol --evm-version istanbul | awk 'NR>3' > SwapPool.metadata.json
truncate -s -1 SwapPool.bin
- $(SOLC) --bin DecimalQuote.sol --evm-version byzantium | awk 'NR>3' > DecimalQuote.bin
- $(SOLC) --abi DecimalQuote.sol --evm-version byzantium | awk 'NR>3' > DecimalQuote.json
- $(SOLC) --metadata DecimalQuote.sol --evm-version byzantium | awk 'NR>3' > DecimalQuote.metadata.json
+ $(SOLC) --bin DecimalQuote.sol --evm-version istanbul | awk 'NR>3' > DecimalQuote.bin
+ $(SOLC) --abi DecimalQuote.sol --evm-version istanbul | awk 'NR>3' > DecimalQuote.json
+ $(SOLC) --metadata DecimalQuote.sol --evm-version istanbul | awk 'NR>3' > DecimalQuote.metadata.json
truncate -s -1 DecimalQuote.bin
install: all
diff --git a/solidity/SwapPool.sol b/solidity/SwapPool.sol
@@ -9,11 +9,11 @@ contract SwapPool {
// Implements EIP173
address public owner;
- address tokenRegistry;
- address tokenLimiter;
- address quoter;
- uint256 feePpm;
- address feeAddress;
+ address public tokenRegistry;
+ address public tokenLimiter;
+ address public quoter;
+ uint256 public feePpm;
+ address public feeAddress;
string public name;
string public symbol;
@@ -21,7 +21,7 @@ contract SwapPool {
uint256 public totalSupply;
- mapping ( address => uint256 ) fees;
+ mapping ( address => uint256 ) public fees;
// Implements Seal
uint256 public sealState;
@@ -36,6 +36,30 @@ contract SwapPool {
// EIP173
event OwnershipTransferred(address indexed previousOwner, address indexed newOwner); // EIP173
+ // Emitted after a successful swap
+ event Swap(
+ address indexed initiator,
+ address indexed tokenIn,
+ address tokenOut,
+ uint256 amountIn,
+ uint256 amountOut,
+ uint256 fee
+ );
+
+ // Emitted only after a liquidity donation
+ event Deposit(
+ address indexed initiator,
+ address indexed tokenIn,
+ uint256 amountIn
+ );
+
+ // Emitted when collecting fees to the set feeAddress
+ event Collect(
+ address indexed feeAddress,
+ address tokenOut,
+ uint256 amountOut
+ );
+
constructor(string memory _name, string memory _symbol, uint8 _decimals, address _tokenRegistry, address _tokenLimiter) {
name = _name;
symbol = _symbol;
@@ -96,6 +120,11 @@ contract SwapPool {
}
function deposit(address _token, uint256 _value) public {
+ _deposit(_token, _value);
+ emit Deposit(msg.sender, _token, _value);
+ }
+
+ function _deposit(address _token, uint256 _value) private {
bool r;
bytes memory v;
@@ -119,7 +148,7 @@ contract SwapPool {
return fee;
}
- function getQuote(address _outToken, address _inToken, uint256 _value) private returns (uint256) {
+ function getQuote(address _outToken, address _inToken, uint256 _value) public returns (uint256) {
bool r;
bytes memory v;
uint256 quote;
@@ -137,22 +166,26 @@ contract SwapPool {
function withdraw(address _outToken, address _inToken, uint256 _value) public {
bool r;
bytes memory v;
- uint256 netValue;
uint256 balance;
uint256 fee;
+ uint256 outValue;
- fee = getFee(_value);
- netValue = _value - fee;
- netValue = getQuote(_outToken, _inToken, netValue);
+ outValue = getQuote(_outToken, _inToken, _value);
(r, v) = _outToken.call(abi.encodeWithSignature("balanceOf(address)", this));
require(r, "ERR_TOKEN");
balance = abi.decode(v, (uint256));
- require(balance >= netValue + fee, "ERR_BALANCE");
- deposit(_inToken, _value);
+ // deduct the fees from the quoted outValue
+ fee = getFee(outValue);
+ outValue -= fee;
+
+ // pool should have enough balance to cover the final outValue (fees already deducted)
+ require(balance >= outValue, "ERR_BALANCE");
- (r, v) = _outToken.call(abi.encodeWithSignature('transfer(address,uint256)', msg.sender, netValue));
+ _deposit(_inToken, _value);
+
+ (r, v) = _outToken.call(abi.encodeWithSignature('transfer(address,uint256)', msg.sender, outValue));
require(r, "ERR_TOKEN");
r = abi.decode(v, (bool));
require(r, "ERR_TRANSFER");
@@ -160,6 +193,8 @@ contract SwapPool {
if (feeAddress != address(0)) {
fees[_outToken] += fee;
}
+
+ emit Swap(msg.sender, _inToken, _outToken, _value, outValue, fee);
}
// Withdraw token to fee address
@@ -176,6 +211,7 @@ contract SwapPool {
bool r;
bytes memory v;
+ require(msg.sender == owner, "ERR_OWNER");
require(feeAddress != address(0), "ERR_AXX");
(r, v) = _outToken.call(abi.encodeWithSignature('transfer(address,uint256)', feeAddress, _value));
@@ -183,6 +219,7 @@ contract SwapPool {
r = abi.decode(v, (bool));
require(r, "ERR_TRANSFER");
+ emit Collect(feeAddress, _outToken, _value);
return _value;
}
@@ -235,3 +272,4 @@ contract SwapPool {
return false;
}
}
+
