commit f785925eb5950076da2fd4821d1d1c1b96cfc156
parent ae2c1b41240487ed47674a32276240451c9c31fa
Author: lash <dev@holbrook.no>
Date: Thu, 9 Feb 2023 11:44:20 +0000
WIP rehabilitating test basic
Diffstat:
6 files changed, 82 insertions(+), 78 deletions(-)
diff --git a/python/erc20_demurrage_token/data/DemurrageTokenSingleNocap.bin b/python/erc20_demurrage_token/data/DemurrageTokenSingleNocap.bin
@@ -1 +1 @@
-60c06040523480156200001157600080fd5b5060405162004360380380620043608339818101604052810190620000379190620008f7565b6801000000000000000083600f0b126200005057600080fd5b6200005a6200060f565b33600460006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506001600e6000600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff021916908315150217905550866006908162000126919062000c18565b50856007908162000138919062000c18565b508460ff166008819055504260038190555060035460808181525050603c8362000163919062000d2e565b60a081815250506200018a60016200035064010000000002620016b0176401000000009004565b600260006101000a8154816fffffffffffffffffffffffffffffffff0219169083600f0b6fffffffffffffffffffffffffffffffff160217905550620001e4846200037764010000000002620016d6176401000000009004565b600d60006101000a8154816fffffffffffffffffffffffffffffffff0219169083600f0b6fffffffffffffffffffffffffffffffff160217905550620002556000600260009054906101000a9004600f0b64ffffffffff1660006001620003cb640100000000026401000000009004565b90506000819080600181540180825580915050600190039060005260206000200160009091909190915060008201518160000160006101000a81548163ffffffff021916908363ffffffff16021790555060208201518160000160046101000a81548168ffffffffffffffffff021916908368ffffffffffffffffff160217905550604082015181600001600d6101000a81548164ffffffffff021916908364ffffffffff160217905550505081601060006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505050505050505062000d79565b6000677fffffffffffffff8211156200036857600080fd5b6040829060020a029050919050565b60008082600f0b136200038957600080fd5b60806fb17217f7d1cf79abc9e3b39803f2f6af620003b6846200043f640100000000026401000000009004565b600f0b02908060020a82049150509050919050565b620003d56200060f565b620003df6200060f565b82816000019063ffffffff16908163ffffffff168152505083816020019068ffffffffffffffffff16908168ffffffffffffffffff168152505084816040019064ffffffffff16908164ffffffffff168152505080915050949350505050565b60008082600f0b136200045157600080fd5b60008083600f0b90506801000000000000000081126200048d576040819060008212600003808260020a82851804189250505090506040820191505b6401000000008112620004bc576020819060008212600003808260020a82851804189250505090506020820191505b620100008112620004e9576010819060008212600003808260020a82851804189250505090506010820191505b610100811262000515576008819060008212600003808260020a82851804189250505090506008820191505b6010811262000540576004819060008212600003808260020a82851804189250505090506004820191505b600481126200056b576002819060008212600003808260020a82851804189250505090506002820191505b600281126200057b576001820191505b600060408084039060020a029050600083607f0386600f0b9060020a029050600067800000000000000090505b600081131562000602578182029150600060ff83908060020a8204915050905080607f0183908060020a8204915050925080820284019350506001819060008212600003808260020a8285180418925050509050620005a8565b5081945050505050919050565b6040518060600160405280600063ffffffff168152602001600068ffffffffffffffffff168152602001600064ffffffffff1681525090565b6000604051905090565b600080fd5b600080fd5b600080fd5b600080fd5b6000601f19601f8301169050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b620006b18262000666565b810181811067ffffffffffffffff82111715620006d357620006d262000677565b5b80604052505050565b6000620006e862000648565b9050620006f68282620006a6565b919050565b600067ffffffffffffffff82111562000719576200071862000677565b5b620007248262000666565b9050602081019050919050565b60005b838110156200075157808201518184015260208101905062000734565b60008484015250505050565b6000620007746200076e84620006fb565b620006dc565b90508281526020810184848401111562000793576200079262000661565b5b620007a084828562000731565b509392505050565b600082601f830112620007c057620007bf6200065c565b5b8151620007d28482602086016200075d565b91505092915050565b600060ff82169050919050565b620007f381620007db565b8114620007ff57600080fd5b50565b6000815190506200081381620007e8565b92915050565b600081600f0b9050919050565b620008318162000819565b81146200083d57600080fd5b50565b600081519050620008518162000826565b92915050565b6000819050919050565b6200086c8162000857565b81146200087857600080fd5b50565b6000815190506200088c8162000861565b92915050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000620008bf8262000892565b9050919050565b620008d181620008b2565b8114620008dd57600080fd5b50565b600081519050620008f181620008c6565b92915050565b60008060008060008060c0878903121562000917576200091662000652565b5b600087015167ffffffffffffffff81111562000938576200093762000657565b5b6200094689828a01620007a8565b965050602087015167ffffffffffffffff8111156200096a576200096962000657565b5b6200097889828a01620007a8565b95505060406200098b89828a0162000802565b94505060606200099e89828a0162000840565b9350506080620009b189828a016200087b565b92505060a0620009c489828a01620008e0565b9150509295509295509295565b600081519050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b6000600282049050600182168062000a2457607f821691505b60208210810362000a3a5762000a39620009dc565b5b50919050565b60008190508160005260206000209050919050565b60006020601f8301049050919050565b60008160020a8302905092915050565b60006008830262000aa77fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8262000a65565b62000ab3868362000a65565b95508019841693508086168417925050509392505050565b6000819050919050565b600062000af662000af062000aea8462000857565b62000acb565b62000857565b9050919050565b6000819050919050565b62000b128362000ad5565b62000b2a62000b218262000afd565b84845462000a75565b825550505050565b600090565b62000b4162000b32565b62000b4e81848462000b07565b505050565b5b8181101562000b765762000b6a60008262000b37565b60018101905062000b54565b5050565b601f82111562000bc55762000b8f8162000a40565b62000b9a8462000a55565b8101602085101562000baa578190505b62000bc262000bb98562000a55565b83018262000b53565b50505b505050565b60008160020a8304905092915050565b600062000bed6000198460080262000bca565b1980831691505092915050565b600062000c08838362000bda565b9150826002028217905092915050565b62000c2382620009d1565b67ffffffffffffffff81111562000c3f5762000c3e62000677565b5b62000c4b825462000a0b565b62000c5882828562000b7a565b600060209050601f83116001811462000c90576000841562000c7b578287015190505b62000c87858262000bfa565b86555062000cf7565b601f19841662000ca08662000a40565b60005b8281101562000cca5784890151825560018201915060208501945060208101905062000ca3565b8683101562000cea578489015162000ce6601f89168262000bda565b8355505b6001600288020188555050505b505050505050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b600062000d3b8262000857565b915062000d488362000857565b925082820262000d588162000857565b9150828204841483151762000d725762000d7162000cff565b5b5092915050565b60805160a0516135a562000dbb60003960008181610f15015281816114c50152611516015260008181610f4101528181611537015261157c01526135a56000f3fe608060405234801561001057600080fd5b506004361061024f576000357c01000000000000000000000000000000000000000000000000000000009004806370a082311161014d57806395d89b41116100d5578063d89135cd11610099578063d89135cd14610750578063e80952951461076e578063eda4e6d61461078c578063f2fde38b146107aa578063f83da35d146107da5761024f565b806395d89b4114610696578063983b2d56146106b4578063b470aade146106e4578063d340ef8a14610702578063d4792037146107205761024f565b806384dde4af1161011c57806384dde4af146105de5780638b8ff2d6146105fc5780638da5cb5b1461062c5780638f0b2d5d1461064a57806394c8a69a146106665761024f565b806370a082311461055457806373f425611461058457806374bedb95146105a257806379ba5097146105c05761024f565b8063313ce567116101db5780634abfbba21161019f5780634abfbba21461047657806351b4541c146104a657806358b2833b146104d65780636787a9be146104f45780636a2d094e146105245761024f565b8063313ce567146103aa57806340452d91146103c857806342966c68146103fa578063449a52f81461041657806347a50517146104465761024f565b806318160ddd1161022257806318160ddd146102f05780631989c6a81461030e578063229ba1971461032c5780633092afd51461034a578063313334871461037a5761024f565b806301ffc9a71461025457806306fdde031461028457806309f28f3c146102a257806310a10f37146102c0575b600080fd5b61026e60048036038101906102699190612c5b565b61080a565b60405161027b9190612ca3565b60405180910390f35b61028c6109b0565b6040516102999190612d4e565b60405180910390f35b6102aa610a3e565b6040516102b79190612d8c565b60405180910390f35b6102da60048036038101906102d59190612f45565b610a51565b6040516102e79190612f8b565b60405180910390f35b6102f8610a65565b6040516103059190612f8b565b60405180910390f35b610316610a7c565b6040516103239190612f8b565b60405180910390f35b610334610a88565b6040516103419190612d8c565b60405180910390f35b610364600480360381019061035f9190613004565b610a9b565b6040516103719190612ca3565b60405180910390f35b610394600480360381019061038f919061305d565b610b8e565b6040516103a19190612f8b565b60405180910390f35b6103b2610bfa565b6040516103bf9190612f8b565b60405180910390f35b6103e260048036038101906103dd919061309d565b610c00565b6040516103f1939291906130f7565b60405180910390f35b610414600480360381019061040f919061309d565b610c6c565b005b610430600480360381019061042b919061312e565b610d91565b60405161043d9190612ca3565b60405180910390f35b610460600480360381019061045b9190613004565b610ec8565b60405161046d9190612f8b565b60405180910390f35b610490600480360381019061048b919061309d565b610f11565b60405161049d9190612f8b565b60405180910390f35b6104c060048036038101906104bb919061309d565b610f71565b6040516104cd9190612f8b565b60405180910390f35b6104de610f92565b6040516104eb9190612f8b565b60405180910390f35b61050e6004803603810190610509919061309d565b610f98565b60405161051b9190612f8b565b60405180910390f35b61053e6004803603810190610539919061309d565b610fd9565b60405161054b9190612f8b565b60405180910390f35b61056e60048036038101906105699190613004565b610ffa565b60405161057b9190612f8b565b60405180910390f35b61058c611061565b6040516105999190612f8b565b60405180910390f35b6105aa611067565b6040516105b79190612f8b565b60405180910390f35b6105c861106d565b6040516105d59190612ca3565b60405180910390f35b6105e6611214565b6040516105f3919061317d565b60405180910390f35b61061660048036038101906106119190612f45565b61123a565b6040516106239190612f8b565b60405180910390f35b61063461124f565b604051610641919061317d565b60405180910390f35b610664600480360381019061065f9190613004565b611275565b005b610680600480360381019061067b9190612f45565b611313565b60405161068d9190612ca3565b60405180910390f35b61069e611378565b6040516106ab9190612d4e565b60405180910390f35b6106ce60048036038101906106c99190613004565b611406565b6040516106db9190612ca3565b60405180910390f35b6106ec6114c3565b6040516106f99190612f8b565b60405180910390f35b61070a6114e7565b6040516107179190612f8b565b60405180910390f35b61073a60048036038101906107359190612f45565b6114ed565b6040516107479190612f8b565b60405180910390f35b610758611506565b6040516107659190612f8b565b60405180910390f35b610776611510565b60405161078391906131c3565b60405180910390f35b61079461157a565b6040516107a19190612f8b565b60405180910390f35b6107c460048036038101906107bf9190613004565b61159e565b6040516107d19190612ca3565b60405180910390f35b6107f460048036038101906107ef91906131de565b611640565b60405161080191906132b4565b60405180910390f35b600063c6bb4b707c010000000000000000000000000000000000000000000000000000000002827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19160361085e57600190506109ab565b63449a52f87c010000000000000000000000000000000000000000000000000000000002827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916036108b057600190506109ab565b6301ffc9a77c010000000000000000000000000000000000000000000000000000000002827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19160361090257600190506109ab565b639493f8b27c010000000000000000000000000000000000000000000000000000000002827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19160361095457600190506109ab565b6337a47be47c010000000000000000000000000000000000000000000000000000000002827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916036109a657600190506109ab565b600090505b919050565b600680546109bd906132fe565b80601f01602080910402602001604051908101604052809291908181526020018280546109e9906132fe565b8015610a365780601f10610a0b57610100808354040283529160200191610a36565b820191906000526020600020905b815481529060010190602001808311610a1957829003601f168201915b505050505081565b600260009054906101000a9004600f0b81565b6000816000015163ffffffff169050919050565b6000600c54600954610a77919061335e565b905090565b60008080549050905090565b600d60009054906101000a9004600f0b81565b6000600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff161480610b2457503373ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff16145b610b2d57600080fd5b6000600e60008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff02191690831515021790555060019050919050565b600080600080610b9d866116b0565b9250610ba8856116b0565b9150610bc3600d60009054906101000a9004600f0b83611718565b9050610bce81611797565b9050610bda8382611718565b9050610be581611824565b67ffffffffffffffff16935050505092915050565b60085481565b60008181548110610c1057600080fd5b906000526020600020016000915090508060000160009054906101000a900463ffffffff16908060000160049054906101000a900468ffffffffffffffffff169080600001600d9054906101000a900464ffffffffff16905083565b600e60003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff16610cc257600080fd5b600160003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054811115610d0e57600080fd5b6000610d1982610f98565b9050610d253382611859565b5081600c6000828254610d389190613392565b925050819055503373ffffffffffffffffffffffffffffffffffffffff167fcc16f5dbb4873280815c1ee09dbd06736cffcc184412cf7a71a0fdb75d397ca583604051610d859190612f8b565b60405180910390a25050565b600080600e60003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff16610e20576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610e1790613412565b60405180910390fd5b610e2983610f98565b90508260096000828254610e3d9190613392565b92505081905550610e4e8482611960565b508373ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fab8530f87dc9b59234c4623bf917212bb2536d647574c8e7e5da92c2ede0c9f885604051610eac9190612f8b565b60405180910390a3610ebc611a24565b50600191505092915050565b6000600160008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020549050919050565b60007f000000000000000000000000000000000000000000000000000000000000000082610f3f9190613432565b7f0000000000000000000000000000000000000000000000000000000000000000610f6a9190613392565b9050919050565b6000603c8242610f81919061335e565b610f8b91906134a3565b9050919050565b60035481565b600080610fbc600260009054906101000a9004600f0b610fb7856116b0565b611718565b9050610fc781611824565b67ffffffffffffffff16915050919050565b6000603c8242610fe9919061335e565b610ff391906134a3565b9050919050565b60008060008061101161100c86610ec8565b6116b0565b925061101e600354610f71565b905061103983600260009054906101000a9004600f0b611718565b915061105761104783611824565b67ffffffffffffffff1682610b8e565b9350505050919050565b600c5481565b600b5481565b600080600560009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16146110ca57600080fd5b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff169050600560009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16600460006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506000600560006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e060405160405180910390a35090565b601060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b6000816040015164ffffffffff169050919050565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16146112cf57600080fd5b80601060006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050565b600080826000015163ffffffff1611156113305760009050611373565b6000826020015168ffffffffffffffffff1611156113515760009050611373565b6000826040015164ffffffffff16111561136e5760009050611373565b600190505b919050565b60078054611385906132fe565b80601f01602080910402602001604051908101604052809291908181526020018280546113b1906132fe565b80156113fe5780601f106113d3576101008083540402835291602001916113fe565b820191906000526020600020905b8154815290600101906020018083116113e157829003601f168201915b505050505081565b6000600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff161461146257600080fd5b6001600e60008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff02191690831515021790555060019050919050565b7f000000000000000000000000000000000000000000000000000000000000000081565b600a5481565b6000816020015168ffffffffffffffffff169050919050565b6000600c54905090565b600060017f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000042611561919061335e565b61156b91906134a3565b6115759190613392565b905090565b7f000000000000000000000000000000000000000000000000000000000000000081565b6000600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16146115fa57600080fd5b81600560006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550919050565b611648612bbb565b611650612bbb565b82816000019063ffffffff16908163ffffffff168152505083816020019068ffffffffffffffffff16908168ffffffffffffffffff168152505084816040019064ffffffffff16908164ffffffffff168152505080915050949350505050565b6000677fffffffffffffff8211156116c757600080fd5b6040829060020a029050919050565b60008082600f0b136116e757600080fd5b60806fb17217f7d1cf79abc9e3b39803f2f6af61170384611bd9565b600f0b02908060020a82049150509050919050565b600080604083600f0b85600f0b029060008212600003808260020a82851804189250505090507fffffffffffffffffffffffffffffffff80000000000000000000000000000000600f0b811215801561178457506f7fffffffffffffffffffffffffffffff600f0b8113155b61178d57600080fd5b8091505092915050565b60006840000000000000000082600f0b126117b157600080fd5b7fffffffffffffffffffffffffffffffffffffffffffffffc0000000000000000082600f0b12156117e5576000905061181f565b61181c6080700171547652b82fe1777d0ffda0d23a7d1284600f0b029060008212600003808260020a828518041892505050611d9f565b90505b919050565b60008082600f0b121561183657600080fd5b604082600f0b9060008212600003808260020a8285180418925050509050919050565b600080600080600160008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020549050600085036118b5576000935050505061195a565b6118be86610ec8565b925084831015611903576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016118fa90613520565b60405180910390fd5b848361190f919061335e565b600160008873ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550600193505050505b92915050565b600080600080600160008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020549050600085036119bc5760009350505050611a1e565b6119c586610ec8565b925084836119d39190613392565b600160008873ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550600193505050505b92915050565b6000611a2e612bbb565b6000611a38610a65565b905060006001600080549050611a4e919061335e565b81548110611a5f57611a5e613540565b5b906000526020600020016040518060600160405290816000820160009054906101000a900463ffffffff1663ffffffff1663ffffffff1681526020016000820160049054906101000a900468ffffffffffffffffff1668ffffffffffffffffff1668ffffffffffffffffff16815260200160008201600d9054906101000a900464ffffffffff1664ffffffffff1664ffffffffff1681525050915080826020019068ffffffffffffffffff16908168ffffffffffffffffff16815250508160006001600080549050611b31919061335e565b81548110611b4257611b41613540565b5b9060005260206000200160008201518160000160006101000a81548163ffffffff021916908363ffffffff16021790555060208201518160000160046101000a81548168ffffffffffffffffff021916908368ffffffffffffffffff160217905550604082015181600001600d6101000a81548164ffffffffff021916908364ffffffffff16021790555090505060019250505090565b60008082600f0b13611bea57600080fd5b60008083600f0b9050680100000000000000008112611c25576040819060008212600003808260020a82851804189250505090506040820191505b6401000000008112611c53576020819060008212600003808260020a82851804189250505090506020820191505b620100008112611c7f576010819060008212600003808260020a82851804189250505090506010820191505b6101008112611caa576008819060008212600003808260020a82851804189250505090506008820191505b60108112611cd4576004819060008212600003808260020a82851804189250505090506004820191505b60048112611cfe576002819060008212600003808260020a82851804189250505090506002820191505b60028112611d0d576001820191505b600060408084039060020a029050600083607f0386600f0b9060020a029050600067800000000000000090505b6000811315611d92578182029150600060ff83908060020a8204915050905080607f0183908060020a8204915050925080820284019350506001819060008212600003808260020a8285180418925050509050611d3a565b5081945050505050919050565b60006840000000000000000082600f0b12611db957600080fd5b7fffffffffffffffffffffffffffffffffffffffffffffffc0000000000000000082600f0b1215611ded5760009050612bb6565b60006f80000000000000000000000000000000905060006780000000000000008416600f0b1315611e3b57608070016a09e667f3bcc908b2fb1366ea957d3e8202908060020a820491505090505b60006740000000000000008416600f0b1315611e745760807001306fe0a31b7152de8d5a46305c85edec8202908060020a820491505090505b60006720000000000000008416600f0b1315611ead5760807001172b83c7d517adcdf7c8c50eb14a791f8202908060020a820491505090505b60006710000000000000008416600f0b1315611ee657608070010b5586cf9890f6298b92b71842a983638202908060020a820491505090505b60006708000000000000008416600f0b1315611f1f5760807001059b0d31585743ae7c548eb68ca417fd8202908060020a820491505090505b60006704000000000000008416600f0b1315611f58576080700102c9a3e778060ee6f7caca4f7a29bde88202908060020a820491505090505b60006702000000000000008416600f0b1315611f9157608070010163da9fb33356d84a66ae336dcdfa3f8202908060020a820491505090505b60006701000000000000008416600f0b1315611fca576080700100b1afa5abcbed6129ab13ec11dc95438202908060020a820491505090505b600066800000000000008416600f0b131561200257608070010058c86da1c09ea1ff19d294cf2f679b8202908060020a820491505090505b600066400000000000008416600f0b131561203a5760807001002c605e2e8cec506d21bfc89a23a00f8202908060020a820491505090505b600066200000000000008416600f0b1315612072576080700100162f3904051fa128bca9c55c31e5df8202908060020a820491505090505b600066100000000000008416600f0b13156120aa5760807001000b175effdc76ba38e31671ca9397258202908060020a820491505090505b600066080000000000008416600f0b13156120e2576080700100058ba01fb9f96d6cacd4b180917c3d8202908060020a820491505090505b600066040000000000008416600f0b131561211a57608070010002c5cc37da9491d0985c348c68e7b38202908060020a820491505090505b600066020000000000008416600f0b13156121525760807001000162e525ee054754457d59952920268202908060020a820491505090505b600066010000000000008416600f0b131561218a57608070010000b17255775c040618bf4a4ade83fc8202908060020a820491505090505b6000658000000000008416600f0b13156121c15760807001000058b91b5bc9ae2eed81e9b7d4cfab8202908060020a820491505090505b6000654000000000008416600f0b13156121f8576080700100002c5c89d5ec6ca4d7c8acc017b7c98202908060020a820491505090505b6000652000000000008416600f0b131561222f57608070010000162e43f4f831060e02d839a9d16d8202908060020a820491505090505b6000651000000000008416600f0b1315612266576080700100000b1721bcfc99d9f890ea069117638202908060020a820491505090505b6000650800000000008416600f0b131561229d57608070010000058b90cf1e6d97f9ca14dbcc16288202908060020a820491505090505b6000650400000000008416600f0b13156122d45760807001000002c5c863b73f016468f6bac5ca2b8202908060020a820491505090505b6000650200000000008416600f0b131561230b576080700100000162e430e5a18f6119e3c02282a58202908060020a820491505090505b6000650100000000008416600f0b13156123425760807001000000b1721835514b86e6d96efd1bfe8202908060020a820491505090505b60006480000000008416600f0b1315612378576080700100000058b90c0b48c6be5df846c5b2ef8202908060020a820491505090505b60006440000000008416600f0b13156123ae57608070010000002c5c8601cc6b9e94213c72737a8202908060020a820491505090505b60006420000000008416600f0b13156123e45760807001000000162e42fff037df38aa2b219f068202908060020a820491505090505b60006410000000008416600f0b131561241a57608070010000000b17217fba9c739aa5819f44f98202908060020a820491505090505b60006408000000008416600f0b13156124505760807001000000058b90bfcdee5acd3c1cedc8238202908060020a820491505090505b60006404000000008416600f0b1315612486576080700100000002c5c85fe31f35a6a30da1be508202908060020a820491505090505b60006402000000008416600f0b13156124bc57608070010000000162e42ff0999ce3541b9fffcf8202908060020a820491505090505b60006401000000008416600f0b13156124f2576080700100000000b17217f80f4ef5aadda455548202908060020a820491505090505b600063800000008416600f0b131561252757608070010000000058b90bfbf8479bd5a81b51ad8202908060020a820491505090505b600063400000008416600f0b131561255c5760807001000000002c5c85fdf84bd62ae30a74cc8202908060020a820491505090505b600063200000008416600f0b1315612591576080700100000000162e42fefb2fed257559bdaa8202908060020a820491505090505b600063100000008416600f0b13156125c65760807001000000000b17217f7d5a7716bba4a9ae8202908060020a820491505090505b600063080000008416600f0b13156125fb576080700100000000058b90bfbe9ddbac5e109cce8202908060020a820491505090505b600063040000008416600f0b131561263057608070010000000002c5c85fdf4b15de6f17eb0d8202908060020a820491505090505b600063020000008416600f0b13156126655760807001000000000162e42fefa494f1478fde058202908060020a820491505090505b600063010000008416600f0b131561269a57608070010000000000b17217f7d20cf927c8e94c8202908060020a820491505090505b6000628000008416600f0b13156126ce5760807001000000000058b90bfbe8f71cb4e4b33d8202908060020a820491505090505b6000624000008416600f0b1315612702576080700100000000002c5c85fdf477b662b269458202908060020a820491505090505b6000622000008416600f0b131561273657608070010000000000162e42fefa3ae53369388c8202908060020a820491505090505b6000621000008416600f0b131561276a576080700100000000000b17217f7d1d351a389d408202908060020a820491505090505b6000620800008416600f0b131561279e57608070010000000000058b90bfbe8e8b2d3d4ede8202908060020a820491505090505b6000620400008416600f0b13156127d25760807001000000000002c5c85fdf4741bea6e77e8202908060020a820491505090505b6000620200008416600f0b1315612806576080700100000000000162e42fefa39fe95583c28202908060020a820491505090505b6000620100008416600f0b131561283a5760807001000000000000b17217f7d1cfb72b45e18202908060020a820491505090505b60006180008416600f0b131561286d576080700100000000000058b90bfbe8e7cc35c3f08202908060020a820491505090505b60006140008416600f0b13156128a057608070010000000000002c5c85fdf473e242ea388202908060020a820491505090505b60006120008416600f0b13156128d35760807001000000000000162e42fefa39f02b772c8202908060020a820491505090505b60006110008416600f0b131561290657608070010000000000000b17217f7d1cf7d83c1a8202908060020a820491505090505b60006108008416600f0b13156129395760807001000000000000058b90bfbe8e7bdcbe2e8202908060020a820491505090505b60006104008416600f0b131561296c576080700100000000000002c5c85fdf473dea871f8202908060020a820491505090505b60006102008416600f0b131561299f57608070010000000000000162e42fefa39ef44d918202908060020a820491505090505b60006101008416600f0b13156129d2576080700100000000000000b17217f7d1cf79e9498202908060020a820491505090505b600060808416600f0b1315612a0457608070010000000000000058b90bfbe8e7bce5448202908060020a820491505090505b600060408416600f0b1315612a365760807001000000000000002c5c85fdf473de6eca8202908060020a820491505090505b600060208416600f0b1315612a68576080700100000000000000162e42fefa39ef366f8202908060020a820491505090505b600060108416600f0b1315612a9a5760807001000000000000000b17217f7d1cf79afa8202908060020a820491505090505b600060088416600f0b1315612acc576080700100000000000000058b90bfbe8e7bcd6d8202908060020a820491505090505b600060048416600f0b1315612afe57608070010000000000000002c5c85fdf473de6b28202908060020a820491505090505b600060028416600f0b1315612b305760807001000000000000000162e42fefa39ef3588202908060020a820491505090505b600060018416600f0b1315612b6257608070010000000000000000b17217f7d1cf79ab8202908060020a820491505090505b604083600f0b9060008212600003808260020a828518041892505050603f03600f0b81908060020a820491505090506f7fffffffffffffffffffffffffffffff600f0b811115612bb157600080fd5b809150505b919050565b6040518060600160405280600063ffffffff168152602001600068ffffffffffffffffff168152602001600064ffffffffff1681525090565b6000604051905090565b600080fd5b60007fffffffff0000000000000000000000000000000000000000000000000000000082169050919050565b612c3881612c03565b8114612c4357600080fd5b50565b600081359050612c5581612c2f565b92915050565b600060208284031215612c7157612c70612bfe565b5b6000612c7f84828501612c46565b91505092915050565b60008115159050919050565b612c9d81612c88565b82525050565b6000602082019050612cb86000830184612c94565b92915050565b600081519050919050565b600082825260208201905092915050565b60005b83811015612cf8578082015181840152602081019050612cdd565b60008484015250505050565b6000601f19601f8301169050919050565b6000612d2082612cbe565b612d2a8185612cc9565b9350612d3a818560208601612cda565b612d4381612d04565b840191505092915050565b60006020820190508181036000830152612d688184612d15565b905092915050565b600081600f0b9050919050565b612d8681612d70565b82525050565b6000602082019050612da16000830184612d7d565b92915050565b600080fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b612de482612d04565b810181811067ffffffffffffffff82111715612e0357612e02612dac565b5b80604052505050565b6000612e16612bf4565b9050612e228282612ddb565b919050565b600063ffffffff82169050919050565b612e4081612e27565b8114612e4b57600080fd5b50565b600081359050612e5d81612e37565b92915050565b600068ffffffffffffffffff82169050919050565b612e8181612e63565b8114612e8c57600080fd5b50565b600081359050612e9e81612e78565b92915050565b600064ffffffffff82169050919050565b612ebe81612ea4565b8114612ec957600080fd5b50565b600081359050612edb81612eb5565b92915050565b600060608284031215612ef757612ef6612da7565b5b612f016060612e0c565b90506000612f1184828501612e4e565b6000830152506020612f2584828501612e8f565b6020830152506040612f3984828501612ecc565b60408301525092915050565b600060608284031215612f5b57612f5a612bfe565b5b6000612f6984828501612ee1565b91505092915050565b6000819050919050565b612f8581612f72565b82525050565b6000602082019050612fa06000830184612f7c565b92915050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000612fd182612fa6565b9050919050565b612fe181612fc6565b8114612fec57600080fd5b50565b600081359050612ffe81612fd8565b92915050565b60006020828403121561301a57613019612bfe565b5b600061302884828501612fef565b91505092915050565b61303a81612f72565b811461304557600080fd5b50565b60008135905061305781613031565b92915050565b6000806040838503121561307457613073612bfe565b5b600061308285828601613048565b925050602061309385828601613048565b9150509250929050565b6000602082840312156130b3576130b2612bfe565b5b60006130c184828501613048565b91505092915050565b6130d381612e27565b82525050565b6130e281612e63565b82525050565b6130f181612ea4565b82525050565b600060608201905061310c60008301866130ca565b61311960208301856130d9565b61312660408301846130e8565b949350505050565b6000806040838503121561314557613144612bfe565b5b600061315385828601612fef565b925050602061316485828601613048565b9150509250929050565b61317781612fc6565b82525050565b6000602082019050613192600083018461316e565b92915050565b60006fffffffffffffffffffffffffffffffff82169050919050565b6131bd81613198565b82525050565b60006020820190506131d860008301846131b4565b92915050565b600080600080608085870312156131f8576131f7612bfe565b5b600061320687828801613048565b945050602061321787828801613048565b935050604061322887828801613048565b925050606061323987828801613048565b91505092959194509250565b61324e81612e27565b82525050565b61325d81612e63565b82525050565b61326c81612ea4565b82525050565b6060820160008201516132886000850182613245565b50602082015161329b6020850182613254565b5060408201516132ae6040850182613263565b50505050565b60006060820190506132c96000830184613272565b92915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b6000600282049050600182168061331657607f821691505b602082108103613329576133286132cf565b5b50919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b600061336982612f72565b915061337483612f72565b925082820390508181111561338c5761338b61332f565b5b92915050565b600061339d82612f72565b91506133a883612f72565b92508282019050808211156133c0576133bf61332f565b5b92915050565b7f4552525f41434345535300000000000000000000000000000000000000000000600082015250565b60006133fc600a83612cc9565b9150613407826133c6565b602082019050919050565b6000602082019050818103600083015261342b816133ef565b9050919050565b600061343d82612f72565b915061344883612f72565b925082820261345681612f72565b9150828204841483151761346d5761346c61332f565b5b5092915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601260045260246000fd5b60006134ae82612f72565b91506134b983612f72565b9250826134c9576134c8613474565b5b828204905092915050565b7f4552525f4f5645525350454e4400000000000000000000000000000000000000600082015250565b600061350a600d83612cc9565b9150613515826134d4565b602082019050919050565b60006020820190508181036000830152613539816134fd565b9050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fdfea26469706673582212204b75a1346dc9b6fd8022d4b7843ef48d6a1dcba4ee1022ef5799e0df78620e2364736f6c63430008110033
-\ No newline at end of file
+60c06040523480156200001157600080fd5b5060405162004551380380620045518339818101604052810190620000379190620008f7565b6801000000000000000083600f0b126200005057600080fd5b6200005a6200060f565b33600460006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506001600e6000600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff021916908315150217905550866006908162000126919062000c18565b50856007908162000138919062000c18565b508460ff166008819055504260038190555060035460808181525050603c8362000163919062000d2e565b60a081815250506200018a60016200035064010000000002620018a1176401000000009004565b600260006101000a8154816fffffffffffffffffffffffffffffffff0219169083600f0b6fffffffffffffffffffffffffffffffff160217905550620001e4846200037764010000000002620018c7176401000000009004565b600d60006101000a8154816fffffffffffffffffffffffffffffffff0219169083600f0b6fffffffffffffffffffffffffffffffff160217905550620002556000600260009054906101000a9004600f0b64ffffffffff1660006001620003cb640100000000026401000000009004565b90506000819080600181540180825580915050600190039060005260206000200160009091909190915060008201518160000160006101000a81548163ffffffff021916908363ffffffff16021790555060208201518160000160046101000a81548168ffffffffffffffffff021916908368ffffffffffffffffff160217905550604082015181600001600d6101000a81548164ffffffffff021916908364ffffffffff160217905550505081601060006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505050505050505062000d79565b6000677fffffffffffffff8211156200036857600080fd5b6040829060020a029050919050565b60008082600f0b136200038957600080fd5b60806fb17217f7d1cf79abc9e3b39803f2f6af620003b6846200043f640100000000026401000000009004565b600f0b02908060020a82049150509050919050565b620003d56200060f565b620003df6200060f565b82816000019063ffffffff16908163ffffffff168152505083816020019068ffffffffffffffffff16908168ffffffffffffffffff168152505084816040019064ffffffffff16908164ffffffffff168152505080915050949350505050565b60008082600f0b136200045157600080fd5b60008083600f0b90506801000000000000000081126200048d576040819060008212600003808260020a82851804189250505090506040820191505b6401000000008112620004bc576020819060008212600003808260020a82851804189250505090506020820191505b620100008112620004e9576010819060008212600003808260020a82851804189250505090506010820191505b610100811262000515576008819060008212600003808260020a82851804189250505090506008820191505b6010811262000540576004819060008212600003808260020a82851804189250505090506004820191505b600481126200056b576002819060008212600003808260020a82851804189250505090506002820191505b600281126200057b576001820191505b600060408084039060020a029050600083607f0386600f0b9060020a029050600067800000000000000090505b600081131562000602578182029150600060ff83908060020a8204915050905080607f0183908060020a8204915050925080820284019350506001819060008212600003808260020a8285180418925050509050620005a8565b5081945050505050919050565b6040518060600160405280600063ffffffff168152602001600068ffffffffffffffffff168152602001600064ffffffffff1681525090565b6000604051905090565b600080fd5b600080fd5b600080fd5b600080fd5b6000601f19601f8301169050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b620006b18262000666565b810181811067ffffffffffffffff82111715620006d357620006d262000677565b5b80604052505050565b6000620006e862000648565b9050620006f68282620006a6565b919050565b600067ffffffffffffffff82111562000719576200071862000677565b5b620007248262000666565b9050602081019050919050565b60005b838110156200075157808201518184015260208101905062000734565b60008484015250505050565b6000620007746200076e84620006fb565b620006dc565b90508281526020810184848401111562000793576200079262000661565b5b620007a084828562000731565b509392505050565b600082601f830112620007c057620007bf6200065c565b5b8151620007d28482602086016200075d565b91505092915050565b600060ff82169050919050565b620007f381620007db565b8114620007ff57600080fd5b50565b6000815190506200081381620007e8565b92915050565b600081600f0b9050919050565b620008318162000819565b81146200083d57600080fd5b50565b600081519050620008518162000826565b92915050565b6000819050919050565b6200086c8162000857565b81146200087857600080fd5b50565b6000815190506200088c8162000861565b92915050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000620008bf8262000892565b9050919050565b620008d181620008b2565b8114620008dd57600080fd5b50565b600081519050620008f181620008c6565b92915050565b60008060008060008060c0878903121562000917576200091662000652565b5b600087015167ffffffffffffffff81111562000938576200093762000657565b5b6200094689828a01620007a8565b965050602087015167ffffffffffffffff8111156200096a576200096962000657565b5b6200097889828a01620007a8565b95505060406200098b89828a0162000802565b94505060606200099e89828a0162000840565b9350506080620009b189828a016200087b565b92505060a0620009c489828a01620008e0565b9150509295509295509295565b600081519050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b6000600282049050600182168062000a2457607f821691505b60208210810362000a3a5762000a39620009dc565b5b50919050565b60008190508160005260206000209050919050565b60006020601f8301049050919050565b60008160020a8302905092915050565b60006008830262000aa77fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8262000a65565b62000ab3868362000a65565b95508019841693508086168417925050509392505050565b6000819050919050565b600062000af662000af062000aea8462000857565b62000acb565b62000857565b9050919050565b6000819050919050565b62000b128362000ad5565b62000b2a62000b218262000afd565b84845462000a75565b825550505050565b600090565b62000b4162000b32565b62000b4e81848462000b07565b505050565b5b8181101562000b765762000b6a60008262000b37565b60018101905062000b54565b5050565b601f82111562000bc55762000b8f8162000a40565b62000b9a8462000a55565b8101602085101562000baa578190505b62000bc262000bb98562000a55565b83018262000b53565b50505b505050565b60008160020a8304905092915050565b600062000bed6000198460080262000bca565b1980831691505092915050565b600062000c08838362000bda565b9150826002028217905092915050565b62000c2382620009d1565b67ffffffffffffffff81111562000c3f5762000c3e62000677565b5b62000c4b825462000a0b565b62000c5882828562000b7a565b600060209050601f83116001811462000c90576000841562000c7b578287015190505b62000c87858262000bfa565b86555062000cf7565b601f19841662000ca08662000a40565b60005b8281101562000cca5784890151825560018201915060208501945060208101905062000ca3565b8683101562000cea578489015162000ce6601f89168262000bda565b8355505b6001600288020188555050505b505050505050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b600062000d3b8262000857565b915062000d488362000857565b925082820262000d588162000857565b9150828204841483151762000d725762000d7162000cff565b5b5092915050565b60805160a05161379662000dbb60003960008181610f96015281816115620152611707015260008181610fc201528181611728015261176d01526137966000f3fe608060405234801561001057600080fd5b5060043610610270576000357c010000000000000000000000000000000000000000000000000000000090048063731f237c1161016357806395d89b41116100e0578063d4792037116100a4578063d479203714610799578063d89135cd146107c9578063e8095295146107e7578063eda4e6d614610805578063f2fde38b14610823578063f83da35d1461085357610270565b806395d89b41146106df578063983b2d56146106fd578063b470aade1461072d578063c0ab70771461074b578063d340ef8a1461077b57610270565b80638b8ff2d6116101275780638b8ff2d61461063b5780638da5cb5b1461066b5780638f0b2d5d146106895780638f1df6bc146106a557806394c8a69a146106af57610270565b8063731f237c146105a557806373f42561146105c357806374bedb95146105e157806379ba5097146105ff57806384dde4af1461061d57610270565b806340452d91116101f157806351b4541c116101b557806351b4541c146104c757806358b2833b146104f75780636787a9be146105155780636a2d094e1461054557806370a082311461057557610270565b806340452d91146103e957806342966c681461041b578063449a52f81461043757806347a50517146104675780634abfbba21461049757610270565b80631989c6a8116102385780631989c6a81461032f578063229ba1971461034d5780633092afd51461036b578063313334871461039b578063313ce567146103cb57610270565b806301ffc9a71461027557806306fdde03146102a557806309f28f3c146102c357806310a10f37146102e157806318160ddd14610311575b600080fd5b61028f600480360381019061028a9190612e4c565b610883565b60405161029c9190612e94565b60405180910390f35b6102ad610a29565b6040516102ba9190612f3f565b60405180910390f35b6102cb610ab7565b6040516102d89190612f7d565b60405180910390f35b6102fb60048036038101906102f69190613136565b610aca565b604051610308919061317c565b60405180910390f35b610319610ade565b604051610326919061317c565b60405180910390f35b610337610af5565b604051610344919061317c565b60405180910390f35b610355610b01565b6040516103629190612f7d565b60405180910390f35b610385600480360381019061038091906131f5565b610b14565b6040516103929190612e94565b60405180910390f35b6103b560048036038101906103b0919061324e565b610c07565b6040516103c2919061317c565b60405180910390f35b6103d3610c73565b6040516103e0919061317c565b60405180910390f35b61040360048036038101906103fe919061328e565b610c79565b604051610412939291906132e8565b60405180910390f35b6104356004803603810190610430919061328e565b610ce5565b005b610451600480360381019061044c919061331f565b610e0a565b60405161045e9190612e94565b60405180910390f35b610481600480360381019061047c91906131f5565b610f49565b60405161048e919061317c565b60405180910390f35b6104b160048036038101906104ac919061328e565b610f92565b6040516104be919061317c565b60405180910390f35b6104e160048036038101906104dc919061328e565b610ff2565b6040516104ee919061317c565b60405180910390f35b6104ff611013565b60405161050c919061317c565b60405180910390f35b61052f600480360381019061052a919061328e565b611019565b60405161053c919061317c565b60405180910390f35b61055f600480360381019061055a919061328e565b61105a565b60405161056c919061317c565b60405180910390f35b61058f600480360381019061058a91906131f5565b61107b565b60405161059c919061317c565b60405180910390f35b6105ad6110e2565b6040516105ba919061317c565b60405180910390f35b6105cb6110f3565b6040516105d8919061317c565b60405180910390f35b6105e96110f9565b6040516105f6919061317c565b60405180910390f35b6106076110ff565b6040516106149190612e94565b60405180910390f35b6106256112a6565b604051610632919061336e565b60405180910390f35b61065560048036038101906106509190613136565b6112cc565b604051610662919061317c565b60405180910390f35b6106736112e1565b604051610680919061336e565b60405180910390f35b6106a3600480360381019061069e91906131f5565b611307565b005b6106ad6113a5565b005b6106c960048036038101906106c49190613136565b6113b0565b6040516106d69190612e94565b60405180910390f35b6106e7611415565b6040516106f49190612f3f565b60405180910390f35b610717600480360381019061071291906131f5565b6114a3565b6040516107249190612e94565b60405180910390f35b610735611560565b604051610742919061317c565b60405180910390f35b6107656004803603810190610760919061328e565b611584565b604051610772919061317c565b60405180910390f35b6107836116d8565b604051610790919061317c565b60405180910390f35b6107b360048036038101906107ae9190613136565b6116de565b6040516107c0919061317c565b60405180910390f35b6107d16116f7565b6040516107de919061317c565b60405180910390f35b6107ef611701565b6040516107fc91906133b4565b60405180910390f35b61080d61176b565b60405161081a919061317c565b60405180910390f35b61083d600480360381019061083891906131f5565b61178f565b60405161084a9190612e94565b60405180910390f35b61086d600480360381019061086891906133cf565b611831565b60405161087a91906134a5565b60405180910390f35b600063c6bb4b707c010000000000000000000000000000000000000000000000000000000002827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916036108d75760019050610a24565b63449a52f87c010000000000000000000000000000000000000000000000000000000002827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916036109295760019050610a24565b6301ffc9a77c010000000000000000000000000000000000000000000000000000000002827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19160361097b5760019050610a24565b639493f8b27c010000000000000000000000000000000000000000000000000000000002827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916036109cd5760019050610a24565b6337a47be47c010000000000000000000000000000000000000000000000000000000002827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff191603610a1f5760019050610a24565b600090505b919050565b60068054610a36906134ef565b80601f0160208091040260200160405190810160405280929190818152602001828054610a62906134ef565b8015610aaf5780601f10610a8457610100808354040283529160200191610aaf565b820191906000526020600020905b815481529060010190602001808311610a9257829003601f168201915b505050505081565b600260009054906101000a9004600f0b81565b6000816000015163ffffffff169050919050565b6000600c54600954610af0919061354f565b905090565b60008080549050905090565b600d60009054906101000a9004600f0b81565b6000600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff161480610b9d57503373ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff16145b610ba657600080fd5b6000600e60008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff02191690831515021790555060019050919050565b600080600080610c16866118a1565b9250610c21856118a1565b9150610c3c600d60009054906101000a9004600f0b83611909565b9050610c4781611988565b9050610c538382611909565b9050610c5e81611a15565b67ffffffffffffffff16935050505092915050565b60085481565b60008181548110610c8957600080fd5b906000526020600020016000915090508060000160009054906101000a900463ffffffff16908060000160049054906101000a900468ffffffffffffffffff169080600001600d9054906101000a900464ffffffffff16905083565b600e60003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff16610d3b57600080fd5b600160003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054811115610d8757600080fd5b6000610d9282611019565b9050610d9e3382611a4a565b5081600c6000828254610db19190613583565b925050819055503373ffffffffffffffffffffffffffffffffffffffff167fcc16f5dbb4873280815c1ee09dbd06736cffcc184412cf7a71a0fdb75d397ca583604051610dfe919061317c565b60405180910390a25050565b600080600e60003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff16610e99576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610e9090613603565b60405180910390fd5b610ea16113a5565b610eaa83611019565b90508260096000828254610ebe9190613583565b92505081905550610ecf8482611b51565b508373ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fab8530f87dc9b59234c4623bf917212bb2536d647574c8e7e5da92c2ede0c9f885604051610f2d919061317c565b60405180910390a3610f3d611c15565b50600191505092915050565b6000600160008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020549050919050565b60007f000000000000000000000000000000000000000000000000000000000000000082610fc09190613623565b7f0000000000000000000000000000000000000000000000000000000000000000610feb9190613583565b9050919050565b6000603c8242611002919061354f565b61100c9190613694565b9050919050565b60035481565b60008061103d600260009054906101000a9004600f0b611038856118a1565b611909565b905061104881611a15565b67ffffffffffffffff16915050919050565b6000603c824261106a919061354f565b6110749190613694565b9050919050565b60008060008061109261108d86610f49565b6118a1565b925061109f600354610ff2565b90506110ba83600260009054906101000a9004600f0b611909565b91506110d86110c883611a15565b67ffffffffffffffff1682610c07565b9350505050919050565b60006110ee6000611584565b905090565b600c5481565b600b5481565b600080600560009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff161461115c57600080fd5b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff169050600560009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16600460006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506000600560006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e060405160405180910390a35090565b601060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b6000816040015164ffffffffff169050919050565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff161461136157600080fd5b80601060006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050565b6113ad6110e2565b50565b600080826000015163ffffffff1611156113cd5760009050611410565b6000826020015168ffffffffffffffffff1611156113ee5760009050611410565b6000826040015164ffffffffff16111561140b5760009050611410565b600190505b919050565b60078054611422906134ef565b80601f016020809104026020016040519081016040528092919081815260200182805461144e906134ef565b801561149b5780601f106114705761010080835404028352916020019161149b565b820191906000526020600020905b81548152906001019060200180831161147e57829003601f168201915b505050505081565b6000600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16146114ff57600080fd5b6001600e60008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff02191690831515021790555060019050919050565b7f000000000000000000000000000000000000000000000000000000000000000081565b6000806000806000611597600354610ff2565b9250600083036115ae5760009450505050506116d3565b600260009054906101000a9004600f0b90506000861180156115cf57508286105b156115d8578592505b6115e1836118a1565b91506115fc600d60009054906101000a9004600f0b83611909565b935061160784611988565b9350611622600260009054906101000a9004600f0b85611909565b600260006101000a8154816fffffffffffffffffffffffffffffffff0219169083600f0b6fffffffffffffffffffffffffffffffff160217905550603c8361166a9190613623565b6003546116779190613583565b60038190555080600f0b836003547f1c9c74563c32efd114cb36fb5e432d9386c8254d08456614804a33a3088ab736600260009054906101000a9004600f0b6040516116c39190612f7d565b60405180910390a4829450505050505b919050565b600a5481565b6000816020015168ffffffffffffffffff169050919050565b6000600c54905090565b600060017f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000042611752919061354f565b61175c9190613694565b6117669190613583565b905090565b7f000000000000000000000000000000000000000000000000000000000000000081565b6000600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16146117eb57600080fd5b81600560006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550919050565b611839612dac565b611841612dac565b82816000019063ffffffff16908163ffffffff168152505083816020019068ffffffffffffffffff16908168ffffffffffffffffff168152505084816040019064ffffffffff16908164ffffffffff168152505080915050949350505050565b6000677fffffffffffffff8211156118b857600080fd5b6040829060020a029050919050565b60008082600f0b136118d857600080fd5b60806fb17217f7d1cf79abc9e3b39803f2f6af6118f484611dca565b600f0b02908060020a82049150509050919050565b600080604083600f0b85600f0b029060008212600003808260020a82851804189250505090507fffffffffffffffffffffffffffffffff80000000000000000000000000000000600f0b811215801561197557506f7fffffffffffffffffffffffffffffff600f0b8113155b61197e57600080fd5b8091505092915050565b60006840000000000000000082600f0b126119a257600080fd5b7fffffffffffffffffffffffffffffffffffffffffffffffc0000000000000000082600f0b12156119d65760009050611a10565b611a0d6080700171547652b82fe1777d0ffda0d23a7d1284600f0b029060008212600003808260020a828518041892505050611f90565b90505b919050565b60008082600f0b1215611a2757600080fd5b604082600f0b9060008212600003808260020a8285180418925050509050919050565b600080600080600160008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054905060008503611aa65760009350505050611b4b565b611aaf86610f49565b925084831015611af4576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401611aeb90613711565b60405180910390fd5b8483611b00919061354f565b600160008873ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550600193505050505b92915050565b600080600080600160008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054905060008503611bad5760009350505050611c0f565b611bb686610f49565b92508483611bc49190613583565b600160008873ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550600193505050505b92915050565b6000611c1f612dac565b6000611c29610ade565b905060006001600080549050611c3f919061354f565b81548110611c5057611c4f613731565b5b906000526020600020016040518060600160405290816000820160009054906101000a900463ffffffff1663ffffffff1663ffffffff1681526020016000820160049054906101000a900468ffffffffffffffffff1668ffffffffffffffffff1668ffffffffffffffffff16815260200160008201600d9054906101000a900464ffffffffff1664ffffffffff1664ffffffffff1681525050915080826020019068ffffffffffffffffff16908168ffffffffffffffffff16815250508160006001600080549050611d22919061354f565b81548110611d3357611d32613731565b5b9060005260206000200160008201518160000160006101000a81548163ffffffff021916908363ffffffff16021790555060208201518160000160046101000a81548168ffffffffffffffffff021916908368ffffffffffffffffff160217905550604082015181600001600d6101000a81548164ffffffffff021916908364ffffffffff16021790555090505060019250505090565b60008082600f0b13611ddb57600080fd5b60008083600f0b9050680100000000000000008112611e16576040819060008212600003808260020a82851804189250505090506040820191505b6401000000008112611e44576020819060008212600003808260020a82851804189250505090506020820191505b620100008112611e70576010819060008212600003808260020a82851804189250505090506010820191505b6101008112611e9b576008819060008212600003808260020a82851804189250505090506008820191505b60108112611ec5576004819060008212600003808260020a82851804189250505090506004820191505b60048112611eef576002819060008212600003808260020a82851804189250505090506002820191505b60028112611efe576001820191505b600060408084039060020a029050600083607f0386600f0b9060020a029050600067800000000000000090505b6000811315611f83578182029150600060ff83908060020a8204915050905080607f0183908060020a8204915050925080820284019350506001819060008212600003808260020a8285180418925050509050611f2b565b5081945050505050919050565b60006840000000000000000082600f0b12611faa57600080fd5b7fffffffffffffffffffffffffffffffffffffffffffffffc0000000000000000082600f0b1215611fde5760009050612da7565b60006f80000000000000000000000000000000905060006780000000000000008416600f0b131561202c57608070016a09e667f3bcc908b2fb1366ea957d3e8202908060020a820491505090505b60006740000000000000008416600f0b13156120655760807001306fe0a31b7152de8d5a46305c85edec8202908060020a820491505090505b60006720000000000000008416600f0b131561209e5760807001172b83c7d517adcdf7c8c50eb14a791f8202908060020a820491505090505b60006710000000000000008416600f0b13156120d757608070010b5586cf9890f6298b92b71842a983638202908060020a820491505090505b60006708000000000000008416600f0b13156121105760807001059b0d31585743ae7c548eb68ca417fd8202908060020a820491505090505b60006704000000000000008416600f0b1315612149576080700102c9a3e778060ee6f7caca4f7a29bde88202908060020a820491505090505b60006702000000000000008416600f0b131561218257608070010163da9fb33356d84a66ae336dcdfa3f8202908060020a820491505090505b60006701000000000000008416600f0b13156121bb576080700100b1afa5abcbed6129ab13ec11dc95438202908060020a820491505090505b600066800000000000008416600f0b13156121f357608070010058c86da1c09ea1ff19d294cf2f679b8202908060020a820491505090505b600066400000000000008416600f0b131561222b5760807001002c605e2e8cec506d21bfc89a23a00f8202908060020a820491505090505b600066200000000000008416600f0b1315612263576080700100162f3904051fa128bca9c55c31e5df8202908060020a820491505090505b600066100000000000008416600f0b131561229b5760807001000b175effdc76ba38e31671ca9397258202908060020a820491505090505b600066080000000000008416600f0b13156122d3576080700100058ba01fb9f96d6cacd4b180917c3d8202908060020a820491505090505b600066040000000000008416600f0b131561230b57608070010002c5cc37da9491d0985c348c68e7b38202908060020a820491505090505b600066020000000000008416600f0b13156123435760807001000162e525ee054754457d59952920268202908060020a820491505090505b600066010000000000008416600f0b131561237b57608070010000b17255775c040618bf4a4ade83fc8202908060020a820491505090505b6000658000000000008416600f0b13156123b25760807001000058b91b5bc9ae2eed81e9b7d4cfab8202908060020a820491505090505b6000654000000000008416600f0b13156123e9576080700100002c5c89d5ec6ca4d7c8acc017b7c98202908060020a820491505090505b6000652000000000008416600f0b131561242057608070010000162e43f4f831060e02d839a9d16d8202908060020a820491505090505b6000651000000000008416600f0b1315612457576080700100000b1721bcfc99d9f890ea069117638202908060020a820491505090505b6000650800000000008416600f0b131561248e57608070010000058b90cf1e6d97f9ca14dbcc16288202908060020a820491505090505b6000650400000000008416600f0b13156124c55760807001000002c5c863b73f016468f6bac5ca2b8202908060020a820491505090505b6000650200000000008416600f0b13156124fc576080700100000162e430e5a18f6119e3c02282a58202908060020a820491505090505b6000650100000000008416600f0b13156125335760807001000000b1721835514b86e6d96efd1bfe8202908060020a820491505090505b60006480000000008416600f0b1315612569576080700100000058b90c0b48c6be5df846c5b2ef8202908060020a820491505090505b60006440000000008416600f0b131561259f57608070010000002c5c8601cc6b9e94213c72737a8202908060020a820491505090505b60006420000000008416600f0b13156125d55760807001000000162e42fff037df38aa2b219f068202908060020a820491505090505b60006410000000008416600f0b131561260b57608070010000000b17217fba9c739aa5819f44f98202908060020a820491505090505b60006408000000008416600f0b13156126415760807001000000058b90bfcdee5acd3c1cedc8238202908060020a820491505090505b60006404000000008416600f0b1315612677576080700100000002c5c85fe31f35a6a30da1be508202908060020a820491505090505b60006402000000008416600f0b13156126ad57608070010000000162e42ff0999ce3541b9fffcf8202908060020a820491505090505b60006401000000008416600f0b13156126e3576080700100000000b17217f80f4ef5aadda455548202908060020a820491505090505b600063800000008416600f0b131561271857608070010000000058b90bfbf8479bd5a81b51ad8202908060020a820491505090505b600063400000008416600f0b131561274d5760807001000000002c5c85fdf84bd62ae30a74cc8202908060020a820491505090505b600063200000008416600f0b1315612782576080700100000000162e42fefb2fed257559bdaa8202908060020a820491505090505b600063100000008416600f0b13156127b75760807001000000000b17217f7d5a7716bba4a9ae8202908060020a820491505090505b600063080000008416600f0b13156127ec576080700100000000058b90bfbe9ddbac5e109cce8202908060020a820491505090505b600063040000008416600f0b131561282157608070010000000002c5c85fdf4b15de6f17eb0d8202908060020a820491505090505b600063020000008416600f0b13156128565760807001000000000162e42fefa494f1478fde058202908060020a820491505090505b600063010000008416600f0b131561288b57608070010000000000b17217f7d20cf927c8e94c8202908060020a820491505090505b6000628000008416600f0b13156128bf5760807001000000000058b90bfbe8f71cb4e4b33d8202908060020a820491505090505b6000624000008416600f0b13156128f3576080700100000000002c5c85fdf477b662b269458202908060020a820491505090505b6000622000008416600f0b131561292757608070010000000000162e42fefa3ae53369388c8202908060020a820491505090505b6000621000008416600f0b131561295b576080700100000000000b17217f7d1d351a389d408202908060020a820491505090505b6000620800008416600f0b131561298f57608070010000000000058b90bfbe8e8b2d3d4ede8202908060020a820491505090505b6000620400008416600f0b13156129c35760807001000000000002c5c85fdf4741bea6e77e8202908060020a820491505090505b6000620200008416600f0b13156129f7576080700100000000000162e42fefa39fe95583c28202908060020a820491505090505b6000620100008416600f0b1315612a2b5760807001000000000000b17217f7d1cfb72b45e18202908060020a820491505090505b60006180008416600f0b1315612a5e576080700100000000000058b90bfbe8e7cc35c3f08202908060020a820491505090505b60006140008416600f0b1315612a9157608070010000000000002c5c85fdf473e242ea388202908060020a820491505090505b60006120008416600f0b1315612ac45760807001000000000000162e42fefa39f02b772c8202908060020a820491505090505b60006110008416600f0b1315612af757608070010000000000000b17217f7d1cf7d83c1a8202908060020a820491505090505b60006108008416600f0b1315612b2a5760807001000000000000058b90bfbe8e7bdcbe2e8202908060020a820491505090505b60006104008416600f0b1315612b5d576080700100000000000002c5c85fdf473dea871f8202908060020a820491505090505b60006102008416600f0b1315612b9057608070010000000000000162e42fefa39ef44d918202908060020a820491505090505b60006101008416600f0b1315612bc3576080700100000000000000b17217f7d1cf79e9498202908060020a820491505090505b600060808416600f0b1315612bf557608070010000000000000058b90bfbe8e7bce5448202908060020a820491505090505b600060408416600f0b1315612c275760807001000000000000002c5c85fdf473de6eca8202908060020a820491505090505b600060208416600f0b1315612c59576080700100000000000000162e42fefa39ef366f8202908060020a820491505090505b600060108416600f0b1315612c8b5760807001000000000000000b17217f7d1cf79afa8202908060020a820491505090505b600060088416600f0b1315612cbd576080700100000000000000058b90bfbe8e7bcd6d8202908060020a820491505090505b600060048416600f0b1315612cef57608070010000000000000002c5c85fdf473de6b28202908060020a820491505090505b600060028416600f0b1315612d215760807001000000000000000162e42fefa39ef3588202908060020a820491505090505b600060018416600f0b1315612d5357608070010000000000000000b17217f7d1cf79ab8202908060020a820491505090505b604083600f0b9060008212600003808260020a828518041892505050603f03600f0b81908060020a820491505090506f7fffffffffffffffffffffffffffffff600f0b811115612da257600080fd5b809150505b919050565b6040518060600160405280600063ffffffff168152602001600068ffffffffffffffffff168152602001600064ffffffffff1681525090565b6000604051905090565b600080fd5b60007fffffffff0000000000000000000000000000000000000000000000000000000082169050919050565b612e2981612df4565b8114612e3457600080fd5b50565b600081359050612e4681612e20565b92915050565b600060208284031215612e6257612e61612def565b5b6000612e7084828501612e37565b91505092915050565b60008115159050919050565b612e8e81612e79565b82525050565b6000602082019050612ea96000830184612e85565b92915050565b600081519050919050565b600082825260208201905092915050565b60005b83811015612ee9578082015181840152602081019050612ece565b60008484015250505050565b6000601f19601f8301169050919050565b6000612f1182612eaf565b612f1b8185612eba565b9350612f2b818560208601612ecb565b612f3481612ef5565b840191505092915050565b60006020820190508181036000830152612f598184612f06565b905092915050565b600081600f0b9050919050565b612f7781612f61565b82525050565b6000602082019050612f926000830184612f6e565b92915050565b600080fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b612fd582612ef5565b810181811067ffffffffffffffff82111715612ff457612ff3612f9d565b5b80604052505050565b6000613007612de5565b90506130138282612fcc565b919050565b600063ffffffff82169050919050565b61303181613018565b811461303c57600080fd5b50565b60008135905061304e81613028565b92915050565b600068ffffffffffffffffff82169050919050565b61307281613054565b811461307d57600080fd5b50565b60008135905061308f81613069565b92915050565b600064ffffffffff82169050919050565b6130af81613095565b81146130ba57600080fd5b50565b6000813590506130cc816130a6565b92915050565b6000606082840312156130e8576130e7612f98565b5b6130f26060612ffd565b905060006131028482850161303f565b600083015250602061311684828501613080565b602083015250604061312a848285016130bd565b60408301525092915050565b60006060828403121561314c5761314b612def565b5b600061315a848285016130d2565b91505092915050565b6000819050919050565b61317681613163565b82525050565b6000602082019050613191600083018461316d565b92915050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60006131c282613197565b9050919050565b6131d2816131b7565b81146131dd57600080fd5b50565b6000813590506131ef816131c9565b92915050565b60006020828403121561320b5761320a612def565b5b6000613219848285016131e0565b91505092915050565b61322b81613163565b811461323657600080fd5b50565b60008135905061324881613222565b92915050565b6000806040838503121561326557613264612def565b5b600061327385828601613239565b925050602061328485828601613239565b9150509250929050565b6000602082840312156132a4576132a3612def565b5b60006132b284828501613239565b91505092915050565b6132c481613018565b82525050565b6132d381613054565b82525050565b6132e281613095565b82525050565b60006060820190506132fd60008301866132bb565b61330a60208301856132ca565b61331760408301846132d9565b949350505050565b6000806040838503121561333657613335612def565b5b6000613344858286016131e0565b925050602061335585828601613239565b9150509250929050565b613368816131b7565b82525050565b6000602082019050613383600083018461335f565b92915050565b60006fffffffffffffffffffffffffffffffff82169050919050565b6133ae81613389565b82525050565b60006020820190506133c960008301846133a5565b92915050565b600080600080608085870312156133e9576133e8612def565b5b60006133f787828801613239565b945050602061340887828801613239565b935050604061341987828801613239565b925050606061342a87828801613239565b91505092959194509250565b61343f81613018565b82525050565b61344e81613054565b82525050565b61345d81613095565b82525050565b6060820160008201516134796000850182613436565b50602082015161348c6020850182613445565b50604082015161349f6040850182613454565b50505050565b60006060820190506134ba6000830184613463565b92915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b6000600282049050600182168061350757607f821691505b60208210810361351a576135196134c0565b5b50919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b600061355a82613163565b915061356583613163565b925082820390508181111561357d5761357c613520565b5b92915050565b600061358e82613163565b915061359983613163565b92508282019050808211156135b1576135b0613520565b5b92915050565b7f4552525f41434345535300000000000000000000000000000000000000000000600082015250565b60006135ed600a83612eba565b91506135f8826135b7565b602082019050919050565b6000602082019050818103600083015261361c816135e0565b9050919050565b600061362e82613163565b915061363983613163565b925082820261364781613163565b9150828204841483151761365e5761365d613520565b5b5092915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601260045260246000fd5b600061369f82613163565b91506136aa83613163565b9250826136ba576136b9613665565b5b828204905092915050565b7f4552525f4f5645525350454e4400000000000000000000000000000000000000600082015250565b60006136fb600d83612eba565b9150613706826136c5565b602082019050919050565b6000602082019050818103600083015261372a816136ee565b9050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fdfea26469706673582212208df54ffd702147c322212cd37b0275e383e20c53759279c0428de609c2666e1e64736f6c63430008110033
+\ No newline at end of file
diff --git a/python/erc20_demurrage_token/data/DemurrageTokenSingleNocap.json b/python/erc20_demurrage_token/data/DemurrageTokenSingleNocap.json
@@ -1 +1 @@
-[{"inputs":[{"internalType":"string","name":"_name","type":"string"},{"internalType":"string","name":"_symbol","type":"string"},{"internalType":"uint8","name":"_decimals","type":"uint8"},{"internalType":"int128","name":"_taxLevel","type":"int128"},{"internalType":"uint256","name":"_periodMinutes","type":"uint256"},{"internalType":"address","name":"_defaultSinkAddress","type":"address"}],"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"_owner","type":"address"},{"indexed":true,"internalType":"address","name":"_spender","type":"address"},{"indexed":false,"internalType":"uint256","name":"_value","type":"uint256"}],"name":"Approval","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"_burner","type":"address"},{"indexed":false,"internalType":"uint256","name":"_value","type":"uint256"}],"name":"Burn","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"bytes32","name":"_foo","type":"bytes32"}],"name":"Debug","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"uint256","name":"_period","type":"uint256"},{"indexed":true,"internalType":"uint256","name":"_periodCount","type":"uint256"},{"indexed":true,"internalType":"uint256","name":"_oldAmount","type":"uint256"},{"indexed":false,"internalType":"uint256","name":"_newAmount","type":"uint256"}],"name":"Decayed","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"_minter","type":"address"},{"indexed":true,"internalType":"address","name":"_beneficiary","type":"address"},{"indexed":false,"internalType":"uint256","name":"_value","type":"uint256"}],"name":"Mint","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"previousOwner","type":"address"},{"indexed":true,"internalType":"address","name":"newOwner","type":"address"}],"name":"OwnershipTransferred","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"uint256","name":"_period","type":"uint256"}],"name":"Period","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"_account","type":"address"},{"indexed":true,"internalType":"uint256","name":"_period","type":"uint256"},{"indexed":false,"internalType":"uint256","name":"_value","type":"uint256"}],"name":"Redistribution","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"_from","type":"address"},{"indexed":true,"internalType":"address","name":"_to","type":"address"},{"indexed":false,"internalType":"uint256","name":"_value","type":"uint256"}],"name":"Transfer","type":"event"},{"inputs":[],"name":"acceptOwnership","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"actualPeriod","outputs":[{"internalType":"uint128","name":"","type":"uint128"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_minter","type":"address"}],"name":"addMinter","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_account","type":"address"}],"name":"balanceOf","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_account","type":"address"}],"name":"baseBalanceOf","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"_value","type":"uint256"}],"name":"burn","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"burned","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"_value","type":"uint256"},{"internalType":"uint256","name":"_period","type":"uint256"}],"name":"decayBy","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"decimals","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"demurrageAmount","outputs":[{"internalType":"int128","name":"","type":"int128"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"_target","type":"uint256"}],"name":"demurrageCycles","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"demurrageTimestamp","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"_lastTimestamp","type":"uint256"}],"name":"getMinutesDelta","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"_periodCount","type":"uint256"}],"name":"getPeriodTimeDelta","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"components":[{"internalType":"uint32","name":"period","type":"uint32"},{"internalType":"uint72","name":"value","type":"uint72"},{"internalType":"uint40","name":"demurrage","type":"uint40"}],"internalType":"struct DemurrageTokenSingleCap.redistributionItem","name":"_redistribution","type":"tuple"}],"name":"isEmptyRedistribution","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"pure","type":"function"},{"inputs":[],"name":"lastPeriod","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_beneficiary","type":"address"},{"internalType":"uint256","name":"_amount","type":"uint256"}],"name":"mintTo","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"name","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"owner","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"periodDuration","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"periodStart","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"redistributionCount","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"","type":"uint256"}],"name":"redistributions","outputs":[{"internalType":"uint32","name":"period","type":"uint32"},{"internalType":"uint72","name":"value","type":"uint72"},{"internalType":"uint40","name":"demurrage","type":"uint40"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_minter","type":"address"}],"name":"removeMinter","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_sinkAddress","type":"address"}],"name":"setSinkAddress","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"sinkAddress","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes4","name":"_sum","type":"bytes4"}],"name":"supportsInterface","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"pure","type":"function"},{"inputs":[],"name":"symbol","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"taxLevel","outputs":[{"internalType":"int128","name":"","type":"int128"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"_value","type":"uint256"}],"name":"toBaseAmount","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"_participants","type":"uint256"},{"internalType":"uint256","name":"_demurrageModifierPpm","type":"uint256"},{"internalType":"uint256","name":"_value","type":"uint256"},{"internalType":"uint256","name":"_period","type":"uint256"}],"name":"toRedistribution","outputs":[{"components":[{"internalType":"uint32","name":"period","type":"uint32"},{"internalType":"uint72","name":"value","type":"uint72"},{"internalType":"uint40","name":"demurrage","type":"uint40"}],"internalType":"struct DemurrageTokenSingleCap.redistributionItem","name":"","type":"tuple"}],"stateMutability":"pure","type":"function"},{"inputs":[{"components":[{"internalType":"uint32","name":"period","type":"uint32"},{"internalType":"uint72","name":"value","type":"uint72"},{"internalType":"uint40","name":"demurrage","type":"uint40"}],"internalType":"struct DemurrageTokenSingleCap.redistributionItem","name":"_redistribution","type":"tuple"}],"name":"toRedistributionDemurrageModifier","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"pure","type":"function"},{"inputs":[{"components":[{"internalType":"uint32","name":"period","type":"uint32"},{"internalType":"uint72","name":"value","type":"uint72"},{"internalType":"uint40","name":"demurrage","type":"uint40"}],"internalType":"struct DemurrageTokenSingleCap.redistributionItem","name":"_redistribution","type":"tuple"}],"name":"toRedistributionPeriod","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"pure","type":"function"},{"inputs":[{"components":[{"internalType":"uint32","name":"period","type":"uint32"},{"internalType":"uint72","name":"value","type":"uint72"},{"internalType":"uint40","name":"demurrage","type":"uint40"}],"internalType":"struct DemurrageTokenSingleCap.redistributionItem","name":"_redistribution","type":"tuple"}],"name":"toRedistributionSupply","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"pure","type":"function"},{"inputs":[],"name":"totalBurned","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"totalSink","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"totalSupply","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_newOwner","type":"address"}],"name":"transferOwnership","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"}]
+[{"inputs":[{"internalType":"string","name":"_name","type":"string"},{"internalType":"string","name":"_symbol","type":"string"},{"internalType":"uint8","name":"_decimals","type":"uint8"},{"internalType":"int128","name":"_taxLevel","type":"int128"},{"internalType":"uint256","name":"_periodMinutes","type":"uint256"},{"internalType":"address","name":"_defaultSinkAddress","type":"address"}],"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"_owner","type":"address"},{"indexed":true,"internalType":"address","name":"_spender","type":"address"},{"indexed":false,"internalType":"uint256","name":"_value","type":"uint256"}],"name":"Approval","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"_burner","type":"address"},{"indexed":false,"internalType":"uint256","name":"_value","type":"uint256"}],"name":"Burn","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"bytes32","name":"_foo","type":"bytes32"}],"name":"Debug","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"uint256","name":"_period","type":"uint256"},{"indexed":true,"internalType":"uint256","name":"_periodCount","type":"uint256"},{"indexed":true,"internalType":"int128","name":"_oldAmount","type":"int128"},{"indexed":false,"internalType":"int128","name":"_newAmount","type":"int128"}],"name":"Decayed","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"_minter","type":"address"},{"indexed":true,"internalType":"address","name":"_beneficiary","type":"address"},{"indexed":false,"internalType":"uint256","name":"_value","type":"uint256"}],"name":"Mint","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"previousOwner","type":"address"},{"indexed":true,"internalType":"address","name":"newOwner","type":"address"}],"name":"OwnershipTransferred","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"uint256","name":"_period","type":"uint256"}],"name":"Period","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"_account","type":"address"},{"indexed":true,"internalType":"uint256","name":"_period","type":"uint256"},{"indexed":false,"internalType":"uint256","name":"_value","type":"uint256"}],"name":"Redistribution","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"_from","type":"address"},{"indexed":true,"internalType":"address","name":"_to","type":"address"},{"indexed":false,"internalType":"uint256","name":"_value","type":"uint256"}],"name":"Transfer","type":"event"},{"inputs":[],"name":"acceptOwnership","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"actualPeriod","outputs":[{"internalType":"uint128","name":"","type":"uint128"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_minter","type":"address"}],"name":"addMinter","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"applyDemurrage","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint256","name":"_rounds","type":"uint256"}],"name":"applyDemurrageLimited","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_account","type":"address"}],"name":"balanceOf","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_account","type":"address"}],"name":"baseBalanceOf","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"_value","type":"uint256"}],"name":"burn","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"burned","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"changePeriod","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint256","name":"_value","type":"uint256"},{"internalType":"uint256","name":"_period","type":"uint256"}],"name":"decayBy","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"decimals","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"demurrageAmount","outputs":[{"internalType":"int128","name":"","type":"int128"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"_target","type":"uint256"}],"name":"demurrageCycles","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"demurrageTimestamp","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"_lastTimestamp","type":"uint256"}],"name":"getMinutesDelta","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"_periodCount","type":"uint256"}],"name":"getPeriodTimeDelta","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"components":[{"internalType":"uint32","name":"period","type":"uint32"},{"internalType":"uint72","name":"value","type":"uint72"},{"internalType":"uint40","name":"demurrage","type":"uint40"}],"internalType":"struct DemurrageTokenSingleCap.redistributionItem","name":"_redistribution","type":"tuple"}],"name":"isEmptyRedistribution","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"pure","type":"function"},{"inputs":[],"name":"lastPeriod","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_beneficiary","type":"address"},{"internalType":"uint256","name":"_amount","type":"uint256"}],"name":"mintTo","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"name","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"owner","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"periodDuration","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"periodStart","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"redistributionCount","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"","type":"uint256"}],"name":"redistributions","outputs":[{"internalType":"uint32","name":"period","type":"uint32"},{"internalType":"uint72","name":"value","type":"uint72"},{"internalType":"uint40","name":"demurrage","type":"uint40"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_minter","type":"address"}],"name":"removeMinter","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_sinkAddress","type":"address"}],"name":"setSinkAddress","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"sinkAddress","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes4","name":"_sum","type":"bytes4"}],"name":"supportsInterface","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"pure","type":"function"},{"inputs":[],"name":"symbol","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"taxLevel","outputs":[{"internalType":"int128","name":"","type":"int128"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"_value","type":"uint256"}],"name":"toBaseAmount","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"_participants","type":"uint256"},{"internalType":"uint256","name":"_demurrageModifierPpm","type":"uint256"},{"internalType":"uint256","name":"_value","type":"uint256"},{"internalType":"uint256","name":"_period","type":"uint256"}],"name":"toRedistribution","outputs":[{"components":[{"internalType":"uint32","name":"period","type":"uint32"},{"internalType":"uint72","name":"value","type":"uint72"},{"internalType":"uint40","name":"demurrage","type":"uint40"}],"internalType":"struct DemurrageTokenSingleCap.redistributionItem","name":"","type":"tuple"}],"stateMutability":"pure","type":"function"},{"inputs":[{"components":[{"internalType":"uint32","name":"period","type":"uint32"},{"internalType":"uint72","name":"value","type":"uint72"},{"internalType":"uint40","name":"demurrage","type":"uint40"}],"internalType":"struct DemurrageTokenSingleCap.redistributionItem","name":"_redistribution","type":"tuple"}],"name":"toRedistributionDemurrageModifier","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"pure","type":"function"},{"inputs":[{"components":[{"internalType":"uint32","name":"period","type":"uint32"},{"internalType":"uint72","name":"value","type":"uint72"},{"internalType":"uint40","name":"demurrage","type":"uint40"}],"internalType":"struct DemurrageTokenSingleCap.redistributionItem","name":"_redistribution","type":"tuple"}],"name":"toRedistributionPeriod","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"pure","type":"function"},{"inputs":[{"components":[{"internalType":"uint32","name":"period","type":"uint32"},{"internalType":"uint72","name":"value","type":"uint72"},{"internalType":"uint40","name":"demurrage","type":"uint40"}],"internalType":"struct DemurrageTokenSingleCap.redistributionItem","name":"_redistribution","type":"tuple"}],"name":"toRedistributionSupply","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"pure","type":"function"},{"inputs":[],"name":"totalBurned","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"totalSink","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"totalSupply","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_newOwner","type":"address"}],"name":"transferOwnership","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"}]
diff --git a/python/erc20_demurrage_token/token.py b/python/erc20_demurrage_token/token.py
@@ -24,6 +24,7 @@ from hexathon import (
# local imports
from erc20_demurrage_token.data import data_dir
+from erc20_demurrage_token.fixed import from_fixed
logg = logging.getLogger(__name__)
@@ -100,7 +101,8 @@ class DemurrageToken(ERC20):
@staticmethod
def abi(multi=True, cap=False):
- name = DemurrageToken.__to_contract_name(multi, cap)
+ #name = DemurrageToken.__to_contract_name(multi, cap)
+ name = 'DemurrageTokenSingleNocap'
if DemurrageToken.__abi.get(name) == None:
f = open(os.path.join(data_dir, name + '.json'), 'r')
DemurrageToken.__abi[name] = json.load(f)
@@ -110,7 +112,8 @@ class DemurrageToken(ERC20):
@staticmethod
def bytecode(multi=True, cap=False):
- name = DemurrageToken.__to_contract_name(multi, cap)
+ #name = DemurrageToken.__to_contract_name(multi, cap)
+ name = 'DemurrageTokenSingleNocap'
if DemurrageToken.__bytecode.get(name) == None:
f = open(os.path.join(data_dir, name + '.bin'), 'r')
DemurrageToken.__bytecode[name] = f.read()
@@ -561,7 +564,8 @@ class DemurrageToken(ERC20):
@classmethod
def parse_demurrage_amount(self, v):
- return abi_decode_single(ABIContractType.UINT256, v)
+ # return abi_decode_single(ABIContractType.UINT256, v)
+ return from_fixed(v)
@classmethod
diff --git a/python/erc20_demurrage_token/unittest/newbase.py b/python/erc20_demurrage_token/unittest/newbase.py
@@ -1,6 +1,7 @@
# standard imports
import logging
import os
+import math
# external imports
from chainlib.eth.unittest.ethtester import EthTesterCase
@@ -19,6 +20,10 @@ from erc20_demurrage_token import (
DemurrageTokenSettings,
DemurrageToken,
)
+from erc20_demurrage_token.fixed import (
+ to_fixed,
+ from_fixed,
+ )
logg = logging.getLogger()
@@ -26,8 +31,7 @@ logg = logging.getLogger()
TAX_LEVEL = int(10000 * 2) # 2%
# calc "1-(0.98)^(1/518400)" <- 518400 = 30 days of blocks
# 0.00000003897127107225
-#PERIOD = int(60/BLOCKTIME) * 60 * 24 * 30 # month
-PERIOD = 10
+PERIOD = 43200
class TestTokenDeploy:
@@ -41,7 +45,8 @@ class TestTokenDeploy:
self.settings.name = token_name
self.settings.symbol = token_symbol
self.settings.decimals = 6
- self.settings.demurrage_level = tax_level ** (1 / period)
+ tax_level_input = to_fixed((1 - (tax_level / 1000000)) ** (1 / period))
+ self.settings.demurrage_level = tax_level_input
self.settings.period_minutes = period
self.settings.sink_address = sink_address
self.sink_address = self.settings.sink_address
@@ -59,11 +64,10 @@ class TestTokenDeploy:
self.start_time = int(r['timestamp'])
self.default_supply = supply
- #self.default_supply_cap = int(self.default_supply * 10)
self.default_supply_cap = 0
- def deploy(self, rpc, deployer_address, interface, mode, supply_cap=0):
+ def deploy(self, rpc, deployer_address, interface, supply_cap=0):
tx_hash = None
o = None
(tx_hash, o) = interface.constructor(deployer_address, self.settings, redistribute=False, cap=0)
@@ -100,7 +104,7 @@ class TestDemurrage(EthTesterCase):
def deploy(self, interface):
- self.address = self.deployer.deploy(self.rpc, self.accounts[0], interface, mode, supply_cap=self.default_supply_cap)
+ self.address = self.deployer.deploy(self.rpc, self.accounts[0], interface, supply_cap=self.default_supply_cap)
self.start_block = self.deployer.start_block
self.start_time = self.deployer.start_time
self.tax_level = self.deployer.tax_level
@@ -117,6 +121,12 @@ class TestDemurrage(EthTesterCase):
logg.debug('asserted within lower {} <= {} <= {}'.format(lower_target, v, target))
+ def assert_equal_decimals(self, v, target, precision):
+ target = int(target * (10 ** precision))
+ target = target / (10 ** precision)
+ self.assertEqual(v, target)
+
+
def tearDown(self):
pass
@@ -130,5 +140,3 @@ class TestDemurrageDefault(TestDemurrage):
c = DemurrageToken(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle)
self.deploy(c)
-
- logg.info('deployed with mode {}'.format(self.mode))
diff --git a/python/tests/test_basic.py b/python/tests/test_basic.py
@@ -18,7 +18,7 @@ from chainlib.eth.block import (
from erc20_demurrage_token import DemurrageToken
# test imports
-from erc20_demurrage_token.unittest.base import TestDemurrageDefault
+from erc20_demurrage_token.unittest import TestDemurrageDefault
logging.basicConfig(level=logging.DEBUG)
logg = logging.getLogger()
@@ -55,7 +55,8 @@ class TestBasic(TestDemurrageDefault):
def test_apply_demurrage_limited(self):
- modifier = (10 ** 28)
+ #modifier = (10 ** 28)
+ modifier = 1
nonce_oracle = RPCNonceOracle(self.accounts[0], self.rpc)
c = DemurrageToken(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle)
@@ -65,8 +66,8 @@ class TestBasic(TestDemurrageDefault):
demurrage_amount = c.parse_demurrage_amount(r)
self.assertEqual(modifier, demurrage_amount)
- self.backend.time_travel(self.start_time + 120)
- (tx_hash, o) = c.apply_demurrage(self.address, sender_address=self.accounts[0], limit=1)
+ self.backend.time_travel(self.start_time + (60 * 43200))
+ (tx_hash, o) = c.apply_demurrage(self.address, sender_address=self.accounts[0], limit=20000)
r = self.rpc.do(o)
o = receipt(tx_hash)
r = self.rpc.do(o)
@@ -75,13 +76,12 @@ class TestBasic(TestDemurrageDefault):
o = c.demurrage_amount(self.address, sender_address=self.accounts[0])
r = self.rpc.do(o)
demurrage_amount = c.parse_demurrage_amount(r)
- modifier_base = 1000000 - self.tax_level
- modifier = int(modifier_base * (10 ** 22)) # 38 decimal places minus 6 (1000000)
- self.assertEqual(modifier, demurrage_amount)
+ self.assert_equal_decimals(0.9906, demurrage_amount, 4)
def test_apply_demurrage(self):
- modifier = (10 ** 28)
+ #modifier = (10 ** 28)
+ modifier = 1
nonce_oracle = RPCNonceOracle(self.accounts[0], self.rpc)
c = DemurrageToken(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle)
@@ -97,7 +97,7 @@ class TestBasic(TestDemurrageDefault):
b = self.rpc.do(o)
logg.debug('block {} start {}'.format(b['timestamp'], self.start_time))
- self.backend.time_travel(self.start_time + 2)
+ self.backend.time_travel(self.start_time + (60 * 43200))
(tx_hash, o) = c.apply_demurrage(self.address, sender_address=self.accounts[0])
r = self.rpc.do(o)
o = receipt(tx_hash)
@@ -107,9 +107,9 @@ class TestBasic(TestDemurrageDefault):
o = c.demurrage_amount(self.address, sender_address=self.accounts[0])
r = self.rpc.do(o)
demurrage_amount = c.parse_demurrage_amount(r)
- self.assertEqual(modifier, demurrage_amount)
+ self.assert_equal_decimals(0.98, demurrage_amount, 2)
- self.backend.time_travel(self.start_time + 61)
+ self.backend.time_travel(self.start_time + (60 * 43200 * 2))
(tx_hash, o) = c.apply_demurrage(self.address, sender_address=self.accounts[0])
r = self.rpc.do(o)
o = receipt(tx_hash)
@@ -120,28 +120,10 @@ class TestBasic(TestDemurrageDefault):
demurrage_amount = c.parse_demurrage_amount(r)
modifier_base = 1000000 - self.tax_level
modifier = int(modifier_base * (10 ** 22)) # 38 decimal places minus 6 (1000000)
- self.assertEqual(modifier, demurrage_amount)
-
- self.backend.time_travel(self.start_time + 601)
- (tx_hash, o) = c.apply_demurrage(self.address, sender_address=self.accounts[0])
- r = self.rpc.do(o)
- o = receipt(tx_hash)
- r = self.rpc.do(o)
- self.assertEqual(r['status'], 1)
- o = c.demurrage_amount(self.address, sender_address=self.accounts[0])
- r = self.rpc.do(o)
- demurrage_amount = c.parse_demurrage_amount(r)
- modifier_base = ((1000000 - self.tax_level) / 1000000) ** 10
- logg.warning('mod base {}'.format(modifier_base))
- modifier = int(modifier_base * (10 ** 12))
-
- rounding_tolerance_nano = 4000000 # 0.000004% precision
- demurrage_amount_truncate = int(demurrage_amount / (10 ** 16)) # equals 38 decimal places - 14 for the modifier magniture - 2 for percent int calc + 6 for token decimals <- TODO verify this calc
- self.assertGreaterEqual(modifier, demurrage_amount_truncate - rounding_tolerance_nano)
- self.assertLessEqual(modifier, demurrage_amount_truncate)
+ self.assert_equal_decimals(0.9604, demurrage_amount, 4)
- def test_mint(self):
+ def test_mint_balance(self):
nonce_oracle = RPCNonceOracle(self.accounts[0], self.rpc)
c = DemurrageToken(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle)
(tx_hash, o) = c.mint_to(self.address, self.accounts[0], self.accounts[1], 1024)
@@ -160,16 +142,19 @@ class TestBasic(TestDemurrageDefault):
o = receipt(tx_hash)
r = self.rpc.do(o)
self.assertEqual(r['status'], 1)
-
o = c.balance_of(self.address, self.accounts[1], sender_address=self.accounts[0])
r = self.rpc.do(o)
balance = c.parse_balance_of(r)
self.assertEqual(balance, 2000)
- self.backend.time_travel(self.start_time + 61)
+ self.backend.time_travel(self.start_time + (60 * 43200))
(tx_hash, o) = c.apply_demurrage(self.address, sender_address=self.accounts[0])
r = self.rpc.do(o)
+ o = receipt(tx_hash)
+ r = self.rpc.do(o)
+ self.assertEqual(r['status'], 1)
+
o = c.balance_of(self.address, self.accounts[1], sender_address=self.accounts[0])
r = self.rpc.do(o)
balance = c.parse_balance_of(r)
diff --git a/solidity/DemurrageTokenSingleNocap.sol b/solidity/DemurrageTokenSingleNocap.sol
@@ -90,7 +90,7 @@ contract DemurrageTokenSingleCap {
event Mint(address indexed _minter, address indexed _beneficiary, uint256 _value);
// New demurrage cache milestone calculated
- event Decayed(uint256 indexed _period, uint256 indexed _periodCount, uint256 indexed _oldAmount, uint256 _newAmount);
+ event Decayed(uint256 indexed _period, uint256 indexed _periodCount, int128 indexed _oldAmount, int128 _newAmount);
// When a new period threshold has been crossed
event Period(uint256 _period);
@@ -214,6 +214,10 @@ contract DemurrageTokenSingleCap {
return true;
}
+ function changePeriod() public {
+ applyDemurrage();
+ }
+
// Creates new tokens out of thin air, and allocates them to the given address
// Triggers tax
function mintTo(address _beneficiary, uint256 _amount) external returns (bool) {
@@ -221,7 +225,7 @@ contract DemurrageTokenSingleCap {
require(minter[msg.sender], 'ERR_ACCESS');
- //changePeriod();
+ changePeriod();
baseAmount = toBaseAmount(_amount);
supply += _amount;
increaseBaseBalance(_beneficiary, baseAmount);
@@ -328,33 +332,38 @@ contract DemurrageTokenSingleCap {
return (block.timestamp - _lastTimestamp) / 60;
}
-// // Calculate and cache the demurrage value corresponding to the (period of the) time of the method call
-// function applyDemurrage() public returns (bool) {
-// return applyDemurrageLimited(0);
-// }
-//
-// function applyDemurrageLimited(uint256 _rounds) public returns (bool) {
-// uint256 periodCount;
-// uint256 lastDemurrageAmount;
-//
-// periodCount = getMinutesDelta(demurrageTimestamp);
-// if (periodCount == 0) {
-// return false;
-// }
-// lastDemurrageAmount = demurrageAmount;
-//
-// // safety limit for exponential calculation to ensure that we can always
-// // execute this code no matter how much time passes.
-// if (_rounds > 0 && _rounds < periodCount) {
-// periodCount = _rounds;
-// }
-//
-// demurrageAmount = uint128(decayBy(lastDemurrageAmount, periodCount));
-// //demurragePeriod = epochPeriodCount;
-// demurrageTimestamp = demurrageTimestamp + (periodCount * 60);
-// emit Decayed(demurrageTimestamp, periodCount, lastDemurrageAmount, demurrageAmount);
-// return true;
-// }
+ // Calculate and cache the demurrage value corresponding to the (period of the) time of the method call
+ function applyDemurrage() public returns (uint256) {
+ return applyDemurrageLimited(0);
+ }
+
+ function applyDemurrageLimited(uint256 _rounds) public returns (uint256) {
+ int128 v;
+ uint256 periodCount;
+ int128 periodPoint;
+ int128 lastDemurrageAmount;
+
+ periodCount = getMinutesDelta(demurrageTimestamp);
+ if (periodCount == 0) {
+ return 0;
+ }
+ lastDemurrageAmount = demurrageAmount;
+
+ // safety limit for exponential calculation to ensure that we can always
+ // execute this code no matter how much time passes.
+ if (_rounds > 0 && _rounds < periodCount) {
+ periodCount = _rounds;
+ }
+
+ periodPoint = ABDKMath64x64.fromUInt(periodCount);
+ v = ABDKMath64x64.mul(taxLevel, periodPoint);
+ v = ABDKMath64x64.exp(v);
+
+ demurrageAmount = ABDKMath64x64.mul(demurrageAmount, v);
+ demurrageTimestamp = demurrageTimestamp + (periodCount * 60);
+ emit Decayed(demurrageTimestamp, periodCount, lastDemurrageAmount, demurrageAmount);
+ return periodCount;
+ }
// Return timestamp of start of period threshold
function getPeriodTimeDelta(uint256 _periodCount) public view returns (uint256) {
@@ -436,8 +445,6 @@ contract DemurrageTokenSingleCap {
valuePoint = ABDKMath64x64.fromUInt(_value);
periodPoint = ABDKMath64x64.fromUInt(_period);
- //valuePoint -= ABDKMath64x64.mul(ABDKMath64x64.exp(ABDKMath64x64.mul(taxLevel, periodPoint)), valuePoint);
- //valuePoint -= ABDKMath64x64.exp(ABDKMath64x64.mul(taxLevel, periodPoint));
v = ABDKMath64x64.mul(taxLevel, periodPoint);
v = ABDKMath64x64.exp(v);
v = ABDKMath64x64.mul(valuePoint, v);
