Add ERC-173 support to giftable token

This reverts commit d771dbb73d.

.gitignore

@@ -4,3 +4,4 @@ dist/
 build/
 gmon.out
 *.egg-info
+.venv/

.gitlab-ci.yml

@@ -0,0 +1,28 @@
+stages:
+  - test
+  - slither-analyzer
+
+test:
+  image: registry.gitlab.com/grassrootseconomics/cic-base-images/ci-solc-python:latest
+  cache:
+  - key:
+      files:
+        - requirements.txt 
+        - test_requirements.txt
+    paths:
+      -  /root/.cache/pip 
+  allow_failure: true
+  script: 
+    - cd python 
+    - export PYTHONPATH=.
+    - pip install --extra-index-url https://pip.grassrootseconomics.net:8433 
+      --extra-index-url https://gitlab.com/api/v4/projects/27624814/packages/pypi/simple 
+      -r requirements.txt -r test_requirements.txt 
+    - bash run_tests.sh
+
+
+slither-analize:
+  image: registry.gitlab.com/grassrootseconomics/cic-base-images/ci-solc-python:latest
+  script: 
+    - pip install slither-analyzer 
+    - slither solidity/

Dockerfile

@@ -1,28 +1,35 @@
 FROM ethereum/solc:0.6.12
 
-FROM python:3.8.6-alpine
+FROM python:3.8.6
 
 COPY --from=0 /usr/bin/solc /usr/bin/solc
 
-RUN apk update &&\
-	apk add gcc bash musl-dev
+#RUN apk update &&\
+#	apk add gcc bash cargo
+RUN apt update && \
+    apt install -y gcc bash cargo
 
 WORKDIR /usr/src
 
 # Try to keep everything above here re-usable!
 
-COPY ./solidity/ /usr/src/giftable_erc20_token/solidity/
-COPY ./python/ /usr/src/giftable_erc20_token/python/
+COPY . .
 
-RUN cd giftable_erc20_token/solidity && \
+RUN chmod +x ./python/run_tests.sh
+
+RUN cd ./solidity && \
 	solc GiftableToken.sol --abi | awk 'NR>3' > GiftableToken.abi.json
 
-RUN cd giftable_erc20_token/solidity && \
+RUN cd ./solidity && \
 	solc GiftableToken.sol --bin | awk 'NR>3' > GiftableToken.bin && \
 	truncate -s "$((`stat -t -c "%s" GiftableToken.bin`-1))" GiftableToken.bin
 
-RUN cd giftable_erc20_token/python && \
-	pip install --extra-index-url https://pip.grassrootseconomics.net:8433 .
+RUN cd ./python && \
+	pip install --extra-index-url https://gitlab.com/api/v4/projects/27624814/packages/pypi/simple \
+  --extra-index-url https://pip.grassrootseconomics.net:8433 \
+  -r requirements.txt -r test_requirements.txt
+
+#RUN pip install slither-analyzer
 
 # To deploy:
 # giftable-token-deploy --contracts-dir giftable_erc20_token/solidity/ <amount>

python/CHANGELOG

@@ -1,9 +1,15 @@
+* 0.1.3	
+	- Add ERC-173 support to giftable token
+* 0.0.10
+	- 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.
 	- Change mint method name to mintTo
 	- Add add minter executable script
-	- Add decode script
 * 0.0.6
 	- Rename contracts-dir flag to abi-dir
 	- Use package data dir as default abi dir

python/MANIFEST.in

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

python/VERSION

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

python/eth_erc20/erc20.py

@@ -19,25 +19,24 @@ 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()
 
 
 class ERC20(TxFactory):
-   
-    def gas(self, code=None):
-        return 8000000
+    
 
-    def balance_of(self, contract_address, address, sender_address=ZERO_ADDRESS):
-        o = jsonrpc_template()
+    def balance_of(self, contract_address, address, sender_address=ZERO_ADDRESS, id_generator=None):
+        j = JSONRPCRequest(id_generator)
+        o = j.template()
         o['method'] = 'eth_call'
         enc = ABIContractEncoder()
         enc.method('balanceOf')
@@ -48,15 +47,17 @@ 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):
-        return self.balance_of(contract_address, address, sender_address=ZERO_ADDRESS)
+    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 symbol(self, contract_address, sender_address=ZERO_ADDRESS):
-        o = jsonrpc_template()
+    def symbol(self, contract_address, sender_address=ZERO_ADDRESS, id_generator=None):
+        j = JSONRPCRequest(id_generator)
+        o = j.template()
         o['method'] = 'eth_call'
         enc = ABIContractEncoder()
         enc.method('symbol')
@@ -65,11 +66,13 @@ 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):
-        o = jsonrpc_template()
+    def name(self, contract_address, sender_address=ZERO_ADDRESS, id_generator=None):
+        j = JSONRPCRequest(id_generator)
+        o = j.template()
         o['method'] = 'eth_call'
         enc = ABIContractEncoder()
         enc.method('name')
@@ -78,11 +81,13 @@ 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):
-        o = jsonrpc_template()
+    def decimals(self, contract_address, sender_address=ZERO_ADDRESS, id_generator=None):
+        j = JSONRPCRequest(id_generator)
+        o = j.template()
         o['method'] = 'eth_call'
         enc = ABIContractEncoder()
         enc.method('decimals')
@@ -91,11 +96,13 @@ 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):
-        o = jsonrpc_template()
+    def total_supply(self, contract_address, sender_address=ZERO_ADDRESS, id_generator=None):
+        j = JSONRPCRequest(id_generator)
+        o = j.template()
         o['method'] = 'eth_call'
         enc = ABIContractEncoder()
         enc.method('totalSupply')
@@ -104,10 +111,30 @@ 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 transfer(self, contract_address, sender_address, recipient_address, value, tx_format=TxFormat.JSONRPC):
+    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):
         enc = ABIContractEncoder()
         enc.method('transfer')
         enc.typ(ABIContractType.ADDRESS)
@@ -117,11 +144,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)
+        tx = self.finalize(tx, tx_format, id_generator=id_generator)
         return tx
 
 
-    def transfer_from(self, contract_address, sender_address, holder_address, recipient_address, value, tx_format=TxFormat.JSONRPC):
+    def transfer_from(self, contract_address, sender_address, holder_address, recipient_address, value, tx_format=TxFormat.JSONRPC, id_generator=None):
         enc = ABIContractEncoder()
         enc.method('transferFrom')
         enc.typ(ABIContractType.ADDRESS)
@@ -137,7 +164,7 @@ class ERC20(TxFactory):
         return tx
 
 
-    def approve(self, contract_address, sender_address, spender_address, value, tx_format=TxFormat.JSONRPC):
+    def approve(self, contract_address, sender_address, spender_address, value, tx_format=TxFormat.JSONRPC, id_generator=None):
         enc = ABIContractEncoder()
         enc.method('approve')
         enc.typ(ABIContractType.ADDRESS)
@@ -166,18 +193,23 @@ class ERC20(TxFactory):
         return abi_decode_single(ABIContractType.UINT256, v)
 
 
+    @classmethod
+    def parse_balance(self, v):
+        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_balance(self, v):
-        return self.parse_balance_of(v)
-
-
-    @classmethod
-    def parse_balance_of(self, v):
+    def parse_allowance(self, v):
         return abi_decode_single(ABIContractType.UINT256, v)
 
 

python/eth_erc20/runnable/balance.py

@@ -16,21 +16,17 @@ import json
 import argparse
 import logging
 
-# third-party imports
+# external imports
 from hexathon import (
         add_0x,
         strip_0x,
         even,
         )
 import sha3
-from eth_abi import encode_single
 
 # external imports
-from chainlib.eth.address import to_checksum
-from chainlib.jsonrpc import (
-        jsonrpc_template,
-        jsonrpc_result,
-        )
+import chainlib.eth.cli
+from chainlib.eth.address import to_checksum_address
 from chainlib.eth.connection import EthHTTPConnection
 from chainlib.eth.gas import (
         OverrideGasOracle,
@@ -44,44 +40,29 @@ from eth_erc20 import ERC20
 logging.basicConfig(level=logging.WARNING)
 logg = logging.getLogger()
 
-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')
+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')
 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)
 
-if args.vv:
-    logg.setLevel(logging.DEBUG)
-elif args.v:
-    logg.setLevel(logging.INFO)
+rpc = chainlib.eth.cli.Rpc()
+conn = rpc.connect_by_config(config)
 
-conn = EthHTTPConnection(args.p)
-gas_oracle = OverrideGasOracle(conn)
+chain_spec = ChainSpec.from_chain_str(config.get('CHAIN_SPEC'))
 
-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)
+token_address = config.get('_EXEC_ADDRESS')
 
 
 def main():
-    r = None
-    decimals = 18
-    g = ERC20(chain_spec=chain_spec)
+    g = ERC20(chain_spec=chain_spec, gas_oracle=rpc.get_gas_oracle())
+
     # determine decimals
     decimals_o = g.decimals(token_address)
     r = conn.do(decimals_o)
@@ -98,9 +79,8 @@ def main():
     token_symbol = g.parse_symbol(r)
     logg.info('symbol {}'.format(token_symbol))
 
-
     # get balance
-    balance_o = g.balance(token_address, address)
+    balance_o = g.balance(token_address, holder_address)
     r = conn.do(balance_o)
    
     hx = strip_0x(r)
@@ -109,9 +89,7 @@ def main():
 
     balance_str = str(balance_value)
     balance_len = len(balance_str)
-    if fmt == 'terminal':
-        sys.stdout.write('{} ({}): '.format(token_name, token_symbol))
-    if fmt == 'raw':
+    if config.get('_RAW'):
         print(balance_str)
     else:
         if balance_len < decimals + 1:

python/eth_erc20/runnable/decode.py

@@ -1,77 +0,0 @@
-#!python3
-
-"""Decode raw ERC20 transaction
-
-.. moduleauthor:: Louis Holbrook <dev@holbrook.no>
-.. pgp:: 0826EDA1702D1E87C6E2875121D2E7BB88C2A746 
-
-"""
-
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# standard imports
-import sys
-import os
-import json
-import argparse
-import logging
-import select
-
-# external imports
-from chainlib.eth.tx import unpack
-from chainlib.chain import ChainSpec
-from chainlib.eth.connection import EthHTTPConnection
-
-# local imports
-from eth_erc20.runnable.util import Decoder
-
-logging.basicConfig(level=logging.WARNING)
-logg = logging.getLogger()
-
-def stdin_arg(t=0):
-    h = select.select([sys.stdin], [], [], t)
-    if len(h[0]) > 0:
-        logg.debug('got stdin arg')
-        v = h[0][0].read()
-        return v.rstrip()
-    return None
-
-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('-n', '--no-resolve', dest='n', action='store_true', help='Do not resolve token metadata on-chain')
-argparser.add_argument('-i', '--chain-id', dest='i', default='evm:ethereum:1', type=str, help='Numeric network id')
-argparser.add_argument('-v', action='store_true', help='Be verbose')
-argparser.add_argument('-vv', action='store_true', help='Be more verbose')
-argparser.add_argument('tx', type=str, nargs='?', default=stdin_arg(), help='hex-encoded signed raw transaction')
-args = argparser.parse_args()
-
-if args.vv:
-    logg.setLevel(logging.DEBUG)
-elif args.v:
-    logg.setLevel(logging.INFO)
-
-argp = args.tx
-if argp == None:
-    logg.info('no argument provided or delayed stdin, attempting another read')
-    argp = stdin_arg(t=None)
-    if argp == None:
-        argparser.error('need first positional argument or value from stdin')
-
-conn = EthHTTPConnection(args.p)
-
-chain_spec = ChainSpec.from_chain_str(args.i)
-
-no_resolve = args.n
-
-def main():
-    tx_raw = argp
-    resolve_rpc = None
-    if not no_resolve:
-        resolve_rpc = conn
-    dec = Decoder(chain_spec)
-    dec.decode_for_puny_humans(tx_raw, chain_spec, sys.stdout, 'transfer', rpc=resolve_rpc)
-
-if __name__ == '__main__':
-    main()

python/eth_erc20/runnable/transfer.py

@@ -10,35 +10,22 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 # standard imports
-import sys
 import os
 import io
 import json
 import argparse
 import logging
 
-# third-party imports
-from crypto_dev_signer.eth.signer import ReferenceSigner as EIP155Signer
-from crypto_dev_signer.keystore.dict import DictKeystore
+# external imports
 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.tx import (
-        unpack,
-        )
-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
+import chainlib.eth.cli
 
 # local imports
 from eth_erc20 import ERC20
@@ -46,126 +33,79 @@ from eth_erc20 import ERC20
 logging.basicConfig(level=logging.WARNING)
 logg = logging.getLogger()
 
-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('-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', required=True, 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('--data-only', dest='data_only', action='store_true', help='output data part only (does not require key)')
-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')
+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)
 
-
-if args.vv:
-    logg.setLevel(logging.DEBUG)
-elif args.v:
-    logg.setLevel(logging.INFO)
-
-block_all = args.ww 
+block_all = args.ww
 block_last = args.w or block_all
 
-signer = None
-signer_address = None
-nonce_oracle = None
+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)
 
-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')
 
 
-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=ERC20.gas())
-
-chain_spec = ChainSpec.from_chain_str(args.i)
-chain_id = chain_spec.network_id()
-
-value = args.amount
-
-send = args.s
-
-data_only = args.data_only
-
-g = ERC20(chain_spec, signer=signer, gas_oracle=gas_oracle, nonce_oracle=nonce_oracle)
-
-
-def balance(token_address, address):
-    o = g.balance(token_address, address)
+def balance(generator, token_address, address, id_generator=None):
+    o = generator.balance(token_address, address, id_generator=id_generator)
     r = conn.do(o)
-    hx = strip_0x(r)
-    return int(hx, 16)
+    token_balance = generator.parse_balance(r)
+    return token_balance
 
 
 def main():
-    recipient = args.recipient
-    if not args.u and recipient != add_0x(args.recipient):
-        raise ValueError('invalid checksum address')
+    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')
 
     if logg.isEnabledFor(logging.DEBUG):
-        logg.debug('sender {} balance after: {}'.format(signer_address, balance(args.a, signer_address)))
-        logg.debug('recipient {} balance after: {}'.format(recipient, balance(args.a, recipient)))
+        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 before: {}'.format(signer_address, sender_balance))
+        logg.debug('recipient {} balance before: {}'.format(recipient, recipient_balance))
 
-    (tx_hash_hex, o) = g.transfer(args.a, signer_address, recipient, value)
-    if data_only:
-        tx_raw_bytes = bytes.fromhex(strip_0x(o['params'][0]))
-        tx = unpack(tx_raw_bytes, chain_spec)
-        print(tx['data'])
-        sys.exit(0)
+    (tx_hash_hex, o) = g.transfer(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):
-                logg.debug('sender {} balance after: {}'.format(signer_address, balance(args.a, signer_address)))
-                logg.debug('recipient {} balance after: {}'.format(recipient, balance(args.a, recipient)))
+                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:
-        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])
+        print(o['params'][0])
 
 
 if __name__ == '__main__':

python/eth_erc20/runnable/util.py

@@ -1,71 +0,0 @@
-# external imports
-from chainlib.eth.tx import (
-        unpack,
-        Tx,
-        )
-from hexathon import (
-        strip_0x,
-        add_0x,
-        )
-from chainlib.eth.constant import ZERO_ADDRESS
-from chainlib.eth.runnable.util import decode_out
-
-# local imports
-from eth_erc20.erc20 import ERC20
-
-sender_address = ZERO_ADDRESS
-
-
-class Decoder:
-
-    def __init__(self, chain_spec):
-        self.chain_spec = chain_spec
-
-
-    def decode_transfer(self, tx, writer, rpc=None):
-        r = ERC20.parse_transfer_request(tx['data'])    
-        token_value = r[1]
-        token_str = tx['to']
-        token_recipient = r[0]
-        if rpc != None:
-            c = ERC20(self.chain_spec)
-            o = c.symbol(tx['to'], sender_address=sender_address)
-            r = rpc.do(o)
-            symbol = c.parse_symbol(r)
-
-            o = c.name(tx['to'], sender_address=sender_address)
-            r = rpc.do(o)
-            name = c.parse_symbol(r)
-
-            o = c.decimals(tx['to'], sender_address=sender_address)
-            r = rpc.do(o)
-            decimals = c.parse_decimals(r)
-
-            token_str = '{} ({})'.format(name, symbol)
-            token_value = token_value / (10 ** decimals)
-            token_value_str = '{:.6f} ({} decimals)'.format(token_value, decimals)
-
-        writer.write("""to: {}
-token: {}
-value: {}
-""".format(
-    token_recipient,
-    token_str,
-    token_value_str,
-    )
-)
-
-        #writer.write('{}\n'.format(r))k
-
-
-    def decode_for_puny_humans(self, tx_raw, chain_spec, writer, method, rpc=None):
-        tx_raw = strip_0x(tx_raw)
-        tx_raw_bytes = bytes.fromhex(tx_raw)
-        tx_src = unpack(tx_raw_bytes, chain_spec)
-        tx = Tx.src_normalize(tx_src)
-      
-        self.decode_transfer(tx, writer, rpc=rpc)
-
-        decode_out(tx_src, writer, skip_keys=['to'])
-        
-        writer.write('src: {}\n'.format(add_0x(tx_raw)))

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":"_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"}]
+[{"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":[],"name":"owner","outputs":[{"internalType":"address","name":"","type":"address"}],"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":"address","name":"_newOwner","type":"address"}],"name":"transferOwnership","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"}]

python/giftable_erc20_token/factory.py

@@ -38,7 +38,8 @@ class GiftableToken(TxFactory):
 
     @staticmethod
     def gas(code=None):
-        return 1500000
+        return 2000000
+
 
     @staticmethod
     def abi():
@@ -70,6 +71,18 @@ 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,17 +17,8 @@ import time
 from enum import Enum
 
 # external imports
-from crypto_dev_signer.eth.signer import ReferenceSigner as EIP155Signer
-from crypto_dev_signer.keystore.dict import DictKeystore
+import chainlib.eth.cli
 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
 
@@ -37,83 +28,47 @@ from giftable_erc20_token import GiftableToken
 logging.basicConfig(level=logging.WARNING)
 logg = logging.getLogger()
 
-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')
+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')
 args = argparser.parse_args()
 
-if args.vv:
-    logg.setLevel(logging.DEBUG)
-elif args.v:
-    logg.setLevel(logging.INFO)
+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())
 
-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)
-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(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
+chain_spec = ChainSpec.from_chain_str(config.get('CHAIN_SPEC'))
 
 
 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 dummy:
-        print(tx_hash_hex)
-        print(o)
-    else:
-        rpc.do(o)
-        if block_last:
-            r = rpc.wait(tx_hash_hex)
+    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)
@@ -123,6 +78,8 @@ def main():
             print(address)
         else:
             print(tx_hash_hex)
+    else:
+        print(o)
 
 
 if __name__ == '__main__':

python/giftable_erc20_token/runnable/gift.py

@@ -15,20 +15,16 @@ import argparse
 import logging
 import time
 
-# third-party imports
-from crypto_dev_signer.eth.signer import ReferenceSigner as EIP155Signer
-from crypto_dev_signer.keystore.dict import DictKeystore
+# external imports
+import chainlib.eth.cli
 from chainlib.eth.tx import receipt
 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.address import to_checksum_address
+from hexathon import (
+        strip_0x,
+        add_0x,
+        )
 
 # local imports
 from giftable_erc20_token import GiftableToken
@@ -36,85 +32,50 @@ from giftable_erc20_token import GiftableToken
 logging.basicConfig(level=logging.WARNING)
 logg = logging.getLogger()
 
-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')
+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')
 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())
 
-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=''
-
-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
+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()
+
+    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 dummy:
-        print(tx_hash_hex)
-        print(o)
-    else:
-        rpc.do(o)
-        if block_last:
-            r = rpc.wait(tx_hash_hex)
+    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. Wish I had more to tell you')
                 sys.exit(1)
@@ -122,6 +83,8 @@ 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,19 +16,15 @@ 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
@@ -36,80 +32,56 @@ from giftable_erc20_token import GiftableToken
 logging.basicConfig(level=logging.WARNING)
 logg = logging.getLogger()
 
-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')
+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')
 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())
 
-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=''
-
-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
+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()
+
+    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)
-    (tx_hash_hex, o) = c.add_minter(token_address, signer_address, minter_address)
-    if dummy:
-        print(tx_hash_hex)
-        print(o)
+    if config.get('_RM'):
+        (tx_hash_hex, o) = c.remove_minter(token_address, signer_address, minter_address)
     else:
-        rpc.do(o)
-        if block_last:
-            r = rpc.wait(tx_hash_hex)
+        (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)
             if r['status'] == 0:
                 sys.stderr.write('EVM revert. Wish I had more to tell you')
                 sys.exit(1)
@@ -117,6 +89,8 @@ 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,4 +1,4 @@
-confini~=0.3.6rc3
-crypto-dev-signer~=0.4.14b3
-chainlib~=0.0.3a1
+confini>=0.3.6rc3,<0.5.0
+crypto-dev-signer>=0.4.15a1,<=0.4.15
+chainlib-eth>=0.0.9a9,<=0.1.0
 potaahto~=0.0.1a2

python/run_tests.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+set -e
+set -x
+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.0.9a5
+version = 0.1.3
 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
@@ -44,4 +44,3 @@ console_scripts =
 	giftable-token-minter = giftable_erc20_token.runnable.minter:main
 	erc20-transfer = eth_erc20.runnable.transfer:main
 	erc20-balance = eth_erc20.runnable.balance:main
-	erc20-decode = eth_erc20.runnable.decode:main

python/tests/conftest.py

@@ -1,25 +0,0 @@
-# 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

@@ -1,74 +0,0 @@
-# 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

@@ -0,0 +1,200 @@
+# 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":"_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"}]
+[{"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":[],"name":"owner","outputs":[{"internalType":"address","name":"","type":"address"}],"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":"address","name":"_newOwner","type":"address"}],"name":"transferOwnership","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"}]

solidity/GiftableToken.sol

@@ -1,10 +1,11 @@
 pragma solidity >0.6.11;
 
 // SPDX-License-Identifier: GPL-3.0-or-later
+// File-Version: 2
 
 contract GiftableToken {
 
-	address owner;
+	address public owner;
 	mapping(address => bool) minters;
 
 	// Implements ERC20
@@ -82,13 +83,21 @@ contract GiftableToken {
 
 	// Implements ERC20
 	function approve(address _spender, uint256 _value) public returns (bool) {
-		allowance[msg.sender][_spender] += _value;
+		if (_value > 0) {
+			require(allowance[msg.sender][_spender] == 0);
+		}
+		allowance[msg.sender][_spender] = _value;
 		emit Approval(msg.sender, _spender, _value);
 		return true;
 	}
 
+	// Implements EIP173
+	function transferOwnership(address _newOwner) public returns (bool) {
+		owner = _newOwner;
+	}
+
 	// Implements EIP165
-	function supportsInterface(bytes4 _sum) {
+	function supportsInterface(bytes4 _sum) public returns (bool) {
 		if (_sum == 0xc6bb4b70) { // ERC20
 			return true;
 		}
@@ -98,6 +107,9 @@ contract GiftableToken {
 		if (_sum == 0x01ffc9a7) { // EIP165
 			return true;
 		}
+		if (_sum == 0x9493f8b2) { // EIP173
+			return true;
+		}
 		return false;
 	}
 }

solidity/Makefile

@@ -4,7 +4,9 @@ all:
 	$(SOLC) --bin GiftableToken.sol --evm-version byzantium | awk 'NR>3' > GiftableToken.bin
 	truncate -s -1 GiftableToken.bin
 	$(SOLC) --abi GiftableToken.sol --evm-version byzantium | awk 'NR>3' > GiftableToken.json
+	$(SOLC) --bin StaticToken.sol --evm-version byzantium | awk 'NR>3' > StaticToken.bin
+	truncate -s -1 StaticToken.bin
+	$(SOLC) --abi StaticToken.sol --evm-version byzantium | awk 'NR>3' > StaticToken.json
 
 install: all
 	cp -v *{json,bin} ../python/giftable_erc20_token/data/
-