diff --git a/python/eth_contract_registry/registry.py b/python/eth_contract_registry/registry.py index 6da5b7e..09d321d 100644 --- a/python/eth_contract_registry/registry.py +++ b/python/eth_contract_registry/registry.py @@ -26,7 +26,10 @@ from hexathon import ( from chainlib.eth.tx import TxFactory # local imports -from .encoding import to_identifier +from .encoding import ( + to_identifier, + from_identifier_hex, + ) logg = logging.getLogger(__name__) @@ -148,3 +151,8 @@ class Registry(TxFactory): tx = self.set_code(tx, data) o['params'].append(self.normalize(tx)) return o + + + @classmethod + def parse_identifier(self, v): + return from_identifier_hex(v) diff --git a/python/eth_contract_registry/runnable/list.py b/python/eth_contract_registry/runnable/list.py new file mode 100644 index 0000000..76c8b37 --- /dev/null +++ b/python/eth_contract_registry/runnable/list.py @@ -0,0 +1,100 @@ +"""Set identifier value on contract registry + +.. moduleauthor:: Louis Holbrook +.. pgp:: 0826EDA1702D1E87C6E2875121D2E7BB88C2A746 + +""" + +# standard imports +import sys +import os +import json +import argparse +import logging + +# third-party imports +from crypto_dev_signer.eth.signer import ReferenceSigner as EIP155Signer +from crypto_dev_signer.keystore.dict import DictKeystore +from crypto_dev_signer.eth.helper import EthTxExecutor +from chainlib.chain import ChainSpec +from chainlib.eth.nonce import RPCNonceOracle +from chainlib.eth.gas import RPCGasOracle +from chainlib.eth.connection import EthHTTPConnection +from chainlib.eth.tx import receipt +from chainlib.eth.constant import ZERO_CONTENT +from chainlib.error import JSONRPCException + +# local imports +from eth_contract_registry import Registry + +logging.basicConfig(level=logging.WARNING) +logg = logging.getLogger() + +script_dir = os.path.dirname(__file__) +data_dir = os.path.join(script_dir, '..', 'data') + +default_format = 'terminal' + +argparser = argparse.ArgumentParser() +argparser.add_argument('-p', '--provider', dest='p', default='http://localhost:8545', type=str, help='RPC provider url (http only)') +argparser.add_argument('-i', '--chain-spec', dest='i', type=str, default='Ethereum:1', help='Chain specification string') +argparser.add_argument('-r', '--registry', dest='r', required=True, type=str, help='Contract registry address') +argparser.add_argument('-f', '--format', dest='f', type=str, default=default_format, help='Output format [human, brief]') +argparser.add_argument('-v', action='store_true', help='Be verbose') +argparser.add_argument('-vv', action='store_true', help='Be more verbose') +argparser.add_argument('--env-prefix', default=os.environ.get('CONFINI_ENV_PREFIX'), dest='env_prefix', type=str, help='environment prefix for variables to overwrite configuration') +argparser.add_argument('identifier', type=str, nargs='?', help='Token symbol to return address for') +args = argparser.parse_args() + +if args.vv: + logg.setLevel(logging.DEBUG) +elif args.v: + logg.setLevel(logging.INFO) + +chain_spec = ChainSpec.from_chain_str(args.i) +chain_id = chain_spec.network_id() + +rpc = EthHTTPConnection(args.p) +registry_address = args.r +identifier = args.identifier +fmt = args.f + + +def out_element(e, fmt=default_format, w=sys.stdout): + logg.debug('format {}'.format(fmt)) + if fmt == 'brief': + w.write(e[1] + '\n') + else: + w.write('{} {}\n'.format(e[0], e[1])) + + +def element(ifc, identifier, fmt=default_format, w=sys.stdout): + o = ifc.address_of(registry_address, identifier) + r = rpc.do(o) + address = ifc.parse_address_of(r) + out_element((identifier, address), fmt, w) + + +def ls(ifc, fmt=default_format, w=sys.stdout): + i = 0 + while True: + o = ifc.identifier(registry_address, i) + try: + r = rpc.do(o) + identifier = ifc.parse_identifier(r) + element(ifc, identifier, fmt, w) + i += 1 + except JSONRPCException: + break + + +def main(): + c = Registry() + if identifier != None: + element(c, identifier, fmt=fmt, w=sys.stdout) + else: + ls(c, fmt=fmt, w=sys.stdout) + + +if __name__ == '__main__': + main() diff --git a/python/gmon.out b/python/gmon.out index 1e15995..55db042 100644 Binary files a/python/gmon.out and b/python/gmon.out differ diff --git a/python/setup.cfg b/python/setup.cfg index 8c0809c..43013ec 100644 --- a/python/setup.cfg +++ b/python/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = eth-contract-registry -version = 0.5.4a3 +version = 0.5.4a4 description = Ethereum Smart Contract key-value registry author = Louis Holbrook author_email = dev@holbrook.no