erc20-pool

Permissioned ERC20 swap pool for EVM
Log | Files | Refs | README

commit af059d24a7a8d0e8a9fd7683ac7704fe838133db
parent 17f5d2f3400a04737141cf0f59587a04ab62cda6
Author: lash <dev@holbrook.no>
Date:   Tue,  1 Aug 2023 15:34:52 +0100

Correct quoter seal flag

Diffstat:
Mpython/erc20_pool/data/SwapPool.bin | 4++--
Mpython/erc20_pool/data/SwapPool.metadata.json | 2+-
Msolidity/SwapPool.sol | 4++--
3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/python/erc20_pool/data/SwapPool.bin b/python/erc20_pool/data/SwapPool.bin @@ -1 +1 @@ -60a06040523480156200001157600080fd5b5060405162003116380380620031168339818101604052810190620000379190620003ac565b8560079081620000489190620006d7565b5084600890816200005a9190620006d7565b508360ff166080818152505081600160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555080600260006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555082600681905550336000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550505050505050620007be565b6000604051905090565b600080fd5b600080fd5b600080fd5b600080fd5b6000601f19601f8301169050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b620001a48262000159565b810181811067ffffffffffffffff82111715620001c657620001c56200016a565b5b80604052505050565b6000620001db6200013b565b9050620001e9828262000199565b919050565b600067ffffffffffffffff8211156200020c576200020b6200016a565b5b620002178262000159565b9050602081019050919050565b60005b838110156200024457808201518184015260208101905062000227565b60008484015250505050565b6000620002676200026184620001ee565b620001cf565b90508281526020810184848401111562000286576200028562000154565b5b6200029384828562000224565b509392505050565b600082601f830112620002b357620002b26200014f565b5b8151620002c584826020860162000250565b91505092915050565b600060ff82169050919050565b620002e681620002ce565b8114620002f257600080fd5b50565b6000815190506200030681620002db565b92915050565b6000819050919050565b62000321816200030c565b81146200032d57600080fd5b50565b600081519050620003418162000316565b92915050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000620003748262000347565b9050919050565b620003868162000367565b81146200039257600080fd5b50565b600081519050620003a6816200037b565b92915050565b60008060008060008060c08789031215620003cc57620003cb62000145565b5b600087015167ffffffffffffffff811115620003ed57620003ec6200014a565b5b620003fb89828a016200029b565b965050602087015167ffffffffffffffff8111156200041f576200041e6200014a565b5b6200042d89828a016200029b565b95505060406200044089828a01620002f5565b94505060606200045389828a0162000330565b93505060806200046689828a0162000395565b92505060a06200047989828a0162000395565b9150509295509295509295565b600081519050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b60006002820490506001821680620004d957607f821691505b602082108103620004ef57620004ee62000491565b5b50919050565b60008190508160005260206000209050919050565b60006020601f8301049050919050565b60008160020a8302905092915050565b6000600883026200055c7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff826200051a565b6200056886836200051a565b95508019841693508086168417925050509392505050565b6000819050919050565b6000819050919050565b6000620005b5620005af620005a98462000580565b6200058a565b62000580565b9050919050565b6000819050919050565b620005d18362000594565b620005e9620005e082620005bc565b8484546200052a565b825550505050565b600090565b62000600620005f1565b6200060d818484620005c6565b505050565b5b81811015620006355762000629600082620005f6565b60018101905062000613565b5050565b601f82111562000684576200064e81620004f5565b62000659846200050a565b8101602085101562000669578190505b6200068162000678856200050a565b83018262000612565b50505b505050565b60008160020a8304905092915050565b6000620006ac6000198460080262000689565b1980831691505092915050565b6000620006c7838362000699565b9150826002028217905092915050565b620006e28262000486565b67ffffffffffffffff811115620006fe57620006fd6200016a565b5b6200070a8254620004c0565b6200071782828562000639565b600060209050601f8311600181146200074f57600084156200073a578287015190505b620007468582620006b9565b865550620007b6565b601f1984166200075f86620004f5565b60005b82811015620007895784890151825560018201915060208501945060208101905062000762565b86831015620007a95784890151620007a5601f89168262000699565b8355505b6001600288020188555050505b505050505050565b60805161293c620007da6000396000610586015261293c6000f3fe608060405234801561001057600080fd5b5060043610610133576000357c01000000000000000000000000000000000000000000000000000000009004806369fe0e2d116100bf57806395d89b411161008e57806395d89b4114610300578063d9caed121461031e578063f2fde38b1461033a578063f3fef3a31461036a578063f912c64b1461039a57610133565b806369fe0e2d1461027a57806386fe212d146102965780638705fcd4146102c65780638da5cb5b146102e257610133565b80632c1758c1116101065780632c1758c1146101c2578063313ce567146101f257806331a5995d1461021057806347e7ef241461022e57806351cff8d91461024a57610133565b806301ffc9a71461013857806306fdde031461016857806318160ddd1461018657806318cbbcfc146101a4575b600080fd5b610152600480360381019061014d9190611cd4565b6103b6565b60405161015f9190611d1c565b60405180910390f35b6101706104b8565b60405161017d9190611dc7565b60405180910390f35b61018e610546565b60405161019b9190611e02565b60405180910390f35b6101ac61054c565b6040516101b99190611e02565b60405180910390f35b6101dc60048036038101906101d79190611e49565b610551565b6040516101e99190611d1c565b60405180910390f35b6101fa610584565b6040516102079190611e02565b60405180910390f35b6102186105a8565b6040516102259190611e02565b60405180910390f35b61024860048036038101906102439190611ed4565b6105ae565b005b610264600480360381019061025f9190611f14565b61079e565b6040516102719190611e02565b60405180910390f35b610294600480360381019061028f9190611e49565b61083a565b005b6102b060048036038101906102ab9190611e49565b610964565b6040516102bd9190611e02565b60405180910390f35b6102e060048036038101906102db9190611f14565b610a4c565b005b6102ea610b6b565b6040516102f79190611f50565b60405180910390f35b610308610b8f565b6040516103159190611dc7565b60405180910390f35b61033860048036038101906103339190611f6b565b610c1d565b005b610354600480360381019061034f9190611f14565b611043565b6040516103619190611d1c565b60405180910390f35b610384600480360381019061037f9190611ed4565b611185565b6040516103919190611e02565b60405180910390f35b6103b460048036038101906103af9190611f14565b6113dd565b005b60006301ffc9a77c010000000000000000000000000000000000000000000000000000000002827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19160361040a57600190506104b3565b639493f8b27c010000000000000000000000000000000000000000000000000000000002827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19160361045c57600190506104b3565b630d7491f87c010000000000000000000000000000000000000000000000000000000002827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916036104ae57600190506104b3565b600090505b919050565b600780546104c590611fed565b80601f01602080910402602001604051908101604052809291908181526020018280546104f190611fed565b801561053e5780601f106105135761010080835404028352916020019161053e565b820191906000526020600020905b81548152906001019060200180831161052157829003601f168201915b505050505081565b60095481565b600381565b60006003821061056057600080fd5b60008203610575576003600b5414905061057f565b81600b5483161490505b919050565b7f000000000000000000000000000000000000000000000000000000000000000081565b600b5481565b600060606105de84600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff166114fc565b6105e884846116d5565b8373ffffffffffffffffffffffffffffffffffffffff163330856040516024016106149392919061207d565b6040516020818303038152906040527f23b872dd000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161069e91906120fb565b6000604051808303816000865af19150503d80600081146106db576040519150601f19603f3d011682016040523d82523d6000602084013e6106e0565b606091505b50809250819350505081610729576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016107209061215e565b60405180910390fd5b8080602001905181019061073d91906121aa565b91508161077f576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161077690612223565b60405180910390fd5b82600960008282546107919190612272565b9250508190555050505050565b600080600a60008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205490506000600a60008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506108328382611185565b915050919050565b610847600160ff16610551565b15610887576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161087e906122f2565b60405180910390fd5b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614610915576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161090c9061235e565b60405180910390fd5b620f4240811061095a576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610951906123ca565b60405180910390fd5b8060048190555050565b600060038211156109aa576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016109a190612436565b60405180910390fd5b6000600b548316146109f1576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016109e8906124a2565b60405180910390fd5b81600b600082825417925050819055506003600b541415157f6b7e2e653f93b645d4ed7292d6429f96637084363e477c8aaea1a43ed13c284e600b54604051610a3a9190611e02565b60405180910390a2600b549050919050565b610a59600260ff16610551565b15610a99576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610a90906122f2565b60405180910390fd5b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614610b27576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610b1e9061235e565b60405180910390fd5b80600560006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050565b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60088054610b9c90611fed565b80601f0160208091040260200160405190810160405280929190818152602001828054610bc890611fed565b8015610c155780601f10610bea57610100808354040283529160200191610c15565b820191906000526020600020905b815481529060010190602001808311610bf857829003601f168201915b505050505081565b600060606000806000610c2f86611a5c565b90508086610c3d91906124c2565b9250610c4a888885611a89565b92508773ffffffffffffffffffffffffffffffffffffffff1630604051602401610c7491906124f6565b6040516020818303038152906040527f70a08231000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051610cfe91906120fb565b6000604051808303816000865af19150503d8060008114610d3b576040519150601f19603f3d011682016040523d82523d6000602084013e610d40565b606091505b50809550819650505084610d89576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610d809061215e565b60405180910390fd5b83806020019051810190610d9d9190612526565b91508083610dab9190612272565b821015610ded576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610de49061259f565b60405180910390fd5b610df787876105ae565b8773ffffffffffffffffffffffffffffffffffffffff163384604051602401610e219291906125bf565b6040516020818303038152906040527fa9059cbb000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051610eab91906120fb565b6000604051808303816000865af19150503d8060008114610ee8576040519150601f19603f3d011682016040523d82523d6000602084013e610eed565b606091505b50809550819650505084610f36576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610f2d9061215e565b60405180910390fd5b83806020019051810190610f4a91906121aa565b945084610f8c576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610f8390612223565b60405180910390fd5b600073ffffffffffffffffffffffffffffffffffffffff16600560009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16146110395780600a60008a73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008282546110319190612272565b925050819055505b5050505050505050565b60008060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff161461109e57600080fd5b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff169050826000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e060405160405180910390a36001915050919050565b6000806060600073ffffffffffffffffffffffffffffffffffffffff16600560009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff160361121b576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016112129061235e565b60405180910390fd5b8473ffffffffffffffffffffffffffffffffffffffff16600560009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16856040516024016112679291906125bf565b6040516020818303038152906040527fa9059cbb000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516112f191906120fb565b6000604051808303816000865af19150503d806000811461132e576040519150601f19603f3d011682016040523d82523d6000602084013e611333565b606091505b5080925081935050508161137c576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016113739061215e565b60405180910390fd5b8080602001905181019061139091906121aa565b9150816113d2576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016113c990612223565b60405180910390fd5b839250505092915050565b6113ea600260ff16610551565b1561142a576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401611421906122f2565b60405180910390fd5b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16146114b8576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016114af9061235e565b60405180910390fd5b80600360006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050565b60006060600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff160361153b5750506116d1565b8273ffffffffffffffffffffffffffffffffffffffff16846040516024016115639190611f50565b6040516020818303038152906040527f3ef25013000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516115ed91906120fb565b6000604051808303816000865af19150503d806000811461162a576040519150601f19603f3d011682016040523d82523d6000602084013e61162f565b606091505b50809250819350505081611678576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161166f90612634565b60405180910390fd5b8080602001905181019061168c91906121aa565b9150816116ce576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016116c5906126a0565b60405180910390fd5b50505b5050565b60006060600080600073ffffffffffffffffffffffffffffffffffffffff16600260009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff160361173b5750505050611a58565b600260009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1686306040516024016117879291906126c0565b6040516020818303038152906040527f23778613000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161181191906120fb565b6000604051808303816000865af19150503d806000811461184e576040519150601f19603f3d011682016040523d82523d6000602084013e611853565b606091505b5080945081955050508361189c576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161189390612735565b60405180910390fd5b828060200190518101906118b09190612526565b91508573ffffffffffffffffffffffffffffffffffffffff16306040516024016118da91906124f6565b6040516020818303038152906040527f70a08231000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161196491906120fb565b6000604051808303816000865af19150503d80600081146119a1576040519150601f19603f3d011682016040523d82523d6000602084013e6119a6565b606091505b508094508195505050836119ef576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016119e69061215e565b60405180910390fd5b82806020019051810190611a039190612526565b9050818582611a129190612272565b1115611a53576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401611a4a906127a1565b60405180910390fd5b505050505b5050565b60008060045483611a6d91906127c1565b9050620f424081611a7e9190612832565b905080915050919050565b600080606060008073ffffffffffffffffffffffffffffffffffffffff16600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1603611af057849350505050611c70565b600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16878787604051602401611b3e93929190612863565b6040516020818303038152906040527fdbb21d40000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051611bc891906120fb565b6000604051808303816000865af19150503d8060008114611c05576040519150601f19603f3d011682016040523d82523d6000602084013e611c0a565b606091505b50809350819450505082611c53576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401611c4a906128e6565b60405180910390fd5b81806020019051810190611c679190612526565b90508093505050505b9392505050565b600080fd5b60007fffffffff0000000000000000000000000000000000000000000000000000000082169050919050565b611cb181611c7c565b8114611cbc57600080fd5b50565b600081359050611cce81611ca8565b92915050565b600060208284031215611cea57611ce9611c77565b5b6000611cf884828501611cbf565b91505092915050565b60008115159050919050565b611d1681611d01565b82525050565b6000602082019050611d316000830184611d0d565b92915050565b600081519050919050565b600082825260208201905092915050565b60005b83811015611d71578082015181840152602081019050611d56565b60008484015250505050565b6000601f19601f8301169050919050565b6000611d9982611d37565b611da38185611d42565b9350611db3818560208601611d53565b611dbc81611d7d565b840191505092915050565b60006020820190508181036000830152611de18184611d8e565b905092915050565b6000819050919050565b611dfc81611de9565b82525050565b6000602082019050611e176000830184611df3565b92915050565b611e2681611de9565b8114611e3157600080fd5b50565b600081359050611e4381611e1d565b92915050565b600060208284031215611e5f57611e5e611c77565b5b6000611e6d84828501611e34565b91505092915050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000611ea182611e76565b9050919050565b611eb181611e96565b8114611ebc57600080fd5b50565b600081359050611ece81611ea8565b92915050565b60008060408385031215611eeb57611eea611c77565b5b6000611ef985828601611ebf565b9250506020611f0a85828601611e34565b9150509250929050565b600060208284031215611f2a57611f29611c77565b5b6000611f3884828501611ebf565b91505092915050565b611f4a81611e96565b82525050565b6000602082019050611f656000830184611f41565b92915050565b600080600060608486031215611f8457611f83611c77565b5b6000611f9286828701611ebf565b9350506020611fa386828701611ebf565b9250506040611fb486828701611e34565b9150509250925092565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b6000600282049050600182168061200557607f821691505b60208210810361201857612017611fbe565b5b50919050565b6000819050919050565b600061204361203e61203984611e76565b61201e565b611e76565b9050919050565b600061205582612028565b9050919050565b60006120678261204a565b9050919050565b6120778161205c565b82525050565b60006060820190506120926000830186611f41565b61209f602083018561206e565b6120ac6040830184611df3565b949350505050565b600081519050919050565b600081905092915050565b60006120d5826120b4565b6120df81856120bf565b93506120ef818560208601611d53565b80840191505092915050565b600061210782846120ca565b915081905092915050565b7f4552525f544f4b454e0000000000000000000000000000000000000000000000600082015250565b6000612148600983611d42565b915061215382612112565b602082019050919050565b600060208201905081810360008301526121778161213b565b9050919050565b61218781611d01565b811461219257600080fd5b50565b6000815190506121a48161217e565b92915050565b6000602082840312156121c0576121bf611c77565b5b60006121ce84828501612195565b91505092915050565b7f4552525f5452414e534645520000000000000000000000000000000000000000600082015250565b600061220d600c83611d42565b9150612218826121d7565b602082019050919050565b6000602082019050818103600083015261223c81612200565b9050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b600061227d82611de9565b915061228883611de9565b92508282019050808211156122a05761229f612243565b5b92915050565b7f4552525f5345414c000000000000000000000000000000000000000000000000600082015250565b60006122dc600883611d42565b91506122e7826122a6565b602082019050919050565b6000602082019050818103600083015261230b816122cf565b9050919050565b7f4552525f41585800000000000000000000000000000000000000000000000000600082015250565b6000612348600783611d42565b915061235382612312565b602082019050919050565b600060208201905081810360008301526123778161233b565b9050919050565b7f4552525f4645455f544f4f5f4849474800000000000000000000000000000000600082015250565b60006123b4601083611d42565b91506123bf8261237e565b602082019050919050565b600060208201905081810360008301526123e3816123a7565b9050919050565b7f4552525f494e56414c49445f5354415445000000000000000000000000000000600082015250565b6000612420601183611d42565b915061242b826123ea565b602082019050919050565b6000602082019050818103600083015261244f81612413565b9050919050565b7f4552525f414c52454144595f4c4f434b45440000000000000000000000000000600082015250565b600061248c601283611d42565b915061249782612456565b602082019050919050565b600060208201905081810360008301526124bb8161247f565b9050919050565b60006124cd82611de9565b91506124d883611de9565b92508282039050818111156124f0576124ef612243565b5b92915050565b600060208201905061250b600083018461206e565b92915050565b60008151905061252081611e1d565b92915050565b60006020828403121561253c5761253b611c77565b5b600061254a84828501612511565b91505092915050565b7f4552525f42414c414e4345000000000000000000000000000000000000000000600082015250565b6000612589600b83611d42565b915061259482612553565b602082019050919050565b600060208201905081810360008301526125b88161257c565b9050919050565b60006040820190506125d46000830185611f41565b6125e16020830184611df3565b9392505050565b7f4552525f52454749535452590000000000000000000000000000000000000000600082015250565b600061261e600c83611d42565b9150612629826125e8565b602082019050919050565b6000602082019050818103600083015261264d81612611565b9050919050565b7f4552525f554e415554485f544f4b454e00000000000000000000000000000000600082015250565b600061268a601083611d42565b915061269582612654565b602082019050919050565b600060208201905081810360008301526126b98161267d565b9050919050565b60006040820190506126d56000830185611f41565b6126e2602083018461206e565b9392505050565b7f4552525f4c494d49544552000000000000000000000000000000000000000000600082015250565b600061271f600b83611d42565b915061272a826126e9565b602082019050919050565b6000602082019050818103600083015261274e81612712565b9050919050565b7f4552525f4c494d49540000000000000000000000000000000000000000000000600082015250565b600061278b600983611d42565b915061279682612755565b602082019050919050565b600060208201905081810360008301526127ba8161277e565b9050919050565b60006127cc82611de9565b91506127d783611de9565b92508282026127e581611de9565b915082820484148315176127fc576127fb612243565b5b5092915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601260045260246000fd5b600061283d82611de9565b915061284883611de9565b92508261285857612857612803565b5b828204905092915050565b60006060820190506128786000830186611f41565b6128856020830185611f41565b6128926040830184611df3565b949350505050565b7f4552525f51554f54455200000000000000000000000000000000000000000000600082015250565b60006128d0600a83611d42565b91506128db8261289a565b602082019050919050565b600060208201905081810360008301526128ff816128c3565b905091905056fea26469706673582212201fe3d14a2ce35f9c28dcf2862f292138ad507dfb418f4509aa46c3fe403a2eaf64736f6c63430008130033 -\ No newline at end of file +60a06040523480156200001157600080fd5b5060405162003116380380620031168339818101604052810190620000379190620003ac565b8560079081620000489190620006d7565b5084600890816200005a9190620006d7565b508360ff166080818152505081600160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555080600260006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555082600681905550336000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550505050505050620007be565b6000604051905090565b600080fd5b600080fd5b600080fd5b600080fd5b6000601f19601f8301169050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b620001a48262000159565b810181811067ffffffffffffffff82111715620001c657620001c56200016a565b5b80604052505050565b6000620001db6200013b565b9050620001e9828262000199565b919050565b600067ffffffffffffffff8211156200020c576200020b6200016a565b5b620002178262000159565b9050602081019050919050565b60005b838110156200024457808201518184015260208101905062000227565b60008484015250505050565b6000620002676200026184620001ee565b620001cf565b90508281526020810184848401111562000286576200028562000154565b5b6200029384828562000224565b509392505050565b600082601f830112620002b357620002b26200014f565b5b8151620002c584826020860162000250565b91505092915050565b600060ff82169050919050565b620002e681620002ce565b8114620002f257600080fd5b50565b6000815190506200030681620002db565b92915050565b6000819050919050565b62000321816200030c565b81146200032d57600080fd5b50565b600081519050620003418162000316565b92915050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000620003748262000347565b9050919050565b620003868162000367565b81146200039257600080fd5b50565b600081519050620003a6816200037b565b92915050565b60008060008060008060c08789031215620003cc57620003cb62000145565b5b600087015167ffffffffffffffff811115620003ed57620003ec6200014a565b5b620003fb89828a016200029b565b965050602087015167ffffffffffffffff8111156200041f576200041e6200014a565b5b6200042d89828a016200029b565b95505060406200044089828a01620002f5565b94505060606200045389828a0162000330565b93505060806200046689828a0162000395565b92505060a06200047989828a0162000395565b9150509295509295509295565b600081519050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b60006002820490506001821680620004d957607f821691505b602082108103620004ef57620004ee62000491565b5b50919050565b60008190508160005260206000209050919050565b60006020601f8301049050919050565b60008160020a8302905092915050565b6000600883026200055c7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff826200051a565b6200056886836200051a565b95508019841693508086168417925050509392505050565b6000819050919050565b6000819050919050565b6000620005b5620005af620005a98462000580565b6200058a565b62000580565b9050919050565b6000819050919050565b620005d18362000594565b620005e9620005e082620005bc565b8484546200052a565b825550505050565b600090565b62000600620005f1565b6200060d818484620005c6565b505050565b5b81811015620006355762000629600082620005f6565b60018101905062000613565b5050565b601f82111562000684576200064e81620004f5565b62000659846200050a565b8101602085101562000669578190505b6200068162000678856200050a565b83018262000612565b50505b505050565b60008160020a8304905092915050565b6000620006ac6000198460080262000689565b1980831691505092915050565b6000620006c7838362000699565b9150826002028217905092915050565b620006e28262000486565b67ffffffffffffffff811115620006fe57620006fd6200016a565b5b6200070a8254620004c0565b6200071782828562000639565b600060209050601f8311600181146200074f57600084156200073a578287015190505b620007468582620006b9565b865550620007b6565b601f1984166200075f86620004f5565b60005b82811015620007895784890151825560018201915060208501945060208101905062000762565b86831015620007a95784890151620007a5601f89168262000699565b8355505b6001600288020188555050505b505050505050565b60805161293c620007da6000396000610586015261293c6000f3fe608060405234801561001057600080fd5b5060043610610133576000357c01000000000000000000000000000000000000000000000000000000009004806369fe0e2d116100bf57806395d89b411161008e57806395d89b4114610300578063d9caed121461031e578063f2fde38b1461033a578063f3fef3a31461036a578063f912c64b1461039a57610133565b806369fe0e2d1461027a57806386fe212d146102965780638705fcd4146102c65780638da5cb5b146102e257610133565b80632c1758c1116101065780632c1758c1146101c2578063313ce567146101f257806331a5995d1461021057806347e7ef241461022e57806351cff8d91461024a57610133565b806301ffc9a71461013857806306fdde031461016857806318160ddd1461018657806318cbbcfc146101a4575b600080fd5b610152600480360381019061014d9190611cd4565b6103b6565b60405161015f9190611d1c565b60405180910390f35b6101706104b8565b60405161017d9190611dc7565b60405180910390f35b61018e610546565b60405161019b9190611e02565b60405180910390f35b6101ac61054c565b6040516101b99190611e02565b60405180910390f35b6101dc60048036038101906101d79190611e49565b610551565b6040516101e99190611d1c565b60405180910390f35b6101fa610584565b6040516102079190611e02565b60405180910390f35b6102186105a8565b6040516102259190611e02565b60405180910390f35b61024860048036038101906102439190611ed4565b6105ae565b005b610264600480360381019061025f9190611f14565b61079e565b6040516102719190611e02565b60405180910390f35b610294600480360381019061028f9190611e49565b61083a565b005b6102b060048036038101906102ab9190611e49565b610964565b6040516102bd9190611e02565b60405180910390f35b6102e060048036038101906102db9190611f14565b610a4c565b005b6102ea610b6b565b6040516102f79190611f50565b60405180910390f35b610308610b8f565b6040516103159190611dc7565b60405180910390f35b61033860048036038101906103339190611f6b565b610c1d565b005b610354600480360381019061034f9190611f14565b611043565b6040516103619190611d1c565b60405180910390f35b610384600480360381019061037f9190611ed4565b611185565b6040516103919190611e02565b60405180910390f35b6103b460048036038101906103af9190611f14565b6113dd565b005b60006301ffc9a77c010000000000000000000000000000000000000000000000000000000002827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19160361040a57600190506104b3565b639493f8b27c010000000000000000000000000000000000000000000000000000000002827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19160361045c57600190506104b3565b630d7491f87c010000000000000000000000000000000000000000000000000000000002827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916036104ae57600190506104b3565b600090505b919050565b600780546104c590611fed565b80601f01602080910402602001604051908101604052809291908181526020018280546104f190611fed565b801561053e5780601f106105135761010080835404028352916020019161053e565b820191906000526020600020905b81548152906001019060200180831161052157829003601f168201915b505050505081565b60095481565b600781565b60006007821061056057600080fd5b60008203610575576007600b5414905061057f565b81600b5483161490505b919050565b7f000000000000000000000000000000000000000000000000000000000000000081565b600b5481565b600060606105de84600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff166114fc565b6105e884846116d5565b8373ffffffffffffffffffffffffffffffffffffffff163330856040516024016106149392919061207d565b6040516020818303038152906040527f23b872dd000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161069e91906120fb565b6000604051808303816000865af19150503d80600081146106db576040519150601f19603f3d011682016040523d82523d6000602084013e6106e0565b606091505b50809250819350505081610729576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016107209061215e565b60405180910390fd5b8080602001905181019061073d91906121aa565b91508161077f576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161077690612223565b60405180910390fd5b82600960008282546107919190612272565b9250508190555050505050565b600080600a60008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205490506000600a60008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506108328382611185565b915050919050565b610847600160ff16610551565b15610887576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161087e906122f2565b60405180910390fd5b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614610915576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161090c9061235e565b60405180910390fd5b620f4240811061095a576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610951906123ca565b60405180910390fd5b8060048190555050565b600060078211156109aa576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016109a190612436565b60405180910390fd5b6000600b548316146109f1576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016109e8906124a2565b60405180910390fd5b81600b600082825417925050819055506007600b541415157f6b7e2e653f93b645d4ed7292d6429f96637084363e477c8aaea1a43ed13c284e600b54604051610a3a9190611e02565b60405180910390a2600b549050919050565b610a59600260ff16610551565b15610a99576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610a90906122f2565b60405180910390fd5b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614610b27576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610b1e9061235e565b60405180910390fd5b80600560006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050565b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60088054610b9c90611fed565b80601f0160208091040260200160405190810160405280929190818152602001828054610bc890611fed565b8015610c155780601f10610bea57610100808354040283529160200191610c15565b820191906000526020600020905b815481529060010190602001808311610bf857829003601f168201915b505050505081565b600060606000806000610c2f86611a5c565b90508086610c3d91906124c2565b9250610c4a888885611a89565b92508773ffffffffffffffffffffffffffffffffffffffff1630604051602401610c7491906124f6565b6040516020818303038152906040527f70a08231000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051610cfe91906120fb565b6000604051808303816000865af19150503d8060008114610d3b576040519150601f19603f3d011682016040523d82523d6000602084013e610d40565b606091505b50809550819650505084610d89576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610d809061215e565b60405180910390fd5b83806020019051810190610d9d9190612526565b91508083610dab9190612272565b821015610ded576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610de49061259f565b60405180910390fd5b610df787876105ae565b8773ffffffffffffffffffffffffffffffffffffffff163384604051602401610e219291906125bf565b6040516020818303038152906040527fa9059cbb000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051610eab91906120fb565b6000604051808303816000865af19150503d8060008114610ee8576040519150601f19603f3d011682016040523d82523d6000602084013e610eed565b606091505b50809550819650505084610f36576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610f2d9061215e565b60405180910390fd5b83806020019051810190610f4a91906121aa565b945084610f8c576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610f8390612223565b60405180910390fd5b600073ffffffffffffffffffffffffffffffffffffffff16600560009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16146110395780600a60008a73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008282546110319190612272565b925050819055505b5050505050505050565b60008060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff161461109e57600080fd5b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff169050826000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e060405160405180910390a36001915050919050565b6000806060600073ffffffffffffffffffffffffffffffffffffffff16600560009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff160361121b576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016112129061235e565b60405180910390fd5b8473ffffffffffffffffffffffffffffffffffffffff16600560009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16856040516024016112679291906125bf565b6040516020818303038152906040527fa9059cbb000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516112f191906120fb565b6000604051808303816000865af19150503d806000811461132e576040519150601f19603f3d011682016040523d82523d6000602084013e611333565b606091505b5080925081935050508161137c576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016113739061215e565b60405180910390fd5b8080602001905181019061139091906121aa565b9150816113d2576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016113c990612223565b60405180910390fd5b839250505092915050565b6113ea600460ff16610551565b1561142a576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401611421906122f2565b60405180910390fd5b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16146114b8576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016114af9061235e565b60405180910390fd5b80600360006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050565b60006060600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff160361153b5750506116d1565b8273ffffffffffffffffffffffffffffffffffffffff16846040516024016115639190611f50565b6040516020818303038152906040527f3ef25013000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516115ed91906120fb565b6000604051808303816000865af19150503d806000811461162a576040519150601f19603f3d011682016040523d82523d6000602084013e61162f565b606091505b50809250819350505081611678576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161166f90612634565b60405180910390fd5b8080602001905181019061168c91906121aa565b9150816116ce576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016116c5906126a0565b60405180910390fd5b50505b5050565b60006060600080600073ffffffffffffffffffffffffffffffffffffffff16600260009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff160361173b5750505050611a58565b600260009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1686306040516024016117879291906126c0565b6040516020818303038152906040527f23778613000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161181191906120fb565b6000604051808303816000865af19150503d806000811461184e576040519150601f19603f3d011682016040523d82523d6000602084013e611853565b606091505b5080945081955050508361189c576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161189390612735565b60405180910390fd5b828060200190518101906118b09190612526565b91508573ffffffffffffffffffffffffffffffffffffffff16306040516024016118da91906124f6565b6040516020818303038152906040527f70a08231000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161196491906120fb565b6000604051808303816000865af19150503d80600081146119a1576040519150601f19603f3d011682016040523d82523d6000602084013e6119a6565b606091505b508094508195505050836119ef576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016119e69061215e565b60405180910390fd5b82806020019051810190611a039190612526565b9050818582611a129190612272565b1115611a53576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401611a4a906127a1565b60405180910390fd5b505050505b5050565b60008060045483611a6d91906127c1565b9050620f424081611a7e9190612832565b905080915050919050565b600080606060008073ffffffffffffffffffffffffffffffffffffffff16600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1603611af057849350505050611c70565b600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16878787604051602401611b3e93929190612863565b6040516020818303038152906040527fdbb21d40000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051611bc891906120fb565b6000604051808303816000865af19150503d8060008114611c05576040519150601f19603f3d011682016040523d82523d6000602084013e611c0a565b606091505b50809350819450505082611c53576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401611c4a906128e6565b60405180910390fd5b81806020019051810190611c679190612526565b90508093505050505b9392505050565b600080fd5b60007fffffffff0000000000000000000000000000000000000000000000000000000082169050919050565b611cb181611c7c565b8114611cbc57600080fd5b50565b600081359050611cce81611ca8565b92915050565b600060208284031215611cea57611ce9611c77565b5b6000611cf884828501611cbf565b91505092915050565b60008115159050919050565b611d1681611d01565b82525050565b6000602082019050611d316000830184611d0d565b92915050565b600081519050919050565b600082825260208201905092915050565b60005b83811015611d71578082015181840152602081019050611d56565b60008484015250505050565b6000601f19601f8301169050919050565b6000611d9982611d37565b611da38185611d42565b9350611db3818560208601611d53565b611dbc81611d7d565b840191505092915050565b60006020820190508181036000830152611de18184611d8e565b905092915050565b6000819050919050565b611dfc81611de9565b82525050565b6000602082019050611e176000830184611df3565b92915050565b611e2681611de9565b8114611e3157600080fd5b50565b600081359050611e4381611e1d565b92915050565b600060208284031215611e5f57611e5e611c77565b5b6000611e6d84828501611e34565b91505092915050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000611ea182611e76565b9050919050565b611eb181611e96565b8114611ebc57600080fd5b50565b600081359050611ece81611ea8565b92915050565b60008060408385031215611eeb57611eea611c77565b5b6000611ef985828601611ebf565b9250506020611f0a85828601611e34565b9150509250929050565b600060208284031215611f2a57611f29611c77565b5b6000611f3884828501611ebf565b91505092915050565b611f4a81611e96565b82525050565b6000602082019050611f656000830184611f41565b92915050565b600080600060608486031215611f8457611f83611c77565b5b6000611f9286828701611ebf565b9350506020611fa386828701611ebf565b9250506040611fb486828701611e34565b9150509250925092565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b6000600282049050600182168061200557607f821691505b60208210810361201857612017611fbe565b5b50919050565b6000819050919050565b600061204361203e61203984611e76565b61201e565b611e76565b9050919050565b600061205582612028565b9050919050565b60006120678261204a565b9050919050565b6120778161205c565b82525050565b60006060820190506120926000830186611f41565b61209f602083018561206e565b6120ac6040830184611df3565b949350505050565b600081519050919050565b600081905092915050565b60006120d5826120b4565b6120df81856120bf565b93506120ef818560208601611d53565b80840191505092915050565b600061210782846120ca565b915081905092915050565b7f4552525f544f4b454e0000000000000000000000000000000000000000000000600082015250565b6000612148600983611d42565b915061215382612112565b602082019050919050565b600060208201905081810360008301526121778161213b565b9050919050565b61218781611d01565b811461219257600080fd5b50565b6000815190506121a48161217e565b92915050565b6000602082840312156121c0576121bf611c77565b5b60006121ce84828501612195565b91505092915050565b7f4552525f5452414e534645520000000000000000000000000000000000000000600082015250565b600061220d600c83611d42565b9150612218826121d7565b602082019050919050565b6000602082019050818103600083015261223c81612200565b9050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b600061227d82611de9565b915061228883611de9565b92508282019050808211156122a05761229f612243565b5b92915050565b7f4552525f5345414c000000000000000000000000000000000000000000000000600082015250565b60006122dc600883611d42565b91506122e7826122a6565b602082019050919050565b6000602082019050818103600083015261230b816122cf565b9050919050565b7f4552525f41585800000000000000000000000000000000000000000000000000600082015250565b6000612348600783611d42565b915061235382612312565b602082019050919050565b600060208201905081810360008301526123778161233b565b9050919050565b7f4552525f4645455f544f4f5f4849474800000000000000000000000000000000600082015250565b60006123b4601083611d42565b91506123bf8261237e565b602082019050919050565b600060208201905081810360008301526123e3816123a7565b9050919050565b7f4552525f494e56414c49445f5354415445000000000000000000000000000000600082015250565b6000612420601183611d42565b915061242b826123ea565b602082019050919050565b6000602082019050818103600083015261244f81612413565b9050919050565b7f4552525f414c52454144595f4c4f434b45440000000000000000000000000000600082015250565b600061248c601283611d42565b915061249782612456565b602082019050919050565b600060208201905081810360008301526124bb8161247f565b9050919050565b60006124cd82611de9565b91506124d883611de9565b92508282039050818111156124f0576124ef612243565b5b92915050565b600060208201905061250b600083018461206e565b92915050565b60008151905061252081611e1d565b92915050565b60006020828403121561253c5761253b611c77565b5b600061254a84828501612511565b91505092915050565b7f4552525f42414c414e4345000000000000000000000000000000000000000000600082015250565b6000612589600b83611d42565b915061259482612553565b602082019050919050565b600060208201905081810360008301526125b88161257c565b9050919050565b60006040820190506125d46000830185611f41565b6125e16020830184611df3565b9392505050565b7f4552525f52454749535452590000000000000000000000000000000000000000600082015250565b600061261e600c83611d42565b9150612629826125e8565b602082019050919050565b6000602082019050818103600083015261264d81612611565b9050919050565b7f4552525f554e415554485f544f4b454e00000000000000000000000000000000600082015250565b600061268a601083611d42565b915061269582612654565b602082019050919050565b600060208201905081810360008301526126b98161267d565b9050919050565b60006040820190506126d56000830185611f41565b6126e2602083018461206e565b9392505050565b7f4552525f4c494d49544552000000000000000000000000000000000000000000600082015250565b600061271f600b83611d42565b915061272a826126e9565b602082019050919050565b6000602082019050818103600083015261274e81612712565b9050919050565b7f4552525f4c494d49540000000000000000000000000000000000000000000000600082015250565b600061278b600983611d42565b915061279682612755565b602082019050919050565b600060208201905081810360008301526127ba8161277e565b9050919050565b60006127cc82611de9565b91506127d783611de9565b92508282026127e581611de9565b915082820484148315176127fc576127fb612243565b5b5092915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601260045260246000fd5b600061283d82611de9565b915061284883611de9565b92508261285857612857612803565b5b828204905092915050565b60006060820190506128786000830186611f41565b6128856020830185611f41565b6128926040830184611df3565b949350505050565b7f4552525f51554f54455200000000000000000000000000000000000000000000600082015250565b60006128d0600a83611d42565b91506128db8261289a565b602082019050919050565b600060208201905081810360008301526128ff816128c3565b905091905056fea2646970667358221220bfdeea1c87787b34e973818c97c85e2e15376268e426b1ddde3443090928515564736f6c63430008130033 +\ No newline at end of file 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":"bytes32","name":"_declaration","type":"bytes32"},{"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":"0x2dfb9b3d37e454c585fae14e6a1ad51c6e427ee61d52d1aff97ed5f6445b2f6d","license":"AGPL-3.0-or-later","urls":["bzz-raw://032d573e4517186ea85a81a638a3c0239b11b49fbabe2df5cc7d6d5b0ebfa583","dweb:/ipfs/QmbtgbN5gjkBZsaLj5dHCoR57mh9RR6axZzZD1BM5d9RDn"]}},"version":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":"bytes32","name":"_declaration","type":"bytes32"},{"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":"0x9a52a74b841493c451d29e9564b5ae4d2592bc313d2eea6bd6c31fe38d5aa4ac","license":"AGPL-3.0-or-later","urls":["bzz-raw://b52219c7544cfc0e2cdae5b7640d38e9479a97b87468a8de0af49d3d548b48f7","dweb:/ipfs/Qmf1bbHJeUfLUoEhV6Qvs9BsDN4fzQTDj5ksXfDcVdEcwx"]}},"version":1} diff --git a/solidity/SwapPool.sol b/solidity/SwapPool.sol @@ -28,8 +28,8 @@ contract SwapPool { uint256 public sealState; uint8 constant FEE_STATE = 1; uint8 constant FEEADDRESS_STATE = 2; - uint8 constant QUOTER_STATE = 2; - uint256 constant public maxSealState = 3; + uint8 constant QUOTER_STATE = 4; + uint256 constant public maxSealState = 7; // Implements Seal event SealStateChange(bool indexed _final, uint256 _sealState);