Merge pull request #980 from guydavis/develop

Testing of latest Gigahorse version.

.github/workflows/develop-chia.yaml

@@ -89,7 +89,7 @@ jobs:
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
-            "GIGAHORSE_BRANCH=v2.1.4.giga26"
+            "GIGAHORSE_BRANCH=v2.1.4.giga32"
             "CHIA_BRANCH=main"
             "PLOTMAN_BRANCH=compress"
           tags: |

.github/workflows/main-chia.yaml

@@ -89,7 +89,7 @@ jobs:
           build-args: |
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=latest"
-            "GIGAHORSE_BRANCH=v2.1.4.giga26"
+            "GIGAHORSE_BRANCH=v2.1.4.giga32"
             "CHIA_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-gigahorse:latest

.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.4.giga26"
+            "GIGAHORSE_BRANCH=v2.1.4.giga32"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:latest
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:v${{ github.event.inputs.version }}

.github/workflows/test-chia.yaml

@@ -89,7 +89,7 @@ jobs:
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=test"
             "CHIADOG_BRANCH=dev"
-            "GIGAHORSE_BRANCH=v2.1.4.giga26"
+            "GIGAHORSE_BRANCH=v2.1.4.giga32"
             "CHIA_BRANCH=main"
             "PLOTMAN_BRANCH=development"
           tags: |

.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.4.giga26"
+            "GIGAHORSE_BRANCH=v2.1.4.giga32"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:test
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:test

CHANGELOG.md

@@ -2,6 +2,15 @@
 
 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
+ - Gigahorse: 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
+### Updated
+ - [Gigahorse](https://github.com/madMAx43v3r/chia-gigahorse/releases/tag/v2.1.4.giga32) to v2.1.4.giga32.
+### Notes
+ - Support for new blockchains and tools DOES NOT imply my endorsement for them.  *Only run those you are comfortable with.*
+
 ## [2.2.1] - 2024-03-06
 ### Updated
  - [Chia](https://github.com/Chia-Network/chia-blockchain/releases/tag/2.2.1) to v2.2.1 - possible fixes for serious problems in v2.2.0?
@@ -25,15 +34,15 @@ All notable changes to this project will be documented in this file. The format
 
 ## [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.
+ - Chia: 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.
+ - [Gigahorse](https://github.com/madMAx43v3r/chia-gigahorse/releases/tag/v2.1.3.giga31) to v2.1.3.giga31.
 
 ## [2.1.3] - 2023-12-19
 ### Updated

VERSION

@@ -1 +1 @@
-2.2.1
+2.2.2

scripts/forks/gigahorse_launch.sh

@@ -101,6 +101,10 @@ if [[ ${mode} =~ ^fullnode.* ]]; then
     echo "Starting Gigahorse recompute_server shortly..."
     sleep 20 && /chia-gigahorse-farmer/chia_recompute_server 2>&1 > /root/.chia/mainnet/log/recompute.log &
   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
 elif [[ ${mode} =~ ^farmer.* ]]; then
   /chia-gigahorse-farmer/chia.bin start farmer-only
 elif [[ ${mode} =~ ^harvester.* ]]; then
@@ -133,6 +137,10 @@ elif [[ ${mode} =~ ^harvester.* ]]; then
       echo "Starting Gigahorse recompute_server shortly..."
       sleep 20 && /chia-gigahorse-farmer/chia_recompute_server 2>&1 > /root/.chia/mainnet/log/recompute.log &
     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
   fi
 elif [[ ${mode} == 'plotter' ]]; then
     echo "Starting in Plotter-only mode.  Run Plotman from either CLI or WebUI."

scripts/madmax_setup.sh

@@ -31,7 +31,6 @@ if [[ (${mode} =~ ^fullnode.*  || ${mode} =~ "plotter") && (${blockchains} == 'c
     fi
 fi
 
-
 # MMX Plotter binaries, https://github.com/madMAx43v3r/chia-gigahorse
 # MMX and Gigahorse container gets the "new" Madmax plotters with compression, only available as binaries
 if [[ (${mode} =~ ^fullnode.*  || ${mode} =~ "plotter") && (${blockchains} == 'mmx' || ${blockchains} == 'gigahorse') ]]; then
@@ -47,14 +46,16 @@ if [[ (${mode} =~ ^fullnode.*  || ${mode} =~ "plotter") && (${blockchains} == 'm
             curl -sLJO https://github.com/madMAx43v3r/chia-gigahorse/raw/${GIGAHORSE_BRANCH}/cuda-plotter/linux/x86_64/cuda_plot_k30
             curl -sLJO https://github.com/madMAx43v3r/chia-gigahorse/raw/${GIGAHORSE_BRANCH}/cuda-plotter/linux/x86_64/cuda_plot_k31
             curl -sLJO https://github.com/madMAx43v3r/chia-gigahorse/raw/${GIGAHORSE_BRANCH}/cuda-plotter/linux/x86_64/cuda_plot_k32
+            curl -sLJO https://github.com/madMAx43v3r/chia-gigahorse/raw/${GIGAHORSE_BRANCH}/cuda-plotter/linux/x86_64/cuda_plot_k32_v3
             curl -sLJO https://github.com/madMAx43v3r/chia-gigahorse/raw/${GIGAHORSE_BRANCH}/cuda-plotter/linux/x86_64/cuda_plot_k33
             chmod 755 cuda_plot*
             curl -sLJO https://github.com/madMAx43v3r/chia-gigahorse/raw/${GIGAHORSE_BRANCH}/chiapos/linux/x86_64/ProofOfSpace
             chmod 755 ProofOfSpace
             popd
             echo "Completed download of Madmax binaries for plotting:"
             echo "chia_plot @ "`chia_plot --version`
-            echo "cuda_plot @ "`cuda_plot_k32 --version`
+            echo "cuda_plot_k32 @ "`cuda_plot_k32 --version`
+            echo "cuda_plot_k32_v3 @ "`cuda_plot_k32_v3 --version`
         else
             echo "Downloading MMX chia_plot and cuda_plot skipped -> unsupported architecture: ${arch_name}"
         fi