diff --git a/python/erc20_demurrage_token/data/DemurrageTokenSingleNocap.bin b/python/erc20_demurrage_token/data/DemurrageTokenSingleNocap.bin index 355cffc..5b63a78 100644 --- a/python/erc20_demurrage_token/data/DemurrageTokenSingleNocap.bin +++ b/python/erc20_demurrage_token/data/DemurrageTokenSingleNocap.bin @@ -1 +1 @@ -61010060405264e8d4a510006a52b7d2dcc80cd2e400000062000023919062000349565b6080908152503480156200003657600080fd5b5060405162003df438038062003df483398181016040528101906200005c919062000648565b33600460006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506001600d6000600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff021916908315150217905550856006908162000128919062000969565b5084600790816200013a919062000969565b508360ff166008819055504260038190555060035460a08181525050603c8262000165919062000349565b60c0818152505060646a52b7d2dcc80cd2e400000062000186919062000a50565b600260006101000a8154816fffffffffffffffffffffffffffffffff02191690836fffffffffffffffffffffffffffffffff160217905550826fffffffffffffffffffffffffffffffff1660e0818152505060006200022a6000600260009054906101000a90046fffffffffffffffffffffffffffffffff166fffffffffffffffffffffffffffffffff1660006001620002a3640100000000026401000000009004565b9050600081908060018154018082558091505060019003906000526020600020016000909190919091505581600f60006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505050505050505062000a96565b6000807affffffffffffffffffffffffffff00000000000000000000000000606860ff16869060020a0216600102811790506cffffffffffffffffff00000000602060ff16859060020a02166001028117905063ffffffff83166001028117905080915050949350505050565b6000819050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b6000620003568262000310565b9150620003638362000310565b9250828202620003738162000310565b915082820484148315176200038d576200038c6200031a565b5b5092915050565b6000604051905090565b600080fd5b600080fd5b600080fd5b600080fd5b6000601f19601f8301169050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b620003fd82620003b2565b810181811067ffffffffffffffff821117156200041f576200041e620003c3565b5b80604052505050565b60006200043462000394565b9050620004428282620003f2565b919050565b600067ffffffffffffffff821115620004655762000464620003c3565b5b6200047082620003b2565b9050602081019050919050565b60005b838110156200049d57808201518184015260208101905062000480565b60008484015250505050565b6000620004c0620004ba8462000447565b62000428565b905082815260208101848484011115620004df57620004de620003ad565b5b620004ec8482856200047d565b509392505050565b600082601f8301126200050c576200050b620003a8565b5b81516200051e848260208601620004a9565b91505092915050565b600060ff82169050919050565b6200053f8162000527565b81146200054b57600080fd5b50565b6000815190506200055f8162000534565b92915050565b60006fffffffffffffffffffffffffffffffff82169050919050565b6200058c8162000565565b81146200059857600080fd5b50565b600081519050620005ac8162000581565b92915050565b620005bd8162000310565b8114620005c957600080fd5b50565b600081519050620005dd81620005b2565b92915050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60006200061082620005e3565b9050919050565b620006228162000603565b81146200062e57600080fd5b50565b600081519050620006428162000617565b92915050565b60008060008060008060c087890312156200066857620006676200039e565b5b600087015167ffffffffffffffff811115620006895762000688620003a3565b5b6200069789828a01620004f4565b965050602087015167ffffffffffffffff811115620006bb57620006ba620003a3565b5b620006c989828a01620004f4565b9550506040620006dc89828a016200054e565b9450506060620006ef89828a016200059b565b93505060806200070289828a01620005cc565b92505060a06200071589828a0162000631565b9150509295509295509295565b600081519050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b600060028204905060018216806200077557607f821691505b6020821081036200078b576200078a6200072d565b5b50919050565b60008190508160005260206000209050919050565b60006020601f8301049050919050565b60008160020a8302905092915050565b600060088302620007f87fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff82620007b6565b620008048683620007b6565b95508019841693508086168417925050509392505050565b6000819050919050565b600062000847620008416200083b8462000310565b6200081c565b62000310565b9050919050565b6000819050919050565b620008638362000826565b6200087b62000872826200084e565b848454620007c6565b825550505050565b600090565b6200089262000883565b6200089f81848462000858565b505050565b5b81811015620008c757620008bb60008262000888565b600181019050620008a5565b5050565b601f8211156200091657620008e08162000791565b620008eb84620007a6565b81016020851015620008fb578190505b620009136200090a85620007a6565b830182620008a4565b50505b505050565b60008160020a8304905092915050565b60006200093e600019846008026200091b565b1980831691505092915050565b60006200095983836200092b565b9150826002028217905092915050565b620009748262000722565b67ffffffffffffffff81111562000990576200098f620003c3565b5b6200099c82546200075c565b620009a9828285620008cb565b600060209050601f831160018114620009e15760008415620009cc578287015190505b620009d885826200094b565b86555062000a48565b601f198416620009f18662000791565b60005b8281101562000a1b57848901518255600182019150602085019450602081019050620009f4565b8683101562000a3b578489015162000a37601f8916826200092b565b8355505b6001600288020188555050505b505050505050565b600062000a5d8262000565565b915062000a6a8362000565565b925082820262000a7a8162000565565b915080821462000a8f5762000a8e6200031a565b5b5092915050565b60805160a05160c05160e0516132de62000b1660003960008181610eb70152818161119a015261235c0152600081816116ae01528181611caa015281816121c301526123fb0152600081816116da0152818161241c01526124610152600081816117470152818161177f015281816117f7015261219f01526132de6000f3fe608060405234801561001057600080fd5b50600436106102d8576000357c010000000000000000000000000000000000000000000000000000000090048063731f237c1161019f578063a457c2d711610106578063d89135cd116100bf578063e809529511610099578063e8095295146109cf578063eda4e6d6146109ed578063f2fde38b14610a0b578063f83da35d14610a3b576102d8565b8063d89135cd14610951578063e3ab207a1461096f578063e54d63f71461099f576102d8565b8063a457c2d714610867578063a9059cbb14610897578063ab28cea0146108c7578063b470aade146108e5578063c0ab707714610903578063d340ef8a14610933576102d8565b80638da5cb5b116101585780638da5cb5b146107915780638f0b2d5d146107af5780638f1df6bc146107cb57806395d89b41146107e9578063983b2d56146108075780639da7d8ba14610837576102d8565b8063731f237c146106cb57806373f42561146106e957806374bedb951461070757806379ba50971461072557806384dde4af146107435780638d34855a14610761576102d8565b806340452d911161024357806358b2833b116101fc57806358b2833b146105bd5780636721d4ef146105db5780636787a9be1461060b5780636a2d094e1461063b5780636ffa8a051461066b57806370a082311461069b576102d8565b806340452d91146104b157806342966c68146104e1578063449a52f8146104fd57806347a505171461052d5780634abfbba21461055d57806351b4541c1461058d576102d8565b8063229ba19711610295578063229ba197146103b557806323b872dd146103d35780633092afd5146104035780633133348714610433578063313ce567146104635780633950935114610481576102d8565b806301ffc9a7146102dd57806306fdde031461030d578063095ea7b31461032b57806309f28f3c1461035b57806318160ddd146103795780631989c6a814610397575b600080fd5b6102f760048036038101906102f29190612a04565b610a6b565b6040516103049190612a4c565b60405180910390f35b610315610c11565b6040516103229190612af7565b60405180910390f35b61034560048036038101906103409190612bad565b610c9f565b6040516103529190612a4c565b60405180910390f35b610363610e70565b6040516103709190612c18565b60405180910390f35b610381610e92565b60405161038e9190612c42565b60405180910390f35b61039f610ea9565b6040516103ac9190612c42565b60405180910390f35b6103bd610eb5565b6040516103ca9190612c42565b60405180910390f35b6103ed60048036038101906103e89190612c5d565b610ed9565b6040516103fa9190612a4c565b60405180910390f35b61041d60048036038101906104189190612cb0565b61108c565b60405161042a9190612a4c565b60405180910390f35b61044d60048036038101906104489190612cdd565b61117f565b60405161045a9190612c42565b60405180910390f35b61046b611233565b6040516104789190612c42565b60405180910390f35b61049b60048036038101906104969190612bad565b611239565b6040516104a89190612a4c565b60405180910390f35b6104cb60048036038101906104c69190612d1d565b6113cf565b6040516104d89190612d63565b60405180910390f35b6104fb60048036038101906104f69190612d1d565b6113f3565b005b61051760048036038101906105129190612bad565b611521565b6040516105249190612a4c565b60405180910390f35b61054760048036038101906105429190612cb0565b611661565b6040516105549190612c42565b60405180910390f35b61057760048036038101906105729190612d1d565b6116aa565b6040516105849190612c42565b60405180910390f35b6105a760048036038101906105a29190612d1d565b61170a565b6040516105b49190612c42565b60405180910390f35b6105c561172b565b6040516105d29190612c42565b60405180910390f35b6105f560048036038101906105f09190612cdd565b611731565b6040516106029190612c42565b60405180910390f35b61062560048036038101906106209190612d1d565b6117b2565b6040516106329190612c42565b60405180910390f35b61065560048036038101906106509190612d1d565b611832565b6040516106629190612c42565b60405180910390f35b61068560048036038101906106809190612daa565b611853565b6040516106929190612c42565b60405180910390f35b6106b560048036038101906106b09190612cb0565b61188d565b6040516106c29190612c42565b60405180910390f35b6106d3611945565b6040516106e09190612a4c565b60405180910390f35b6106f1611956565b6040516106fe9190612c42565b60405180910390f35b61070f61195c565b60405161071c9190612c42565b60405180910390f35b61072d611962565b60405161073a9190612a4c565b60405180910390f35b61074b611b09565b6040516107589190612de6565b60405180910390f35b61077b60048036038101906107769190612daa565b611b2f565b6040516107889190612c42565b60405180910390f35b610799611b5d565b6040516107a69190612de6565b60405180910390f35b6107c960048036038101906107c49190612cb0565b611b83565b005b6107d3611c21565b6040516107e09190612a4c565b60405180910390f35b6107f1611d71565b6040516107fe9190612af7565b60405180910390f35b610821600480360381019061081c9190612cb0565b611dff565b60405161082e9190612a4c565b60405180910390f35b610851600480360381019061084c9190612daa565b611ebc565b60405161085e9190612c42565b60405180910390f35b610881600480360381019061087c9190612bad565b611ee8565b60405161088e9190612a4c565b60405180910390f35b6108b160048036038101906108ac9190612bad565b612107565b6040516108be9190612a4c565b60405180910390f35b6108cf61219d565b6040516108dc9190612c42565b60405180910390f35b6108ed6121c1565b6040516108fa9190612c42565b60405180910390f35b61091d60048036038101906109189190612d1d565b6121e5565b60405161092a9190612a4c565b60405180910390f35b61093b61231d565b6040516109489190612c42565b60405180910390f35b610959612323565b6040516109669190612c42565b60405180910390f35b61098960048036038101906109849190612daa565b61232d565b6040516109969190612c42565b60405180910390f35b6109b960048036038101906109b49190612cdd565b612341565b6040516109c69190612c42565b60405180910390f35b6109d76123f5565b6040516109e49190612c18565b60405180910390f35b6109f561245f565b604051610a029190612c42565b60405180910390f35b610a256004803603810190610a209190612cb0565b612483565b604051610a329190612a4c565b60405180910390f35b610a556004803603810190610a509190612e01565b612525565b604051610a629190612d63565b60405180910390f35b600063c6bb4b707c010000000000000000000000000000000000000000000000000000000002827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff191603610abf5760019050610c0c565b63449a52f87c010000000000000000000000000000000000000000000000000000000002827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff191603610b115760019050610c0c565b6301ffc9a77c010000000000000000000000000000000000000000000000000000000002827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff191603610b635760019050610c0c565b639493f8b27c010000000000000000000000000000000000000000000000000000000002827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff191603610bb55760019050610c0c565b6337a47be47c010000000000000000000000000000000000000000000000000000000002827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff191603610c075760019050610c0c565b600090505b919050565b60068054610c1e90612e97565b80601f0160208091040260200160405190810160405280929190818152602001828054610c4a90612e97565b8015610c975780601f10610c6c57610100808354040283529160200191610c97565b820191906000526020600020905b815481529060010190602001808311610c7a57829003601f168201915b505050505081565b6000806000600e60003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541115610d6b5760008314610d6a576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610d6190612f14565b60405180910390fd5b5b610d73611c21565b50610d7d836117b2565b905080600e60003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508373ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b92585604051610e5d9190612c42565b60405180910390a3600191505092915050565b600260009054906101000a90046fffffffffffffffffffffffffffffffff1681565b6000600c54600954610ea49190612f63565b905090565b60008080549050905090565b7f000000000000000000000000000000000000000000000000000000000000000081565b6000806000610ee6611c21565b50610ef0846117b2565b915081600e60008873ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610f7b57600080fd5b81600e60008873ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008282546110079190612f63565b92505081905550611019868684612592565b90508473ffffffffffffffffffffffffffffffffffffffff168673ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef866040516110789190612c42565b60405180910390a380925050509392505050565b6000600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16148061111557503373ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff16145b61111e57600080fd5b6000600d60008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff02191690831515021790555060019050919050565b600080600064e8d4a5100091506a52b7d2dcc80cd2e40000007f00000000000000000000000000000000000000000000000000000000000000006111c39190612fc6565b905060005b8481101561120c5764e8d4a5100082846111e29190612ff7565b6111ec9190612fc6565b836111f79190612f63565b9250808061120490613039565b9150506111c8565b5064e8d4a51000858361121f9190612ff7565b6112299190612fc6565b9250505092915050565b60085481565b600080611244611c21565b5061124e836117b2565b905080600e60003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008282546112dc9190613081565b925050819055508373ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925600e60003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008873ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020546040516113bc9190612c42565b60405180910390a3600191505092915050565b600081815481106113df57600080fd5b906000526020600020016000915090505481565b600d60003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff1661144957600080fd5b600160003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205481111561149557600080fd5b60006114a0826117b2565b90506114aa611945565b506114b533826125b7565b5081600c60008282546114c89190613081565b925050819055503373ffffffffffffffffffffffffffffffffffffffff167fcc16f5dbb4873280815c1ee09dbd06736cffcc184412cf7a71a0fdb75d397ca5836040516115159190612c42565b60405180910390a25050565b600080600d60003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff166115b0576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016115a790613101565b60405180910390fd5b6115b8611c21565b506115c2836117b2565b905082600960008282546115d69190613081565b925050819055506115e784826126be565b508373ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fab8530f87dc9b59234c4623bf917212bb2536d647574c8e7e5da92c2ede0c9f8856040516116459190612c42565b60405180910390a3611655612782565b50600191505092915050565b6000600160008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020549050919050565b60007f0000000000000000000000000000000000000000000000000000000000000000826116d89190612ff7565b7f00000000000000000000000000000000000000000000000000000000000000006117039190613081565b9050919050565b6000603c824261171a9190612f63565b6117249190612fc6565b9050919050565b60035481565b6000806402540be400836117459190612ff7565b7f00000000000000000000000000000000000000000000000000000000000000006117709190612f63565b8461177b9190612ff7565b90507f0000000000000000000000000000000000000000000000000000000000000000816117a99190612fc6565b91505092915050565b60006402540be400600260009054906101000a90046fffffffffffffffffffffffffffffffff166117e39190613121565b6fffffffffffffffffffffffffffffffff167f0000000000000000000000000000000000000000000000000000000000000000836118219190612ff7565b61182b9190612fc6565b9050919050565b6000603c82426118429190612f63565b61184c9190612fc6565b9050919050565b6000606860ff167affffffffffffffffffffffffffff00000000000000000000000000836001900416908060020a82049150509050919050565b60008060008061189c85611661565b92506118a960035461170a565b90506118f56402540be400600260009054906101000a90046fffffffffffffffffffffffffffffffff166118dd9190613121565b6fffffffffffffffffffffffffffffffff168261117f565b6fffffffffffffffffffffffffffffffff16915064e8d4a510006a52b7d2dcc80cd2e40000006119259190612ff7565b82846119319190612ff7565b61193b9190612fc6565b9350505050919050565b600061195160006121e5565b905090565b600c5481565b600b5481565b600080600560009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16146119bf57600080fd5b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff169050600560009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16600460006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506000600560006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e060405160405180910390a35090565b600f60009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b6000806000611b3d84611ebc565b9150611b4884611853565b9050611b548282611731565b92505050919050565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614611bdd57600080fd5b80600f60006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050565b6000806000806000806000806000611c37611945565b50611c40612829565b975060006001028803611c5e57600098505050505050505050611d6e565b6000600a5481548110611c7457611c7361315e565b5b90600052602060002001549350611c8a8861232d565b9550600186611c999190613081565b9050611ca484611853565b9450603c7f0000000000000000000000000000000000000000000000000000000000000000611cd39190612fc6565b9150611cdf858361117f565b9250611cf5600084611cef610e92565b84612525565b96506000879080600181540180825580915050600190039060005260206000200160009091909190915055611d2987612915565b507f55d243082e019fce4009ccea5368b92e436c17586a1e793c7deda16df4e5d67581604051611d599190612c42565b60405180910390a16001985050505050505050505b90565b60078054611d7e90612e97565b80601f0160208091040260200160405190810160405280929190818152602001828054611daa90612e97565b8015611df75780601f10611dcc57610100808354040283529160200191611df7565b820191906000526020600020905b815481529060010190602001808311611dda57829003601f168201915b505050505081565b6000600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614611e5b57600080fd5b6001600d60008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff02191690831515021790555060019050919050565b6000602060ff166cffffffffffffffffff00000000836001900416908060020a82049150509050919050565b600080611ef4836117b2565b905080600e60003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015611f7f57600080fd5b611f87611c21565b5080600e60003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008282546120149190612f63565b925050819055508373ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925600e60003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008873ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020546040516120f49190612c42565b60405180910390a3600191505092915050565b6000806000612114611c21565b5061211e846117b2565b915061212b338684612592565b90508473ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef8660405161218a9190612c42565b60405180910390a3809250505092915050565b7f000000000000000000000000000000000000000000000000000000000000000081565b7f000000000000000000000000000000000000000000000000000000000000000081565b60008060006121f560035461170a565b91506000820361220a57600092505050612318565b600260009054906101000a90046fffffffffffffffffffffffffffffffff166fffffffffffffffffffffffffffffffff16905060008411801561224c57508184105b15612255578391505b61225f818361117f565b600260006101000a8154816fffffffffffffffffffffffffffffffff02191690836fffffffffffffffffffffffffffffffff160217905550603c826122a49190612ff7565b6003546122b19190613081565b60038190555080826003547fa0717e54e02bd9829db5e6e998aec0ae9de796b8d150a3cc46a92ab869697755600260009054906101000a90046fffffffffffffffffffffffffffffffff1660405161230991906131c8565b60405180910390a46001925050505b919050565b600a5481565b6000600c54905090565b600063ffffffff8260019004169050919050565b600080600064e8d4a5100091506a52b7d2dcc80cd2e40000007f00000000000000000000000000000000000000000000000000000000000000006123859190612fc6565b905060005b848110156123ce5764e8d4a5100082846123a49190612ff7565b6123ae9190612fc6565b836123b99190613081565b925080806123c690613039565b91505061238a565b5064e8d4a5100085836123e19190612ff7565b6123eb9190612fc6565b9250505092915050565b600060017f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000426124469190612f63565b6124509190612fc6565b61245a9190613081565b905090565b7f000000000000000000000000000000000000000000000000000000000000000081565b6000600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16146124df57600080fd5b81600560006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550919050565b6000807affffffffffffffffffffffffffff00000000000000000000000000606860ff16869060020a0216600102811790506cffffffffffffffffff00000000602060ff16859060020a02166001028117905063ffffffff83166001028117905080915050949350505050565b60008061259f85846125b7565b506125aa84846126be565b5060019150509392505050565b600080600080600160008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205490506000850361261357600093505050506126b8565b61261c86611661565b925084831015612661576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016126589061322f565b60405180910390fd5b848361266d9190612f63565b600160008873ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550600193505050505b92915050565b600080600080600160008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205490506000850361271a576000935050505061277c565b61272386611661565b925084836127319190613081565b600160008873ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550600193505050505b92915050565b600080600061278f610e92565b9050600060016000805490506127a59190612f63565b815481106127b6576127b561315e565b5b90600052602060002001546001900491506cffffffffffffffffff000000001982169150602060ff16819060020a028217915081600102600060016000805490506128019190612f63565b815481106128125761281161315e565b5b906000526020600020018190555060019250505090565b600080600080600a54815481106128435761284261315e565b5b906000526020600020015491503073ffffffffffffffffffffffffffffffffffffffff1663e80952956040518163ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401602060405180830381865afa1580156128b7573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906128db919061327b565b6fffffffffffffffffffffffffffffffff1690506128f88261232d565b811161290c57600060010292505050612912565b81925050505b90565b600080600061292384611b2f565b9150600b54612931836117b2565b61293b9190612f63565b9050612969600f60009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16826126be565b506001600a600082825461297d9190613081565b9250508190555080600b60008282546129969190613081565b925050819055508192505050919050565b600080fd5b60007fffffffff0000000000000000000000000000000000000000000000000000000082169050919050565b6129e1816129ac565b81146129ec57600080fd5b50565b6000813590506129fe816129d8565b92915050565b600060208284031215612a1a57612a196129a7565b5b6000612a28848285016129ef565b91505092915050565b60008115159050919050565b612a4681612a31565b82525050565b6000602082019050612a616000830184612a3d565b92915050565b600081519050919050565b600082825260208201905092915050565b60005b83811015612aa1578082015181840152602081019050612a86565b60008484015250505050565b6000601f19601f8301169050919050565b6000612ac982612a67565b612ad38185612a72565b9350612ae3818560208601612a83565b612aec81612aad565b840191505092915050565b60006020820190508181036000830152612b118184612abe565b905092915050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000612b4482612b19565b9050919050565b612b5481612b39565b8114612b5f57600080fd5b50565b600081359050612b7181612b4b565b92915050565b6000819050919050565b612b8a81612b77565b8114612b9557600080fd5b50565b600081359050612ba781612b81565b92915050565b60008060408385031215612bc457612bc36129a7565b5b6000612bd285828601612b62565b9250506020612be385828601612b98565b9150509250929050565b60006fffffffffffffffffffffffffffffffff82169050919050565b612c1281612bed565b82525050565b6000602082019050612c2d6000830184612c09565b92915050565b612c3c81612b77565b82525050565b6000602082019050612c576000830184612c33565b92915050565b600080600060608486031215612c7657612c756129a7565b5b6000612c8486828701612b62565b9350506020612c9586828701612b62565b9250506040612ca686828701612b98565b9150509250925092565b600060208284031215612cc657612cc56129a7565b5b6000612cd484828501612b62565b91505092915050565b60008060408385031215612cf457612cf36129a7565b5b6000612d0285828601612b98565b9250506020612d1385828601612b98565b9150509250929050565b600060208284031215612d3357612d326129a7565b5b6000612d4184828501612b98565b91505092915050565b6000819050919050565b612d5d81612d4a565b82525050565b6000602082019050612d786000830184612d54565b92915050565b612d8781612d4a565b8114612d9257600080fd5b50565b600081359050612da481612d7e565b92915050565b600060208284031215612dc057612dbf6129a7565b5b6000612dce84828501612d95565b91505092915050565b612de081612b39565b82525050565b6000602082019050612dfb6000830184612dd7565b92915050565b60008060008060808587031215612e1b57612e1a6129a7565b5b6000612e2987828801612b98565b9450506020612e3a87828801612b98565b9350506040612e4b87828801612b98565b9250506060612e5c87828801612b98565b91505092959194509250565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b60006002820490506001821680612eaf57607f821691505b602082108103612ec257612ec1612e68565b5b50919050565b7f5a45524f5f464952535400000000000000000000000000000000000000000000600082015250565b6000612efe600a83612a72565b9150612f0982612ec8565b602082019050919050565b60006020820190508181036000830152612f2d81612ef1565b9050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b6000612f6e82612b77565b9150612f7983612b77565b9250828203905081811115612f9157612f90612f34565b5b92915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601260045260246000fd5b6000612fd182612b77565b9150612fdc83612b77565b925082612fec57612feb612f97565b5b828204905092915050565b600061300282612b77565b915061300d83612b77565b925082820261301b81612b77565b9150828204841483151761303257613031612f34565b5b5092915050565b600061304482612b77565b91507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff820361307657613075612f34565b5b600182019050919050565b600061308c82612b77565b915061309783612b77565b92508282019050808211156130af576130ae612f34565b5b92915050565b7f4552525f41434345535300000000000000000000000000000000000000000000600082015250565b60006130eb600a83612a72565b91506130f6826130b5565b602082019050919050565b6000602082019050818103600083015261311a816130de565b9050919050565b600061312c82612bed565b915061313783612bed565b925082820261314581612bed565b915080821461315757613156612f34565b5b5092915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b6000819050919050565b60006131b26131ad6131a884612bed565b61318d565b612b77565b9050919050565b6131c281613197565b82525050565b60006020820190506131dd60008301846131b9565b92915050565b7f4552525f4f5645525350454e4400000000000000000000000000000000000000600082015250565b6000613219600d83612a72565b9150613224826131e3565b602082019050919050565b600060208201905081810360008301526132488161320c565b9050919050565b61325881612bed565b811461326357600080fd5b50565b6000815190506132758161324f565b92915050565b600060208284031215613291576132906129a7565b5b600061329f84828501613266565b9150509291505056fea2646970667358221220d498bcac54c9f0e4b63eea066f2ad30aea293661380ef849a31efc9b436e3eb064736f6c63430008110033 \ No newline at end of file +61010060405264e8d4a510006a52b7d2dcc80cd2e400000062000023919062000349565b6080908152503480156200003657600080fd5b50604051620042073803806200420783398181016040528101906200005c919062000648565b33600460006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506001600d6000600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff021916908315150217905550856006908162000128919062000969565b5084600790816200013a919062000969565b508360ff166008819055504260038190555060035460a08181525050603c8262000165919062000349565b60c0818152505060646a52b7d2dcc80cd2e400000062000186919062000a50565b600260006101000a8154816fffffffffffffffffffffffffffffffff02191690836fffffffffffffffffffffffffffffffff160217905550826fffffffffffffffffffffffffffffffff1660e0818152505060006200022a6000600260009054906101000a90046fffffffffffffffffffffffffffffffff166fffffffffffffffffffffffffffffffff1660006001620002a3640100000000026401000000009004565b9050600081908060018154018082558091505060019003906000526020600020016000909190919091505581600f60006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505050505050505062000a96565b6000807affffffffffffffffffffffffffff00000000000000000000000000606860ff16869060020a0216600102811790506cffffffffffffffffff00000000602060ff16859060020a02166001028117905063ffffffff83166001028117905080915050949350505050565b6000819050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b6000620003568262000310565b9150620003638362000310565b9250828202620003738162000310565b915082820484148315176200038d576200038c6200031a565b5b5092915050565b6000604051905090565b600080fd5b600080fd5b600080fd5b600080fd5b6000601f19601f8301169050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b620003fd82620003b2565b810181811067ffffffffffffffff821117156200041f576200041e620003c3565b5b80604052505050565b60006200043462000394565b9050620004428282620003f2565b919050565b600067ffffffffffffffff821115620004655762000464620003c3565b5b6200047082620003b2565b9050602081019050919050565b60005b838110156200049d57808201518184015260208101905062000480565b60008484015250505050565b6000620004c0620004ba8462000447565b62000428565b905082815260208101848484011115620004df57620004de620003ad565b5b620004ec8482856200047d565b509392505050565b600082601f8301126200050c576200050b620003a8565b5b81516200051e848260208601620004a9565b91505092915050565b600060ff82169050919050565b6200053f8162000527565b81146200054b57600080fd5b50565b6000815190506200055f8162000534565b92915050565b60006fffffffffffffffffffffffffffffffff82169050919050565b6200058c8162000565565b81146200059857600080fd5b50565b600081519050620005ac8162000581565b92915050565b620005bd8162000310565b8114620005c957600080fd5b50565b600081519050620005dd81620005b2565b92915050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60006200061082620005e3565b9050919050565b620006228162000603565b81146200062e57600080fd5b50565b600081519050620006428162000617565b92915050565b60008060008060008060c087890312156200066857620006676200039e565b5b600087015167ffffffffffffffff811115620006895762000688620003a3565b5b6200069789828a01620004f4565b965050602087015167ffffffffffffffff811115620006bb57620006ba620003a3565b5b620006c989828a01620004f4565b9550506040620006dc89828a016200054e565b9450506060620006ef89828a016200059b565b93505060806200070289828a01620005cc565b92505060a06200071589828a0162000631565b9150509295509295509295565b600081519050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b600060028204905060018216806200077557607f821691505b6020821081036200078b576200078a6200072d565b5b50919050565b60008190508160005260206000209050919050565b60006020601f8301049050919050565b60008160020a8302905092915050565b600060088302620007f87fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff82620007b6565b620008048683620007b6565b95508019841693508086168417925050509392505050565b6000819050919050565b600062000847620008416200083b8462000310565b6200081c565b62000310565b9050919050565b6000819050919050565b620008638362000826565b6200087b62000872826200084e565b848454620007c6565b825550505050565b600090565b6200089262000883565b6200089f81848462000858565b505050565b5b81811015620008c757620008bb60008262000888565b600181019050620008a5565b5050565b601f8211156200091657620008e08162000791565b620008eb84620007a6565b81016020851015620008fb578190505b620009136200090a85620007a6565b830182620008a4565b50505b505050565b60008160020a8304905092915050565b60006200093e600019846008026200091b565b1980831691505092915050565b60006200095983836200092b565b9150826002028217905092915050565b620009748262000722565b67ffffffffffffffff81111562000990576200098f620003c3565b5b6200099c82546200075c565b620009a9828285620008cb565b600060209050601f831160018114620009e15760008415620009cc578287015190505b620009d885826200094b565b86555062000a48565b601f198416620009f18662000791565b60005b8281101562000a1b57848901518255600182019150602085019450602081019050620009f4565b8683101562000a3b578489015162000a37601f8916826200092b565b8355505b6001600288020188555050505b505050505050565b600062000a5d8262000565565b915062000a6a8362000565565b925082820262000a7a8162000565565b915080821462000a8f5762000a8e6200031a565b5b5092915050565b60805160a05160c05160e0516136f162000b1660003960008181610f390152818161121c01526124a501526000818161177e01528181611df30152818161230c01526125440152600081816117aa0152818161256501526125aa0152600081816118170152818161184f015281816118c701526122e801526136f16000f3fe608060405234801561001057600080fd5b506004361061030e576000357c010000000000000000000000000000000000000000000000000000000090048063731f237c116101ba578063a9059cbb11610106578063e3ab207a116100bf578063eda4e6d611610099578063eda4e6d614610a53578063ee48a2fa14610a71578063f2fde38b14610a8d578063f83da35d14610abd5761030e565b8063e3ab207a146109d5578063e54d63f714610a05578063e809529514610a355761030e565b8063a9059cbb146108fd578063ab28cea01461092d578063b470aade1461094b578063c0ab707714610969578063d340ef8a14610999578063d89135cd146109b75761030e565b80638da5cb5b1161017357806395d89b411161014d57806395d89b411461084f578063983b2d561461086d5780639da7d8ba1461089d578063a457c2d7146108cd5761030e565b80638da5cb5b146107f75780638f0b2d5d146108155780638f1df6bc146108315761030e565b8063731f237c1461073157806373f425611461074f57806374bedb951461076d57806379ba50971461078b57806384dde4af146107a95780638d34855a146107c75761030e565b806340452d911161027957806358b2833b116102325780636a2d094e1161020c5780636a2d094e146106715780636d5055a6146106a15780636ffa8a05146106d157806370a08231146107015761030e565b806358b2833b146105f35780636721d4ef146106115780636787a9be146106415761030e565b806340452d91146104e757806342966c6814610517578063449a52f81461053357806347a50517146105635780634abfbba21461059357806351b4541c146105c35761030e565b8063229ba197116102cb578063229ba197146103eb57806323b872dd146104095780633092afd5146104395780633133348714610469578063313ce5671461049957806339509351146104b75761030e565b806301ffc9a71461031357806306fdde0314610343578063095ea7b31461036157806309f28f3c1461039157806318160ddd146103af5780631989c6a8146103cd575b600080fd5b61032d60048036038101906103289190612ce5565b610aed565b60405161033a9190612d2d565b60405180910390f35b61034b610c93565b6040516103589190612dd8565b60405180910390f35b61037b60048036038101906103769190612e8e565b610d21565b6040516103889190612d2d565b60405180910390f35b610399610ef2565b6040516103a69190612ef9565b60405180910390f35b6103b7610f14565b6040516103c49190612f23565b60405180910390f35b6103d5610f2b565b6040516103e29190612f23565b60405180910390f35b6103f3610f37565b6040516104009190612f23565b60405180910390f35b610423600480360381019061041e9190612f3e565b610f5b565b6040516104309190612d2d565b60405180910390f35b610453600480360381019061044e9190612f91565b61110e565b6040516104609190612d2d565b60405180910390f35b610483600480360381019061047e9190612fbe565b611201565b6040516104909190612f23565b60405180910390f35b6104a16112b5565b6040516104ae9190612f23565b60405180910390f35b6104d160048036038101906104cc9190612e8e565b6112bb565b6040516104de9190612d2d565b60405180910390f35b61050160048036038101906104fc9190612ffe565b611451565b60405161050e9190613044565b60405180910390f35b610531600480360381019061052c9190612ffe565b611475565b005b61054d60048036038101906105489190612e8e565b61156c565b60405161055a9190612d2d565b60405180910390f35b61057d60048036038101906105789190612f91565b6116ac565b60405161058a9190612f23565b60405180910390f35b6105ad60048036038101906105a89190612ffe565b61177a565b6040516105ba9190612f23565b60405180910390f35b6105dd60048036038101906105d89190612ffe565b6117da565b6040516105ea9190612f23565b60405180910390f35b6105fb6117fb565b6040516106089190612f23565b60405180910390f35b61062b60048036038101906106269190612fbe565b611801565b6040516106389190612f23565b60405180910390f35b61065b60048036038101906106569190612ffe565b611882565b6040516106689190612f23565b60405180910390f35b61068b60048036038101906106869190612ffe565b611902565b6040516106989190612f23565b60405180910390f35b6106bb60048036038101906106b69190612f91565b611923565b6040516106c89190612f23565b60405180910390f35b6106eb60048036038101906106e6919061308b565b61199c565b6040516106f89190612f23565b60405180910390f35b61071b60048036038101906107169190612f91565b6119d6565b6040516107289190612f23565b60405180910390f35b610739611a8e565b6040516107469190612d2d565b60405180910390f35b610757611a9f565b6040516107649190612f23565b60405180910390f35b610775611aa5565b6040516107829190612f23565b60405180910390f35b610793611aab565b6040516107a09190612d2d565b60405180910390f35b6107b1611c52565b6040516107be91906130c7565b60405180910390f35b6107e160048036038101906107dc919061308b565b611c78565b6040516107ee9190612f23565b60405180910390f35b6107ff611ca6565b60405161080c91906130c7565b60405180910390f35b61082f600480360381019061082a9190612f91565b611ccc565b005b610839611d6a565b6040516108469190612d2d565b60405180910390f35b610857611eba565b6040516108649190612dd8565b60405180910390f35b61088760048036038101906108829190612f91565b611f48565b6040516108949190612d2d565b60405180910390f35b6108b760048036038101906108b2919061308b565b612005565b6040516108c49190612f23565b60405180910390f35b6108e760048036038101906108e29190612e8e565b612031565b6040516108f49190612d2d565b60405180910390f35b61091760048036038101906109129190612e8e565b612250565b6040516109249190612d2d565b60405180910390f35b6109356122e6565b6040516109429190612f23565b60405180910390f35b61095361230a565b6040516109609190612f23565b60405180910390f35b610983600480360381019061097e9190612ffe565b61232e565b6040516109909190612d2d565b60405180910390f35b6109a1612466565b6040516109ae9190612f23565b60405180910390f35b6109bf61246c565b6040516109cc9190612f23565b60405180910390f35b6109ef60048036038101906109ea919061308b565b612476565b6040516109fc9190612f23565b60405180910390f35b610a1f6004803603810190610a1a9190612fbe565b61248a565b604051610a2c9190612f23565b60405180910390f35b610a3d61253e565b604051610a4a9190612ef9565b60405180910390f35b610a5b6125a8565b604051610a689190612f23565b60405180910390f35b610a8b6004803603810190610a869190613118565b6125cc565b005b610aa76004803603810190610aa29190612f91565b6126e1565b604051610ab49190612d2d565b60405180910390f35b610ad76004803603810190610ad29190613158565b612783565b604051610ae49190613044565b60405180910390f35b600063c6bb4b707c010000000000000000000000000000000000000000000000000000000002827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff191603610b415760019050610c8e565b63449a52f87c010000000000000000000000000000000000000000000000000000000002827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff191603610b935760019050610c8e565b6301ffc9a77c010000000000000000000000000000000000000000000000000000000002827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff191603610be55760019050610c8e565b639493f8b27c010000000000000000000000000000000000000000000000000000000002827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff191603610c375760019050610c8e565b6337a47be47c010000000000000000000000000000000000000000000000000000000002827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff191603610c895760019050610c8e565b600090505b919050565b60068054610ca0906131ee565b80601f0160208091040260200160405190810160405280929190818152602001828054610ccc906131ee565b8015610d195780601f10610cee57610100808354040283529160200191610d19565b820191906000526020600020905b815481529060010190602001808311610cfc57829003601f168201915b505050505081565b6000806000600e60003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541115610ded5760008314610dec576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610de39061326b565b60405180910390fd5b5b610df5611d6a565b50610dff83611882565b905080600e60003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508373ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b92585604051610edf9190612f23565b60405180910390a3600191505092915050565b600260009054906101000a90046fffffffffffffffffffffffffffffffff1681565b6000600c54600954610f2691906132ba565b905090565b60008080549050905090565b7f000000000000000000000000000000000000000000000000000000000000000081565b6000806000610f68611d6a565b50610f7284611882565b915081600e60008873ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610ffd57600080fd5b81600e60008873ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600082825461108991906132ba565b9250508190555061109b8686846127f0565b90508473ffffffffffffffffffffffffffffffffffffffff168673ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef866040516110fa9190612f23565b60405180910390a380925050509392505050565b6000600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16148061119757503373ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff16145b6111a057600080fd5b6000600d60008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff02191690831515021790555060019050919050565b600080600064e8d4a5100091506a52b7d2dcc80cd2e40000007f0000000000000000000000000000000000000000000000000000000000000000611245919061331d565b905060005b8481101561128e5764e8d4a510008284611264919061334e565b61126e919061331d565b8361127991906132ba565b9250808061128690613390565b91505061124a565b5064e8d4a5100085836112a1919061334e565b6112ab919061331d565b9250505092915050565b60085481565b6000806112c6611d6a565b506112d083611882565b905080600e60003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600082825461135e91906133d8565b925050819055508373ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925600e60003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008873ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205460405161143e9190612f23565b60405180910390a3600191505092915050565b6000818154811061146157600080fd5b906000526020600020016000915090505481565b600d60003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff166114cb57600080fd5b6114d4336119d6565b8111156114e057600080fd5b60006114eb82611882565b90506114f5611a8e565b506115003382612815565b5081600c600082825461151391906133d8565b925050819055503373ffffffffffffffffffffffffffffffffffffffff167fcc16f5dbb4873280815c1ee09dbd06736cffcc184412cf7a71a0fdb75d397ca5836040516115609190612f23565b60405180910390a25050565b600080600d60003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff166115fb576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016115f290613458565b60405180910390fd5b611603611d6a565b5061160d83611882565b9050826009600082825461162191906133d8565b925050819055506116328482612867565b508373ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fab8530f87dc9b59234c4623bf917212bb2536d647574c8e7e5da92c2ede0c9f8856040516116909190612f23565b60405180910390a36116a061288e565b50600191505092915050565b600080600160008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002080549050905060008103611706576000915050611775565b68ffffffffffffffffff600160008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020828154811061176157611760613478565b5b906000526020600020015460019004169150505b919050565b60007f0000000000000000000000000000000000000000000000000000000000000000826117a8919061334e565b7f00000000000000000000000000000000000000000000000000000000000000006117d391906133d8565b9050919050565b6000603c82426117ea91906132ba565b6117f4919061331d565b9050919050565b60035481565b6000806402540be40083611815919061334e565b7f000000000000000000000000000000000000000000000000000000000000000061184091906132ba565b8461184b919061334e565b90507f000000000000000000000000000000000000000000000000000000000000000081611879919061331d565b91505092915050565b60006402540be400600260009054906101000a90046fffffffffffffffffffffffffffffffff166118b391906134a7565b6fffffffffffffffffffffffffffffffff167f0000000000000000000000000000000000000000000000000000000000000000836118f1919061334e565b6118fb919061331d565b9050919050565b6000603c824261191291906132ba565b61191c919061331d565b9050919050565b600080600160008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000208054905090506000810361197d576000915050611997565b6119938360018361198e91906132ba565b612935565b9150505b919050565b6000606860ff167affffffffffffffffffffffffffff00000000000000000000000000836001900416908060020a82049150509050919050565b6000806000806119e5856116ac565b92506119f26003546117da565b9050611a3e6402540be400600260009054906101000a90046fffffffffffffffffffffffffffffffff16611a2691906134a7565b6fffffffffffffffffffffffffffffffff1682611201565b6fffffffffffffffffffffffffffffffff16915064e8d4a510006a52b7d2dcc80cd2e4000000611a6e919061334e565b8284611a7a919061334e565b611a84919061331d565b9350505050919050565b6000611a9a600061232e565b905090565b600c5481565b600b5481565b600080600560009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614611b0857600080fd5b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff169050600560009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16600460006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506000600560006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e060405160405180910390a35090565b600f60009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b6000806000611c8684612005565b9150611c918461199c565b9050611c9d8282611801565b92505050919050565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614611d2657600080fd5b80600f60006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050565b6000806000806000806000806000611d80611a8e565b50611d896129bd565b975060006001028803611da757600098505050505050505050611eb7565b6000600a5481548110611dbd57611dbc613478565b5b90600052602060002001549350611dd388612476565b9550600186611de291906133d8565b9050611ded8461199c565b9450603c7f0000000000000000000000000000000000000000000000000000000000000000611e1c919061331d565b9150611e288583611201565b9250611e3e600084611e38610f14565b84612783565b96506000879080600181540180825580915050600190039060005260206000200160009091909190915055611e7287612aa9565b507f55d243082e019fce4009ccea5368b92e436c17586a1e793c7deda16df4e5d67581604051611ea29190612f23565b60405180910390a16001985050505050505050505b90565b60078054611ec7906131ee565b80601f0160208091040260200160405190810160405280929190818152602001828054611ef3906131ee565b8015611f405780601f10611f1557610100808354040283529160200191611f40565b820191906000526020600020905b815481529060010190602001808311611f2357829003601f168201915b505050505081565b6000600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614611fa457600080fd5b6001600d60008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff02191690831515021790555060019050919050565b6000602060ff166cffffffffffffffffff00000000836001900416908060020a82049150509050919050565b60008061203d83611882565b905080600e60003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205410156120c857600080fd5b6120d0611d6a565b5080600e60003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600082825461215d91906132ba565b925050819055508373ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925600e60003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008873ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205460405161223d9190612f23565b60405180910390a3600191505092915050565b600080600061225d611d6a565b5061226784611882565b91506122743386846127f0565b90508473ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef866040516122d39190612f23565b60405180910390a3809250505092915050565b7f000000000000000000000000000000000000000000000000000000000000000081565b7f000000000000000000000000000000000000000000000000000000000000000081565b600080600061233e6003546117da565b91506000820361235357600092505050612461565b600260009054906101000a90046fffffffffffffffffffffffffffffffff166fffffffffffffffffffffffffffffffff16905060008411801561239557508184105b1561239e578391505b6123a88183611201565b600260006101000a8154816fffffffffffffffffffffffffffffffff02191690836fffffffffffffffffffffffffffffffff160217905550603c826123ed919061334e565b6003546123fa91906133d8565b60038190555080826003547fa0717e54e02bd9829db5e6e998aec0ae9de796b8d150a3cc46a92ab869697755600260009054906101000a90046fffffffffffffffffffffffffffffffff16604051612452919061351f565b60405180910390a46001925050505b919050565b600a5481565b6000600c54905090565b600063ffffffff8260019004169050919050565b600080600064e8d4a5100091506a52b7d2dcc80cd2e40000007f00000000000000000000000000000000000000000000000000000000000000006124ce919061331d565b905060005b848110156125175764e8d4a5100082846124ed919061334e565b6124f7919061331d565b8361250291906133d8565b9250808061250f90613390565b9150506124d3565b5064e8d4a51000858361252a919061334e565b612534919061331d565b9250505092915050565b600060017f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000004261258f91906132ba565b612599919061331d565b6125a391906133d8565b905090565b7f000000000000000000000000000000000000000000000000000000000000000081565b600080600160008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020805490509150600081036126ae57600160008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000207f80000000000000000000000000000000000000000000000000000000000000008417600102908060018154018082558091505060019003906000526020600020016000909190919091505550506126dd565b6126c4846001846126bf91906132ba565b612935565b9050600a5481146126da576126d98484612b3b565b5b50505b5050565b6000600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff161461273d57600080fd5b81600560006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550919050565b6000807affffffffffffffffffffffffffff00000000000000000000000000606860ff16869060020a0216600102811790506cffffffffffffffffff00000000602060ff16859060020a02166001028117905063ffffffff83166001028117905080915050949350505050565b6000806127fd8584612815565b506128088484612867565b5060019150509392505050565b60008082036128275760009050612861565b61285c837fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff84612857919061353a565b612b3b565b600190505b92915050565b60008082036128795760009050612888565b6128838383612b3b565b600190505b92915050565b600080600061289b610f14565b9050600060016000805490506128b191906132ba565b815481106128c2576128c1613478565b5b90600052602060002001546001900491506cffffffffffffffffff000000001982169150602060ff16819060020a0282179150816001026000600160008054905061290d91906132ba565b8154811061291e5761291d613478565b5b906000526020600020018190555060019250505090565b6000604860ff166cffffffff000000000000000000600160008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020848154811061299b5761299a613478565b5b90600052602060002001546001900416908060020a8204915050905092915050565b600080600080600a54815481106129d7576129d6613478565b5b906000526020600020015491503073ffffffffffffffffffffffffffffffffffffffff1663e80952956040518163ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401602060405180830381865afa158015612a4b573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190612a6f91906135de565b6fffffffffffffffffffffffffffffffff169050612a8c82612476565b8111612aa057600060010292505050612aa6565b81925050505b90565b6000806000612ab784611c78565b9150600b54612ac583611882565b612acf91906132ba565b9050612afd600f60009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1682612867565b506001600a6000828254612b1191906133d8565b9250508190555080600b6000828254612b2a91906133d8565b925050819055508192505050919050565b6000806000612b49856116ac565b92508383612b57919061360b565b91508268ffffffffffffffffff168268ffffffffffffffffff1611612bb1576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401612ba89061369b565b60405180910390fd5b7f800000000000000000000000000000000000000000000000000000000000000090506cffffffff000000000000000000604860ff16600a5463ffffffff169060020a0263ffffffff16168117905068ffffffffffffffffff612c13866116ac565b1681179050600160008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000208160010290806001815401808255809150506001900390600052602060002001600090919091909150555050505050565b600080fd5b60007fffffffff0000000000000000000000000000000000000000000000000000000082169050919050565b612cc281612c8d565b8114612ccd57600080fd5b50565b600081359050612cdf81612cb9565b92915050565b600060208284031215612cfb57612cfa612c88565b5b6000612d0984828501612cd0565b91505092915050565b60008115159050919050565b612d2781612d12565b82525050565b6000602082019050612d426000830184612d1e565b92915050565b600081519050919050565b600082825260208201905092915050565b60005b83811015612d82578082015181840152602081019050612d67565b60008484015250505050565b6000601f19601f8301169050919050565b6000612daa82612d48565b612db48185612d53565b9350612dc4818560208601612d64565b612dcd81612d8e565b840191505092915050565b60006020820190508181036000830152612df28184612d9f565b905092915050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000612e2582612dfa565b9050919050565b612e3581612e1a565b8114612e4057600080fd5b50565b600081359050612e5281612e2c565b92915050565b6000819050919050565b612e6b81612e58565b8114612e7657600080fd5b50565b600081359050612e8881612e62565b92915050565b60008060408385031215612ea557612ea4612c88565b5b6000612eb385828601612e43565b9250506020612ec485828601612e79565b9150509250929050565b60006fffffffffffffffffffffffffffffffff82169050919050565b612ef381612ece565b82525050565b6000602082019050612f0e6000830184612eea565b92915050565b612f1d81612e58565b82525050565b6000602082019050612f386000830184612f14565b92915050565b600080600060608486031215612f5757612f56612c88565b5b6000612f6586828701612e43565b9350506020612f7686828701612e43565b9250506040612f8786828701612e79565b9150509250925092565b600060208284031215612fa757612fa6612c88565b5b6000612fb584828501612e43565b91505092915050565b60008060408385031215612fd557612fd4612c88565b5b6000612fe385828601612e79565b9250506020612ff485828601612e79565b9150509250929050565b60006020828403121561301457613013612c88565b5b600061302284828501612e79565b91505092915050565b6000819050919050565b61303e8161302b565b82525050565b60006020820190506130596000830184613035565b92915050565b6130688161302b565b811461307357600080fd5b50565b6000813590506130858161305f565b92915050565b6000602082840312156130a1576130a0612c88565b5b60006130af84828501613076565b91505092915050565b6130c181612e1a565b82525050565b60006020820190506130dc60008301846130b8565b92915050565b6000819050919050565b6130f5816130e2565b811461310057600080fd5b50565b600081359050613112816130ec565b92915050565b6000806040838503121561312f5761312e612c88565b5b600061313d85828601612e43565b925050602061314e85828601613103565b9150509250929050565b6000806000806080858703121561317257613171612c88565b5b600061318087828801612e79565b945050602061319187828801612e79565b93505060406131a287828801612e79565b92505060606131b387828801612e79565b91505092959194509250565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b6000600282049050600182168061320657607f821691505b602082108103613219576132186131bf565b5b50919050565b7f5a45524f5f464952535400000000000000000000000000000000000000000000600082015250565b6000613255600a83612d53565b91506132608261321f565b602082019050919050565b6000602082019050818103600083015261328481613248565b9050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b60006132c582612e58565b91506132d083612e58565b92508282039050818111156132e8576132e761328b565b5b92915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601260045260246000fd5b600061332882612e58565b915061333383612e58565b925082613343576133426132ee565b5b828204905092915050565b600061335982612e58565b915061336483612e58565b925082820261337281612e58565b915082820484148315176133895761338861328b565b5b5092915050565b600061339b82612e58565b91507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff82036133cd576133cc61328b565b5b600182019050919050565b60006133e382612e58565b91506133ee83612e58565b92508282019050808211156134065761340561328b565b5b92915050565b7f4552525f41434345535300000000000000000000000000000000000000000000600082015250565b6000613442600a83612d53565b915061344d8261340c565b602082019050919050565b6000602082019050818103600083015261347181613435565b9050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b60006134b282612ece565b91506134bd83612ece565b92508282026134cb81612ece565b91508082146134dd576134dc61328b565b5b5092915050565b6000819050919050565b60006135096135046134ff84612ece565b6134e4565b612e58565b9050919050565b613519816134ee565b82525050565b60006020820190506135346000830184613510565b92915050565b6000613545826130e2565b9150613550836130e2565b925082820261355e816130e2565b91507f800000000000000000000000000000000000000000000000000000000000000084146000841216156135965761359561328b565b5b82820584148315176135ab576135aa61328b565b5b5092915050565b6135bb81612ece565b81146135c657600080fd5b50565b6000815190506135d8816135b2565b92915050565b6000602082840312156135f4576135f3612c88565b5b6000613602848285016135c9565b91505092915050565b6000613616826130e2565b9150613621836130e2565b9250828201905082811215600083121683821260008412151617156136495761364861328b565b5b92915050565b7f4552525f574f554c445752415000000000000000000000000000000000000000600082015250565b6000613685600d83612d53565b91506136908261364f565b602082019050919050565b600060208201905081810360008301526136b481613678565b905091905056fea26469706673582212204ec3e1eaf5ef91918049514cd75f5d736a6f45bcd7e5ec9bab19afee2618a28764736f6c63430008110033 \ No newline at end of file diff --git a/python/erc20_demurrage_token/data/DemurrageTokenSingleNocap.json b/python/erc20_demurrage_token/data/DemurrageTokenSingleNocap.json index 654f397..9af57ad 100644 --- 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":"uint128","name":"_taxLevelMinute","type":"uint128"},{"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":[],"name":"applyDemurrage","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint256","name":"_rounds","type":"uint256"}],"name":"applyDemurrageLimited","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_spender","type":"address"},{"internalType":"uint256","name":"_value","type":"uint256"}],"name":"approve","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":[],"name":"changePeriod","outputs":[{"internalType":"bool","name":"","type":"bool"}],"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":[{"internalType":"address","name":"_spender","type":"address"},{"internalType":"uint256","name":"_value","type":"uint256"}],"name":"decreaseAllowance","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"demurrageAmount","outputs":[{"internalType":"uint128","name":"","type":"uint128"}],"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":"_supply","type":"uint256"},{"internalType":"uint256","name":"_demurrageAmount","type":"uint256"}],"name":"getDistribution","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"_redistribution","type":"bytes32"}],"name":"getDistributionFromRedistribution","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","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":[{"internalType":"uint256","name":"_value","type":"uint256"},{"internalType":"uint256","name":"_period","type":"uint256"}],"name":"growBy","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_spender","type":"address"},{"internalType":"uint256","name":"_value","type":"uint256"}],"name":"increaseAllowance","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","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":"bytes32","name":"","type":"bytes32"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_minter","type":"address"}],"name":"removeMinter","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"resolutionFactor","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","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":"uint256","name":"","type":"uint256"}],"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":[{"internalType":"bytes32","name":"","type":"bytes32"}],"stateMutability":"pure","type":"function"},{"inputs":[{"internalType":"bytes32","name":"redistribution","type":"bytes32"}],"name":"toRedistributionDemurrageModifier","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"pure","type":"function"},{"inputs":[{"internalType":"bytes32","name":"redistribution","type":"bytes32"}],"name":"toRedistributionPeriod","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"pure","type":"function"},{"inputs":[{"internalType":"bytes32","name":"redistribution","type":"bytes32"}],"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":"_to","type":"address"},{"internalType":"uint256","name":"_value","type":"uint256"}],"name":"transfer","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_from","type":"address"},{"internalType":"address","name":"_to","type":"address"},{"internalType":"uint256","name":"_value","type":"uint256"}],"name":"transferFrom","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","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":"uint128","name":"_taxLevelMinute","type":"uint128"},{"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":[{"internalType":"address","name":"_account","type":"address"}],"name":"accountPeriod","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","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":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint256","name":"_rounds","type":"uint256"}],"name":"applyDemurrageLimited","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_spender","type":"address"},{"internalType":"uint256","name":"_value","type":"uint256"}],"name":"approve","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":[],"name":"changePeriod","outputs":[{"internalType":"bool","name":"","type":"bool"}],"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":[{"internalType":"address","name":"_spender","type":"address"},{"internalType":"uint256","name":"_value","type":"uint256"}],"name":"decreaseAllowance","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"demurrageAmount","outputs":[{"internalType":"uint128","name":"","type":"uint128"}],"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":"_supply","type":"uint256"},{"internalType":"uint256","name":"_demurrageAmount","type":"uint256"}],"name":"getDistribution","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"_redistribution","type":"bytes32"}],"name":"getDistributionFromRedistribution","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","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":[{"internalType":"uint256","name":"_value","type":"uint256"},{"internalType":"uint256","name":"_period","type":"uint256"}],"name":"growBy","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_spender","type":"address"},{"internalType":"uint256","name":"_value","type":"uint256"}],"name":"increaseAllowance","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","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":"bytes32","name":"","type":"bytes32"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_account","type":"address"},{"internalType":"int256","name":"_delta","type":"int256"}],"name":"registerAccountPeriod","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_minter","type":"address"}],"name":"removeMinter","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"resolutionFactor","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","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":"uint256","name":"","type":"uint256"}],"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":[{"internalType":"bytes32","name":"","type":"bytes32"}],"stateMutability":"pure","type":"function"},{"inputs":[{"internalType":"bytes32","name":"redistribution","type":"bytes32"}],"name":"toRedistributionDemurrageModifier","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"pure","type":"function"},{"inputs":[{"internalType":"bytes32","name":"redistribution","type":"bytes32"}],"name":"toRedistributionPeriod","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"pure","type":"function"},{"inputs":[{"internalType":"bytes32","name":"redistribution","type":"bytes32"}],"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":"_to","type":"address"},{"internalType":"uint256","name":"_value","type":"uint256"}],"name":"transfer","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_from","type":"address"},{"internalType":"address","name":"_to","type":"address"},{"internalType":"uint256","name":"_value","type":"uint256"}],"name":"transferFrom","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_newOwner","type":"address"}],"name":"transferOwnership","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"}] diff --git a/solidity/DemurrageTokenSingleNocap.sol b/solidity/DemurrageTokenSingleNocap.sol index 95eb7da..0cccb9f 100644 --- a/solidity/DemurrageTokenSingleNocap.sol +++ b/solidity/DemurrageTokenSingleNocap.sol @@ -14,7 +14,13 @@ contract DemurrageTokenSingleCap { uint256 constant maskRedistributionDemurrage = 0x0000000000ffffffffffffffffffffffffffff00000000000000000000000000; // ((1 << 36) - 1) << 140 // Account balances - mapping (address => uint256) account; + mapping (address => bytes32[] ) account; + uint8 constant shiftAccountValue = 0; + uint256 constant maskAccountValue = 0x0000000000000000000000000000000000000000000000ffffffffffffffffff; // (1 << 72) - 1 + uint8 constant shiftAccountPeriod = 72; + uint256 constant maskAccountPeriod = 0x00000000000000000000000000000000000000ffffffff000000000000000000; // ((1 << 32) - 1) << 72 + uint8 constant shiftAccountUsed = 255; + uint256 constant maskAccountUsed = 0x8000000000000000000000000000000000000000000000000000000000000000; // (1 << 255) // Cached demurrage amount, ppm with 38 digit resolution uint128 public demurrageAmount; @@ -163,43 +169,36 @@ contract DemurrageTokenSingleCap { return (baseBalance * currentDemurragedAmount) / (nanoDivider * 1000000000000); } + /// Balance unmodified by demurrage function baseBalanceOf(address _account) public view returns (uint256) { - return account[_account]; + uint256 lastPeriodUsed; + + lastPeriodUsed = account[_account].length; + if (lastPeriodUsed == 0) { + return 0; + } + return uint256(account[_account][lastPeriodUsed]) & maskAccountValue; } + /// Increases base balance for a single account function increaseBaseBalance(address _account, uint256 _delta) private returns (bool) { - uint256 oldBalance; - uint256 newBalance; - uint256 workAccount; - - workAccount = uint256(account[_account]); - if (_delta == 0) { return false; } - - oldBalance = baseBalanceOf(_account); - account[_account] = oldBalance + _delta; + + movePeriodBalance(_account, int256(_delta)); return true; } /// Decreases base balance for a single account function decreaseBaseBalance(address _account, uint256 _delta) private returns (bool) { - uint256 oldBalance; - uint256 newBalance; - uint256 workAccount; - - workAccount = uint256(account[_account]); - if (_delta == 0) { return false; } - oldBalance = baseBalanceOf(_account); - require(oldBalance >= _delta, 'ERR_OVERSPEND'); // overspend guard - account[_account] = oldBalance - _delta; + movePeriodBalance(_account, int256(_delta) * -1); return true; } @@ -354,6 +353,54 @@ contract DemurrageTokenSingleCap { return (block.timestamp - _target) / 60; } + + // Deserialize the pemurrage period for the given account is participating in + function accountPeriod(address _account) public view returns (uint256) { + uint256 accountPeriods; + + accountPeriods = account[_account].length; + if (accountPeriods == 0) { + return 0; + } + return accountPeriodBase(_account, accountPeriods - 1); + } + + function accountPeriodBase(address _account, uint256 _idx) private view returns (uint256) { + return (uint256(account[_account][_idx]) & maskAccountPeriod) >> shiftAccountPeriod; + } + + function movePeriodBalance(address _account, int256 _delta) private { + int256 oldBalance; + uint256 newBalance; + uint256 workAccount; + + //workAccount = uint256(account[_index][_account]); + + oldBalance = int256(baseBalanceOf(_account)); + newBalance = uint256(oldBalance + _delta); + require(uint72(newBalance) > uint72(uint256(oldBalance)), 'ERR_WOULDWRAP'); // revert if increase would result in a wrapped value + workAccount = (1 << 255); + + workAccount |= ((uint32(lastPeriod) << shiftAccountPeriod) & maskAccountPeriod); + workAccount |= (baseBalanceOf(_account) & maskAccountValue); + account[_account].push(bytes32(workAccount)); + } + + function registerAccountPeriod(address _account, int256 _delta) public { + uint256 accountPeriods; + uint256 lastPeriodUsed; + + accountPeriods = account[_account].length; + if (lastPeriodUsed == 0) { + account[_account].push(bytes32(uint256(_delta) | (1 << 255))); + return; + } + lastPeriodUsed = accountPeriodBase(_account, accountPeriods - 1); + if (lastPeriodUsed != lastPeriod) { + movePeriodBalance(_account, _delta); + } + } + // Recalculate the demurrage modifier for the new period // Note that the supply for the consecutive period will be taken at the time of code execution, and thus not necessarily at the time when the redistribution period threshold was crossed. function changePeriod() public returns (bool) { @@ -525,7 +572,7 @@ contract DemurrageTokenSingleCap { // Only token minters can burn tokens function burn(uint256 _value) public { require(minter[msg.sender]); - require(_value <= account[msg.sender]); + require(_value <= balanceOf(msg.sender)); uint256 _delta = toBaseAmount(_value); applyDemurrage();