erc20-vend

Create ERC20 tokens the can be minted by existing ERC20 token balance
Log | Files | Refs

commit 698ca51a0d3db8d7639819f4ef6df9ac4e683aea
parent 8d0f14a521b1d3742040027fa9e0de84517682e7
Author: lash <dev@holbrook.no>
Date:   Tue,  1 Aug 2023 15:50:53 +0100

Update to cic interface for token swap

Diffstat:
Mpython/erc20_vend/data/Vend.bin | 4++--
Mpython/erc20_vend/data/Vend.json | 2+-
Mpython/erc20_vend/data/Vend.metadata.json | 2+-
Mpython/erc20_vend/vend.py | 11+++++++----
Mpython/test_requirements.txt | 2+-
Mpython/tests/test_base.py | 8++++----
Mpython/tests/test_events.py | 4++--
Mpython/tests/test_supply.py | 2+-
Msolidity/Vend.sol | 6++++--
9 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/python/erc20_vend/data/Vend.bin b/python/erc20_vend/data/Vend.bin @@ -1 +1 @@ -60806040523480156200001157600080fd5b50604051620051d3380380620051d3833981810160405281019062000037919062000547565b6000606084600160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555083600160156101000a81548160ff021916908360ff160217905550600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166040516024016040516020818303038152906040527f313ce567000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516200016291906200061c565b6000604051808303816000865af19150503d8060008114620001a1576040519150601f19603f3d011682016040523d82523d6000602084013e620001a6565b606091505b50809250819350505081620001f2576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401620001e99062000696565b60405180910390fd5b80806020019051810190620002089190620006b8565b600160146101000a81548160ff021916908360ff160217905550600160159054906101000a900460ff1660ff16600160149054906101000a900460ff1660ff1610156200025457600080fd5b82620003d257600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166040516024016040516020818303038152906040527f18160ddd000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516200032591906200061c565b6000604051808303816000865af19150503d806000811462000364576040519150601f19603f3d011682016040523d82523d6000602084013e62000369565b606091505b50809250819350505081620003b5576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401620003ac9062000696565b60405180910390fd5b80806020019051810190620003cb919062000725565b6002819055505b83600160149054906101000a900460ff16620003ef919062000786565b600a620003fd919062000916565b600381905550600060035403620004175760016003819055505b336000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550505050505062000967565b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000620004948262000467565b9050919050565b620004a68162000487565b8114620004b257600080fd5b50565b600081519050620004c6816200049b565b92915050565b600060ff82169050919050565b620004e481620004cc565b8114620004f057600080fd5b50565b6000815190506200050481620004d9565b92915050565b60008115159050919050565b62000521816200050a565b81146200052d57600080fd5b50565b600081519050620005418162000516565b92915050565b60008060006060848603121562000563576200056262000462565b5b60006200057386828701620004b5565b93505060206200058686828701620004f3565b9250506040620005998682870162000530565b9150509250925092565b600081519050919050565b600081905092915050565b60005b83811015620005d9578082015181840152602081019050620005bc565b60008484015250505050565b6000620005f282620005a3565b620005fe8185620005ae565b935062000610818560208601620005b9565b80840191505092915050565b60006200062a8284620005e5565b915081905092915050565b600082825260208201905092915050565b7f4552525f544f4b454e0000000000000000000000000000000000000000000000600082015250565b60006200067e60098362000635565b91506200068b8262000646565b602082019050919050565b60006020820190508181036000830152620006b1816200066f565b9050919050565b600060208284031215620006d157620006d062000462565b5b6000620006e184828501620004f3565b91505092915050565b6000819050919050565b620006ff81620006ea565b81146200070b57600080fd5b50565b6000815190506200071f81620006f4565b92915050565b6000602082840312156200073e576200073d62000462565b5b60006200074e848285016200070e565b91505092915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b60006200079382620004cc565b9150620007a083620004cc565b9250828203905060ff811115620007bc57620007bb62000757565b5b92915050565b6000600282049050919050565b6000808291508390505b60018511156200082157808604811115620007f957620007f862000757565b5b6001851615620008095780820291505b80810290506200081985620007c2565b9450620007d9565b94509492505050565b6000826200083c57600190506200090f565b816200084c57600090506200090f565b81600181146200086557600281146200087057620008a6565b60019150506200090f565b60ff84111562000885576200088462000757565b5b8360020a9150848211156200089f576200089e62000757565b5b506200090f565b5060208310610133831016604e8410600b8410161715620008e05782820a905083811115620008da57620008d962000757565b5b6200090f565b620008ef8484846001620007cf565b9250905081840481111562000909576200090862000757565b5b81810290505b9392505050565b60006200092382620006ea565b91506200093083620004cc565b92506200095f7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff84846200082a565b905092915050565b61485c80620009776000396000f3fe60806040523480156200001157600080fd5b5060043610620000b1576000357c0100000000000000000000000000000000000000000000000000000000900480635ae06f7e11620000805780635ae06f7e146200018e578063644b7a4314620001c45780639eca672c14620001fa578063da2824a8146200023057620000b1565b806301ffc9a714620000b657806314d943b014620000ec578063198e2b8a14620001225780632b29ba231462000158575b600080fd5b620000d46004803603810190620000ce919062001853565b62000266565b604051620000e39190620018a2565b60405180910390f35b6200010a600480360381019062000104919062001924565b6200031a565b60405162000119919062001971565b60405180910390f35b6200014060048036038101906200013a9190620019fc565b62000af9565b6040516200014f919062001a9b565b60405180910390f35b62000176600480360381019062000170919062001924565b62000cbc565b604051620001859190620018a2565b60405180910390f35b620001ac6004803603810190620001a6919062001924565b62000d69565b604051620001bb9190620018a2565b60405180910390f35b620001e26004803603810190620001dc919062001ae9565b62000e5d565b604051620001f1919062001a9b565b60405180910390f35b62000218600480360381019062000212919062001924565b62000ea8565b60405162000227919062001971565b60405180910390f35b6200024e600480360381019062000248919062001924565b620014db565b6040516200025d9190620018a2565b60405180910390f35b60006301ffc9a77c010000000000000000000000000000000000000000000000000000000002827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff191603620002bc576001905062000315565b63abe1f1f57c010000000000000000000000000000000000000000000000000000000002827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19160362000310576001905062000315565b600090505b919050565b600080600060606000808694506000600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008973ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205414620003e9576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401620003e09062001b7c565b60405180910390fd5b600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163360405160240162000435919062001a9b565b6040516020818303038152906040527f70a08231000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051620004c1919062001c17565b6000604051808303816000865af19150503d806000811462000500576040519150601f19603f3d011682016040523d82523d6000602084013e62000505565b606091505b5080945081955050508362000551576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401620005489062001c80565b60405180910390fd5b8280602001905181019062000567919062001cb9565b90507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8110620005ce576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401620005c59062001d3b565b60405180910390fd5b60008103620005e65760009550505050505062000af4565b600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16333083604051602401620006369392919062001dc8565b6040516020818303038152906040527f23b872dd000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051620006c2919062001c17565b6000604051808303816000865af19150503d806000811462000701576040519150601f19603f3d011682016040523d82523d6000602084013e62000706565b606091505b5080945081955050508362000752576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401620007499062001c80565b60405180910390fd5b8280602001905181019062000768919062001e36565b935083620007ad576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401620007a49062001eb8565b60405180910390fd5b80600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550600060035403620008425780915062000855565b6003548162000852919062001f38565b91505b60006002540362000947578473ffffffffffffffffffffffffffffffffffffffff1663449a52f833846040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401620008b992919062001f70565b6020604051808303816000875af1158015620008d9573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620008ff919062001e36565b62000941576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401620009389062001fed565b60405180910390fd5b62000aeb565b8673ffffffffffffffffffffffffffffffffffffffff1633836040516024016200097392919062001f70565b6040516020818303038152906040527fa9059cbb000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051620009ff919062001c17565b6000604051808303816000865af19150503d806000811462000a3e576040519150601f19603f3d011682016040523d82523d6000602084013e62000a43565b606091505b5080945081955050508362000a8f576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040162000a869062001c80565b60405180910390fd5b8280602001905181019062000aa5919062001e36565b93508362000aea576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040162000ae1906200205f565b60405180910390fd5b5b81955050505050505b919050565b60008060008087878787600160159054906101000a900460ff16600060405162000b2390620017de565b62000b349695949392919062002135565b604051809103906000f08015801562000b51573d6000803e3d6000fd5b50925082915060058054905090506005839080600181540180825580915050600190039060005260206000200160009091909190916101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506000600254111562000c71578273ffffffffffffffffffffffffffffffffffffffff1663449a52f8306002546040518363ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040162000c2992919062001f70565b6020604051808303816000875af115801562000c49573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019062000c6f919062001e36565b505b600254817f0f91f79b60765ed60c8537a0c2f417bfc1ab0a46df716a76bc7ba5130529898f8460405162000ca6919062001a9b565b60405180910390a3819350505050949350505050565b6000600760008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff168062000d62575060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff16145b9050919050565b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16148062000df257508173ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16145b62000dfc57600080fd5b6000600760008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff02191690831515021790555060019050919050565b60006005828154811062000e765762000e7562002194565b5b9060005260206000200160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff169050919050565b6000806060600080600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205491506000820362000f46576000945050505050620014d6565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008873ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541062001027576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016200101e9062002213565b60405180910390fd5b62001033863362001598565b90507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008873ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff81036200110c576000945050505050620014d6565b8573ffffffffffffffffffffffffffffffffffffffff163330836040516024016200113a9392919062001dc8565b6040516020818303038152906040527f23b872dd000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051620011c6919062001c17565b6000604051808303816000865af19150503d806000811462001205576040519150601f19603f3d011682016040523d82523d6000602084013e6200120a565b606091505b5080945081955050508362001256576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016200124d9062001c80565b60405180910390fd5b828060200190518101906200126c919062001e36565b935083620012b1576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401620012a89062001eb8565b60405180910390fd5b80600460008873ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600082825462001302919062002235565b92505081905550600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1633836040516024016200135792919062001f70565b6040516020818303038152906040527fa9059cbb000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051620013e3919062001c17565b6000604051808303816000865af19150503d806000811462001422576040519150601f19603f3d011682016040523d82523d6000602084013e62001427565b606091505b5080945081955050508362001473576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016200146a9062001c80565b60405180910390fd5b8280602001905181019062001489919062001e36565b935083620014ce576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401620014c59062001eb8565b60405180910390fd5b819450505050505b919050565b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16146200153757600080fd5b6001600760008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff02191690831515021790555060019050919050565b60008060606000808673ffffffffffffffffffffffffffffffffffffffff1686604051602401620015ca919062001a9b565b6040516020818303038152906040527f70a08231000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405162001656919062001c17565b6000604051808303816000865af19150503d806000811462001695576040519150601f19603f3d011682016040523d82523d6000602084013e6200169a565b606091505b50809450819550505083620016e6576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401620016dd9062001c80565b60405180910390fd5b82806020019051810190620016fc919062001cb9565b9150600660008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008873ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054905080600354836200178e919062002270565b14620017d1576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401620017c8906200230b565b60405180910390fd5b8194505050505092915050565b6124f9806200232e83390190565b600080fd5b600080fd5b60007fffffffff0000000000000000000000000000000000000000000000000000000082169050919050565b6200182d81620017f6565b81146200183957600080fd5b50565b6000813590506200184d8162001822565b92915050565b6000602082840312156200186c576200186b620017ec565b5b60006200187c848285016200183c565b91505092915050565b60008115159050919050565b6200189c8162001885565b82525050565b6000602082019050620018b9600083018462001891565b92915050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000620018ec82620018bf565b9050919050565b620018fe81620018df565b81146200190a57600080fd5b50565b6000813590506200191e81620018f3565b92915050565b6000602082840312156200193d576200193c620017ec565b5b60006200194d848285016200190d565b91505092915050565b6000819050919050565b6200196b8162001956565b82525050565b600060208201905062001988600083018462001960565b92915050565b600080fd5b600080fd5b600080fd5b60008083601f840112620019b657620019b56200198e565b5b8235905067ffffffffffffffff811115620019d657620019d562001993565b5b602083019150836001820283011115620019f557620019f462001998565b5b9250929050565b6000806000806040858703121562001a195762001a18620017ec565b5b600085013567ffffffffffffffff81111562001a3a5762001a39620017f1565b5b62001a48878288016200199d565b9450945050602085013567ffffffffffffffff81111562001a6e5762001a6d620017f1565b5b62001a7c878288016200199d565b925092505092959194509250565b62001a9581620018df565b82525050565b600060208201905062001ab2600083018462001a8a565b92915050565b62001ac38162001956565b811462001acf57600080fd5b50565b60008135905062001ae38162001ab8565b92915050565b60006020828403121562001b025762001b01620017ec565b5b600062001b128482850162001ad2565b91505092915050565b600082825260208201905092915050565b7f4552525f55534544000000000000000000000000000000000000000000000000600082015250565b600062001b6460088362001b1b565b915062001b718262001b2c565b602082019050919050565b6000602082019050818103600083015262001b978162001b55565b9050919050565b600081519050919050565b600081905092915050565b60005b8381101562001bd457808201518184015260208101905062001bb7565b60008484015250505050565b600062001bed8262001b9e565b62001bf9818562001ba9565b935062001c0b81856020860162001bb4565b80840191505092915050565b600062001c25828462001be0565b915081905092915050565b7f4552525f544f4b454e0000000000000000000000000000000000000000000000600082015250565b600062001c6860098362001b1b565b915062001c758262001c30565b602082019050919050565b6000602082019050818103600083015262001c9b8162001c59565b9050919050565b60008151905062001cb38162001ab8565b92915050565b60006020828403121562001cd25762001cd1620017ec565b5b600062001ce28482850162001ca2565b91505092915050565b7f4552525f56414c55455f544f4f5f484947480000000000000000000000000000600082015250565b600062001d2360128362001b1b565b915062001d308262001ceb565b602082019050919050565b6000602082019050818103600083015262001d568162001d14565b9050919050565b6000819050919050565b600062001d8862001d8262001d7c84620018bf565b62001d5d565b620018bf565b9050919050565b600062001d9c8262001d67565b9050919050565b600062001db08262001d8f565b9050919050565b62001dc28162001da3565b82525050565b600060608201905062001ddf600083018662001a8a565b62001dee602083018562001db7565b62001dfd604083018462001960565b949350505050565b62001e108162001885565b811462001e1c57600080fd5b50565b60008151905062001e308162001e05565b92915050565b60006020828403121562001e4f5762001e4e620017ec565b5b600062001e5f8482850162001e1f565b91505092915050565b7f4552525f544f4b454e5f5452414e534645520000000000000000000000000000600082015250565b600062001ea060128362001b1b565b915062001ead8262001e68565b602082019050919050565b6000602082019050818103600083015262001ed38162001e91565b9050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601260045260246000fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b600062001f458262001956565b915062001f528362001956565b92508262001f655762001f6462001eda565b5b828204905092915050565b600060408201905062001f87600083018562001a8a565b62001f96602083018462001960565b9392505050565b7f4552525f4d494e54000000000000000000000000000000000000000000000000600082015250565b600062001fd560088362001b1b565b915062001fe28262001f9d565b602082019050919050565b60006020820190508181036000830152620020088162001fc6565b9050919050565b7f4552525f56454e445f544f4b454e5f5452414e53464552000000000000000000600082015250565b60006200204760178362001b1b565b915062002054826200200f565b602082019050919050565b600060208201905081810360008301526200207a8162002038565b9050919050565b82818337600083830152505050565b6000601f19601f8301169050919050565b6000620020af838562001b1b565b9350620020be83858462002081565b620020c98362002090565b840190509392505050565b600060ff82169050919050565b620020ec81620020d4565b82525050565b6000819050919050565b60006200211d620021176200211184620020f2565b62001d5d565b62001956565b9050919050565b6200212f81620020fc565b82525050565b600060808201905081810360008301526200215281888a620020a1565b9050818103602083015262002169818688620020a1565b90506200217a6040830185620020e1565b62002189606083018462002124565b979650505050505050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b7f4552525f414c52454144595f57495448445241574e0000000000000000000000600082015250565b6000620021fb60158362001b1b565b91506200220882620021c3565b602082019050919050565b600060208201905081810360008301526200222e81620021ec565b9050919050565b6000620022428262001956565b91506200224f8362001956565b92508282019050808211156200226a576200226962001f09565b5b92915050565b60006200227d8262001956565b91506200228a8362001956565b92508282026200229a8162001956565b91508282048414831517620022b457620022b362001f09565b5b5092915050565b7f4552525f4c4f434b454400000000000000000000000000000000000000000000600082015250565b6000620022f3600a8362001b1b565b91506200230082620022bb565b602082019050919050565b600060208201905081810360008301526200232681620022e4565b905091905056fe60806040523480156200001157600080fd5b50604051620024f9380380620024f98339818101604052810190620000379190620002d3565b336000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055508360029081620000889190620005ca565b5082600390816200009a9190620005ca565b5081600460006101000a81548160ff021916908360ff1602179055508060098190555050505050620006b1565b6000604051905090565b600080fd5b600080fd5b600080fd5b600080fd5b6000601f19601f8301169050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b6200013082620000e5565b810181811067ffffffffffffffff82111715620001525762000151620000f6565b5b80604052505050565b600062000167620000c7565b905062000175828262000125565b919050565b600067ffffffffffffffff821115620001985762000197620000f6565b5b620001a382620000e5565b9050602081019050919050565b60005b83811015620001d0578082015181840152602081019050620001b3565b60008484015250505050565b6000620001f3620001ed846200017a565b6200015b565b905082815260208101848484011115620002125762000211620000e0565b5b6200021f848285620001b0565b509392505050565b600082601f8301126200023f576200023e620000db565b5b815162000251848260208601620001dc565b91505092915050565b600060ff82169050919050565b62000272816200025a565b81146200027e57600080fd5b50565b600081519050620002928162000267565b92915050565b6000819050919050565b620002ad8162000298565b8114620002b957600080fd5b50565b600081519050620002cd81620002a2565b92915050565b60008060008060808587031215620002f057620002ef620000d1565b5b600085015167ffffffffffffffff811115620003115762000310620000d6565b5b6200031f8782880162000227565b945050602085015167ffffffffffffffff811115620003435762000342620000d6565b5b620003518782880162000227565b9350506040620003648782880162000281565b92505060606200037787828801620002bc565b91505092959194509250565b600081519050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b60006002820490506001821680620003d657607f821691505b602082108103620003ec57620003eb6200038e565b5b50919050565b60008190508160005260206000209050919050565b60006020601f8301049050919050565b60008160020a8302905092915050565b600060088302620004597fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8262000417565b62000465868362000417565b95508019841693508086168417925050509392505050565b6000819050919050565b6000620004a8620004a26200049c8462000298565b6200047d565b62000298565b9050919050565b6000819050919050565b620004c48362000487565b620004dc620004d382620004af565b84845462000427565b825550505050565b600090565b620004f3620004e4565b62000500818484620004b9565b505050565b5b8181101562000528576200051c600082620004e9565b60018101905062000506565b5050565b601f82111562000577576200054181620003f2565b6200054c8462000407565b810160208510156200055c578190505b620005746200056b8562000407565b83018262000505565b50505b505050565b60008160020a8304905092915050565b60006200059f600019846008026200057c565b1980831691505092915050565b6000620005ba83836200058c565b9150826002028217905092915050565b620005d58262000383565b67ffffffffffffffff811115620005f157620005f0620000f6565b5b620005fd8254620003bd565b6200060a8282856200052c565b600060209050601f8311600181146200064257600084156200062d578287015190505b620006398582620005ac565b865550620006a9565b601f1984166200065286620003f2565b60005b828110156200067c5784890151825560018201915060208501945060208101905062000655565b868310156200069c578489015162000698601f8916826200058c565b8355505b6001600288020188555050505b505050505050565b611e3880620006c16000396000f3fe608060405234801561001057600080fd5b5060043610610175576000357c0100000000000000000000000000000000000000000000000000000000900480635f408c04116100e0578063a9059cbb11610099578063a9059cbb14610422578063b1cb0db314610452578063d89135cd14610470578063da2824a81461048e578063dd62ed3e146104be578063f2fde38b146104ee57610175565b80635f408c041461035e57806370a082311461037c5780638da5cb5b146103ac57806394d008ef146103ca57806395d89b41146103e6578063a2309ff81461040457610175565b8063313ce56711610132578063313ce5671461027657806342966c6814610294578063449a52f8146102c457806344d17187146102f457806344df8e70146103105780635ae06f7e1461032e57610175565b806301ffc9a71461017a57806306fdde03146101aa578063095ea7b3146101c857806318160ddd146101f857806323b872dd146102165780632b29ba2314610246575b600080fd5b610194600480360381019061018f919061178d565b61051e565b6040516101a191906117d5565b60405180910390f35b6101b2610768565b6040516101bf9190611880565b60405180910390f35b6101e260048036038101906101dd9190611936565b6107f6565b6040516101ef91906117d5565b60405180910390f35b610200610991565b60405161020d9190611985565b60405180910390f35b610230600480360381019061022b91906119a0565b6109a8565b60405161023d91906117d5565b60405180910390f35b610260600480360381019061025b91906119f3565b610cd0565b60405161026d91906117d5565b60405180910390f35b61027e610d7c565b60405161028b9190611a3c565b60405180910390f35b6102ae60048036038101906102a99190611a57565b610d8f565b6040516102bb91906117d5565b60405180910390f35b6102de60048036038101906102d99190611936565b610f51565b6040516102eb91906117d5565b60405180910390f35b61030e60048036038101906103099190611ae9565b6110dd565b005b61031861115b565b60405161032591906117d5565b60405180910390f35b610348600480360381019061034391906119f3565b6111aa565b60405161035591906117d5565b60405180910390f35b61036661129c565b6040516103739190611a3c565b60405180910390f35b610396600480360381019061039191906119f3565b61133a565b6040516103a39190611985565b60405180910390f35b6103b4611352565b6040516103c19190611b6c565b60405180910390f35b6103e460048036038101906103df9190611ae9565b611376565b005b6103ee611387565b6040516103fb9190611880565b60405180910390f35b61040c611415565b6040516104199190611985565b60405180910390f35b61043c60048036038101906104379190611936565b61141b565b60405161044991906117d5565b60405180910390f35b61045a61159a565b6040516104679190611985565b60405180910390f35b6104786115a0565b6040516104859190611985565b60405180910390f35b6104a860048036038101906104a391906119f3565b6115a6565b6040516104b591906117d5565b60405180910390f35b6104d860048036038101906104d39190611b87565b611662565b6040516104e59190611985565b60405180910390f35b610508600480360381019061050391906119f3565b611687565b60405161051591906117d5565b60405180910390f35b600063b61bc9417c010000000000000000000000000000000000000000000000000000000002827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916036105725760019050610763565b63449a52f87c010000000000000000000000000000000000000000000000000000000002827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916036105c45760019050610763565b6301ffc9a77c010000000000000000000000000000000000000000000000000000000002827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916036106165760019050610763565b639493f8b27c010000000000000000000000000000000000000000000000000000000002827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916036106685760019050610763565b63abe1f1f57c010000000000000000000000000000000000000000000000000000000002827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916036106ba5760019050610763565b63b1110c1b7c010000000000000000000000000000000000000000000000000000000002827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19160361070c5760019050610763565b63841a0e947c010000000000000000000000000000000000000000000000000000000002827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19160361075e5760019050610763565b600090505b919050565b6002805461077590611bf6565b80601f01602080910402602001604051908101604052809291908181526020018280546107a190611bf6565b80156107ee5780601f106107c3576101008083540402835291602001916107ee565b820191906000526020600020905b8154815290600101906020018083116107d157829003601f168201915b505050505081565b60008061080161129c565b60ff161461080e57600080fd5b60008211156108a1576000600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054146108a057600080fd5b5b81600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9258460405161097f9190611985565b60405180910390a36001905092915050565b60006008546007546109a39190611c56565b905090565b6000806109b361129c565b60ff16146109c057600080fd5b81600660008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610a4957600080fd5b81600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610a9557600080fd5b81600660008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610b1d9190611c56565b600660008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000208190555081600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206000828254610bec9190611c56565b9250508190555081600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206000828254610c429190611c8a565b925050819055503373ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff168573ffffffffffffffffffffffffffffffffffffffff167f5f7542858008eeb041631f30e6109ae94b83a58e9a58261dd2c42c508850f93985604051610cbd9190611985565b60405180910390a4600190509392505050565b6000600b60008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff1680610d75575060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff16145b9050919050565b600460009054906101000a900460ff1681565b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614610e20576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610e1790611d0a565b60405180910390fd5b81600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610ea2576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610e9990611d76565b60405180910390fd5b81600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206000828254610ef19190611c56565b925050819055508160086000828254610f0a9190611c8a565b925050819055507fb90306ad06b2a6ff86ddc9327db583062895ef6540e62dc50add009db5b356eb82604051610f409190611985565b60405180910390a160019050919050565b6000600b60003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff1680610ff6575060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16145b610fff57600080fd5b81600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600082825461104e9190611c8a565b9250508190555081600760008282546110679190611c8a565b925050819055508273ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fab8530f87dc9b59234c4623bf917212bb2536d647574c8e7e5da92c2ede0c9f8846040516110cb9190611985565b60405180910390a36001905092915050565b8373ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff161461114b576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161114290611de2565b60405180910390fd5b61115483610d8f565b5050505050565b60006111a5600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610d8f565b905090565b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16148061123257508173ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16145b61123b57600080fd5b6000600b60008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff02191690831515021790555060019050919050565b600080600954036112b05760009050611337565b600a60009054906101000a900460ff16156112ce5760019050611337565b6009544210611332576001600a60006101000a81548160ff0219169083151502179055507ff80dbaea4785589e52984ca36a31de106adc77759539a5c7d92883bf49692fe9426040516113219190611985565b60405180910390a160029050611337565b600090505b90565b60056020528060005260406000206000915090505481565b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b6113808484610f51565b5050505050565b6003805461139490611bf6565b80601f01602080910402602001604051908101604052809291908181526020018280546113c090611bf6565b801561140d5780601f106113e25761010080835404028352916020019161140d565b820191906000526020600020905b8154815290600101906020018083116113f057829003601f168201915b505050505081565b60075481565b60008061142661129c565b60ff161461143357600080fd5b81600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561147f57600080fd5b81600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008282546114ce9190611c56565b9250508190555081600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008282546115249190611c8a565b925050819055508273ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040516115889190611985565b60405180910390a36001905092915050565b60095481565b60085481565b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff161461160157600080fd5b6001600b60008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff02191690831515021790555060019050919050565b6006602052816000526040600020602052806000526040600020600091509150505481565b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16146116e257600080fd5b816000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555060019050919050565b600080fd5b600080fd5b60007fffffffff0000000000000000000000000000000000000000000000000000000082169050919050565b61176a81611735565b811461177557600080fd5b50565b60008135905061178781611761565b92915050565b6000602082840312156117a3576117a261172b565b5b60006117b184828501611778565b91505092915050565b60008115159050919050565b6117cf816117ba565b82525050565b60006020820190506117ea60008301846117c6565b92915050565b600081519050919050565b600082825260208201905092915050565b60005b8381101561182a57808201518184015260208101905061180f565b60008484015250505050565b6000601f19601f8301169050919050565b6000611852826117f0565b61185c81856117fb565b935061186c81856020860161180c565b61187581611836565b840191505092915050565b6000602082019050818103600083015261189a8184611847565b905092915050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60006118cd826118a2565b9050919050565b6118dd816118c2565b81146118e857600080fd5b50565b6000813590506118fa816118d4565b92915050565b6000819050919050565b61191381611900565b811461191e57600080fd5b50565b6000813590506119308161190a565b92915050565b6000806040838503121561194d5761194c61172b565b5b600061195b858286016118eb565b925050602061196c85828601611921565b9150509250929050565b61197f81611900565b82525050565b600060208201905061199a6000830184611976565b92915050565b6000806000606084860312156119b9576119b861172b565b5b60006119c7868287016118eb565b93505060206119d8868287016118eb565b92505060406119e986828701611921565b9150509250925092565b600060208284031215611a0957611a0861172b565b5b6000611a17848285016118eb565b91505092915050565b600060ff82169050919050565b611a3681611a20565b82525050565b6000602082019050611a516000830184611a2d565b92915050565b600060208284031215611a6d57611a6c61172b565b5b6000611a7b84828501611921565b91505092915050565b600080fd5b600080fd5b600080fd5b60008083601f840112611aa957611aa8611a84565b5b8235905067ffffffffffffffff811115611ac657611ac5611a89565b5b602083019150836001820283011115611ae257611ae1611a8e565b5b9250929050565b60008060008060608587031215611b0357611b0261172b565b5b6000611b11878288016118eb565b9450506020611b2287828801611921565b935050604085013567ffffffffffffffff811115611b4357611b42611730565b5b611b4f87828801611a93565b925092505092959194509250565b611b66816118c2565b82525050565b6000602082019050611b816000830184611b5d565b92915050565b60008060408385031215611b9e57611b9d61172b565b5b6000611bac858286016118eb565b9250506020611bbd858286016118eb565b9150509250929050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b60006002820490506001821680611c0e57607f821691505b602082108103611c2157611c20611bc7565b5b50919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b6000611c6182611900565b9150611c6c83611900565b9250828203905081811115611c8457611c83611c27565b5b92915050565b6000611c9582611900565b9150611ca083611900565b9250828201905080821115611cb857611cb7611c27565b5b92915050565b7f4552525f41434345535300000000000000000000000000000000000000000000600082015250565b6000611cf4600a836117fb565b9150611cff82611cbe565b602082019050919050565b60006020820190508181036000830152611d2381611ce7565b9050919050565b7f4552525f46554e44530000000000000000000000000000000000000000000000600082015250565b6000611d606009836117fb565b9150611d6b82611d2a565b602082019050919050565b60006020820190508181036000830152611d8f81611d53565b9050919050565b7f4552525f4e4f545f53454c460000000000000000000000000000000000000000600082015250565b6000611dcc600c836117fb565b9150611dd782611d96565b602082019050919050565b60006020820190508181036000830152611dfb81611dbf565b905091905056fea26469706673582212207c618c5e739ffaab5926ea597eb54f0122f3f64b626f5a26fb110c7779f25e7564736f6c63430008130033a264697066735822122068c1ec1133d0c179e447caaab52ef2a5201b96e3c3a3f47094a30322100b4e9f64736f6c63430008130033 -\ No newline at end of file +60806040523480156200001157600080fd5b50604051620051d3380380620051d3833981810160405281019062000037919062000547565b6000606084600160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555083600160156101000a81548160ff021916908360ff160217905550600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166040516024016040516020818303038152906040527f313ce567000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516200016291906200061c565b6000604051808303816000865af19150503d8060008114620001a1576040519150601f19603f3d011682016040523d82523d6000602084013e620001a6565b606091505b50809250819350505081620001f2576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401620001e99062000696565b60405180910390fd5b80806020019051810190620002089190620006b8565b600160146101000a81548160ff021916908360ff160217905550600160159054906101000a900460ff1660ff16600160149054906101000a900460ff1660ff1610156200025457600080fd5b82620003d257600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166040516024016040516020818303038152906040527f18160ddd000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516200032591906200061c565b6000604051808303816000865af19150503d806000811462000364576040519150601f19603f3d011682016040523d82523d6000602084013e62000369565b606091505b50809250819350505081620003b5576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401620003ac9062000696565b60405180910390fd5b80806020019051810190620003cb919062000725565b6002819055505b83600160149054906101000a900460ff16620003ef919062000786565b600a620003fd919062000916565b600381905550600060035403620004175760016003819055505b336000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550505050505062000967565b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000620004948262000467565b9050919050565b620004a68162000487565b8114620004b257600080fd5b50565b600081519050620004c6816200049b565b92915050565b600060ff82169050919050565b620004e481620004cc565b8114620004f057600080fd5b50565b6000815190506200050481620004d9565b92915050565b60008115159050919050565b62000521816200050a565b81146200052d57600080fd5b50565b600081519050620005418162000516565b92915050565b60008060006060848603121562000563576200056262000462565b5b60006200057386828701620004b5565b93505060206200058686828701620004f3565b9250506040620005998682870162000530565b9150509250925092565b600081519050919050565b600081905092915050565b60005b83811015620005d9578082015181840152602081019050620005bc565b60008484015250505050565b6000620005f282620005a3565b620005fe8185620005ae565b935062000610818560208601620005b9565b80840191505092915050565b60006200062a8284620005e5565b915081905092915050565b600082825260208201905092915050565b7f4552525f544f4b454e0000000000000000000000000000000000000000000000600082015250565b60006200067e60098362000635565b91506200068b8262000646565b602082019050919050565b60006020820190508181036000830152620006b1816200066f565b9050919050565b600060208284031215620006d157620006d062000462565b5b6000620006e184828501620004f3565b91505092915050565b6000819050919050565b620006ff81620006ea565b81146200070b57600080fd5b50565b6000815190506200071f81620006f4565b92915050565b6000602082840312156200073e576200073d62000462565b5b60006200074e848285016200070e565b91505092915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b60006200079382620004cc565b9150620007a083620004cc565b9250828203905060ff811115620007bc57620007bb62000757565b5b92915050565b6000600282049050919050565b6000808291508390505b60018511156200082157808604811115620007f957620007f862000757565b5b6001851615620008095780820291505b80810290506200081985620007c2565b9450620007d9565b94509492505050565b6000826200083c57600190506200090f565b816200084c57600090506200090f565b81600181146200086557600281146200087057620008a6565b60019150506200090f565b60ff84111562000885576200088462000757565b5b8360020a9150848211156200089f576200089e62000757565b5b506200090f565b5060208310610133831016604e8410600b8410161715620008e05782820a905083811115620008da57620008d962000757565b5b6200090f565b620008ef8484846001620007cf565b9250905081840481111562000909576200090862000757565b5b81810290505b9392505050565b60006200092382620006ea565b91506200093083620004cc565b92506200095f7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff84846200082a565b905092915050565b61485c80620009776000396000f3fe60806040523480156200001157600080fd5b5060043610620000b1576000357c0100000000000000000000000000000000000000000000000000000000900480635ae06f7e11620000805780635ae06f7e146200018e578063644b7a4314620001c4578063da2824a814620001fa578063f340fa01146200023057620000b1565b806301ffc9a714620000b6578063198e2b8a14620000ec5780632b29ba23146200012257806351cff8d91462000158575b600080fd5b620000d46004803603810190620000ce919062001853565b62000266565b604051620000e39190620018a2565b60405180910390f35b6200010a60048036038101906200010491906200192d565b6200031a565b60405162000119919062001a00565b60405180910390f35b6200014060048036038101906200013a919062001a4e565b620004dd565b6040516200014f9190620018a2565b60405180910390f35b62000176600480360381019062000170919062001a4e565b6200058a565b60405162000185919062001a9b565b60405180910390f35b620001ac6004803603810190620001a6919062001a4e565b62000bbd565b604051620001bb9190620018a2565b60405180910390f35b620001e26004803603810190620001dc919062001ae9565b62000cb1565b604051620001f1919062001a00565b60405180910390f35b62000218600480360381019062000212919062001a4e565b62000cfc565b604051620002279190620018a2565b60405180910390f35b6200024e600480360381019062000248919062001a4e565b62000db9565b6040516200025d919062001a9b565b60405180910390f35b60006301ffc9a77c010000000000000000000000000000000000000000000000000000000002827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff191603620002bc576001905062000315565b63abe1f1f57c010000000000000000000000000000000000000000000000000000000002827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19160362000310576001905062000315565b600090505b919050565b60008060008087878787600160159054906101000a900460ff1660006040516200034490620017de565b620003559695949392919062001bea565b604051809103906000f08015801562000372573d6000803e3d6000fd5b50925082915060058054905090506005839080600181540180825580915050600190039060005260206000200160009091909190916101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506000600254111562000492578273ffffffffffffffffffffffffffffffffffffffff1663449a52f8306002546040518363ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004016200044a92919062001c49565b6020604051808303816000875af11580156200046a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019062000490919062001ca7565b505b600254817f0f91f79b60765ed60c8537a0c2f417bfc1ab0a46df716a76bc7ba5130529898f84604051620004c7919062001a00565b60405180910390a3819350505050949350505050565b6000600760008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff168062000583575060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff16145b9050919050565b6000806060600080600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020549150600082036200062857600094505050505062000bb8565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008873ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541062000709576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401620007009062001d29565b60405180910390fd5b62000715863362001598565b90507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008873ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8103620007ee57600094505050505062000bb8565b8573ffffffffffffffffffffffffffffffffffffffff163330836040516024016200081c9392919062001dac565b6040516020818303038152906040527f23b872dd000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051620008a8919062001e62565b6000604051808303816000865af19150503d8060008114620008e7576040519150601f19603f3d011682016040523d82523d6000602084013e620008ec565b606091505b5080945081955050508362000938576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016200092f9062001ecb565b60405180910390fd5b828060200190518101906200094e919062001ca7565b93508362000993576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016200098a9062001f3d565b60405180910390fd5b80600460008873ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206000828254620009e4919062001f8e565b92505081905550600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16338360405160240162000a3992919062001c49565b6040516020818303038152906040527fa9059cbb000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405162000ac5919062001e62565b6000604051808303816000865af19150503d806000811462000b04576040519150601f19603f3d011682016040523d82523d6000602084013e62000b09565b606091505b5080945081955050508362000b55576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040162000b4c9062001ecb565b60405180910390fd5b8280602001905181019062000b6b919062001ca7565b93508362000bb0576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040162000ba79062001f3d565b60405180910390fd5b819450505050505b919050565b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16148062000c4657508173ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16145b62000c5057600080fd5b6000600760008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff02191690831515021790555060019050919050565b60006005828154811062000cca5762000cc962001fc9565b5b9060005260206000200160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff169050919050565b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff161462000d5857600080fd5b6001600760008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff02191690831515021790555060019050919050565b600080600060606000808694506000600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008973ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541462000e88576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040162000e7f9062002048565b60405180910390fd5b600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163360405160240162000ed4919062001a00565b6040516020818303038152906040527f70a08231000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405162000f60919062001e62565b6000604051808303816000865af19150503d806000811462000f9f576040519150601f19603f3d011682016040523d82523d6000602084013e62000fa4565b606091505b5080945081955050508362000ff0576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040162000fe79062001ecb565b60405180910390fd5b8280602001905181019062001006919062002081565b90507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff81106200106d576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401620010649062002103565b60405180910390fd5b60008103620010855760009550505050505062001593565b600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16333083604051602401620010d59392919062001dac565b6040516020818303038152906040527f23b872dd000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405162001161919062001e62565b6000604051808303816000865af19150503d8060008114620011a0576040519150601f19603f3d011682016040523d82523d6000602084013e620011a5565b606091505b50809450819550505083620011f1576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401620011e89062001ecb565b60405180910390fd5b8280602001905181019062001207919062001ca7565b9350836200124c576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401620012439062001f3d565b60405180910390fd5b80600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550600060035403620012e157809150620012f4565b60035481620012f1919062002154565b91505b600060025403620013e6578473ffffffffffffffffffffffffffffffffffffffff1663449a52f833846040518363ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004016200135892919062001c49565b6020604051808303816000875af115801562001378573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906200139e919062001ca7565b620013e0576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401620013d790620021dc565b60405180910390fd5b6200158a565b8673ffffffffffffffffffffffffffffffffffffffff1633836040516024016200141292919062001c49565b6040516020818303038152906040527fa9059cbb000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516200149e919062001e62565b6000604051808303816000865af19150503d8060008114620014dd576040519150601f19603f3d011682016040523d82523d6000602084013e620014e2565b606091505b508094508195505050836200152e576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401620015259062001ecb565b60405180910390fd5b8280602001905181019062001544919062001ca7565b93508362001589576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040162001580906200224e565b60405180910390fd5b5b81955050505050505b919050565b60008060606000808673ffffffffffffffffffffffffffffffffffffffff1686604051602401620015ca919062001a00565b6040516020818303038152906040527f70a08231000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405162001656919062001e62565b6000604051808303816000865af19150503d806000811462001695576040519150601f19603f3d011682016040523d82523d6000602084013e6200169a565b606091505b50809450819550505083620016e6576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401620016dd9062001ecb565b60405180910390fd5b82806020019051810190620016fc919062002081565b9150600660008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008873ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054905080600354836200178e919062002270565b14620017d1576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401620017c8906200230b565b60405180910390fd5b8194505050505092915050565b6124f9806200232e83390190565b600080fd5b600080fd5b60007fffffffff0000000000000000000000000000000000000000000000000000000082169050919050565b6200182d81620017f6565b81146200183957600080fd5b50565b6000813590506200184d8162001822565b92915050565b6000602082840312156200186c576200186b620017ec565b5b60006200187c848285016200183c565b91505092915050565b60008115159050919050565b6200189c8162001885565b82525050565b6000602082019050620018b9600083018462001891565b92915050565b600080fd5b600080fd5b600080fd5b60008083601f840112620018e757620018e6620018bf565b5b8235905067ffffffffffffffff811115620019075762001906620018c4565b5b602083019150836001820283011115620019265762001925620018c9565b5b9250929050565b600080600080604085870312156200194a5762001949620017ec565b5b600085013567ffffffffffffffff8111156200196b576200196a620017f1565b5b6200197987828801620018ce565b9450945050602085013567ffffffffffffffff8111156200199f576200199e620017f1565b5b620019ad87828801620018ce565b925092505092959194509250565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000620019e882620019bb565b9050919050565b620019fa81620019db565b82525050565b600060208201905062001a176000830184620019ef565b92915050565b62001a2881620019db565b811462001a3457600080fd5b50565b60008135905062001a488162001a1d565b92915050565b60006020828403121562001a675762001a66620017ec565b5b600062001a778482850162001a37565b91505092915050565b6000819050919050565b62001a958162001a80565b82525050565b600060208201905062001ab2600083018462001a8a565b92915050565b62001ac38162001a80565b811462001acf57600080fd5b50565b60008135905062001ae38162001ab8565b92915050565b60006020828403121562001b025762001b01620017ec565b5b600062001b128482850162001ad2565b91505092915050565b600082825260208201905092915050565b82818337600083830152505050565b6000601f19601f8301169050919050565b600062001b5a838562001b1b565b935062001b6983858462001b2c565b62001b748362001b3b565b840190509392505050565b600060ff82169050919050565b62001b978162001b7f565b82525050565b6000819050919050565b6000819050919050565b600062001bd262001bcc62001bc68462001b9d565b62001ba7565b62001a80565b9050919050565b62001be48162001bb1565b82525050565b6000608082019050818103600083015262001c0781888a62001b4c565b9050818103602083015262001c1e81868862001b4c565b905062001c2f604083018562001b8c565b62001c3e606083018462001bd9565b979650505050505050565b600060408201905062001c606000830185620019ef565b62001c6f602083018462001a8a565b9392505050565b62001c818162001885565b811462001c8d57600080fd5b50565b60008151905062001ca18162001c76565b92915050565b60006020828403121562001cc05762001cbf620017ec565b5b600062001cd08482850162001c90565b91505092915050565b7f4552525f414c52454144595f57495448445241574e0000000000000000000000600082015250565b600062001d1160158362001b1b565b915062001d1e8262001cd9565b602082019050919050565b6000602082019050818103600083015262001d448162001d02565b9050919050565b600062001d6c62001d6662001d6084620019bb565b62001ba7565b620019bb565b9050919050565b600062001d808262001d4b565b9050919050565b600062001d948262001d73565b9050919050565b62001da68162001d87565b82525050565b600060608201905062001dc36000830186620019ef565b62001dd2602083018562001d9b565b62001de1604083018462001a8a565b949350505050565b600081519050919050565b600081905092915050565b60005b8381101562001e1f57808201518184015260208101905062001e02565b60008484015250505050565b600062001e388262001de9565b62001e44818562001df4565b935062001e5681856020860162001dff565b80840191505092915050565b600062001e70828462001e2b565b915081905092915050565b7f4552525f544f4b454e0000000000000000000000000000000000000000000000600082015250565b600062001eb360098362001b1b565b915062001ec08262001e7b565b602082019050919050565b6000602082019050818103600083015262001ee68162001ea4565b9050919050565b7f4552525f544f4b454e5f5452414e534645520000000000000000000000000000600082015250565b600062001f2560128362001b1b565b915062001f328262001eed565b602082019050919050565b6000602082019050818103600083015262001f588162001f16565b9050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b600062001f9b8262001a80565b915062001fa88362001a80565b925082820190508082111562001fc35762001fc262001f5f565b5b92915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b7f4552525f55534544000000000000000000000000000000000000000000000000600082015250565b60006200203060088362001b1b565b91506200203d8262001ff8565b602082019050919050565b60006020820190508181036000830152620020638162002021565b9050919050565b6000815190506200207b8162001ab8565b92915050565b6000602082840312156200209a5762002099620017ec565b5b6000620020aa848285016200206a565b91505092915050565b7f4552525f56414c55455f544f4f5f484947480000000000000000000000000000600082015250565b6000620020eb60128362001b1b565b9150620020f882620020b3565b602082019050919050565b600060208201905081810360008301526200211e81620020dc565b9050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601260045260246000fd5b6000620021618262001a80565b91506200216e8362001a80565b92508262002181576200218062002125565b5b828204905092915050565b7f4552525f4d494e54000000000000000000000000000000000000000000000000600082015250565b6000620021c460088362001b1b565b9150620021d1826200218c565b602082019050919050565b60006020820190508181036000830152620021f781620021b5565b9050919050565b7f4552525f56454e445f544f4b454e5f5452414e53464552000000000000000000600082015250565b60006200223660178362001b1b565b91506200224382620021fe565b602082019050919050565b60006020820190508181036000830152620022698162002227565b9050919050565b60006200227d8262001a80565b91506200228a8362001a80565b92508282026200229a8162001a80565b91508282048414831517620022b457620022b362001f5f565b5b5092915050565b7f4552525f4c4f434b454400000000000000000000000000000000000000000000600082015250565b6000620022f3600a8362001b1b565b91506200230082620022bb565b602082019050919050565b600060208201905081810360008301526200232681620022e4565b905091905056fe60806040523480156200001157600080fd5b50604051620024f9380380620024f98339818101604052810190620000379190620002d3565b336000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055508360029081620000889190620005ca565b5082600390816200009a9190620005ca565b5081600460006101000a81548160ff021916908360ff1602179055508060098190555050505050620006b1565b6000604051905090565b600080fd5b600080fd5b600080fd5b600080fd5b6000601f19601f8301169050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b6200013082620000e5565b810181811067ffffffffffffffff82111715620001525762000151620000f6565b5b80604052505050565b600062000167620000c7565b905062000175828262000125565b919050565b600067ffffffffffffffff821115620001985762000197620000f6565b5b620001a382620000e5565b9050602081019050919050565b60005b83811015620001d0578082015181840152602081019050620001b3565b60008484015250505050565b6000620001f3620001ed846200017a565b6200015b565b905082815260208101848484011115620002125762000211620000e0565b5b6200021f848285620001b0565b509392505050565b600082601f8301126200023f576200023e620000db565b5b815162000251848260208601620001dc565b91505092915050565b600060ff82169050919050565b62000272816200025a565b81146200027e57600080fd5b50565b600081519050620002928162000267565b92915050565b6000819050919050565b620002ad8162000298565b8114620002b957600080fd5b50565b600081519050620002cd81620002a2565b92915050565b60008060008060808587031215620002f057620002ef620000d1565b5b600085015167ffffffffffffffff811115620003115762000310620000d6565b5b6200031f8782880162000227565b945050602085015167ffffffffffffffff811115620003435762000342620000d6565b5b620003518782880162000227565b9350506040620003648782880162000281565b92505060606200037787828801620002bc565b91505092959194509250565b600081519050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b60006002820490506001821680620003d657607f821691505b602082108103620003ec57620003eb6200038e565b5b50919050565b60008190508160005260206000209050919050565b60006020601f8301049050919050565b60008160020a8302905092915050565b600060088302620004597fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8262000417565b62000465868362000417565b95508019841693508086168417925050509392505050565b6000819050919050565b6000620004a8620004a26200049c8462000298565b6200047d565b62000298565b9050919050565b6000819050919050565b620004c48362000487565b620004dc620004d382620004af565b84845462000427565b825550505050565b600090565b620004f3620004e4565b62000500818484620004b9565b505050565b5b8181101562000528576200051c600082620004e9565b60018101905062000506565b5050565b601f82111562000577576200054181620003f2565b6200054c8462000407565b810160208510156200055c578190505b620005746200056b8562000407565b83018262000505565b50505b505050565b60008160020a8304905092915050565b60006200059f600019846008026200057c565b1980831691505092915050565b6000620005ba83836200058c565b9150826002028217905092915050565b620005d58262000383565b67ffffffffffffffff811115620005f157620005f0620000f6565b5b620005fd8254620003bd565b6200060a8282856200052c565b600060209050601f8311600181146200064257600084156200062d578287015190505b620006398582620005ac565b865550620006a9565b601f1984166200065286620003f2565b60005b828110156200067c5784890151825560018201915060208501945060208101905062000655565b868310156200069c578489015162000698601f8916826200058c565b8355505b6001600288020188555050505b505050505050565b611e3880620006c16000396000f3fe608060405234801561001057600080fd5b5060043610610175576000357c0100000000000000000000000000000000000000000000000000000000900480635f408c04116100e0578063a9059cbb11610099578063a9059cbb14610422578063b1cb0db314610452578063d89135cd14610470578063da2824a81461048e578063dd62ed3e146104be578063f2fde38b146104ee57610175565b80635f408c041461035e57806370a082311461037c5780638da5cb5b146103ac57806394d008ef146103ca57806395d89b41146103e6578063a2309ff81461040457610175565b8063313ce56711610132578063313ce5671461027657806342966c6814610294578063449a52f8146102c457806344d17187146102f457806344df8e70146103105780635ae06f7e1461032e57610175565b806301ffc9a71461017a57806306fdde03146101aa578063095ea7b3146101c857806318160ddd146101f857806323b872dd146102165780632b29ba2314610246575b600080fd5b610194600480360381019061018f919061178d565b61051e565b6040516101a191906117d5565b60405180910390f35b6101b2610768565b6040516101bf9190611880565b60405180910390f35b6101e260048036038101906101dd9190611936565b6107f6565b6040516101ef91906117d5565b60405180910390f35b610200610991565b60405161020d9190611985565b60405180910390f35b610230600480360381019061022b91906119a0565b6109a8565b60405161023d91906117d5565b60405180910390f35b610260600480360381019061025b91906119f3565b610cd0565b60405161026d91906117d5565b60405180910390f35b61027e610d7c565b60405161028b9190611a3c565b60405180910390f35b6102ae60048036038101906102a99190611a57565b610d8f565b6040516102bb91906117d5565b60405180910390f35b6102de60048036038101906102d99190611936565b610f51565b6040516102eb91906117d5565b60405180910390f35b61030e60048036038101906103099190611ae9565b6110dd565b005b61031861115b565b60405161032591906117d5565b60405180910390f35b610348600480360381019061034391906119f3565b6111aa565b60405161035591906117d5565b60405180910390f35b61036661129c565b6040516103739190611a3c565b60405180910390f35b610396600480360381019061039191906119f3565b61133a565b6040516103a39190611985565b60405180910390f35b6103b4611352565b6040516103c19190611b6c565b60405180910390f35b6103e460048036038101906103df9190611ae9565b611376565b005b6103ee611387565b6040516103fb9190611880565b60405180910390f35b61040c611415565b6040516104199190611985565b60405180910390f35b61043c60048036038101906104379190611936565b61141b565b60405161044991906117d5565b60405180910390f35b61045a61159a565b6040516104679190611985565b60405180910390f35b6104786115a0565b6040516104859190611985565b60405180910390f35b6104a860048036038101906104a391906119f3565b6115a6565b6040516104b591906117d5565b60405180910390f35b6104d860048036038101906104d39190611b87565b611662565b6040516104e59190611985565b60405180910390f35b610508600480360381019061050391906119f3565b611687565b60405161051591906117d5565b60405180910390f35b600063b61bc9417c010000000000000000000000000000000000000000000000000000000002827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916036105725760019050610763565b63449a52f87c010000000000000000000000000000000000000000000000000000000002827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916036105c45760019050610763565b6301ffc9a77c010000000000000000000000000000000000000000000000000000000002827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916036106165760019050610763565b639493f8b27c010000000000000000000000000000000000000000000000000000000002827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916036106685760019050610763565b63abe1f1f57c010000000000000000000000000000000000000000000000000000000002827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916036106ba5760019050610763565b63b1110c1b7c010000000000000000000000000000000000000000000000000000000002827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19160361070c5760019050610763565b63841a0e947c010000000000000000000000000000000000000000000000000000000002827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19160361075e5760019050610763565b600090505b919050565b6002805461077590611bf6565b80601f01602080910402602001604051908101604052809291908181526020018280546107a190611bf6565b80156107ee5780601f106107c3576101008083540402835291602001916107ee565b820191906000526020600020905b8154815290600101906020018083116107d157829003601f168201915b505050505081565b60008061080161129c565b60ff161461080e57600080fd5b60008211156108a1576000600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054146108a057600080fd5b5b81600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9258460405161097f9190611985565b60405180910390a36001905092915050565b60006008546007546109a39190611c56565b905090565b6000806109b361129c565b60ff16146109c057600080fd5b81600660008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610a4957600080fd5b81600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610a9557600080fd5b81600660008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610b1d9190611c56565b600660008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000208190555081600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206000828254610bec9190611c56565b9250508190555081600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206000828254610c429190611c8a565b925050819055503373ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff168573ffffffffffffffffffffffffffffffffffffffff167f5f7542858008eeb041631f30e6109ae94b83a58e9a58261dd2c42c508850f93985604051610cbd9190611985565b60405180910390a4600190509392505050565b6000600b60008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff1680610d75575060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff16145b9050919050565b600460009054906101000a900460ff1681565b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614610e20576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610e1790611d0a565b60405180910390fd5b81600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610ea2576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610e9990611d76565b60405180910390fd5b81600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206000828254610ef19190611c56565b925050819055508160086000828254610f0a9190611c8a565b925050819055507fb90306ad06b2a6ff86ddc9327db583062895ef6540e62dc50add009db5b356eb82604051610f409190611985565b60405180910390a160019050919050565b6000600b60003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff1680610ff6575060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16145b610fff57600080fd5b81600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600082825461104e9190611c8a565b9250508190555081600760008282546110679190611c8a565b925050819055508273ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fab8530f87dc9b59234c4623bf917212bb2536d647574c8e7e5da92c2ede0c9f8846040516110cb9190611985565b60405180910390a36001905092915050565b8373ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff161461114b576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161114290611de2565b60405180910390fd5b61115483610d8f565b5050505050565b60006111a5600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610d8f565b905090565b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16148061123257508173ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16145b61123b57600080fd5b6000600b60008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff02191690831515021790555060019050919050565b600080600954036112b05760009050611337565b600a60009054906101000a900460ff16156112ce5760019050611337565b6009544210611332576001600a60006101000a81548160ff0219169083151502179055507ff80dbaea4785589e52984ca36a31de106adc77759539a5c7d92883bf49692fe9426040516113219190611985565b60405180910390a160029050611337565b600090505b90565b60056020528060005260406000206000915090505481565b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b6113808484610f51565b5050505050565b6003805461139490611bf6565b80601f01602080910402602001604051908101604052809291908181526020018280546113c090611bf6565b801561140d5780601f106113e25761010080835404028352916020019161140d565b820191906000526020600020905b8154815290600101906020018083116113f057829003601f168201915b505050505081565b60075481565b60008061142661129c565b60ff161461143357600080fd5b81600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561147f57600080fd5b81600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008282546114ce9190611c56565b9250508190555081600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008282546115249190611c8a565b925050819055508273ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040516115889190611985565b60405180910390a36001905092915050565b60095481565b60085481565b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff161461160157600080fd5b6001600b60008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff02191690831515021790555060019050919050565b6006602052816000526040600020602052806000526040600020600091509150505481565b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16146116e257600080fd5b816000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555060019050919050565b600080fd5b600080fd5b60007fffffffff0000000000000000000000000000000000000000000000000000000082169050919050565b61176a81611735565b811461177557600080fd5b50565b60008135905061178781611761565b92915050565b6000602082840312156117a3576117a261172b565b5b60006117b184828501611778565b91505092915050565b60008115159050919050565b6117cf816117ba565b82525050565b60006020820190506117ea60008301846117c6565b92915050565b600081519050919050565b600082825260208201905092915050565b60005b8381101561182a57808201518184015260208101905061180f565b60008484015250505050565b6000601f19601f8301169050919050565b6000611852826117f0565b61185c81856117fb565b935061186c81856020860161180c565b61187581611836565b840191505092915050565b6000602082019050818103600083015261189a8184611847565b905092915050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60006118cd826118a2565b9050919050565b6118dd816118c2565b81146118e857600080fd5b50565b6000813590506118fa816118d4565b92915050565b6000819050919050565b61191381611900565b811461191e57600080fd5b50565b6000813590506119308161190a565b92915050565b6000806040838503121561194d5761194c61172b565b5b600061195b858286016118eb565b925050602061196c85828601611921565b9150509250929050565b61197f81611900565b82525050565b600060208201905061199a6000830184611976565b92915050565b6000806000606084860312156119b9576119b861172b565b5b60006119c7868287016118eb565b93505060206119d8868287016118eb565b92505060406119e986828701611921565b9150509250925092565b600060208284031215611a0957611a0861172b565b5b6000611a17848285016118eb565b91505092915050565b600060ff82169050919050565b611a3681611a20565b82525050565b6000602082019050611a516000830184611a2d565b92915050565b600060208284031215611a6d57611a6c61172b565b5b6000611a7b84828501611921565b91505092915050565b600080fd5b600080fd5b600080fd5b60008083601f840112611aa957611aa8611a84565b5b8235905067ffffffffffffffff811115611ac657611ac5611a89565b5b602083019150836001820283011115611ae257611ae1611a8e565b5b9250929050565b60008060008060608587031215611b0357611b0261172b565b5b6000611b11878288016118eb565b9450506020611b2287828801611921565b935050604085013567ffffffffffffffff811115611b4357611b42611730565b5b611b4f87828801611a93565b925092505092959194509250565b611b66816118c2565b82525050565b6000602082019050611b816000830184611b5d565b92915050565b60008060408385031215611b9e57611b9d61172b565b5b6000611bac858286016118eb565b9250506020611bbd858286016118eb565b9150509250929050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b60006002820490506001821680611c0e57607f821691505b602082108103611c2157611c20611bc7565b5b50919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b6000611c6182611900565b9150611c6c83611900565b9250828203905081811115611c8457611c83611c27565b5b92915050565b6000611c9582611900565b9150611ca083611900565b9250828201905080821115611cb857611cb7611c27565b5b92915050565b7f4552525f41434345535300000000000000000000000000000000000000000000600082015250565b6000611cf4600a836117fb565b9150611cff82611cbe565b602082019050919050565b60006020820190508181036000830152611d2381611ce7565b9050919050565b7f4552525f46554e44530000000000000000000000000000000000000000000000600082015250565b6000611d606009836117fb565b9150611d6b82611d2a565b602082019050919050565b60006020820190508181036000830152611d8f81611d53565b9050919050565b7f4552525f4e4f545f53454c460000000000000000000000000000000000000000600082015250565b6000611dcc600c836117fb565b9150611dd782611d96565b602082019050919050565b60006020820190508181036000830152611dfb81611dbf565b905091905056fea26469706673582212207c618c5e739ffaab5926ea597eb54f0122f3f64b626f5a26fb110c7779f25e7564736f6c63430008130033a26469706673582212206226f4f783ef26447e397977b5adbf34009a6806ad92e41af81961d09812b19664736f6c63430008130033 +\ No newline at end of file diff --git a/python/erc20_vend/data/Vend.json b/python/erc20_vend/data/Vend.json @@ -1 +1 @@ -[{"inputs":[{"internalType":"address","name":"_controlToken","type":"address"},{"internalType":"uint8","name":"_decimals","type":"uint8"},{"internalType":"bool","name":"_mint","type":"bool"}],"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"uint256","name":"_idx","type":"uint256"},{"indexed":true,"internalType":"uint256","name":"_supply","type":"uint256"},{"indexed":false,"internalType":"address","name":"_token","type":"address"}],"name":"TokenCreated","type":"event"},{"inputs":[{"internalType":"address","name":"_minter","type":"address"}],"name":"addWriter","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"string","name":"_name","type":"string"},{"internalType":"string","name":"_symbol","type":"string"}],"name":"create","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_minter","type":"address"}],"name":"deleteWriter","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_token","type":"address"}],"name":"getFor","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint256","name":"_idx","type":"uint256"}],"name":"getTokenByIndex","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_minter","type":"address"}],"name":"isWriter","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes4","name":"_sum","type":"bytes4"}],"name":"supportsInterface","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"pure","type":"function"},{"inputs":[{"internalType":"address","name":"_token","type":"address"}],"name":"withdrawFor","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"}] +[{"inputs":[{"internalType":"address","name":"_controlToken","type":"address"},{"internalType":"uint8","name":"_decimals","type":"uint8"},{"internalType":"bool","name":"_mint","type":"bool"}],"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"uint256","name":"_idx","type":"uint256"},{"indexed":true,"internalType":"uint256","name":"_supply","type":"uint256"},{"indexed":false,"internalType":"address","name":"_token","type":"address"}],"name":"TokenCreated","type":"event"},{"inputs":[{"internalType":"address","name":"_minter","type":"address"}],"name":"addWriter","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"string","name":"_name","type":"string"},{"internalType":"string","name":"_symbol","type":"string"}],"name":"create","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_minter","type":"address"}],"name":"deleteWriter","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_token","type":"address"}],"name":"deposit","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint256","name":"_idx","type":"uint256"}],"name":"getTokenByIndex","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_minter","type":"address"}],"name":"isWriter","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes4","name":"_sum","type":"bytes4"}],"name":"supportsInterface","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"pure","type":"function"},{"inputs":[{"internalType":"address","name":"_token","type":"address"}],"name":"withdraw","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"}] diff --git a/python/erc20_vend/data/Vend.metadata.json b/python/erc20_vend/data/Vend.metadata.json @@ -1 +1 @@ -{"compiler":{"version":"0.8.19+commit.7dd6d404"},"language":"Solidity","output":{"abi":[{"inputs":[{"internalType":"address","name":"_controlToken","type":"address"},{"internalType":"uint8","name":"_decimals","type":"uint8"},{"internalType":"bool","name":"_mint","type":"bool"}],"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"uint256","name":"_idx","type":"uint256"},{"indexed":true,"internalType":"uint256","name":"_supply","type":"uint256"},{"indexed":false,"internalType":"address","name":"_token","type":"address"}],"name":"TokenCreated","type":"event"},{"inputs":[{"internalType":"address","name":"_minter","type":"address"}],"name":"addWriter","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"string","name":"_name","type":"string"},{"internalType":"string","name":"_symbol","type":"string"}],"name":"create","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_minter","type":"address"}],"name":"deleteWriter","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_token","type":"address"}],"name":"getFor","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint256","name":"_idx","type":"uint256"}],"name":"getTokenByIndex","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_minter","type":"address"}],"name":"isWriter","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes4","name":"_sum","type":"bytes4"}],"name":"supportsInterface","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"pure","type":"function"},{"inputs":[{"internalType":"address","name":"_token","type":"address"}],"name":"withdrawFor","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"}],"devdoc":{"kind":"dev","methods":{},"version":1},"userdoc":{"kind":"user","methods":{},"version":1}},"settings":{"compilationTarget":{"Vend.sol":"ERC20Vend"},"evmVersion":"byzantium","libraries":{},"metadata":{"bytecodeHash":"ipfs"},"optimizer":{"enabled":false,"runs":200},"remappings":[]},"sources":{"GiftableToken.sol":{"keccak256":"0xaa3263856dd73d7bb1ec06b4ca38dd86ddd0771e8cb2ca47b7c1e3c69be9c14a","license":"AGPL-3.0-or-later","urls":["bzz-raw://ddeb57c7ea151da4b52a95c6c12a225b54b80713c323821ea52f8c8ca295479c","dweb:/ipfs/QmZKwsNxRQFdQRjPsHP7RepfLtXDXhDEb3Qy2koPJdFoWG"]},"Vend.sol":{"keccak256":"0x1ff484a2958b7caeaad6c454e4c5cafb564c365d0832e5c12dc93df3104d4989","license":"AGPL-3.0-or-later","urls":["bzz-raw://a24cb33e1a162b9a7f717692fe77dbe577880b525ac8ded08c274e2633caaabb","dweb:/ipfs/QmdpVhfrpmSbfa1ccPSAV1FrfrPwMyGAjX7js9yz9jkNRe"]}},"version":1} +{"compiler":{"version":"0.8.19+commit.7dd6d404"},"language":"Solidity","output":{"abi":[{"inputs":[{"internalType":"address","name":"_controlToken","type":"address"},{"internalType":"uint8","name":"_decimals","type":"uint8"},{"internalType":"bool","name":"_mint","type":"bool"}],"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"uint256","name":"_idx","type":"uint256"},{"indexed":true,"internalType":"uint256","name":"_supply","type":"uint256"},{"indexed":false,"internalType":"address","name":"_token","type":"address"}],"name":"TokenCreated","type":"event"},{"inputs":[{"internalType":"address","name":"_minter","type":"address"}],"name":"addWriter","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"string","name":"_name","type":"string"},{"internalType":"string","name":"_symbol","type":"string"}],"name":"create","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_minter","type":"address"}],"name":"deleteWriter","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_token","type":"address"}],"name":"deposit","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint256","name":"_idx","type":"uint256"}],"name":"getTokenByIndex","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_minter","type":"address"}],"name":"isWriter","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes4","name":"_sum","type":"bytes4"}],"name":"supportsInterface","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"pure","type":"function"},{"inputs":[{"internalType":"address","name":"_token","type":"address"}],"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":{"Vend.sol":"ERC20Vend"},"evmVersion":"byzantium","libraries":{},"metadata":{"bytecodeHash":"ipfs"},"optimizer":{"enabled":false,"runs":200},"remappings":[]},"sources":{"GiftableToken.sol":{"keccak256":"0xaa3263856dd73d7bb1ec06b4ca38dd86ddd0771e8cb2ca47b7c1e3c69be9c14a","license":"AGPL-3.0-or-later","urls":["bzz-raw://ddeb57c7ea151da4b52a95c6c12a225b54b80713c323821ea52f8c8ca295479c","dweb:/ipfs/QmZKwsNxRQFdQRjPsHP7RepfLtXDXhDEb3Qy2koPJdFoWG"]},"Vend.sol":{"keccak256":"0xbba9760f80ab12fe9a26dad15c309fc46ad47195307edd1c0dd218e756188d6d","license":"AGPL-3.0-or-later","urls":["bzz-raw://81c740e10df40203f96d85c0d3d734cb5f7edea4de4c7d4a3183d4e7ab977fe3","dweb:/ipfs/QmdcDTF5FcUhqtvr2MaXEQfqHJTPFBBwz5Jik9u1tZkkLw"]}},"version":1} diff --git a/python/erc20_vend/vend.py b/python/erc20_vend/vend.py @@ -95,9 +95,10 @@ class Vend(TxFactory): return tx - def get_for(self, contract_address, sender_address, token_address, tx_format=TxFormat.JSONRPC, id_generator=None): + #def get_for(self, contract_address, sender_address, token_address, tx_format=TxFormat.JSONRPC, id_generator=None): + def deposit(self, contract_address, sender_address, token_address, tx_format=TxFormat.JSONRPC, id_generator=None): enc = ABIContractEncoder() - enc.method('getFor') + enc.method('deposit') enc.typ(ABIContractType.ADDRESS) enc.address(token_address) data = add_0x(enc.get()) @@ -107,9 +108,11 @@ class Vend(TxFactory): return tx - def withdraw_for(self, contract_address, sender_address, token_address, tx_format=TxFormat.JSONRPC, id_generator=None): + #def withdraw_for(self, contract_address, sender_address, token_address, tx_format=TxFormat.JSONRPC, id_generator=None): + def withdraw(self, contract_address, sender_address, token_address, tx_format=TxFormat.JSONRPC, id_generator=None): enc = ABIContractEncoder() - enc.method('withdrawFor') + #enc.method('withdrawFor') + enc.method('withdraw') enc.typ(ABIContractType.ADDRESS) enc.address(token_address) data = add_0x(enc.get()) diff --git a/python/test_requirements.txt b/python/test_requirements.txt @@ -1,4 +1,4 @@ eth_tester==0.5.0b3 py-evm==0.3.0a20 eth-interface==0.1.1 -eth-writer==0.0.1 +eth-writer==0.0.2 diff --git a/python/tests/test_base.py b/python/tests/test_base.py @@ -63,7 +63,7 @@ class TestVendBase(TestVend): nonce_oracle = RPCNonceOracle(self.alice, conn=self.conn) c = Vend(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle) - (tx_hash, o) = c.get_for(self.vend_address, self.alice, vended_token_address) + (tx_hash, o) = c.deposit(self.vend_address, self.alice, vended_token_address) self.rpc.do(o) o = receipt(tx_hash) r = self.rpc.do(o) @@ -77,7 +77,7 @@ class TestVendBase(TestVend): self.assertEqual(r['status'], 1) c = Vend(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle) - (tx_hash, o) = c.get_for(self.vend_address, self.alice, vended_token_address) + (tx_hash, o) = c.deposit(self.vend_address, self.alice, vended_token_address) self.rpc.do(o) o = receipt(tx_hash) r = self.rpc.do(o) @@ -95,7 +95,7 @@ class TestVendBase(TestVend): self.assertEqual(balance, 0) c = Vend(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle) - (tx_hash, o) = c.withdraw_for(self.vend_address, self.alice, vended_token_address) + (tx_hash, o) = c.withdraw(self.vend_address, self.alice, vended_token_address) self.rpc.do(o) o = receipt(tx_hash) r = self.rpc.do(o) @@ -106,7 +106,7 @@ class TestVendBase(TestVend): self.rpc.do(o) c = Vend(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle) - (tx_hash, o) = c.withdraw_for(self.vend_address, self.alice, vended_token_address) + (tx_hash, o) = c.withdraw(self.vend_address, self.alice, vended_token_address) self.rpc.do(o) o = receipt(tx_hash) r = self.rpc.do(o) diff --git a/python/tests/test_events.py b/python/tests/test_events.py @@ -65,7 +65,7 @@ class TestVendBase(TestVendCore): nonce_oracle = RPCNonceOracle(self.alice, conn=self.conn) c = Vend(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle) - (tx_hash, o) = c.get_for(self.vend_address, self.alice, vended_token_address) + (tx_hash, o) = c.deposit(self.vend_address, self.alice, vended_token_address) self.rpc.do(o) o = receipt(tx_hash) r = self.rpc.do(o) @@ -132,7 +132,7 @@ class TestVendBase(TestVendCore): self.rpc.do(o) c = Vend(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle) - (tx_hash, o) = c.get_for(self.vend_address, self.alice, vended_token_address) + (tx_hash, o) = c.deposit(self.vend_address, self.alice, vended_token_address) self.rpc.do(o) o = receipt(tx_hash) r = self.rpc.do(o) diff --git a/python/tests/test_supply.py b/python/tests/test_supply.py @@ -68,7 +68,7 @@ class TestVendBase(TestVendCore): self.rpc.do(o) c = Vend(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle) - (tx_hash, o) = c.get_for(self.vend_address, self.alice, vended_token_address) + (tx_hash, o) = c.deposit(self.vend_address, self.alice, vended_token_address) self.rpc.do(o) c = ERC20(self.chain_spec) diff --git a/solidity/Vend.sol b/solidity/Vend.sol @@ -91,7 +91,8 @@ contract ERC20Vend { } // Receive the vended token for the currently held balance. - function getFor(address _token) public returns (uint256) { + //function getFor(address _token) public returns (uint256) { + function deposit(address _token) public returns (uint256) { GiftableToken l_token; bool r; bytes memory v; @@ -139,7 +140,8 @@ contract ERC20Vend { // If contract locks exchanged tokens, this can be called to retrieve the locked tokens. // The vended token balance MUST match the original balance emitted on the exchange. // The caller must have given allowance for the full amount. - function withdrawFor(address _token) public returns (uint256) { + //function withdrawFor(address _token) public returns (uint256) { + function withdraw(address _token) public returns (uint256) { bool r; bytes memory v; uint256 l_balance;