Update giftable token on chainlib 0.3.x

python/CHANGELOG

@@ -1,4 +1,6 @@
-* 0.3.2
+* 0.4.1
+	- Implement chainlib 0.3.x for giftable token
+* 0.4.0
 	- Implement chainlib 0.3.0
 * 0.3.1
 	- Upgrade chainlib to 0.2.0

python/README.test

@@ -0,0 +1,3 @@
+On arch, Python.h is in non-standard location, which may cause pip install -r test_requirements to fail.
+
+If so, set env CFLAGS=`pkg-config --cflags python3`

python/eth_erc20/runnable/transfer.py

@@ -21,10 +21,7 @@ from hexathon import (
         add_0x,
         strip_0x,
         )
-from chainlib.eth.connection import EthHTTPConnection
-from chainlib.chain import ChainSpec
 from chainlib.eth.runnable.util import decode_for_puny_humans
-from chainlib.eth.address import to_checksum_address
 import chainlib.eth.cli
 from chainlib.eth.cli.log import process_log
 from chainlib.eth.settings import process_settings

python/giftable_erc20_token/runnable/deploy.py

@@ -1,3 +1,5 @@
+#!python3
+
 """Deploys giftable token
 
 .. moduleauthor:: Louis Holbrook <dev@holbrook.no>
@@ -18,56 +20,76 @@ from enum import Enum
 
 # external imports
 import chainlib.eth.cli
-from chainlib.chain import ChainSpec
-from chainlib.eth.connection import EthHTTPConnection
 from chainlib.eth.tx import receipt
+from chainlib.settings import ChainSettings
+from chainlib.eth.cli.log import process_log
+from chainlib.eth.settings import process_settings
+from chainlib.eth.cli.arg import (
+        Arg,
+        ArgFlag,
+        process_args,
+        )
+from chainlib.eth.cli.config import (
+        Config,
+        process_config,
+        )
+
 
 # local imports
 from giftable_erc20_token import GiftableToken
 
-logging.basicConfig(level=logging.WARNING)
 logg = logging.getLogger()
 
-arg_flags = chainlib.eth.cli.argflag_std_write
-argparser = chainlib.eth.cli.ArgumentParser(arg_flags)
+
+def process_config_local(config, arg, args, flags):
+    config.add(args.token_name, '_TOKEN_NAME', False)
+    config.add(args.token_symbol, '_TOKEN_SYMBOL', False)
+    config.add(args.token_decimals, '_TOKEN_DECIMALS', False)
+    return config
+
+
+arg_flags = ArgFlag()
+arg = Arg(arg_flags)
+flags = arg_flags.STD_WRITE | arg_flags.WALLET
+
+argparser = chainlib.eth.cli.ArgumentParser()
+argparser = process_args(argparser, 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()
 
-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())
+logg = process_log(args, logg)
 
-wallet = chainlib.eth.cli.Wallet()
-wallet.from_config(config)
+config = Config()
+config = process_config(config, arg, args, flags)
+config = process_config_local(config, arg, args, flags)
+logg.debug('config loaded:\n{}'.format(config))
 
-rpc = chainlib.eth.cli.Rpc(wallet=wallet)
-conn = rpc.connect_by_config(config)
-
-chain_spec = ChainSpec.from_chain_str(config.get('CHAIN_SPEC'))
+settings = ChainSettings()
+settings = process_settings(settings, config)
+logg.debug('settings loaded:\n{}'.format(settings))
 
 
 def main():
-    signer = rpc.get_signer()
-    signer_address = rpc.get_sender_address()
+    signer_address = settings.get('SENDER_ADDRESS')
 
-    token_name = config.get('_TOKEN_NAME')
-    token_symbol = config.get('_TOKEN_SYMBOL')
-    token_decimals = config.get('_TOKEN_DECIMALS')
+    c = GiftableToken(
+            settings.get('CHAIN_SPEC'),
+            signer=settings.get('SIGNER'),
+            gas_oracle=settings.get('GAS_ORACLE'),
+            nonce_oracle=settings.get('NONCE_ORACLE'),
+            )
 
-    gas_oracle = rpc.get_gas_oracle()
-    nonce_oracle = rpc.get_nonce_oracle()
-
-    c = GiftableToken(chain_spec, signer=signer, gas_oracle=gas_oracle, nonce_oracle=nonce_oracle)
-
-    (tx_hash_hex, o) = c.constructor(signer_address, token_name, token_symbol, token_decimals)
-    if config.get('_RPC_SEND'):
+    (tx_hash_hex, o) = c.constructor(
+            signer_address,
+            config.get('_TOKEN_NAME'),
+            config.get('_TOKEN_SYMBOL'),
+            config.get('_TOKEN_DECIMALS'),
+            )
+    if settings.get('RPC_SEND'):
         conn.do(o)
-        if config.get('_WAIT'):
+        if settings.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')

python/giftable_erc20_token/runnable/minter.py

@@ -17,10 +17,21 @@ import time
 
 # external imports
 import chainlib.eth.cli
-from chainlib.eth.connection import EthHTTPConnection
-from chainlib.chain import ChainSpec
 from chainlib.eth.tx import receipt
+from chainlib.settings import ChainSettings
+from chainlib.eth.cli.log import process_log
+from chainlib.eth.settings import process_settings
 from chainlib.eth.address import to_checksum_address
+from chainlib.eth.cli.arg import (
+        Arg,
+        ArgFlag,
+        process_args,
+        )
+from chainlib.eth.cli.config import (
+        Config,
+        process_config,
+        )
+
 from hexathon import (
         strip_0x,
         add_0x,
@@ -29,37 +40,41 @@ from hexathon import (
 # local imports
 from giftable_erc20_token import GiftableToken
 
-logging.basicConfig(level=logging.WARNING)
 logg = logging.getLogger()
 
-arg_flags = chainlib.eth.cli.argflag_std_write | chainlib.eth.cli.Flag.EXEC | chainlib.eth.cli.Flag.WALLET
-argparser = chainlib.eth.cli.ArgumentParser(arg_flags)
+
+def process_config_local(config, arg, args, flags):
+    config.add(args.rm, '_RM', False)
+    config.add(add_0x(args.minter_address[0]), '_MINTER_ADDRESS', False)
+    return config
+
+
+arg_flags = ArgFlag()
+arg = Arg(arg_flags)
+flags = arg_flags.STD_WRITE | arg_flags.EXEC | arg_flags.WALLET
+
+argparser = chainlib.eth.cli.ArgumentParser()
+argparser = process_args(argparser, 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')
+argparser.add_argument('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())
 
-wallet = chainlib.eth.cli.Wallet()
-wallet.from_config(config)
+logg = process_log(args, logg)
 
-rpc = chainlib.eth.cli.Rpc(wallet=wallet)
-conn = rpc.connect_by_config(config)
+config = Config()
+config = process_config(config, arg, args, flags)
+config = process_config_local(config, arg, args, flags)
+logg.debug('config loaded:\n{}'.format(config))
 
-chain_spec = ChainSpec.from_chain_str(config.get('CHAIN_SPEC'))
+settings = ChainSettings()
+settings = process_settings(settings, config)
+logg.debug('settings loaded:\n{}'.format(settings))
 
 
 def main():
-    signer = rpc.get_signer()
-    signer_address = rpc.get_sender_address()
+    signer_address = settings.get('SENDER_ADDRESS')
 
-    gas_oracle = rpc.get_gas_oracle()
-    nonce_oracle = rpc.get_nonce_oracle()
-
-    recipient_address_input = config.get('_RECIPIENT')
+    recipient_address_input = settings.get('RECIPIENT')
     if recipient_address_input == None:
         recipient_address_input = signer_address
 
@@ -67,20 +82,30 @@ def main():
     if not config.true('_UNSAFE') and recipient_address != add_0x(recipient_address_input):
         raise ValueError('invalid checksum address for recipient')
 
-    token_address = add_0x(to_checksum_address(config.get('_EXEC_ADDRESS')))
-    if not config.true('_UNSAFE') and token_address != add_0x(config.get('_EXEC_ADDRESS')):
-        raise ValueError('invalid checksum address for contract')
-
     minter_address = config.get('_MINTER_ADDRESS')
-    c = GiftableToken(chain_spec, signer=signer, gas_oracle=gas_oracle, nonce_oracle=nonce_oracle)
-    if config.get('_RM'):
-        (tx_hash_hex, o) = c.remove_minter(token_address, signer_address, minter_address)
-    else:
-        (tx_hash_hex, o) = c.add_minter(token_address, signer_address, minter_address)
+    c = GiftableToken(
+            settings.get('CHAIN_SPEC'),
+            signer=settings.get('SIGNER'),
+            gas_oracle=settings.get('GAS_ORACLE'),
+            nonce_oracle=settings.get('NONCE_ORACLE'),
+            )
 
-    if config.get('_RPC_SEND'):
+    if config.get('_RM'):
+        (tx_hash_hex, o) = c.remove_minter(
+                settings.get('EXEC'),
+                signer_address,
+                minter_address,
+                )
+    else:
+        (tx_hash_hex, o) = c.add_minter(
+                settings.get('EXEC'),
+                signer_address,
+                minter_address,
+                )
+
+    if settings.get('RPC_SEND'):
         conn.do(o)
-        if config.get('_WAIT'):
+        if settings.get('WAIT'):
             r = conn.wait(tx_hash_hex)
             if r['status'] == 0:
                 sys.stderr.write('EVM revert. Wish I had more to tell you')