Revert "Improve test coverage"

This reverts commit 2d79c863ce.

.gitignore

@@ -0,0 +1,6 @@
+__pycache__
+*.pyc
+dist/
+build/
+gmon.out
+*.egg-info

python/CHANGELOG

@@ -1,3 +1,13 @@
+* 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
+* 0.0.6
+	- Rename contracts-dir flag to abi-dir
+	- Use package data dir as default abi dir
+* 0.0.5
+	- Add token owner flag to deploy script
 * 0.0.4
 	- Bundle abi in data subfolder
 * 0.0.3

python/MANIFEST.in

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

python/eth_erc20/__init__.py

@@ -0,0 +1 @@
+from .erc20 import ERC20

python/eth_erc20/data/ERC20.json

@@ -0,0 +1 @@
+[{"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":"_owner","type":"address"},{"internalType":"address","name":"_spender","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":[],"name":"decimals","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"name","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","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/eth_erc20/erc20.py

@@ -0,0 +1,251 @@
+# standard imports
+import logging
+
+# external imports
+import sha3
+from hexathon import (
+        add_0x,
+        strip_0x,
+        )
+from crypto_dev_signer.eth.transaction import EIP155Transaction
+
+# external imports
+from chainlib.hash import (
+        keccak256_hex_to_hex,
+        keccak256_string_to_hex,
+        )
+from chainlib.eth.constant import ZERO_ADDRESS
+from chainlib.eth.tx import (
+        TxFactory,
+        TxFormat,
+        )
+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 balance_of(self, contract_address, address, sender_address=ZERO_ADDRESS):
+        o = jsonrpc_template()
+        o['method'] = 'eth_call'
+        enc = ABIContractEncoder()
+        enc.method('balanceOf')
+        enc.typ(ABIContractType.ADDRESS)
+        enc.address(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')
+        return o
+
+
+    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):
+        o = jsonrpc_template()
+        o['method'] = 'eth_call'
+        enc = ABIContractEncoder()
+        enc.method('symbol')
+        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')
+        return o
+
+
+    def name(self, contract_address, sender_address=ZERO_ADDRESS):
+        o = jsonrpc_template()
+        o['method'] = 'eth_call'
+        enc = ABIContractEncoder()
+        enc.method('name')
+        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')
+        return o
+
+    
+    def decimals(self, contract_address, sender_address=ZERO_ADDRESS):
+        o = jsonrpc_template()
+        o['method'] = 'eth_call'
+        enc = ABIContractEncoder()
+        enc.method('decimals')
+        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')
+        return o
+
+
+    def total_supply(self, contract_address, sender_address=ZERO_ADDRESS):
+        o = jsonrpc_template()
+        o['method'] = 'eth_call'
+        enc = ABIContractEncoder()
+        enc.method('totalSupply')
+        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')
+        return o
+
+
+    def transfer(self, contract_address, sender_address, recipient_address, value, tx_format=TxFormat.JSONRPC):
+        enc = ABIContractEncoder()
+        enc.method('transfer')
+        enc.typ(ABIContractType.ADDRESS)
+        enc.typ(ABIContractType.UINT256)
+        enc.address(recipient_address)
+        enc.uint256(value)
+        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)
+        return tx
+
+
+    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)
+        enc.typ(ABIContractType.ADDRESS)
+        enc.typ(ABIContractType.UINT256)
+        enc.address(holder_address)
+        enc.address(recipient_address)
+        enc.uint256(value)
+        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)
+        return tx
+
+
+    def approve(self, contract_address, sender_address, spender_address, value, tx_format=TxFormat.JSONRPC):
+        enc = ABIContractEncoder()
+        enc.method('approve')
+        enc.typ(ABIContractType.ADDRESS)
+        enc.typ(ABIContractType.UINT256)
+        enc.address(spender_address)
+        enc.uint256(value)
+        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)
+        return tx
+
+
+    @classmethod
+    def parse_symbol(self, v):
+        return abi_decode_single(ABIContractType.STRING, v)
+
+
+    @classmethod
+    def parse_name(self, v):
+        return abi_decode_single(ABIContractType.STRING, v)
+
+
+    @classmethod
+    def parse_decimals(self, v):
+        return abi_decode_single(ABIContractType.UINT256, v)
+
+
+    @classmethod
+    def parse_balance(self, v):
+        return abi_decode_single(ABIContractType.UINT256, v)
+
+
+    @classmethod
+    def parse_transfer_request(self, v):
+        v = strip_0x(v)
+        cursor = 0
+        enc = ABIContractEncoder()
+        enc.method('transfer')
+        enc.typ(ABIContractType.ADDRESS)
+        enc.typ(ABIContractType.UINT256)
+        r = enc.get()
+        l = len(r)
+        m = v[:l]
+        if m != r:
+            logg.error('method mismatch, expected {}, got {}'.format(r, m))
+            raise RequestMismatchException(v)
+        cursor += l
+
+        dec = ABIContractDecoder()
+        dec.typ(ABIContractType.ADDRESS)
+        dec.typ(ABIContractType.UINT256)
+        dec.val(v[cursor:cursor+64])
+        cursor += 64
+        dec.val(v[cursor:cursor+64])
+        r = dec.decode()
+        return r 
+
+
+    @classmethod
+    def parse_transfer_from_request(self, v):
+        v = strip_0x(v)
+        cursor = 0
+        enc = ABIContractEncoder()
+        enc.method('transferFrom')
+        enc.typ(ABIContractType.ADDRESS)
+        enc.typ(ABIContractType.ADDRESS)
+        enc.typ(ABIContractType.UINT256)
+        r = enc.get()
+        l = len(r)
+        m = v[:l]
+        if m != r:
+            logg.error('method mismatch, expected {}, got {}'.format(r, m))
+            raise RequestMismatchException(v)
+        cursor += l
+
+        dec = ABIContractDecoder()
+        dec.typ(ABIContractType.ADDRESS)
+        dec.typ(ABIContractType.ADDRESS)
+        dec.typ(ABIContractType.UINT256)
+        dec.val(v[cursor:cursor+64])
+        cursor += 64
+        dec.val(v[cursor:cursor+64])
+        cursor += 64
+        dec.val(v[cursor:cursor+64])
+        r = dec.decode()
+        return r 
+
+
+    @classmethod
+    def parse_approve_request(self, v):
+        v = strip_0x(v)
+        cursor = 0
+        enc = ABIContractEncoder()
+        enc.method('approve')
+        enc.typ(ABIContractType.ADDRESS)
+        enc.typ(ABIContractType.UINT256)
+        r = enc.get()
+        l = len(r)
+        m = v[:l]
+        if m != r:
+            logg.error('method mismatch, expected {}, got {}'.format(r, m))
+            raise RequestMismatchException(v)
+        cursor += l
+
+        dec = ABIContractDecoder()
+        dec.typ(ABIContractType.ADDRESS)
+        dec.typ(ABIContractType.UINT256)
+        dec.val(v[cursor:cursor+64])
+        cursor += 64
+        dec.val(v[cursor:cursor+64])
+        r = dec.decode()
+        return r 

python/eth_erc20/runnable/balance.py

@@ -0,0 +1,125 @@
+#!python3
+
+"""Token balance query script
+
+.. 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
+
+# third-party 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,
+        )
+from chainlib.eth.connection import EthHTTPConnection
+from chainlib.eth.gas import (
+        OverrideGasOracle,
+        balance,
+        )
+from chainlib.chain import ChainSpec
+
+# local imports
+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')
+args = argparser.parse_args()
+
+
+if args.vv:
+    logg.setLevel(logging.DEBUG)
+elif args.v:
+    logg.setLevel(logging.INFO)
+
+conn = EthHTTPConnection(args.p)
+gas_oracle = OverrideGasOracle(conn)
+
+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():
+    r = None
+    decimals = 18
+    g = ERC20(chain_spec=chain_spec)
+    # determine decimals
+    decimals_o = g.decimals(token_address)
+    r = conn.do(decimals_o)
+    decimals = int(strip_0x(r), 16)
+    logg.info('decimals {}'.format(decimals))
+
+    name_o = g.name(token_address)
+    r = conn.do(name_o)
+    token_name = g.parse_name(r)
+    logg.info('name {}'.format(token_name))
+
+    symbol_o = g.symbol(token_address)
+    r = conn.do(symbol_o)
+    token_symbol = g.parse_symbol(r)
+    logg.info('symbol {}'.format(token_symbol))
+
+
+    # get balance
+    balance_o = g.balance(token_address, address)
+    r = conn.do(balance_o)
+   
+    hx = strip_0x(r)
+    balance_value = int(hx, 16)
+    logg.debug('balance {} = {} decimals {}'.format(even(hx), balance_value, decimals))
+
+    balance_str = str(balance_value)
+    balance_len = len(balance_str)
+    if fmt == 'terminal':
+        sys.stdout.write('{} ({}): '.format(token_name, token_symbol))
+    if fmt == 'raw':
+        print(balance_str)
+    else:
+        if balance_len < decimals + 1:
+            print('0.{}'.format(balance_str.zfill(decimals)))
+        else:
+            offset = balance_len-decimals
+            print('{}.{}'.format(balance_str[:offset],balance_str[offset:]))
+
+
+if __name__ == '__main__':
+    main()

python/eth_erc20/runnable/transfer.py

@@ -0,0 +1,161 @@
+#!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
+
+# 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
+
+# local imports
+from eth_erc20 import ERC20
+
+logging.basicConfig(level=logging.WARNING)
+logg = logging.getLogger()
+
+logging.getLogger('web3').setLevel(logging.WARNING)
+logging.getLogger('urllib3').setLevel(logging.WARNING)
+
+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
+
+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=''
+
+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)
+
+conn = EthHTTPConnection(args.p)
+
+nonce_oracle = None
+if args.nonce != None:
+    nonce_oracle = OverrideNonceOracle(signer_address, args.nonce)
+else:
+    nonce_oracle = RPCNonceOracle(signer_address, conn)
+
+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(token_address, address):
+    o = g.balance(token_address, address)
+    r = conn.do(o)
+    hx = strip_0x(r)
+    return int(hx, 16)
+
+
+def main():
+    recipient = args.recipient
+    if not args.u and recipient != add_0x(args.recipient):
+        raise ValueError('invalid checksum address')
+
+    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)))
+
+    (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):
+                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:
+        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__':
+    main()

python/giftable_erc20_token/__init__.py

@@ -0,0 +1 @@
+from .factory import GiftableToken

python/giftable_erc20_token/data/GiftableToken.abi.json

@@ -1 +0,0 @@
-[{"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":"allowances","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":"uint256","name":"_value","type":"uint256"}],"name":"mint","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/data/GiftableToken.json

@@ -0,0 +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"}]

python/giftable_erc20_token/data/__init__.py

@@ -0,0 +1,3 @@
+import os
+
+data_dir = os.path.realpath(os.path.dirname(__file__))

python/giftable_erc20_token/factory.py

@@ -0,0 +1,84 @@
+# standard imports
+import os
+import logging
+
+# external imports
+from chainlib.eth.tx import (
+        TxFactory,
+        TxFormat,
+        )
+from chainlib.hash import keccak256_string_to_hex
+from chainlib.eth.contract import (
+        ABIContractEncoder,
+        ABIContractType,
+        )
+
+# local imports
+from giftable_erc20_token.data import data_dir
+
+logg = logging.getLogger(__name__)
+
+
+class GiftableToken(TxFactory):
+
+    __abi = None
+    __bytecode = None
+
+    def constructor(self, sender_address, name, symbol, decimals, tx_format=TxFormat.JSONRPC):
+        code = GiftableToken.bytecode()
+        enc = ABIContractEncoder()
+        enc.string(name)
+        enc.string(symbol)
+        enc.uint256(decimals)
+        code += enc.get()
+        tx = self.template(sender_address, None, use_nonce=True)
+        tx = self.set_code(tx, code)
+        return self.finalize(tx, tx_format)
+
+
+    @staticmethod
+    def gas(code=None):
+        return 1500000
+
+    @staticmethod
+    def abi():
+        if GiftableToken.__abi == None:
+            f = open(os.path.join(data_dir, 'GiftableToken.json'), 'r')
+            GiftableToken.__abi = json.load(f)
+            f.close()
+        return GiftableToken.__abi
+
+
+    @staticmethod
+    def bytecode():
+        if GiftableToken.__bytecode == None:
+            f = open(os.path.join(data_dir, 'GiftableToken.bin'))
+            GiftableToken.__bytecode = f.read()
+            f.close()
+        return GiftableToken.__bytecode
+
+
+    def add_minter(self, contract_address, sender_address, address, tx_format=TxFormat.JSONRPC):
+        enc = ABIContractEncoder()
+        enc.method('addMinter')
+        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')
+        enc.typ(ABIContractType.ADDRESS)
+        enc.typ(ABIContractType.UINT256)
+        enc.address(address)
+        enc.uint256(value)
+        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

python/giftable_erc20_token/runnable/deploy.py

@@ -1,4 +1,4 @@
-"""Deploys giftable token, and optionally gifts a set amount to all accounts in wallet
+"""Deploys giftable token
 
 .. moduleauthor:: Louis Holbrook <dev@holbrook.no>
 .. pgp:: 0826EDA1702D1E87C6E2875121D2E7BB88C2A746 
@@ -8,78 +8,121 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 # standard imports
+import sys
 import os
 import json
 import argparse
 import logging
+import time
+from enum import Enum
 
-# third-party imports
-import web3
+# external imports
+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
+
+# local imports
+from giftable_erc20_token import GiftableToken
 
 logging.basicConfig(level=logging.WARNING)
 logg = logging.getLogger()
 
-logging.getLogger('web3').setLevel(logging.WARNING)
-logging.getLogger('urllib3').setLevel(logging.WARNING)
+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('-n', '--name', dest='n', default='Giftable Token', type=str, help='Token name')
-argparser.add_argument('-s', '--symbol', dest='s', default='GFT', type=str, help='Token symbol')
-argparser.add_argument('-d', '--decimals', dest='d', default=18, type=int, help='Token decimals')
-argparser.add_argument('-a', '--account', dest='a', action='append', type=str, help='Account to fund')
-argparser.add_argument('-m', '--minter', dest='m', action='append', type=str, help='Minter to add')
-argparser.add_argument('--contracts-dir', dest='contracts_dir', type=str, default='.', help='Directory containing bytecode and abi')
+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('amount', type=int, help='Initial token supply (will be owned by contract creator)')
+argparser.add_argument('-vv', action='store_true', help='Be more verbose')
 args = argparser.parse_args()
 
-if args.v:
+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
+
+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_name = args.name
+token_symbol = args.symbol
+token_decimals = args.decimals
+
 
 def main():
-    w3 = web3.Web3(web3.Web3.HTTPProvider(args.p))
+    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 r['status'] == 0:
+                sys.stderr.write('EVM revert while deploying contract. Wish I had more to tell you')
+                sys.exit(1)
+            # TODO: pass through translator for keys (evm tester uses underscore instead of camelcase)
+            address = r['contractAddress']
 
-    f = open(os.path.join(args.contracts_dir, 'GiftableToken.abi.json'), 'r')
-    abi = json.load(f)
-    f.close()
-
-    f = open(os.path.join(args.contracts_dir, 'GiftableToken.bin'), 'r')
-    bytecode = f.read()
-    f.close()
-
-    w3.eth.defaultAccount = w3.eth.accounts[0]
-
-    c = w3.eth.contract(abi=abi, bytecode=bytecode)
-    tx_hash = c.constructor(args.n, args.s, args.d).transact()
-    rcpt = w3.eth.getTransactionReceipt(tx_hash)
-    address = rcpt.contractAddress
-    c = w3.eth.contract(abi=abi, address=address)
-
-    logg.debug('construct tx {} address {}'.format(tx_hash.hex(), address))
-
-    balance = c.functions.balanceOf(w3.eth.defaultAccount).call()
-    logg.info('balance {}: {} {}'.format(w3.eth.defaultAccount, balance, tx_hash))
-
-
-    if args.a != None:
-        for a in args.a:
-            if a == w3.eth.defaultAccount:
-                continue
-            tx_hash_mint = c.functions.mint(args.amount).transact()
-            tx_hash_transfer = c.functions.transfer(a, args.amount).transact()
-            rcpt = w3.eth.getTransactionReceipt(tx_hash)
-            balance = c.functions.balanceOf(a).call()
-            logg.info('balance {}: {}'.format(a, balance))
-
-    if args.m != None:
-        for a in args.m:
-            if a == w3.eth.defaultAccount:
-                continue
-            tx_hash_minter = c.functions.addMinter(a).transact()
-            logg.info('minter {}'.format(a))
-
-    print(address)
+            print(address)
+        else:
+            print(tx_hash_hex)
 
 
 if __name__ == '__main__':

python/giftable_erc20_token/runnable/gift.py

@@ -8,52 +8,121 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 # standard imports
+import sys
 import os
 import json
 import argparse
 import logging
+import time
 
 # third-party imports
-import web3
+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.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
 
 logging.basicConfig(level=logging.WARNING)
 logg = logging.getLogger()
 
-logging.getLogger('web3').setLevel(logging.WARNING)
-logging.getLogger('urllib3').setLevel(logging.WARNING)
+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('-t', '--token-address', required='True', dest='t', type=str, help='Giftable token address')
-argparser.add_argument('-m', '--minter-address', dest='m', type=str, help='Minter account address')
-argparser.add_argument('--contracts-dir', dest='contracts_dir', type=str, default='.', help='Directory containing bytecode and abi')
+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('-r', '--recipient-address', dest='r', type=str, help='Recipient account address')
-argparser.add_argument('amount', type=int, help='Amount of tokens to mint and gift')
+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()
 
-if args.v:
+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
+
+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():
-    w3 = web3.Web3(web3.Web3.HTTPProvider(args.p))
-
-    f = open(os.path.join(args.contracts_dir, 'GiftableToken.abi.json'), 'r')
-    abi = json.load(f)
-    f.close()
-
-    c = w3.eth.contract(abi=abi, address=args.t)
-    if args.m != None:
-        w3.eth.defaultAccount = web3.Web3.toChecksumAddress(args.m)
+    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:
-        w3.eth.defaultAccount = w3.eth.accounts[0]
+        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)
 
-    recipient = w3.eth.defaultAccount
-    if args.r != None:
-        recipient = web3.Web3.toChecksumAddress(args.r)
+        logg.info('mint to {} tx {}'.format(recipient_address, tx_hash_hex))
 
-    c.functions.mint(args.amount).transact()
-    tx = c.functions.transfer(recipient, args.amount).transact()
+        print(tx_hash_hex)
 
-    print(tx.hex())
 
+if __name__ == '__main__':
+    main()

python/giftable_erc20_token/runnable/minter.py

@@ -0,0 +1,123 @@
+"""Add minter to token contact
+
+.. 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 time
+
+# external imports
+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
+
+# local imports
+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')
+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
+
+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():
+    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)
+    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)
+
+        logg.info('add minter {} to {} tx {}'.format(minter_address, token_address, tx_hash_hex))
+
+        print(tx_hash_hex)
+
+
+if __name__ == '__main__':
+    main()

python/requirements.txt

@@ -1 +1,4 @@
-web3==5.12.2
+confini~=0.3.6rc3
+crypto-dev-signer~=0.4.14b3
+chainlib~=0.0.3a1
+potaahto~=0.0.1a2

python/setup.cfg

@@ -1,10 +1,10 @@
 [metadata]
-name = giftable-erc20-token
-version = 0.0.4
-description = Simple ERC20 contract with deployment script that lets any address mint and gift itself tokens.
+name = eth-erc20
+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
-url = https://gitlab.com/nolash/giftable-erc-token
+url = https://gitlab.com/cic/eth-erc20
 keywords =
 	ethereum
 classifiers =
@@ -26,15 +26,21 @@ python_requires = >= 3.6
 packages =
 	giftable_erc20_token
 	giftable_erc20_token.runnable
-install_requires =
-	web3==5.12.2
+	giftable_erc20_token.data
+	eth_erc20
+	eth_erc20.data
+	eth_erc20.runnable
 
 [options.package_data]
 * =
- 	data/GiftableToken.abi.json
+ 	data/GiftableToken.json
  	data/GiftableToken.bin
+ 	data/ERC20.json
 
 [options.entry_points]
 console_scripts =
 	giftable-token-deploy = giftable_erc20_token.runnable.deploy:main
 	giftable-token-gift = giftable_erc20_token.runnable.gift:main
+	giftable-token-minter = giftable_erc20_token.runnable.minter:main
+	erc20-transfer = eth_erc20.runnable.transfer:main
+	erc20-balance = eth_erc20.runnable.balance:main

python/setup.py

@@ -1,5 +1,24 @@
 from setuptools import setup
 
+requirements = []
+f = open('requirements.txt', 'r')
+while True:
+    l = f.readline()
+    if l == '':
+        break
+    requirements.append(l.rstrip())
+f.close()
+
+test_requirements = []
+f = open('test_requirements.txt', 'r')
+while True:
+    l = f.readline()
+    if l == '':
+        break
+    test_requirements.append(l.rstrip())
+f.close()
+
+
 setup(
         package_data={
             '': [
@@ -8,4 +27,6 @@ setup(
                 ],
             },
         include_package_data=True,
+        install_requires=requirements,
+        tests_require=test_requirements,
         )

python/test_requirements.txt

@@ -0,0 +1,3 @@
+eth_tester==0.5.0b3
+py-evm==0.3.0a20
+pytest==6.0.1

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

solidity/GiftableToken.abi.json

@@ -1 +0,0 @@
-[{"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":"allowances","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":"uint256","name":"_value","type":"uint256"}],"name":"mint","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.json

@@ -0,0 +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"}]

solidity/GiftableToken.sol

@@ -1,4 +1,4 @@
-pragma solidity >=0.6.12;
+pragma solidity >0.6.11;
 
 // SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -7,16 +7,23 @@ contract GiftableToken {
 	address owner;
 	mapping(address => bool) minters;
 
+	// Implements ERC20
 	string public name;
+	// Implements ERC20
 	string public symbol;
+	// Implements ERC20
 	uint8 public decimals;
+	// Implements ERC20
 	uint256 public totalSupply;
+	// Implements ERC20
 	mapping (address => uint256) public balanceOf;
-	mapping (address => mapping (address => uint256)) public allowances;
+	// Implements ERC20
+	mapping (address => mapping (address => uint256)) public allowance;
 
 	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);
 
 	constructor(string memory _name, string memory _symbol, uint8 _decimals) public {
 		owner = msg.sender;
@@ -26,12 +33,14 @@ contract GiftableToken {
 		minters[msg.sender] = true;
 	}
 
-	function mint(uint256 _value) public returns (bool) {
+	function mintTo(address _to, uint256 _value) public returns (bool) {
 		require(minters[msg.sender]);
 
-		balanceOf[msg.sender] += _value;
+		balanceOf[_to] += _value;
 		totalSupply += _value;
 
+		emit Mint(msg.sender, _to, _value);
+
 		return true;
 	}
 
@@ -51,6 +60,7 @@ contract GiftableToken {
 		return true;
 	}
 
+	// Implements ERC20
 	function transfer(address _to, uint256 _value) public returns (bool) {
 		require(balanceOf[msg.sender] >= _value);
 		balanceOf[msg.sender] -= _value; 
@@ -59,19 +69,35 @@ contract GiftableToken {
 		return true;
 	}
 
+	// Implements ERC20
 	function transferFrom(address _from, address _to, uint256 _value) public returns (bool) {
-		require(allowances[_from][msg.sender] >= _value);
+		require(allowance[_from][msg.sender] >= _value);
 		require(balanceOf[_from] >= _value);
-		allowances[_from][msg.sender] = allowances[_from][msg.sender] - _value;
+		allowance[_from][msg.sender] = allowance[_from][msg.sender] - _value;
 		balanceOf[_from] -= _value; 
 		balanceOf[_to] += _value;
 		emit TransferFrom(_from, _to, msg.sender, _value);
 		return true;
 	}
 
+	// Implements ERC20
 	function approve(address _spender, uint256 _value) public returns (bool) {
-		allowances[msg.sender][_spender] += _value;
+		allowance[msg.sender][_spender] += _value;
 		emit Approval(msg.sender, _spender, _value);
 		return true;
 	}
+
+	// Implements EIP165
+	function supportsInterface(bytes4 _sum) {
+		if (_sum == 0xc6bb4b70) { // ERC20
+			return true;
+		}
+		if (_sum == 0x449a52f8) { // Minter
+			return true;
+		}
+		if (_sum == 0x01ffc9a7) { // EIP165
+			return true;
+		}
+		return false;
+	}
 }

solidity/Makefile

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