diff --git a/home.admin/00infoBlitz.sh b/home.admin/00infoBlitz.sh index b205ba5af..6b40fa642 100755 --- a/home.admin/00infoBlitz.sh +++ b/home.admin/00infoBlitz.sh @@ -18,9 +18,11 @@ if [ $# -gt 0 ];then CHAIN=$1 chain=${CHAIN::-3} fi -source /home/admin/config.scripts/_functions.lightning.sh -getLNvars lnd ${chain}net -getLNaliases +source <(/home/admin/config.scripts/network.aliases.sh getvars lnd ${chain}net) +shopt -s expand_aliases +alias bitcoincli_alias="$bitcoincli_alias" +alias lncli_alias="$lncli_alias" +alias lightningcli_alias="$lightningcli_alias" ## get HDD/SSD info source <(sudo /home/admin/config.scripts/blitz.datadrive.sh status) diff --git a/home.admin/00infoLCD.sh b/home.admin/00infoLCD.sh index aa3ac44e0..211ed7225 100755 --- a/home.admin/00infoLCD.sh +++ b/home.admin/00infoLCD.sh @@ -110,9 +110,11 @@ while : configExists=$(ls ${configFile} 2>/dev/null | grep -c '.conf') if [ ${configExists} -eq 1 ]; then source ${configFile} - source /home/admin/config.scripts/_functions.lightning.sh - getLNvars lnd ${chain}net - getLNaliases + source <(/home/admin/config.scripts/network.aliases.sh getvars lnd ${chain}net) + shopt -s expand_aliases + alias bitcoincli_alias="$bitcoincli_alias" + alias lncli_alias="$lncli_alias" + alias lightningcli_alias="$lightningcli_alias" fi # reboot info diff --git a/home.admin/00raspiblitz.sh b/home.admin/00raspiblitz.sh index 4efe1bc63..287ad7fed 100755 --- a/home.admin/00raspiblitz.sh +++ b/home.admin/00raspiblitz.sh @@ -154,9 +154,11 @@ if [ "${state}" = "ready" ]; then if [ ${configExists} -eq 1 ]; then echo "loading config data" source ${configFile} - source /home/admin/config.scripts/_functions.lightning.sh - getLNvars lnd ${chain}net - getLNaliases + source <(/home/admin/config.scripts/network.aliases.sh getvars lnd ${chain}net) + shopt -s expand_aliases + alias bitcoincli_alias="$bitcoincli_alias" + alias lncli_alias="$lncli_alias" + alias lightningcli_alias="$lightningcli_alias" else echo "setup still in progress - setupStep(${setupStep})" fi diff --git a/home.admin/BBconnectPeer.sh b/home.admin/BBconnectPeer.sh index c584894be..1c8cad05d 100755 --- a/home.admin/BBconnectPeer.sh +++ b/home.admin/BBconnectPeer.sh @@ -12,9 +12,11 @@ if [ ${#chain} -eq 0 ]; then chain=$(${network}-cli getblockchaininfo | jq -r '.chain') fi -source /home/admin/config.scripts/_functions.lightning.sh -getLNvars $1 $2 -getLNaliases +source <(/home/admin/config.scripts/network.aliases.sh getvars $1 $2) +shopt -s expand_aliases +alias bitcoincli_alias="$bitcoincli_alias" +alias lncli_alias="$lncli_alias" +alias lightningcli_alias="$lightningcli_alias" # set network map info networkMap="https://lnmainnet.gaben.win" diff --git a/home.admin/BBcreateInvoice.sh b/home.admin/BBcreateInvoice.sh index f21370106..99fe93e16 100755 --- a/home.admin/BBcreateInvoice.sh +++ b/home.admin/BBcreateInvoice.sh @@ -14,9 +14,11 @@ if [ ${#chain} -eq 0 ]; then chain=$(${network}-cli getblockchaininfo | jq -r '.chain') fi -source /home/admin/config.scripts/_functions.lightning.sh -getLNvars $1 $2 -getLNaliases +source <(/home/admin/config.scripts/network.aliases.sh getvars $1 $2) +shopt -s expand_aliases +alias bitcoincli_alias="$bitcoincli_alias" +alias lncli_alias="$lncli_alias" +alias lightningcli_alias="$lightningcli_alias" # Check if ready (chain in sync and channels open) ./XXchainInSync.sh $network $chain $LNTYPE diff --git a/home.admin/BBfundWallet.sh b/home.admin/BBfundWallet.sh index 55be289a8..cd89162ab 100755 --- a/home.admin/BBfundWallet.sh +++ b/home.admin/BBfundWallet.sh @@ -11,9 +11,11 @@ if [ ${#chain} -eq 0 ]; then chain=$(${network}-cli getblockchaininfo | jq -r '.chain') fi -source /home/admin/config.scripts/_functions.lightning.sh -getLNvars $1 $2 -getLNaliases +source <(/home/admin/config.scripts/network.aliases.sh getvars $1 $2) +shopt -s expand_aliases +alias bitcoincli_alias="$bitcoincli_alias" +alias lncli_alias="$lncli_alias" +alias lightningcli_alias="$lightningcli_alias" # PRECHECK) check if chain is in sync if [ $LNTYPE = cln ];then diff --git a/home.admin/BBopenChannel.sh b/home.admin/BBopenChannel.sh index 00d42bebf..d9357f271 100755 --- a/home.admin/BBopenChannel.sh +++ b/home.admin/BBopenChannel.sh @@ -12,9 +12,11 @@ if [ ${#chain} -eq 0 ]; then chain=$(${network}-cli getblockchaininfo | jq -r '.chain') fi -source /home/admin/config.scripts/_functions.lightning.sh -getLNvars $1 $2 -getLNaliases +source <(/home/admin/config.scripts/network.aliases.sh getvars $1 $2) +shopt -s expand_aliases +alias bitcoincli_alias="$bitcoincli_alias" +alias lncli_alias="$lncli_alias" +alias lightningcli_alias="$lightningcli_alias" echo "" echo "*** Precheck ***" diff --git a/home.admin/BBpayInvoice.sh b/home.admin/BBpayInvoice.sh index 439881a97..06880c965 100755 --- a/home.admin/BBpayInvoice.sh +++ b/home.admin/BBpayInvoice.sh @@ -14,9 +14,11 @@ if [ ${#chain} -eq 0 ]; then chain=$(${network}-cli getblockchaininfo | jq -r '.chain') fi -source /home/admin/config.scripts/_functions.lightning.sh -getLNvars $1 $2 -getLNaliases +source <(/home/admin/config.scripts/network.aliases.sh getvars $1 $2) +shopt -s expand_aliases +alias bitcoincli_alias="$bitcoincli_alias" +alias lncli_alias="$lncli_alias" +alias lightningcli_alias="$lightningcli_alias" # Check if ready (chain in sync and channels open) ./XXchainInSync.sh $network $chain $LNTYPE diff --git a/home.admin/XXchainInSync.sh b/home.admin/XXchainInSync.sh index d76ff8d61..210b5e553 100755 --- a/home.admin/XXchainInSync.sh +++ b/home.admin/XXchainInSync.sh @@ -14,9 +14,11 @@ else LNTYPE=lnd fi -source /home/admin/config.scripts/_functions.lightning.sh -getLNvars $LNTYPE ${chain}net -getLNaliases +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 if [ $LNTYPE = cln ];then diff --git a/home.admin/config.scripts/_functions.lightning.sh b/home.admin/config.scripts/_functions.lightning.sh deleted file mode 100644 index 43dd42520..000000000 --- a/home.admin/config.scripts/_functions.lightning.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/bash - -# getLNvars -function getLNvars { - # LNTYPE is lnd | cln - if [ $# -gt 0 ];then - LNTYPE=$1 - else - LNTYPE=lnd - fi - # CHAIN is signet | testnet | mainnet - if [ $# -gt 1 ];then - CHAIN=$2 - chain=${CHAIN::-3} - else - CHAIN=${chain}net - fi - if [ ${chain} = test ];then - netprefix="t" - L1rpcportmod=1 - L2rpcportmod=1 - elif [ ${chain} = sig ];then - netprefix="s" - L1rpcportmod=3 - L2rpcportmod=3 - elif [ ${chain} = main ];then - netprefix="" - L1rpcportmod="" - L2rpcportmod=0 - fi -} - -# getLNaliases -function getLNaliases { -#TODO ALL -# instead of all -# sudo -u bitcoin /usr/local/bin/lncli --chain=${network} --network=${chain}net -lncli_alias="sudo -u bitcoin /usr/local/bin/lncli -n=${chain}net --rpcserver localhost:1${L2rpcportmod}009" -# sudo -u bitcoin ${network}-cli -datadir=/home/bitcoin/.${network} -bitcoincli_alias="/usr/local/bin/${network}-cli -datadir=/home/bitcoin/.${network} -rpcport=${L1rpcportmod}8332" -lightningcli_alias="sudo -u bitcoin /usr/local/bin/lightning-cli --conf=/home/bitcoin/.lightning/${netprefix}config" -shopt -s expand_aliases -alias lncli_alias="$lncli_alias" -alias bitcoincli_alias="$bitcoincli_alias" -alias lightningcli_alias="$lightningcli_alias" -} \ No newline at end of file diff --git a/home.admin/config.scripts/blitz.statusscan.sh b/home.admin/config.scripts/blitz.statusscan.sh index 8ee8c6054..c52156242 100755 --- a/home.admin/config.scripts/blitz.statusscan.sh +++ b/home.admin/config.scripts/blitz.statusscan.sh @@ -10,9 +10,11 @@ else LNTYPE=lnd fi -source /home/admin/config.scripts/_functions.lightning.sh -getLNvars $LNTYPE ${chain}net -getLNaliases +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" # command info if [ "$1" = "-h" ] || [ "$1" = "-help" ]; then diff --git a/home.admin/config.scripts/lnd.unlock.sh b/home.admin/config.scripts/lnd.unlock.sh index 74e6e201a..f9fa3b3ae 100755 --- a/home.admin/config.scripts/lnd.unlock.sh +++ b/home.admin/config.scripts/lnd.unlock.sh @@ -10,9 +10,11 @@ fi source /home/admin/raspiblitz.info source /mnt/hdd/raspiblitz.conf -source /home/admin/config.scripts/_functions.lightning.sh -getLNvars lnd ${chain}net -getLNaliases +source <(/home/admin/config.scripts/network.aliases.sh getvars lnd ${chain}net) +shopt -s expand_aliases +alias bitcoincli_alias="$bitcoincli_alias" +alias lncli_alias="$lncli_alias" +alias lightningcli_alias="$lightningcli_alias" # 1. parameter passwordC="$1" diff --git a/home.admin/config.scripts/network.aliases.sh b/home.admin/config.scripts/network.aliases.sh new file mode 100644 index 000000000..13e3d2233 --- /dev/null +++ b/home.admin/config.scripts/network.aliases.sh @@ -0,0 +1,49 @@ +#!/bin/bash + +# Usage: +# source <(/home/admin/config.scripts/network.aliases.sh +# shopt -s expand_aliases +# alias bitcoincli_alias="$bitcoincli_alias" +# alias lncli_alias="$lncli_alias" +# alias lightningcli_alias="$lightningcli_alias" +source /mnt/hdd/raspiblitz.conf + +if [ $1 = getvars ];then + # LNTYPE is lnd | cln + if [ $# -gt 1 ];then + LNTYPE=$2 + else + LNTYPE=lnd + fi + # CHAIN is signet | testnet | mainnet + if [ $# -gt 2 ];then + CHAIN=$3 + chain=${CHAIN::-3} + else + CHAIN=${chain}net + fi + if [ ${chain} = test ];then + netprefix="t" + echo "netprefix=t" + L1rpcportmod=1 + L2rpcportmod=1 + elif [ ${chain} = sig ];then + netprefix="s" + echo "netprefix=s" + L1rpcportmod=3 + L2rpcportmod=3 + elif [ ${chain} = main ];then + netprefix="" + echo "netprefix=''" + L1rpcportmod="" + L2rpcportmod=0 + fi + + #TODO ALL + # instead of all + # sudo -u bitcoin /usr/local/bin/lncli --chain=${network} --network=${chain}net + echo "lncli_alias=\"sudo -u bitcoin /usr/local/bin/lncli -n=${chain}net --rpcserver localhost:1${L2rpcportmod}009\"" + # sudo -u bitcoin ${network}-cli -datadir=/home/bitcoin/.${network} + echo "bitcoincli_alias=\"/usr/local/bin/${network}-cli -datadir=/home/bitcoin/.${network} -rpcport=${L1rpcportmod}8332\"" + echo "lightningcli_alias=\"sudo -u bitcoin /usr/local/bin/lightning-cli --conf=/home/bitcoin/.lightning/${netprefix}config\"" +fi diff --git a/home.admin/config.scripts/network.monitor.sh b/home.admin/config.scripts/network.monitor.sh index 7ef944ef9..7070fc594 100755 --- a/home.admin/config.scripts/network.monitor.sh +++ b/home.admin/config.scripts/network.monitor.sh @@ -12,9 +12,11 @@ fi source /mnt/hdd/raspiblitz.conf source /home/admin/raspiblitz.info -source /home/admin/config.scripts/_functions.lightning.sh -getLNvars lnd ${chain}net -getLNaliases +source <(/home/admin/config.scripts/network.aliases.sh getvars lnd ${chain}net) +shopt -s expand_aliases +alias bitcoincli_alias="$bitcoincli_alias" +alias lncli_alias="$lncli_alias" +alias lightningcli_alias="$lightningcli_alias" ################### # STATUS