Add LND support

docker-compose-generator/docker-fragments/bitcoin-clightning.yml

@@ -23,7 +23,7 @@ services:
       - bitcoind
   btcpayserver:
     environment:
-      BTCPAY_BTCLIGHTNING: "/etc/clightning_bitcoin/lightning-rpc"
+      BTCPAY_BTCLIGHTNING: "type=clightning;server=unix://etc/clightning_bitcoin/lightning-rpc"
     volumes:
       - "clightning_bitcoin_datadir:/etc/clightning_bitcoin"
     links:

docker-compose-generator/docker-fragments/bitcoin-lnd.yml

@@ -0,0 +1,49 @@
+version: "3"
+
+services:
+  lnd_bitcoin:
+    image: btcpayserver/lnd:0.4.2.0
+    container_name: btcpayserver_lnd_bitcoin
+    environment:
+      LND_CHAIN: "btc"
+      LND_ENVIRONMENT: "${NBITCOIN_NETWORK:-regtest}"
+      LND_EXTRA_ARGS: |
+        restlisten=0.0.0.0:8080
+        bitcoin.node=bitcoind
+        bitcoind.rpchost=bitcoind:43782
+        bitcoind.zmqpath=tcp://bitcoind:28332
+        externalip=${BTCPAY_HOST}:9735
+        alias=${LIGHTNING_ALIAS}
+        noencryptwallet=1
+        notls=1
+    ports:
+      - "9735:9735"
+    expose:
+      - "8080"
+      - "9735"
+    volumes:
+      - "lnd_bitcoin_datadir:/data"
+      - "bitcoin_datadir:/deps/.bitcoin"
+    links:
+      - bitcoind
+
+  btcpayserver:
+    environment:
+      BTCPAY_BTCLIGHTNING: "type=lnd-rest;server=http://lnd_bitcoin:8080/;macaroonfilepath=/etc/lnd_bitcoin/admin.macaroon;allowinsecure=true"
+    volumes:
+      - "lnd_bitcoin_datadir:/etc/lnd_bitcoin"
+    links:
+      - lnd_bitcoin
+
+  bitcoind:
+    environment:
+      BITCOIN_EXTRA_ARGS: |
+        zmqpubrawtx=tcp://0.0.0.0:28332
+        zmqpubrawblock=tcp://0.0.0.0:28332
+        zmqpubrawtxlock=tcp://0.0.0.0:28332
+        zmqpubhashblock=tcp://0.0.0.0:28332
+    expose:
+      - "28332"
+
+volumes:
+  lnd_bitcoin_datadir:

docker-compose-generator/docker-fragments/btcpayserver.yml

@@ -4,7 +4,7 @@ services:
 
   btcpayserver:
     restart: unless-stopped
-    image: nicolasdorier/btcpayserver:1.0.2.39
+    image: nicolasdorier/btcpayserver:1.0.2.40
     expose:
       - "49392"
     environment:

docker-compose-generator/docker-fragments/litecoin-clightning.yml

@@ -23,7 +23,7 @@ services:
       - litecoind
   btcpayserver:
     environment:
-      BTCPAY_LTCLIGHTNING: "/etc/clightning_litecoin/lightning-rpc"
+      BTCPAY_LTCLIGHTNING: "type=clightning;server=unix://etc/clightning_litecoin/lightning-rpc"
     volumes:
       - "clightning_litecoin_datadir:/etc/clightning_litecoin"
     links:

docker-compose-generator/docker-fragments/litecoin-lnd.yml

@@ -0,0 +1,49 @@
+version: "3"
+
+services:
+  lnd_litecoin:
+    image: btcpayserver/lnd:0.4.2.0
+    container_name: btcpayserver_lnd_litecoin
+    environment:
+      LND_CHAIN: "ltc"
+      LND_ENVIRONMENT: "${NBITCOIN_NETWORK:-regtest}"
+      LND_EXTRA_ARGS: |
+        restlisten=0.0.0.0:8080
+        litecoin.node=litecoind
+        litecoind.rpchost=litecoind:43782
+        litecoind.zmqpath=tcp://litecoind:28332
+        externalip=${BTCPAY_HOST}:9736
+        alias=${LIGHTNING_ALIAS}
+        noencryptwallet=1
+        notls=1
+    ports:
+      - "9736:9735"
+    expose:
+      - "8080"
+      - "9736"
+    volumes:
+      - "lnd_litecoin_datadir:/data"
+      - "litecoin_datadir:/deps/.litecoin"
+    links:
+      - litecoind
+
+  btcpayserver:
+    environment:
+      BTCPAY_LTCLIGHTNING: "type=lnd-rest;server=http://lnd_litecoin:8080/;macaroonfilepath=/etc/lnd_litecoin/admin.macaroon;allowinsecure=true"
+    volumes:
+      - "lnd_litecoin_datadir:/etc/lnd_litecoin"
+    links:
+      - lnd_litecoin
+
+  litecoind:
+    environment:
+      BITCOIN_EXTRA_ARGS: |
+        zmqpubrawtx=tcp://0.0.0.0:28332
+        zmqpubrawblock=tcp://0.0.0.0:28332
+        zmqpubrawtxlock=tcp://0.0.0.0:28332
+        zmqpubhashblock=tcp://0.0.0.0:28332
+    expose:
+      - "28332"
+
+volumes:
+  lnd_litecoin_datadir:

docker-compose-generator/src/CryptoDefinition.cs

@@ -21,6 +21,11 @@ namespace DockerGenerator
 			get;
 			private set;
 		}
+        public string LNDFragment
+        {
+            get;
+            private set;
+        }
 
         public static CryptoDefinition[] GetDefinitions()
 		{
@@ -31,30 +36,29 @@ namespace DockerGenerator
 					Crypto = "ltc",
 					CryptoFragment = "litecoin",
 					CLightningFragment = "litecoin-clightning",
+                    LNDFragment = "litecoin-lnd"
                 },
 				new CryptoDefinition()
 				{
 					Crypto = "btc",
 					CryptoFragment = "bitcoin",
 					CLightningFragment = "bitcoin-clightning",
+                    LNDFragment = "bitcoin-lnd"
 				},
 				new CryptoDefinition()
 				{
 					Crypto = "btg",
-					CryptoFragment = "bgold",
-					CLightningFragment = null,
+					CryptoFragment = "bgold"
 				},
 				new CryptoDefinition()
 				{
 					Crypto = "ftc",
-					CryptoFragment = "feathercoin",
-					CLightningFragment = null,
+					CryptoFragment = "feathercoin"
 				},
                 new CryptoDefinition()
                 {
                     Crypto = "grs",
-                    CryptoFragment = "groestlcoin",
-                    CLightningFragment = null,
+                    CryptoFragment = "groestlcoin"
                 }
             };
 		}

docker-compose-generator/src/DockerComposeDefinition.cs

@@ -77,10 +77,10 @@ namespace DockerGenerator
         private KeyValuePair<YamlNode, YamlNode>[] Merge(List<KeyValuePair<YamlNode, YamlNode>> services)
         {
             return services
-					.GroupBy(s => s.Key.ToString(), s=> s.Value)
+                .GroupBy(s => s.Key.ToString(), s => s.Value)
                 .Select(group =>
                     (GroupName: group.Key,
-						 MainNode: group.OfType<YamlMappingNode>().Single(n=> n.Children.ContainsKey("image")),
+                     MainNode: group.OfType<YamlMappingNode>().Single(n => n.Children.ContainsKey("image")),
                      MergedNodes: group.OfType<YamlMappingNode>().Where(n => !n.Children.ContainsKey("image"))))
                 .Select(_ =>
                 {
@@ -101,10 +101,18 @@ namespace DockerGenerator
                                     if(mainChildMapping.Children.TryGetValue(leaf.Key, out var mainLeaf))
                                     {
                                         if(leaf.Value is YamlScalarNode leafScalar && mainLeaf is YamlScalarNode leafMainScalar)
+                                        {
+                                            var eof = EOF(leafMainScalar.Value) ?? EOF(leaf.Value.ToString());
+                                            if(eof != null)
+                                            {
+                                                leafMainScalar.Value = leafMainScalar.Value + eof + leaf.Value;
+                                            }
+                                            else
                                             {
                                                 leafMainScalar.Value = leafMainScalar.Value + "," + leaf.Value;
                                             }
                                         }
+                                    }
                                     else
                                     {
                                         mainChildMapping.Add(leaf.Key, leaf.Value);
@@ -124,6 +132,15 @@ namespace DockerGenerator
                 }).ToArray();
         }
 
+        private string EOF(string value)
+        {
+            if(value.Contains("\r\n", StringComparison.OrdinalIgnoreCase))
+                return "\r\n";
+            if(value.Contains("\n", StringComparison.OrdinalIgnoreCase))
+                return "\n";
+            return null;
+        }
+
         private YamlMappingNode ParseDocument(string fragment)
         {
             var input = new StringReader(File.ReadAllText(Path.Combine(FragmentLocation, $"{fragment}.yml")));

docker-compose-generator/src/Program.cs

@@ -86,6 +86,10 @@ namespace DockerGenerator
 				{
 					fragments.Add(crypto.CLightningFragment);
 				}
+                if(composition.SelectedLN == "lnd" && crypto.LNDFragment != null)
+                {
+                    fragments.Add(crypto.LNDFragment);
+                }
             }
 
 			var def = new DockerComposeDefinition(name, fragments);