Upgrade Caravan to v0.3.3; Upgrade Joinmarket to v0.7.0; Upgrade Specter to v0.6.1; Upgrade Thunderhub to v0.9.7

* upgrade thunderhub, caravan, joinmarket; and make bash variables consistent

* update setup_device
This commit is contained in:
Abhishek Shandilya 2020-08-26 21:12:48 -04:00 committed by GitHub
parent 74e0674f57
commit 09d01738cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 56 additions and 47 deletions

View File

@ -36,16 +36,17 @@ Each myNode device comes with a number of wonderful features:
- RTL (Ride the Lightning) - Lightning Wallet (v0.8.3-beta)
- Samourai Dojo (v1.5.0)
- Samourai Whirlpool (whirlpool-client-cli v0.10.5)
- Specter Desktop (v0.6.0)
- Specter Desktop (v0.6.1)
- Thunderhub (v0.9.7)
- BTC RPC Explorer (v2.0.2)
- Mempool.Space - Mempool local visualizer for the Bitcoin blockchain (v1.0)
- LND Hub - Lightning Wallet Server (v1.2.0)
- Lndmanage (v0.10.0)
- Lightning Loop - A Non-Custodial Off/On Chain Bridge (v0.8.0-beta)
- LNBits (Raspiblitz version)
- Caravan (v0.2.0)
- Caravan (v0.3.3)
- Tor
- JoinMarket CLI (v0.6.2)
- JoinMarket CLI (v0.7.0)
- LND Connect - Generate QR Codes for connecting wallets (v0.2.0)
- Virtual Machine support (OVA file: VirtualBox, VMWare)
- VPN for Remote Access (OpenVPN 2.4.7)

View File

@ -163,7 +163,7 @@ if [ $IS_RASPI = 1 ]; then
elif [ $IS_ROCK64 = 1 ] || [ $IS_ROCKPRO64 = 1 ]; then
ARCH="aarch64-linux-gnu"
elif [ $IS_X86 = 1 ]; then
ARCH="x86_64-linux-gnu"
ARCH="x86_64-linux-gnu"
else
echo "Unknown Bitcoin Version"
exit 1
@ -283,7 +283,7 @@ fi
# Install LndHub
LNDHUB_VERSION="v1.2.0"
LNDHUB_UPGRADE_URL=https://github.com/BlueWallet/LndHub/archive/${LNDHUB_VERSION}.tar.gz
LNDHUB_UPGRADE_URL=https://github.com/BlueWallet/LndHub/archive/$LNDHUB_VERSION.tar.gz
LNDHUB_UPGRADE_URL_FILE=/home/bitcoin/.mynode/.lndhub_url
CURRENT=""
if [ -f $LNDHUB_UPGRADE_URL_FILE ]; then
@ -309,8 +309,8 @@ cd ~
# Install Caravan
CARAVAN_VERSION="v0.3.2"
CARAVAN_UPGRADE_URL=https://github.com/unchained-capital/caravan/archive/${CARAVAN_VERSION}.tar.gz
CARAVAN_VERSION="v0.3.3"
CARAVAN_UPGRADE_URL=https://github.com/unchained-capital/caravan/archive/$CARAVAN_VERSION.tar.gz
CARAVAN_UPGRADE_URL_FILE=/home/bitcoin/.mynode/.caravan_url
CARAVAN_SETTINGS_UPDATE_FILE=/home/bitcoin/.mynode/.caravan_settings_1
CURRENT=""
@ -323,7 +323,7 @@ if [ "$CURRENT" != "$CARAVAN_UPGRADE_URL" ] || [ ! -f $CARAVAN_SETTINGS_UPDATE_F
rm -f caravan.tar.gz
wget $CARAVAN_UPGRADE_URL -O caravan.tar.gz
tar -xzf caravan.tar.gz
tar -xzf caravan.tar.gz
rm -f caravan.tar.gz
mv caravan-* caravan
chown -R bitcoin:bitcoin caravan
@ -337,7 +337,8 @@ cd ~
# Install cors proxy (my fork)
CORSPROXY_UPGRADE_URL=https://github.com/tehelsper/CORS-Proxy/archive/v1.7.0.tar.gz
CORSPROXY_VERSION="v1.7.0"
CORSPROXY_UPGRADE_URL=https://github.com/tehelsper/CORS-Proxy/archive/$CORSPROXY_VERSION.tar.gz
CORSPROXY_UPGRADE_URL_FILE=/home/bitcoin/.mynode/.corsproxy_url
CURRENT=""
if [ -f $CORSPROXY_UPGRADE_URL_FILE ]; then
@ -349,7 +350,7 @@ if [ "$CURRENT" != "$CORSPROXY_UPGRADE_URL" ]; then
rm -f corsproxy.tar.gz
wget $CORSPROXY_UPGRADE_URL -O corsproxy.tar.gz
tar -xzf corsproxy.tar.gz
tar -xzf corsproxy.tar.gz
rm -f corsproxy.tar.gz
mv CORS-* corsproxy
@ -378,7 +379,7 @@ fi
# Upgrade JoinMarket
echo "Upgrading JoinMarket..."
if [ $IS_RASPI = 1 ] || [ $IS_X86 = 1 ]; then
JOINMARKET_VERSION=v0.6.2
JOINMARKET_VERSION="v0.7.0"
JOINMARKET_UPGRADE_URL=https://github.com/JoinMarket-Org/joinmarket-clientserver/archive/$JOINMARKET_VERSION.tar.gz
JOINMARKET_UPGRADE_URL_FILE=/home/bitcoin/.mynode/.joinmarket_version
CURRENT=""
@ -401,7 +402,7 @@ if [ $IS_RASPI = 1 ] || [ $IS_X86 = 1 ]; then
sudo -u bitcoin tar -xvf joinmarket.tar.gz
sudo -u bitcoin rm joinmarket.tar.gz
mv joinmarket-clientserver-* joinmarket-clientserver
cd joinmarket-clientserver
yes | ./install.sh --without-qt
@ -410,7 +411,8 @@ if [ $IS_RASPI = 1 ] || [ $IS_X86 = 1 ]; then
fi
# Install Whirlpool
WHIRLPOOL_UPGRADE_URL=https://github.com/Samourai-Wallet/whirlpool-client-cli/releases/download/0.10.5/whirlpool-client-cli-0.10.5-run.jar
WHIRLPOOL_VERSION="0.10.5"
WHIRLPOOL_UPGRADE_URL=https://github.com/Samourai-Wallet/whirlpool-client-cli/releases/download/$WHIRLPOOL_VERSION/whirlpool-client-cli-$WHIRLPOOL_VERSION-run.jar
WHIRLPOOL_UPGRADE_URL_FILE=/home/bitcoin/.mynode/.whirlpool_url
CURRENT=""
if [ -f $WHIRLPOOL_UPGRADE_URL_FILE ]; then
@ -421,7 +423,7 @@ if [ "$CURRENT" != "$WHIRLPOOL_UPGRADE_URL" ]; then
cd /opt/mynode/whirlpool
sudo rm -rf *.jar
sudo -u bitcoin wget -O whirlpool.jar $WHIRLPOOL_UPGRADE_URL
echo $WHIRLPOOL_UPGRADE_URL > $WHIRLPOOL_UPGRADE_URL_FILE
fi
@ -450,7 +452,7 @@ if [ "$CURRENT" != "$RTL_UPGRADE_URL" ]; then
sudo -u bitcoin mv RTL-* RTL
cd RTL
sudo -u bitcoin NG_CLI_ANALYTICS=false npm install --only=production
mkdir -p /home/bitcoin/.mynode/
chown -R bitcoin:bitcoin /home/bitcoin/.mynode/
echo $RTL_UPGRADE_URL > $RTL_UPGRADE_URL_FILE
@ -460,7 +462,8 @@ if [ "$CURRENT" != "$RTL_UPGRADE_URL" ]; then
fi
# Upgrade BTC RPC Explorer
BTCRPCEXPLORER_UPGRADE_URL=https://github.com/janoside/btc-rpc-explorer/archive/v2.0.2.tar.gz
BTCRPCEXPLORER_VERSION="v2.0.2"
BTCRPCEXPLORER_UPGRADE_URL=https://github.com/janoside/btc-rpc-explorer/archive/$BTCRPCEXPLORER_VERSION.tar.gz
BTCRPCEXPLORER_UPGRADE_URL_FILE=/home/bitcoin/.mynode/.btcrpcexplorer_url
CURRENT=""
if [ -f $BTCRPCEXPLORER_UPGRADE_URL_FILE ]; then
@ -517,7 +520,7 @@ fi
# Upgrade Specter Desktop
SPECTER_UPGRADE_VERSION=0.6.0
SPECTER_UPGRADE_VERSION="0.6.1"
SPECTER_UPGRADE_URL_FILE=/home/bitcoin/.mynode/.spectre_url
CURRENT=""
if [ -f $SPECTER_UPGRADE_URL_FILE ]; then
@ -544,7 +547,8 @@ fi
# Upgrade Thunderhub
THUNDERHUB_UPGRADE_URL=https://github.com/apotdevin/thunderhub/archive/v0.9.0.tar.gz
THUNDERHUB_VERSION="v0.9.7"
THUNDERHUB_UPGRADE_URL=https://github.com/apotdevin/thunderhub/archive/$THUNDERHUB_VERSION.tar.gz
THUNDERHUB_UPGRADE_URL_FILE=/home/bitcoin/.mynode/.thunderhub_url
CURRENT=""
if [ -f $THUNDERHUB_UPGRADE_URL_FILE ]; then
@ -576,7 +580,8 @@ LNDCONNECTARCH="lndconnect-linux-armv7"
if [ $IS_X86 = 1 ]; then
LNDCONNECTARCH="lndconnect-linux-amd64"
fi
LNDCONNECT_UPGRADE_URL=https://github.com/LN-Zap/lndconnect/releases/download/v0.2.0/$LNDCONNECTARCH-v0.2.0.tar.gz
LNDCONNECT_VERSION="v0.2.0"
LNDCONNECT_UPGRADE_URL=https://github.com/LN-Zap/lndconnect/releases/download/$LNDCONNECT_VERSION/$LNDCONNECTARCH-$LNDCONNECT_VERSION.tar.gz
LNDCONNECT_UPGRADE_URL_FILE=/home/bitcoin/.mynode/.lndconnect_url
CURRENT=""
if [ -f $LNDCONNECT_UPGRADE_URL_FILE ]; then
@ -590,7 +595,7 @@ if [ "$CURRENT" != "$LNDCONNECT_UPGRADE_URL" ]; then
tar -xvf lndconnect.tar.gz
rm lndconnect.tar.gz
mv lndconnect-* lndconnect
install -m 0755 -o root -g root -t /usr/local/bin lndconnect/*
install -m 0755 -o root -g root -t /usr/local/bin lndconnect/*
mkdir -p /home/bitcoin/.mynode/
chown -R bitcoin:bitcoin /home/bitcoin/.mynode/
@ -627,7 +632,7 @@ fi
# tar -xvf tor.tar.gz
# rm tor.tar.gz
# mv tor-* tor
# cd tor
# ./configure
# make

View File

@ -127,15 +127,15 @@ apt-get -y upgrade
export DEBIAN_FRONTEND=noninteractive
apt-get -y install apt-transport-https
apt-get -y install htop git curl bash-completion jq dphys-swapfile lsof libzmq3-dev
apt-get -y install build-essential python-dev python-pip python3-dev python3-pip
apt-get -y install build-essential python-dev python-pip python3-dev python3-pip
apt-get -y install transmission-cli fail2ban ufw tclsh bluez python-bluez redis-server
#apt-get -y install mongodb-org
apt-get -y install clang hitch zlib1g-dev libffi-dev file toilet ncdu
apt-get -y install toilet-fonts avahi-daemon figlet libsecp256k1-dev
apt-get -y install toilet-fonts avahi-daemon figlet libsecp256k1-dev
apt-get -y install inotify-tools libssl-dev tor tmux screen fonts-dejavu
apt-get -y install python-grpcio python3-grpcio
apt-get -y install pv sysstat network-manager rsync parted unzip pkg-config
apt-get -y install libfreetype6-dev libpng-dev libatlas-base-dev libgmp-dev libltdl-dev
apt-get -y install libfreetype6-dev libpng-dev libatlas-base-dev libgmp-dev libltdl-dev
apt-get -y install libffi-dev libssl-dev glances python3-bottle automake libtool libltdl7
apt -y -qq install apt-transport-https ca-certificates
apt-get -y install xorg chromium openbox lightdm openjdk-11-jre libevent-dev ncurses-dev
@ -173,7 +173,7 @@ pip2 install wheel
pip2 install --upgrade wheel
pip2 install speedtest-cli transmissionrpc flask python-bitcoinrpc redis prometheus_client requests
pip2 install python-pam python-bitcoinlib psutil
pip2 install grpcio grpcio-tools googleapis-common-protos
pip2 install grpcio grpcio-tools googleapis-common-protos
pip2 install tzupdate virtualenv pysocks
@ -254,7 +254,7 @@ if [ $IS_RASPI = 1 ]; then
elif [ $IS_ROCK64 = 1 ] || [ $IS_ROCKPRO64 = 1 ]; then
ARCH="aarch64-linux-gnu"
elif [ $IS_X86 = 1 ]; then
ARCH="x86_64-linux-gnu"
ARCH="x86_64-linux-gnu"
else
echo "Unknown Bitcoin Version"
exit 1
@ -378,7 +378,7 @@ chown -R bitcoin:bitcoin /opt/mynode
# Install LND Hub
LNDHUB_VERSION="v1.2.0"
LNDHUB_UPGRADE_URL=https://github.com/BlueWallet/LndHub/archive/${LNDHUB_VERSION}.tar.gz
LNDHUB_UPGRADE_URL=https://github.com/BlueWallet/LndHub/archive/$LNDHUB_VERSION.tar.gz
LNDHUB_UPGRADE_URL_FILE=/home/bitcoin/.mynode/.lndhub_url
CURRENT=""
if [ -f $LNDHUB_UPGRADE_URL_FILE ]; then
@ -403,8 +403,8 @@ fi
cd ~
# Install Caravan
CARAVAN_VERSION="v0.2.0"
CARAVAN_UPGRADE_URL=https://github.com/unchained-capital/caravan/archive/${CARAVAN_VERSION}.tar.gz
CARAVAN_VERSION="v0.3.3"
CARAVAN_UPGRADE_URL=https://github.com/unchained-capital/caravan/archive/$CARAVAN_VERSION.tar.gz
CARAVAN_UPGRADE_URL_FILE=/home/bitcoin/.mynode/.caravan_url
CURRENT=""
if [ -f $CARAVAN_UPGRADE_URL_FILE ]; then
@ -416,7 +416,7 @@ if [ "$CURRENT" != "$CARAVAN_UPGRADE_URL" ]; then
rm -f caravan.tar.gz
wget $CARAVAN_UPGRADE_URL -O caravan.tar.gz
tar -xzf caravan.tar.gz
tar -xzf caravan.tar.gz
rm -f caravan.tar.gz
mv caravan-* caravan
chown -R bitcoin:bitcoin caravan
@ -429,7 +429,8 @@ cd ~
# Install cors proxy (my fork)
CORSPROXY_UPGRADE_URL=https://github.com/tehelsper/CORS-Proxy/archive/v1.7.0.tar.gz
CORSPROXY_VERSION="v1.7.0"
CORSPROXY_UPGRADE_URL=https://github.com/tehelsper/CORS-Proxy/archive/$CORSPROXY_VERSION.tar.gz
CORSPROXY_UPGRADE_URL_FILE=/home/bitcoin/.mynode/.corsproxy_url
CURRENT=""
if [ -f $CORSPROXY_UPGRADE_URL ]; then
@ -441,7 +442,7 @@ if [ "$CURRENT" != "$CORSPROXY_UPGRADE_URL" ]; then
rm -f corsproxy.tar.gz
wget $CORSPROXY_UPGRADE_URL -O corsproxy.tar.gz
tar -xzf corsproxy.tar.gz
tar -xzf corsproxy.tar.gz
rm -f corsproxy.tar.gz
mv CORS-* corsproxy
@ -455,7 +456,7 @@ cd ~
# Install Electrs (only build to save new version, now included in overlay)
#cd /home/admin/download
#wget https://github.com/romanz/electrs/archive/v0.7.0.tar.gz
#tar -xvf v0.7.0.tar.gz
#tar -xvf v0.7.0.tar.gz
#cd electrs-0.7.0
#cargo build --release
#sudo install -g root -o root target/release/electrs /usr/bin/electrs
@ -480,7 +481,7 @@ fi
# Install JoinMarket
echo "Install JoinMarket..."
if [ $IS_RASPI = 1 ] || [ $IS_X86 = 1 ]; then
JOINMARKET_VERSION=v0.6.2
JOINMARKET_VERSION="v0.7.0"
JOINMARKET_UPGRADE_URL=https://github.com/JoinMarket-Org/joinmarket-clientserver/archive/$JOINMARKET_VERSION.tar.gz
JOINMARKET_UPGRADE_URL_FILE=/home/bitcoin/.mynode/.joinmarket_version
CURRENT=""
@ -496,7 +497,7 @@ if [ $IS_RASPI = 1 ] || [ $IS_X86 = 1 ]; then
sudo -u bitcoin tar -xvf joinmarket.tar.gz
sudo -u bitcoin rm joinmarket.tar.gz
mv joinmarket-clientserver-* joinmarket-clientserver
cd joinmarket-clientserver
yes | ./install.sh --without-qt
@ -505,7 +506,8 @@ if [ $IS_RASPI = 1 ] || [ $IS_X86 = 1 ]; then
fi
# Install Whirlpool
WHIRLPOOL_UPGRADE_URL=https://github.com/Samourai-Wallet/whirlpool-client-cli/releases/download/0.10.5/whirlpool-client-cli-0.10.5-run.jar
WHIRLPOOL_VERSION="0.10.5"
WHIRLPOOL_UPGRADE_URL=https://github.com/Samourai-Wallet/whirlpool-client-cli/releases/download/$WHIRLPOOL_VERSION/whirlpool-client-cli-$WHIRLPOOL_VERSION-run.jar
WHIRLPOOL_UPGRADE_URL_FILE=/home/bitcoin/.mynode/.whirlpool_url
CURRENT=""
if [ -f $WHIRLPOOL_UPGRADE_URL_FILE ]; then
@ -516,7 +518,7 @@ if [ "$CURRENT" != "$WHIRLPOOL_UPGRADE_URL" ]; then
cd /opt/mynode/whirlpool
sudo rm -rf *.jar
sudo -u bitcoin wget -O whirlpool.jar $WHIRLPOOL_UPGRADE_URL
echo $WHIRLPOOL_UPGRADE_URL > $WHIRLPOOL_UPGRADE_URL_FILE
fi
@ -533,7 +535,7 @@ fi
if [ "$CURRENT" != "$RTL_UPGRADE_URL" ]; then
cd /opt/mynode
rm -rf RTL
sudo -u bitcoin wget $RTL_UPGRADE_URL -O RTL.tar.gz
#sudo -u bitcoin wget $RTL_UPGRADE_ASC_URL -O RTL.tar.gz.asc
@ -544,7 +546,7 @@ if [ "$CURRENT" != "$RTL_UPGRADE_URL" ]; then
sudo -u bitcoin mv RTL-* RTL
cd RTL
sudo -u bitcoin NG_CLI_ANALYTICS=false npm install --only=production
mkdir -p /home/bitcoin/.mynode/
chown -R bitcoin:bitcoin /home/bitcoin/.mynode/
echo $RTL_UPGRADE_URL > $RTL_UPGRADE_URL_FILE
@ -552,7 +554,8 @@ fi
# Install BTC RPC Explorer
BTCRPCEXPLORER_UPGRADE_URL=https://github.com/janoside/btc-rpc-explorer/archive/v2.0.2.tar.gz
BTCRPCEXPLORER_VERSION="v2.0.2"
BTCRPCEXPLORER_UPGRADE_URL=https://github.com/janoside/btc-rpc-explorer/archive/$BTCRPCEXPLORER_VERSION.tar.gz
BTCRPCEXPLORER_UPGRADE_URL_FILE=/home/bitcoin/.mynode/.btcrpcexplorer_url
CURRENT=""
if [ -f $BTCRPCEXPLORER_UPGRADE_URL_FILE ]; then
@ -609,7 +612,7 @@ fi
# Upgrade Specter Desktop
SPECTER_UPGRADE_VERSION=0.6.0
SPECTER_UPGRADE_VERSION="0.6.1"
SPECTER_UPGRADE_URL_FILE=/home/bitcoin/.mynode/.spectre_url
CURRENT=""
if [ -f $SPECTER_UPGRADE_URL_FILE ]; then
@ -636,7 +639,8 @@ fi
# Upgrade Thunderhub
THUNDERHUB_UPGRADE_URL=https://github.com/apotdevin/thunderhub/archive/v0.9.0.tar.gz
THUNDERHUB_VERSION="v0.9.7"
THUNDERHUB_UPGRADE_URL=https://github.com/apotdevin/thunderhub/archive/$THUNDERHUB_VERSION.tar.gz
THUNDERHUB_UPGRADE_URL_FILE=/home/bitcoin/.mynode/.thunderhub_url
CURRENT=""
if [ -f $THUNDERHUB_UPGRADE_URL_FILE ]; then
@ -658,7 +662,7 @@ if [ "$CURRENT" != "$THUNDERHUB_UPGRADE_URL" ]; then
# Setup symlink to service files
rm -f /opt/mynode/thunderhub/.env.local
sudo ln -s /mnt/hdd/mynode/thunderhub/.env.local /opt/mynode/thunderhub/.env.local
echo $THUNDERHUB_UPGRADE_URL > $THUNDERHUB_UPGRADE_URL_FILE
fi
@ -668,7 +672,8 @@ LNDCONNECTARCH="lndconnect-linux-armv7"
if [ $IS_X86 = 1 ]; then
LNDCONNECTARCH="lndconnect-linux-amd64"
fi
LNDCONNECT_UPGRADE_URL=https://github.com/LN-Zap/lndconnect/releases/download/v0.2.0/$LNDCONNECTARCH-v0.2.0.tar.gz
LNDCONNECT_VERSION="v0.2.0"
LNDCONNECT_UPGRADE_URL=https://github.com/LN-Zap/lndconnect/releases/download/v0.2.0/$LNDCONNECTARCH-$LNDCONNECT_VERSION.tar.gz
LNDCONNECT_UPGRADE_URL_FILE=/home/bitcoin/.mynode/.lndconnect_url
CURRENT=""
if [ -f $LNDCONNECT_UPGRADE_URL_FILE ]; then
@ -682,7 +687,7 @@ if [ "$CURRENT" != "$LNDCONNECT_UPGRADE_URL" ]; then
tar -xvf lndconnect.tar.gz
rm lndconnect.tar.gz
mv lndconnect-* lndconnect
install -m 0755 -o root -g root -t /usr/local/bin lndconnect/*
install -m 0755 -o root -g root -t /usr/local/bin lndconnect/*
mkdir -p /home/bitcoin/.mynode/
chown -R bitcoin:bitcoin /home/bitcoin/.mynode/
@ -820,5 +825,3 @@ echo ""
### MAKE IMAGE NOW ###
# This prevents auto gen files like certs to be part of the base image
# Must make sure image can boot after this point and fully come up