From 9fb9c8bf5761f031f19fc1fd09402504b85cb0e9 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Tue, 19 Dec 2023 16:16:20 -0700 Subject: [PATCH 1/9] Better support for integrations. --- CHANGELOG.md | 8 ++++++++ VERSION | 2 +- docker/dockerfile | 1 + scripts/forks/chia_install.sh | 8 +++++++- scripts/forks/chia_launch.sh | 4 ++++ scripts/forks/gigahorse_launch.sh | 4 ++++ 6 files changed, 25 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3921f8a7..b9ef0b3b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +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 +### 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. +### Changed + - Optionally launch of Gigahorse recompute server when in harvester mode if env var `gigahorse_recompute_server=true` is set. +### Updated + - TBD + ## [2.1.3] - 2023-12-19 ### Updated - [Chia](https://github.com/Chia-Network/chia-blockchain/releases/tag/2.1.3) to v2.1.3 - fix for unforunate bug CNI released in 2.1.2 diff --git a/VERSION b/VERSION index abae0d9a..c346e7a0 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.1.3 \ No newline at end of file +2.1.4 \ No newline at end of file diff --git a/docker/dockerfile b/docker/dockerfile index 78b2182e..d62c888e 100644 --- a/docker/dockerfile +++ b/docker/dockerfile @@ -101,6 +101,7 @@ ENV keys="/root/.chia/mnemonic.txt" ENV plots_dir="/plots" # One of fullnode, farmer, harvester, plotter, farmer+plotter, harvester+plotter. Default is fullnode ENV mode="fullnode" +ENV chia_exporter="false" ENV chives_masternode="false" ENV gigahorse_recompute_server="false" # The single blockchain to run: chia, flax, nchain, hddcoin, chives, etc diff --git a/scripts/forks/chia_install.sh b/scripts/forks/chia_install.sh index 19500998..32b8561d 100644 --- a/scripts/forks/chia_install.sh +++ b/scripts/forks/chia_install.sh @@ -10,7 +10,7 @@ if [ -z ${CHIA_BRANCH} ]; then else cd /tmp rm -rf /root/.cache - apt-get update && apt-get install -y dialog apt-utils + apt-get update && apt-get install -y dialog apt-utils ca-certificates curl gnupg /usr/bin/bash /machinaris/scripts/gpu_drivers_install.sh git clone --branch ${CHIA_BRANCH} --recurse-submodules=mozilla-ca https://github.com/Chia-Network/chia-blockchain.git /chia-blockchain @@ -33,4 +33,10 @@ else curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.1.3/chia-blockchain-cli_2.1.3-1_arm64.deb apt-get install ./chia-blockchain-cli*.deb fi + + # Also include "chia-exporter" for Prometheus reporting endpoints. + curl -sL https://repo.chia.net/FD39E6D3.pubkey.asc | sudo gpg --dearmor -o /usr/share/keyrings/chia.gpg + echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/chia.gpg] https://repo.chia.net/chia-exporter/debian/ stable main" | tee /etc/apt/sources.list.d/chia-exporter.list > /dev/null + apt-get update + apt-get install -y chia-exporter fi diff --git a/scripts/forks/chia_launch.sh b/scripts/forks/chia_launch.sh index d8962bb6..bfa1371a 100644 --- a/scripts/forks/chia_launch.sh +++ b/scripts/forks/chia_launch.sh @@ -95,6 +95,10 @@ if [[ ${mode} =~ ^fullnode.* ]]; then else chia start farmer fi + if [[ ${chia_exporter} == "true" ]]; then + echo "Starting Chia Exporter service for Prometheus reporting..." + sleep 20 && /usr/local/bin/chia-exporter serve 2>&1 > /root/.chia/mainnet/log/chia-exporter.log & + fi if [[ ${mode} =~ .*timelord$ ]]; then if [ ! -f vdf_bench ]; then echo "Building timelord binaries..." diff --git a/scripts/forks/gigahorse_launch.sh b/scripts/forks/gigahorse_launch.sh index 8f5766f0..8a2c78d1 100644 --- a/scripts/forks/gigahorse_launch.sh +++ b/scripts/forks/gigahorse_launch.sh @@ -129,6 +129,10 @@ elif [[ ${mode} =~ ^harvester.* ]]; then /chia-gigahorse-farmer/chia.bin configure --set-farmer-peer ${farmer_address}:${farmer_port} 2>&1 >> /root/.chia/mainnet/log/init.log /chia-gigahorse-farmer/chia.bin configure --enable-upnp false 2>&1 >> /root/.chia/mainnet/log/init.log /chia-gigahorse-farmer/chia.bin start harvester -r + if [[ ${gigahorse_recompute_server} == "true" ]]; then + echo "Starting Gigahorse recompute_server shortly..." + sleep 20 && /chia-gigahorse-farmer/chia_recompute_server 2>&1 > /root/.chia/mainnet/log/recompute.log & + fi fi elif [[ ${mode} == 'plotter' ]]; then echo "Starting in Plotter-only mode. Run Plotman from either CLI or WebUI." From 9513bc3e1c8b9fd63286276b0fcb7aadbc86b374 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Sat, 23 Dec 2023 13:32:17 -0700 Subject: [PATCH 2/9] Chia @ 2.1.4rc1 and Gigahorse at 2.1.3giga26 with arm64 support. --- .github/workflows/develop-chia.yaml | 4 ++-- .github/workflows/main-chia.yaml | 4 ++-- .github/workflows/main-mmx.yaml | 2 +- .github/workflows/test-chia.yaml | 4 ++-- .github/workflows/test-mmx.yaml | 2 +- CHANGELOG.md | 4 +++- scripts/forks/chia_install.sh | 4 ++-- scripts/forks/gigahorse_install.sh | 6 +++++- 8 files changed, 18 insertions(+), 12 deletions(-) diff --git a/.github/workflows/develop-chia.yaml b/.github/workflows/develop-chia.yaml index fa5e3e89..30110c0d 100644 --- a/.github/workflows/develop-chia.yaml +++ b/.github/workflows/develop-chia.yaml @@ -82,14 +82,14 @@ jobs: with: file: docker/dockerfile context: . - platforms: linux/amd64 + platforms: linux/amd64,linux/arm64 provenance: false push: true build-args: | "UBUNTU_VER=jammy" "MACHINARIS_STREAM=develop" "CHIADOG_BRANCH=dev" - "GIGAHORSE_BRANCH=v2.1.1.giga25" + "GIGAHORSE_BRANCH=v2.1.3.giga26" "CHIA_BRANCH=main" "PLOTMAN_BRANCH=compress" tags: | diff --git a/.github/workflows/main-chia.yaml b/.github/workflows/main-chia.yaml index add10785..4ad46407 100644 --- a/.github/workflows/main-chia.yaml +++ b/.github/workflows/main-chia.yaml @@ -83,13 +83,13 @@ jobs: with: file: docker/dockerfile context: . - platforms: linux/amd64 + platforms: linux/amd64,linux/arm64 provenance: false push: true build-args: | "UBUNTU_VER=jammy" "MACHINARIS_STREAM=latest" - "GIGAHORSE_BRANCH=v2.1.1.giga25" + "GIGAHORSE_BRANCH=v2.1.3.giga26" "CHIA_BRANCH=main" tags: | ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-gigahorse:latest diff --git a/.github/workflows/main-mmx.yaml b/.github/workflows/main-mmx.yaml index 4061f167..2e08fdb2 100644 --- a/.github/workflows/main-mmx.yaml +++ b/.github/workflows/main-mmx.yaml @@ -46,7 +46,7 @@ jobs: "MACHINARIS_STREAM=latest" "CHIA_BRANCH=latest" "MMX_BRANCH=v0.10.6" - "GIGAHORSE_BRANCH=v2.1.1.giga25" + "GIGAHORSE_BRANCH=v2.1.3.giga26" tags: | ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:latest ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:v${{ github.event.inputs.version }} diff --git a/.github/workflows/test-chia.yaml b/.github/workflows/test-chia.yaml index 865f6c23..e27aee5d 100644 --- a/.github/workflows/test-chia.yaml +++ b/.github/workflows/test-chia.yaml @@ -82,14 +82,14 @@ jobs: with: file: docker/dockerfile context: . - platforms: linux/amd64 + platforms: linux/amd64,linux/arm64 provenance: false push: true build-args: | "UBUNTU_VER=jammy" "MACHINARIS_STREAM=test" "CHIADOG_BRANCH=dev" - "GIGAHORSE_BRANCH=v2.1.1.giga25" + "GIGAHORSE_BRANCH=v2.1.3.giga26" "CHIA_BRANCH=main" "PLOTMAN_BRANCH=development" tags: | diff --git a/.github/workflows/test-mmx.yaml b/.github/workflows/test-mmx.yaml index 7d9611fb..e5bd7257 100644 --- a/.github/workflows/test-mmx.yaml +++ b/.github/workflows/test-mmx.yaml @@ -46,7 +46,7 @@ jobs: "CHIA_BRANCH=latest" "PLOTMAN_BRANCH=development" "MMX_BRANCH=v0.10.6" - "GIGAHORSE_BRANCH=v2.1.1.giga25" + "GIGAHORSE_BRANCH=v2.1.3.giga26" tags: | ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:test ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:test diff --git a/CHANGELOG.md b/CHANGELOG.md index b9ef0b3b..b9c2eefd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,10 +5,12 @@ All notable changes to this project will be documented in this file. The format ## Unreleased ### 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. ### Changed - Optionally launch of Gigahorse recompute server when in harvester mode if env var `gigahorse_recompute_server=true` is set. ### Updated - - TBD + - [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. ## [2.1.3] - 2023-12-19 ### Updated diff --git a/scripts/forks/chia_install.sh b/scripts/forks/chia_install.sh index 32b8561d..1c5bb423 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.3/chia-blockchain-cli_2.1.3-1_amd64.deb + curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.1.4-rc1/chia-blockchain-cli_2.1.4rc1-1_amd64.deb apt-get install ./chia-blockchain-cli*.deb else - curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.1.3/chia-blockchain-cli_2.1.3-1_arm64.deb + curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.1.4-rc1/chia-blockchain-cli_2.1.4rc1-1_arm64.deb apt-get install ./chia-blockchain-cli*.deb fi diff --git a/scripts/forks/gigahorse_install.sh b/scripts/forks/gigahorse_install.sh index 824ab6d1..54c2ec32 100644 --- a/scripts/forks/gigahorse_install.sh +++ b/scripts/forks/gigahorse_install.sh @@ -15,7 +15,11 @@ else /usr/bin/bash /machinaris/scripts/gpu_drivers_install.sh arch_name="$(uname -m)" - url="https://github.com/madMAx43v3r/chia-gigahorse/releases/download/${GIGAHORSE_BRANCH}/chia-gigahorse-farmer-${GIGAHORSE_VERSION}-${arch_name}.tar.gz" + if [[ "${arch_name}" = "x86_64" ]]; then + url="https://github.com/madMAx43v3r/chia-gigahorse/releases/download/${GIGAHORSE_BRANCH}/chia-gigahorse-farmer-${GIGAHORSE_VERSION}-x86-64.tar.gz" + else + url="https://github.com/madMAx43v3r/chia-gigahorse/releases/download/${GIGAHORSE_BRANCH}/chia-gigahorse-farmer-${GIGAHORSE_VERSION}-aarch64.tar.gz" + fi echo "Pulling Madmax closed-source Chia farming binary from..." echo ${url} cd / && curl --retry 5 --retry-max-time 120 -skJLO ${url} From 80b07b6a27ce85c35baf63dbe1fcb87a94890e53 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Sat, 23 Dec 2023 13:40:19 -0700 Subject: [PATCH 3/9] Underscore, not hyphen. --- scripts/forks/gigahorse_install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/forks/gigahorse_install.sh b/scripts/forks/gigahorse_install.sh index 54c2ec32..36b1674e 100644 --- a/scripts/forks/gigahorse_install.sh +++ b/scripts/forks/gigahorse_install.sh @@ -16,7 +16,7 @@ else arch_name="$(uname -m)" if [[ "${arch_name}" = "x86_64" ]]; then - url="https://github.com/madMAx43v3r/chia-gigahorse/releases/download/${GIGAHORSE_BRANCH}/chia-gigahorse-farmer-${GIGAHORSE_VERSION}-x86-64.tar.gz" + url="https://github.com/madMAx43v3r/chia-gigahorse/releases/download/${GIGAHORSE_BRANCH}/chia-gigahorse-farmer-${GIGAHORSE_VERSION}-x86_64.tar.gz" else url="https://github.com/madMAx43v3r/chia-gigahorse/releases/download/${GIGAHORSE_BRANCH}/chia-gigahorse-farmer-${GIGAHORSE_VERSION}-aarch64.tar.gz" fi From 55a6ee7b07aff236ae44106ed2a58d249813e780 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Tue, 26 Dec 2023 07:22:11 -0700 Subject: [PATCH 4/9] Disable arm64 for development stream again. Will try in test stream. --- .github/workflows/develop-chia.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/develop-chia.yaml b/.github/workflows/develop-chia.yaml index 30110c0d..3ea2be6f 100644 --- a/.github/workflows/develop-chia.yaml +++ b/.github/workflows/develop-chia.yaml @@ -82,7 +82,7 @@ jobs: with: file: docker/dockerfile context: . - platforms: linux/amd64,linux/arm64 + platforms: linux/amd64 provenance: false push: true build-args: | From a14cdcb17021cd5d568c4dcc61fc32c0bc26eea4 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Tue, 26 Dec 2023 07:40:08 -0700 Subject: [PATCH 5/9] Try double equals sign. --- scripts/bladebit_setup.sh | 2 +- scripts/forks/chia_install.sh | 2 +- scripts/forks/gigahorse_install.sh | 2 +- scripts/forks/staicoin_install.sh | 2 +- scripts/madmax_setup.sh | 2 +- scripts/megacmd_setup.sh | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/bladebit_setup.sh b/scripts/bladebit_setup.sh index 8eac9d68..4c799352 100644 --- a/scripts/bladebit_setup.sh +++ b/scripts/bladebit_setup.sh @@ -15,7 +15,7 @@ if [[ (${mode} =~ ^fullnode.* || ${mode} =~ "plotter") && (${blockchains} == 'c # Now install CNI's separate binary for actual GPU plotting... cd /opt/chia/bladebit rm -f ./bladebit # Remove stale version bundled in the DEB package. - if [[ "${arch_name}" = "x86_64" ]]; then + if [[ "${arch_name}" == "x86_64" ]]; then curl -sLJO https://github.com/Chia-Network/bladebit/releases/download/v3.1.0/bladebit-v3.1.0-ubuntu-x86-64.tar.gz curl -sLJO https://github.com/Chia-Network/bladebit/releases/download/v3.1.0/bladebit-cuda-v3.1.0-ubuntu-x86-64.tar.gz else diff --git a/scripts/forks/chia_install.sh b/scripts/forks/chia_install.sh index 1c5bb423..3f461a94 100644 --- a/scripts/forks/chia_install.sh +++ b/scripts/forks/chia_install.sh @@ -26,7 +26,7 @@ else ubuntu_ver=`lsb_release -r -s` echo "Installing Chia CUDA binaries on ${arch_name}..." cd /tmp - if [[ "${arch_name}" = "x86_64" ]]; then + 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 apt-get install ./chia-blockchain-cli*.deb else diff --git a/scripts/forks/gigahorse_install.sh b/scripts/forks/gigahorse_install.sh index 36b1674e..e0ed197c 100644 --- a/scripts/forks/gigahorse_install.sh +++ b/scripts/forks/gigahorse_install.sh @@ -15,7 +15,7 @@ else /usr/bin/bash /machinaris/scripts/gpu_drivers_install.sh arch_name="$(uname -m)" - if [[ "${arch_name}" = "x86_64" ]]; then + if [[ "${arch_name}" == "x86_64" ]]; then url="https://github.com/madMAx43v3r/chia-gigahorse/releases/download/${GIGAHORSE_BRANCH}/chia-gigahorse-farmer-${GIGAHORSE_VERSION}-x86_64.tar.gz" else url="https://github.com/madMAx43v3r/chia-gigahorse/releases/download/${GIGAHORSE_BRANCH}/chia-gigahorse-farmer-${GIGAHORSE_VERSION}-aarch64.tar.gz" diff --git a/scripts/forks/staicoin_install.sh b/scripts/forks/staicoin_install.sh index c52488cd..1b09f8e8 100644 --- a/scripts/forks/staicoin_install.sh +++ b/scripts/forks/staicoin_install.sh @@ -28,7 +28,7 @@ else /usr/bin/sh ./install.sh arch_name="$(uname -m)" - if [[ "${arch_name}" = "x86_64" ]]; then + if [[ "${arch_name}" == "x86_64" ]]; then sh /machinaris/scripts/timelord_setup.sh fi diff --git a/scripts/madmax_setup.sh b/scripts/madmax_setup.sh index c1c74750..a8d5300c 100644 --- a/scripts/madmax_setup.sh +++ b/scripts/madmax_setup.sh @@ -37,7 +37,7 @@ fi if [[ (${mode} =~ ^fullnode.* || ${mode} =~ "plotter") && (${blockchains} == 'mmx' || ${blockchains} == 'gigahorse') ]]; then if [ ! -f /usr/bin/chia_plot ] && [[ "${madmax_skip_build}" != 'true' ]]; then arch_name="$(uname -m)" - if [[ "${arch_name}" = "x86_64" ]]; then + if [[ "${arch_name}" == "x86_64" ]]; then pushd /usr/bin curl -sLJO https://github.com/madMAx43v3r/chia-gigahorse/raw/${GIGAHORSE_BRANCH}/cpu-plotter/linux/x86_64/chia_plot curl -sLJO https://github.com/madMAx43v3r/chia-gigahorse/raw/${GIGAHORSE_BRANCH}/cpu-plotter/linux/x86_64/chia_plot_k34 diff --git a/scripts/megacmd_setup.sh b/scripts/megacmd_setup.sh index 27ed663b..86284ac6 100644 --- a/scripts/megacmd_setup.sh +++ b/scripts/megacmd_setup.sh @@ -9,7 +9,7 @@ if [[ ${mode} =~ ^fullnode.* ]] && [[ "${blockchain_db_download}" == 'true' ]] & arch_name="$(uname -m)" ubuntu_ver=`lsb_release -r -s` echo "Installing megacmd on ${arch_name}..." - if [[ "${arch_name}" = "x86_64" ]]; then + if [[ "${arch_name}" == "x86_64" ]]; then apt update apt install -y libc-ares2 libavcodec58 libavformat58 libavutil56 libswscale5 libmediainfo0v5 libzen0v5 libcrypto++8 libfreeimage3 libpcrecpp0v5 cd /tmp && curl -O https://mega.nz/linux/repo/xUbuntu_${ubuntu_ver}/amd64/megacmd_1.6.0-6.1_amd64.deb From 5377e38fd54b2012a3da4d94d6b8fb09f22227f0 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Thu, 4 Jan 2024 10:44:59 -0700 Subject: [PATCH 6/9] Handle initial missing plot_id from plotman. Self-corrects within a few seconds. --- CHANGELOG.md | 1 + api/models/plotman.py | 7 +++++-- scripts/forks/chia_install.sh | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b9c2eefd..9740d609 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ All notable changes to this project will be documented in this file. The format - Support for running Gigahorse containers on arm64 architectures such as Raspberry Pi. ### 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..2df5df53 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-rc2/chia-blockchain-cli_2.1.4rc2-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-rc2/chia-blockchain-cli_2.1.4rc2-1_arm64.deb apt-get install ./chia-blockchain-cli*.deb fi From bbcc16f2f32e97325f031df64264ba2d577a2f44 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Sun, 7 Jan 2024 11:13:36 -0700 Subject: [PATCH 7/9] Increase default fee for pool operations as Chia blockchain is getting more expensive to use. --- web/templates/settings/pools.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/templates/settings/pools.html b/web/templates/settings/pools.html index 48f711cd..eecc0120 100644 --- a/web/templates/settings/pools.html +++ b/web/templates/settings/pools.html @@ -37,7 +37,7 @@
- +
From ed4ebcb3e5d63eaa5803cb13a1b86f8cb4ad5d41 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Wed, 10 Jan 2024 16:59:23 -0700 Subject: [PATCH 8/9] Pin a blockchain of interest on main page. --- CHANGELOG.md | 1 + scripts/forks/chia_install.sh | 4 ++-- web/routes.py | 11 +++++++++-- web/templates/index.html | 9 ++++++--- 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9740d609..d1ddb0ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ All notable changes to this project will be documented in this file. The format ### 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. diff --git a/scripts/forks/chia_install.sh b/scripts/forks/chia_install.sh index 2df5df53..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-rc2/chia-blockchain-cli_2.1.4rc2-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-rc2/chia-blockchain-cli_2.1.4rc2-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 %} -