erc20-demurrage-token

ERC20 token with redistributed continual demurrage
Log | Files | Refs | README

commit 226f81fc5cff47aaa22470e141766e66a74e2191
parent 47ee1cfa45ac571d48a51f651d8d97c79bd17c56
Author: William Luke <william@atto-byte.com>
Date:   Mon, 14 Mar 2022 12:58:45 +0000

Merge branch 'lash/apply-cli' into 'master'

Add apply demurrage cli tool

See merge request cicnet/erc20-demurrage-token!9
Diffstat:
Mpython/CHANGELOG | 9++++++---
Apython/erc20_demurrage_token/runnable/apply.py | 90+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Mpython/erc20_demurrage_token/runnable/deploy.py | 5++---
Mpython/setup.cfg | 3++-
4 files changed, 100 insertions(+), 7 deletions(-)

diff --git a/python/CHANGELOG b/python/CHANGELOG @@ -1,7 +1,10 @@ +- 0.0.11 + * Apply demurrage cli tool +- 0.0.10 + * Settable sink address - 0.0.9 - * Fix wrong redistribution calculation in single nocap -[...] + * Correct redistribution amount for SingleNocap contract - 0.0.2 * Move to chainlib-eth -- 0.0.1-unreleased +- 0.0.1 * Interface for redistributed and non-redistributed, with or without cap diff --git a/python/erc20_demurrage_token/runnable/apply.py b/python/erc20_demurrage_token/runnable/apply.py @@ -0,0 +1,90 @@ +"""Deploy sarafu token + +.. moduleauthor:: Louis Holbrook <dev@holbrook.no> +.. pgp:: 0826EDA1702D1E87C6E2875121D2E7BB88C2A746 + +""" + +# standard imports +import sys +import os +import json +import argparse +import logging + +# external imports +import confini +from funga.eth.signer import EIP155Signer +from funga.eth.keystore.dict import DictKeystore +from chainlib.chain import ChainSpec +from chainlib.eth.nonce import ( + RPCNonceOracle, + OverrideNonceOracle, + ) +from chainlib.eth.gas import ( + RPCGasOracle, + OverrideGasOracle, + ) +from chainlib.eth.connection import EthHTTPConnection +from chainlib.eth.tx import receipt +from chainlib.eth.constant import ZERO_ADDRESS +import chainlib.eth.cli + +# local imports +import erc20_demurrage_token +from erc20_demurrage_token import ( + DemurrageToken, + DemurrageTokenSettings, + ) + +logging.basicConfig(level=logging.WARNING) +logg = logging.getLogger() + +script_dir = os.path.dirname(__file__) +data_dir = os.path.join(script_dir, '..', 'data') + +config_dir = os.path.join(data_dir, 'config') + +arg_flags = chainlib.eth.cli.argflag_std_write | chainlib.eth.cli.Flag.EXEC +argparser = chainlib.eth.cli.ArgumentParser(arg_flags) +args = argparser.parse_args() +config = chainlib.eth.cli.Config.from_args(args, arg_flags, default_fee_limit=DemurrageToken.gas(), base_config_dir=config_dir) + +wallet = chainlib.eth.cli.Wallet() +wallet.from_config(config) + +rpc = chainlib.eth.cli.Rpc(wallet=wallet) +conn = rpc.connect_by_config(config) + +chain_spec = ChainSpec.from_chain_str(config.get('CHAIN_SPEC')) + + +def main(): + signer = rpc.get_signer() + signer_address = rpc.get_sender_address() + + gas_oracle = rpc.get_gas_oracle() + nonce_oracle = rpc.get_nonce_oracle() + + c = DemurrageToken(chain_spec, signer=signer, gas_oracle=gas_oracle, nonce_oracle=nonce_oracle) + (tx_hash_hex, o) = c.apply_demurrage(config.get('_EXEC_ADDRESS'), signer_address) + if config.get('_RPC_SEND'): + conn.do(o) + if config.get('_WAIT'): + r = conn.wait(tx_hash_hex) + if r['status'] == 0: + sys.stderr.write('EVM revert while deploying contract. Wish I had more to tell you') + sys.exit(1) + # TODO: pass through translator for keys (evm tester uses underscore instead of camelcase) + address = r['contractAddress'] + + print(address) + else: + print(tx_hash_hex) + + else: + print(o) + + +if __name__ == '__main__': + main() diff --git a/python/erc20_demurrage_token/runnable/deploy.py b/python/erc20_demurrage_token/runnable/deploy.py @@ -49,8 +49,8 @@ arg_flags = chainlib.eth.cli.argflag_std_write argparser = chainlib.eth.cli.ArgumentParser(arg_flags) argparser.add_argument('--name', dest='token_name', type=str, help='Token name') argparser.add_argument('--symbol', dest='token_symbol', required=True, type=str, help='Token symbol') -argparser.add_argument('--decimals', dest='token_decimals', default=18, type=int, help='Token decimals') -argparser.add_argument('--sink-address', dest='sink_address', default=ZERO_ADDRESS, type=str, help='demurrage level,ppm per minute') +argparser.add_argument('--decimals', dest='token_decimals', type=int, help='Token decimals') +argparser.add_argument('--sink-address', dest='sink_address', type=str, help='demurrage level,ppm per minute') argparser.add_argument('--supply-limit', dest='supply_limit', type=int, help='token supply limit (0 = no limit)') argparser.add_argument('--redistribution-period', type=int, help='redistribution period, minutes (0 = deactivate)') # default 10080 = week argparser.add_argument('--multi', action='store_true', help='automatic redistribution') @@ -90,7 +90,6 @@ conn = rpc.connect_by_config(config) chain_spec = ChainSpec.from_chain_str(config.get('CHAIN_SPEC')) - def main(): signer = rpc.get_signer() signer_address = rpc.get_sender_address() diff --git a/python/setup.cfg b/python/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = erc20-demurrage-token -version = 0.0.10 +version = 0.0.11 description = ERC20 token with redistributed continual demurrage author = Louis Holbrook author_email = dev@holbrook.no @@ -40,3 +40,4 @@ packages = [options.entry_points] console_scripts = erc20-demurrage-token-deploy = erc20_demurrage_token.runnable.deploy:main + erc20-demurrage-token-apply = erc20_demurrage_token.runnable.apply:main