Merge branch 'master' into 'daven/0.0.0'

# Conflicts:
#   requirements.txt
#   run_tests.sh

chainlib/eth/cli.py

@@ -10,8 +10,7 @@ from chainlib.cli import (
         argflag_std_base,
         Config as BaseConfig,
         Wallet as BaseWallet,
-        Rpc as BaseRpc,
-        Flag,
+        Rpc as BaseRpc, Flag,
     )
 from crypto_dev_signer.eth.signer import ReferenceSigner as EIP155Signer
 
@@ -107,6 +106,7 @@ class Config(BaseConfig):
 
     @classmethod
     def from_args(cls, args, arg_flags=0x0f, env=os.environ, extra_args={}, base_config_dir=None, default_config_dir=None, user_config_dir=None, default_fee_limit=None, logger=None, load_callback=None):
+        super(Config, cls).override_defaults(base_dir=cls.default_base_config_dir)
         if default_fee_limit == None:
             default_fee_limit = cls.default_fee_limit
         config = BaseConfig.from_args(args, arg_flags=arg_flags, env=env, extra_args=extra_args, base_config_dir=base_config_dir, default_config_dir=default_config_dir, user_config_dir=user_config_dir, default_fee_limit=default_fee_limit, logger=logger, load_callback=load_callback)

chainlib/eth/data/config/config.ini

@@ -1,6 +1,6 @@
 [rpc]
 http_provider = http://localhost:8545
-provider =
+provider = http://localhost:8545
 auth =
 credentials =
 dialect = default

chainlib/eth/runnable/balance.py

@@ -36,7 +36,6 @@ arg_flags = chainlib.eth.cli.argflag_std_read
 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, default_config_dir=config_dir)
 config = chainlib.eth.cli.Config.from_args(args, arg_flags)
 
 wallet = chainlib.eth.cli.Wallet()

chainlib/eth/runnable/count.py

@@ -42,6 +42,7 @@ conn = rpc.connect_by_config(config)
 
 
 def main():
+    # TODO: should tolerate if address not prefixed with 0x 
     o = count(holder_address, id_generator=rpc.id_generator)
     r = conn.do(o)
     count_result = None

requirements.txt

@@ -1,8 +1,7 @@
-crypto-dev-signer>=0.4.15a1,<=0.4.15
+crypto-dev-signer>=0.4.15a4,<=0.4.15
 pysha3==1.0.2
 hexathon~=0.0.1a8
 websocket-client==0.57.0
 potaahto~=0.0.1a1
-chainlib==0.0.9a3
-chainlib-eth==0.0.9a6
+chainlib==0.0.9a10
 confini>=0.4.1a1,<0.5.0

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = chainlib-eth
-version = 0.0.9a9
+version = 0.0.9a13
 description = Ethereum implementation of the chainlib interface
 author = Louis Holbrook
 author_email = dev@holbrook.no