hook FO configQueryInterval to custom graph create

Author: willcl-ark

resources/networks/6_node_bitcoin/network.yaml

@@ -28,4 +28,6 @@ nodes:
     connect:
       - tank-0006
   - name: tank-0006
-fork_observer: true
+fork_observer:
+  enabled: true
+  configQueryInterval: 20

src/warnet/deploy.py

@@ -69,7 +69,7 @@ def deploy_fork_observer(directory: Path):
         network_file = yaml.safe_load(f)
 
     # Only start if configured in the network file
-    if not network_file.get("fork_observer", False):
+    if not network_file.get("fork_observer", {}).get("enabled", False):
         return
 
     namespace = get_default_namespace()
@@ -99,6 +99,7 @@ def deploy_fork_observer(directory: Path):
     # Create yaml string using multi-line string format
     override_string = override_string.strip()
     v = {"config": override_string}
+    v["configQueryinterval"] = network_file.get("fork_observer", {}).get("configQueryinterval", 20)
     yaml_string = yaml.dump(v, default_style="|", default_flow_style=False)
 
     # Dump to yaml tempfile

src/warnet/main.py

@@ -190,10 +190,22 @@ def quickstart():
             type=bool,
             default=True,
         )
+        fork_observer_query_interval = 20
+        if fork_observer:
+            fork_observer_query_interval = click.prompt(
+                click.style(
+                    "\nHow often would you like fork-observer to query node status (seconds)?",
+                    fg="blue",
+                    bold=True,
+                ),
+                type=int,
+                default=20,
+            )
 
         click.secho("\nCreating project structure...", fg="yellow", bold=True)
         project_path = Path(os.path.expanduser(proj_answers["project_path"]))
         create_warnet_project(project_path)
+
         click.secho("\nGenerating custom network...", fg="yellow", bold=True)
         custom_network_path = project_path / "networks" / answers["network_name"]
         custom_graph(
@@ -202,10 +214,17 @@ def quickstart():
             answers["version"],
             custom_network_path,
             fork_observer,
+            fork_observer_query_interval,
         )
         click.secho("\nSetup completed successfully!", fg="green", bold=True)
-        click.echo("\nRun the following command to deploy this network:")
+
+        click.echo(
+            f"\nEdit the network files found in {custom_network_path} before deployment if you want to customise the network."
+        )
+
+        click.echo("\nWhen you're ready, run the following command to deploy this network:")
         click.echo(f"warnet deploy {custom_network_path}")
+
     except Exception as e:
         click.echo(f"{e}\n\n")
         click.secho(f"An error occurred while running the quick start script:\n\n{e}\n\n", fg="red")
@@ -368,7 +387,12 @@ def logs(pod_name: str, follow: bool):
 
 
 def custom_graph(
-    num_nodes: int, num_connections: int, version: str, datadir: Path, fork_observer: bool
+    num_nodes: int,
+    num_connections: int,
+    version: str,
+    datadir: Path,
+    fork_observer: bool,
+    fork_obs_query_interval: int,
 ):
     datadir.mkdir(parents=False, exist_ok=False)
     # Generate network.yaml
@@ -400,7 +424,10 @@ def custom_graph(
         nodes.append(node)
 
     network_yaml_data = {"nodes": nodes}
-    network_yaml_data["fork_observer"] = fork_observer
+    network_yaml_data["fork_observer"] = {
+        "enabled": fork_observer,
+        "configQueryInterval": fork_obs_query_interval,
+    }
 
     with open(os.path.join(datadir, "network.yaml"), "w") as f:
         yaml.dump(network_yaml_data, f, default_flow_style=False)