diff --git a/CHANGELOG.md b/CHANGELOG.md index b9c2eefd..1e92bcb4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,12 +2,14 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## Unreleased +## [2.1.4] - 2024-01-11 ### Added - Optionally launch `chia-exporter` [metrics endpoint](https://github.com/Chia-Network/chia-exporter) for Prometheus reporting if env var `chia_exporter=true` is set. - Support for running Gigahorse containers on arm64 architectures such as Raspberry Pi. + - Main dashboard page can now be pinned (Pin Icon) to display only a blockchain of interest, rather than rotating through each in turn. ### Changed - Optionally launch of Gigahorse recompute server when in harvester mode if env var `gigahorse_recompute_server=true` is set. + - Fix for Bladebit GPU plotting jobs taking a minute to display on Plotting page on job start. Should now be seconds only. ### Updated - [Chia](https://github.com/Chia-Network/chia-blockchain/releases/tag/2.1.4) to v2.1.4 - misc improvements, see their release notes. - [Gigahorse](https://github.com/madMAx43v3r/chia-gigahorse/releases/tag/v2.1.3.giga26) to v2.1.3.giga26. diff --git a/api/models/plotman.py b/api/models/plotman.py index 2a80507b..a94462c6 100644 --- a/api/models/plotman.py +++ b/api/models/plotman.py @@ -19,8 +19,11 @@ def __init__(self, cli_stdout, plotman_pid): self.columns[8] = 'size' else: # Check for a plotting job row values = line.split() - if len(values) > 1 and values[1] in ['chia', 'madmax', 'bladebit']: - if len(values) == len(self.columns): + if len(values) > 1: + if len(values) == (len(self.columns) - 1) and values[0] in ['chia', 'madmax', 'bladebit']: + # Sometimes plotman can't find the plot_id on newly started plotting jobs, use a placeholder + values.insert(0, 'xxxxxx') + if len(values) == len(self.columns) and values[1] in ['chia', 'madmax', 'bladebit']: row = {} i = 0 for i in range(len(self.columns)): diff --git a/scripts/forks/chia_install.sh b/scripts/forks/chia_install.sh index 3f461a94..4dfb3d17 100644 --- a/scripts/forks/chia_install.sh +++ b/scripts/forks/chia_install.sh @@ -27,10 +27,10 @@ else echo "Installing Chia CUDA binaries on ${arch_name}..." cd /tmp if [[ "${arch_name}" == "x86_64" ]]; then - curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.1.4-rc1/chia-blockchain-cli_2.1.4rc1-1_amd64.deb + curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.1.4/chia-blockchain-cli_2.1.4-1_amd64.deb apt-get install ./chia-blockchain-cli*.deb else - curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.1.4-rc1/chia-blockchain-cli_2.1.4rc1-1_arm64.deb + curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.1.4/chia-blockchain-cli_2.1.4-1_arm64.deb apt-get install ./chia-blockchain-cli*.deb fi diff --git a/web/routes.py b/web/routes.py index 01ad019d..92f9de9a 100644 --- a/web/routes.py +++ b/web/routes.py @@ -75,14 +75,21 @@ def index(): workers = worker.load_worker_summary() farm_summary = chia.load_farm_summary() plotting = plotman.load_plotting_summary_by_blockchains(farm_summary.farms.keys()) - selected_blockchain = farm_summary.selected_blockchain() + if request.args.get('selected_blockchain'): + # Check if user has pinned the view to a particular blockchain view on refresh, no rotate + selected_blockchain = request.args.get('selected_blockchain') + carousel_ride_enabled = False # Disable automatic carousel rotation on load + else: # Default is to rotate every 10 seconds + selected_blockchain = farm_summary.selected_blockchain() + carousel_ride_enabled = True # Enable automatic carousel rotation on load chia.challenges_chart_data(farm_summary) p.partials_chart_data(farm_summary) stats.load_daily_diff(farm_summary) stats.wallet_chart_data(farm_summary) warnings.check_warnings(request.args) return render_template('index.html', reload_seconds=120, farms=farm_summary.farms, \ - plotting=plotting, workers=workers, global_config=gc, selected_blockchain=selected_blockchain) + plotting=plotting, workers=workers, global_config=gc, \ + carousel_ride_enabled=carousel_ride_enabled, selected_blockchain=selected_blockchain) @app.route('/chart') def chart(): diff --git a/web/templates/index.html b/web/templates/index.html index c90aef30..b509744b 100644 --- a/web/templates/index.html +++ b/web/templates/index.html @@ -18,7 +18,7 @@ {% endwith %} -