bitcoin, scenarios: pull rpc port and auth from chart

Author: pinheadmz

resources/charts/bitcoincore/templates/pod.yaml

@@ -7,6 +7,8 @@ metadata:
     {{- with .Values.podLabels }}
         {{- toYaml . | nindent 4 }}
     {{- end }}
+    chain: {{ .Values.chain }}
+    RPCPort: "{{ index .Values .Values.chain "RPCPort" }}"
     app: {{ include "bitcoincore.fullname" . }}
     {{- if .Values.collectLogs }}
     collect_logs: "true"

src/warnet/bitcoin.py

@@ -36,10 +36,12 @@ def rpc(tank: str, method: str, params: str):
 
 
 def _rpc(tank: str, method: str, params: str):
+    # bitcoin-cli should be able to read bitcoin.conf inside the container
+    # so no extra args like port, chain, username or password are needed
     if params:
-        cmd = f"kubectl exec {tank} -- bitcoin-cli -regtest -rpcuser='user' -rpcpassword='password' {method} {' '.join(map(str, params))}"
+        cmd = f"kubectl exec {tank} -- bitcoin-cli {method} {' '.join(map(str, params))}"
     else:
-        cmd = f"kubectl exec {tank} -- bitcoin-cli -regtest -rpcuser='user' -rpcpassword='password' {method}"
+        cmd = f"kubectl exec {tank} -- bitcoin-cli {method}"
     return run_command(cmd)
 
 

src/warnet/control.py

@@ -173,9 +173,9 @@ def run(scenario_file: str, additional_args: tuple[str]):
     tanks = [
         {
             "tank": tank.metadata.name,
-            "chain": "regtest",
+            "chain": tank.metadata.labels["chain"],
             "rpc_host": tank.status.pod_ip,
-            "rpc_port": 18443,
+            "rpc_port": int(tank.metadata.labels["RPCPort"]),
             "rpc_user": "user",
             "rpc_password": "password",
             "init_peers": [],