Merge pull request 'Allow gentx-files to be omitted' (#911) from dbor…

…eham/allow-zero-gentx into main

Reviewed-on: https://git.vdb.to/cerc-io/stack-orchestrator/pulls/911

stack_orchestrator/data/stacks/mainnet-laconic/deploy/commands.py

@@ -298,9 +298,6 @@ 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 and parameters.gentx_address_list) :
-                print("Error: --gentx-files and --gentx-addresses 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(parameters.gentx_address_list)
             # Add those keys to our genesis, with balances we determine here (why?)

stack_orchestrator/deploy/deployment_create.py

@@ -535,7 +535,7 @@ def create_operation(deployment_command_context, spec_file, deployment_dir, netw
 @click.option("--chain-id", help="The new chain id")
 @click.option("--key-name", help="Name for new node key")
 @click.option("--gentx-files", help="List of comma-delimited gentx filenames from other nodes")
-@click.option("--gentx-addresses", help="List of comma-delimited validator addresses for other nodes")
+@click.option("--gentx-addresses", type=str, help="List of comma-delimited validator addresses for other nodes")
 @click.option("--genesis-file", help="Genesis file for the network")
 @click.option("--initialize-network", is_flag=True, default=False, help="Initialize phase")
 @click.option("--join-network", is_flag=True, default=False, help="Join phase")