From 1e24ec1352680a3e77ee4a013913de2c71eec5aa Mon Sep 17 00:00:00 2001 From: lash Date: Wed, 2 Mar 2022 08:15:10 +0000 Subject: [PATCH] Add apply demurrage cli tool --- python/CHANGELOG | 10 ++- .../erc20_demurrage_token/runnable/apply.py | 90 +++++++++++++++++++ python/setup.cfg | 3 +- 3 files changed, 100 insertions(+), 3 deletions(-) create mode 100644 python/erc20_demurrage_token/runnable/apply.py diff --git a/python/CHANGELOG b/python/CHANGELOG index 38043fd..3602f2b 100644 --- a/python/CHANGELOG +++ b/python/CHANGELOG @@ -1,4 +1,10 @@ -- 0.0.2-pending +- 0.0.11 + * Apply demurrage cli tool +- 0.0.10 + * Settable sink address +- 0.0.9 + * 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 new file mode 100644 index 0000000..91008fb --- /dev/null +++ b/python/erc20_demurrage_token/runnable/apply.py @@ -0,0 +1,90 @@ +"""Deploy sarafu token + +.. moduleauthor:: Louis Holbrook +.. 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/setup.cfg b/python/setup.cfg index 2f76655..0536298 100644 --- a/python/setup.cfg +++ b/python/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = erc20-demurrage-token -version = 0.0.8 +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