Revert "Improve test coverage"

This reverts commit 2d79c863ce.

python/CHANGELOG

@@ -1,8 +1,3 @@
-* 0.0.10-pending
-	- Upgrade chainlib dependency, providing customizable jsonrpc id
-	- Move to chainlib-eth
-* 0.0.9-unreleased
-* 0.0.8-unreleased
 * 0.0.7-unreleased
 	- Implement keystore signing.
 	- Change makefile to compile contract for Byzantium.

python/MANIFEST.in

@@ -1 +1 @@
-include **/data/ERC20.json **/data/GiftableToken.json **/data/GiftableToken.bin *requirements.txt
+include **/data/ERC20.json **/data/GiftableToken.json **/data/GiftableToken.bin requirements.txt test_requirements.txt

python/VERSION

@@ -1 +1 @@
-0.0.10
+0.0.1

python/eth_erc20/erc20.py

@@ -7,6 +7,7 @@ from hexathon import (
         add_0x,
         strip_0x,
         )
+from crypto_dev_signer.eth.transaction import EIP155Transaction
 
 # external imports
 from chainlib.hash import (
@@ -18,13 +19,13 @@ from chainlib.eth.tx import (
         TxFactory,
         TxFormat,
         )
-from chainlib.jsonrpc import JSONRPCRequest
 from chainlib.eth.contract import (
         ABIContractEncoder,
         ABIContractDecoder,
         ABIContractType,
         abi_decode_single,
         )
+from chainlib.jsonrpc import jsonrpc_template
 from chainlib.eth.error import RequestMismatchException
 
 logg = logging.getLogger()
@@ -33,9 +34,8 @@ logg = logging.getLogger()
 class ERC20(TxFactory):
     
 
-    def balance_of(self, contract_address, address, sender_address=ZERO_ADDRESS, id_generator=None):
-        j = JSONRPCRequest(id_generator)
-        o = j.template()
+    def balance_of(self, contract_address, address, sender_address=ZERO_ADDRESS):
+        o = jsonrpc_template()
         o['method'] = 'eth_call'
         enc = ABIContractEncoder()
         enc.method('balanceOf')
@@ -46,17 +46,15 @@ class ERC20(TxFactory):
         tx = self.set_code(tx, data)
         o['params'].append(self.normalize(tx))
         o['params'].append('latest')
-        o = j.finalize(o)
         return o
 
 
-    def balance(self, contract_address, address, sender_address=ZERO_ADDRESS, id_generator=None):
-        return self.balance_of(contract_address, address, sender_address=sender_address, id_generator=id_generator)
+    def balance(self, contract_address, address, sender_address=ZERO_ADDRESS):
+        return self.balance_of(contract_address, address, sender_address=ZERO_ADDRESS)
 
 
-    def symbol(self, contract_address, sender_address=ZERO_ADDRESS, id_generator=None):
-        j = JSONRPCRequest(id_generator)
-        o = j.template()
+    def symbol(self, contract_address, sender_address=ZERO_ADDRESS):
+        o = jsonrpc_template()
         o['method'] = 'eth_call'
         enc = ABIContractEncoder()
         enc.method('symbol')
@@ -65,13 +63,11 @@ class ERC20(TxFactory):
         tx = self.set_code(tx, data)
         o['params'].append(self.normalize(tx))
         o['params'].append('latest')
-        o = j.finalize(o)
         return o
 
 
-    def name(self, contract_address, sender_address=ZERO_ADDRESS, id_generator=None):
-        j = JSONRPCRequest(id_generator)
-        o = j.template()
+    def name(self, contract_address, sender_address=ZERO_ADDRESS):
+        o = jsonrpc_template()
         o['method'] = 'eth_call'
         enc = ABIContractEncoder()
         enc.method('name')
@@ -80,13 +76,11 @@ class ERC20(TxFactory):
         tx = self.set_code(tx, data)
         o['params'].append(self.normalize(tx))
         o['params'].append('latest')
-        o = j.finalize(o)
         return o
 
     
-    def decimals(self, contract_address, sender_address=ZERO_ADDRESS, id_generator=None):
-        j = JSONRPCRequest(id_generator)
-        o = j.template()
+    def decimals(self, contract_address, sender_address=ZERO_ADDRESS):
+        o = jsonrpc_template()
         o['method'] = 'eth_call'
         enc = ABIContractEncoder()
         enc.method('decimals')
@@ -95,13 +89,11 @@ class ERC20(TxFactory):
         tx = self.set_code(tx, data)
         o['params'].append(self.normalize(tx))
         o['params'].append('latest')
-        o = j.finalize(o)
         return o
 
 
-    def total_supply(self, contract_address, sender_address=ZERO_ADDRESS, id_generator=None):
-        j = JSONRPCRequest(id_generator)
-        o = j.template()
+    def total_supply(self, contract_address, sender_address=ZERO_ADDRESS):
+        o = jsonrpc_template()
         o['method'] = 'eth_call'
         enc = ABIContractEncoder()
         enc.method('totalSupply')
@@ -110,30 +102,10 @@ class ERC20(TxFactory):
         tx = self.set_code(tx, data)
         o['params'].append(self.normalize(tx))
         o['params'].append('latest')
-        o = j.finalize(o)
         return o
 
 
-    def allowance(self, contract_address, holder_address, spender_address, sender_address=ZERO_ADDRESS, id_generator=None):
-        j = JSONRPCRequest(id_generator)
-        o = j.template()
-        o['method'] = 'eth_call'
-        enc = ABIContractEncoder()
-        enc.method('allowance')
-        enc.typ(ABIContractType.ADDRESS)
-        enc.typ(ABIContractType.ADDRESS)
-        enc.address(holder_address)
-        enc.address(spender_address)
-        data = add_0x(enc.get())
-        tx = self.template(sender_address, contract_address)
-        tx = self.set_code(tx, data)
-        o['params'].append(self.normalize(tx))
-        o['params'].append('latest')
-        o = j.finalize(o)
-        return o
-
-
-    def transfer(self, contract_address, sender_address, recipient_address, value, tx_format=TxFormat.JSONRPC, id_generator=None):
+    def transfer(self, contract_address, sender_address, recipient_address, value, tx_format=TxFormat.JSONRPC):
         enc = ABIContractEncoder()
         enc.method('transfer')
         enc.typ(ABIContractType.ADDRESS)
@@ -143,11 +115,11 @@ class ERC20(TxFactory):
         data = add_0x(enc.get())
         tx = self.template(sender_address, contract_address, use_nonce=True)
         tx = self.set_code(tx, data)
-        tx = self.finalize(tx, tx_format, id_generator=id_generator)
+        tx = self.finalize(tx, tx_format)
         return tx
 
 
-    def transfer_from(self, contract_address, sender_address, holder_address, recipient_address, value, tx_format=TxFormat.JSONRPC, id_generator=None):
+    def transfer_from(self, contract_address, sender_address, holder_address, recipient_address, value, tx_format=TxFormat.JSONRPC):
         enc = ABIContractEncoder()
         enc.method('transferFrom')
         enc.typ(ABIContractType.ADDRESS)
@@ -163,7 +135,7 @@ class ERC20(TxFactory):
         return tx
 
 
-    def approve(self, contract_address, sender_address, spender_address, value, tx_format=TxFormat.JSONRPC, id_generator=None):
+    def approve(self, contract_address, sender_address, spender_address, value, tx_format=TxFormat.JSONRPC):
         enc = ABIContractEncoder()
         enc.method('approve')
         enc.typ(ABIContractType.ADDRESS)
@@ -197,21 +169,6 @@ class ERC20(TxFactory):
         return abi_decode_single(ABIContractType.UINT256, v)
 
 
-    @classmethod
-    def parse_balance_of(self, v):
-        return self.parse_balance(v)
-
-
-    @classmethod
-    def parse_total_supply(self, v):
-        return abi_decode_single(ABIContractType.UINT256, v)
-
-
-    @classmethod
-    def parse_allowance(self, v):
-        return abi_decode_single(ABIContractType.UINT256, v)
-
-
     @classmethod
     def parse_transfer_request(self, v):
         v = strip_0x(v)

python/eth_erc20/runnable/approve.py

@@ -1,99 +0,0 @@
-#!python3
-
-"""Token transfer script
-
-.. moduleauthor:: Louis Holbrook <dev@holbrook.no>
-.. pgp:: 0826EDA1702D1E87C6E2875121D2E7BB88C2A746 
-
-"""
-
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# standard imports
-import os
-import io
-import json
-import argparse
-import logging
-
-# external imports
-from hexathon import (
-        add_0x,
-        strip_0x,
-        )
-from chainlib.eth.connection import EthHTTPConnection
-from chainlib.chain import ChainSpec
-from chainlib.eth.runnable.util import decode_for_puny_humans
-from chainlib.eth.address import to_checksum_address
-import chainlib.eth.cli
-
-# local imports
-from eth_erc20 import ERC20
-
-logging.basicConfig(level=logging.WARNING)
-logg = logging.getLogger()
-
-arg_flags = chainlib.eth.cli.argflag_std_write | chainlib.eth.cli.Flag.EXEC | chainlib.eth.cli.Flag.WALLET 
-argparser = chainlib.eth.cli.ArgumentParser(arg_flags)
-argparser.add_positional('amount', type=int, help='Token amount to send')
-args = argparser.parse_args()
-extra_args = {
-    'amount': None,
-        }
-config = chainlib.eth.cli.Config.from_args(args, arg_flags, extra_args=extra_args, default_fee_limit=100000)
-
-block_all = args.ww
-block_last = args.w or block_all
-
-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'))
-
-value = config.get('_AMOUNT')
-
-send = config.true('_RPC_SEND')
-
-def main():
-
-    signer = rpc.get_signer()
-    signer_address = rpc.get_sender_address()
-
-    gas_oracle = rpc.get_gas_oracle()
-    nonce_oracle = rpc.get_nonce_oracle()
-
-    g = ERC20(chain_spec, signer=signer, gas_oracle=gas_oracle, nonce_oracle=nonce_oracle)
-
-    recipient = to_checksum_address(config.get('_RECIPIENT'))
-    if not config.true('_UNSAFE') and recipient != add_0x(config.get('_RECIPIENT')):
-        raise ValueError('invalid checksum address for recipient')
-
-    token_address = to_checksum_address(config.get('_EXEC_ADDRESS'))
-    if not config.true('_UNSAFE') and token_address != add_0x(config.get('_EXEC_ADDRESS')):
-        raise ValueError('invalid checksum address for contract')
-
-    (tx_hash_hex, o) = g.approve(token_address, signer_address, recipient, value, id_generator=rpc.id_generator)
-
-    if send:
-        conn.do(o)
-        if block_last:
-            r = conn.wait(tx_hash_hex)
-            if logg.isEnabledFor(logging.DEBUG):
-                sender_balance = balance(g, token_address, signer_address, id_generator=rpc.id_generator)
-                recipient_balance = balance(g, token_address, recipient, id_generator=rpc.id_generator)
-                logg.debug('sender {} balance after: {}'.format(signer_address, sender_balance))
-                logg.debug('recipient {} balance after: {}'.format(recipient, recipient_balance))
-            if r['status'] == 0:
-                logg.critical('VM revert. Wish I could tell you more')
-                sys.exit(1)
-        print(tx_hash_hex)
-
-    else:
-        print(o['params'][0])
-
-
-if __name__ == '__main__':
-    main()

python/eth_erc20/runnable/balance.py

@@ -16,17 +16,21 @@ import json
 import argparse
 import logging
 
-# external imports
+# third-party imports
 from hexathon import (
         add_0x,
         strip_0x,
         even,
         )
 import sha3
+from eth_abi import encode_single
 
 # external imports
-import chainlib.eth.cli
-from chainlib.eth.address import to_checksum_address
+from chainlib.eth.address import to_checksum
+from chainlib.jsonrpc import (
+        jsonrpc_template,
+        jsonrpc_result,
+        )
 from chainlib.eth.connection import EthHTTPConnection
 from chainlib.eth.gas import (
         OverrideGasOracle,
@@ -40,29 +44,44 @@ from eth_erc20 import ERC20
 logging.basicConfig(level=logging.WARNING)
 logg = logging.getLogger()
 
-arg_flags = chainlib.eth.cli.argflag_std_read | chainlib.eth.cli.Flag.EXEC
-argparser = chainlib.eth.cli.ArgumentParser(arg_flags)
-argparser.add_positional('address', type=str, help='Ethereum address of recipient')
+default_abi_dir = os.environ.get('ETH_ABI_DIR', '/usr/share/local/cic/solidity/abi')
+default_eth_provider = os.environ.get('ETH_PROVIDER', 'http://localhost:8545')
+
+argparser = argparse.ArgumentParser()
+argparser.add_argument('-p', '--provider', dest='p', default=default_eth_provider, type=str, help='Web3 provider url (http only)')
+argparser.add_argument('-a', '--token-address', dest='a', required=True, type=str, help='Token address. If not set, will return gas balance')
+argparser.add_argument('-f', '--format', dest='f', type=str, default='terminal', help='Output format [terminal (default), raw, brief]')
+argparser.add_argument('-i', '--chain-spec', dest='i', type=str, default='evm:ethereum:1', help='Chain specification string')
+argparser.add_argument('-u', '--unsafe', dest='u', action='store_true', help='Auto-convert address to checksum adddress')
+argparser.add_argument('-v', action='store_true', help='Be verbose')
+argparser.add_argument('-vv', action='store_true', help='Be more verbose')
+argparser.add_argument('address', type=str, help='Account address')
 args = argparser.parse_args()
-config = chainlib.eth.cli.Config.from_args(args, arg_flags)
 
-wallet = chainlib.eth.cli.Wallet()
-wallet.from_config(config)
-holder_address = args.address
-if wallet.get_signer_address() == None and holder_address != None:
-    holder_address = wallet.from_address(holder_address)
 
-rpc = chainlib.eth.cli.Rpc()
-conn = rpc.connect_by_config(config)
+if args.vv:
+    logg.setLevel(logging.DEBUG)
+elif args.v:
+    logg.setLevel(logging.INFO)
 
-chain_spec = ChainSpec.from_chain_str(config.get('CHAIN_SPEC'))
+conn = EthHTTPConnection(args.p)
+gas_oracle = OverrideGasOracle(conn)
 
-token_address = config.get('_EXEC_ADDRESS')
+address = to_checksum(args.address)
+if not args.u and address != add_0x(args.address):
+    raise ValueError('invalid checksum address')
+
+token_address = args.a
+
+fmt = args.f
+
+chain_spec = ChainSpec.from_chain_str(args.i)
 
 
 def main():
-    g = ERC20(chain_spec=chain_spec, gas_oracle=rpc.get_gas_oracle())
-
+    r = None
+    decimals = 18
+    g = ERC20(chain_spec=chain_spec)
     # determine decimals
     decimals_o = g.decimals(token_address)
     r = conn.do(decimals_o)
@@ -79,8 +98,9 @@ def main():
     token_symbol = g.parse_symbol(r)
     logg.info('symbol {}'.format(token_symbol))
 
+
     # get balance
-    balance_o = g.balance(token_address, holder_address)
+    balance_o = g.balance(token_address, address)
     r = conn.do(balance_o)
    
     hx = strip_0x(r)
@@ -89,7 +109,9 @@ def main():
 
     balance_str = str(balance_value)
     balance_len = len(balance_str)
-    if config.get('_RAW'):
+    if fmt == 'terminal':
+        sys.stdout.write('{} ({}): '.format(token_name, token_symbol))
+    if fmt == 'raw':
         print(balance_str)
     else:
         if balance_len < decimals + 1:

python/eth_erc20/runnable/transfer.py

@@ -16,19 +16,25 @@ import json
 import argparse
 import logging
 
-# external imports
+# third-party imports
+from crypto_dev_signer.eth.signer import ReferenceSigner as EIP155Signer
+from crypto_dev_signer.keystore.dict import DictKeystore
 from hexathon import (
         add_0x,
         strip_0x,
         )
 from chainlib.eth.connection import EthHTTPConnection
+from chainlib.jsonrpc import jsonrpc_template
+from chainlib.eth.nonce import (
+        RPCNonceOracle,
+        OverrideNonceOracle,
+        )
+from chainlib.eth.gas import (
+        RPCGasOracle,
+        OverrideGasOracle,
+        )
 from chainlib.chain import ChainSpec
 from chainlib.eth.runnable.util import decode_for_puny_humans
-from chainlib.eth.address import (
-        to_checksum_address,
-        is_same_address,
-        )
-import chainlib.eth.cli
 
 # local imports
 from eth_erc20 import ERC20
@@ -36,96 +42,119 @@ from eth_erc20 import ERC20
 logging.basicConfig(level=logging.WARNING)
 logg = logging.getLogger()
 
-arg_flags = chainlib.eth.cli.argflag_std_write | chainlib.eth.cli.Flag.EXEC | chainlib.eth.cli.Flag.WALLET 
-argparser = chainlib.eth.cli.ArgumentParser(arg_flags)
-argparser.add_argument('--from', type=str, help='Address to send on behalf of') 
-argparser.add_positional('amount', type=int, help='Token amount to send')
-args = argparser.parse_args()
-extra_args = {
-    'amount': None,
-    'from': None,
-        }
-config = chainlib.eth.cli.Config.from_args(args, arg_flags, extra_args=extra_args, default_fee_limit=100000)
+logging.getLogger('web3').setLevel(logging.WARNING)
+logging.getLogger('urllib3').setLevel(logging.WARNING)
 
-block_all = args.ww
+default_abi_dir = '/usr/local/share/cic/solidity/abi'
+argparser = argparse.ArgumentParser()
+argparser.add_argument('-p', '--provider', dest='p', default='http://localhost:8545', type=str, help='Web3 provider url (http only)')
+argparser.add_argument('-w', action='store_true', help='Wait for the last transaction to be confirmed')
+argparser.add_argument('-ww', action='store_true', help='Wait for every transaction to be confirmed')
+argparser.add_argument('-i', '--chain-spec', dest='i', type=str, default='evm:ethereum:1', help='Chain specification string')
+argparser.add_argument('-a', '--token-address', required='True', dest='a', type=str, help='Token address')
+argparser.add_argument('-y', '--key-file', dest='y', type=str, help='Ethereum keystore file to use for signing')
+argparser.add_argument('--env-prefix', default=os.environ.get('CONFINI_ENV_PREFIX'), dest='env_prefix', type=str, help='environment prefix for variables to overwrite configuration')
+argparser.add_argument('-u', '--unsafe', dest='u', action='store_true', help='Auto-convert address to checksum adddress')
+argparser.add_argument('-s', '--send', dest='s', action='store_true', help='Send to network')
+argparser.add_argument('--nonce', type=int, help='Override nonce')
+argparser.add_argument('--gas-price', dest='gas_price', type=int, help='Override gas price')
+argparser.add_argument('--gas-limit', dest='gas_limit', type=int, help='Override gas limit')
+argparser.add_argument('-v', action='store_true', help='Be verbose')
+argparser.add_argument('-vv', action='store_true', help='Be more verbose')
+argparser.add_argument('recipient', type=str, help='Recipient account address')
+argparser.add_argument('amount', type=int, help='Amount of tokens to mint and gift')
+args = argparser.parse_args()
+
+
+if args.vv:
+    logg.setLevel(logging.DEBUG)
+elif args.v:
+    logg.setLevel(logging.INFO)
+
+block_all = args.ww 
 block_last = args.w or block_all
 
-wallet = chainlib.eth.cli.Wallet()
-wallet.from_config(config)
+passphrase_env = 'ETH_PASSPHRASE'
+if args.env_prefix != None:
+    passphrase_env = args.env_prefix + '_' + passphrase_env
+passphrase = os.environ.get(passphrase_env)
+logg.error('pass {}'.format(passphrase_env))
+if passphrase == None:
+    logg.warning('no passphrase given')
+    passphrase=''
 
-rpc = chainlib.eth.cli.Rpc(wallet=wallet)
-conn = rpc.connect_by_config(config)
+signer_address = None
+keystore = DictKeystore()
+if args.y != None:
+    logg.debug('loading keystore file {}'.format(args.y))
+    signer_address = keystore.import_keystore_file(args.y, password=passphrase)
+    logg.debug('now have key for signer address {}'.format(signer_address))
+signer = EIP155Signer(keystore)
 
-chain_spec = ChainSpec.from_chain_str(config.get('CHAIN_SPEC'))
+conn = EthHTTPConnection(args.p)
 
-value = config.get('_AMOUNT')
+nonce_oracle = None
+if args.nonce != None:
+    nonce_oracle = OverrideNonceOracle(signer_address, args.nonce)
+else:
+    nonce_oracle = RPCNonceOracle(signer_address, conn)
 
-send = config.true('_RPC_SEND')
+def _max_gas(code=None):
+    return 8000000
+
+gas_oracle = None
+if args.gas_price != None or args.gas_limit != None:
+    gas_oracle = OverrideGasOracle(price=args.gas_price, limit=args.gas_limit)
+else:
+    gas_oracle = RPCGasOracle(conn, code_callback=_max_gas)
+
+chain_spec = ChainSpec.from_chain_str(args.i)
+chain_id = chain_spec.network_id()
+
+value = args.amount
+
+send = args.s
+
+g = ERC20(chain_spec, signer=signer, gas_oracle=gas_oracle, nonce_oracle=nonce_oracle)
 
 
-def balance(generator, token_address, address, id_generator=None):
-    o = generator.balance(token_address, address, id_generator=id_generator)
+def balance(token_address, address):
+    o = g.balance(token_address, address)
     r = conn.do(o)
-    token_balance = generator.parse_balance(r)
-    return token_balance
+    hx = strip_0x(r)
+    return int(hx, 16)
 
 
 def main():
-    signer = rpc.get_signer()
-    signer_address = rpc.get_sender_address()
+    recipient = args.recipient
+    if not args.u and recipient != add_0x(args.recipient):
+        raise ValueError('invalid checksum address')
 
-    gas_oracle = rpc.get_gas_oracle()
-    nonce_oracle = rpc.get_nonce_oracle()
-
-    g = ERC20(chain_spec, signer=signer, gas_oracle=gas_oracle, nonce_oracle=nonce_oracle)
-
-    recipient = to_checksum_address(config.get('_RECIPIENT'))
-    if not config.true('_UNSAFE') and recipient != add_0x(config.get('_RECIPIENT')):
-        raise ValueError('invalid checksum address for recipient')
-
-    token_address = to_checksum_address(config.get('_EXEC_ADDRESS'))
-    if not config.true('_UNSAFE') and token_address != add_0x(config.get('_EXEC_ADDRESS')):
-        raise ValueError('invalid checksum address for contract')
-
-    transfer_from_address = None
-    if config.get('_FROM'):
-        transfer_from_address = to_checksum_address(config.get('_FROM'))
-        if not config.true('_UNSAFE') and transfer_from_address != add_0x(config.get('_FROM')):
-            raise ValueError('invalid checksum address for "from" argument')
-
-    check_balance_address = None
-    
     if logg.isEnabledFor(logging.DEBUG):
-        if transfer_from_address:
-            check_balance_address = transfer_from_address
-        else:
-            check_balance_address = signer_address
-        sender_balance = balance(g, token_address, check_balance_address, id_generator=rpc.id_generator)
-        recipient_balance = balance(g, token_address, recipient, id_generator=rpc.id_generator)
-        logg.debug('sender {} balance before: {}'.format(check_balance_address, sender_balance))
-        logg.debug('recipient {} balance before: {}'.format(recipient, recipient_balance))
+        logg.debug('sender {} balance after: {}'.format(signer_address, balance(args.a, signer_address)))
+        logg.debug('recipient {} balance after: {}'.format(recipient, balance(args.a, recipient)))
 
-    if transfer_from_address and not is_same_address(transfer_from_address, signer_address):
-        (tx_hash_hex, o) = g.transfer_from(token_address, signer_address, transfer_from_address, recipient, value, id_generator=rpc.id_generator)
-    else:
-        (tx_hash_hex, o) = g.transfer(token_address, signer_address, recipient, value, id_generator=rpc.id_generator)
+    (tx_hash_hex, o) = g.transfer(args.a, signer_address, recipient, value)
 
     if send:
         conn.do(o)
         if block_last:
             r = conn.wait(tx_hash_hex)
             if logg.isEnabledFor(logging.DEBUG):
-                sender_balance = balance(g, token_address, check_balance_address, id_generator=rpc.id_generator)
-                recipient_balance = balance(g, token_address, recipient, id_generator=rpc.id_generator)
-                logg.debug('sender {} balance after: {}'.format(check_balance_address, sender_balance))
-                logg.debug('recipient {} balance after: {}'.format(recipient, recipient_balance))
+                logg.debug('sender {} balance after: {}'.format(signer_address, balance(args.a, signer_address)))
+                logg.debug('recipient {} balance after: {}'.format(recipient, balance(args.a, recipient)))
             if r['status'] == 0:
                 logg.critical('VM revert. Wish I could tell you more')
                 sys.exit(1)
         print(tx_hash_hex)
 
     else:
-        print(o['params'][0])
+        if logg.isEnabledFor(logging.INFO):
+            io_str = io.StringIO()
+            decode_for_puny_humans(o['params'][0], chain_spec, io_str)
+            print(io_str.getvalue())
+        else:
+            print(o['params'][0])
 
 
 if __name__ == '__main__':

python/giftable_erc20_token/data/GiftableToken.json

@@ -1 +1 @@
-[{"inputs":[{"internalType":"string","name":"_name","type":"string"},{"internalType":"string","name":"_symbol","type":"string"},{"internalType":"uint8","name":"_decimals","type":"uint8"}],"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":"_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":"_from","type":"address"},{"indexed":true,"internalType":"address","name":"_to","type":"address"},{"indexed":false,"internalType":"uint256","name":"_value","type":"uint256"}],"name":"Transfer","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"_from","type":"address"},{"indexed":true,"internalType":"address","name":"_to","type":"address"},{"indexed":true,"internalType":"address","name":"_spender","type":"address"},{"indexed":false,"internalType":"uint256","name":"_value","type":"uint256"}],"name":"TransferFrom","type":"event"},{"inputs":[{"internalType":"address","name":"_minter","type":"address"}],"name":"addMinter","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"","type":"address"},{"internalType":"address","name":"","type":"address"}],"name":"allowance","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","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":"","type":"address"}],"name":"balanceOf","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"decimals","outputs":[{"internalType":"uint8","name":"","type":"uint8"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_to","type":"address"},{"internalType":"uint256","name":"_value","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":[{"internalType":"address","name":"_minter","type":"address"}],"name":"removeMinter","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"bytes4","name":"_sum","type":"bytes4"}],"name":"supportsInterface","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"symbol","outputs":[{"internalType":"string","name":"","type":"string"}],"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":"string","name":"_name","type":"string"},{"internalType":"string","name":"_symbol","type":"string"},{"internalType":"uint8","name":"_decimals","type":"uint8"}],"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":"_from","type":"address"},{"indexed":true,"internalType":"address","name":"_to","type":"address"},{"indexed":false,"internalType":"uint256","name":"_value","type":"uint256"}],"name":"Transfer","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"_from","type":"address"},{"indexed":true,"internalType":"address","name":"_to","type":"address"},{"indexed":true,"internalType":"address","name":"_spender","type":"address"},{"indexed":false,"internalType":"uint256","name":"_value","type":"uint256"}],"name":"TransferFrom","type":"event"},{"inputs":[{"internalType":"address","name":"_minter","type":"address"}],"name":"addMinter","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"","type":"address"},{"internalType":"address","name":"","type":"address"}],"name":"allowance","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","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":"","type":"address"}],"name":"balanceOf","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"decimals","outputs":[{"internalType":"uint8","name":"","type":"uint8"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_to","type":"address"},{"internalType":"uint256","name":"_value","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":[{"internalType":"address","name":"_minter","type":"address"}],"name":"removeMinter","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"symbol","outputs":[{"internalType":"string","name":"","type":"string"}],"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"}]

python/giftable_erc20_token/factory.py

@@ -38,8 +38,7 @@ class GiftableToken(TxFactory):
 
     @staticmethod
     def gas(code=None):
-        return 2000000
-
+        return 1500000
 
     @staticmethod
     def abi():
@@ -71,18 +70,6 @@ class GiftableToken(TxFactory):
         return tx
 
 
-    def remove_minter(self, contract_address, sender_address, address, tx_format=TxFormat.JSONRPC):
-        enc = ABIContractEncoder()
-        enc.method('removeMinter')
-        enc.typ(ABIContractType.ADDRESS)
-        enc.address(address)
-        data = enc.get()
-        tx = self.template(sender_address, contract_address, use_nonce=True)
-        tx = self.set_code(tx, data)
-        tx = self.finalize(tx, tx_format)
-        return tx
-
-
     def mint_to(self, contract_address, sender_address, address, value, tx_format=TxFormat.JSONRPC):
         enc = ABIContractEncoder()
         enc.method('mintTo')

python/giftable_erc20_token/runnable/deploy.py

@@ -17,8 +17,17 @@ import time
 from enum import Enum
 
 # external imports
-import chainlib.eth.cli
+from crypto_dev_signer.eth.signer import ReferenceSigner as EIP155Signer
+from crypto_dev_signer.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
 
@@ -28,47 +37,83 @@ from giftable_erc20_token import GiftableToken
 logging.basicConfig(level=logging.WARNING)
 logg = logging.getLogger()
 
-arg_flags = chainlib.eth.cli.argflag_std_write
-argparser = chainlib.eth.cli.ArgumentParser(arg_flags)
-argparser.add_argument('--name', dest='token_name', required=True, 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')
+script_dir = os.path.dirname(__file__)
+data_dir = os.path.join(script_dir, '..', 'data')
+
+
+argparser = argparse.ArgumentParser()
+argparser.add_argument('-p', '--provider', dest='p', default='http://localhost:8545', type=str, help='Web3 provider url (http only)')
+argparser.add_argument('-w', action='store_true', help='Wait for the last transaction to be confirmed')
+argparser.add_argument('-ww', action='store_true', help='Wait for every transaction to be confirmed')
+argparser.add_argument('-i', '--chain-spec', dest='i', type=str, default='evm:ethereum:1', help='Chain specification string')
+argparser.add_argument('-y', '--key-file', dest='y', type=str, help='Ethereum keystore file to use for signing')
+argparser.add_argument('--env-prefix', default=os.environ.get('CONFINI_ENV_PREFIX'), dest='env_prefix', type=str, help='environment prefix for variables to overwrite configuration')
+argparser.add_argument('--name', default='Giftable Token', type=str, help='Token name')
+argparser.add_argument('--symbol', default='GFT', type=str, help='Token symbol')
+argparser.add_argument('--decimals', default=18, type=int, help='Token decimals')
+argparser.add_argument('-d', action='store_true', help='Dump RPC calls to terminal and do not send')
+argparser.add_argument('--gas-price', type=int, dest='gas_price', help='Override gas price')
+argparser.add_argument('--nonce', type=int, help='Override transaction nonce')
+argparser.add_argument('-v', action='store_true', help='Be verbose')
+argparser.add_argument('-vv', action='store_true', help='Be more verbose')
 args = argparser.parse_args()
 
-extra_args = {
-    'token_name': None,
-    'token_symbol': None,
-    'token_decimals': None,
-    }
-config = chainlib.eth.cli.Config.from_args(args, arg_flags, extra_args=extra_args, default_fee_limit=GiftableToken.gas())
+if args.vv:
+    logg.setLevel(logging.DEBUG)
+elif args.v:
+    logg.setLevel(logging.INFO)
 
-wallet = chainlib.eth.cli.Wallet()
-wallet.from_config(config)
+block_all = args.ww
+block_last = args.w or block_all
 
-rpc = chainlib.eth.cli.Rpc(wallet=wallet)
-conn = rpc.connect_by_config(config)
+passphrase_env = 'ETH_PASSPHRASE'
+if args.env_prefix != None:
+    passphrase_env = args.env_prefix + '_' + passphrase_env
+passphrase = os.environ.get(passphrase_env)
+if passphrase == None:
+    logg.warning('no passphrase given')
+    passphrase=''
 
-chain_spec = ChainSpec.from_chain_str(config.get('CHAIN_SPEC'))
+signer_address = None
+keystore = DictKeystore()
+if args.y != None:
+    logg.debug('loading keystore file {}'.format(args.y))
+    signer_address = keystore.import_keystore_file(args.y, password=passphrase)
+    logg.debug('now have key for signer address {}'.format(signer_address))
+signer = EIP155Signer(keystore)
+
+chain_spec = ChainSpec.from_chain_str(args.i)
+
+rpc = EthHTTPConnection(args.p)
+nonce_oracle = None
+if args.nonce != None:
+    nonce_oracle = OverrideNonceOracle(signer_address, args.nonce)
+else:
+    nonce_oracle = RPCNonceOracle(signer_address, rpc)
+
+gas_oracle = None
+if args.gas_price !=None:
+    gas_oracle = OverrideGasOracle(price=args.gas_price, conn=rpc, code_callback=GiftableToken.gas)
+else:
+    gas_oracle = RPCGasOracle(rpc, code_callback=GiftableToken.gas)
+
+dummy = args.d
+
+token_name = args.name
+token_symbol = args.symbol
+token_decimals = args.decimals
 
 
 def main():
-    signer = rpc.get_signer()
-    signer_address = rpc.get_sender_address()
-
-    token_name = config.get('_TOKEN_NAME')
-    token_symbol = config.get('_TOKEN_SYMBOL')
-    token_decimals = config.get('_TOKEN_DECIMALS')
-
-    gas_oracle = rpc.get_gas_oracle()
-    nonce_oracle = rpc.get_nonce_oracle()
-
     c = GiftableToken(chain_spec, signer=signer, gas_oracle=gas_oracle, nonce_oracle=nonce_oracle)
-
     (tx_hash_hex, o) = c.constructor(signer_address, token_name, token_symbol, token_decimals)
-    if config.get('_RPC_SEND'):
-        conn.do(o)
-        if config.get('_WAIT'):
-            r = conn.wait(tx_hash_hex)
+    if dummy:
+        print(tx_hash_hex)
+        print(o)
+    else:
+        rpc.do(o)
+        if block_last:
+            r = rpc.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)
@@ -78,8 +123,6 @@ def main():
             print(address)
         else:
             print(tx_hash_hex)
-    else:
-        print(o)
 
 
 if __name__ == '__main__':

python/giftable_erc20_token/runnable/gift.py

@@ -15,16 +15,20 @@ import argparse
 import logging
 import time
 
-# external imports
-import chainlib.eth.cli
+# third-party imports
+from crypto_dev_signer.eth.signer import ReferenceSigner as EIP155Signer
+from crypto_dev_signer.keystore.dict import DictKeystore
 from chainlib.eth.tx import receipt
 from chainlib.chain import ChainSpec
-from chainlib.eth.connection import EthHTTPConnection
-from chainlib.eth.address import to_checksum_address
-from hexathon import (
-        strip_0x,
-        add_0x,
+from chainlib.eth.nonce import (
+        RPCNonceOracle,
+        OverrideNonceOracle,
         )
+from chainlib.eth.gas import (
+        RPCGasOracle,
+        OverrideGasOracle,
+        )
+from chainlib.eth.connection import EthHTTPConnection
 
 # local imports
 from giftable_erc20_token import GiftableToken
@@ -32,50 +36,85 @@ from giftable_erc20_token import GiftableToken
 logging.basicConfig(level=logging.WARNING)
 logg = logging.getLogger()
 
-arg_flags = chainlib.eth.cli.argflag_std_write | chainlib.eth.cli.Flag.EXEC | chainlib.eth.cli.Flag.WALLET
-argparser = chainlib.eth.cli.ArgumentParser(arg_flags)
-argparser.add_positional('amount', type=int, help='Token amount to gift')
+script_dir = os.path.dirname(__file__)
+data_dir = os.path.join(script_dir, '..', 'data')
+
+argparser = argparse.ArgumentParser()
+argparser.add_argument('-p', '--provider', dest='p', default='http://localhost:8545', type=str, help='Web3 provider url (http only)')
+argparser.add_argument('-e', action='store_true', help='Treat all transactions as essential')
+argparser.add_argument('-w', action='store_true', help='Wait for the last transaction to be confirmed')
+argparser.add_argument('-ww', action='store_true', help='Wait for every transaction to be confirmed')
+argparser.add_argument('-i', '--chain-spec', dest='i', type=str, default='evm:ethereum:1', help='Chain specification string')
+argparser.add_argument('-a', '--token-address', required='True', dest='a', type=str, help='Giftable token address')
+argparser.add_argument('-y', '--key-file', dest='y', type=str, help='Ethereum keystore file to use for signing')
+argparser.add_argument('-v', action='store_true', help='Be verbose')
+argparser.add_argument('-vv', action='store_true', help='Be more verbose')
+argparser.add_argument('-d', action='store_true', help='Dump RPC calls to terminal and do not send')
+argparser.add_argument('--gas-price', type=int, dest='gas_price', help='Override gas price')
+argparser.add_argument('--nonce', type=int, help='Override transaction nonce')
+argparser.add_argument('--env-prefix', default=os.environ.get('CONFINI_ENV_PREFIX'), dest='env_prefix', type=str, help='environment prefix for variables to overwrite configuration')
+argparser.add_argument('--recipient', type=str, help='Recipient account address. If not set, tokens will be gifted to the keystore account')
+argparser.add_argument('value', type=int, help='Value of tokens to mint and gift')
 args = argparser.parse_args()
-extra_args = {
-    'amount': None,
-    }
-config = chainlib.eth.cli.Config.from_args(args, arg_flags, extra_args=extra_args, default_fee_limit=GiftableToken.gas())
 
-wallet = chainlib.eth.cli.Wallet()
-wallet.from_config(config)
+if args.vv:
+    logg.setLevel(logging.DEBUG)
+elif args.v:
+    logg.setLevel(logging.INFO)
 
-rpc = chainlib.eth.cli.Rpc(wallet=wallet)
-conn = rpc.connect_by_config(config)
+block_all = args.ww
+block_last = args.w or block_all
 
-chain_spec = ChainSpec.from_chain_str(config.get('CHAIN_SPEC'))
+passphrase_env = 'ETH_PASSPHRASE'
+if args.env_prefix != None:
+    passphrase_env = args.env_prefix + '_' + passphrase_env
+passphrase = os.environ.get(passphrase_env)
+if passphrase == None:
+    logg.warning('no passphrase given')
+    passphrase=''
+
+signer_address = None
+keystore = DictKeystore()
+if args.y != None:
+    logg.debug('loading keystore file {}'.format(args.y))
+    signer_address = keystore.import_keystore_file(args.y, password=passphrase)
+    logg.debug('now have key for signer address {}'.format(signer_address))
+signer = EIP155Signer(keystore)
+
+chain_spec = ChainSpec.from_chain_str(args.i)
+
+rpc = EthHTTPConnection(args.p)
+nonce_oracle = None
+if args.nonce != None:
+    nonce_oracle = OverrideNonceOracle(signer_address, args.nonce)
+else:
+    nonce_oracle = RPCNonceOracle(signer_address, rpc)
+
+gas_oracle = None
+if args.gas_price !=None:
+    gas_oracle = OverrideGasOracle(price=args.gas_price, conn=rpc, code_callback=GiftableToken.gas)
+else:
+    gas_oracle = RPCGasOracle(rpc, code_callback=GiftableToken.gas)
+
+dummy = args.d
+
+token_address = args.a
+recipient_address = args.recipient
+if recipient_address == None:
+    recipient_address = signer_address
+token_value = args.value
 
 
 def main():
-    signer = rpc.get_signer()
-    signer_address = rpc.get_sender_address()
-
-    gas_oracle = rpc.get_gas_oracle()
-    nonce_oracle = rpc.get_nonce_oracle()
-
-    recipient_address_input = config.get('_RECIPIENT')
-    if recipient_address_input == None:
-        recipient_address_input = signer_address
-
-    recipient_address = add_0x(to_checksum_address(recipient_address_input))
-    if not config.true('_UNSAFE') and recipient_address != add_0x(recipient_address_input):
-        raise ValueError('invalid checksum address for recipient')
-
-    token_address = add_0x(to_checksum_address(config.get('_EXEC_ADDRESS')))
-    if not config.true('_UNSAFE') and token_address != add_0x(config.get('_EXEC_ADDRESS')):
-        raise ValueError('invalid checksum address for contract')
-
-    token_value = config.get('_AMOUNT')
     c = GiftableToken(chain_spec, signer=signer, gas_oracle=gas_oracle, nonce_oracle=nonce_oracle)
     (tx_hash_hex, o) = c.mint_to(token_address, signer_address, recipient_address, token_value)
-    if config.get('_RPC_SEND'):
-        conn.do(o)
-        if config.get('_WAIT'):
-            r = conn.wait(tx_hash_hex)
+    if dummy:
+        print(tx_hash_hex)
+        print(o)
+    else:
+        rpc.do(o)
+        if block_last:
+            r = rpc.wait(tx_hash_hex)
             if r['status'] == 0:
                 sys.stderr.write('EVM revert. Wish I had more to tell you')
                 sys.exit(1)
@@ -83,8 +122,6 @@ def main():
         logg.info('mint to {} tx {}'.format(recipient_address, tx_hash_hex))
 
         print(tx_hash_hex)
-    else:
-        print(o)
 
 
 if __name__ == '__main__':

python/giftable_erc20_token/runnable/minter.py

@@ -16,15 +16,19 @@ import logging
 import time
 
 # external imports
-import chainlib.eth.cli
 from chainlib.eth.connection import EthHTTPConnection
+from crypto_dev_signer.eth.signer import ReferenceSigner as EIP155Signer
+from crypto_dev_signer.keystore.dict import DictKeystore
+from chainlib.eth.nonce import (
+        RPCNonceOracle,
+        OverrideNonceOracle,
+        )
+from chainlib.eth.gas import (
+        RPCGasOracle,
+        OverrideGasOracle,
+        )
 from chainlib.chain import ChainSpec
 from chainlib.eth.tx import receipt
-from chainlib.eth.address import to_checksum_address
-from hexathon import (
-        strip_0x,
-        add_0x,
-        )
 
 # local imports
 from giftable_erc20_token import GiftableToken
@@ -32,56 +36,80 @@ from giftable_erc20_token import GiftableToken
 logging.basicConfig(level=logging.WARNING)
 logg = logging.getLogger()
 
-arg_flags = chainlib.eth.cli.argflag_std_write | chainlib.eth.cli.Flag.EXEC | chainlib.eth.cli.Flag.WALLET
-argparser = chainlib.eth.cli.ArgumentParser(arg_flags)
-argparser.add_argument('--rm', action='store_true', help='Remove entry')
-argparser.add_positional('minter_address', type=str, help='Address to add or remove as minter')
+script_dir = os.path.dirname(__file__)
+data_dir = os.path.join(script_dir, '..', 'data')
+
+argparser = argparse.ArgumentParser()
+argparser.add_argument('-p', '--provider', dest='p', default='http://localhost:8545', type=str, help='Web3 provider url (http only)')
+argparser.add_argument('-w', action='store_true', help='Wait for the last transaction to be confirmed')
+argparser.add_argument('-ww', action='store_true', help='Wait for every transaction to be confirmed')
+argparser.add_argument('-i', '--chain-spec', dest='i', type=str, default='evm:ethereum:1', help='Chain specification string')
+argparser.add_argument('-a', '--token-address', required='True', dest='a', type=str, help='Giftable token address')
+argparser.add_argument('-y', '--key-file', dest='y', type=str, help='Ethereum keystore file to use for signing')
+argparser.add_argument('-v', action='store_true', help='Be verbose')
+argparser.add_argument('-vv', action='store_true', help='Be more verbose')
+argparser.add_argument('-d', action='store_true', help='Dump RPC calls to terminal and do not send')
+argparser.add_argument('--gas-price', type=int, dest='gas_price', help='Override gas price')
+argparser.add_argument('--nonce', type=int, help='Override transaction nonce')
+argparser.add_argument('--env-prefix', default=os.environ.get('CONFINI_ENV_PREFIX'), dest='env_prefix', type=str, help='environment prefix for variables to overwrite configuration')
+argparser.add_argument('minter_address', type=str, help='Minter address to add')
 args = argparser.parse_args()
-extra_args = {
-    'rm': None,
-    'minter_address': None,
-    }
-config = chainlib.eth.cli.Config.from_args(args, arg_flags, extra_args=extra_args, default_fee_limit=GiftableToken.gas())
 
-wallet = chainlib.eth.cli.Wallet()
-wallet.from_config(config)
+if args.vv:
+    logg.setLevel(logging.DEBUG)
+elif args.v:
+    logg.setLevel(logging.INFO)
 
-rpc = chainlib.eth.cli.Rpc(wallet=wallet)
-conn = rpc.connect_by_config(config)
+block_all = args.ww
+block_last = args.w or block_all
 
-chain_spec = ChainSpec.from_chain_str(config.get('CHAIN_SPEC'))
+passphrase_env = 'ETH_PASSPHRASE'
+if args.env_prefix != None:
+    passphrase_env = args.env_prefix + '_' + passphrase_env
+passphrase = os.environ.get(passphrase_env)
+if passphrase == None:
+    logg.warning('no passphrase given')
+    passphrase=''
+
+signer_address = None
+keystore = DictKeystore()
+if args.y != None:
+    logg.debug('loading keystore file {}'.format(args.y))
+    signer_address = keystore.import_keystore_file(args.y, password=passphrase)
+    logg.debug('now have key for signer address {}'.format(signer_address))
+signer = EIP155Signer(keystore)
+
+chain_spec = ChainSpec.from_chain_str(args.i)
+
+rpc = EthHTTPConnection(args.p)
+nonce_oracle = None
+if args.nonce != None:
+    nonce_oracle = OverrideNonceOracle(signer_address, args.nonce)
+else:
+    nonce_oracle = RPCNonceOracle(signer_address, rpc)
+
+gas_oracle = None
+if args.gas_price !=None:
+    gas_oracle = OverrideGasOracle(price=args.gas_price, conn=rpc, code_callback=GiftableToken.gas)
+else:
+    gas_oracle = RPCGasOracle(rpc, code_callback=GiftableToken.gas)
+
+dummy = args.d
+
+token_address = args.a
+minter_address = args.minter_address
 
 
 def main():
-    signer = rpc.get_signer()
-    signer_address = rpc.get_sender_address()
-
-    gas_oracle = rpc.get_gas_oracle()
-    nonce_oracle = rpc.get_nonce_oracle()
-
-    recipient_address_input = config.get('_RECIPIENT')
-    if recipient_address_input == None:
-        recipient_address_input = signer_address
-
-    recipient_address = add_0x(to_checksum_address(recipient_address_input))
-    if not config.true('_UNSAFE') and recipient_address != add_0x(recipient_address_input):
-        raise ValueError('invalid checksum address for recipient')
-
-    token_address = add_0x(to_checksum_address(config.get('_EXEC_ADDRESS')))
-    if not config.true('_UNSAFE') and token_address != add_0x(config.get('_EXEC_ADDRESS')):
-        raise ValueError('invalid checksum address for contract')
-
-    minter_address = config.get('_MINTER_ADDRESS')
     c = GiftableToken(chain_spec, signer=signer, gas_oracle=gas_oracle, nonce_oracle=nonce_oracle)
-    if config.get('_RM'):
-        (tx_hash_hex, o) = c.remove_minter(token_address, signer_address, minter_address)
+    (tx_hash_hex, o) = c.add_minter(token_address, signer_address, minter_address)
+    if dummy:
+        print(tx_hash_hex)
+        print(o)
     else:
-        (tx_hash_hex, o) = c.add_minter(token_address, signer_address, minter_address)
-
-    if config.get('_RPC_SEND'):
-        conn.do(o)
-        if config.get('_WAIT'):
-            r = conn.wait(tx_hash_hex)
+        rpc.do(o)
+        if block_last:
+            r = rpc.wait(tx_hash_hex)
             if r['status'] == 0:
                 sys.stderr.write('EVM revert. Wish I had more to tell you')
                 sys.exit(1)
@@ -89,8 +117,6 @@ def main():
         logg.info('add minter {} to {} tx {}'.format(minter_address, token_address, tx_hash_hex))
 
         print(tx_hash_hex)
-    else:
-        print(o)
 
 
 if __name__ == '__main__':

python/requirements.txt

@@ -1,3 +1,4 @@
-confini~=0.5.1
-chainlib-eth~=0.0.12
-potaahto~=0.1.0
+confini~=0.3.6rc3
+crypto-dev-signer~=0.4.14b3
+chainlib~=0.0.3a1
+potaahto~=0.0.1a2

python/run_tests.sh

@@ -1,14 +0,0 @@
-#!/bin/bash
-
-set -e
-set -x
-default_pythonpath=$PYTHONPATH:.
-export PYTHONPATH=${default_pythonpath:-.}
-for f in `ls tests/*.py`; do
-	python $f
-	if [ $? -gt 0 ]; then
-		exit 1
-	fi
-done
-set +x
-set +e

python/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = eth-erc20
-version = 0.1.2
+version = 0.0.9a2
 description = ERC20 interface and simple contract with deployment script that lets any address mint and gift itself tokens.
 author = Louis Holbrook
 author_email = dev@holbrook.no

python/tests/conftest.py

@@ -0,0 +1,25 @@
+# standard imports
+import os
+
+# external imports
+import pytest
+from crypto_dev_signer.keystore.dict import DictKeystore
+from crypto_dev_signer.eth.signer import ReferenceSigner as EIP155Signer
+
+
+@pytest.fixture(scope='session')
+def keystore():
+    ks = DictKeystore()
+    
+    pk = os.urandom(32)
+    ks.import_raw_key(pk)
+    return ks
+
+
+@pytest.fixture(scope='session')
+def signer(
+    keystore,
+        ):
+
+    s = EIP155Signer(keystore)
+    return s

python/tests/test_erc20.py

@@ -0,0 +1,74 @@
+# standard imports
+import logging
+import os 
+
+# external imports
+from hexathon import (
+        strip_0x,
+        add_0x,
+        )
+from chainlib.eth.address import to_checksum_address
+from chainlib.eth.tx import (
+        unpack,
+        TxFormat,
+        )
+from chainlib.eth.pytest import *
+
+# local imports
+from eth_erc20 import ERC20
+
+logg = logging.getLogger()
+
+contract_address = to_checksum_address('0xdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef')
+benefactor_address = to_checksum_address('0xefdeadbeefdeadbeefdeadbeefdeadbeefdeadbe')
+
+
+# TODO: use unittest instead
+def test_erc20_balance(
+    default_chain_spec,
+        ):
+    e = ERC20(default_chain_spec,)
+
+    holder_address = to_checksum_address('0xbeefdeadbeefdeadbeefdeadbeefdeadbeefdead')
+    o = e.balance_of(contract_address, holder_address)
+    assert len(o['params'][0]['data']) == 64 + 8 + 2
+    assert o['params'][0]['data'][:10] == add_0x('70a08231')
+
+
+def test_erc20_decimals(
+        default_chain_spec,
+        ):
+    e = ERC20(default_chain_spec)
+
+    o = e.decimals(contract_address)
+    assert o['params'][0]['data'] == add_0x('313ce567')
+
+
+def test_erc20_transfer(
+        keystore,
+        signer,
+        default_chain_spec,
+        ):
+    e = ERC20(default_chain_spec, signer=signer)
+
+    addresses = keystore.list()
+    (tx_hash_hex, o) = e.transfer(contract_address, addresses[0], benefactor_address, 1024)
+
+
+def test_erc20_parse_transfer_request(
+        keystore,
+        signer,
+        default_chain_spec,
+        ):
+
+    e = ERC20(default_chain_spec, signer=signer)
+
+    addresses = keystore.list()
+    (tx_hash_hex, o) = e.transfer(contract_address, addresses[0], benefactor_address, 1024, tx_format=TxFormat.RLP_SIGNED)
+    b = bytes.fromhex(strip_0x(o))
+
+    #chain_spec = ChainSpec('evm', 'foo', 1, 'bar')
+    tx = unpack(b, default_chain_spec)
+    r = ERC20.parse_transfer_request(tx['data'])
+    assert r[0] == benefactor_address
+    assert r[1] == 1024

python/tests/test_erc20_interface.py

@@ -1,200 +0,0 @@
-# standard imports
-import logging
-import unittest
-
-# external imports
-from chainlib.eth.unittest.ethtester import EthTesterCase
-from chainlib.connection import RPCConnection
-from chainlib.eth.nonce import RPCNonceOracle
-from chainlib.eth.gas import OverrideGasOracle
-from chainlib.eth.tx import (
-        transaction,
-        receipt,
-        )
-from chainlib.eth.address import to_checksum_address
-
-# local imports
-from giftable_erc20_token import GiftableToken
-from eth_erc20 import ERC20
-
-logging.basicConfig(level=logging.DEBUG)
-logg = logging.getLogger(__name__)
-
-
-class TestToken(EthTesterCase):
-
-    def setUp(self):
-        super(TestToken, self).setUp()
-        self.conn = RPCConnection.connect(self.chain_spec, 'default')
-        nonce_oracle = RPCNonceOracle(self.accounts[0], conn=self.conn)
-        c = GiftableToken(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle)
-        self.symbol = 'FOO'
-        self.name = 'Foo Token'
-        self.decimals = 16
-        (tx_hash, o) = c.constructor(self.accounts[0], self.name, self.symbol, self.decimals)
-        r = self.conn.do(o)
-        logg.debug('deployed with hash {}'.format(r))
-        
-        o = receipt(r)
-        r = self.conn.do(o)
-        self.address = to_checksum_address(r['contract_address'])
-
-        self.initial_supply = 1 << 40
-        (tx_hash, o) = c.mint_to(self.address, self.accounts[0], self.accounts[0], self.initial_supply)
-        r = self.conn.do(o)
-        o = receipt(tx_hash)
-        r = self.conn.do(o)
-        self.assertEqual(r['status'], 1)
-
-
-    def test_balance(self):
-        c = ERC20(self.chain_spec)
-        o = c.balance_of(self.address, self.accounts[0], sender_address=self.accounts[0])
-        r = self.conn.do(o)
-        balance = ERC20.parse_balance(r)
-        self.assertEqual(self.initial_supply, balance)
-
-
-    def test_supply(self):
-        c = ERC20(self.chain_spec)
-        o = c.total_supply(self.address, sender_address=self.accounts[0])
-        r = self.conn.do(o)
-        supply = ERC20.parse_total_supply(r)
-        self.assertEqual(self.initial_supply, supply)
-
-
-    def test_name(self):
-        c = ERC20(self.chain_spec)
-        o = c.name(self.address, sender_address=self.accounts[0])
-        r = self.conn.do(o)
-        name = ERC20.parse_name(r)
-        self.assertEqual(self.name, name)
-
-
-    def test_symbol(self):
-        c = ERC20(self.chain_spec)
-        o = c.symbol(self.address, sender_address=self.accounts[0])
-        r = self.conn.do(o)
-        symbol = ERC20.parse_symbol(r)
-        self.assertEqual(self.symbol, symbol)
-
-
-    def test_transfer(self):
-        nonce_oracle = RPCNonceOracle(self.accounts[0], conn=self.conn)
-        gas_oracle = OverrideGasOracle(limit=100000, conn=self.conn)
-        c = ERC20(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle, gas_oracle=gas_oracle)
-        (tx_hash, o) = c.transfer(self.address, self.accounts[0], self.accounts[1], 1000)
-        r = self.rpc.do(o)
-        o = receipt(tx_hash)
-        r = self.rpc.do(o)
-        self.assertEqual(r['status'], 1)
-
-        o = c.balance_of(self.address, self.accounts[0], sender_address=self.accounts[0])
-        r = self.rpc.do(o)
-        balance = c.parse_balance(r)
-        self.assertEqual(balance, self.initial_supply - 1000)
-
-        o = c.balance_of(self.address, self.accounts[1], sender_address=self.accounts[0])
-        r = self.rpc.do(o)
-        balance = c.parse_balance(r)
-        self.assertEqual(balance, 1000)
-
-        o = transaction(tx_hash)
-        r = self.rpc.do(o)
-        data = c.parse_transfer_request(r['data'])
-        self.assertEqual(data[0], self.accounts[1])
-        self.assertEqual(data[1], 1000)
-
-
-    def test_transfer_from(self):
-        nonce_oracle = RPCNonceOracle(self.accounts[0], conn=self.conn)
-        gas_oracle = OverrideGasOracle(limit=100000, conn=self.conn)
-        c = ERC20(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle, gas_oracle=gas_oracle)
-        (tx_hash, o) = c.approve(self.address, self.accounts[0], self.accounts[1], 1000)
-        r = self.rpc.do(o)
-        o = receipt(tx_hash)
-        r = self.rpc.do(o)
-        self.assertEqual(r['status'], 1)
-
-        o = c.allowance(self.address, self.accounts[0], self.accounts[1], sender_address=self.accounts[0])
-        r = self.rpc.do(o)
-        allowance = c.parse_allowance(r)
-        self.assertEqual(allowance, 1000)
-
-        o = transaction(tx_hash)
-        r = self.rpc.do(o)
-        data = c.parse_approve_request(r['data'])
-        self.assertEqual(data[0], self.accounts[1])
-        self.assertEqual(data[1], 1000)
-
-        nonce_oracle = RPCNonceOracle(self.accounts[1], conn=self.conn)
-        c = ERC20(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle, gas_oracle=gas_oracle)
-        (tx_hash, o) = c.transfer_from(self.address, self.accounts[1], self.accounts[0], self.accounts[2], 1001)
-        r = self.rpc.do(o)
-        o = receipt(tx_hash)
-        r = self.rpc.do(o)
-        self.assertEqual(r['status'], 0)
-
-        o = transaction(tx_hash)
-        r = self.rpc.do(o)
-        data = c.parse_transfer_from_request(r['data'])
-        self.assertEqual(data[0], self.accounts[0])
-        self.assertEqual(data[1], self.accounts[2])
-        self.assertEqual(data[2], 1001)
-
-        (tx_hash, o) = c.transfer_from(self.address, self.accounts[1], self.accounts[0], self.accounts[2], 1000)
-        r = self.rpc.do(o)
-        o = receipt(tx_hash)
-        r = self.rpc.do(o)
-        self.assertEqual(r['status'], 1)
-
-        o = c.balance_of(self.address, self.accounts[0], sender_address=self.accounts[0])
-        r = self.rpc.do(o)
-        balance = c.parse_balance(r)
-        self.assertEqual(balance, self.initial_supply - 1000)
-
-        o = c.balance_of(self.address, self.accounts[2], sender_address=self.accounts[0])
-        r = self.rpc.do(o)
-        balance = c.parse_balance(r)
-        self.assertEqual(balance, 1000)
-
-
-    def test_revoke_approve(self):
-        nonce_oracle = RPCNonceOracle(self.accounts[0], conn=self.conn)
-        gas_oracle = OverrideGasOracle(limit=100000, conn=self.conn)
-        c = ERC20(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle, gas_oracle=gas_oracle)
-        (tx_hash, o) = c.approve(self.address, self.accounts[0], self.accounts[1], 1000)
-        r = self.rpc.do(o)
-        o = receipt(tx_hash)
-        r = self.rpc.do(o)
-        self.assertEqual(r['status'], 1)
-        
-        (tx_hash, o) = c.approve(self.address, self.accounts[0], self.accounts[1], 999)
-        r = self.rpc.do(o)
-        o = receipt(tx_hash)
-        r = self.rpc.do(o)
-        self.assertEqual(r['status'], 0)
-     
-        (tx_hash, o) = c.approve(self.address, self.accounts[0], self.accounts[1], 0)
-        r = self.rpc.do(o)
-        o = receipt(tx_hash)
-        r = self.rpc.do(o)
-        self.assertEqual(r['status'], 1)
- 
-        o = c.allowance(self.address, self.accounts[0], self.accounts[1], sender_address=self.accounts[0])
-        r = self.rpc.do(o)
-        allowance = c.parse_allowance(r)
-        self.assertEqual(allowance, 0)
-
-        nonce_oracle = RPCNonceOracle(self.accounts[1], conn=self.conn)
-        c = ERC20(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle, gas_oracle=gas_oracle)
-        (tx_hash, o) = c.transfer_from(self.address, self.accounts[1], self.accounts[0], self.accounts[2], 1)
-        r = self.rpc.do(o)
-        o = receipt(tx_hash)
-        r = self.rpc.do(o)
-        self.assertEqual(r['status'], 0)
-
-
-
-if __name__ == '__main__':
-    unittest.main()

solidity/GiftableToken.json

@@ -1 +1 @@
-[{"inputs":[{"internalType":"string","name":"_name","type":"string"},{"internalType":"string","name":"_symbol","type":"string"},{"internalType":"uint8","name":"_decimals","type":"uint8"}],"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":"_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":"_from","type":"address"},{"indexed":true,"internalType":"address","name":"_to","type":"address"},{"indexed":false,"internalType":"uint256","name":"_value","type":"uint256"}],"name":"Transfer","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"_from","type":"address"},{"indexed":true,"internalType":"address","name":"_to","type":"address"},{"indexed":true,"internalType":"address","name":"_spender","type":"address"},{"indexed":false,"internalType":"uint256","name":"_value","type":"uint256"}],"name":"TransferFrom","type":"event"},{"inputs":[{"internalType":"address","name":"_minter","type":"address"}],"name":"addMinter","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"","type":"address"},{"internalType":"address","name":"","type":"address"}],"name":"allowance","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","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":"","type":"address"}],"name":"balanceOf","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"decimals","outputs":[{"internalType":"uint8","name":"","type":"uint8"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_to","type":"address"},{"internalType":"uint256","name":"_value","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":[{"internalType":"address","name":"_minter","type":"address"}],"name":"removeMinter","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"bytes4","name":"_sum","type":"bytes4"}],"name":"supportsInterface","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"symbol","outputs":[{"internalType":"string","name":"","type":"string"}],"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":"string","name":"_name","type":"string"},{"internalType":"string","name":"_symbol","type":"string"},{"internalType":"uint8","name":"_decimals","type":"uint8"}],"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":"_from","type":"address"},{"indexed":true,"internalType":"address","name":"_to","type":"address"},{"indexed":false,"internalType":"uint256","name":"_value","type":"uint256"}],"name":"Transfer","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"_from","type":"address"},{"indexed":true,"internalType":"address","name":"_to","type":"address"},{"indexed":true,"internalType":"address","name":"_spender","type":"address"},{"indexed":false,"internalType":"uint256","name":"_value","type":"uint256"}],"name":"TransferFrom","type":"event"},{"inputs":[{"internalType":"address","name":"_minter","type":"address"}],"name":"addMinter","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"","type":"address"},{"internalType":"address","name":"","type":"address"}],"name":"allowance","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","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":"","type":"address"}],"name":"balanceOf","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"decimals","outputs":[{"internalType":"uint8","name":"","type":"uint8"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_to","type":"address"},{"internalType":"uint256","name":"_value","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":[{"internalType":"address","name":"_minter","type":"address"}],"name":"removeMinter","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"symbol","outputs":[{"internalType":"string","name":"","type":"string"}],"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"}]

solidity/GiftableToken.sol

@@ -23,7 +23,7 @@ contract GiftableToken {
 	event Transfer(address indexed _from, address indexed _to, uint256 _value);
 	event TransferFrom(address indexed _from, address indexed _to, address indexed _spender, uint256 _value);
 	event Approval(address indexed _owner, address indexed _spender, uint256 _value);
-	event Mint(address indexed _minter, address indexed _beneficiary, uint256 _value); // Minter
+	event Mint(address indexed _minter, address indexed _beneficiary, uint256 _value);
 
 	constructor(string memory _name, string memory _symbol, uint8 _decimals) public {
 		owner = msg.sender;
@@ -33,7 +33,6 @@ contract GiftableToken {
 		minters[msg.sender] = true;
 	}
 
-	// Implements Minter
 	function mintTo(address _to, uint256 _value) public returns (bool) {
 		require(minters[msg.sender]);
 
@@ -53,11 +52,6 @@ contract GiftableToken {
 		return true;
 	}
 
-	// Implements Writer
-	function addWriter(address _minter) public returns (bool) {
-		return addMinter(_minter);
-	}
-
 	function removeMinter(address _minter) public returns (bool) {
 		require(msg.sender == owner || msg.sender == _minter);
 
@@ -66,11 +60,6 @@ contract GiftableToken {
 		return true;
 	}
 
-	// Implements Writer
-	function deleteWriter(address _minter) public returns (bool) {
-		return removeMinter(_minter);
-	}
-
 	// Implements ERC20
 	function transfer(address _to, uint256 _value) public returns (bool) {
 		require(balanceOf[msg.sender] >= _value);
@@ -93,16 +82,13 @@ contract GiftableToken {
 
 	// Implements ERC20
 	function approve(address _spender, uint256 _value) public returns (bool) {
-		if (_value > 0) {
-			require(allowance[msg.sender][_spender] == 0);
-		}
-		allowance[msg.sender][_spender] = _value;
+		allowance[msg.sender][_spender] += _value;
 		emit Approval(msg.sender, _spender, _value);
 		return true;
 	}
 
 	// Implements EIP165
-	function supportsInterface(bytes4 _sum) public returns (bool) {
+	function supportsInterface(bytes4 _sum) {
 		if (_sum == 0xc6bb4b70) { // ERC20
 			return true;
 		}
@@ -112,9 +98,6 @@ contract GiftableToken {
 		if (_sum == 0x01ffc9a7) { // EIP165
 			return true;
 		}
-		if (_sum == 0x80c84bd6) { // Writer
-			return true;
-		}
 		return false;
 	}
 }