add cln23.02.2 node

docker-compose.yml

@@ -85,6 +85,17 @@ services:
       - ./data/clightning-2:/root/.lightning/:uid=1000,gid=1000
       - ./data/clightning-2-rest:/usr/src/app/certs/
 
+  clightning-3:
+    hostname: clightning-3
+    depends_on:
+      - bitcoind
+    image: boltz/c-lightning:23.02.2
+    entrypoint: "sh -c 'sleep 15 && lightningd --large-channels --network regtest --bind-addr=0.0.0.0:9735 --bitcoin-rpcconnect=bitcoind --bitcoin-rpcport=18443 --bitcoin-rpcuser=lnbits --bitcoin-rpcpassword=lnbits'"
+    expose:
+      - 9735
+    volumes:
+      - ./data/clightning-3:/root/.lightning/
+
   lnd-1:
     hostname: lnd-1
     depends_on:

docker-scripts.sh

@@ -66,9 +66,9 @@ lnbits-regtest-start-log(){
 lnbits-regtest-stop(){
   docker compose down --volumes
   # clean up lightning node data
-  sudo rm -rf ./data/clightning-1 ./data/clightning-2 ./data/lnd-1  ./data/lnd-2 ./data/lnd-3 ./data/boltz/boltz.db ./data/eclair/regtest
+  sudo rm -rf ./data/clightning-1 ./data/clightning-2 ./data/clightning-3 ./data/lnd-1  ./data/lnd-2 ./data/lnd-3 ./data/boltz/boltz.db ./data/eclair/regtest
   # recreate lightning node data folders preventing permission errors
-  mkdir ./data/clightning-1 ./data/clightning-2 ./data/lnd-1 ./data/lnd-2 ./data/lnd-3
+  mkdir ./data/clightning-1 ./data/clightning-2 ./data/clightning-3 ./data/lnd-1 ./data/lnd-2 ./data/lnd-3
 }
 
 lnbits-regtest-restart(){
@@ -92,6 +92,7 @@ lnbits-regtest-init(){
 lnbits-lightning-sync(){
   wait-for-clightning-sync 1
   wait-for-clightning-sync 2
+  wait-for-clightning-sync 3
   wait-for-lnd-sync 1
   wait-for-lnd-sync 2
   wait-for-lnd-sync 3
@@ -103,6 +104,7 @@ lnbits-lightning-init(){
   for i in 0 1 2 3 4; do
     fund_clightning_node 1
     fund_clightning_node 2
+    fund_clightning_node 3
     fund_lnd_node 1
     fund_lnd_node 2
     fund_lnd_node 3
@@ -139,6 +141,13 @@ lnbits-lightning-init(){
   bitcoin-cli-sim -generate $channel_confirms > /dev/null
   wait-for-lnd-channel 1
 
+  # lnd-1 -> cln-3
+  lncli-sim 1 connect $(lightning-cli-sim 3 getinfo | jq -r '.id')@lnbits-legend-clightning-3-1 > /dev/null
+  echo "open channel from lnd-1 to cln-3"
+  lncli-sim 1 openchannel $(lightning-cli-sim 3 getinfo | jq -r '.id') $channel_size $balance_size > /dev/null
+  bitcoin-cli-sim -generate $channel_confirms > /dev/null
+  wait-for-lnd-channel 1
+
   # lnd-2 -> cln-2
   lncli-sim 2 connect $(lightning-cli-sim 2 getinfo | jq -r '.id')@lnbits-legend-clightning-2-1 > /dev/null
   echo "open channel from lnd-2 to cln-2"
@@ -146,6 +155,13 @@ lnbits-lightning-init(){
   bitcoin-cli-sim -generate $channel_confirms > /dev/null
   wait-for-lnd-channel 2
 
+  # lnd-3 -> cln-3
+  lncli-sim 3 connect $(lightning-cli-sim 3 getinfo | jq -r '.id')@lnbits-legend-clightning-3-1 > /dev/null
+  echo "open channel from lnd-3 to cln-1"
+  lncli-sim 3 openchannel $(lightning-cli-sim 3 getinfo | jq -r '.id') $channel_size $balance_size > /dev/null
+  bitcoin-cli-sim -generate $channel_confirms > /dev/null
+  wait-for-lnd-channel 3
+
   # lnd-3 -> cln-2
   lncli-sim 3 connect $(lightning-cli-sim 2 getinfo | jq -r '.id')@lnbits-legend-clightning-2-1 > /dev/null
   echo "open channel from lnd-3 to cln-2"
@@ -160,15 +176,16 @@ lnbits-lightning-init(){
   bitcoin-cli-sim -generate $channel_confirms > /dev/null
   wait-for-lnd-channel 3
 
-  # lnd-1 -> eclair-1
+  # lnd-2 -> eclair-1
-  lncli-sim 1 connect $(get-eclair-pubkey)@lnbits-legend-eclair-1 > /dev/null
+  lncli-sim 2 connect $(get-eclair-pubkey)@lnbits-legend-eclair-1 > /dev/null
-  echo "open channel from lnd-1 to eclair-1"
+  echo "open channel from lnd-2 to eclair-1"
-  lncli-sim 1 openchannel $(get-eclair-pubkey) $channel_size $balance_size > /dev/null
+  lncli-sim 2 openchannel $(get-eclair-pubkey) $channel_size $balance_size > /dev/null
   bitcoin-cli-sim -generate $channel_confirms > /dev/null
-  wait-for-lnd-channel 1
+  wait-for-lnd-channel 2
 
   wait-for-clightning-channel 1
   wait-for-clightning-channel 2
+  wait-for-clightning-channel 3
 
   lnbits-lightning-sync
 

tests

@@ -20,7 +20,7 @@ run(){
 }
 
 failed="false"
-blockheight=195
+blockheight=207
 utxos=5
 channel_size=24000000 # 0.024 btc
 balance_size=12000000 # 0.012 btc
@@ -36,18 +36,16 @@ for i in 1 2 3; do
   run "lnd-$i .synced_to_chain" "true" $(lncli-sim $i getinfo | jq -r ".synced_to_chain")
   run "lnd-$i utxo count" $utxos $(lncli-sim $i listunspent | jq -r ".utxos | length")
   run "lnd-$i .block_height" $blockheight $(lncli-sim $i getinfo | jq -r ".block_height")
-  if [[ "$i" == "1" ]]; then
+  if [[ "$i" == "2" ]]; then
-    channel_count=4
-  elif [[ "$i" == "2" ]]; then
-    channel_count=2
-  else
     channel_count=3
+  else
+    channel_count=4
   fi
   run "lnd-$i openchannels" $channel_count $(lncli-sim $i listchannels | jq -r ".channels | length")
   run "lnd-$i .channels[0].capacity" $channel_size $(lncli-sim $i listchannels | jq -r ".channels[0].capacity")
   run "lnd-$i .channels[0].push_amount_sat" $balance_size $(lncli-sim $i listchannels | jq -r ".channels[0].push_amount_sat")
 done
-for i in 1 2; do
+for i in 1 2 3; do
   # run "cln-$i blockheight" $blockheight $(lightning-cli-sim $i getinfo | jq -r ".blockheight")
   run "cln-$i utxo count" $utxos $(lightning-cli-sim $i listfunds | jq -r ".outputs | length")
   run "cln-$i openchannels" 2 $(lightning-cli-sim $i getinfo | jq -r ".num_active_channels")