From 4cca223a1e713ec7f73c12339b11dd20e5e452d5 Mon Sep 17 00:00:00 2001 From: David Boreham Date: Mon, 4 Sep 2023 14:34:00 -0600 Subject: [PATCH 1/2] Configure initial peers through deploy create command --- .../stacks/mainnet-laconic/deploy/commands.py | 20 ++++++++++++++++++- app/deployment_create.py | 5 +++-- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/app/data/stacks/mainnet-laconic/deploy/commands.py b/app/data/stacks/mainnet-laconic/deploy/commands.py index 31c48662..8237070f 100644 --- a/app/data/stacks/mainnet-laconic/deploy/commands.py +++ b/app/data/stacks/mainnet-laconic/deploy/commands.py @@ -110,6 +110,20 @@ def _remove_persistent_peers(options: CommandOptions, network_dir: Path): output_file.write(config_file_content) +def _insert_persistent_peers(options: CommandOptions, config_dir: Path, new_persistent_peers: str): + config_file_path = _config_toml_path(config_dir) + if not config_file_path.exists(): + print("Error: config.toml not found") + sys.exit(1) + with open(config_file_path, "r") as input_file: + config_file_content = input_file.read() + persistent_peers_pattern = '^persistent_peers = "(.+?)"' + replace_with = f"persistent_peers = \"{new_persistent_peers}\"" + config_file_content = re.sub(persistent_peers_pattern, replace_with, config_file_content, flags=re.MULTILINE) + with open(config_file_path, "w") as output_file: + output_file.write(config_file_content) + + def setup(command_context: DeployCommandContext, parameters: LaconicStackSetupCommand, extra_args): options = command_context.cluster_context.options @@ -245,7 +259,7 @@ def setup(command_context: DeployCommandContext, parameters: LaconicStackSetupCo def create(command_context: DeployCommandContext, extra_args): - network_dir = extra_args + network_dir = extra_args[0] if network_dir is None: print("Error: --network-dir must be supplied") sys.exit(1) @@ -265,6 +279,10 @@ def create(command_context: DeployCommandContext, extra_args): # TODO: change this to work with non local paths deployment_config_dir = command_context.deployment_dir.joinpath("data", "laconicd-config") copytree(config_dir_path, deployment_config_dir, dirs_exist_ok=True) + # If supplied, add the initial persistent peers to the config file + if extra_args[1]: + initial_persistent_peers = extra_args[1] + _insert_persistent_peers(command_context.cluster_context.options, deployment_config_dir, initial_persistent_peers) # Copy the data directory contents into our deployment # TODO: change this to work with non local paths deployment_data_dir = command_context.deployment_dir.joinpath("data", "laconicd-data") diff --git a/app/deployment_create.py b/app/deployment_create.py index a23da498..f5db318b 100644 --- a/app/deployment_create.py +++ b/app/deployment_create.py @@ -238,8 +238,9 @@ def init(ctx, output, map_ports_to_host): @click.option("--deployment-dir", help="Create deployment files in this directory") # TODO: Hack @click.option("--network-dir", help="Network configuration supplied in this directory") +@click.option("--initial-peers", help="Initial set of persistent peers") @click.pass_context -def create(ctx, spec_file, deployment_dir, network_dir): +def create(ctx, spec_file, deployment_dir, network_dir, initial_peers): # This function fails with a useful error message if the file doens't exist parsed_spec = get_parsed_deployment_spec(spec_file) stack_name = parsed_spec['stack'] @@ -287,7 +288,7 @@ def create(ctx, spec_file, deployment_dir, network_dir): deployment_command_context = ctx.obj deployment_command_context.stack = stack_name deployment_context = DeploymentContext(Path(deployment_dir), deployment_command_context) - call_stack_deploy_create(deployment_context, network_dir) + call_stack_deploy_create(deployment_context, [network_dir, initial_peers]) # TODO: this code should be in the stack .py files but -- 2.45.2 From e11b1ccfae79b2ffc20bc9fc1f29cffa9d5a9092 Mon Sep 17 00:00:00 2001 From: David Boreham Date: Mon, 4 Sep 2023 15:09:43 -0600 Subject: [PATCH 2/2] Re-write config file --- .../stacks/mainnet-laconic/deploy/commands.py | 33 +++++++++++-------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/app/data/stacks/mainnet-laconic/deploy/commands.py b/app/data/stacks/mainnet-laconic/deploy/commands.py index 8237070f..14771617 100644 --- a/app/data/stacks/mainnet-laconic/deploy/commands.py +++ b/app/data/stacks/mainnet-laconic/deploy/commands.py @@ -14,7 +14,7 @@ # along with this program. If not, see . from app.util import get_yaml -from app.deploy_types import DeployCommandContext, LaconicStackSetupCommand +from app.deploy_types import DeployCommandContext, LaconicStackSetupCommand, DeploymentContext from app.stack_state import State from app.deploy_util import VolumeMapping, run_container_command from app.command_types import CommandOptions @@ -111,13 +111,13 @@ def _remove_persistent_peers(options: CommandOptions, network_dir: Path): def _insert_persistent_peers(options: CommandOptions, config_dir: Path, new_persistent_peers: str): - config_file_path = _config_toml_path(config_dir) + config_file_path = config_dir.joinpath("config.toml") if not config_file_path.exists(): print("Error: config.toml not found") sys.exit(1) with open(config_file_path, "r") as input_file: config_file_content = input_file.read() - persistent_peers_pattern = '^persistent_peers = "(.+?)"' + persistent_peers_pattern = '^persistent_peers = ""' replace_with = f"persistent_peers = \"{new_persistent_peers}\"" config_file_content = re.sub(persistent_peers_pattern, replace_with, config_file_content, flags=re.MULTILINE) with open(config_file_path, "w") as output_file: @@ -198,20 +198,22 @@ def setup(command_context: DeployCommandContext, parameters: LaconicStackSetupCo f"laconicd add-genesis-account {parameters.key_name} 12900000000000000000000{currency}\ --home {laconicd_home_path_in_container} --keyring-backend test", mounts) - print(f"Command output: {output2}") + if options.debug: + print(f"Command output: {output2}") output3, status3 = run_container_command( command_context, "laconicd", f"laconicd gentx {parameters.key_name} 90000000000{currency} --home {laconicd_home_path_in_container}\ --chain-id {chain_id} --keyring-backend test", mounts) - print(f"Command output: {output3}") + if options.debug: + print(f"Command output: {output3}") output4, status4 = run_container_command( command_context, "laconicd", f"laconicd keys show {parameters.key_name} -a --home {laconicd_home_path_in_container} --keyring-backend test", mounts) - print(f"Command output: {output4}") + print(f"Node validator address: {output4}") elif phase == SetupPhase.CREATE: if not os.path.exists(network_dir): @@ -230,6 +232,9 @@ def setup(command_context: DeployCommandContext, parameters: LaconicStackSetupCo copyfile(genesis_file_path, os.path.join(network_dir, "config", os.path.basename(genesis_file_path))) else: # We're generating the genesis file + if not parameters.gentx_file_list: + print(f"Error: --gentx-files must be supplied") + sys.exit(1) # First look in the supplied gentx files for the other nodes' keys other_node_keys = _get_node_keys_from_gentx_files(options, parameters.gentx_file_list) # Add those keys to our genesis, with balances we determine here (why?) @@ -237,13 +242,15 @@ def setup(command_context: DeployCommandContext, parameters: LaconicStackSetupCo outputk, statusk = run_container_command( command_context, "laconicd", f"laconicd add-genesis-account {other_node_key} 12900000000000000000000{currency}\ --home {laconicd_home_path_in_container} --keyring-backend test", mounts) - print(f"Command output: {outputk}") + if options.debug: + print(f"Command output: {outputk}") # Copy the gentx json files into our network dir _copy_gentx_files(options, network_dir, parameters.gentx_file_list) # Now we can run collect-gentxs output1, status1 = run_container_command( command_context, "laconicd", f"laconicd collect-gentxs --home {laconicd_home_path_in_container}", mounts) - print(f"Command output: {output1}") + if options.debug: + print(f"Command output: {output1}") print(f"Generated genesis file, please copy to other nodes as required: \ {os.path.join(network_dir, 'config', 'genesis.json')}") # Last thing, collect-gentxs puts a likely bogus set of persistent_peers in config.toml so we remove that now @@ -251,14 +258,14 @@ def setup(command_context: DeployCommandContext, parameters: LaconicStackSetupCo # In both cases we validate the genesis file now output2, status1 = run_container_command( command_context, "laconicd", f"laconicd validate-genesis --home {laconicd_home_path_in_container}", mounts) - print(f"Command output: {output2}") + print(f"validate-genesis result: {output2}") else: print("Illegal parameters supplied") sys.exit(1) -def create(command_context: DeployCommandContext, extra_args): +def create(context: DeploymentContext, extra_args): network_dir = extra_args[0] if network_dir is None: print("Error: --network-dir must be supplied") @@ -277,15 +284,15 @@ def create(command_context: DeployCommandContext, extra_args): sys.exit(1) # Copy the network directory contents into our deployment # TODO: change this to work with non local paths - deployment_config_dir = command_context.deployment_dir.joinpath("data", "laconicd-config") + deployment_config_dir = context.deployment_dir.joinpath("data", "laconicd-config") copytree(config_dir_path, deployment_config_dir, dirs_exist_ok=True) # If supplied, add the initial persistent peers to the config file if extra_args[1]: initial_persistent_peers = extra_args[1] - _insert_persistent_peers(command_context.cluster_context.options, deployment_config_dir, initial_persistent_peers) + _insert_persistent_peers(context.command_context.cluster_context.options, deployment_config_dir, initial_persistent_peers) # Copy the data directory contents into our deployment # TODO: change this to work with non local paths - deployment_data_dir = command_context.deployment_dir.joinpath("data", "laconicd-data") + deployment_data_dir = context.deployment_dir.joinpath("data", "laconicd-data") copytree(data_dir_path, deployment_data_dir, dirs_exist_ok=True) -- 2.45.2