Merge pull request #945 from guydavis/develop

Latest updates for wider testing.
guydavis · Nov 27, 2023 · 4fc4f38 · 4fc4f38
2 parents 436ee8e + 0652cba
commit 4fc4f38
Show file tree

Hide file tree

Showing 24 changed files with 1,400 additions and 1,238 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.1.giga22"
+            "GIGAHORSE_BRANCH=v2.1.1.giga25"
             "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.1.giga22"
+            "GIGAHORSE_BRANCH=v2.1.1.giga25"
             "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.1.giga22"
+            "GIGAHORSE_BRANCH=v2.1.1.giga25"
           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.1.giga22"
+            "GIGAHORSE_BRANCH=v2.1.1.giga25"
             "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.1.giga22"
+            "GIGAHORSE_BRANCH=v2.1.1.giga25"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:test
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:test
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,16 +5,23 @@ All notable changes to this project will be documented in this file. The format
 ## [Unreleased] - 2023-?-?
 ### Added 
  - Settings | Plotting | Bladebit now supports "no_direct_io: true" option
+ - Settings | Plotting | Bladebit now supports "check_plots: 100" option to check at end of plot creation
+ - Settings | Plotting | Bladebit now supports "check_threshold: 0.6" option to delete invalid plots at end of plot creation
 ### Changed
  - Support for [Gigahorse Recompute Server](https://github.com/guydavis/machinaris/wiki/Gigahorse#recompute-server) (single GPU on fullnode/farmer), shared by multiple Gigahorse harvesters.
 ### Updated
  - [Chia](https://github.com/Chia-Network/chia-blockchain/releases/tag/2.1.1) to v2.1.1 - misc improvements, see their release notes.
- - [Gigahorse](https://github.com/madMAx43v3r/chia-gigahorse/releases/tag/v2.1.1.giga22) to v2.1.1.giga22 with C20 compression support.
+ - [Gigahorse](https://github.com/madMAx43v3r/chia-gigahorse/releases/tag/v2.1.1.giga25) to v2.1.1.giga25 with C20 compression support.
+ - [Flask](https://flask.palletsprojects.com/en/3.0.x/changes/#version-3-0-0) to v3.0.0 - serves up the Machinaris WebUI.
+### Notes
+ - Regression in Chia binaries (since v2.0.0) ignoring the "-y" parameter on plotnft changes, has broken pool join/leave thru WebUI.
 
 ## [2.1.0] - 2023-10-06
 ### Updated
  - [Bladebit](https://github.com/Chia-Network/bladebit/releases/tag/v3.1.0) to v3.1.0 - Supporting hybrid GPU/disk plotting with either 128 GB or 16 GB RAM.
  - [Chia](https://github.com/Chia-Network/chia-blockchain/releases/tag/2.1.0) to v2.1.0 - misc improvements, see their release notes.
+### Notes
+ - Regression in Chia binaries (since v2.0.0) ignoring the "-y" parameter on plotnft changes, has broken pool join/leave thru WebUI.
 
 ## [2.0.0] - 2023-08-24
 ### Added
@@ -30,6 +37,8 @@ All notable changes to this project will be documented in this file. The format
  - [HDDCoin](https://github.com/HDDcoin-Network/hddcoin-blockchain/releases/tag/3.0.0) to 3.0.0 based on Chia 1.8.2.
  - [MMX](https://github.com/madMAx43v3r/mmx-node/releases/tag/v0.10.6) to v0.10.6. 
  - [Wheat](https://github.com/wheatnetwork/wheat-blockchain/releases/tag/1.8.2) to v1.8.2.
+### Notes
+ - Regression in Chia binaries ignoring the "-y" parameter on plotnft changes, has broken pool join/leave thru WebUI.
 
 ## [1.8.2] - 2023-06-28
 ## Updated

diff --git a/api/schedules/status_worker.py b/api/schedules/status_worker.py
@@ -63,10 +63,13 @@ def gather_services_status():
     # Assumes a single blockchain is enabled in this container
     blockchain = globals.enabled_blockchains()[0]
     if gc['farming_enabled'] or gc['harvesting_enabled']:
-        if blockchain == 'mmx':
-            farming_status = mmx_cli.load_farm_info(blockchain).status
-        else:
-            farming_status = chia_cli.load_farm_summary(blockchain).status
+        try: # Deal with Gigahorse users plotting with farming manually disabled due to GPU contention
+            if blockchain == 'mmx':
+                farming_status = mmx_cli.load_farm_info(blockchain).status
+            else:
+                farming_status = chia_cli.load_farm_summary(blockchain).status
+        except Exception as ex:
+            app.logger.error("Skipping farm status for worker due to: {0}".format(str(ex)))
         if chiadog_cli.get_chiadog_pid(blockchain):
             monitoring_status = "running"
         else:

diff --git a/api/translations/de_DE/LC_MESSAGES/messages.po b/api/translations/de_DE/LC_MESSAGES/messages.po
@@ -7,35 +7,36 @@ msgstr ""
 "Project-Id-Version: Machinaris VERSION\n"
 "Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris"
 "/issuesCreation-Date: 2022-02-16 15:00-0700\n"
-"POT-Creation-Date: 2023-04-23 17:03-0600\n"
+"POT-Creation-Date: 2023-11-05 07:23-0700\n"
 "PO-Revision-Date: 2022-02-15 14:29-0700\n"
-"Last-Translator: ApfelBirneKreis\n"
+"Last-Translator: slowfinger\n"
 "Language: de\n"
 "Language-Team: de <LL@li.org>\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.12.1\n"
+"Generated-By: Babel 2.13.1\n"
 
 #: commands/chia_cli.py:79
 msgid "Updated config.yaml failed validation!"
-msgstr "Geupdatete config.yaml hat die Validation nicht bestanden"
+msgstr "Geupdatete config.yaml hat die Validierung nicht bestanden!"
 
 #: commands/pools_cli.py:76
 msgid "No requested pool modifications were sent. Current settings are unchanged."
 msgstr ""
-"Keine Pool modifikationen wurden gesendet. Vorherige Einstellungen wurden"
-" beibehalten"
+"Keine Pool Modifikationen wurden gesendet. Vorherige Einstellungen wurden"
+" beibehalten."
 
 #: commands/pools_cli.py:166
 msgid ""
 "Successfully left pool, switching to self-pooling. Please wait a few "
 "minutes or more to complete. DO NOT immediately re-submit your request. "
 "View the log for details."
 msgstr ""
-"Pool erfolgreich verlassen. Es wird zu self-pooling gewechselt.Bitte "
-"warte ein paar minuten und sende die Anfrage NICHT sofort nochmal."
+"Pool erfolgreich verlassen. Es wird zu self-pooling gewechselt. Bitte "
+"warte ein paar Minuten und sende die Anfrage NICHT sofort nochmal. Mehr "
+"Details findest du in den Logs."
 
 #: commands/pools_cli.py:212
 #, python-format
@@ -44,17 +45,19 @@ msgid ""
 " to complete. DO NOT immediately re-submit your request. Be patient! View"
 " the log for details."
 msgstr ""
-"Pool %(pool_url)s erfolgreich beigetreten und PlotNFT erstelltBitte warte"
-" ein paar minuten und sende die Anfrage NICHT sofort nochmal."
+"Pool %(pool_url)s erfolgreich beigetreten und PlotNFT erstellt. Bitte "
+"warte ein paar Minuten und sende die Anfrage NICHT sofort nochmal. Mehr "
+"Details findest du in den Logs."
 
 #: commands/pools_cli.py:243
 msgid ""
 "Successfully created a NFT for self-pooling.  Please wait a few minutes "
 "or more to complete. DO NOT immediately re-submit your request. Be "
 "patient! View the log for details."
 msgstr ""
-"NFT für Self-pooling erfolgreich erstellt.Bitte warte ein paar minuten "
-"und sende die Anfrage NICHT sofort nochmal."
+"NFT für Self-pooling erfolgreich erstellt. Bitte warte ein paar Minuten "
+"und sende die Anfrage NICHT sofort nochmal. Mehr Details findest du in "
+"den Logs."
 
 #: views/ping/resources.py:28
 msgid "Pong!"

diff --git a/api/translations/fr_FR/LC_MESSAGES/messages.po b/api/translations/fr_FR/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: Machinaris VERSION\n"
 "Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris"
 "/issuesCreation-Date: 2022-02-16 15:00-0700\n"
-"POT-Creation-Date: 2023-04-23 17:03-0600\n"
+"POT-Creation-Date: 2023-11-05 07:23-0700\n"
 "PO-Revision-Date: 2022-02-15 14:29-0700\n"
 "Last-Translator: Guy Davis\n"
 "Language: fr\n"
@@ -16,7 +16,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.12.1\n"
+"Generated-By: Babel 2.13.1\n"
 
 #: commands/chia_cli.py:79
 msgid "Updated config.yaml failed validation!"

diff --git a/api/translations/it_IT/LC_MESSAGES/messages.po b/api/translations/it_IT/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: Machinaris VERSION\n"
 "Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris"
 "/issuesCreation-Date: 2022-02-16 15:00-0700\n"
-"POT-Creation-Date: 2023-04-23 17:03-0600\n"
+"POT-Creation-Date: 2023-11-05 07:23-0700\n"
 "PO-Revision-Date: 2022-02-15 14:29-0700\n"
 "Last-Translator: Fabrizio Cacicia\n"
 "Language: it\n"
@@ -16,7 +16,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.12.1\n"
+"Generated-By: Babel 2.13.1\n"
 
 #: commands/chia_cli.py:79
 msgid "Updated config.yaml failed validation!"

diff --git a/api/translations/nl_NL/LC_MESSAGES/messages.po b/api/translations/nl_NL/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: Machinaris VERSION\n"
 "Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris/issuesPOT-"
 "Creation-Date: 2022-03-13 10:30-0600\n"
-"POT-Creation-Date: 2023-04-23 17:03-0600\n"
+"POT-Creation-Date: 2023-11-05 07:23-0700\n"
 "PO-Revision-Date: 2022-03-13 10:29-0600\n"
 "Last-Translator: Bernie Deprez\n"
 "Language: nl_NL\n"
@@ -16,7 +16,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.12.1\n"
+"Generated-By: Babel 2.13.1\n"
 
 #: commands/chia_cli.py:79
 msgid "Updated config.yaml failed validation!"

diff --git a/api/translations/pt_PT/LC_MESSAGES/messages.po b/api/translations/pt_PT/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: Machinaris VERSION\n"
 "Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris"
 "/issuesCreation-Date: 2022-02-16 15:00-0700\n"
-"POT-Creation-Date: 2023-04-23 17:03-0600\n"
+"POT-Creation-Date: 2023-11-05 07:23-0700\n"
 "PO-Revision-Date: 2022-02-13 13:45-0700\n"
 "Last-Translator: Antonio Casqueiro\n"
 "Language: pt\n"
@@ -16,7 +16,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.12.1\n"
+"Generated-By: Babel 2.13.1\n"
 
 #: commands/chia_cli.py:79
 msgid "Updated config.yaml failed validation!"

diff --git a/api/translations/zh/LC_MESSAGES/messages.po b/api/translations/zh/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: Machinaris VERSION\n"
 "Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris"
 "/issuesCreation-Date: 2022-02-16 15:00-0700\n"
-"POT-Creation-Date: 2023-04-23 17:03-0600\n"
+"POT-Creation-Date: 2023-11-05 07:23-0700\n"
 "PO-Revision-Date: 2022-02-15 14:29-0700\n"
 "Last-Translator: Guy Davis\n"
 "Language: zh\n"
@@ -16,7 +16,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.12.1\n"
+"Generated-By: Babel 2.13.1\n"
 
 #: commands/chia_cli.py:79
 msgid "Updated config.yaml failed validation!"

diff --git a/config/plotman.sample.yaml b/config/plotman.sample.yaml
@@ -110,6 +110,8 @@ plotting:
                 mode: diskplot        # Either enable ramplot, diskplot, or gpuplot. 
                 diskplot_cache:   4GB # If diskplot, amount of RAM to allocate to caching disk writes
                 diskplot_buckets: 256 # Optionally set a different number of buckets to use for diskplot
+                #check_plots: 100      # For gpuplot only, will optionally perform given number of validations per new plot
+                #check_threshold: 0.6  # For gpuplot only, will optionally delete a new plot failing validity check below threshold level (0 to 1)
 
         madmax:
                 # Classic Madmax plotter; see https://github.com/guydavis/machinaris/wiki/MadMax

diff --git 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.1/chia-blockchain-cli_2.1.1-1_amd64.deb
+        curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.1.2-rc1/chia-blockchain-cli_2.1.2rc1-1_amd64.deb
         apt-get install ./chia-blockchain-cli*.deb
     else
-        curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.1.1/chia-blockchain-cli_2.1.1-1_arm64.deb
+        curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.1.2-rc1/chia-blockchain-cli_2.1.2rc1-1_arm64.deb
         apt-get install ./chia-blockchain-cli*.deb
     fi
 fi
diff --git a/scripts/pull_3rd_party_libs.sh b/scripts/pull_3rd_party_libs.sh
@@ -4,7 +4,7 @@
 #
 
 # Bootstrap and Icons
-BSI_VERSION=1.11.0
+BSI_VERSION=1.11.1
 BOOTSTRAP_VERSION=5.3.2
 BASEPATH=${JS_LIBS_BASEPATH:-/machinaris/web/static/3rd_party}
 
@@ -13,15 +13,15 @@ LEAFLET_VERSION=1.9.4
 
 # List of other css/js links
 LIST="
-https://cdn.datatables.net/1.13.6/css/dataTables.bootstrap5.css
-https://cdn.datatables.net/1.13.6/js/dataTables.bootstrap5.js
-https://cdn.datatables.net/1.13.6/js/jquery.dataTables.js
+https://cdn.datatables.net/1.13.7/css/dataTables.bootstrap5.css
+https://cdn.datatables.net/1.13.7/js/dataTables.bootstrap5.js
+https://cdn.datatables.net/1.13.7/js/jquery.dataTables.js
 https://cdn.jsdelivr.net/npm/chart.js@4.4.0/dist/chart.umd.js.map
 https://cdn.jsdelivr.net/npm/chart.js@4.4.0/dist/chart.umd.min.js
 https://cdn.jsdelivr.net/npm/chartjs-adapter-luxon@1.3.1/dist/chartjs-adapter-luxon.umd.min.js
 https://cdn.jsdelivr.net/npm/chartjs-plugin-datalabels@2.2.0/dist/chartjs-plugin-datalabels.min.js
 https://cdn.jsdelivr.net/npm/jquery@3.7.1/dist/jquery.min.js
-https://cdn.jsdelivr.net/npm/luxon@3.4.3/build/global/luxon.min.js"
+https://cdn.jsdelivr.net/npm/luxon@3.4.4/build/global/luxon.min.js"
 
 mkdir -p $BASEPATH
 for url in $LIST ; do

diff --git a/web/actions/stats.py b/web/actions/stats.py
@@ -38,7 +38,7 @@
     StatPlottingDiskFree,
 ]
 
-# Don't overload the bar chart with tons of plots paths, randomly sample only this amount
+# Don't overload the bar chart with tons of plots paths, show only the first X paths
 MAX_ALLOWED_PATHS_ON_BAR_CHART = 20
 
 # Ignore disk stats that are older than this many minutes ago
@@ -280,9 +280,11 @@ def load_current_disk_usage(disk_type, hostname=None):
                             free.append(free_row.value) # Leave at GB
                         continue
             if len(paths):
-                if len(paths) > MAX_ALLOWED_PATHS_ON_BAR_CHART:
-                    paths = sorted(random.sample(paths, MAX_ALLOWED_PATHS_ON_BAR_CHART))
-                summary_by_worker[host.hostname] = { "paths": paths, "used": used, "free": free}
+                summary_by_worker[host.hostname] = { 
+                    "paths": paths[:MAX_ALLOWED_PATHS_ON_BAR_CHART], 
+                    "used": used[:MAX_ALLOWED_PATHS_ON_BAR_CHART], 
+                    "free": free[:MAX_ALLOWED_PATHS_ON_BAR_CHART]
+                }
     #app.logger.debug(summary_by_worker.keys())
     return summary_by_worker
 

diff --git a/web/routes.py b/web/routes.py
@@ -8,9 +8,10 @@
 import traceback
 
 from datetime import datetime
-from flask import Flask, flash, redirect, render_template, abort, escape, \
+from flask import Flask, flash, redirect, render_template, abort, \
         request, session, url_for, send_from_directory, make_response
 from flask_babel import _, lazy_gettext as _l
+from markupsafe import escape
 
 from common.config import globals
 from common.utils import fiat