From 152e2313e26faa24ae4b4faef07662456b787a9d Mon Sep 17 00:00:00 2001 From: nolash Date: Wed, 8 Sep 2021 17:53:34 +0200 Subject: [PATCH 1/4] Bump version, deps --- requirements.txt | 4 ++-- setup.cfg | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index 5fcf1b9..79a2256 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ -crypto-dev-signer>=0.4.15a1,<=0.4.15 +crypto-dev-signer>=0.4.15a3,<=0.4.15 pysha3==1.0.2 hexathon~=0.0.1a8 websocket-client==0.57.0 potaahto~=0.0.1a1 -chainlib==0.0.9a6 +chainlib==0.0.9a7 confini>=0.4.1a1,<0.5.0 diff --git a/setup.cfg b/setup.cfg index a4a91cb..379a962 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = chainlib-eth -version = 0.0.9a9 +version = 0.0.9a10 description = Ethereum implementation of the chainlib interface author = Louis Holbrook author_email = dev@holbrook.no From ca3911481917e4717b730ce6e5a8863d19667743 Mon Sep 17 00:00:00 2001 From: nolash Date: Thu, 9 Sep 2021 14:16:36 +0200 Subject: [PATCH 2/4] Upgrade chainlib --- requirements.txt | 4 ++-- setup.cfg | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index 79a2256..a12beff 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ -crypto-dev-signer>=0.4.15a3,<=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.9a7 +chainlib==0.0.9a8 confini>=0.4.1a1,<0.5.0 diff --git a/setup.cfg b/setup.cfg index 379a962..6dce84f 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = chainlib-eth -version = 0.0.9a10 +version = 0.0.9a11 description = Ethereum implementation of the chainlib interface author = Louis Holbrook author_email = dev@holbrook.no From a3f8f92f9cc14cc97b4c9c659534f868a79e9d60 Mon Sep 17 00:00:00 2001 From: nolash Date: Mon, 13 Sep 2021 08:49:44 +0200 Subject: [PATCH 3/4] Upgrade chainlib (dumpconfig) --- chainlib/eth/runnable/balance.py | 1 - chainlib/eth/runnable/count.py | 1 + requirements.txt | 2 +- setup.cfg | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/chainlib/eth/runnable/balance.py b/chainlib/eth/runnable/balance.py index e44b128..bfb205f 100644 --- a/chainlib/eth/runnable/balance.py +++ b/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() diff --git a/chainlib/eth/runnable/count.py b/chainlib/eth/runnable/count.py index bb59a4d..48763ec 100644 --- a/chainlib/eth/runnable/count.py +++ b/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 diff --git a/requirements.txt b/requirements.txt index a12beff..572b8ef 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,5 +3,5 @@ pysha3==1.0.2 hexathon~=0.0.1a8 websocket-client==0.57.0 potaahto~=0.0.1a1 -chainlib==0.0.9a8 +chainlib==0.0.9a9 confini>=0.4.1a1,<0.5.0 diff --git a/setup.cfg b/setup.cfg index 6dce84f..9a65479 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = chainlib-eth -version = 0.0.9a11 +version = 0.0.9a12 description = Ethereum implementation of the chainlib interface author = Louis Holbrook author_email = dev@holbrook.no From 6f28311e522d95527289434dae343df5d78d18dc Mon Sep 17 00:00:00 2001 From: nolash Date: Mon, 13 Sep 2021 16:35:45 +0200 Subject: [PATCH 4/4] Bump version --- chainlib/eth/cli.py | 4 ++-- chainlib/eth/data/config/config.ini | 2 +- requirements.txt | 2 +- run_tests.sh | 2 +- setup.cfg | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/chainlib/eth/cli.py b/chainlib/eth/cli.py index 8a0723c..985f1ef 100644 --- a/chainlib/eth/cli.py +++ b/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) diff --git a/chainlib/eth/data/config/config.ini b/chainlib/eth/data/config/config.ini index b59fd8c..10d94e5 100644 --- a/chainlib/eth/data/config/config.ini +++ b/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 diff --git a/requirements.txt b/requirements.txt index 572b8ef..3de6992 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,5 +3,5 @@ pysha3==1.0.2 hexathon~=0.0.1a8 websocket-client==0.57.0 potaahto~=0.0.1a1 -chainlib==0.0.9a9 +chainlib==0.0.9a10 confini>=0.4.1a1,<0.5.0 diff --git a/run_tests.sh b/run_tests.sh index 9ac346f..2a36ca3 100644 --- a/run_tests.sh +++ b/run_tests.sh @@ -2,7 +2,7 @@ set -e set -x -#export PYTHONPATH=${PYTHONPATH:.} +export PYTHONPATH=${PYTHONPATH:.} for f in `ls tests/*.py`; do python $f done diff --git a/setup.cfg b/setup.cfg index 9a65479..5262482 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = chainlib-eth -version = 0.0.9a12 +version = 0.0.9a13 description = Ethereum implementation of the chainlib interface author = Louis Holbrook author_email = dev@holbrook.no