mirror of
https://github.com/raspiblitz/raspiblitz.git
synced 2025-03-27 02:01:53 +01:00
fix openchannels check or cln in menu (#4751)
* shellcheck format BBpayInvoice * fix openchannels check for cl * shellcheck format + fix CLN check for channels in BBcreateInvoice * nit: use paid correctly * enhance summars plugin output
This commit is contained in:
openoms
GitHub
parent
fa9ff68760
commit
731aa73128
@ -20,41 +20,41 @@ source <(/home/admin/config.scripts/network.aliases.sh getvars $1 $2)
|
||||
source <(/home/admin/config.scripts/network.aliases.sh getvars $LNTYPE ${chain}net)
|
||||
|
||||
# check if chain is in sync
|
||||
if [ $LNTYPE = cl ];then
|
||||
if [ $LNTYPE = cl ]; then
|
||||
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)
|
||||
if [ $BLOCKHEIGHT -eq $CLHEIGHT ];then
|
||||
if [ $BLOCKHEIGHT -eq $CLHEIGHT ]; then
|
||||
cmdChainInSync=1
|
||||
else
|
||||
cmdChainInSync=0
|
||||
fi
|
||||
elif [ $LNTYPE = lnd ];then
|
||||
elif [ $LNTYPE = lnd ]; then
|
||||
lncommand="${netprefix}lncli"
|
||||
cmdChainInSync="$lncli_alias getinfo | grep '"synced_to_chain": true' -c"
|
||||
fi
|
||||
chainInSync=${cmdChainInSync}
|
||||
while [ "${chainInSync}" == "0" ]; do
|
||||
dialog --title "Fail: not in sync" \
|
||||
--ok-label "Try now" \
|
||||
--cancel-label "Give up" \
|
||||
--pause "\n\n'$lncommand getinfo' shows 'synced_to_chain': false\n\nTry again in a few seconds." 15 60 5
|
||||
|
||||
--ok-label "Try now" \
|
||||
--cancel-label "Give up" \
|
||||
--pause "\n\n'$lncommand getinfo' shows 'synced_to_chain': false\n\nTry again in a few seconds." 15 60 5
|
||||
|
||||
if [ $? -gt 0 ]; then
|
||||
exit 0
|
||||
exit 0
|
||||
fi
|
||||
chainInSync=${cmdChainInSync}
|
||||
done
|
||||
|
||||
# check number of connected peers
|
||||
echo "check for open channels"
|
||||
if [ $LNTYPE = cl ];then
|
||||
openChannels=$($lightningcli_alias listpeers | grep -c "CHANNELD_NORMAL")
|
||||
elif [ $LNTYPE = lnd ];then
|
||||
openChannels=$($lncli_alias listchannels 2>/dev/null | grep chan_id -c)
|
||||
if [ $LNTYPE = cl ]; then
|
||||
openChannels=$($lightningcli_alias getinfo | jq .num_active_channels)
|
||||
elif [ $LNTYPE = lnd ]; then
|
||||
openChannels=$($lncli_alias listchannels 2>/dev/null | grep chan_id -c)
|
||||
fi
|
||||
if [ ${openChannels} -eq 0 ]; then
|
||||
echo
|
||||
echo
|
||||
echo "#########"
|
||||
echo "FAIL - You have NO ESTABLISHED CHANNELS .. open a channel first."
|
||||
echo "#########"
|
||||
@ -66,7 +66,7 @@ fi
|
||||
l1="Enter the AMOUNT IN SATOSHIS to invoice:"
|
||||
l2="1 ${network} = 100 000 000 SAT"
|
||||
dialog --title "Request payment through Lightning" \
|
||||
--inputbox "$l1\n$l2" 9 50 2>$_temp
|
||||
--inputbox "$l1\n$l2" 9 50 2>$_temp
|
||||
amount=$(cat $_temp | xargs | tr -dc '0-9')
|
||||
shred -u $_temp
|
||||
if [ ${#amount} -eq 0 ]; then
|
||||
@ -80,12 +80,12 @@ fi
|
||||
# TODO let user enter a description
|
||||
|
||||
# build command
|
||||
if [ $LNTYPE = cl ];then
|
||||
if [ $LNTYPE = cl ]; then
|
||||
label=$(date +%s) # seconds since 1970-01-01 00:00:00 UTC
|
||||
# invoice msatoshi label description [expiry] [fallbacks] [preimage] [exposeprivatechannels] [cltv]
|
||||
command="$lightningcli_alias invoice ${amount}sat $label ''"
|
||||
# TODO warn about insufficient liquidity
|
||||
elif [ $LNTYPE = lnd ];then
|
||||
elif [ $LNTYPE = lnd ]; then
|
||||
command="$lncli_alias addinvoice ${amount}"
|
||||
fi
|
||||
|
||||
@ -114,16 +114,16 @@ if [ ${#error} -gt 0 ]; then
|
||||
echo "###############"
|
||||
echo "${error}"
|
||||
else
|
||||
if [ $LNTYPE = cl ];then
|
||||
if [ $LNTYPE = cl ]; then
|
||||
payReq=$(echo "$result" | grep bolt11 | cut -d '"' -f4)
|
||||
elif [ $LNTYPE = lnd ];then
|
||||
elif [ $LNTYPE = lnd ]; then
|
||||
rhash=$(echo "$result" | grep r_hash | cut -d '"' -f4)
|
||||
payReq=$(echo "$result" | grep payment_request | cut -d '"' -f4)
|
||||
fi
|
||||
sudo /home/admin/config.scripts/blitz.display.sh qr "${payReq}"
|
||||
|
||||
if [ $(sudo dpkg-query -l | grep "ii qrencode" | wc -l) = 0 ]; then
|
||||
sudo apt-get install qrencode -y > /dev/null
|
||||
sudo apt-get install qrencode -y >/dev/null
|
||||
fi
|
||||
|
||||
# raise high focus on lightning channel balance next 5min
|
||||
@ -141,24 +141,23 @@ else
|
||||
echo "${payReq}"
|
||||
echo
|
||||
echo "Monitoring the Incoming Payment with:"
|
||||
if [ $LNTYPE = cl ];then
|
||||
if [ $LNTYPE = cl ]; then
|
||||
echo "$lightningcli_alias waitinvoice $label"
|
||||
elif [ $LNTYPE = lnd ];then
|
||||
elif [ $LNTYPE = lnd ]; then
|
||||
echo "$lncli_alias lookupinvoice ${rhash}"
|
||||
fi
|
||||
echo "Press x and hold to skip to menu."
|
||||
|
||||
while :
|
||||
do
|
||||
if [ $LNTYPE = cl ];then
|
||||
while :; do
|
||||
if [ $LNTYPE = cl ]; then
|
||||
result=$($lightningcli_alias waitinvoice $label)
|
||||
wasPayed=$(echo $result | grep -c 'paid')
|
||||
elif [ $LNTYPE = lnd ];then
|
||||
wasPaid=$(echo $result | grep -c 'paid')
|
||||
elif [ $LNTYPE = lnd ]; then
|
||||
result=$($lncli_alias lookupinvoice ${rhash})
|
||||
wasPayed=$(echo $result | grep -c '"settled": true')
|
||||
wasPaid=$(echo $result | grep -c '"settled": true')
|
||||
fi
|
||||
if [ ${wasPayed} -gt 0 ]; then
|
||||
echo
|
||||
if [ ${wasPaid} -gt 0 ]; then
|
||||
echo
|
||||
echo $result
|
||||
echo
|
||||
echo "OK the Invoice was paid - returning to menu."
|
||||
@ -167,16 +166,16 @@ else
|
||||
sleep 2
|
||||
break
|
||||
fi
|
||||
|
||||
|
||||
# wait 2 seconds for key input
|
||||
read -n 1 -t 2 keyPressed
|
||||
|
||||
# check if user wants to abort session
|
||||
if [ "${keyPressed}" = "x" ]; then
|
||||
echo
|
||||
echo
|
||||
echo $result
|
||||
echo
|
||||
echo "Returning to menu - invoice was not payed yet."
|
||||
echo "Returning to menu - the invoice has not been paid yet."
|
||||
break
|
||||
fi
|
||||
|
||||
@ -186,4 +185,4 @@ else
|
||||
|
||||
fi
|
||||
echo "Press ENTER to return to main menu."
|
||||
read key
|
||||
read key
|
||||
|
||||
@ -19,46 +19,46 @@ fi
|
||||
source <(/home/admin/config.scripts/network.aliases.sh getvars $1 $2)
|
||||
|
||||
# check if chain is in sync
|
||||
if [ $LNTYPE = cl ];then
|
||||
if [ $LNTYPE = cl ]; then
|
||||
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)
|
||||
if [ $BLOCKHEIGHT -eq $CLHEIGHT ];then
|
||||
if [ $BLOCKHEIGHT -eq $CLHEIGHT ]; then
|
||||
cmdChainInSync=1
|
||||
else
|
||||
cmdChainInSync=0
|
||||
fi
|
||||
elif [ $LNTYPE = lnd ];then
|
||||
elif [ $LNTYPE = lnd ]; then
|
||||
lncommand="${netprefix}lncli"
|
||||
cmdChainInSync="$lncli_alias getinfo | grep '"synced_to_chain": true' -c"
|
||||
fi
|
||||
chainInSync=${cmdChainInSync}
|
||||
while [ "${chainInSync}" == "0" ]; do
|
||||
dialog --title "Fail: not in sync" \
|
||||
--ok-label "Try now" \
|
||||
--cancel-label "Give up" \
|
||||
--pause "\n\n'$lncommand getinfo' shows 'synced_to_chain': false\n\nTry again in a few seconds." 15 60 5
|
||||
|
||||
--ok-label "Try now" \
|
||||
--cancel-label "Give up" \
|
||||
--pause "\n\n'$lncommand getinfo' shows 'synced_to_chain': false\n\nTry again in a few seconds." 15 60 5
|
||||
|
||||
if [ $? -gt 0 ]; then
|
||||
exit 0
|
||||
exit 0
|
||||
fi
|
||||
chainInSync=${cmdChainInSync}
|
||||
done
|
||||
|
||||
# check number of connected peers
|
||||
echo "check for open channels"
|
||||
if [ $LNTYPE = cl ];then
|
||||
openChannels=$($lightningcli_alias listpeers | grep -c "CHANNELD_NORMAL")
|
||||
elif [ $LNTYPE = lnd ];then
|
||||
openChannels=$($lncli_alias listchannels 2>/dev/null | grep chan_id -c)
|
||||
if [ $LNTYPE = cl ]; then
|
||||
openChannels=$($lightningcli_alias getinfo | jq .num_active_channels)
|
||||
elif [ $LNTYPE = lnd ]; then
|
||||
openChannels=$($lncli_alias listchannels 2>/dev/null | grep chan_id -c)
|
||||
fi
|
||||
if [ ${openChannels} -eq 0 ]; then
|
||||
echo
|
||||
echo
|
||||
echo "#########"
|
||||
echo "FAIL - You have NO ESTABLISHED CHANNELS .. open a channel first."
|
||||
echo "#########"
|
||||
sleep 3
|
||||
echo
|
||||
echo
|
||||
exit 0
|
||||
fi
|
||||
|
||||
@ -81,7 +81,7 @@ l1="Copy the LightningInvoice/PaymentRequest into here:"
|
||||
l2="Its a long string starting with '${paymentRequestStart}'"
|
||||
l3="To try it out go to: ${testSite}"
|
||||
dialog --title "Pay through the Lightning Network" \
|
||||
--inputbox "$l1\n$l2\n$l3" 10 70 2>$_temp
|
||||
--inputbox "$l1\n$l2\n$l3" 10 70 2>$_temp
|
||||
invoice=$(cat $_temp | xargs)
|
||||
shred -u $_temp
|
||||
if [ ${#invoice} -eq 0 ]; then
|
||||
@ -95,10 +95,10 @@ fi
|
||||
# TODO: maybe try/show the decoded info first by using https://api.lightning.community/#decodepayreq
|
||||
|
||||
# build command
|
||||
if [ $LNTYPE = cl ];then
|
||||
if [ $LNTYPE = cl ]; then
|
||||
# pay bolt11 [msatoshi] [label] [riskfactor] [maxfeepercent] [retry_for] [maxdelay] [exemptfee]
|
||||
command="$lightningcli_alias pay ${invoice}"
|
||||
elif [ $LNTYPE = lnd ];then
|
||||
elif [ $LNTYPE = lnd ]; then
|
||||
command="$lncli_alias sendpayment --force --pay_req=${invoice}"
|
||||
fi
|
||||
|
||||
@ -112,7 +112,7 @@ echo "Pay Invoice / Payment Request"
|
||||
echo "This script is an example using lightning in the command line."
|
||||
echo "It is not optimized for performance or error handling."
|
||||
echo "************************************************************"
|
||||
echo
|
||||
echo
|
||||
echo "COMMAND LINE: "
|
||||
echo $command
|
||||
echo
|
||||
@ -125,9 +125,9 @@ error=$(cat ${_error})
|
||||
#echo "result(${result})"
|
||||
#echo "error(${error})"
|
||||
|
||||
if [ $LNTYPE = cl ];then
|
||||
if [ $LNTYPE = cl ]; then
|
||||
resultIsError=$(echo "${result}" | grep -c '"code":')
|
||||
elif [ $LNTYPE = lnd ];then
|
||||
elif [ $LNTYPE = lnd ]; then
|
||||
resultIsError=$(echo "${result}" | grep -c "payment_error")
|
||||
fi
|
||||
if [ ${resultIsError} -gt 0 ]; then
|
||||
|
||||
@ -34,9 +34,9 @@ fi
|
||||
|
||||
echo
|
||||
echo "# Running:"
|
||||
echo "${netprefix}lightning-cli -H summars summars-columns=IN_SATS,OUT_SATS,GRAPH_SATS,ALIAS summars-sort-by=IN_SATS"
|
||||
echo "${netprefix}lightning-cli -H summars summars-columns=IN_SATS,OUT_SATS,GRAPH_SATS,ALIAS,FLAG,BASE,PPM,UPTIME,HTLCS,STATE summars-sort-by=-IN_SATS"
|
||||
echo
|
||||
$lightningcli_alias -H summars summars-columns=IN_SATS,OUT_SATS,GRAPH_SATS,ALIAS summars-sort-by=IN_SATS
|
||||
$lightningcli_alias -H summars summars-columns=IN_SATS,OUT_SATS,GRAPH_SATS,ALIAS,FLAG,BASE,PPM,UPTIME,HTLCS,STATE summars-sort-by=-IN_SATS
|
||||
echo
|
||||
|
||||
if [ "$(echo "$@" | grep -c "runonce")" -gt 0 ]; then
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user