From bf04ad9b7602c985bedfe086ed34c251fe7873bf Mon Sep 17 00:00:00 2001
From: rootzoll <christian@geektank.de>
Date: Mon, 3 Dec 2018 18:04:37 +0100
Subject: [PATCH] more info on unconfirmed funds
---
home.admin/00infoBlitz.sh | 5 ++++-
home.admin/00mainMenu.sh | 3 +++
home.admin/10setupBlitz.sh | 2 +-
home.admin/config.scripts/bonus.rtl.sh | 1 -
4 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/home.admin/00infoBlitz.sh b/home.admin/00infoBlitz.sh
index 14178af..b3a3f3a 100755
--- a/home.admin/00infoBlitz.sh
+++ b/home.admin/00infoBlitz.sh
@@ -203,10 +203,13 @@ else
fi
else
ln_walletbalance="$(sudo -u bitcoin /usr/local/bin/lncli --macaroonpath=${lnd_macaroon_dir}/readonly.macaroon --tlscertpath=${lnd_dir}/tls.cert walletbalance | jq -r '.confirmed_balance')" 2>/dev/null
+ ln_walletbalance_wait="$(sudo -u bitcoin /usr/local/bin/lncli --macaroonpath=${lnd_macaroon_dir}/readonly.macaroon --tlscertpath=${lnd_dir}/tls.cert walletbalance | jq -r '.unconfirmed_balance')" 2>/dev/null
+ if [ "${ln_walletbalance_wait}" = "0" ] then ln_walletbalance_wait=""; fi
+ if [ ${#ln_walletbalance_wait} -gt 0 ] then ln_walletbalance_wait="(+${ln_walletbalance_wait})"; fi
ln_channelbalance="$(sudo -u bitcoin /usr/local/bin/lncli --macaroonpath=${lnd_macaroon_dir}/readonly.macaroon --tlscertpath=${lnd_dir}/tls.cert channelbalance | jq -r '.balance')" 2>/dev/null
ln_channels_online="$(echo "${ln_getInfo}" | jq -r '.num_active_channels')" 2>/dev/null
ln_channels_total="$(sudo -u bitcoin /usr/local/bin/lncli --macaroonpath=${lnd_macaroon_dir}/readonly.macaroon --tlscertpath=${lnd_dir}/tls.cert listchannels | jq '.[] | length')" 2>/dev/null
- ln_baseInfo="${color_gray}wallet ${ln_walletbalance} sat"
+ ln_baseInfo="${color_gray}wallet ${ln_walletbalance} sat ${ln_walletbalance_wait}"
ln_peers="$(echo "${ln_getInfo}" | jq -r '.num_peers')" 2>/dev/null
ln_channelInfo="${ln_channels_online}/${ln_channels_total} Channels ${ln_channelbalance} sat"
ln_peersInfo="${color_purple}${ln_peers} ${color_gray}peers"
diff --git a/home.admin/00mainMenu.sh b/home.admin/00mainMenu.sh
index e661593..32efd39 100755
--- a/home.admin/00mainMenu.sh
+++ b/home.admin/00mainMenu.sh
@@ -124,6 +124,9 @@ if [ -f "/home/admin/.setup" ]; then
fi
if [ ${setupState} -eq 0 ]; then
+ # check data from boostrap
+ # TODO: when olddata --> CLEAN OR MANUAL-UPDATE-INFO
+
# start setup
BACKTITLE="RaspiBlitz - Setup"
TITLE="⚡ Welcome to your RaspiBlitz ⚡"
diff --git a/home.admin/10setupBlitz.sh b/home.admin/10setupBlitz.sh
index 63122f5..a9753b1 100755
--- a/home.admin/10setupBlitz.sh
+++ b/home.admin/10setupBlitz.sh
@@ -111,7 +111,7 @@ if [ ${mountOK} -eq 1 ]; then
sudo tail /mnt/hdd/${network}/debug.log
echo ""
- echo "UNKOWN STATE - there is blockain data folder, but blockchaind is not running"
+ echo "UNKOWN STATE - there is blockain data folder, but blockchain service is not running"
echo "It seems that something went wrong during sync/download/copy of the blockchain."
echo "Or something with the config is not correct."
echo "Sometimes a reboot helps --> sudo shutdown -r now"
diff --git a/home.admin/config.scripts/bonus.rtl.sh b/home.admin/config.scripts/bonus.rtl.sh
index f20182d..b151b35 100755
--- a/home.admin/config.scripts/bonus.rtl.sh
+++ b/home.admin/config.scripts/bonus.rtl.sh
@@ -77,7 +77,6 @@ fi
# switch off
if [ "$1" = "0" ] || [ "$1" = "off" ]; then
- echo "*** REMOVING RTL ***"
# setting value in raspi blitz config
sudo sed -i "s/^rtlWebinterface=.*/rtlWebinterface=off/g" /mnt/hdd/raspiblitz.conf