From b1a1979fc17c5ead1bcdd69f783568b28f6c0ea1 Mon Sep 17 00:00:00 2001 From: Chris Marslender Date: Thu, 15 Feb 2024 12:58:42 -0600 Subject: [PATCH 1/4] If missing, add testnet11 constants to config file --- chia/cmds/configure.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/chia/cmds/configure.py b/chia/cmds/configure.py index c269964d8df3..919b45f8b4cf 100644 --- a/chia/cmds/configure.py +++ b/chia/cmds/configure.py @@ -4,6 +4,7 @@ from typing import Optional import click +import yaml from chia.server.outbound_message import NodeType from chia.util.config import ( @@ -12,6 +13,7 @@ save_config, set_peer_info, str2bool, + initial_config_file, ) @@ -103,6 +105,21 @@ def configure( if testnet: if testnet == "true" or testnet == "t": print("Setting Testnet") + # check if network_overrides.constants.testnet11 exists + if ( + "testnet11" not in config["network_overrides"]["constants"] + or "testnet11" not in config["network_overrides"]["config"] + ): + print("Testnet11 constants missing. Adding to config...") + initial_config_str: str = initial_config_file("config.yaml") + initial_config = yaml.safe_load(initial_config_str) + config["network_overrides"]["constants"]["testnet11"] = initial_config["network_overrides"][ + "constants" + ]["testnet11"] + config["network_overrides"]["config"]["testnet11"] = initial_config["network_overrides"]["config"][ + "testnet11" + ] + testnet_port = "58444" testnet_introducer = "introducer-testnet11.chia.net" testnet_dns_introducer = "dns-introducer-testnet11.chia.net" From e1ced60132df371ddbc83ab45cf1d8d66caa3c4b Mon Sep 17 00:00:00 2001 From: Chris Marslender Date: Thu, 15 Feb 2024 13:12:24 -0600 Subject: [PATCH 2/4] Run isort --- chia/cmds/configure.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chia/cmds/configure.py b/chia/cmds/configure.py index 919b45f8b4cf..0bb7a90f18e0 100644 --- a/chia/cmds/configure.py +++ b/chia/cmds/configure.py @@ -8,12 +8,12 @@ from chia.server.outbound_message import NodeType from chia.util.config import ( + initial_config_file, load_defaults_for_missing_services, lock_and_load_config, save_config, set_peer_info, str2bool, - initial_config_file, ) From ee701703e89a7d493db6a74939151d6f0bc72c48 Mon Sep 17 00:00:00 2001 From: Chris Marslender Date: Thu, 15 Feb 2024 13:39:01 -0600 Subject: [PATCH 3/4] Be specific about which parts are missing when updating config --- chia/cmds/configure.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/chia/cmds/configure.py b/chia/cmds/configure.py index 0bb7a90f18e0..4a5463b4db50 100644 --- a/chia/cmds/configure.py +++ b/chia/cmds/configure.py @@ -113,12 +113,15 @@ def configure( print("Testnet11 constants missing. Adding to config...") initial_config_str: str = initial_config_file("config.yaml") initial_config = yaml.safe_load(initial_config_str) - config["network_overrides"]["constants"]["testnet11"] = initial_config["network_overrides"][ - "constants" - ]["testnet11"] - config["network_overrides"]["config"]["testnet11"] = initial_config["network_overrides"]["config"][ - "testnet11" - ] + if "testnet11" not in config["network_overrides"]["constants"]: + config["network_overrides"]["constants"]["testnet11"] = initial_config["network_overrides"][ + "constants" + ]["testnet11"] + + if "testnet11" not in config["network_overrides"]["config"]: + config["network_overrides"]["config"]["testnet11"] = initial_config["network_overrides"]["config"][ + "testnet11" + ] testnet_port = "58444" testnet_introducer = "introducer-testnet11.chia.net" From 40e30a1c43941e2dda87d8aa6d778d0727212455 Mon Sep 17 00:00:00 2001 From: Chris Marslender Date: Thu, 15 Feb 2024 13:40:28 -0600 Subject: [PATCH 4/4] Run black --- chia/cmds/configure.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/chia/cmds/configure.py b/chia/cmds/configure.py index 4a5463b4db50..c45ee38c87d4 100644 --- a/chia/cmds/configure.py +++ b/chia/cmds/configure.py @@ -119,9 +119,9 @@ def configure( ]["testnet11"] if "testnet11" not in config["network_overrides"]["config"]: - config["network_overrides"]["config"]["testnet11"] = initial_config["network_overrides"]["config"][ - "testnet11" - ] + config["network_overrides"]["config"]["testnet11"] = initial_config["network_overrides"][ + "config" + ]["testnet11"] testnet_port = "58444" testnet_introducer = "introducer-testnet11.chia.net"