Merge pull request #538 from pinheadmz/signet

Support signet in warnet

Author: pinheadmz

.github/workflows/test.yml

@@ -62,6 +62,7 @@ jobs:
           - logging_test.py
           - rpc_test.py
           - services_test.py
+          - signet_test.py
           - scenarios_test.py
     steps:
       - uses: actions/checkout@v4

resources/charts/bitcoincore/templates/_helpers.tpl

@@ -60,10 +60,10 @@ Create the name of the service account to use
 {{/*
 Add network section heading in bitcoin.conf after v0.17.0
 */}}
-{{- define "bitcoincore.check_semver.regtest" -}}
+{{- define "bitcoincore.check_semver" -}}
 {{- $tag := .Values.image.tag | trimPrefix "v" -}}
 {{- $version := semverCompare ">=0.17.0" $tag -}}
 {{- if $version -}}
-[regtest]
+[{{ .Values.chain }}]
 {{- end -}}
 {{- end -}}

resources/charts/bitcoincore/templates/configmap.yaml

@@ -6,13 +6,13 @@ metadata:
     {{- include "bitcoincore.labels" . | nindent 4 }}
 data:
   bitcoin.conf: |
-    {{- if eq .Values.chain "regtest" }}
-    regtest=1
+    {{ .Values.chain }}=1
 
-    {{ template "bitcoincore.check_semver.regtest" . }}
-      {{- tpl .Values.regtestConfig . | nindent 4 }}
-    {{- end }}
+    {{ template "bitcoincore.check_semver" . }}
     {{- .Values.baseConfig | nindent 4 }}
+    rpcport={{ index .Values .Values.chain "RPCPort" }}
+    zmqpubrawblock=tcp://0.0.0.0:{{ .Values.ZMQBlockPort }}
+    zmqpubrawtx=tcp://0.0.0.0:{{ .Values.ZMQTxPort }}
     {{- .Values.config | nindent 4 }}
     {{- range .Values.connect }}
       {{- print "connect=" . | nindent 4}}

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"
@@ -29,21 +31,23 @@ spec:
       imagePullPolicy: {{ .Values.image.pullPolicy }}
       ports:
         - name: rpc
-          containerPort: {{ .Values.regtest.RPCPort }}
+          containerPort: {{ index .Values .Values.chain "RPCPort" }}
           protocol: TCP
         - name: p2p
-          containerPort: {{ .Values.regtest.P2PPort }}
+          containerPort: {{ index .Values .Values.chain "P2PPort" }}
           protocol: TCP
         - name: zmq-tx
-          containerPort: {{ .Values.regtest.ZMQTxPort }}
+          containerPort: {{ .Values.ZMQTxPort }}
           protocol: TCP
         - name: zmq-block
-          containerPort: {{ .Values.regtest.ZMQBlockPort }}
+          containerPort: {{ .Values.ZMQBlockPort }}
           protocol: TCP
       livenessProbe:
         {{- toYaml .Values.livenessProbe | nindent 8 }}
       readinessProbe:
         {{- toYaml .Values.readinessProbe | nindent 8 }}
+        tcpSocket:
+          port: {{ index .Values .Values.chain "RPCPort" }}
       resources:
         {{- toYaml .Values.resources | nindent 8 }}
       volumeMounts:
@@ -65,7 +69,7 @@ spec:
         - name: BITCOIN_RPC_HOST
           value: "127.0.0.1"
         - name: BITCOIN_RPC_PORT
-          value: "{{ .Values.regtest.RPCPort }}"
+          value: "{{ index .Values .Values.chain "RPCPort" }}"
         - name: BITCOIN_RPC_USER
           value: user
         - name: BITCOIN_RPC_PASSWORD

resources/charts/bitcoincore/templates/service.yaml

@@ -8,19 +8,19 @@ metadata:
 spec:
   type: {{ .Values.service.type }}
   ports:
-    - port: {{ .Values.regtest.RPCPort }}
+    - port: {{ index .Values .Values.chain "RPCPort" }}
       targetPort: rpc
       protocol: TCP
       name: rpc
-    - port: {{ .Values.regtest.P2PPort }}
+    - port: {{ index .Values .Values.chain "P2PPort" }}
       targetPort: p2p
       protocol: TCP
       name: p2p
-    - port: {{ .Values.regtest.ZMQTxPort }}
+    - port: {{ .Values.ZMQTxPort }}
       targetPort: zmq-tx
       protocol: TCP
       name: zmq-tx
-    - port: {{ .Values.regtest.ZMQBlockPort }}
+    - port: {{ .Values.ZMQBlockPort }}
       targetPort: zmq-block
       protocol: TCP
       name: zmq-block

resources/charts/bitcoincore/values.yaml

@@ -36,8 +36,13 @@ service:
 regtest:
   RPCPort: 18443
   P2PPort: 18444
-  ZMQTxPort: 28333
-  ZMQBlockPort: 28332
+
+signet:
+  RPCPort: 38332
+  P2PPort: 38333
+
+ZMQTxPort: 28333
+ZMQBlockPort: 28332
 
 ingress:
   enabled: false
@@ -82,8 +87,6 @@ readinessProbe:
   failureThreshold: 1
   periodSeconds: 1
   successThreshold: 1
-  tcpSocket:
-    port: 18443
   timeoutSeconds: 1
 
 
@@ -112,14 +115,6 @@ collectLogs: false
 metricsExport: false
 prometheusMetricsPort: 9332
 
-regtestConfig: |
-  rpcuser=user
-  rpcpassword=password
-  rpcport=18443
-  rpcallowip=0.0.0.0/0
-  rpcbind=0.0.0.0
-  rest=1
-
 baseConfig: |
   checkmempool=0
   acceptnonstdtxn=1
@@ -129,9 +124,13 @@ baseConfig: |
   capturemessages=1
   fallbackfee=0.00001000
   listen=1
+  rpcuser=user
+  rpcpassword=password
+  rpcallowip=0.0.0.0/0
+  rpcbind=0.0.0.0
+  rest=1
+  # rpcport and zmq endpoints are configured by chain in configmap.yaml
 
-  zmqpubrawblock=tcp://0.0.0.0:28332
-  zmqpubrawtx=tcp://0.0.0.0:28333
 
 config: ""