diff --git a/rootfs/standard/usr/bin/mynode_post_upgrade.sh b/rootfs/standard/usr/bin/mynode_post_upgrade.sh index 3d4008ab..d42e290f 100755 --- a/rootfs/standard/usr/bin/mynode_post_upgrade.sh +++ b/rootfs/standard/usr/bin/mynode_post_upgrade.sh @@ -297,7 +297,7 @@ if [ $IS_X86 = 1 ]; then fi POOL_UPGRADE_URL=https://github.com/lightninglabs/pool/releases/download/$POOL_VERSION/$POOL_ARCH-$POOL_VERSION.tar.gz POOL_UPGRADE_MANIFEST_URL=https://github.com/lightninglabs/pool/releases/download/$POOL_VERSION/manifest-$POOL_VERSION.txt -POOL_UPGRADE_MANIFEST_SIG_URL=https://github.com/lightninglabs/pool/releases/download/$POOL_VERSION/manifest-$POOL_VERSION.txt.asc +POOL_UPGRADE_MANIFEST_SIG_URL=https://github.com/lightninglabs/pool/releases/download/$POOL_VERSION/manifest-$POOL_VERSION.txt.sig CURRENT="" if [ -f $POOL_VERSION_FILE ]; then CURRENT=$(cat $POOL_VERSION_FILE) @@ -312,7 +312,7 @@ if [ "$CURRENT" != "$POOL_VERSION" ]; then wget $POOL_UPGRADE_MANIFEST_URL wget $POOL_UPGRADE_MANIFEST_SIG_URL - gpg --verify manifest-*.txt.asc + gpg --verify manifest-*.txt.sig if [ $? == 0 ]; then # Install Pool tar -xzf pool-*.tar.gz diff --git a/rootfs/standard/usr/share/mynode/mynode_app_versions.sh b/rootfs/standard/usr/share/mynode/mynode_app_versions.sh index e9adcc02..4bc6bed0 100644 --- a/rootfs/standard/usr/share/mynode/mynode_app_versions.sh +++ b/rootfs/standard/usr/share/mynode/mynode_app_versions.sh @@ -12,7 +12,7 @@ LOOP_VERSION="v0.11.2-beta" LOOP_VERSION_FILE=/home/bitcoin/.mynode/loop_version LOOP_LATEST_VERSION_FILE=/home/bitcoin/.mynode/loop_version_latest -POOL_VERSION="v0.3.4-alpha" +POOL_VERSION="v0.4.1-alpha" POOL_VERSION_FILE=/home/bitcoin/.mynode/pool_version POOL_LATEST_VERSION_FILE=/home/bitcoin/.mynode/pool_version_latest diff --git a/rootfs/standard/var/www/mynode/lightning_info.py b/rootfs/standard/var/www/mynode/lightning_info.py index fb971f63..860531b2 100644 --- a/rootfs/standard/var/www/mynode/lightning_info.py +++ b/rootfs/standard/var/www/mynode/lightning_info.py @@ -13,7 +13,8 @@ from systemctl_info import * lightning_info = None lnd_ready = False lnd_version = None -loopd_version = None +loop_version = None +pool_version = None lightning_peers = None lightning_channels = None lightning_channel_balance = None @@ -273,11 +274,17 @@ def get_lnd_version(): lnd_version = subprocess.check_output("lnd --version | egrep -o '[0-9]+\\.[0-9]+\\.[0-9]+' | head -n 1", shell=True) return "v{}".format(lnd_version) -def get_loopd_version(): - global loopd_version - if loopd_version == None: - loopd_version = subprocess.check_output("loopd --version | egrep -o '[0-9]+\\.[0-9]+\\.[0-9]+' | head -n 1", shell=True) - return "v{}".format(loopd_version) +def get_loop_version(): + global loop_version + if loop_version == None: + loop_version = subprocess.check_output("loopd --version | egrep -o '[0-9]+\\.[0-9]+\\.[0-9]+' | head -n 1", shell=True) + return "v{}".format(loop_version) + +def get_pool_version(): + global pool_version + if pool_version == None: + pool_version = subprocess.check_output("poold --version | egrep -o '[0-9]+\\.[0-9]+\\.[0-9]+' | head -n 1", shell=True) + return "v{}".format(pool_version) def get_default_lnd_config(): try: diff --git a/rootfs/standard/var/www/mynode/lnd.py b/rootfs/standard/var/www/mynode/lnd.py index 8a4f91b5..13852b40 100644 --- a/rootfs/standard/var/www/mynode/lnd.py +++ b/rootfs/standard/var/www/mynode/lnd.py @@ -67,7 +67,8 @@ def page_lnd(): "wallet_exists": wallet_exists, "wallet_logged_in": wallet_logged_in, "version": get_lnd_version(), - "loopd_version": get_loopd_version(), + "loop_version": get_loop_version(), + "pool_version": get_pool_version(), "status": status, "ui_settings": read_ui_settings() } @@ -81,7 +82,8 @@ def page_lnd(): "alias": alias, "status": get_lnd_status(), "version": get_lnd_version(), - "loopd_version": get_loopd_version(), + "loop_version": get_loop_version(), + "pool_version": get_pool_version(), "ui_settings": read_ui_settings() } return render_template('lnd.html', **templateData) @@ -162,7 +164,8 @@ def page_lnd(): "wallet_exists": wallet_exists, "wallet_logged_in": wallet_logged_in, "version": get_lnd_version(), - "loopd_version": get_loopd_version(), + "loop_version": get_loop_version(), + "pool_version": get_pool_version(), "channel_backup_exists": channel_backup_exists, "status": status, "height": height, diff --git a/rootfs/standard/var/www/mynode/templates/lnd.html b/rootfs/standard/var/www/mynode/templates/lnd.html index 5012ff56..7c9181b7 100644 --- a/rootfs/standard/var/www/mynode/templates/lnd.html +++ b/rootfs/standard/var/www/mynode/templates/lnd.html @@ -137,7 +137,11 @@