chaintool
/
chainlib-eth
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into 'daven/0.0.0' 

# Conflicts:
#   requirements.txt
#   run_tests.sh
This commit is contained in:
Daven Savoie 2021-09-14 18:09:24 +00:00
parent 2402ffc669 6f28311e52
commit 335cf662ba
6 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
chainlib/eth/cli.py
View File

@ -10,8 +10,7 @@ from chainlib.cli import (
argflag_std_base, argflag_std_base,
Config as BaseConfig, Config as BaseConfig,
Wallet as BaseWallet, Wallet as BaseWallet,
Rpc as BaseRpc, Rpc as BaseRpc, Flag,
Flag,
) )
from crypto_dev_signer.eth.signer import ReferenceSigner as EIP155Signer from crypto_dev_signer.eth.signer import ReferenceSigner as EIP155Signer
@ -107,6 +106,7 @@ class Config(BaseConfig):
@classmethod @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): 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: if default_fee_limit == None:
default_fee_limit = cls.default_fee_limit 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) 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)

2
chainlib/eth/data/config/config.ini
View File

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

1
chainlib/eth/runnable/balance.py
View File

@ -36,7 +36,6 @@ arg_flags = chainlib.eth.cli.argflag_std_read
argparser = chainlib.eth.cli.ArgumentParser(arg_flags) argparser = chainlib.eth.cli.ArgumentParser(arg_flags)
argparser.add_positional('address', type=str, help='Ethereum address of recipient') argparser.add_positional('address', type=str, help='Ethereum address of recipient')
args = argparser.parse_args() 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) config = chainlib.eth.cli.Config.from_args(args, arg_flags)
wallet = chainlib.eth.cli.Wallet() wallet = chainlib.eth.cli.Wallet()

1
chainlib/eth/runnable/count.py
View File

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

5
requirements.txt
View File

@ -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 pysha3==1.0.2
hexathon~=0.0.1a8 hexathon~=0.0.1a8
websocket-client==0.57.0 websocket-client==0.57.0
potaahto~=0.0.1a1 potaahto~=0.0.1a1
chainlib==0.0.9a3 chainlib==0.0.9a10
chainlib-eth==0.0.9a6
confini>=0.4.1a1,<0.5.0 confini>=0.4.1a1,<0.5.0

2
setup.cfg
View File

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