Skip compulsory exec address for offline encode, add wait to raw
This commit is contained in:
parent
1fbd94d382
commit
96a0f3beb0
@ -66,9 +66,6 @@ extra_args = {
|
|||||||
}
|
}
|
||||||
config = chainlib.eth.cli.Config.from_args(args, arg_flags, extra_args=extra_args, default_config_dir=config_dir)
|
config = chainlib.eth.cli.Config.from_args(args, arg_flags, extra_args=extra_args, default_config_dir=config_dir)
|
||||||
|
|
||||||
if not config.get('_EXEC_ADDRESS'):
|
|
||||||
argparser.error('exec address (-e) must be defined')
|
|
||||||
|
|
||||||
block_all = args.ww
|
block_all = args.ww
|
||||||
block_last = args.w or block_all
|
block_last = args.w or block_all
|
||||||
|
|
||||||
@ -109,12 +106,18 @@ def main():
|
|||||||
print(strip_0x(code))
|
print(strip_0x(code))
|
||||||
return
|
return
|
||||||
|
|
||||||
exec_address = add_0x(to_checksum_address(config.get('_EXEC_ADDRESS')))
|
exec_address = config.get('_EXEC_ADDRESS')
|
||||||
|
if exec_address:
|
||||||
|
exec_address = add_0x(to_checksum_address(exec_address))
|
||||||
|
|
||||||
if signer == None or config.true('_NOTX'):
|
if signer == None or config.true('_NOTX'):
|
||||||
if config.true('_RAW'):
|
if config.true('_RAW'):
|
||||||
print(strip_0x(code))
|
print(strip_0x(code))
|
||||||
return
|
return
|
||||||
|
|
||||||
|
if not exec_address:
|
||||||
|
argparser.error('exec address (-e) must be defined')
|
||||||
|
|
||||||
c = TxFactory(chain_spec)
|
c = TxFactory(chain_spec)
|
||||||
j = JSONRPCRequest(id_generator=rpc.id_generator)
|
j = JSONRPCRequest(id_generator=rpc.id_generator)
|
||||||
o = j.template()
|
o = j.template()
|
||||||
@ -140,6 +143,9 @@ def main():
|
|||||||
sys.stderr.write('query returned an empty value ({})\n'.format(r))
|
sys.stderr.write('query returned an empty value ({})\n'.format(r))
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
|
||||||
|
if not exec_address:
|
||||||
|
argparser.error('exec address (-e) must be defined')
|
||||||
|
|
||||||
if chain_spec == None:
|
if chain_spec == None:
|
||||||
raise ValueError('chain spec must be specified')
|
raise ValueError('chain spec must be specified')
|
||||||
|
|
||||||
|
@ -106,7 +106,7 @@ def main():
|
|||||||
logg.debug('sender {} balance after: {}'.format(signer_address, sender_balance))
|
logg.debug('sender {} balance after: {}'.format(signer_address, sender_balance))
|
||||||
logg.debug('recipient {} balance after: {}'.format(recipient, recipient_balance))
|
logg.debug('recipient {} balance after: {}'.format(recipient, recipient_balance))
|
||||||
if r['status'] == 0:
|
if r['status'] == 0:
|
||||||
logg.critical('VM revert. Wish I could tell you more')
|
logg.critical('VM revert for {}. Wish I could tell you more'.format(tx_hash_hex))
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
print(tx_hash_hex)
|
print(tx_hash_hex)
|
||||||
else:
|
else:
|
||||||
|
@ -133,6 +133,11 @@ 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:
|
||||||
|
r = conn.wait(tx_hash_hex)
|
||||||
|
if r['status'] == 0:
|
||||||
|
logg.critical('VM revert for {}. Wish I could tell you more'.format(tx_hash_hex))
|
||||||
|
sys.exit(1)
|
||||||
print(r)
|
print(r)
|
||||||
else:
|
else:
|
||||||
print(o)
|
print(o)
|
||||||
|
Loading…
Reference in New Issue
Block a user