diff --git a/chainlib/eth/connection.py b/chainlib/eth/connection.py index 9ae6582..a20c775 100644 --- a/chainlib/eth/connection.py +++ b/chainlib/eth/connection.py @@ -91,10 +91,10 @@ class EthHTTPConnection(JSONRPCHTTPConnection): if e != None: e = snake_and_camel(e) # In openethereum we encounter receipts that have NONE block hashes and numbers. WTF... + logg.debug('({}) poll receipt received {}'.format(str(self), r)) if e['block_hash'] == None: logg.warning('poll receipt attempt {} returned receipt but with a null block hash value!'.format(i)) else: - logg.debug('({}) poll receipt completed {}'.format(str(self), r)) logg.debug('e {}'.format(strip_0x(e['status']))) if strip_0x(e['status']) == '00': raise RevertEthException(tx_hash_hex) diff --git a/chainlib/eth/data/config/config.ini b/chainlib/eth/data/config/config.ini index 10d94e5..c405cc0 100644 --- a/chainlib/eth/data/config/config.ini +++ b/chainlib/eth/data/config/config.ini @@ -1,5 +1,4 @@ [rpc] -http_provider = http://localhost:8545 provider = http://localhost:8545 auth = credentials = @@ -7,7 +6,7 @@ dialect = default scheme = http [chain] -spec = evm:ethereum:1 +spec = evm:berlin:1:ethereum [wallet] key_file = diff --git a/chainlib/eth/runnable/gas.py b/chainlib/eth/runnable/gas.py index 8cfd57c..b3f4a6e 100644 --- a/chainlib/eth/runnable/gas.py +++ b/chainlib/eth/runnable/gas.py @@ -63,8 +63,12 @@ send = config.true('_RPC_SEND') def balance(address, id_generator): o = gas_balance(address, id_generator=id_generator) r = conn.do(o) - hx = strip_0x(r) - return int(hx, 16) + try: + balance = int(r) + except ValueError: + balance = strip_0x(r) + balance = int(balance, 16) + return balance def main(): diff --git a/requirements.txt b/requirements.txt index 26af1bc..94431e6 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.10a6 -confini>=0.4.1a1,<0.5.0 +chainlib==0.0.10a9 +confini>=0.4.2rc3,<0.5.0 diff --git a/setup.cfg b/setup.cfg index f55778c..6540182 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = chainlib-eth -version = 0.0.10a15 +version = 0.0.10a18 description = Ethereum implementation of the chainlib interface author = Louis Holbrook author_email = dev@holbrook.no