Add support for LDK nodes

And a small logging fix for eclair.
t-bast · Jun 10, 2022 · b84b637 · b84b637
1 parent 8e3a66a
commit b84b637
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 3 deletions.
diff --git a/.bash_aliases b/.bash_aliases
@@ -50,3 +50,13 @@ alias carol-lnd='$LND_BIN --lnddir=.lnd/carol'
 alias carol-lnd-cli='$LND_CLI --lnddir=.lnd/carol --rpcserver=localhost:10011 --network=regtest'
 alias dave-lnd='$LND_BIN --lnddir=.lnd/dave'
 alias dave-lnd-cli='$LND_CLI --lnddir=.lnd/dave --rpcserver=localhost:10012 --network=regtest'
+
+##### LDK #####
+
+# Set the path to the ldk-tutorial node (see https://github.com/lightningdevkit/ldk-sample):
+LDK_BIN=.ldk/bin/ldk-tutorial-node
+
+alias alice-ldk='$LDK_BIN user:password@localhost:18443 .ldk/alice/data 9735 regtest'
+alias bob-ldk='$LDK_BIN user:password@localhost:18443 .ldk/bob/data 9736 regtest'
+alias carol-ldk='$LDK_BIN user:password@localhost:18443 .ldk/carol/data 9737 regtest'
+alias dave-ldk='$LDK_BIN user:password@localhost:18443 .ldk/dave/data 9738 regtest'
diff --git a/.eclair/logback.xml b/.eclair/logback.xml
@@ -5,7 +5,7 @@
         <target>System.out</target>
         <withJansi>false</withJansi>
         <encoder>
-            <pattern>%yellow(${HOSTNAME} %d) %highlight(%-5level) %replace(%logger{24}){'\$.*',''}%X{category}%X{nodeId}%X{channelId}%X{paymentHash}%.-11X{parentPaymentId}%.-11X{paymentId} - %msg%ex{12}%n</pattern>
+            <pattern>%yellow(${HOSTNAME} %d) %highlight(%-5level) %replace(%logger{24}){'\$.*',''}%X{category}%X{nodeId}%X{channelId}%X{paymentHash}%.-11X{parentPaymentId}%.-11X{paymentId}%.-11X{txPublishId} - %msg%ex{12}%n</pattern>
         </encoder>
     </appender>
 
@@ -19,7 +19,7 @@
             <totalSizeCap>5GB</totalSizeCap>
         </rollingPolicy>
         <encoder>
-            <pattern>%d %-5level %replace(%logger{24}){'\$.*',''}%X{category}%X{nodeId}%X{channelId}%X{paymentHash}%.-11X{parentPaymentId}%.-11X{paymentId} - %msg%ex{24}%n</pattern>
+            <pattern>%d %-5level %replace(%logger{24}){'\$.*',''}%X{category}%X{nodeId}%X{channelId}%X{paymentHash}%.-11X{parentPaymentId}%.-11X{paymentId}%.-11X{txPublishId} - %msg%ex{24}%n</pattern>
         </encoder>
     </appender>
 
@@ -41,7 +41,7 @@
         <then>
             <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
                 <encoder>
-                    <pattern>%d %-5level %replace(%logger{24}){'\$.*',''}%X{category}%X{nodeId}%X{channelId}%X{paymentHash}%.-11X{parentPaymentId}%.-11X{paymentId} - %msg%ex{24}%n</pattern>
+                    <pattern>%d %-5level %replace(%logger{24}){'\$.*',''}%X{category}%X{nodeId}%X{channelId}%X{paymentHash}%.-11X{parentPaymentId}%.-11X{paymentId}%.-11X{txPublishId} - %msg%ex{24}%n</pattern>
                 </encoder>
             </appender>
             <root>

diff --git a/.ldk/reset_nodes.sh b/.ldk/reset_nodes.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+echo Resetting LDK nodes...
+
+# All data is under <alias>/.ldk/data
+rm -r **/data
diff --git a/scripts/reset_all_nodes.sh b/scripts/reset_all_nodes.sh
@@ -3,3 +3,4 @@
 (cd .eclair && ./reset_nodes.sh)
 (cd .lightning && ./reset_nodes.sh)
 (cd .lnd && ./reset_nodes.sh)
+(cd .ldk && ./reset_nodes.sh)