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

Make sure syncer doesnt croak on invalidstate

Browse Source
This commit is contained in:
lash 2022-04-27 09:01:46 +00:00
parent b893aaa7b1
commit 24a71b6c7f
Signed by: lash
GPG Key ID: 21D2E7BB88C2A746
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
chaind/eth/runnable/send.py
View File

@ -34,7 +34,7 @@ arg_flags = chainlib.eth.cli.argflag_std_write
argparser = chainlib.eth.cli.ArgumentParser(arg_flags, arg_long={'-s': '--send-rpc'}) argparser = chainlib.eth.cli.ArgumentParser(arg_flags, arg_long={'-s': '--send-rpc'})
argparser.add_positional('source', required=False, type=str, help='Transaction source file') argparser.add_positional('source', required=False, type=str, help='Transaction source file')
local_arg_flags = chaind.cli.argflag_local_socket_client local_arg_flags = chaind.cli.argflag_local_socket_client | chaind.cli.ChaindFlag.TOKEN
chaind.cli.process_flags(argparser, local_arg_flags) chaind.cli.process_flags(argparser, local_arg_flags)
args = argparser.parse_args() args = argparser.parse_args()
@ -105,9 +105,9 @@ class SocketSender:
def main(): def main():
token_resolver = None token_resolver = None
if config.get('TOKEN_MODULE') != None: if settings.get('TOKEN_MODULE') != None:
import importlib import importlib
m = importlib.import_module(config.get('TOKEN_MODULE')) m = importlib.import_module(settings.get('TOKEN_MODULE'))
m = m.TokenResolver m = m.TokenResolver
else: else:
from chaind.eth.token.gas import GasTokenResolver from chaind.eth.token.gas import GasTokenResolver

2
chaind/eth/token/base.py
View File

@ -28,7 +28,7 @@ class BaseTokenResolver:
def get_values(self, gas_value, value, executable_address=None): def get_values(self, gas_value, value, executable_address=None):
nonce = self.nonce_oracle.next_nonce() nonce = self.nonce_oracle.get_nonce()
if executable_address == None: if executable_address == None:
return (value, 0, nonce) return (value, 0, nonce)

2
requirements.txt
View File

@ -1,4 +1,4 @@
chaind~=0.1.0 chaind~=0.1.1
hexathon~=0.1.5 hexathon~=0.1.5
chainlib-eth~=0.1.0 chainlib-eth~=0.1.0
pyxdg~=0.27 pyxdg~=0.27

3
setup.cfg
View File

@ -1,6 +1,6 @@
[metadata] [metadata]
name = chaind-eth name = chaind-eth
version = 0.1.0 version = 0.1.3
description = Queue server for ethereum description = Queue server for ethereum
author = Louis Holbrook author = Louis Holbrook
author_email = dev@holbrook.no author_email = dev@holbrook.no
@ -31,6 +31,7 @@ packages =
chaind.eth chaind.eth
chaind.eth.runnable chaind.eth.runnable
chaind.eth.cli chaind.eth.cli
chaind.eth.token
[options.entry_points] [options.entry_points]
console_scripts = console_scripts =