michael.heier/mynode
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Upgrade JoinMarket to 0.6.2

Browse Source
This commit is contained in:
Taylor Helsper 2020-05-02 22:20:49 -05:00
parent 2c087eacbd
commit 7e31f0fa29
2 changed files with 46 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
rootfs/standard/usr/bin/mynode_post_upgrade.sh
View File

@ -259,36 +259,35 @@ fi
# Upgrade JoinMarket # Upgrade JoinMarket
echo "Upgrading JoinMarket..." echo "Upgrading JoinMarket..."
if [ $IS_PREMIUM -eq 1 ]; then if [ $IS_RASPI = 1 ] || [ $IS_X86 = 1 ]; then
JOINMARKET_VERSION=0.6.1 JOINMARKET_VERSION=v0.6.2
JOINMARKET_GITHUB_URL=https://github.com/JoinMarket-Org/joinmarket-clientserver.git JOINMARKET_UPGRADE_URL=https://github.com/JoinMarket-Org/joinmarket-clientserver/archive/$JOINMARKET_VERSION.tar.gz
JOINMARKET_VERSION_FILE=/home/bitcoin/.mynode/.joinmarket_version JOINMARKET_UPGRADE_URL_FILE=/home/bitcoin/.mynode/.joinmarket_version
CURRENT="" CURRENT=""
if [ -f $JOINMARKET_VERSION_FILE ]; then if [ -f $JOINMARKET_UPGRADE_URL_FILE ]; then
CURRENT=$(cat $JOINMARKET_VERSION_FILE) CURRENT=$(cat $JOINMARKET_UPGRADE_URL_FILE)
fi fi
if [ "$CURRENT" != "$JOINMARKET_VERSION" ]; then if [ "$CURRENT" != "$JOINMARKET_VERSION" ]; then
# Download and build JoinMarket # Download and build JoinMarket
cd /opt/mynode cd /opt/mynode
if [ ! -d /opt/mynode/joinmarket-clientserver ]; then # Backup old version in case config / wallet was stored within folder
git clone $JOINMARKET_GITHUB_URL if [ ! -d /opt/mynode/jm_backup ] && [ -d /opt/mynode/joinmarket-clientserver ]; then
cd joinmarket-clientserver cp -R /opt/mynode/joinmarket-clientserver /opt/mynode/jm_backup
else chown -R bitcoin:bitcoin /opt/mynode/jm_backup
cd joinmarket-clientserver
git pull origin master
fi fi
git fetch --tags --all
git reset --hard v$JOINMARKET_VERSION
# Create virtualenv and setup JoinMarket rm -rf joinmarket-clientserver
virtualenv -p python3 jmvenv
source jmvenv/bin/activate
python setupall.py --daemon
python setupall.py --client-bitcoin
deactivate
echo $JOINMARKET_VERSION > $JOINMARKET_VERSION_FILE sudo -u bitcoin wget $JOINMARKET_UPGRADE_URL -O joinmarket.tar.gz
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
echo $JOINMARKET_VERSION > $JOINMARKET_UPGRADE_URL_FILE
fi fi
fi fi

26
setup/setup_device.sh
View File

@ -393,6 +393,32 @@ if [ ! -f /usr/include/secp256k1_ecdh.h ]; then
cp -f include/* /usr/include/ cp -f include/* /usr/include/
fi fi
# Install JoinMarket
echo "Install JoinMarket..."
if [ $IS_RASPI = 1 ] || [ $IS_X86 = 1 ]; then
JOINMARKET_VERSION=v0.6.2
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=""
if [ -f $JOINMARKET_UPGRADE_URL_FILE ]; then
CURRENT=$(cat $JOINMARKET_UPGRADE_URL_FILE)
fi
if [ "$CURRENT" != "$JOINMARKET_VERSION" ]; then
# Download and build JoinMarket
cd /opt/mynode
rm -rf joinmarket-clientserver
sudo -u bitcoin wget $JOINMARKET_UPGRADE_URL -O joinmarket.tar.gz
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
echo $JOINMARKET_VERSION > $JOINMARKET_UPGRADE_URL_FILE
fi
fi
# Install Whirlpool # Install Whirlpool
WHIRLPOOL_UPGRADE_URL=https://github.com/Samourai-Wallet/whirlpool-client-cli/releases/download/0.10.4/whirlpool-client-cli-0.10.4-run.jar WHIRLPOOL_UPGRADE_URL=https://github.com/Samourai-Wallet/whirlpool-client-cli/releases/download/0.10.4/whirlpool-client-cli-0.10.4-run.jar