mirror of
https://github.com/raspiblitz/raspiblitz.git
synced 2025-04-03 01:18:44 +02:00
CONNECT bitcoin RPC: format output and fix removal (#2174)
This commit is contained in:
openoms
GitHub
parent
daf180f8d9
commit
64bfc91b03
@ -150,6 +150,15 @@ HiddenServicePort 8333 127.0.0.1:8333" | sudo tee -a /etc/tor/torrc
|
||||
;;
|
||||
${network}RPC)
|
||||
# vars
|
||||
if [ $(${chain}net) = mainnet ];then
|
||||
BITCOINRPCPORT=8332
|
||||
elif [ $(${chain}net) = testnet ];then
|
||||
BITCOINRPCPORT=18332
|
||||
elif [ $(${chain}net) = signet ];then
|
||||
BITCOINRPCPORT=38332
|
||||
fi
|
||||
echo "# Running on ${chain}net"
|
||||
echo
|
||||
localIPrange=$(ip addr | grep 'state UP' -A2 | grep -E -v 'docker0|veth' |\
|
||||
grep 'eth0\|wlan0\|enp0' | tail -n1 | awk '{print $2}' |\
|
||||
awk -F. '{print $1"."$2"."$3".0/24"}')
|
||||
@ -157,9 +166,36 @@ HiddenServicePort 8333 127.0.0.1:8333" | sudo tee -a /etc/tor/torrc
|
||||
grep 'eth0\|wlan0\|enp0' | tail -n1 | awk '{print $2}' | cut -f1 -d'/')
|
||||
allowIPrange=$(grep -c "rpcallowip=$localIPrange" < /mnt/hdd/${network}/${network}.conf)
|
||||
bindIP=$(grep -c "rpcbind=$localIP" < /mnt/hdd/${network}/${network}.conf)
|
||||
rpcTorService=$(grep -c "HiddenServicePort 8332 127.0.0.1:8332" < /etc/tor/torrc)
|
||||
TorRPCaddress=$(sudo cat /mnt/hdd/tor/bitcoin8332/hostname)
|
||||
|
||||
rpcTorService=$(grep -c "HiddenServicePort ${BITCOINRPCPORT} 127.0.0.1:${BITCOINRPCPORT}" < /etc/tor/torrc)
|
||||
TorRPCaddress=$(sudo cat /mnt/hdd/tor/bitcoin${BITCOINRPCPORT}/hostname)
|
||||
|
||||
function showRPCcredentials() {
|
||||
RPCUSER=$(sudo cat /mnt/hdd/${network}/${network}.conf | grep rpcuser | cut -c 9-)
|
||||
RPCPSW=$(sudo cat /mnt/hdd/${network}/${network}.conf | grep rpcpassword | cut -c 13-)
|
||||
echo
|
||||
echo "RPC username:"
|
||||
echo "$RPCUSER"
|
||||
echo
|
||||
echo "RPC password:"
|
||||
echo "$RPCPSW"
|
||||
if [ $allowIPrange -gt 0 ]&&[ $bindIP -gt 0 ];then
|
||||
echo
|
||||
echo "Host on the local network (make sure to connect from the same network):"
|
||||
echo $localIP
|
||||
fi
|
||||
if [ $rpcTorService -gt 0 ];then
|
||||
echo
|
||||
echo "Host via Tor (Tor needs to run on the client connecting as well):"
|
||||
echo $TorRPCaddress
|
||||
fi
|
||||
echo
|
||||
echo "Port:"
|
||||
echo "${BITCOINRPCPORT}"
|
||||
echo
|
||||
echo "More documentation at:"
|
||||
echo "https://github.com/openoms/joininbox/blob/master/prepare_remote_node.md"
|
||||
}
|
||||
|
||||
# menu
|
||||
OPTIONS=()
|
||||
if [ $allowIPrange -eq 0 ]&&\
|
||||
@ -182,11 +218,12 @@ HiddenServicePort 8333 127.0.0.1:8333" | sudo tee -a /etc/tor/torrc
|
||||
--title "${network} RPC" \
|
||||
--ok-label "Select" \
|
||||
--cancel-label "Cancel" \
|
||||
--menu "" 9 64 3 \
|
||||
--menu "" 9 66 3 \
|
||||
"${OPTIONS[@]}" 2>&1 >/dev/tty)
|
||||
|
||||
case $CHOICE in
|
||||
ADDRPCLAN)
|
||||
ADDRPCLAN)
|
||||
clear
|
||||
echo "# Make sure the bitcoind wallet is on"
|
||||
/home/admin/config.scripts/network.wallet.sh on
|
||||
|
||||
@ -203,69 +240,47 @@ HiddenServicePort 8333 127.0.0.1:8333" | sudo tee -a /etc/tor/torrc
|
||||
echo "# Restarting ${network}d"
|
||||
sudo systemctl restart ${network}d
|
||||
fi
|
||||
echo "# ufw allow from $localIPrange to any port 8332"
|
||||
sudo ufw allow from $localIPrange to any port 8332
|
||||
echo "# ufw allow from $localIPrange to any port ${BITCOINRPCPORT}"
|
||||
sudo ufw allow from $localIPrange to any port ${BITCOINRPCPORT}
|
||||
echo
|
||||
showRPCcredentials
|
||||
echo "Press ENTER to return to the menu."
|
||||
read key
|
||||
;;
|
||||
ADDRPCTOR)
|
||||
clear
|
||||
echo "# Make sure the bitcoind wallet is on"
|
||||
/home/admin/config.scripts/network.wallet.sh on
|
||||
|
||||
/home/admin/config.scripts/internet.hiddenservice.sh bitcoin8332 8332 8332
|
||||
/home/admin/config.scripts/internet.hiddenservice.sh bitcoin${BITCOINRPCPORT} ${BITCOINRPCPORT} ${BITCOINRPCPORT}
|
||||
echo
|
||||
echo "The address of the local node is: $TorRPCaddress"
|
||||
;;
|
||||
|
||||
CREDENTIALS)
|
||||
clear
|
||||
RPCUSER=$(sudo cat /mnt/hdd/${network}/${network}.conf | grep rpcuser | cut -c 9-)
|
||||
RPCPSW=$(sudo cat /mnt/hdd/${network}/${network}.conf | grep rpcpassword | cut -c 13-)
|
||||
|
||||
if [ $allowIPrange -gt 0 ]&&[ $bindIP -gt 0 ];then
|
||||
echo $localIP
|
||||
fi
|
||||
if [ $rpcTorService -gt 0 ];then
|
||||
echo $TorRPCaddress
|
||||
fi
|
||||
|
||||
echo "RPC username:"
|
||||
echo "$RPCUSER"
|
||||
echo
|
||||
echo "RPC password:"
|
||||
echo "$RPCPSW"
|
||||
echo
|
||||
if [ $allowIPrange -gt 0 ]&&[ $bindIP -gt 0 ];then
|
||||
echo "Host on the local network (make sure to connect from the same network):"
|
||||
echo $localIP
|
||||
fi
|
||||
if [ $rpcTorService -gt 0 ];then
|
||||
echo "Host via Tor (make sure to connect over Tor):"
|
||||
echo $TorRPCaddress
|
||||
fi
|
||||
echo
|
||||
echo "Port:"
|
||||
echo "8332"
|
||||
echo
|
||||
echo "More documentation at:"
|
||||
echo "https://github.com/openoms/joininbox/blob/master/prepare_remote_node.md"
|
||||
echo
|
||||
showRPCcredentials
|
||||
echo
|
||||
echo "Press ENTER to return to the menu."
|
||||
read key
|
||||
;;
|
||||
REMOVERPC)
|
||||
# remove old entrysudo sed -i "/# Hidden Service for BITCOIN RPC (mainnet, testnet, signet)/,/^\s*$/{d}" /etc/tor/torrc
|
||||
sudo sed -i "/# Hidden Service for BITCOIN RPC (mainnet, testnet, signet)/,/^\s*$/{d}" /etc/tor/torrc
|
||||
/home/admin/config.scripts/internet.hiddenservice.sh off bitcoin8332
|
||||
sudo sed -i "/# Hidden Service for BITCOIN RPC (mainnet, testnet, signet)/,/^\s*$/{d}" /etc/tor/torrc
|
||||
|
||||
sudo ufw deny from $localIPrange to any port 8332
|
||||
CREDENTIALS)
|
||||
clear
|
||||
showRPCcredentials
|
||||
echo
|
||||
echo "Press ENTER to return to the menu."
|
||||
read key
|
||||
;;
|
||||
REMOVERPC)
|
||||
# remove old entry
|
||||
sudo sed -i "/# Hidden Service for BITCOIN RPC (mainnet, testnet, signet)/,/^\s*$/{d}" /etc/tor/torrc
|
||||
# remove Hidden Service
|
||||
/home/admin/config.scripts/internet.hiddenservice.sh off bitcoin${BITCOINRPCPORT}
|
||||
sudo ufw deny from $localIPrange to any port ${BITCOINRPCPORT}
|
||||
restartCore=0
|
||||
if [ $allowIPrange -gt 0 ]; then
|
||||
sed '/rrpcallowip=$localIPrange/d' /mnt/hdd/${network}/${network}.conf
|
||||
sudo sed -i "/^rpcallowip=.*/d" /mnt/hdd/${network}/${network}.conf
|
||||
restartCore=1
|
||||
fi
|
||||
if [ $bindIP -eq 0 ]; then
|
||||
sed '/rpcbind=$localIP/d' /mnt/hdd/${network}/${network}.conf
|
||||
if [ $bindIP -gt 0 ]; then
|
||||
sudo sed -i "/^rpcbind=$localIP/d" /mnt/hdd/${network}/${network}.conf
|
||||
restartCore=1
|
||||
fi
|
||||
if [ $restartCore = 1 ];then
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user