cicnet/cic-cli
5
1
Fork 0
Code Issues Pull Requests Projects Releases 18 Wiki Activity

fix(ext): allow loading chain_spec from config
All checks were successful
continuous-integration/drone/pr Build is passing
Details
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
William Luke 2022-03-01 13:48:58 +03:00
parent 7ccdde481b
commit 1d4b0512ad
2 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cic/cmd/ext.py
View File

@ -10,7 +10,7 @@ from cic.contract.network import Network
def process_args(argparser): def process_args(argparser):
argparser.add_argument( argparser.add_argument(
"--registry", required=True, type=str, help="contract registry address" "--registry", type=str, help="contract registry address"
) )
argparser.add_argument( argparser.add_argument(
"-d", "--directory", type=str, dest="directory", default=".", help="directory" "-d", "--directory", type=str, dest="directory", default=".", help="directory"
@ -28,11 +28,11 @@ def execute(config, eargs):
cn = Network(eargs.directory, targets=eargs.target) cn = Network(eargs.directory, targets=eargs.target)
cn.load() cn.load()
chain_spec = ChainSpec.from_chain_str(eargs.i) chain_spec = ChainSpec.from_chain_str(eargs.i or config.get("CHAIN_SPEC"))
m = importlib.import_module(f"cic.ext.{eargs.target}.start") m = importlib.import_module(f"cic.ext.{eargs.target}.start")
m.extension_start( m.extension_start(
cn, cn,
registry_address=eargs.registry, registry_address=eargs.registry or config.get("CIC_REGISTRY_ADDRESS"),
chain_spec=chain_spec, chain_spec=chain_spec,
rpc_provider=config.get("RPC_PROVIDER"), rpc_provider=config.get("RPC_PROVIDER"),
) ) # TODO add key account address

32
cic/ext/eth/start.py
View File

@ -1,6 +1,6 @@
# external imports # external imports
from cic_eth_registry import CICRegistry
from chainlib.eth.connection import RPCConnection from chainlib.eth.connection import RPCConnection
from cic_eth_registry import CICRegistry
def extension_start(network, *args, **kwargs): def extension_start(network, *args, **kwargs):
@ -9,22 +9,26 @@ def extension_start(network, *args, **kwargs):
:param network: Network object to read and write settings from :param network: Network object to read and write settings from
:type network: cic.network.Network :type network: cic.network.Network
""" """
CICRegistry.address = kwargs['registry_address'] CICRegistry.address = kwargs.get("registry_address")
key_account_address = kwargs['key_account_address'] or '' key_account_address = kwargs.get("key_account_address")
RPCConnection.register_location(
kwargs.get("rpc_provider"), kwargs.get("chain_spec")
)
conn = RPCConnection.connect(kwargs.get("chain_spec"))
RPCConnection.register_location(kwargs['rpc_provider'], kwargs['chain_spec']) registry = CICRegistry(kwargs.get("chain_spec"), conn)
conn = RPCConnection.connect(kwargs['chain_spec'])
registry = CICRegistry(kwargs['chain_spec'], conn) address_declarator = registry.by_name("AddressDeclarator")
network.resource_set(
"eth", "address_declarator", address_declarator, key_account=key_account_address
)
address_declarator = registry.by_name('AddressDeclarator') token_index = registry.by_name("TokenRegistry")
network.resource_set('eth', 'address_declarator', address_declarator, key_account=key_account_address) network.resource_set(
"eth", "token_index", token_index, key_account=key_account_address
)
token_index = registry.by_name('TokenRegistry') network.resource_set("eth", "token", None, key_account=key_account_address)
network.resource_set('eth', 'token_index', token_index, key_account=key_account_address)
network.resource_set('eth', 'token', None, key_account=key_account_address) network.set("eth", kwargs["chain_spec"])
network.set('eth', kwargs['chain_spec'])
network.save() network.save()