From a15fe1d6a8d85a9127360c8dc926fa8ccb8680ff Mon Sep 17 00:00:00 2001 From: nolash Date: Mon, 15 Feb 2021 21:40:12 +0100 Subject: [PATCH] Rehabilitate add script, add to packaging --- python/giftable_erc20_token/runnable/add.py | 9 ++++----- python/setup.cfg | 3 ++- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/python/giftable_erc20_token/runnable/add.py b/python/giftable_erc20_token/runnable/add.py index 8b1f4a6..093b8f4 100644 --- a/python/giftable_erc20_token/runnable/add.py +++ b/python/giftable_erc20_token/runnable/add.py @@ -41,7 +41,7 @@ argparser.add_argument('-a', '--token-address', required='True', dest='a', type= argparser.add_argument('-y', '--key-file', dest='y', type=str, help='Ethereum keystore file to use for signing') argparser.add_argument('--abi-dir', dest='abi_dir', type=str, default=data_dir, help='Directory containing bytecode and abi (default: {})'.format(data_dir)) argparser.add_argument('-v', action='store_true', help='Be verbose') -argparser.add_argument('minter_address', type=int, help='Minter address to add') +argparser.add_argument('minter_address', type=str, help='Minter address to add') args = argparser.parse_args() if args.v: @@ -86,13 +86,12 @@ def main(): c = w3.eth.contract(abi=abi, address=args.a) - recipient = signer_address - if args.recipient != None: - recipient = args.recipient + if not web3.Web3.isChecksumAddress(args.minter_address): + raise ValueError('Minter is not a valid address {}'.format(args.minter_address)) (tx_hash, rcpt) = helper.sign_and_send( [ - c.functions.addMinter(args.recipient).buildTransaction, + c.functions.addMinter(args.minter_address).buildTransaction, ], ) diff --git a/python/setup.cfg b/python/setup.cfg index 533980e..7adecf2 100644 --- a/python/setup.cfg +++ b/python/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = giftable-erc20-token -version = 0.0.7b9 +version = 0.0.7b10 description = Simple ERC20 contract with deployment script that lets any address mint and gift itself tokens. author = Louis Holbrook author_email = dev@holbrook.no @@ -39,3 +39,4 @@ install_requires = console_scripts = giftable-token-deploy = giftable_erc20_token.runnable.deploy:main giftable-token-gift = giftable_erc20_token.runnable.gift:main + giftable-token-add = giftable_erc20_token.runnable.add:main