eth-accounts-index

Accounts index evm contract tooling with permissioned writes
Log | Files | Refs

commit 7c3d93904091702e47023d83084764514c2693f7
parent a5e6a9047888ff3f5a7eed6bf413dd0375709012
Author: nolash <dev@holbrook.no>
Date:   Fri, 30 Apr 2021 22:04:34 +0200

Rehabilitate commands

Diffstat:
Mpython/eth_accounts_index/registry.py | 4++--
Mpython/eth_accounts_index/runnable/add.py | 8++++----
Mpython/eth_accounts_index/runnable/deploy.py | 4++--
Mpython/eth_accounts_index/runnable/list.py | 2+-
4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/python/eth_accounts_index/registry.py b/python/eth_accounts_index/registry.py @@ -11,7 +11,7 @@ from chainlib.eth.contract import ( ) # local imports -from .index import AccountsIndex +from .interface import AccountsIndex moddir = os.path.dirname(__file__) datadir = os.path.join(moddir, 'data') @@ -42,7 +42,7 @@ class AccountRegistry(AccountsIndex): @staticmethod def gas(code=None): - return 700000 + return 1200000 def constructor(self, sender_address): diff --git a/python/eth_accounts_index/runnable/add.py b/python/eth_accounts_index/runnable/add.py @@ -28,7 +28,7 @@ from chainlib.eth.connection import EthHTTPConnection from chainlib.eth.tx import receipt # local imports -from eth_accounts_index import AccountsIndex +from eth_accounts_index.registry import AccountRegistry logging.basicConfig(level=logging.WARNING) logg = logging.getLogger() @@ -88,9 +88,9 @@ else: gas_oracle = None if args.gas_price !=None: - gas_oracle = OverrideGasOracle(price=args.gas_price, conn=rpc, code_callback=AccountsIndex.gas) + gas_oracle = OverrideGasOracle(price=args.gas_price, conn=rpc, code_callback=AccountRegistry.gas) else: - gas_oracle = RPCGasOracle(rpc, code_callback=AccountsIndex.gas) + gas_oracle = RPCGasOracle(rpc, code_callback=AccountRegistry.gas) dummy = args.d contract_address = args.a @@ -100,7 +100,7 @@ account = args.address def main(): if __name__ == '__main__': - c = AccountsIndex(chain_spec, signer=signer, gas_oracle=gas_oracle, nonce_oracle=nonce_oracle) + c = AccountRegistry(chain_spec, signer=signer, gas_oracle=gas_oracle, nonce_oracle=nonce_oracle) (tx_hash_hex, o) = c.add(contract_address, signer_address, account) if dummy: print(tx_hash_hex) diff --git a/python/eth_accounts_index/runnable/deploy.py b/python/eth_accounts_index/runnable/deploy.py @@ -55,8 +55,8 @@ if args.vv: elif args.v: logg.setLevel(logging.INFO) -block_last = args.w -block_all = args.ww +block_all = args.ww +block_last = args.w or block_all passphrase_env = 'ETH_PASSPHRASE' if args.env_prefix != None: diff --git a/python/eth_accounts_index/runnable/list.py b/python/eth_accounts_index/runnable/list.py @@ -77,7 +77,7 @@ def element(ifc, address, fmt=default_format, w=sys.stdout): def ls(ifc, fmt=default_format, w=sys.stdout): i = 1 while True: - o = ifc.account(account_registry_address, i) + o = ifc.entry(account_registry_address, i) try: r = rpc.do(o) account = ifc.parse_account(r)