har- code node-defaults values and remove the need for extra yaml file

Author: pinheadmz

resources/networks/fork_observer/node-defaults.yaml

@@ -48,6 +48,13 @@ class AnnexMember(Enum):
 
 PLUGIN_ANNEX = "annex"
 
+DEFAULT_IMAGE_REPO="bitcoindevproject/bitcoin"
+
+# Bitcoin Core config
+FORK_OBSERVER_RPCAUTH="forkobserver:1418183465eecbd407010cf60811c6a0$d4e5f0647a63429c218da1302d7f19fe627302aeb0a71a74de55346a25d8057c"
+# Fork Observer config
+FORK_OBSERVER_RPC_USER="forkobserver"
+FORK_OBSERVER_RPC_PASSWORD="tabconf2024"
 
 # Directories and files for non-python assets, e.g., helm charts, example scenarios, default configs
 SRC_DIR = files("warnet")

src/warnet/constants.py

@@ -29,6 +29,8 @@
     AnnexMember,
     HookValue,
     WarnetContent,
+    FORK_OBSERVER_RPC_USER,
+    FORK_OBSERVER_RPC_PASSWORD,
 )
 from .control import _logs, _run
 from .k8s import (
@@ -331,8 +333,8 @@ def deploy_fork_observer(directory: Path, debug: bool) -> bool:
 description = "{node_name}.{default_namespace}.svc:{int(p2pport)}"
 rpc_host = "{node_name}.{default_namespace}.svc"
 rpc_port = {int(rpcport)}
-rpc_user = "forkobserver"
-rpc_password = "tabconf2024"
+rpc_user = "{FORK_OBSERVER_RPC_USER}"
+rpc_password = "{FORK_OBSERVER_RPC_PASSWORD}"
 """
 
         override_string += node_config

src/warnet/deploy.py

@@ -2,7 +2,6 @@
 import os
 import random
 import sys
-from importlib.resources import files
 from pathlib import Path
 
 import click
@@ -11,7 +10,12 @@
 
 from resources.scenarios.ln_framework.ln import Policy
 
-from .constants import DEFAULT_TAG, SUPPORTED_TAGS
+from .constants import (
+    DEFAULT_TAG,
+    SUPPORTED_TAGS,
+    FORK_OBSERVER_RPCAUTH,
+    DEFAULT_IMAGE_REPO,
+)
 
 
 @click.group(name="graph", hidden=True)
@@ -41,7 +45,7 @@ def custom_graph(
     connections = set()
 
     for i in range(num_nodes):
-        node = {"name": f"tank-{i:04d}", "addnode": [], "image": {"tag": version}}
+        node = {"name": f"tank-{i:04d}", "addnode": []}
 
         # Add round-robin connection
         next_node = (i + 1) % num_nodes
@@ -77,11 +81,19 @@ def custom_graph(
         yaml.dump(network_yaml_data, f, default_flow_style=False)
 
     # Generate node-defaults.yaml
-    default_yaml_path = (
-        files("resources.networks").joinpath("fork_observer").joinpath("node-defaults.yaml")
-    )
-    with open(str(default_yaml_path)) as f:
-        defaults_yaml_content = yaml.safe_load(f)
+    defaults_yaml_content = {
+        "chain": "regtest",
+        "image": {
+            "repository": DEFAULT_IMAGE_REPO,
+            "pullPolicy": "IfNotPresent",
+            "tag": version
+        },
+        "defaultConfig":
+            f"rpcauth={FORK_OBSERVER_RPCAUTH}\n" +
+            "rpcwhitelist=forkobserver:getchaintips,getblockheader,getblockhash,getblock,getnetworkinfo\n" +
+            "rpcwhitelistdefault=0\n" +
+            "debug=rpc\n"
+    }
 
     # Configure logging
     defaults_yaml_content["collectLogs"] = logging