remove rpcpassword related code for lnd/btc config syncing (#2135)

home.admin/50copyHDD.sh

@@ -213,9 +213,6 @@ fi
 # if started after intial setup - quit here
 if [ "${setupStep}" = "100" ]; then
   sudo cp /home/admin/assets/bitcoin.conf /mnt/hdd/bitcoin/bitcoin.conf
-  rpcpass=$(sudo cat /mnt/hdd/lnd/lnd.conf | grep 'bitcoind.rpcpass' | cut -d "=" -f2)
-  sudo chown bitcoin:bitcoin /mnt/hdd/bitcoin/bitcoin.conf
-  sudo sed -i "s/^rpcpassword=.*/rpcpassword=${rpcpass}/g" /mnt/hdd/bitcoin/bitcoin.conf 2>/dev/null
   sudo systemctl enable bitcoind
   echo "DONE - rebooting: sudo shutdown -r now"
   sudo shutdown -r now

home.admin/70initLND.sh

@@ -82,8 +82,6 @@ if [ ${configExists} -eq 0 ]; then
   sudo mkdir /mnt/hdd/lnd 2> /dev/null
   sudo chown -R bitcoin:bitcoin /mnt/hdd/lnd
   sudo cp /home/admin/assets/lnd.${network}.conf /mnt/hdd/lnd/lnd.conf
-  source <(sudo cat /mnt/hdd/${network}/${network}.conf 2>/dev/null | grep "rpcpassword" | sed 's/^[a-z]*\./lnd/g')
-  sudo sed -i "s/^${network}d.rpcpass=.*/${network}d.rpcpass=${rpcpassword}/g" /mnt/hdd/lnd/lnd.conf
   sudo chown bitcoin:bitcoin /mnt/hdd/lnd/lnd.conf
   if [ -d /home/bitcoin/.lnd ]; then
     echo "OK - LND config written"

home.admin/_bootstrap.provision.sh

@@ -604,9 +604,6 @@ if [ ${confExists} -eq 0 ]; then
   sudo cp /home/admin/assets/bitcoin.conf /mnt/hdd/bitcoin/bitcoin.conf
   sudo chown bitcoin:bitcoin /mnt/hdd/bitcoin/bitcoin.conf
 fi
-echo "Aligning lnd.conf & ${network}.conf" >> ${logFile}
-rpcpass=$(sudo cat /mnt/hdd/lnd/lnd.conf | grep "${network}d.rpcpass" | cut -d "=" -f2)
-sudo sed -i "s/^rpcpassword=.*/rpcpassword=${rpcpass}/g" /mnt/hdd/bitcoin/bitcoin.conf 2>/dev/null
 
 # singal setup done
 sudo sed -i "s/^message=.*/message='Setup Done'/g" ${infoFile}

home.admin/config.scripts/blitz.setpassword.sh

@@ -219,13 +219,10 @@ elif [ "${abcd}" = "b" ]; then
 
   # change in assets (just in case this is used on setup)
   sed -i "s/^rpcpassword=.*/rpcpassword=${newPassword}/g" /home/admin/assets/${network}.conf 2>/dev/null
-  sed -i "s/^${network}d.rpcpass=.*/${network}d.rpcpass=${newPassword}/g" /home/admin/assets/lnd.${network}.conf 2>/dev/null
 
   # change in real configs
   sed -i "s/^rpcpassword=.*/rpcpassword=${newPassword}/g" /mnt/hdd/${network}/${network}.conf 2>/dev/null
   sed -i "s/^rpcpassword=.*/rpcpassword=${newPassword}/g" /home/admin/.${network}/${network}.conf 2>/dev/null
-  sed -i "s/^${network}d.rpcpass=.*/${network}d.rpcpass=${newPassword}/g" /mnt/hdd/lnd/lnd.conf 2>/dev/null
-  sed -i "s/^${network}d.rpcpass=.*/${network}d.rpcpass=${newPassword}/g" /home/admin/.lnd/lnd.conf 2>/dev/null
 
   # blitzweb
   if ! [ -f /etc/nginx/.htpasswd ]; then

home.admin/config.scripts/lnd.check.sh

@@ -40,7 +40,7 @@ if [ "$1" == "basic-setup" ]; then
     echo "err='tls.cert is missing for user admin'"
   fi
 
-  # check lnd.conf exits
+  # check lnd.conf exists
   lndConfExists=$(sudo ls /mnt/hdd/lnd/lnd.conf 2>/dev/null | grep -c 'lnd.conf')
   if [ ${lndConfExists} -gt 0 ]; then
     echo "config=1"
@@ -142,38 +142,6 @@ if [ "$1" == "basic-setup" ]; then
     echo "wallet=0"
   fi
 
-  # check that RPC USER between Bitcoin and LND is correct
-  rpcusercorrect=0
-  source <(sudo cat /mnt/hdd/lnd/lnd.conf 2>/dev/null | grep "${lndNetwork}d.rpcuser" | sed 's/^[a-z]*\./lnd/g')
-  source <(sudo cat /mnt/hdd/${lndNetwork}/${lndNetwork}.conf 2>/dev/null | grep "rpcuser" | sed 's/^[a-z]*\./lnd/g')
-  if [ ${#lndrpcuser} -eq 0 ]; then
-    echo "err='lnd.conf: missing ${lndNetwork}d.rpcuser (needs to be same as set in ${lndNetwork}.conf)'"
-  elif [ ${#rpcuser} -eq 0 ]; then
-    echo "err='${lndNetwork}.conf: missing rpcuser (needs to be same as set in lnd.conf)'"
-  elif [ "${rpcuser}" != "${lndrpcuser}" ]; then
-    echo "err='${lndNetwork}.conf (${rpcuser}) & lnd.conf (${lndrpcuser}): RPC user missmatch! - LND cannot connect to blockchain RPC'"
-  else
-    # OK looks good
-    rpcusercorrect=1
-  fi
-  echo "rpcusercorrect=${rpcusercorrect}"
-
-  # check that RPC PASSWORD between Bitcoin and LND is correct
-  rpcpasscorrect=0
-  source <(sudo cat /mnt/hdd/lnd/lnd.conf 2>/dev/null | grep "${lndNetwork}d.rpcpass" | sed 's/^[a-z]*\./lnd/g')
-  source <(sudo cat /mnt/hdd/${lndNetwork}/${lndNetwork}.conf 2>/dev/null | grep "rpcpassword" | sed 's/^[a-z]*\./lnd/g')
-  if [ ${#lndrpcpass} -eq 0 ]; then
-    echo "err='lnd.conf: missing ${lndNetwork}d.rpcpass (needs to be same as set in ${lndNetwork}.conf)'"
-  elif [ ${#rpcpassword} -eq 0 ]; then
-    echo "err='${lndNetwork}.conf: missing rpcpassword (needs to be same as set in lnd.conf)'"
-  elif [ "${rpcpassword}" != "${lndrpcpass}" ]; then
-    echo "err='${lndNetwork}.conf (${rpcpassword}) & lnd.conf (${lndrpcpass}): RPC password missmatch! - should autofix on reboot'"
-  else
-    # OK looks good
-    rpcpasscorrect=1
-  fi
-  echo "rpcpasscorrect=${rpcpasscorrect}"
-
   # check basic LND logs
   torConnectionProblem=$(sudo journalctl -u lnd -b --no-pager -n14 | grep "lnd\[" | grep -c "dial tcp 127.0.0.1:9050: connect: connection refused")
   if [ ${torConnectionProblem} -gt 0 ]; then

home.admin/config.scripts/lnd.credentials.sh

@@ -178,14 +178,6 @@ elif [ "$1" = "sync" ]; then
     ln -s /mnt/hdd/app-data/lnd/ /home/admin/.lnd # and create symlink
   fi
 
-  echo "# make sure network (bitcoin/litecoin) RPC password is set correctly in lnd.conf"
-  source <(sudo cat /mnt/hdd/"${network}"/"${network}".conf 2>/dev/null | grep "rpcpass" | sed 's/^[a-z]*\./lnd/g')
-  if [ "${#rpcpassword}" -gt 0 ]; then
-    sudo sed -i 's/^"${network}"d.rpcpass=.*/"${network}"d.rpcpass="${rpcpassword}"/g' /mnt/hdd/lnd/lnd.conf 2>/dev/null
-  else
-    echo "# WARN: could not get value 'rpcpass' from network config (e.g. bitcoin.conf)"
-  fi
-
   echo "# make sure LND conf is readable and symlinked"
   sudo chmod 644 "/mnt/hdd/lnd/lnd.conf"
   sudo chown bitcoin:bitcoin "/mnt/hdd/lnd/lnd.conf"