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

Rehabilitate raw cli tool

Browse Source
This commit is contained in:
lash 2022-05-12 12:58:24 +00:00
parent 7604b48e12
commit 628028e4ce
Signed by: lash
GPG Key ID: 21D2E7BB88C2A746
2 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
chainlib/eth/runnable/info.py
View File

@ -49,7 +49,6 @@ from chainlib.eth.cli.log import process_log
BLOCK_SAMPLES = 10 BLOCK_SAMPLES = 10
logging.basicConfig(level=logging.WARNING)
logg = logging.getLogger() logg = logging.getLogger()
script_dir = os.path.dirname(os.path.realpath(__file__)) script_dir = os.path.dirname(os.path.realpath(__file__))
@ -82,11 +81,12 @@ argparser.add_argument('--local', action='store_true', help='Include local info'
argparser.add_argument('entry', nargs='?', help='Output single item') argparser.add_argument('entry', nargs='?', help='Output single item')
args = argparser.parse_args() args = argparser.parse_args()
logg = process_log(args, logg)
config = Config() config = Config()
config = process_config(config, arg, args, flags) config = process_config(config, arg, args, flags)
config = process_config_local(config, arg, args, flags) config = process_config_local(config, arg, args, flags)
logg.debug('config loaded:\n{}'.format(config)) logg.debug('config loaded:\n{}'.format(config))
#config = chainlib.eth.cli.Config.from_args(args, arg_flags, extra_args=extra_args, default_config_dir=config_dir)
if config.get('_ENTRY') != None: if config.get('_ENTRY') != None:
if config.get('_ENTRY') not in results_translation.keys(): if config.get('_ENTRY') not in results_translation.keys():

35
chainlib/eth/runnable/raw.py
View File

@ -41,23 +41,41 @@ from chainlib.error import SignerMissingException
from chainlib.chain import ChainSpec from chainlib.chain import ChainSpec
from chainlib.eth.runnable.util import decode_for_puny_humans from chainlib.eth.runnable.util import decode_for_puny_humans
from chainlib.eth.jsonrpc import to_blockheight_param from chainlib.eth.jsonrpc import to_blockheight_param
import chainlib.eth.cli
from chainlib.eth.cli.arg import (
Arg,
ArgFlag,
process_args,
)
from chainlib.eth.cli.config import (
Config,
process_config,
)
from chainlib.eth.cli.log import process_log
logging.basicConfig(level=logging.WARNING)
logg = logging.getLogger() logg = logging.getLogger()
script_dir = os.path.dirname(os.path.realpath(__file__)) script_dir = os.path.dirname(os.path.realpath(__file__))
config_dir = os.path.join(script_dir, '..', 'data', 'config') config_dir = os.path.join(script_dir, '..', 'data', 'config')
arg_flags = chainlib.eth.cli.argflag_std_write | chainlib.eth.cli.Flag.EXEC arg_flags = ArgFlag()
argparser = chainlib.eth.cli.ArgumentParser(arg_flags) arg = Arg(arg_flags)
flags = arg_flags.STD_WRITE | arg_flags.EXEC
argparser = chainlib.eth.cli.ArgumentParser()
argparser = process_args(argparser, arg, flags)
argparser.add_argument('--deploy', action='store_true', help='Deploy data as contract') argparser.add_argument('--deploy', action='store_true', help='Deploy data as contract')
argparser.add_argument('--mode', choices=['tx', 'call'], type=str, help='Mode of operation') argparser.add_argument('--mode', choices=['tx', 'call'], type=str, help='Mode of operation')
argparser.add_positional('data', type=str, help='Transaction data') argparser.add_argument('data', type=str, help='Transaction data')
args = argparser.parse_args() args = argparser.parse_args()
config = chainlib.eth.cli.Config.from_args(args, arg_flags, default_config_dir=config_dir)
block_all = args.ww logg = process_log(args, logg)
block_last = args.w or block_all
config = Config()
config = process_config(config, arg, args, flags)
logg.debug('config loaded:\n{}'.format(config))
wallet = chainlib.eth.cli.Wallet(EIP155Signer) wallet = chainlib.eth.cli.Wallet(EIP155Signer)
wallet.from_config(config) wallet.from_config(config)
@ -74,7 +92,6 @@ except AttributeError:
pass pass
def main(): def main():
signer_address = None signer_address = None
try: try:
signer = rpc.get_signer() signer = rpc.get_signer()
@ -134,7 +151,7 @@ def main():
o = raw(args.data, id_generator=rpc.id_generator) o = raw(args.data, id_generator=rpc.id_generator)
if send: if send:
r = conn.do(o) r = conn.do(o)
if block_last: if config.true('_WAIT'):
r = conn.wait(tx_hash_hex) r = conn.wait(tx_hash_hex)
if r['status'] == 0: if r['status'] == 0:
logg.critical('VM revert for {}. Wish I could tell you more'.format(tx_hash_hex)) logg.critical('VM revert for {}. Wish I could tell you more'.format(tx_hash_hex))