Allow fee settings for read
This commit is contained in:
parent
5d7c5556d4
commit
6b5628cf28
@ -1,5 +1,6 @@
|
||||
# standard imports
|
||||
import os
|
||||
import logging
|
||||
|
||||
# external imports
|
||||
from chainlib.cli import (
|
||||
@ -25,6 +26,9 @@ from chainlib.eth.nonce import (
|
||||
OverrideNonceOracle,
|
||||
RPCNonceOracle,
|
||||
)
|
||||
|
||||
logg = logging.getLogger(__name__)
|
||||
|
||||
script_dir = os.path.dirname(os.path.realpath(__file__))
|
||||
|
||||
|
||||
@ -57,8 +61,6 @@ class Rpc(BaseRpc):
|
||||
|
||||
if self.can_sign():
|
||||
nonce = None
|
||||
fee_price = None
|
||||
fee_limit = None
|
||||
try:
|
||||
nonce = config.get('_NONCE')
|
||||
except KeyError:
|
||||
@ -68,14 +70,18 @@ class Rpc(BaseRpc):
|
||||
else:
|
||||
self.nonce_oracle = RPCNonceOracle(self.get_sender_address(), self.conn, id_generator=self.id_generator)
|
||||
|
||||
fee_price = None
|
||||
fee_limit = None
|
||||
try:
|
||||
fee_price = config.get('_FEE_PRICE')
|
||||
except KeyError:
|
||||
pass
|
||||
|
||||
try:
|
||||
fee_limit = config.get('_FEE_LIMIT')
|
||||
except KeyError:
|
||||
pass
|
||||
|
||||
if fee_price != None or fee_limit != None:
|
||||
self.fee_oracle = OverrideGasOracle(price=fee_price, limit=fee_limit, conn=self.conn, id_generator=self.id_generator)
|
||||
else:
|
||||
|
@ -1,9 +1,10 @@
|
||||
[rpc]
|
||||
http_provider = http://localhost:8545
|
||||
http_authentication =
|
||||
http_username =
|
||||
http_password =
|
||||
provider =
|
||||
auth =
|
||||
credentials =
|
||||
dialect = default
|
||||
scheme = http
|
||||
|
||||
[chain]
|
||||
spec = evm:ethereum:1
|
||||
|
@ -133,6 +133,7 @@ def main():
|
||||
elif not is_checksum_address(address):
|
||||
raise ValueError('invalid checksum address: {}'.format(address))
|
||||
r = get_address(conn, address, rpc.id_generator, config.get('_HEIGHT'))
|
||||
if r != None:
|
||||
print(r)
|
||||
|
||||
|
||||
|
@ -110,11 +110,11 @@ def main():
|
||||
sys.exit(1)
|
||||
return
|
||||
|
||||
elif signer_address != None:
|
||||
if signer_address != None:
|
||||
if chain_spec == None:
|
||||
raise ValueError('chain spec must be specified')
|
||||
g = TxFactory(chain_spec, signer=rpc.get_signer(), gas_oracle=rpc.get_gas_oracle(), nonce_oracle=rpc.get_nonce_oracle())
|
||||
tx = g.template(signer_address, recipient, use_nonce=True)
|
||||
tx = g.template(signer_address, exec_address, use_nonce=True)
|
||||
if args.data != None:
|
||||
tx = g.set_code(tx, add_0x(args.data))
|
||||
|
||||
|
@ -3,5 +3,5 @@ pysha3==1.0.2
|
||||
hexathon~=0.0.1a8
|
||||
websocket-client==0.57.0
|
||||
potaahto~=0.0.1a1
|
||||
chainlib==0.0.9a3
|
||||
chainlib==0.0.9a6
|
||||
confini>=0.4.1a1,<0.5.0
|
||||
|
Loading…
Reference in New Issue
Block a user