eth-accounts-index

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

commit ed9f15995bf9dca30af670ad432d8bb12b556bbd
parent 95474ddff55ed3049282a01657b1740f5f42d5cd
Author: Louis Holbrook <accounts-gitlab@holbrook.no>
Date:   Sun,  4 Apr 2021 12:54:18 +0000

Merge branch 'lash/chainlib' into 'master'

Lash/chainlib

See merge request nolash/eth-accounts-index!2
Diffstat:
Mpython/eth_accounts_index/runnable/add.py | 5++---
Mpython/eth_accounts_index/runnable/deploy.py | 5++---
Mpython/eth_accounts_index/runnable/writer.py | 5++---
Mpython/requirements.txt | 4++--
Mpython/setup.cfg | 2+-
5 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/python/eth_accounts_index/runnable/add.py b/python/eth_accounts_index/runnable/add.py @@ -34,7 +34,7 @@ argparser = argparse.ArgumentParser() argparser.add_argument('-p', '--provider', dest='p', default='http://localhost:8545', type=str, help='Web3 provider url (http only)') argparser.add_argument('-w', action='store_true', help='Wait for the last transaction to be confirmed') argparser.add_argument('-ww', action='store_true', help='Wait for every transaction to be confirmed') -argparser.add_argument('-i', '--chain-spec', dest='i', type=str, default='Ethereum:1', help='Chain specification string') +argparser.add_argument('-i', '--chain-spec', dest='i', type=str, default='evm:ethereum:1', help='Chain specification string') argparser.add_argument('-y', '--key-file', dest='y', type=str, help='Ethereum keystore file to use for signing') argparser.add_argument('-a', '--contract-address', dest='a', required=True, type=str, help='Contract address to account index to edit') argparser.add_argument('-v', action='store_true', help='Be verbose') @@ -68,7 +68,6 @@ if args.y != None: signer = EIP155Signer(keystore) chain_spec = ChainSpec.from_chain_str(args.i) -chain_id = chain_spec.network_id() rpc = EthHTTPConnection(args.p) nonce_oracle = RPCNonceOracle(signer_address, rpc) @@ -80,7 +79,7 @@ account = args.address def main(): if __name__ == '__main__': - c = AccountRegistry(signer=signer, gas_oracle=gas_oracle, nonce_oracle=nonce_oracle, chain_id=chain_id) + 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) rpc.do(o) r = rpc.wait(tx_hash_hex) diff --git a/python/eth_accounts_index/runnable/deploy.py b/python/eth_accounts_index/runnable/deploy.py @@ -34,7 +34,7 @@ argparser = argparse.ArgumentParser() argparser.add_argument('-p', '--provider', dest='p', default='http://localhost:8545', type=str, help='Web3 provider url (http only)') argparser.add_argument('-w', action='store_true', help='Wait for the last transaction to be confirmed') argparser.add_argument('-ww', action='store_true', help='Wait for every transaction to be confirmed') -argparser.add_argument('-i', '--chain-spec', dest='i', type=str, default='Ethereum:1', help='Chain specification string') +argparser.add_argument('-i', '--chain-spec', dest='i', type=str, default='evm:ethereum:1', help='Chain specification string') argparser.add_argument('-y', '--key-file', dest='y', type=str, help='Ethereum keystore file to use for signing') argparser.add_argument('-v', action='store_true', help='Be verbose') argparser.add_argument('-vv', action='store_true', help='Be more verbose') @@ -66,7 +66,6 @@ if args.y != None: signer = EIP155Signer(keystore) chain_spec = ChainSpec.from_chain_str(args.i) -chain_id = chain_spec.network_id() rpc = EthHTTPConnection(args.p) nonce_oracle = RPCNonceOracle(signer_address, rpc) @@ -74,7 +73,7 @@ gas_oracle = RPCGasOracle(rpc, code_callback=AccountRegistry.gas) def main(): - c = AccountRegistry(signer=signer, gas_oracle=gas_oracle, nonce_oracle=nonce_oracle, chain_id=chain_id) + c = AccountRegistry(chain_spec, signer=signer, gas_oracle=gas_oracle, nonce_oracle=nonce_oracle) (tx_hash_hex, o) = c.constructor(signer_address) rpc.do(o) if block_last: diff --git a/python/eth_accounts_index/runnable/writer.py b/python/eth_accounts_index/runnable/writer.py @@ -34,7 +34,7 @@ argparser = argparse.ArgumentParser() argparser.add_argument('-p', '--provider', dest='p', default='http://localhost:8545', type=str, help='Web3 provider url (http only)') argparser.add_argument('-w', action='store_true', help='Wait for the last transaction to be confirmed') argparser.add_argument('-ww', action='store_true', help='Wait for every transaction to be confirmed') -argparser.add_argument('-i', '--chain-spec', dest='i', type=str, default='Ethereum:1', help='Chain specification string') +argparser.add_argument('-i', '--chain-spec', dest='i', type=str, default='evm:ethereum:1', help='Chain specification string') argparser.add_argument('-y', '--key-file', dest='y', type=str, help='Ethereum keystore file to use for signing') argparser.add_argument('-a', '--contract-address', dest='a', required=True, type=str, help='Contract address to account index to edit') argparser.add_argument('--delete', action='store_true', help='Delete address') @@ -69,7 +69,6 @@ if args.y != None: signer = EIP155Signer(keystore) chain_spec = ChainSpec.from_chain_str(args.i) -chain_id = chain_spec.network_id() rpc = EthHTTPConnection(args.p) nonce_oracle = RPCNonceOracle(signer_address, rpc) @@ -82,7 +81,7 @@ if args.delete: def main(): - c = AccountRegistry(signer=signer, gas_oracle=gas_oracle, nonce_oracle=nonce_oracle, chain_id=chain_id) + c = AccountRegistry(chain_spec, signer=signer, gas_oracle=gas_oracle, nonce_oracle=nonce_oracle) tx_hash_hex = None o = None if delete: diff --git a/python/requirements.txt b/python/requirements.txt @@ -1,3 +1,3 @@ confini~=0.3.6rc3 -chainlib~=0.0.1a42 -crypto-dev-signer~=0.4.14a15 +chainlib~=0.0.2a1 +crypto-dev-signer~=0.4.14a17 diff --git a/python/setup.cfg b/python/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = eth-accounts-index -version = 0.0.11a6 +version = 0.0.11a7 description = Accounts index evm contract tooling with permissioned writes author = Louis Holbrook author_email = dev@holbrook.no