From 4931ef1d700a750c64417997d8d1905fdafb103e Mon Sep 17 00:00:00 2001 From: Mohammed Sohail Date: Tue, 26 Mar 2024 16:56:44 +0800 Subject: [PATCH] fix: include fees in public liquidity --- python/erc20_pool/data/SwapPool.bin | 2 +- python/erc20_pool/data/SwapPool.metadata.json | 2 +- solidity/SwapPool.sol | 6 +----- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/python/erc20_pool/data/SwapPool.bin b/python/erc20_pool/data/SwapPool.bin index 4b7a768..21f6ea3 100644 --- a/python/erc20_pool/data/SwapPool.bin +++ b/python/erc20_pool/data/SwapPool.bin @@ -1 +1 @@ -60a060405234801561001057600080fd5b506040516131ab3803806131ab83398181016040528101906100329190610335565b84600690816100419190610609565b5083600790816100519190610609565b508260ff166080818152505081600160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555080600260006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550336000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050505050506106db565b6000604051905090565b600080fd5b600080fd5b600080fd5b600080fd5b6000601f19601f8301169050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b61019082610147565b810181811067ffffffffffffffff821117156101af576101ae610158565b5b80604052505050565b60006101c2610129565b90506101ce8282610187565b919050565b600067ffffffffffffffff8211156101ee576101ed610158565b5b6101f782610147565b9050602081019050919050565b60005b83811015610222578082015181840152602081019050610207565b60008484015250505050565b600061024161023c846101d3565b6101b8565b90508281526020810184848401111561025d5761025c610142565b5b610268848285610204565b509392505050565b600082601f8301126102855761028461013d565b5b815161029584826020860161022e565b91505092915050565b600060ff82169050919050565b6102b48161029e565b81146102bf57600080fd5b50565b6000815190506102d1816102ab565b92915050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000610302826102d7565b9050919050565b610312816102f7565b811461031d57600080fd5b50565b60008151905061032f81610309565b92915050565b600080600080600060a0868803121561035157610350610133565b5b600086015167ffffffffffffffff81111561036f5761036e610138565b5b61037b88828901610270565b955050602086015167ffffffffffffffff81111561039c5761039b610138565b5b6103a888828901610270565b94505060406103b9888289016102c2565b93505060606103ca88828901610320565b92505060806103db88828901610320565b9150509295509295909350565b600081519050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b6000600282049050600182168061043a57607f821691505b60208210810361044d5761044c6103f3565b5b50919050565b60008190508160005260206000209050919050565b60006020601f8301049050919050565b600082821b905092915050565b6000600883026104b57fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff82610478565b6104bf8683610478565b95508019841693508086168417925050509392505050565b6000819050919050565b6000819050919050565b60006105066105016104fc846104d7565b6104e1565b6104d7565b9050919050565b6000819050919050565b610520836104eb565b61053461052c8261050d565b848454610485565b825550505050565b600090565b61054961053c565b610554818484610517565b505050565b5b818110156105785761056d600082610541565b60018101905061055a565b5050565b601f8211156105bd5761058e81610453565b61059784610468565b810160208510156105a6578190505b6105ba6105b285610468565b830182610559565b50505b505050565b600082821c905092915050565b60006105e0600019846008026105c2565b1980831691505092915050565b60006105f983836105cf565b9150826002028217905092915050565b610612826103e8565b67ffffffffffffffff81111561062b5761062a610158565b5b6106358254610422565b61064082828561057c565b600060209050601f8311600181146106735760008415610661578287015190505b61066b85826105ed565b8655506106d3565b601f19841661068186610453565b60005b828110156106a957848901518255600182019150602085019450602081019050610684565b868310156106c657848901516106c2601f8916826105cf565b8355505b6001600288020188555050505b505050505050565b608051612ab56106f6600039600061061d0152612ab56000f3fe608060405234801561001057600080fd5b50600436106101585760003560e01c806386fe212d116100c3578063c515ee231161007c578063c515ee23146103bb578063c6bbd5a7146103eb578063d9caed1214610409578063f2fde38b14610425578063f3fef3a314610455578063f912c64b1461048557610158565b806386fe212d146102f75780638705fcd4146103275780638da5cb5b1461034357806395d89b41146103615780639d23c4c71461037f578063a534150c1461039d57610158565b806331a5995d1161011557806331a5995d14610235578063412753581461025357806347e7ef241461027157806351cff8d91461028d57806353799c57146102bd57806369fe0e2d146102db57610158565b806301ffc9a71461015d57806306fdde031461018d57806318160ddd146101ab57806318cbbcfc146101c95780632c1758c1146101e7578063313ce56714610217575b600080fd5b61017760048036038101906101729190611e4d565b6104a1565b6040516101849190611e95565b60405180910390f35b61019561054f565b6040516101a29190611f40565b60405180910390f35b6101b36105dd565b6040516101c09190611f7b565b60405180910390f35b6101d16105e3565b6040516101de9190611f7b565b60405180910390f35b61020160048036038101906101fc9190611fc2565b6105e8565b60405161020e9190611e95565b60405180910390f35b61021f61061b565b60405161022c9190611f7b565b60405180910390f35b61023d61063f565b60405161024a9190611f7b565b60405180910390f35b61025b610645565b6040516102689190612030565b60405180910390f35b61028b60048036038101906102869190612077565b61066b565b005b6102a760048036038101906102a291906120b7565b61085b565b6040516102b49190611f7b565b60405180910390f35b6102c56108f7565b6040516102d29190612030565b60405180910390f35b6102f560048036038101906102f09190611fc2565b61091d565b005b610311600480360381019061030c9190611fc2565b610a47565b60405161031e9190611f7b565b60405180910390f35b610341600480360381019061033c91906120b7565b610b2f565b005b61034b610c4e565b6040516103589190612030565b60405180910390f35b610369610c72565b6040516103769190611f40565b60405180910390f35b610387610d00565b6040516103949190612030565b60405180910390f35b6103a5610d26565b6040516103b29190611f7b565b60405180910390f35b6103d560048036038101906103d091906120e4565b610d2c565b6040516103e29190611f7b565b60405180910390f35b6103f3610f1a565b6040516104009190612030565b60405180910390f35b610423600480360381019061041e91906120e4565b610f40565b005b61043f600480360381019061043a91906120b7565b6113aa565b60405161044c9190611e95565b60405180910390f35b61046f600480360381019061046a9190612077565b6114ec565b60405161047c9190611f7b565b60405180910390f35b61049f600480360381019061049a91906120b7565b611744565b005b60006301ffc9a760e01b827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916036104d9576001905061054a565b639493f8b260e01b827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19160361050f576001905061054a565b630d7491f860e01b827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff191603610545576001905061054a565b600090505b919050565b6006805461055c90612166565b80601f016020809104026020016040519081016040528092919081815260200182805461058890612166565b80156105d55780601f106105aa576101008083540402835291602001916105d5565b820191906000526020600020905b8154815290600101906020018083116105b857829003601f168201915b505050505081565b60085481565b600781565b6000600782106105f757600080fd5b6000820361060c576007600a54149050610616565b81600a5483161490505b919050565b7f000000000000000000000000000000000000000000000000000000000000000081565b600a5481565b600560009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b6000606061069b84600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16611863565b6106a58484611a3c565b8373ffffffffffffffffffffffffffffffffffffffff163330856040516024016106d1939291906121f6565b6040516020818303038152906040527f23b872dd000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161075b9190612274565b6000604051808303816000865af19150503d8060008114610798576040519150601f19603f3d011682016040523d82523d6000602084013e61079d565b606091505b508092508193505050816107e6576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016107dd906122d7565b60405180910390fd5b808060200190518101906107fa9190612323565b91508161083c576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016108339061239c565b60405180910390fd5b826008600082825461084e91906123eb565b9250508190555050505050565b600080600960008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205490506000600960008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506108ef83826114ec565b915050919050565b600260009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b61092a600160ff166105e8565b1561096a576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016109619061246b565b60405180910390fd5b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16146109f8576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016109ef906124d7565b60405180910390fd5b620f42408110610a3d576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610a3490612543565b60405180910390fd5b8060048190555050565b60006007821115610a8d576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610a84906125af565b60405180910390fd5b6000600a54831614610ad4576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610acb9061261b565b60405180910390fd5b81600a600082825417925050819055506007600a541415157f6b7e2e653f93b645d4ed7292d6429f96637084363e477c8aaea1a43ed13c284e600a54604051610b1d9190611f7b565b60405180910390a2600a549050919050565b610b3c600260ff166105e8565b15610b7c576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610b739061246b565b60405180910390fd5b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614610c0a576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610c01906124d7565b60405180910390fd5b80600560006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050565b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60078054610c7f90612166565b80601f0160208091040260200160405190810160405280929190818152602001828054610cab90612166565b8015610cf85780601f10610ccd57610100808354040283529160200191610cf8565b820191906000526020600020905b815481529060010190602001808311610cdb57829003601f168201915b505050505081565b600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60045481565b600080606060008073ffffffffffffffffffffffffffffffffffffffff16600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1603610d9357849350505050610f13565b600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16878787604051602401610de19392919061263b565b6040516020818303038152906040527fdbb21d40000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051610e6b9190612274565b6000604051808303816000865af19150503d8060008114610ea8576040519150601f19603f3d011682016040523d82523d6000602084013e610ead565b606091505b50809350819450505082610ef6576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610eed906126be565b60405180910390fd5b81806020019051810190610f0a91906126f3565b90508093505050505b9392505050565b600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60006060600080600080610f55898989610d2c565b91508873ffffffffffffffffffffffffffffffffffffffff1630604051602401610f7f9190612720565b6040516020818303038152906040527f70a08231000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516110099190612274565b6000604051808303816000865af19150503d8060008114611046576040519150601f19603f3d011682016040523d82523d6000602084013e61104b565b606091505b50809650819750505085611094576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161108b906122d7565b60405180910390fd5b848060200190518101906110a891906126f3565b9350600960008a73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054846110f5919061273b565b905061110082611dc3565b9250828261110e919061273b565b915081841015611153576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161114a906127bb565b60405180910390fd5b61115d888861066b565b8873ffffffffffffffffffffffffffffffffffffffff1633836040516024016111879291906127db565b6040516020818303038152906040527fa9059cbb000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516112119190612274565b6000604051808303816000865af19150503d806000811461124e576040519150601f19603f3d011682016040523d82523d6000602084013e611253565b606091505b5080965081975050508561129c576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401611293906122d7565b60405180910390fd5b848060200190518101906112b09190612323565b9550856112f2576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016112e99061239c565b60405180910390fd5b600073ffffffffffffffffffffffffffffffffffffffff16600560009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff161461139f5782600960008b73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600082825461139791906123eb565b925050819055505b505050505050505050565b60008060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff161461140557600080fd5b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff169050826000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e060405160405180910390a36001915050919050565b6000806060600073ffffffffffffffffffffffffffffffffffffffff16600560009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1603611582576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401611579906124d7565b60405180910390fd5b8473ffffffffffffffffffffffffffffffffffffffff16600560009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16856040516024016115ce9291906127db565b6040516020818303038152906040527fa9059cbb000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516116589190612274565b6000604051808303816000865af19150503d8060008114611695576040519150601f19603f3d011682016040523d82523d6000602084013e61169a565b606091505b508092508193505050816116e3576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016116da906122d7565b60405180910390fd5b808060200190518101906116f79190612323565b915081611739576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016117309061239c565b60405180910390fd5b839250505092915050565b611751600460ff166105e8565b15611791576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016117889061246b565b60405180910390fd5b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff161461181f576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401611816906124d7565b60405180910390fd5b80600360006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050565b60006060600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff16036118a2575050611a38565b8273ffffffffffffffffffffffffffffffffffffffff16846040516024016118ca9190612030565b6040516020818303038152906040527f3ef25013000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516119549190612274565b6000604051808303816000865af19150503d8060008114611991576040519150601f19603f3d011682016040523d82523d6000602084013e611996565b606091505b508092508193505050816119df576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016119d690612850565b60405180910390fd5b808060200190518101906119f39190612323565b915081611a35576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401611a2c906128bc565b60405180910390fd5b50505b5050565b60006060600080600073ffffffffffffffffffffffffffffffffffffffff16600260009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1603611aa25750505050611dbf565b600260009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168630604051602401611aee9291906128dc565b6040516020818303038152906040527f23778613000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051611b789190612274565b6000604051808303816000865af19150503d8060008114611bb5576040519150601f19603f3d011682016040523d82523d6000602084013e611bba565b606091505b50809450819550505083611c03576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401611bfa90612951565b60405180910390fd5b82806020019051810190611c1791906126f3565b91508573ffffffffffffffffffffffffffffffffffffffff1630604051602401611c419190612720565b6040516020818303038152906040527f70a08231000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051611ccb9190612274565b6000604051808303816000865af19150503d8060008114611d08576040519150601f19603f3d011682016040523d82523d6000602084013e611d0d565b606091505b50809450819550505083611d56576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401611d4d906122d7565b60405180910390fd5b82806020019051810190611d6a91906126f3565b9050818582611d7991906123eb565b1115611dba576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401611db1906129bd565b60405180910390fd5b505050505b5050565b60008060045483611dd491906129dd565b9050620f424081611de59190612a4e565b905080915050919050565b600080fd5b60007fffffffff0000000000000000000000000000000000000000000000000000000082169050919050565b611e2a81611df5565b8114611e3557600080fd5b50565b600081359050611e4781611e21565b92915050565b600060208284031215611e6357611e62611df0565b5b6000611e7184828501611e38565b91505092915050565b60008115159050919050565b611e8f81611e7a565b82525050565b6000602082019050611eaa6000830184611e86565b92915050565b600081519050919050565b600082825260208201905092915050565b60005b83811015611eea578082015181840152602081019050611ecf565b60008484015250505050565b6000601f19601f8301169050919050565b6000611f1282611eb0565b611f1c8185611ebb565b9350611f2c818560208601611ecc565b611f3581611ef6565b840191505092915050565b60006020820190508181036000830152611f5a8184611f07565b905092915050565b6000819050919050565b611f7581611f62565b82525050565b6000602082019050611f906000830184611f6c565b92915050565b611f9f81611f62565b8114611faa57600080fd5b50565b600081359050611fbc81611f96565b92915050565b600060208284031215611fd857611fd7611df0565b5b6000611fe684828501611fad565b91505092915050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b600061201a82611fef565b9050919050565b61202a8161200f565b82525050565b60006020820190506120456000830184612021565b92915050565b6120548161200f565b811461205f57600080fd5b50565b6000813590506120718161204b565b92915050565b6000806040838503121561208e5761208d611df0565b5b600061209c85828601612062565b92505060206120ad85828601611fad565b9150509250929050565b6000602082840312156120cd576120cc611df0565b5b60006120db84828501612062565b91505092915050565b6000806000606084860312156120fd576120fc611df0565b5b600061210b86828701612062565b935050602061211c86828701612062565b925050604061212d86828701611fad565b9150509250925092565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b6000600282049050600182168061217e57607f821691505b60208210810361219157612190612137565b5b50919050565b6000819050919050565b60006121bc6121b76121b284611fef565b612197565b611fef565b9050919050565b60006121ce826121a1565b9050919050565b60006121e0826121c3565b9050919050565b6121f0816121d5565b82525050565b600060608201905061220b6000830186612021565b61221860208301856121e7565b6122256040830184611f6c565b949350505050565b600081519050919050565b600081905092915050565b600061224e8261222d565b6122588185612238565b9350612268818560208601611ecc565b80840191505092915050565b60006122808284612243565b915081905092915050565b7f4552525f544f4b454e0000000000000000000000000000000000000000000000600082015250565b60006122c1600983611ebb565b91506122cc8261228b565b602082019050919050565b600060208201905081810360008301526122f0816122b4565b9050919050565b61230081611e7a565b811461230b57600080fd5b50565b60008151905061231d816122f7565b92915050565b60006020828403121561233957612338611df0565b5b60006123478482850161230e565b91505092915050565b7f4552525f5452414e534645520000000000000000000000000000000000000000600082015250565b6000612386600c83611ebb565b915061239182612350565b602082019050919050565b600060208201905081810360008301526123b581612379565b9050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b60006123f682611f62565b915061240183611f62565b9250828201905080821115612419576124186123bc565b5b92915050565b7f4552525f5345414c000000000000000000000000000000000000000000000000600082015250565b6000612455600883611ebb565b91506124608261241f565b602082019050919050565b6000602082019050818103600083015261248481612448565b9050919050565b7f4552525f41585800000000000000000000000000000000000000000000000000600082015250565b60006124c1600783611ebb565b91506124cc8261248b565b602082019050919050565b600060208201905081810360008301526124f0816124b4565b9050919050565b7f4552525f4645455f544f4f5f4849474800000000000000000000000000000000600082015250565b600061252d601083611ebb565b9150612538826124f7565b602082019050919050565b6000602082019050818103600083015261255c81612520565b9050919050565b7f4552525f494e56414c49445f5354415445000000000000000000000000000000600082015250565b6000612599601183611ebb565b91506125a482612563565b602082019050919050565b600060208201905081810360008301526125c88161258c565b9050919050565b7f4552525f414c52454144595f4c4f434b45440000000000000000000000000000600082015250565b6000612605601283611ebb565b9150612610826125cf565b602082019050919050565b60006020820190508181036000830152612634816125f8565b9050919050565b60006060820190506126506000830186612021565b61265d6020830185612021565b61266a6040830184611f6c565b949350505050565b7f4552525f51554f54455200000000000000000000000000000000000000000000600082015250565b60006126a8600a83611ebb565b91506126b382612672565b602082019050919050565b600060208201905081810360008301526126d78161269b565b9050919050565b6000815190506126ed81611f96565b92915050565b60006020828403121561270957612708611df0565b5b6000612717848285016126de565b91505092915050565b600060208201905061273560008301846121e7565b92915050565b600061274682611f62565b915061275183611f62565b9250828203905081811115612769576127686123bc565b5b92915050565b7f4552525f42414c414e4345000000000000000000000000000000000000000000600082015250565b60006127a5600b83611ebb565b91506127b08261276f565b602082019050919050565b600060208201905081810360008301526127d481612798565b9050919050565b60006040820190506127f06000830185612021565b6127fd6020830184611f6c565b9392505050565b7f4552525f52454749535452590000000000000000000000000000000000000000600082015250565b600061283a600c83611ebb565b915061284582612804565b602082019050919050565b600060208201905081810360008301526128698161282d565b9050919050565b7f4552525f554e415554485f544f4b454e00000000000000000000000000000000600082015250565b60006128a6601083611ebb565b91506128b182612870565b602082019050919050565b600060208201905081810360008301526128d581612899565b9050919050565b60006040820190506128f16000830185612021565b6128fe60208301846121e7565b9392505050565b7f4552525f4c494d49544552000000000000000000000000000000000000000000600082015250565b600061293b600b83611ebb565b915061294682612905565b602082019050919050565b6000602082019050818103600083015261296a8161292e565b9050919050565b7f4552525f4c494d49540000000000000000000000000000000000000000000000600082015250565b60006129a7600983611ebb565b91506129b282612971565b602082019050919050565b600060208201905081810360008301526129d68161299a565b9050919050565b60006129e882611f62565b91506129f383611f62565b9250828202612a0181611f62565b91508282048414831517612a1857612a176123bc565b5b5092915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601260045260246000fd5b6000612a5982611f62565b9150612a6483611f62565b925082612a7457612a73612a1f565b5b82820490509291505056fea264697066735822122068e18522757a834bc3a2959e46b4fb5e9c37590704ae8711d79c3835f4b8290364736f6c63430008190033 \ No newline at end of file +60a060405234801561001057600080fd5b5060405161315c38038061315c83398181016040528101906100329190610335565b84600690816100419190610609565b5083600790816100519190610609565b508260ff166080818152505081600160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555080600260006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550336000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050505050506106db565b6000604051905090565b600080fd5b600080fd5b600080fd5b600080fd5b6000601f19601f8301169050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b61019082610147565b810181811067ffffffffffffffff821117156101af576101ae610158565b5b80604052505050565b60006101c2610129565b90506101ce8282610187565b919050565b600067ffffffffffffffff8211156101ee576101ed610158565b5b6101f782610147565b9050602081019050919050565b60005b83811015610222578082015181840152602081019050610207565b60008484015250505050565b600061024161023c846101d3565b6101b8565b90508281526020810184848401111561025d5761025c610142565b5b610268848285610204565b509392505050565b600082601f8301126102855761028461013d565b5b815161029584826020860161022e565b91505092915050565b600060ff82169050919050565b6102b48161029e565b81146102bf57600080fd5b50565b6000815190506102d1816102ab565b92915050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000610302826102d7565b9050919050565b610312816102f7565b811461031d57600080fd5b50565b60008151905061032f81610309565b92915050565b600080600080600060a0868803121561035157610350610133565b5b600086015167ffffffffffffffff81111561036f5761036e610138565b5b61037b88828901610270565b955050602086015167ffffffffffffffff81111561039c5761039b610138565b5b6103a888828901610270565b94505060406103b9888289016102c2565b93505060606103ca88828901610320565b92505060806103db88828901610320565b9150509295509295909350565b600081519050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b6000600282049050600182168061043a57607f821691505b60208210810361044d5761044c6103f3565b5b50919050565b60008190508160005260206000209050919050565b60006020601f8301049050919050565b600082821b905092915050565b6000600883026104b57fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff82610478565b6104bf8683610478565b95508019841693508086168417925050509392505050565b6000819050919050565b6000819050919050565b60006105066105016104fc846104d7565b6104e1565b6104d7565b9050919050565b6000819050919050565b610520836104eb565b61053461052c8261050d565b848454610485565b825550505050565b600090565b61054961053c565b610554818484610517565b505050565b5b818110156105785761056d600082610541565b60018101905061055a565b5050565b601f8211156105bd5761058e81610453565b61059784610468565b810160208510156105a6578190505b6105ba6105b285610468565b830182610559565b50505b505050565b600082821c905092915050565b60006105e0600019846008026105c2565b1980831691505092915050565b60006105f983836105cf565b9150826002028217905092915050565b610612826103e8565b67ffffffffffffffff81111561062b5761062a610158565b5b6106358254610422565b61064082828561057c565b600060209050601f8311600181146106735760008415610661578287015190505b61066b85826105ed565b8655506106d3565b601f19841661068186610453565b60005b828110156106a957848901518255600182019150602085019450602081019050610684565b868310156106c657848901516106c2601f8916826105cf565b8355505b6001600288020188555050505b505050505050565b608051612a666106f6600039600061061d0152612a666000f3fe608060405234801561001057600080fd5b50600436106101585760003560e01c806386fe212d116100c3578063c515ee231161007c578063c515ee23146103bb578063c6bbd5a7146103eb578063d9caed1214610409578063f2fde38b14610425578063f3fef3a314610455578063f912c64b1461048557610158565b806386fe212d146102f75780638705fcd4146103275780638da5cb5b1461034357806395d89b41146103615780639d23c4c71461037f578063a534150c1461039d57610158565b806331a5995d1161011557806331a5995d14610235578063412753581461025357806347e7ef241461027157806351cff8d91461028d57806353799c57146102bd57806369fe0e2d146102db57610158565b806301ffc9a71461015d57806306fdde031461018d57806318160ddd146101ab57806318cbbcfc146101c95780632c1758c1146101e7578063313ce56714610217575b600080fd5b61017760048036038101906101729190611dfe565b6104a1565b6040516101849190611e46565b60405180910390f35b61019561054f565b6040516101a29190611ef1565b60405180910390f35b6101b36105dd565b6040516101c09190611f2c565b60405180910390f35b6101d16105e3565b6040516101de9190611f2c565b60405180910390f35b61020160048036038101906101fc9190611f73565b6105e8565b60405161020e9190611e46565b60405180910390f35b61021f61061b565b60405161022c9190611f2c565b60405180910390f35b61023d61063f565b60405161024a9190611f2c565b60405180910390f35b61025b610645565b6040516102689190611fe1565b60405180910390f35b61028b60048036038101906102869190612028565b61066b565b005b6102a760048036038101906102a29190612068565b61085b565b6040516102b49190611f2c565b60405180910390f35b6102c56108f7565b6040516102d29190611fe1565b60405180910390f35b6102f560048036038101906102f09190611f73565b61091d565b005b610311600480360381019061030c9190611f73565b610a47565b60405161031e9190611f2c565b60405180910390f35b610341600480360381019061033c9190612068565b610b2f565b005b61034b610c4e565b6040516103589190611fe1565b60405180910390f35b610369610c72565b6040516103769190611ef1565b60405180910390f35b610387610d00565b6040516103949190611fe1565b60405180910390f35b6103a5610d26565b6040516103b29190611f2c565b60405180910390f35b6103d560048036038101906103d09190612095565b610d2c565b6040516103e29190611f2c565b60405180910390f35b6103f3610f1a565b6040516104009190611fe1565b60405180910390f35b610423600480360381019061041e9190612095565b610f40565b005b61043f600480360381019061043a9190612068565b61135b565b60405161044c9190611e46565b60405180910390f35b61046f600480360381019061046a9190612028565b61149d565b60405161047c9190611f2c565b60405180910390f35b61049f600480360381019061049a9190612068565b6116f5565b005b60006301ffc9a760e01b827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916036104d9576001905061054a565b639493f8b260e01b827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19160361050f576001905061054a565b630d7491f860e01b827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff191603610545576001905061054a565b600090505b919050565b6006805461055c90612117565b80601f016020809104026020016040519081016040528092919081815260200182805461058890612117565b80156105d55780601f106105aa576101008083540402835291602001916105d5565b820191906000526020600020905b8154815290600101906020018083116105b857829003601f168201915b505050505081565b60085481565b600781565b6000600782106105f757600080fd5b6000820361060c576007600a54149050610616565b81600a5483161490505b919050565b7f000000000000000000000000000000000000000000000000000000000000000081565b600a5481565b600560009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b6000606061069b84600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16611814565b6106a584846119ed565b8373ffffffffffffffffffffffffffffffffffffffff163330856040516024016106d1939291906121a7565b6040516020818303038152906040527f23b872dd000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161075b9190612225565b6000604051808303816000865af19150503d8060008114610798576040519150601f19603f3d011682016040523d82523d6000602084013e61079d565b606091505b508092508193505050816107e6576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016107dd90612288565b60405180910390fd5b808060200190518101906107fa91906122d4565b91508161083c576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016108339061234d565b60405180910390fd5b826008600082825461084e919061239c565b9250508190555050505050565b600080600960008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205490506000600960008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506108ef838261149d565b915050919050565b600260009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b61092a600160ff166105e8565b1561096a576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016109619061241c565b60405180910390fd5b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16146109f8576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016109ef90612488565b60405180910390fd5b620f42408110610a3d576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610a34906124f4565b60405180910390fd5b8060048190555050565b60006007821115610a8d576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610a8490612560565b60405180910390fd5b6000600a54831614610ad4576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610acb906125cc565b60405180910390fd5b81600a600082825417925050819055506007600a541415157f6b7e2e653f93b645d4ed7292d6429f96637084363e477c8aaea1a43ed13c284e600a54604051610b1d9190611f2c565b60405180910390a2600a549050919050565b610b3c600260ff166105e8565b15610b7c576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610b739061241c565b60405180910390fd5b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614610c0a576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610c0190612488565b60405180910390fd5b80600560006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050565b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60078054610c7f90612117565b80601f0160208091040260200160405190810160405280929190818152602001828054610cab90612117565b8015610cf85780601f10610ccd57610100808354040283529160200191610cf8565b820191906000526020600020905b815481529060010190602001808311610cdb57829003601f168201915b505050505081565b600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60045481565b600080606060008073ffffffffffffffffffffffffffffffffffffffff16600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1603610d9357849350505050610f13565b600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16878787604051602401610de1939291906125ec565b6040516020818303038152906040527fdbb21d40000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051610e6b9190612225565b6000604051808303816000865af19150503d8060008114610ea8576040519150601f19603f3d011682016040523d82523d6000602084013e610ead565b606091505b50809350819450505082610ef6576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610eed9061266f565b60405180910390fd5b81806020019051810190610f0a91906126a4565b90508093505050505b9392505050565b600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b600060606000806000610f54888888610d2c565b90508773ffffffffffffffffffffffffffffffffffffffff1630604051602401610f7e91906126d1565b6040516020818303038152906040527f70a08231000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516110089190612225565b6000604051808303816000865af19150503d8060008114611045576040519150601f19603f3d011682016040523d82523d6000602084013e61104a565b606091505b50809550819650505084611093576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161108a90612288565b60405180910390fd5b838060200190518101906110a791906126a4565b92506110b281611d74565b915081816110c091906126ec565b905080831015611105576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016110fc9061276c565b60405180910390fd5b61110f878761066b565b8773ffffffffffffffffffffffffffffffffffffffff16338260405160240161113992919061278c565b6040516020818303038152906040527fa9059cbb000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516111c39190612225565b6000604051808303816000865af19150503d8060008114611200576040519150601f19603f3d011682016040523d82523d6000602084013e611205565b606091505b5080955081965050508461124e576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161124590612288565b60405180910390fd5b8380602001905181019061126291906122d4565b9450846112a4576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161129b9061234d565b60405180910390fd5b600073ffffffffffffffffffffffffffffffffffffffff16600560009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16146113515781600960008a73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206000828254611349919061239c565b925050819055505b5050505050505050565b60008060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16146113b657600080fd5b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff169050826000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e060405160405180910390a36001915050919050565b6000806060600073ffffffffffffffffffffffffffffffffffffffff16600560009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1603611533576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161152a90612488565b60405180910390fd5b8473ffffffffffffffffffffffffffffffffffffffff16600560009054906101000a900473ffffffffffffffffffffffffffffffffffffffff168560405160240161157f92919061278c565b6040516020818303038152906040527fa9059cbb000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516116099190612225565b6000604051808303816000865af19150503d8060008114611646576040519150601f19603f3d011682016040523d82523d6000602084013e61164b565b606091505b50809250819350505081611694576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161168b90612288565b60405180910390fd5b808060200190518101906116a891906122d4565b9150816116ea576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016116e19061234d565b60405180910390fd5b839250505092915050565b611702600460ff166105e8565b15611742576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016117399061241c565b60405180910390fd5b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16146117d0576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016117c790612488565b60405180910390fd5b80600360006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050565b60006060600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff16036118535750506119e9565b8273ffffffffffffffffffffffffffffffffffffffff168460405160240161187b9190611fe1565b6040516020818303038152906040527f3ef25013000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516119059190612225565b6000604051808303816000865af19150503d8060008114611942576040519150601f19603f3d011682016040523d82523d6000602084013e611947565b606091505b50809250819350505081611990576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161198790612801565b60405180910390fd5b808060200190518101906119a491906122d4565b9150816119e6576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016119dd9061286d565b60405180910390fd5b50505b5050565b60006060600080600073ffffffffffffffffffffffffffffffffffffffff16600260009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1603611a535750505050611d70565b600260009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168630604051602401611a9f92919061288d565b6040516020818303038152906040527f23778613000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051611b299190612225565b6000604051808303816000865af19150503d8060008114611b66576040519150601f19603f3d011682016040523d82523d6000602084013e611b6b565b606091505b50809450819550505083611bb4576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401611bab90612902565b60405180910390fd5b82806020019051810190611bc891906126a4565b91508573ffffffffffffffffffffffffffffffffffffffff1630604051602401611bf291906126d1565b6040516020818303038152906040527f70a08231000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051611c7c9190612225565b6000604051808303816000865af19150503d8060008114611cb9576040519150601f19603f3d011682016040523d82523d6000602084013e611cbe565b606091505b50809450819550505083611d07576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401611cfe90612288565b60405180910390fd5b82806020019051810190611d1b91906126a4565b9050818582611d2a919061239c565b1115611d6b576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401611d629061296e565b60405180910390fd5b505050505b5050565b60008060045483611d85919061298e565b9050620f424081611d9691906129ff565b905080915050919050565b600080fd5b60007fffffffff0000000000000000000000000000000000000000000000000000000082169050919050565b611ddb81611da6565b8114611de657600080fd5b50565b600081359050611df881611dd2565b92915050565b600060208284031215611e1457611e13611da1565b5b6000611e2284828501611de9565b91505092915050565b60008115159050919050565b611e4081611e2b565b82525050565b6000602082019050611e5b6000830184611e37565b92915050565b600081519050919050565b600082825260208201905092915050565b60005b83811015611e9b578082015181840152602081019050611e80565b60008484015250505050565b6000601f19601f8301169050919050565b6000611ec382611e61565b611ecd8185611e6c565b9350611edd818560208601611e7d565b611ee681611ea7565b840191505092915050565b60006020820190508181036000830152611f0b8184611eb8565b905092915050565b6000819050919050565b611f2681611f13565b82525050565b6000602082019050611f416000830184611f1d565b92915050565b611f5081611f13565b8114611f5b57600080fd5b50565b600081359050611f6d81611f47565b92915050565b600060208284031215611f8957611f88611da1565b5b6000611f9784828501611f5e565b91505092915050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000611fcb82611fa0565b9050919050565b611fdb81611fc0565b82525050565b6000602082019050611ff66000830184611fd2565b92915050565b61200581611fc0565b811461201057600080fd5b50565b60008135905061202281611ffc565b92915050565b6000806040838503121561203f5761203e611da1565b5b600061204d85828601612013565b925050602061205e85828601611f5e565b9150509250929050565b60006020828403121561207e5761207d611da1565b5b600061208c84828501612013565b91505092915050565b6000806000606084860312156120ae576120ad611da1565b5b60006120bc86828701612013565b93505060206120cd86828701612013565b92505060406120de86828701611f5e565b9150509250925092565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b6000600282049050600182168061212f57607f821691505b602082108103612142576121416120e8565b5b50919050565b6000819050919050565b600061216d61216861216384611fa0565b612148565b611fa0565b9050919050565b600061217f82612152565b9050919050565b600061219182612174565b9050919050565b6121a181612186565b82525050565b60006060820190506121bc6000830186611fd2565b6121c96020830185612198565b6121d66040830184611f1d565b949350505050565b600081519050919050565b600081905092915050565b60006121ff826121de565b61220981856121e9565b9350612219818560208601611e7d565b80840191505092915050565b600061223182846121f4565b915081905092915050565b7f4552525f544f4b454e0000000000000000000000000000000000000000000000600082015250565b6000612272600983611e6c565b915061227d8261223c565b602082019050919050565b600060208201905081810360008301526122a181612265565b9050919050565b6122b181611e2b565b81146122bc57600080fd5b50565b6000815190506122ce816122a8565b92915050565b6000602082840312156122ea576122e9611da1565b5b60006122f8848285016122bf565b91505092915050565b7f4552525f5452414e534645520000000000000000000000000000000000000000600082015250565b6000612337600c83611e6c565b915061234282612301565b602082019050919050565b600060208201905081810360008301526123668161232a565b9050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b60006123a782611f13565b91506123b283611f13565b92508282019050808211156123ca576123c961236d565b5b92915050565b7f4552525f5345414c000000000000000000000000000000000000000000000000600082015250565b6000612406600883611e6c565b9150612411826123d0565b602082019050919050565b60006020820190508181036000830152612435816123f9565b9050919050565b7f4552525f41585800000000000000000000000000000000000000000000000000600082015250565b6000612472600783611e6c565b915061247d8261243c565b602082019050919050565b600060208201905081810360008301526124a181612465565b9050919050565b7f4552525f4645455f544f4f5f4849474800000000000000000000000000000000600082015250565b60006124de601083611e6c565b91506124e9826124a8565b602082019050919050565b6000602082019050818103600083015261250d816124d1565b9050919050565b7f4552525f494e56414c49445f5354415445000000000000000000000000000000600082015250565b600061254a601183611e6c565b915061255582612514565b602082019050919050565b600060208201905081810360008301526125798161253d565b9050919050565b7f4552525f414c52454144595f4c4f434b45440000000000000000000000000000600082015250565b60006125b6601283611e6c565b91506125c182612580565b602082019050919050565b600060208201905081810360008301526125e5816125a9565b9050919050565b60006060820190506126016000830186611fd2565b61260e6020830185611fd2565b61261b6040830184611f1d565b949350505050565b7f4552525f51554f54455200000000000000000000000000000000000000000000600082015250565b6000612659600a83611e6c565b915061266482612623565b602082019050919050565b600060208201905081810360008301526126888161264c565b9050919050565b60008151905061269e81611f47565b92915050565b6000602082840312156126ba576126b9611da1565b5b60006126c88482850161268f565b91505092915050565b60006020820190506126e66000830184612198565b92915050565b60006126f782611f13565b915061270283611f13565b925082820390508181111561271a5761271961236d565b5b92915050565b7f4552525f42414c414e4345000000000000000000000000000000000000000000600082015250565b6000612756600b83611e6c565b915061276182612720565b602082019050919050565b6000602082019050818103600083015261278581612749565b9050919050565b60006040820190506127a16000830185611fd2565b6127ae6020830184611f1d565b9392505050565b7f4552525f52454749535452590000000000000000000000000000000000000000600082015250565b60006127eb600c83611e6c565b91506127f6826127b5565b602082019050919050565b6000602082019050818103600083015261281a816127de565b9050919050565b7f4552525f554e415554485f544f4b454e00000000000000000000000000000000600082015250565b6000612857601083611e6c565b915061286282612821565b602082019050919050565b600060208201905081810360008301526128868161284a565b9050919050565b60006040820190506128a26000830185611fd2565b6128af6020830184612198565b9392505050565b7f4552525f4c494d49544552000000000000000000000000000000000000000000600082015250565b60006128ec600b83611e6c565b91506128f7826128b6565b602082019050919050565b6000602082019050818103600083015261291b816128df565b9050919050565b7f4552525f4c494d49540000000000000000000000000000000000000000000000600082015250565b6000612958600983611e6c565b915061296382612922565b602082019050919050565b600060208201905081810360008301526129878161294b565b9050919050565b600061299982611f13565b91506129a483611f13565b92508282026129b281611f13565b915082820484148315176129c9576129c861236d565b5b5092915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601260045260246000fd5b6000612a0a82611f13565b9150612a1583611f13565b925082612a2557612a246129d0565b5b82820490509291505056fea2646970667358221220f040764414fa76afbd581fbb19ad7bcd16ab510c5013c8e9fcdbf3011b93844164736f6c63430008190033 \ No newline at end of file diff --git a/python/erc20_pool/data/SwapPool.metadata.json b/python/erc20_pool/data/SwapPool.metadata.json index 36ff07c..51c8864 100644 --- a/python/erc20_pool/data/SwapPool.metadata.json +++ b/python/erc20_pool/data/SwapPool.metadata.json @@ -1 +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":"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":[],"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":"_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":"0x2d4d5b851b129b41f7385b234385a37efd9b987274067f4952c4c17482d10753","license":"AGPL-3.0-or-later","urls":["bzz-raw://1500537c49d0098426268313ab43ccf4df875f758c4d8d53cc51a2ef60217cd2","dweb:/ipfs/QmRSDgJaVpK1V4jLsK7BSj2iYgUW95TJjuRXYyB4ubt4YG"]}},"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":"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":[],"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":"_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":"0x0bc00214f3016c65c77d2b5148a9b83020d8dc7613f396c4637351579095ff1e","license":"AGPL-3.0-or-later","urls":["bzz-raw://1ea9a924be3a74c39712e96a69f06c1f3a858ff324341d4bba654f9d257e24cf","dweb:/ipfs/QmXHPfTiWQAWtLGXjvJcmsDQi8EDnwX3uQA7o9387Dts1U"]}},"version":1} diff --git a/solidity/SwapPool.sol b/solidity/SwapPool.sol index 457332e..2ce21f4 100644 --- a/solidity/SwapPool.sol +++ b/solidity/SwapPool.sol @@ -140,7 +140,6 @@ contract SwapPool { uint256 balance; uint256 fee; uint256 outValue; - uint256 trueBalance; outValue = getQuote(_outToken, _inToken, _value); @@ -148,13 +147,10 @@ contract SwapPool { require(r, "ERR_TOKEN"); balance = abi.decode(v, (uint256)); - // unwithdrawn fees should remain untouched - trueBalance = balance - fees[_outToken]; - // 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");