Merge pull request #948 from guydavis/integration

Machinaris 2.1.2

.github/workflows/develop-chia.yaml

@@ -44,9 +44,8 @@ jobs:
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
-            "CHIA_BRANCH=release/2.1.0"
+            "CHIA_BRANCH=release/2.1.2"
             "BLADEBIT_BRANCH=master"
-            "MADMAX_BRANCH=master"
             "PLOTMAN_BRANCH=compress"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:develop
@@ -90,9 +89,8 @@ jobs:
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
-            "GIGAHORSE_BRANCH=v1.8.2.giga14"
-            "CHIA_BRANCH=release/1.8.3"
-            "MADMAX_BRANCH=v1.8.2.giga14"
+            "GIGAHORSE_BRANCH=v2.1.1.giga25"
+            "CHIA_BRANCH=main"
             "PLOTMAN_BRANCH=compress"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-gigahorse:develop

.github/workflows/develop-chives.yaml

@@ -47,7 +47,6 @@ jobs:
             "CHIADOG_BRANCH=dev"
             "CHIVES_REPO=https://github.com/HiveProject2021/chives-blockchain.git"
             "CHIVES_BRANCH=1.5.4"
-            "MADMAX_BRANCH=master"
             "PLOTMAN_BRANCH=development"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chives:develop

.github/workflows/develop-mmx.yaml

@@ -45,7 +45,6 @@ jobs:
             "MACHINARIS_STREAM=develop"
             "MMX_BRANCH=master"
             "CHIA_BRANCH=latest"
-            "MADMAX_BRANCH=master"
             "PLOTMAN_BRANCH=development"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:develop

.github/workflows/main-chia.yaml

@@ -44,8 +44,7 @@ jobs:
           build-args: |
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=latest"
-            "CHIA_BRANCH=release/2.1.0"
-            "MADMAX_BRANCH=v1.8.2.giga14"
+            "CHIA_BRANCH=release/2.1.2"
             "BLADEBIT_BRANCH=master"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:latest
@@ -90,9 +89,8 @@ jobs:
           build-args: |
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=latest"
-            "GIGAHORSE_BRANCH=v1.8.2.giga14"
-            "CHIA_BRANCH=release/1.8.1"
-            "MADMAX_BRANCH=v1.8.2.giga14"
+            "GIGAHORSE_BRANCH=v2.1.1.giga25"
+            "CHIA_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-gigahorse:latest
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-gigahorse:v${{ github.event.inputs.version }}

.github/workflows/main-chives.yaml

@@ -46,7 +46,6 @@ jobs:
             "MACHINARIS_STREAM=latest"
             "CHIVES_REPO=https://github.com/HiveProject2021/chives-blockchain.git"
             "CHIVES_BRANCH=1.5.4"
-            "MADMAX_BRANCH=v1.8.2.giga14"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chives:latest
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chives:v${{ github.event.inputs.version }}

.github/workflows/main-mmx.yaml

@@ -46,7 +46,7 @@ jobs:
             "MACHINARIS_STREAM=latest"
             "CHIA_BRANCH=latest"
             "MMX_BRANCH=v0.10.6"
-            "MADMAX_BRANCH=v1.8.2.giga14"
+            "GIGAHORSE_BRANCH=v2.1.1.giga25"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:latest
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:v${{ github.event.inputs.version }}

.github/workflows/test-chia.yaml

@@ -44,10 +44,9 @@ jobs:
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=test"
             "CHIADOG_BRANCH=dev"
-            "CHIA_BRANCH=release/2.1.0"
+            "CHIA_BRANCH=release/2.1.2"
             "PLOTMAN_BRANCH=development"
             "BLADEBIT_BRANCH=master"
-            "MADMAX_BRANCH=v1.8.2.giga14"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:test
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris:test
@@ -90,8 +89,8 @@ jobs:
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=test"
             "CHIADOG_BRANCH=dev"
-            "GIGAHORSE_BRANCH=v1.8.2.giga14"
-            "CHIA_BRANCH=release/1.8.1"
+            "GIGAHORSE_BRANCH=v2.1.1.giga25"
+            "CHIA_BRANCH=main"
             "PLOTMAN_BRANCH=development"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-gigahorse:test

.github/workflows/test-chives.yaml

@@ -91,7 +91,6 @@ jobs:
             "CHIVES_REPO=https://github.com/foxypool/chives-blockchain.git"
             "CHIVES_BRANCH=main"
             "PLOTMAN_BRANCH=development"
-            "MADMAX_BRANCH=v1.8.2.giga14"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chivesfoxy:test
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chivesfoxy:test

.github/workflows/test-mmx.yaml

@@ -46,7 +46,7 @@ jobs:
             "CHIA_BRANCH=latest"
             "PLOTMAN_BRANCH=development"
             "MMX_BRANCH=v0.10.6"
-            "MADMAX_BRANCH=v1.8.2.giga14"
+            "GIGAHORSE_BRANCH=v2.1.1.giga25"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:test
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:test

CHANGELOG.md

@@ -2,10 +2,26 @@
 
 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).
 
+## [2.1.2] - 2023-12-13
+### 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.2) to v2.1.2 - misc improvements, see their release notes.
+ - [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
@@ -21,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

VERSION

@@ -1 +1 @@
-2.1.0
+2.1.2

api/models/chia.py

@@ -24,7 +24,7 @@ def __init__(self, cli_stdout, blockchain):
                     self.plot_count = line.strip().split(':')[1].strip()
                 elif "Total size of plots" in line:
                     self.plots_size = line.strip().split(':')[1].strip()
-                    if blockchain == 'chia': # Example "68.388 TiB, 68.425 TiBe (effective)"
+                    if blockchain in ['cactus', 'chia', 'gigahorse']: # Example "68.388 TiB, 68.425 TiBe (effective)"
                         raw,effective = self.plots_size.strip().split(',')
                         self.plots_size = effective.strip().removesuffix('e (effective)')
                 elif "status" in line: 

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:

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 <[email protected]>\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!"

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!"

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!"

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!"

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!"

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!"

config/plotman.sample-gigahorse.yaml

@@ -113,7 +113,7 @@ plotting:
                 k: 32                 # The default size for Chia plot is k32
                 mode: gpuplot         # Either enable diskplot or gpuplot. 
                 network_port: 8444    # Use 8444 for Chia
-                compression: 7        # Compression level (default = 1, min = 1, max = 9)
+                compression: 7        # Compression level (default = 1, min = 1, max = 20)
                 gpu_device: 0         # CUDA device (default = 0)
                 gpu_ndevices: 1       # Number of CUDA devices (default = 1)
                 gpu_streams: 4        # Number of parallel streams (default = 4, must be >= 2)

config/plotman.sample-mmx.yaml

@@ -107,12 +107,12 @@ plotting:
         type: madmax
 
         madmax:
-                # Madmax plotter: https://github.com/guydavis/machinaris/wiki/MadMax
-                k: 32                 # The minimum K size for mainnet will probably be k30
-                mode: diskplot        # Either enable diskplot or gpuplot. 
-                n_threads: 4          # Default is 4, SLOWLY crank up if you have many cores
-                n_buckets: 256        # Default is 256
-                n_buckets3: 256       # Default is 256
-                n_rmulti2: 1          # Default is 1
+                # Gigahorse plotter: https://github.com/guydavis/machinaris/wiki/Gigahorse
+                k: 32                 # The default size for MMX plot is k32
+                mode: gpuplot         # Either enable diskplot or gpuplot. 
                 network_port: 11337   # Use 11337 for MMX
-                compression: 1        # Compression level (default = 1, min = 1, max = 9)
+                compression: 7        # Compression level (default = 1, min = 1, max = 20)
+                gpu_device: 0         # CUDA device (default = 0)
+                gpu_ndevices: 1       # Number of CUDA devices (default = 1)
+                gpu_streams: 4        # Number of parallel streams (default = 4, must be >= 2)
+                #gpu_shared_memory: 16 # Max shared / pinned memory in GiB (default = unlimited)

config/plotman.sample.yaml

@@ -105,10 +105,13 @@ plotting:
                 # BladeBit plotter; see https://github.com/guydavis/machinaris/wiki/Bladebit
                 threads: 4            # Threads per job
                 no_numa: true         # Whether to disable NUMA memory support or not
+                no_direct_io: false   # Whether to disable DirectIO writes to to destination media
                 compression: 0        # Compression level (default = 0, min = 0, max = 6)
                 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