From 96a1e4a4cbba929fee4d0e7f0b0bf17528f2c904 Mon Sep 17 00:00:00 2001 From: openoms Date: Sun, 23 May 2021 11:26:41 +0100 Subject: [PATCH] getLNvars getLNaliases to _functions.lightning.sh --- home.admin/BBconnectPeer.sh | 41 ++---------------- home.admin/BBcreateInvoice.sh | 36 ++-------------- home.admin/BBfundWallet.sh | 39 ++--------------- home.admin/BBopenChannel.sh | 39 ++--------------- home.admin/BBpayInvoice.sh | 36 ++-------------- home.admin/XXchainInSync.sh | 24 ++--------- .../config.scripts/_functions.lightning.sh | 42 +++++++++++++++++++ 7 files changed, 61 insertions(+), 196 deletions(-) create mode 100644 home.admin/config.scripts/_functions.lightning.sh diff --git a/home.admin/BBconnectPeer.sh b/home.admin/BBconnectPeer.sh index bc4cd1058..b4e0a1f6f 100755 --- a/home.admin/BBconnectPeer.sh +++ b/home.admin/BBconnectPeer.sh @@ -12,44 +12,11 @@ if [ ${#chain} -eq 0 ]; then chain=$(${network}-cli getblockchaininfo | jq -r '.chain') fi -# LNTYPE is lnd | cln -if [ $# -gt 0 ];then - LNTYPE=$1 -else - LNTYPE=lnd -fi +source /home/admin/config.scripts/_functions.lightning.sh +getLNvars $1 $2 +getLNaliases -# 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 - -lncli_alias="sudo -u bitcoin /usr/local/bin/lncli -n=${chain}net --rpcserver localhost:1${L2rpcportmod}009" -bitcoincli_alias="/usr/local/bin/${network}-cli -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" - -# set ntwork map info +# set network map info networkMap="https://lnmainnet.gaben.win" if [ "$network" = "litecoin" ]; then networkMap="https://lnexplorer.hcwong.me" diff --git a/home.admin/BBcreateInvoice.sh b/home.admin/BBcreateInvoice.sh index 27b7d29ba..f21370106 100755 --- a/home.admin/BBcreateInvoice.sh +++ b/home.admin/BBcreateInvoice.sh @@ -14,39 +14,9 @@ if [ ${#chain} -eq 0 ]; then chain=$(${network}-cli getblockchaininfo | jq -r '.chain') fi -# 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 -lncli_alias="sudo -u bitcoin /usr/local/bin/lncli -n=${chain}net --rpcserver localhost:1${L2rpcportmod}009" -bitcoincli_alias="/usr/local/bin/${network}-cli -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" +source /home/admin/config.scripts/_functions.lightning.sh +getLNvars $1 $2 +getLNaliases # 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 2470b03e5..ed49bb4eb 100755 --- a/home.admin/BBfundWallet.sh +++ b/home.admin/BBfundWallet.sh @@ -11,42 +11,9 @@ if [ ${#chain} -eq 0 ]; then chain=$(${network}-cli getblockchaininfo | jq -r '.chain') fi -# 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 - -lncli_alias="sudo -u bitcoin /usr/local/bin/lncli -n=${chain}net --rpcserver localhost:1${L2rpcportmod}009" -bitcoincli_alias="/usr/local/bin/${network}-cli -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" +source /home/admin/config.scripts/_functions.lightning.sh +getLNvars $1 $2 +getLNaliases # PRECHECK) check if chain is in sync if [ $LNTYPE = cln ];then diff --git a/home.admin/BBopenChannel.sh b/home.admin/BBopenChannel.sh index e1ea012be..cdb53846b 100755 --- a/home.admin/BBopenChannel.sh +++ b/home.admin/BBopenChannel.sh @@ -12,42 +12,9 @@ if [ ${#chain} -eq 0 ]; then chain=$(${network}-cli getblockchaininfo | jq -r '.chain') fi -# 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 - -lncli_alias="sudo -u bitcoin /usr/local/bin/lncli -n=${chain}net --rpcserver localhost:1${L2rpcportmod}009" -bitcoincli_alias="/usr/local/bin/${network}-cli -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" +source /home/admin/config.scripts/_functions.lightning.sh +getLNvars $1 $2 +getLNaliases echo "" echo "*** Precheck ***" diff --git a/home.admin/BBpayInvoice.sh b/home.admin/BBpayInvoice.sh index ccc6896a8..439881a97 100755 --- a/home.admin/BBpayInvoice.sh +++ b/home.admin/BBpayInvoice.sh @@ -14,39 +14,9 @@ if [ ${#chain} -eq 0 ]; then chain=$(${network}-cli getblockchaininfo | jq -r '.chain') fi -# 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 -lncli_alias="sudo -u bitcoin /usr/local/bin/lncli -n=${chain}net --rpcserver localhost:1${L2rpcportmod}009" -bitcoincli_alias="/usr/local/bin/${network}-cli -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" +source /home/admin/config.scripts/_functions.lightning.sh +getLNvars $1 $2 +getLNaliases # 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 e1ab32297..25a5df8bd 100755 --- a/home.admin/XXchainInSync.sh +++ b/home.admin/XXchainInSync.sh @@ -14,27 +14,9 @@ else LNTYPE=lnd 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 - -lncli_alias="sudo -u bitcoin /usr/local/bin/lncli -n=${chain}net --rpcserver localhost:1${L2rpcportmod}009" -bitcoincli_alias="/usr/local/bin/${network}-cli -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" +source /home/admin/config.scripts/_functions.lightning.sh +getLNvars $LNTYPE ${chain}net +getLNaliases # 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 new file mode 100644 index 000000000..a45b6f9ac --- /dev/null +++ b/home.admin/config.scripts/_functions.lightning.sh @@ -0,0 +1,42 @@ +#!/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 { +lncli_alias="sudo -u bitcoin /usr/local/bin/lncli -n=${chain}net --rpcserver localhost:1${L2rpcportmod}009" +bitcoincli_alias="/usr/local/bin/${network}-cli -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