From bc66ee29b1c10be91af6946f845cb8ebe8af7d05 Mon Sep 17 00:00:00 2001
From: Mayank Chhabra <mayankchhabra9@gmail.com>
Date: Tue, 11 Aug 2020 06:40:15 +0530
Subject: [PATCH] Remove hardcoded mainnet neutrino peers (#117)

---
 scripts/configure         | 11 ++++-------
 templates/lnd-sample.conf | 12 +++---------
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/scripts/configure b/scripts/configure
index 94012f4..b37c9eb 100755
--- a/scripts/configure
+++ b/scripts/configure
@@ -113,13 +113,10 @@ if [ "$BITCOIN_NETWORK" == "testnet" ]; then
   sed -i "s/\#testnet=1/testnet=1/g" "$BITCOIN_CONF_FILE"
   # Switch LND to testnet
   sed -i "s/bitcoin.mainnet=1/bitcoin.testnet=1/g;" "$LND_CONF_FILE"
-  # Comment mainnet neutrino peers
-  sed -i "s/neutrino.addpeer=bb2.breez.technology/\;neutrino.addpeer=bb2.breez.technology/g;" "$LND_CONF_FILE"
-  sed -i "s/neutrino.addpeer=mainnet1-btcd.zaphq.io/\;neutrino.addpeer=mainnet1-btcd.zaphq.io/g;" "$LND_CONF_FILE"
-  sed -i "s/neutrino.addpeer=mainnet2-btcd.zaphq.io/\;neutrino.addpeer=mainnet2-btcd.zaphq.io/g;" "$LND_CONF_FILE"
-  # Uncomment testnet neutrino peers
-  sed -i "s/\;neutrino.addpeer=testnet1-btcd.zaphq.io/neutrino.addpeer=testnet1-btcd.zaphq.io/g;" "$LND_CONF_FILE"
-  sed -i "s/\;neutrino.addpeer=testnet2-btcd.zaphq.io/neutrino.addpeer=testnet2-btcd.zaphq.io/g;" "$LND_CONF_FILE"
+  # Uncomment testnet neutrino block and peers
+  sed -i "s/\# \[neutrino\]/\[neutrino\]/g;" "$LND_CONF_FILE"
+  sed -i "s/\# neutrino.addpeer=testnet1-btcd.zaphq.io/neutrino.addpeer=testnet1-btcd.zaphq.io/g;" "$LND_CONF_FILE"
+  sed -i "s/\# neutrino.addpeer=testnet2-btcd.zaphq.io/neutrino.addpeer=testnet2-btcd.zaphq.io/g;" "$LND_CONF_FILE"
 
 fi
 
diff --git a/templates/lnd-sample.conf b/templates/lnd-sample.conf
index 63e4bc6..9597c6a 100644
--- a/templates/lnd-sample.conf
+++ b/templates/lnd-sample.conf
@@ -24,17 +24,11 @@ bitcoin.mainnet=1
 bitcoin.node=neutrino
 bitcoin.defaultchanconfs=2
 
-[neutrino]
-# Mainnet neutrino peers that are automatically 
-# commented if Umbrel is not configured for mainnet
-neutrino.addpeer=bb2.breez.technology
-neutrino.addpeer=mainnet1-btcd.zaphq.io
-neutrino.addpeer=mainnet2-btcd.zaphq.io
-
+# [neutrino]
 # Testnet neutrino peers that are automatically 
 # uncommented if Umbrel is configured for testnet
-;neutrino.addpeer=testnet1-btcd.zaphq.io
-;neutrino.addpeer=testnet2-btcd.zaphq.io
+# neutrino.addpeer=testnet1-btcd.zaphq.io
+# neutrino.addpeer=testnet2-btcd.zaphq.io
 
 [tor]
 tor.active=1