bitcoin tanks now connect to each other

m3dwards · m3dwards · commit 9de24ac9b9aa · 2024-08-21T17:33:36.000+02:00
diff --git a/networks/6_node_bitcoin/defaults.yaml b/networks/6_node_bitcoin/defaults.yaml
@@ -1,3 +1,5 @@
+chain: regtest
+
 collectLogs: true
 metricsExport: true
 
@@ -19,23 +21,5 @@ image:
   # Overrides the image tag whose default is the chart appVersion.
   tag: "27.0"
 
-config: |2+
-    regtest=1
-    checkmempool=0
-    acceptnonstdtxn=1
-    debuglogfile=0
-    logips=1
-    logtimemicros=1
-    capturemessages=1
-    fallbackfee=0.00001000
-    listen=1
-
-    [regtest]
-    rpcuser=user
-    rpcpassword=password
-    rpcport=18443
-    rpcallowip=0.0.0.0/0
-    rpcbind=0.0.0.0
-
-    zmqpubrawblock=tcp://0.0.0.0:28332
-    zmqpubrawtx=tcp://0.0.0.0:28333
+config: |
+  dns=1
diff --git a/networks/6_node_bitcoin/network.yaml b/networks/6_node_bitcoin/network.yaml
@@ -1,10 +1,31 @@
 nodes:
   - name: tank-0001
-    config:
-      image:
-        tag: "26.0"
+    image:
+      tag: "26.0"
+    connect:
+      - tank-0002
+      - tank-0003
   - name: tank-0002
+    resources:
+      limits:
+        cpu: 100m
+        memory: 128Mi
+      requests:
+        cpu: 100m
+        memory: 128Mi
+    connect:
+      - tank-0003
+      - tank-0004
   - name: tank-0003
+    connect:
+      - tank-0004
+      - tank-0005
   - name: tank-0004
+    connect:
+      - tank-0005
+      - tank-0006
   - name: tank-0005
+    connect:
+      - tank-0006
+      - tank-0007
   - name: tank-0006
diff --git a/resources/charts/bitcoincore/templates/_helpers.tpl b/resources/charts/bitcoincore/templates/_helpers.tpl
@@ -14,12 +14,7 @@ If release name contains chart name it will be used as a full name.
 {{- if .Values.fullnameOverride }}
 {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
 {{- else }}
-{{- $name := default .Chart.Name .Values.nameOverride }}
-{{- if contains $name .Release.Name }}
-{{- .Release.Name | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
-{{- end }}
+{{- printf "%s" .Release.Name | trunc 63 | trimSuffix "-" }}
 {{- end }}
 {{- end }}
 
diff --git a/resources/charts/bitcoincore/templates/configmap.yaml b/resources/charts/bitcoincore/templates/configmap.yaml
@@ -5,5 +5,12 @@ metadata:
   labels:
     {{- include "bitcoincore.labels" . | nindent 4 }}
 data:
-  bitcoin-conf: |
-   {{ tpl .Values.config . | nindent 2 }}
+  bitcoin.conf: |
+    {{- if eq .Values.chain "regtest" }}
+      {{- tpl .Values.regtestConfig . | nindent 4 }}
+    {{- end }}
+    {{- .Values.baseConfig | nindent 4 }}
+    {{- .Values.config | nindent 4 }}
+    {{- range .Values.connect }}
+      {{- print "connect=" . | nindent 4}}
+    {{- end }}
diff --git a/resources/charts/bitcoincore/templates/pod.yaml b/resources/charts/bitcoincore/templates/pod.yaml
@@ -22,8 +22,17 @@ spec:
       image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
       imagePullPolicy: {{ .Values.image.pullPolicy }}
       ports:
-        - name: http
-          containerPort: {{ .Values.service.port }}
+        - name: rpc
+          containerPort: {{ .Values.regtest.RPCPort }}
+          protocol: TCP
+        - name: p2p
+          containerPort: {{ .Values.regtest.P2PPort }}
+          protocol: TCP
+        - name: zmq-tx
+          containerPort: {{ .Values.regtest.ZMQTxPort }}
+          protocol: TCP
+        - name: zmq-block
+          containerPort: {{ .Values.regtest.ZMQBlockPort }}
           protocol: TCP
       livenessProbe:
         {{- toYaml .Values.livenessProbe | nindent 8 }}
diff --git a/resources/charts/bitcoincore/templates/service.yaml b/resources/charts/bitcoincore/templates/service.yaml
@@ -0,0 +1,27 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "bitcoincore.fullname" . }}
+  labels:
+    {{- include "bitcoincore.labels" . | nindent 4 }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - port: {{ .Values.regtest.RPCPort }}
+      targetPort: rpc
+      protocol: TCP
+      name: rpc
+    - port: {{ .Values.regtest.P2PPort }}
+      targetPort: p2p
+      protocol: TCP
+      name: p2p
+    - port: {{ .Values.regtest.ZMQTxPort }}
+      targetPort: zmq-tx
+      protocol: TCP
+      name: zmq-tx
+    - port: {{ .Values.regtest.ZMQBlockPort }}
+      targetPort: zmq-block
+      protocol: TCP
+      name: zmq-block
+  selector:
+    {{- include "bitcoincore.selectorLabels" . | nindent 4 }}
diff --git a/resources/charts/bitcoincore/values.yaml b/resources/charts/bitcoincore/values.yaml
@@ -38,7 +38,12 @@ securityContext: {}
 
 service:
   type: ClusterIP
-  port: 80
+
+regtest:
+  RPCPort: 18443
+  P2PPort: 18444
+  ZMQTxPort: 28333
+  ZMQBlockPort: 28332
 
 ingress:
   enabled: false
@@ -107,23 +112,31 @@ tolerations: []
 
 affinity: {}
 
-config: |2+
-    regtest=1
-    checkmempool=0
-    acceptnonstdtxn=1
-    debuglogfile=0
-    logips=1
-    logtimemicros=1
-    capturemessages=1
-    fallbackfee=0.00001000
-    listen=1
-
-    [regtest]
-    rpcuser=user
-    rpcpassword=password
-    rpcport=18443
-    rpcallowip=0.0.0.0/0
-    rpcbind=0.0.0.0
-
-    zmqpubrawblock=tcp://0.0.0.0:28332
-    zmqpubrawtx=tcp://0.0.0.0:28333
+chain: regtest
+
+regtestConfig: |
+  regtest=1
+
+  [regtest]
+  rpcuser=user
+  rpcpassword=password
+  rpcport=18443
+  rpcallowip=0.0.0.0/0
+  rpcbind=0.0.0.0
+
+baseConfig: |
+  checkmempool=0
+  acceptnonstdtxn=1
+  debuglogfile=0
+  logips=1
+  logtimemicros=1
+  capturemessages=1
+  fallbackfee=0.00001000
+  listen=1
+
+  zmqpubrawblock=tcp://0.0.0.0:28332
+  zmqpubrawtx=tcp://0.0.0.0:28333
+
+config: ""
+
+connect: []
diff --git a/src/warnet/cli/network2.py b/src/warnet/cli/network2.py
@@ -5,7 +5,7 @@
 import click
 import yaml
 
-from .process import run_command
+from .process import stream_command
 
 NETWORK_DIR = Path("networks")
 DEFAULT_NETWORK = "6_node_bitcoin"
@@ -40,7 +40,8 @@ def start2(network_name: str, logging: bool, network: str):
         try:
             temp_override_file_path = ""
             node_name = node.get("name")
-            node_config_override = node.get("config")
+            # all the keys apart from name
+            node_config_override = {k: v for k, v in node.items() if k != "name"}
 
             cmd = f"{HELM_COMMAND} {node_name} {BITCOIN_CHART_LOCATION} --namespace {NAMESPACE} -f {defaults_file_path}"
 
@@ -52,12 +53,12 @@ def start2(network_name: str, logging: bool, network: str):
                     temp_override_file_path = temp_file.name
                 cmd = f"{cmd} -f {temp_override_file_path}"
 
-            if not run_command(cmd, stream_output=True):
+            if not stream_command(cmd):
                 print(f"Failed to run Helm command: {cmd}")
                 return
         except Exception as e:
             print(f"Error: {e}")
             return
-        finally:
-            if temp_override_file_path:
-                Path(temp_override_file_path).unlink()
+        # finally:
+        # if temp_override_file_path:
+        #     Path(temp_override_file_path).unlink()
