Merge pull request #964 from guydavis/develop

Testing latest fixes.
guydavis · Jan 15, 2024 · 3f6976f · 3f6976f
2 parents df04b27 + 4cd6f65
commit 3f6976f
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 6 deletions.
diff --git a/.github/workflows/develop-chia.yaml b/.github/workflows/develop-chia.yaml
@@ -89,7 +89,7 @@ jobs:
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
-            "GIGAHORSE_BRANCH=v2.1.3.giga26"
+            "GIGAHORSE_BRANCH=v2.1.4.giga26"
             "CHIA_BRANCH=main"
             "PLOTMAN_BRANCH=compress"
           tags: |

diff --git a/.github/workflows/main-chia.yaml b/.github/workflows/main-chia.yaml
@@ -89,7 +89,7 @@ jobs:
           build-args: |
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=latest"
-            "GIGAHORSE_BRANCH=v2.1.3.giga26"
+            "GIGAHORSE_BRANCH=v2.1.4.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
@@ -46,7 +46,7 @@ jobs:
             "MACHINARIS_STREAM=latest"
             "CHIA_BRANCH=latest"
             "MMX_BRANCH=v0.10.6"
-            "GIGAHORSE_BRANCH=v2.1.3.giga26"
+            "GIGAHORSE_BRANCH=v2.1.4.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
@@ -89,7 +89,7 @@ jobs:
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=test"
             "CHIADOG_BRANCH=dev"
-            "GIGAHORSE_BRANCH=v2.1.3.giga26"
+            "GIGAHORSE_BRANCH=v2.1.4.giga26"
             "CHIA_BRANCH=main"
             "PLOTMAN_BRANCH=development"
           tags: |

diff --git 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.3.giga26"
+            "GIGAHORSE_BRANCH=v2.1.4.giga26"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:test
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:test
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 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]
+### Changed
+ - Harvester mode will now optionally also run chia-exporter for Prometheus results.
+### Updated
+ - [Chia](https://github.com/Chia-Network/chia-blockchain/releases/tag/2.1.5) to v2.1.5 - misc improvements, see their release notes.
+ - [Gigahorse](https://github.com/madMAx43v3r/chia-gigahorse/releases/tag/v2.1.4.giga26) to v2.1.4.giga26.
+
 ## [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.

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.1.4
+2.1.5
diff --git a/api/schedules/status_plotnfts.py b/api/schedules/status_plotnfts.py
@@ -24,6 +24,8 @@ def extract_wallet_num(plotnft):
     for line in plotnft.split('\n'):
         if line.strip().startswith("Wallet id"):
             return int(line[len('Wallet id '): len(line)-2])
+        if line.strip().startswith("Wallet ID:"):
+            return int(line[len('Wallet ID: '): len(line)])
     return None
 
 def extract_launcher_id(plotnft):

diff --git a/scripts/forks/chia_launch.sh b/scripts/forks/chia_launch.sh
@@ -136,6 +136,10 @@ elif [[ ${mode} =~ ^harvester.* ]]; then
     chia configure --set-farmer-peer ${farmer_address}:${farmer_port}  2>&1 >> /root/.chia/mainnet/log/init.log
     chia configure --enable-upnp false  2>&1 >> /root/.chia/mainnet/log/init.log
     chia start harvester -r
+    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."