highperfocused/raspiblitz
1
0
Fork 0
mirror of https://github.com/raspiblitz/raspiblitz.git synced 2025-09-20 13:02:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

all lncli_aliases to be used as variables

Browse Source
This commit is contained in:
openoms
2021-06-29 13:25:25 +01:00
parent 2cac034043
commit 64eeb8944c
3 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
home.admin/BBcreateInvoice.sh
View File

@@ -17,14 +17,10 @@ fi
source <(/home/admin/config.scripts/network.aliases.sh getvars $1 $2) source <(/home/admin/config.scripts/network.aliases.sh getvars $1 $2)
source <(/home/admin/config.scripts/network.aliases.sh getvars $LNTYPE ${chain}net) source <(/home/admin/config.scripts/network.aliases.sh getvars $LNTYPE ${chain}net)
shopt -s expand_aliases
alias bitcoincli_alias="$bitcoincli_alias"
alias lncli_alias="$lncli_alias"
alias lightningcli_alias="$lightningcli_alias"
# check if chain is in sync # check if chain is in sync
if [ $LNTYPE = cln ];then if [ $LNTYPE = cln ];then
lncommand="lightning-cli" lncommand="${netprefix}lightning-cli"
BLOCKHEIGHT=$($bitcoincli_alias getblockchaininfo|grep blocks|awk '{print $2}'|cut -d, -f1) BLOCKHEIGHT=$($bitcoincli_alias getblockchaininfo|grep blocks|awk '{print $2}'|cut -d, -f1)
CLHEIGHT=$($lightningcli_alias getinfo | jq .blockheight) CLHEIGHT=$($lightningcli_alias getinfo | jq .blockheight)
if [ $BLOCKHEIGHT -eq $CLHEIGHT ];then if [ $BLOCKHEIGHT -eq $CLHEIGHT ];then
@@ -33,8 +29,8 @@ if [ $LNTYPE = cln ];then
cmdChainInSync=0 cmdChainInSync=0
fi fi
elif [ $LNTYPE = lnd ];then elif [ $LNTYPE = lnd ];then
lncommand="lncli" lncommand="${netprefix}lncli"
cmdChainInSync="lncli_alias getinfo | grep '"synced_to_chain": true' -c" cmdChainInSync="$lncli_alias getinfo | grep '"synced_to_chain": true' -c"
fi fi
chainInSync=${cmdChainInSync} chainInSync=${cmdChainInSync}
while [ "${chainInSync}" == "0" ]; do while [ "${chainInSync}" == "0" ]; do

10
home.admin/BBpayInvoice.sh
View File

@@ -17,14 +17,10 @@ fi
source <(/home/admin/config.scripts/network.aliases.sh getvars $1 $2) source <(/home/admin/config.scripts/network.aliases.sh getvars $1 $2)
source <(/home/admin/config.scripts/network.aliases.sh getvars $LNTYPE ${chain}net) source <(/home/admin/config.scripts/network.aliases.sh getvars $LNTYPE ${chain}net)
shopt -s expand_aliases
alias bitcoincli_alias="$bitcoincli_alias"
alias lncli_alias="$lncli_alias"
alias lightningcli_alias="$lightningcli_alias"
# check if chain is in sync # check if chain is in sync
if [ $LNTYPE = cln ];then if [ $LNTYPE = cln ];then
lncommand="lightning-cli" lncommand="${netprefix}lightning-cli"
BLOCKHEIGHT=$($bitcoincli_alias getblockchaininfo|grep blocks|awk '{print $2}'|cut -d, -f1) BLOCKHEIGHT=$($bitcoincli_alias getblockchaininfo|grep blocks|awk '{print $2}'|cut -d, -f1)
CLHEIGHT=$($lightningcli_alias getinfo | jq .blockheight) CLHEIGHT=$($lightningcli_alias getinfo | jq .blockheight)
if [ $BLOCKHEIGHT -eq $CLHEIGHT ];then if [ $BLOCKHEIGHT -eq $CLHEIGHT ];then
@@ -33,8 +29,8 @@ if [ $LNTYPE = cln ];then
cmdChainInSync=0 cmdChainInSync=0
fi fi
elif [ $LNTYPE = lnd ];then elif [ $LNTYPE = lnd ];then
lncommand="lncli" lncommand="${netprefix}lncli"
cmdChainInSync="lncli_alias getinfo | grep '"synced_to_chain": true' -c" cmdChainInSync="$lncli_alias getinfo | grep '"synced_to_chain": true' -c"
fi fi
chainInSync=${cmdChainInSync} chainInSync=${cmdChainInSync}
while [ "${chainInSync}" == "0" ]; do while [ "${chainInSync}" == "0" ]; do

2
home.admin/config.scripts/lnd.unlock.sh
View File

@@ -66,7 +66,7 @@ while [ ${fallback} -eq 0 ]
recoveryOption="--recovery_window=1000 " recoveryOption="--recovery_window=1000 "
echo "# runnign unlock with ${recoveryOption}" echo "# runnign unlock with ${recoveryOption}"
fi fi
result=$(echo "$passwordC" | sudo -u bitcoin lncli --chain=${network} --network=${chain}net unlock ${recoveryOption}--stdin 2>&1) result=$(echo "$passwordC" | $lncli_alias unlock ${recoveryOption}--stdin 2>&1)
wasUnlocked=$(echo "${result}" | grep -c 'successfully unlocked') wasUnlocked=$(echo "${result}" | grep -c 'successfully unlocked')
wrongPassword=$(echo "${result}" | grep -c 'invalid passphrase') wrongPassword=$(echo "${result}" | grep -c 'invalid passphrase')
if [ ${wasUnlocked} -gt 0 ]; then if [ ${wasUnlocked} -gt 0 ]; then