checkpoint cln integrated into ln_framework

issues:
- restoring wallet produces same spend address on two nodes
- lnd node connecting to cln produces infinite reconnect issue - system resource issue
- two cln nodes can not find each other - gossip error

Author: macgyver13

resources/charts/bitcoincore/charts/cln/templates/configmap.yaml

@@ -10,10 +10,36 @@ data:
     {{- .Values.defaultConfig | nindent 4 }}
     {{- .Values.config | nindent 4 }}
     network={{ .Values.global.chain }}
+    bind-addr=0.0.0.0:{{ .Values.P2PPort }}
+    clnrest-port={{ .Values.RestPort }}
     bitcoin-rpcconnect={{ include "bitcoincore.fullname" . }}
     bitcoin-rpcport={{ index .Values.global .Values.global.chain "RPCPort" }}
     bitcoin-rpcpassword={{ .Values.global.rpcpassword }}
     alias={{ include "cln.fullname" . }}
+    announce-addr=dns:{{ include "cln.fullname" . }}:9735
+    database-upgrade=true
+    bitcoin-retry-timeout=600
+    clnrest-certs=/root/.lightning
+  tls.cert: |
+    -----BEGIN CERTIFICATE-----
+    MIIB8TCCAZagAwIBAgIUJDsR6mmY+TaO9pCfjtotlbOkzJMwCgYIKoZIzj0EAwIw
+    MjEfMB0GA1UECgwWbG5kIGF1dG9nZW5lcmF0ZWQgY2VydDEPMA0GA1UEAwwGd2Fy
+    bmV0MB4XDTI0MTExMTE2NTM1MFoXDTM0MTEwOTE2NTM1MFowMjEfMB0GA1UECgwW
+    bG5kIGF1dG9nZW5lcmF0ZWQgY2VydDEPMA0GA1UEAwwGd2FybmV0MFkwEwYHKoZI
+    zj0CAQYIKoZIzj0DAQcDQgAEBVltIvaTlAQI/3FFatTqVflZuZdRJ0SmRMSJrFLP
+    tp0fxE7hmteSt6gjQriy90fP8j9OJXBNAjt915kLY4zVvqOBiTCBhjAOBgNVHQ8B
+    Af8EBAMCAqQwEwYDVR0lBAwwCgYIKwYBBQUHAwEwDwYDVR0TAQH/BAUwAwEB/zAd
+    BgNVHQ4EFgQU5d8QMrwhLgTkDjWA+eXZGz+dybUwLwYDVR0RBCgwJoIJbG9jYWxo
+    b3N0ggEqhwR/AAABhxAAAAAAAAAAAAAAAAAAAAABMAoGCCqGSM49BAMCA0kAMEYC
+    IQDPofN0fEl5gTwCYhk3nZbjMqJhZ8BsSJ6K8XRhxr7zbwIhAPsgQCFOqUWg632O
+    NEO53OQ6CIqnpxSskjsFNH4ZBQOE
+    -----END CERTIFICATE-----
+  tls.key: |
+    -----BEGIN EC PRIVATE KEY-----
+    MHcCAQEEIIcFtWTLQv5JaRRxdkPKkO98OrvgeztbZ7h8Ev/4UbE4oAoGCCqGSM49
+    AwEHoUQDQgAEBVltIvaTlAQI/3FFatTqVflZuZdRJ0SmRMSJrFLPtp0fxE7hmteS
+    t6gjQriy90fP8j9OJXBNAjt915kLY4zVvg==
+    -----END EC PRIVATE KEY-----
 ---
 apiVersion: v1
 kind: ConfigMap

resources/charts/bitcoincore/charts/cln/templates/pod.yaml

@@ -31,9 +31,19 @@ spec:
         - name: p2p
           containerPort: {{ .Values.P2PPort }}
           protocol: TCP
+        - name: rest
+          containerPort: {{ .Values.RestPort }}
+          protocol: TCP
       command:
-        - "lightningd"
-        - "--conf=/root/.lightning/config"
+        - /bin/sh
+        - -c
+        - | 
+          lightningd --conf=/root/.lightning/config --recover=35b8182d6db5cec40d9bead20607b7c9b91ed89997a290bc0e0f07e5922e4714 &
+          pid=$!;
+          sleep 10;
+          kill $pid;
+          sleep 1;
+          lightningd --conf=/root/.lightning/config
       livenessProbe:
         {{- toYaml .Values.livenessProbe | nindent 8 }}
       readinessProbe:
@@ -49,6 +59,12 @@ spec:
         - mountPath: /root/.lightning/config
           name: config
           subPath: config
+        - mountPath: /root/.lightning/cert
+          name: config
+          subPath: tls.cert
+        - mountPath: /root/.lightning/key
+          name: config
+          subPath: tls.key
     {{- with .Values.extraContainers }}
     {{- toYaml . | nindent 4 }}
     {{- end }}

resources/charts/bitcoincore/charts/cln/templates/service.yaml

@@ -12,5 +12,9 @@ spec:
       targetPort: p2p
       protocol: TCP
       name: p2p
+    - port: {{ .Values.RestPort }}
+      targetPort: rest
+      protocol: TCP
+      name: rest
   selector:
     {{- include "cln.selectorLabels" . | nindent 4 }}

resources/charts/bitcoincore/charts/cln/values.yaml

@@ -3,9 +3,6 @@
 # Declare variables to be passed into your templates.
 namespace: warnet
 
-# This will set the replicaset count more information can be found here: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset/
-replicaCount: 1
-
 image:
   repository: elementsproject/lightningd
   pullPolicy: IfNotPresent
@@ -35,6 +32,7 @@ service:
   type: ClusterIP
 
 P2PPort: 9735
+RestPort: 3010
 
 # This block is for setting up the ingress for more information can be found here: https://kubernetes.io/docs/concepts/services-networking/ingress/
 ingress:
@@ -89,10 +87,6 @@ readinessProbe:
 
 # Additional volumes on the output Deployment definition.
 volumes: []
-# - name: foo
-#   secret:
-#     secretName: mysecret
-#     optional: false
 
 # Additional volumeMounts on the output Deployment definition.
 volumeMounts: []
@@ -108,8 +102,10 @@ affinity: {}
 
 baseConfig: |
   log-level=debug
-  bind-addr=0.0.0.0:9735
+  developer
+  dev-fast-gossip
   bitcoin-rpcuser=user
+  clnrest-host=0.0.0.0
   # bitcoind.rpcpass are set in configmap.yaml
 
 config: ""

resources/charts/bitcoincore/charts/lnd/templates/_helpers.tpl

@@ -23,7 +23,7 @@ If release name contains chart name it will be used as a full name.
 Expand the name of the chart.
 */}}
 {{- define "lnd.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}-ln
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}-lnd
 {{- end }}
 
 {{/*
@@ -35,7 +35,7 @@ If release name contains chart name it will be used as a full name.
 {{- if .Values.fullnameOverride }}
 {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
 {{- else }}
-{{- printf "%s" .Release.Name | trunc 63 | trimSuffix "-" }}-ln
+{{- printf "%s" .Release.Name | trunc 63 | trimSuffix "-" }}-lnd
 {{- end }}
 {{- end }}
 

resources/scenarios/commander.py

@@ -14,7 +14,7 @@
 from typing import Dict
 
 from kubernetes import client, config
-from ln_framework.ln import LND
+from ln_framework.ln import CLN, LND, LNNode
 from test_framework.authproxy import AuthServiceProxy
 from test_framework.p2p import NetworkThread
 from test_framework.test_framework import (
@@ -161,7 +161,7 @@ def setup(self):
 
         # Keep a separate index of tanks by pod name
         self.tanks: Dict[str, TestNode] = {}
-        self.lns: Dict[str, LND] = {}
+        self.lns: Dict[str, LNNode] = {}
         self.channels = WARNET["channels"]
 
         for i, tank in enumerate(WARNET["tanks"]):
@@ -194,7 +194,11 @@ def setup(self):
             self.tanks[tank["tank"]] = node
 
         for ln in WARNET["lightning"]:
-            self.lns[ln] = LND(ln)
+            #create the correct implementation based on pod name
+            if "-cln" in ln:
+                self.lns[ln] = CLN(ln)
+            else:
+                self.lns[ln] = LND(ln)
 
         self.num_nodes = len(self.nodes)