From 125d470502efa4feb5e218136a44aee2c0354987 Mon Sep 17 00:00:00 2001
From: Guy Davis <guydavis.ca@gmail.com>
Date: Thu, 18 May 2023 07:51:37 -0600
Subject: [PATCH 01/49] Start on next dev cycle.

---
 .github/workflows/develop-chia.yaml |  2 +-
 CHANGELOG.md                        | 12 ++++++++++++
 VERSION                             |  2 +-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/develop-chia.yaml b/.github/workflows/develop-chia.yaml
index 20dbb0bd..46a568c9 100644
--- a/.github/workflows/develop-chia.yaml
+++ b/.github/workflows/develop-chia.yaml
@@ -44,7 +44,7 @@ jobs:
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
-            "CHIA_BRANCH=release/1.8.1"
+            "CHIA_BRANCH=main"
             "BLADEBIT_BRANCH=cuda-compression"
             "MADMAX_BRANCH=master"
             "PLOTMAN_BRANCH=compress"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bcf0a4bc..183d560e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,18 @@
 
 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] - 2023-?-?
+### Added
+
+### Changed
+
+### Updated
+ - [Chia](https://github.com/Chia-Network/chia-blockchain/releases/tag/1.8.2) to v1.8.2
+ - [Gigahorse](https://github.com/madMAx43v3r/chia-gigahorse/releases/tag/v1.8.0.giga12) to v1.8.0.giga12.
+### Notes
+ - Bladebit still broken on ability to `ramplot` and `diskplot` as they try to match Gigahorse's GPU plotting. Still awaiting a fix...
+ - Support for new blockchains and tools DOES NOT imply my endorsement for them.  *Only run those you are comfortable with.*
+
 ## [1.8.1] - 2023-05-17
 ### Changed
  - By default, exclude Gigahorse plots from automated plot check due to poor performance of the 'ProofOfSpace' binary.
diff --git a/VERSION b/VERSION
index b9268dae..0bfbd573 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.8.1
\ No newline at end of file
+1.8.2
\ No newline at end of file

From a16457be2e539fd370e7edb5d3a28e82199db387 Mon Sep 17 00:00:00 2001
From: Guy Davis <guydavis.ca@gmail.com>
Date: Thu, 18 May 2023 07:55:16 -0600
Subject: [PATCH 02/49] Gigahorse v1.8.1giga12

---
 .github/workflows/develop-chia.yaml | 6 +++---
 .github/workflows/main-chia.yaml    | 8 ++++----
 .github/workflows/main-chives.yaml  | 2 +-
 .github/workflows/main-mmx.yaml     | 2 +-
 .github/workflows/test-chia.yaml    | 6 +++---
 .github/workflows/test-chives.yaml  | 2 +-
 .github/workflows/test-mmx.yaml     | 2 +-
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/develop-chia.yaml b/.github/workflows/develop-chia.yaml
index 46a568c9..c06ad5f7 100644
--- a/.github/workflows/develop-chia.yaml
+++ b/.github/workflows/develop-chia.yaml
@@ -90,9 +90,9 @@ jobs:
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
-            "GIGAHORSE_BRANCH=v1.8.0.giga11"
-            "CHIA_BRANCH=release/1.8.0"
-            "MADMAX_BRANCH=v1.8.0.giga11"
+            "GIGAHORSE_BRANCH=v1.8.1.giga12"
+            "CHIA_BRANCH=release/1.8.1"
+            "MADMAX_BRANCH=v1.8.1.giga12"
             "PLOTMAN_BRANCH=compress"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-gigahorse:develop
diff --git a/.github/workflows/main-chia.yaml b/.github/workflows/main-chia.yaml
index ca89c8d4..0f51f2ed 100644
--- a/.github/workflows/main-chia.yaml
+++ b/.github/workflows/main-chia.yaml
@@ -45,7 +45,7 @@ jobs:
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=latest"
             "CHIA_BRANCH=release/1.8.1"
-            "MADMAX_BRANCH=v1.8.0.giga11"
+            "MADMAX_BRANCH=v1.8.1.giga12"
             "BLADEBIT_BRANCH=cuda-compression"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:latest
@@ -90,9 +90,9 @@ jobs:
           build-args: |
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=latest"
-            "GIGAHORSE_BRANCH=v1.8.0.giga11"
-            "CHIA_BRANCH=release/1.8.0"
-            "MADMAX_BRANCH=v1.8.0.giga11"
+            "GIGAHORSE_BRANCH=v1.8.1.giga12"
+            "CHIA_BRANCH=release/1.8.1"
+            "MADMAX_BRANCH=v1.8.1.giga12"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-gigahorse:latest
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-gigahorse:v${{ github.event.inputs.version }}
diff --git a/.github/workflows/main-chives.yaml b/.github/workflows/main-chives.yaml
index 5ab8502f..e3bbc3c7 100644
--- a/.github/workflows/main-chives.yaml
+++ b/.github/workflows/main-chives.yaml
@@ -46,7 +46,7 @@ jobs:
             "MACHINARIS_STREAM=latest"
             "CHIVES_REPO=https://github.com/HiveProject2021/chives-blockchain.git"
             "CHIVES_BRANCH=1.5.4"
-            "MADMAX_BRANCH=v1.8.0.giga11"
+            "MADMAX_BRANCH=v1.8.1.giga12"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chives:latest
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chives:v${{ github.event.inputs.version }}
diff --git a/.github/workflows/main-mmx.yaml b/.github/workflows/main-mmx.yaml
index fdc650ff..6bb44c76 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.2"
-            "MADMAX_BRANCH=v1.8.0.giga11"
+            "MADMAX_BRANCH=v1.8.1.giga12"
           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 1d09091d..c3d87132 100644
--- a/.github/workflows/test-chia.yaml
+++ b/.github/workflows/test-chia.yaml
@@ -47,7 +47,7 @@ jobs:
             "CHIA_BRANCH=release/1.8.1"
             "PLOTMAN_BRANCH=development"
             "BLADEBIT_BRANCH=cuda-compression"
-            "MADMAX_BRANCH=v1.8.0.giga11"
+            "MADMAX_BRANCH=v1.8.1.giga12"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:test
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris:test
@@ -90,8 +90,8 @@ jobs:
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=test"
             "CHIADOG_BRANCH=dev"
-            "GIGAHORSE_BRANCH=v1.8.0.giga11"
-            "CHIA_BRANCH=release/1.8.0"
+            "GIGAHORSE_BRANCH=v1.8.1.giga12"
+            "CHIA_BRANCH=release/1.8.1"
             "PLOTMAN_BRANCH=development"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-gigahorse:test
diff --git a/.github/workflows/test-chives.yaml b/.github/workflows/test-chives.yaml
index 14cc6982..7b7afaba 100644
--- a/.github/workflows/test-chives.yaml
+++ b/.github/workflows/test-chives.yaml
@@ -91,7 +91,7 @@ jobs:
             "CHIVES_REPO=https://github.com/foxypool/chives-blockchain.git"
             "CHIVES_BRANCH=main"
             "PLOTMAN_BRANCH=development"
-            "MADMAX_BRANCH=v1.8.0.giga11"
+            "MADMAX_BRANCH=v1.8.1.giga12"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chivesfoxy:test
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chivesfoxy:test
diff --git a/.github/workflows/test-mmx.yaml b/.github/workflows/test-mmx.yaml
index 6d8e6a38..bfe0f7d5 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.2"
-            "MADMAX_BRANCH=v1.8.0.giga11"
+            "MADMAX_BRANCH=v1.8.1.giga12"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:test
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:test

From 9d9a389e421d583de4184201830317bac8807d95 Mon Sep 17 00:00:00 2001
From: Guy Davis <guydavis.ca@gmail.com>
Date: Fri, 19 May 2023 22:01:12 -0600
Subject: [PATCH 03/49] Cactus v1.8.1

---
 CHANGELOG.md                    | 1 +
 scripts/forks/cactus_install.sh | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 183d560e..a0902b02 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
 ### Changed
 
 ### Updated
+ - [Cactus](https://github.com/Cactus-Network/cactus-blockchain/releases/tag/1.8.1) to v1.8.1
  - [Chia](https://github.com/Chia-Network/chia-blockchain/releases/tag/1.8.2) to v1.8.2
  - [Gigahorse](https://github.com/madMAx43v3r/chia-gigahorse/releases/tag/v1.8.0.giga12) to v1.8.0.giga12.
 ### Notes
diff --git a/scripts/forks/cactus_install.sh b/scripts/forks/cactus_install.sh
index df6d57e2..b8237bca 100644
--- a/scripts/forks/cactus_install.sh
+++ b/scripts/forks/cactus_install.sh
@@ -4,8 +4,8 @@
 #
 
 CACTUS_BRANCH=$1
-# On 2023-05-05
-HASH=167b5edeb3363a625a15663cf4729fd7b8b0373e
+# On 2023-05-19
+HASH=8c7956d9fdd751235824af2630d472ccd77fa936
 
 if [ -z ${CACTUS_BRANCH} ]; then
     echo 'Skipping Cactus install as not requested.'

From e013f440bf8ea882001e619cc12bc65d0f8482ca Mon Sep 17 00:00:00 2001
From: Guy Davis <guydavis.ca@gmail.com>
Date: Tue, 23 May 2023 09:44:09 -0600
Subject: [PATCH 04/49] MMX @ v0.10.6

---
 .github/workflows/main-mmx.yaml | 2 +-
 .github/workflows/test-mmx.yaml | 2 +-
 CHANGELOG.md                    | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main-mmx.yaml b/.github/workflows/main-mmx.yaml
index 6bb44c76..8366c995 100644
--- a/.github/workflows/main-mmx.yaml
+++ b/.github/workflows/main-mmx.yaml
@@ -45,7 +45,7 @@ jobs:
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=latest"
             "CHIA_BRANCH=latest"
-            "MMX_BRANCH=v0.10.2"
+            "MMX_BRANCH=v0.10.6"
             "MADMAX_BRANCH=v1.8.1.giga12"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:latest
diff --git a/.github/workflows/test-mmx.yaml b/.github/workflows/test-mmx.yaml
index bfe0f7d5..22106e5b 100644
--- a/.github/workflows/test-mmx.yaml
+++ b/.github/workflows/test-mmx.yaml
@@ -45,7 +45,7 @@ jobs:
             "MACHINARIS_STREAM=test"
             "CHIA_BRANCH=latest"
             "PLOTMAN_BRANCH=development"
-            "MMX_BRANCH=v0.10.2"
+            "MMX_BRANCH=v0.10.6"
             "MADMAX_BRANCH=v1.8.1.giga12"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:test
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a0902b02..9223cdff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ All notable changes to this project will be documented in this file. The format
  - [Cactus](https://github.com/Cactus-Network/cactus-blockchain/releases/tag/1.8.1) to v1.8.1
  - [Chia](https://github.com/Chia-Network/chia-blockchain/releases/tag/1.8.2) to v1.8.2
  - [Gigahorse](https://github.com/madMAx43v3r/chia-gigahorse/releases/tag/v1.8.0.giga12) to v1.8.0.giga12.
+ - [MMX](https://github.com/madMAx43v3r/mmx-node/releases/tag/v0.10.6) to v0.10.6. 
 ### Notes
  - Bladebit still broken on ability to `ramplot` and `diskplot` as they try to match Gigahorse's GPU plotting. Still awaiting a fix...
  - Support for new blockchains and tools DOES NOT imply my endorsement for them.  *Only run those you are comfortable with.*

From ff1f6a890c4fc938758ee3f04b94a95c7419373d Mon Sep 17 00:00:00 2001
From: Guy Davis <guydavis.ca@gmail.com>
Date: Wed, 24 May 2023 10:30:09 -0600
Subject: [PATCH 05/49] Deprecate stale blockchains.

---
 CHANGELOG.md                     |  2 +-
 web/templates/worker_launch.html | 45 +++++++-------------------------
 2 files changed, 11 insertions(+), 36 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9223cdff..66579f4c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,7 @@ All notable changes to this project will be documented in this file. The format
 ### Added
 
 ### Changed
-
+ - Deprecated stale blockchains, by hiding from Worker wizards: BPX, N-Chain, Silicoin, Stor
 ### Updated
  - [Cactus](https://github.com/Cactus-Network/cactus-blockchain/releases/tag/1.8.1) to v1.8.1
  - [Chia](https://github.com/Chia-Network/chia-blockchain/releases/tag/1.8.2) to v1.8.2
diff --git a/web/templates/worker_launch.html b/web/templates/worker_launch.html
index 380f8773..1340a839 100644
--- a/web/templates/worker_launch.html
+++ b/web/templates/worker_launch.html
@@ -685,13 +685,6 @@ <h2>{{_('Machinaris Worker - Launch Config')}}</h2>
                                 Ballcoin
                             </label>
                         </div>
-                        <div class="col">
-                            <input class="form-check-input" type="checkbox" name="blockchains"
-                                id="blockchain-bpx" onclick="updateDocker()" value="bpx">
-                            <label class="form-check-label" for="blockchain-bpx" onclick="updateDocker()">
-                                BPX
-                            </label>
-                        </div>
                         <div class="col">
                             <input class="form-check-input" type="checkbox" name="blockchains"
                                 id="blockchain-btcgreen" onclick="updateDocker()" value="btcgreen">
@@ -706,8 +699,6 @@ <h2>{{_('Machinaris Worker - Launch Config')}}</h2>
                                 Cactus
                             </label>
                         </div>
-                    </div>
-                    <div class="row">
                         <div class="col">
                             <input class="form-check-input" type="checkbox" checked name="blockchains"
                                 id="blockchain-chia" onclick="updateDocker()" value="chia">
@@ -715,6 +706,8 @@ <h2>{{_('Machinaris Worker - Launch Config')}}</h2>
                                 Chia
                             </label>
                         </div>
+                    </div>
+                    <div class="row">
                         <div class="col">
                             <input class="form-check-input" type="checkbox" name="blockchains"
                                 id="blockchain-chinilla" onclick="updateDocker()" value="chinilla">
@@ -743,8 +736,6 @@ <h2>{{_('Machinaris Worker - Launch Config')}}</h2>
                                 Cryptodoge
                             </label>
                         </div>
-                    </div>
-                    <div class="row">
                         <div class="col">
                             <input class="form-check-input" type="checkbox" name="blockchains"
                                 id="blockchain-ecostake" onclick="updateDocker()" value="ecostake">
@@ -752,6 +743,8 @@ <h2>{{_('Machinaris Worker - Launch Config')}}</h2>
                                 Ecostake
                             </label>
                         </div>
+                    </div>
+                    <div class="row">
                         <div class="col">
                             <input class="form-check-input" type="checkbox" name="blockchains"
                                 id="blockchain-flax" onclick="updateDocker()" value="flax">
@@ -780,8 +773,6 @@ <h2>{{_('Machinaris Worker - Launch Config')}}</h2>
                                 Gold
                             </label>
                         </div>
-                    </div>
-                    <div class="row">
                         <div class="col">
                             <input class="form-check-input" type="checkbox" name="blockchains"
                                 id="blockchain-greenbtc" onclick="updateDocker()" value="greenbtc">
@@ -789,6 +780,8 @@ <h2>{{_('Machinaris Worker - Launch Config')}}</h2>
                                 GreenBTC
                             </label>
                         </div>
+                    </div>
+                    <div class="row">
                         <div class="col">
                             <input class="form-check-input" type="checkbox" name="blockchains"
                                 id="blockchain-hddcoin" onclick="updateDocker()" value="hddcoin">
@@ -817,8 +810,6 @@ <h2>{{_('Machinaris Worker - Launch Config')}}</h2>
                                 Mint
                             </label>
                         </div>
-                    </div>
-                    <div class="row">
                         <div class="col">
                             <input class="form-check-input" type="checkbox" name="blockchains"
                                 id="blockchain-mmx" onclick="updateDocker()" value="mmx">
@@ -826,6 +817,8 @@ <h2>{{_('Machinaris Worker - Launch Config')}}</h2>
                                 MMX
                             </label>
                         </div>
+                    </div>
+                    <div class="row">
                         <div class="col">
                             <input class="form-check-input" type="checkbox" name="blockchains"
                                 id="blockchain-moon" onclick="updateDocker()" value="moon">
@@ -833,13 +826,6 @@ <h2>{{_('Machinaris Worker - Launch Config')}}</h2>
                                 Moon
                             </label>
                         </div>
-                        <div class="col">
-                            <input class="form-check-input" type="checkbox" name="blockchains"
-                                id="blockchain-nchain" onclick="updateDocker()" value="nchain">
-                            <label class="form-check-label" for="blockchain-nchain">
-                                N-Chain
-                            </label>
-                        </div>
                         <div class="col">
                             <input class="form-check-input" type="checkbox" name="blockchains"
                                 id="blockchain-one" onclick="updateDocker()" value="one">
@@ -854,8 +840,6 @@ <h2>{{_('Machinaris Worker - Launch Config')}}</h2>
                                 Petroleum
                             </label>
                         </div>
-                    </div>
-                    <div class="row">
                         <div class="col">
                             <input class="form-check-input" type="checkbox" name="blockchains"
                                 id="blockchain-pipscoin" onclick="updateDocker()" value="pipscoin">
@@ -870,6 +854,8 @@ <h2>{{_('Machinaris Worker - Launch Config')}}</h2>
                                 Profit
                             </label>
                         </div>
+                    </div>
+                    <div class="row">
                         <div class="col">
                             <input class="form-check-input" type="checkbox" name="blockchains"
                                 id="blockchain-shibgreen" onclick="updateDocker()" value="shibgreen">
@@ -884,15 +870,6 @@ <h2>{{_('Machinaris Worker - Launch Config')}}</h2>
                                 Staicoin
                             </label>
                         </div>
-                        <div class="col">
-                            <input class="form-check-input" type="checkbox" name="blockchains"
-                                id="blockchain-stor" onclick="updateDocker()" value="stor">
-                            <label class="form-check-label" for="blockchain-stor">
-                                Stor
-                            </label>
-                        </div>
-                    </div>
-                    <div class="row">
                         <div class="col">
                             <input class="form-check-input" type="checkbox" name="blockchains"
                                 id="blockchain-tad" onclick="updateDocker()" value="tad">
@@ -908,8 +885,6 @@ <h2>{{_('Machinaris Worker - Launch Config')}}</h2>
                             </label>
                         </div>
                         <div class="col">&nbsp;</div>
-                        <div class="col">&nbsp;</div>
-                        <div class="col">&nbsp;</div>
                     </div>
                 </div>
             </div>

From 82b6ba2bd4fc9d9b1c1c6409933f2e7e786b1341 Mon Sep 17 00:00:00 2001
From: Guy Davis <guydavis.ca@gmail.com>
Date: Sun, 28 May 2023 09:45:56 -0600
Subject: [PATCH 06/49] Gigahorse @ v1.8.1.giga13

---
 .github/workflows/develop-chia.yaml | 4 ++--
 .github/workflows/main-chia.yaml    | 6 +++---
 .github/workflows/main-chives.yaml  | 2 +-
 .github/workflows/main-mmx.yaml     | 2 +-
 .github/workflows/test-chia.yaml    | 4 ++--
 .github/workflows/test-chives.yaml  | 2 +-
 .github/workflows/test-mmx.yaml     | 2 +-
 CHANGELOG.md                        | 2 +-
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/develop-chia.yaml b/.github/workflows/develop-chia.yaml
index c06ad5f7..1f9a944c 100644
--- a/.github/workflows/develop-chia.yaml
+++ b/.github/workflows/develop-chia.yaml
@@ -90,9 +90,9 @@ jobs:
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
-            "GIGAHORSE_BRANCH=v1.8.1.giga12"
+            "GIGAHORSE_BRANCH=v1.8.1.giga13"
             "CHIA_BRANCH=release/1.8.1"
-            "MADMAX_BRANCH=v1.8.1.giga12"
+            "MADMAX_BRANCH=v1.8.1.giga13"
             "PLOTMAN_BRANCH=compress"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-gigahorse:develop
diff --git a/.github/workflows/main-chia.yaml b/.github/workflows/main-chia.yaml
index 0f51f2ed..fdfe49c0 100644
--- a/.github/workflows/main-chia.yaml
+++ b/.github/workflows/main-chia.yaml
@@ -45,7 +45,7 @@ jobs:
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=latest"
             "CHIA_BRANCH=release/1.8.1"
-            "MADMAX_BRANCH=v1.8.1.giga12"
+            "MADMAX_BRANCH=v1.8.1.giga13"
             "BLADEBIT_BRANCH=cuda-compression"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:latest
@@ -90,9 +90,9 @@ jobs:
           build-args: |
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=latest"
-            "GIGAHORSE_BRANCH=v1.8.1.giga12"
+            "GIGAHORSE_BRANCH=v1.8.1.giga13"
             "CHIA_BRANCH=release/1.8.1"
-            "MADMAX_BRANCH=v1.8.1.giga12"
+            "MADMAX_BRANCH=v1.8.1.giga13"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-gigahorse:latest
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-gigahorse:v${{ github.event.inputs.version }}
diff --git a/.github/workflows/main-chives.yaml b/.github/workflows/main-chives.yaml
index e3bbc3c7..9dc62a7d 100644
--- a/.github/workflows/main-chives.yaml
+++ b/.github/workflows/main-chives.yaml
@@ -46,7 +46,7 @@ jobs:
             "MACHINARIS_STREAM=latest"
             "CHIVES_REPO=https://github.com/HiveProject2021/chives-blockchain.git"
             "CHIVES_BRANCH=1.5.4"
-            "MADMAX_BRANCH=v1.8.1.giga12"
+            "MADMAX_BRANCH=v1.8.1.giga13"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chives:latest
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chives:v${{ github.event.inputs.version }}
diff --git a/.github/workflows/main-mmx.yaml b/.github/workflows/main-mmx.yaml
index 8366c995..8c0b0fa7 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"
-            "MADMAX_BRANCH=v1.8.1.giga12"
+            "MADMAX_BRANCH=v1.8.1.giga13"
           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 c3d87132..b80c1499 100644
--- a/.github/workflows/test-chia.yaml
+++ b/.github/workflows/test-chia.yaml
@@ -47,7 +47,7 @@ jobs:
             "CHIA_BRANCH=release/1.8.1"
             "PLOTMAN_BRANCH=development"
             "BLADEBIT_BRANCH=cuda-compression"
-            "MADMAX_BRANCH=v1.8.1.giga12"
+            "MADMAX_BRANCH=v1.8.1.giga13"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:test
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris:test
@@ -90,7 +90,7 @@ jobs:
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=test"
             "CHIADOG_BRANCH=dev"
-            "GIGAHORSE_BRANCH=v1.8.1.giga12"
+            "GIGAHORSE_BRANCH=v1.8.1.giga13"
             "CHIA_BRANCH=release/1.8.1"
             "PLOTMAN_BRANCH=development"
           tags: |
diff --git a/.github/workflows/test-chives.yaml b/.github/workflows/test-chives.yaml
index 7b7afaba..2681016f 100644
--- a/.github/workflows/test-chives.yaml
+++ b/.github/workflows/test-chives.yaml
@@ -91,7 +91,7 @@ jobs:
             "CHIVES_REPO=https://github.com/foxypool/chives-blockchain.git"
             "CHIVES_BRANCH=main"
             "PLOTMAN_BRANCH=development"
-            "MADMAX_BRANCH=v1.8.1.giga12"
+            "MADMAX_BRANCH=v1.8.1.giga13"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chivesfoxy:test
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chivesfoxy:test
diff --git a/.github/workflows/test-mmx.yaml b/.github/workflows/test-mmx.yaml
index 22106e5b..ea691e38 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"
-            "MADMAX_BRANCH=v1.8.1.giga12"
+            "MADMAX_BRANCH=v1.8.1.giga13"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:test
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:test
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 66579f4c..a7dc1a38 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,7 +10,7 @@ All notable changes to this project will be documented in this file. The format
 ### Updated
  - [Cactus](https://github.com/Cactus-Network/cactus-blockchain/releases/tag/1.8.1) to v1.8.1
  - [Chia](https://github.com/Chia-Network/chia-blockchain/releases/tag/1.8.2) to v1.8.2
- - [Gigahorse](https://github.com/madMAx43v3r/chia-gigahorse/releases/tag/v1.8.0.giga12) to v1.8.0.giga12.
+ - [Gigahorse](https://github.com/madMAx43v3r/chia-gigahorse/releases/tag/v1.8.1.giga13) to v1.8.1.giga13.
  - [MMX](https://github.com/madMAx43v3r/mmx-node/releases/tag/v0.10.6) to v0.10.6. 
 ### Notes
  - Bladebit still broken on ability to `ramplot` and `diskplot` as they try to match Gigahorse's GPU plotting. Still awaiting a fix...

From e05f014c5c5742a0096c675918f7ee6256aed0c6 Mon Sep 17 00:00:00 2001
From: Guy Davis <guydavis.ca@gmail.com>
Date: Thu, 1 Jun 2023 13:51:51 -0600
Subject: [PATCH 07/49] Updated libs.

---
 .github/workflows/main-chia.yaml | 2 +-
 .github/workflows/test-chia.yaml | 2 +-
 CHANGELOG.md                     | 5 +++--
 scripts/bladebit_setup.sh        | 8 ++++++--
 scripts/forks/chia_install.sh    | 6 +++++-
 scripts/pull_3rd_party_libs.sh   | 2 +-
 6 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/main-chia.yaml b/.github/workflows/main-chia.yaml
index fdfe49c0..2addbc40 100644
--- a/.github/workflows/main-chia.yaml
+++ b/.github/workflows/main-chia.yaml
@@ -44,7 +44,7 @@ jobs:
           build-args: |
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=latest"
-            "CHIA_BRANCH=release/1.8.1"
+            "CHIA_BRANCH=release/1.8.2"
             "MADMAX_BRANCH=v1.8.1.giga13"
             "BLADEBIT_BRANCH=cuda-compression"
           tags: |
diff --git a/.github/workflows/test-chia.yaml b/.github/workflows/test-chia.yaml
index b80c1499..12964b30 100644
--- a/.github/workflows/test-chia.yaml
+++ b/.github/workflows/test-chia.yaml
@@ -44,7 +44,7 @@ jobs:
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=test"
             "CHIADOG_BRANCH=dev"
-            "CHIA_BRANCH=release/1.8.1"
+            "CHIA_BRANCH=release/1.8.2"
             "PLOTMAN_BRANCH=development"
             "BLADEBIT_BRANCH=cuda-compression"
             "MADMAX_BRANCH=v1.8.1.giga13"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a7dc1a38..fb0ddba1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,10 +4,11 @@ All notable changes to this project will be documented in this file. The format
 
 ## [Unreleased] - 2023-?-?
 ### Added
-
+ - [Chia](https://docs.google.com/document/d/1MSJ8JzAQGDGrnEzdr4zK4IcTDbokJfpHypn8Dt60Mx8/) - Alpha GPU-farming, requires manual config changes. [Status](https://github.com/Chia-Network/chia-blockchain/issues)
 ### Changed
  - Deprecated stale blockchains, by hiding from Worker wizards: BPX, N-Chain, Silicoin, Stor
 ### Updated
+ - [Bladebit](https://downloads.chia.net/bladebit/) to 3.0.0-alpha4.3. [Status](https://github.com/Chia-Network/bladebit/issues)
  - [Cactus](https://github.com/Cactus-Network/cactus-blockchain/releases/tag/1.8.1) to v1.8.1
  - [Chia](https://github.com/Chia-Network/chia-blockchain/releases/tag/1.8.2) to v1.8.2
  - [Gigahorse](https://github.com/madMAx43v3r/chia-gigahorse/releases/tag/v1.8.1.giga13) to v1.8.1.giga13.
@@ -21,7 +22,7 @@ All notable changes to this project will be documented in this file. The format
  - By default, exclude Gigahorse plots from automated plot check due to poor performance of the 'ProofOfSpace' binary.
  - Fix for plotting manager issues when plotting with multiple tmp drives.
 ### Updated
- - [Bladebit](https://downloads.chia.net/bladebit/) to 3.0.0-alpha4. Status @ https://github.com/Chia-Network/bladebit/issues
+ - [Bladebit](https://downloads.chia.net/bladebit/) to 3.0.0-alpha4. [Status](https://github.com/Chia-Network/bladebit/issues)
  - [BPX](https://github.com/bpx-network/bpx-blockchain/releases/tag/2.1.0) to v2.1.0
  - [Cactus](https://github.com/Cactus-Network/cactus-blockchain/releases/tag/1.8.0) to v1.8.0
  - [Chia](https://github.com/Chia-Network/chia-blockchain/releases/tag/1.8.1) to v1.8.1
diff --git a/scripts/bladebit_setup.sh b/scripts/bladebit_setup.sh
index 7ae8ed40..12b12823 100644
--- a/scripts/bladebit_setup.sh
+++ b/scripts/bladebit_setup.sh
@@ -24,8 +24,12 @@ if [[ (${mode} =~ ^fullnode.*  || ${mode} =~ "plotter") && (${blockchains} == 'c
             ln -s /bladebit/build/bladebit /usr/bin/bladebit
             cd / && echo "Bladebit version: "`bladebit --version`
             cd /bladebit/build
-            curl -sLJO https://download.chia.net/bladebit/alpha4/bladebit-cuda-plotter/bladebit-cuda-v3.0.0-alpha4-ubuntu-x86-64.tar.gz
-            tar -xvf bladebit-cuda-v3.0.0-alpha4-ubuntu-x86-64.tar.gz
+            if [[ "${arch_name}" = "x86_64" ]]; then
+                curl -sLJO https://download.chia.net/bladebit/alpha4.3/bladebit-cuda-plotter/DEB/bladebit-cuda-v3.0.0-alpha4-ubuntu-x86-64.tar.gz
+            else
+                curl -sLJO https://download.chia.net/bladebit/alpha4.3/bladebit-cuda-plotter/DEB/bladebit-cuda-v3.0.0-alpha4-ubuntu-arm64.tar.gz
+            fi
+            tar -xvf *.tar.gz
             chmod 755 bladebit_cuda
             ln -s /bladebit/build/bladebit_cuda /usr/bin/bladebit_cuda
         else
diff --git a/scripts/forks/chia_install.sh b/scripts/forks/chia_install.sh
index 9bbd3fd9..714e4153 100644
--- a/scripts/forks/chia_install.sh
+++ b/scripts/forks/chia_install.sh
@@ -25,8 +25,12 @@ else
     arch_name="$(uname -m)"
     ubuntu_ver=`lsb_release -r -s`
     echo "Installing Chia CUDA binaries on ${arch_name}..."
+    cd /tmp
     if [[ "${arch_name}" = "x86_64" ]]; then
-        curl -sLJO https://download.chia.net/bladebit/alpha4/chia-blockchain-cuda/ubuntu/chia-blockchain-cli_1.8.1rc2-dev34-1_amd64.deb
+        curl -sLJO https://download.chia.net/dev/chia-blockchain-cli-1.8.0rc2-dev31-4d60ba1b-1.x86_64.rpm
+        apt-get install ./chia-blockchain*.deb
+    elif [[ "${arch_name}" = "arm64" ]]; then
+        curl -sLJO https://download.chia.net/dev/chia-blockchain-cli_1.8.0rc2-dev31-4d60ba1b-1_arm64.deb
         apt-get install ./chia-blockchain*.deb
     else
         echo "Installing Chia CUDA binaries skipped -> unsupported architecture: ${arch_name}"
diff --git a/scripts/pull_3rd_party_libs.sh b/scripts/pull_3rd_party_libs.sh
index eaabe676..5b8e3752 100755
--- a/scripts/pull_3rd_party_libs.sh
+++ b/scripts/pull_3rd_party_libs.sh
@@ -5,7 +5,7 @@
 
 # Bootstrap and Icons
 BSI_VERSION=1.10.3
-BOOTSTRAP_VERSION=5.2.3
+BOOTSTRAP_VERSION=5.3.0
 BASEPATH=${JS_LIBS_BASEPATH:-/machinaris/web/static/3rd_party}
 
 # Mapping library

From 65c48891a38c5ca5b6f7ae611f8c4e62e7927dde Mon Sep 17 00:00:00 2001
From: Guy Davis <guydavis.ca@gmail.com>
Date: Thu, 1 Jun 2023 18:29:07 -0600
Subject: [PATCH 08/49] Fix download link.

---
 scripts/forks/chia_install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/forks/chia_install.sh b/scripts/forks/chia_install.sh
index 714e4153..9c88f564 100644
--- a/scripts/forks/chia_install.sh
+++ b/scripts/forks/chia_install.sh
@@ -27,7 +27,7 @@ else
     echo "Installing Chia CUDA binaries on ${arch_name}..."
     cd /tmp
     if [[ "${arch_name}" = "x86_64" ]]; then
-        curl -sLJO https://download.chia.net/dev/chia-blockchain-cli-1.8.0rc2-dev31-4d60ba1b-1.x86_64.rpm
+        curl -sLJO https://download.chia.net/dev/chia-blockchain-cli_1.8.0rc2-dev31-4d60ba1b-1_amd64.deb
         apt-get install ./chia-blockchain*.deb
     elif [[ "${arch_name}" = "arm64" ]]; then
         curl -sLJO https://download.chia.net/dev/chia-blockchain-cli_1.8.0rc2-dev31-4d60ba1b-1_arm64.deb

From 3cff498d47da35149e5542268de68fd8328d4e15 Mon Sep 17 00:00:00 2001
From: Guy Davis <guydavis.ca@gmail.com>
Date: Fri, 2 Jun 2023 11:34:03 -0600
Subject: [PATCH 09/49] CNI with more zip.zip dumps.

---
 scripts/forks/chia_install.sh | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/scripts/forks/chia_install.sh b/scripts/forks/chia_install.sh
index 9c88f564..a0357255 100644
--- a/scripts/forks/chia_install.sh
+++ b/scripts/forks/chia_install.sh
@@ -27,11 +27,13 @@ else
     echo "Installing Chia CUDA binaries on ${arch_name}..."
     cd /tmp
     if [[ "${arch_name}" = "x86_64" ]]; then
-        curl -sLJO https://download.chia.net/dev/chia-blockchain-cli_1.8.0rc2-dev31-4d60ba1b-1_amd64.deb
-        apt-get install ./chia-blockchain*.deb
+        curl -sLJO https://download.chia.net/bladebit/alpha4.3/chia-blockchain-cuda/chia-installers-linux-deb-intel.zip.zip
+        unzip *.zip
+        apt-get install ./chia-blockchain-cli*.deb
     elif [[ "${arch_name}" = "arm64" ]]; then
-        curl -sLJO https://download.chia.net/dev/chia-blockchain-cli_1.8.0rc2-dev31-4d60ba1b-1_arm64.deb
-        apt-get install ./chia-blockchain*.deb
+        curl -sLJO https://download.chia.net/bladebit/alpha4.3/chia-blockchain-cuda/chia-installers-linux-deb-arm64.zip.zip
+        unzip *.zip
+        apt-get install ./chia-blockchain-cli*.deb
     else
         echo "Installing Chia CUDA binaries skipped -> unsupported architecture: ${arch_name}"
     fi

From 4048b3ea436dac0f9a59af7c3c9320711079740a Mon Sep 17 00:00:00 2001
From: Guy Davis <guydavis.ca@gmail.com>
Date: Fri, 2 Jun 2023 12:18:43 -0600
Subject: [PATCH 10/49] Try using /usr/bin/chia as preferred binary.

---
 common/config/blockchains.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/config/blockchains.json b/common/config/blockchains.json
index df6441ff..7bca352f 100644
--- a/common/config/blockchains.json
+++ b/common/config/blockchains.json
@@ -87,7 +87,7 @@
     "chia": {
         "name": "Chia",
         "symbol": "XCH" ,
-        "binary":  "/chia-blockchain/venv/bin/chia",
+        "binary":  "/usr/bin/chia",
         "network_path": "/root/.chia/mainnet",
         "network_name": "mainnet",
         "network_port": 8444,

From 349aa739bd954948e07f14eae01de4f617cf7802 Mon Sep 17 00:00:00 2001
From: Guy Davis <guydavis.ca@gmail.com>
Date: Fri, 2 Jun 2023 12:51:12 -0600
Subject: [PATCH 11/49] More custom Chia launch behavior.

---
 scripts/forks/chia_launch.sh | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/scripts/forks/chia_launch.sh b/scripts/forks/chia_launch.sh
index 32fe7b71..3a7f52cf 100644
--- a/scripts/forks/chia_launch.sh
+++ b/scripts/forks/chia_launch.sh
@@ -13,9 +13,8 @@ mkdir -p /root/.chia/.chia_keys
 rm -f /root/.chia_keys
 ln -s /root/.chia/.chia_keys /root/.chia_keys
 
-cd /chia-blockchain
-
-. ./activate
+#cd /chia-blockchain
+#. ./activate
 
 if [[ "${blockchain_db_download}" == 'true' ]] \
   && [[ "${mode}" == 'fullnode' ]] \
@@ -41,9 +40,9 @@ if [[ "${blockchain_db_download}" == 'true' ]] \
   echo "Please be patient! Downloading blockchain database indirectly (via libtorrent) from: "
   echo "    ${torrent}"
   curl -skLJ -O ${torrent}
-  deactivate # Use the system python
+  #deactivate # Use the system python
   /usr/bin/python /machinaris/scripts/chiadb_download.py $PWD/*.torrent >> /tmp/chiadb_download.log 2>&1
-  cd /chia-blockchain && . ./activate # Re-activate
+  #cd /chia-blockchain && . ./activate # Re-activate
   echo "Now decompressing the blockchain database..."
   cd /root/.chia/mainnet/db/chia && gunzip *.gz
   cd /root/.chia/mainnet/db

From 9c3b62b4347eded99c966d11bd37478894658d0c Mon Sep 17 00:00:00 2001
From: Guy Davis <guydavis.ca@gmail.com>
Date: Sat, 3 Jun 2023 15:04:58 -0600
Subject: [PATCH 12/49] Handle Chia reporting "effective" plots size now.

---
 api/models/chia.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/api/models/chia.py b/api/models/chia.py
index d9c9da15..84e473f6 100644
--- a/api/models/chia.py
+++ b/api/models/chia.py
@@ -24,6 +24,9 @@ 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)"
+                        raw,effective = self.plots_size.strip().split(',')
+                        self.plots_size = effective.strip().removesuffix('e (effective)')
                 elif "status" in line: 
                     self.calc_status(line.split(':')[1].strip())
                 elif re.match("Total.*farmed:.*$", line):

From 3a2bcb3f28eef7f80e639ef4a87e4caead0bac85 Mon Sep 17 00:00:00 2001
From: Guy Davis <guydavis.ca@gmail.com>
Date: Thu, 8 Jun 2023 10:31:00 -0600
Subject: [PATCH 13/49] Fix for latest Bootstrap's display of text-muted.

---
 web/templates/drives.html          | 4 ++--
 web/templates/farming/workers.html | 2 +-
 web/templates/worker.html          | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/web/templates/drives.html b/web/templates/drives.html
index 888623c6..fc50dc23 100644
--- a/web/templates/drives.html
+++ b/web/templates/drives.html
@@ -216,7 +216,7 @@ <h5 class="text-white">
                 ({{ drive.serial_number }})
               {% endif %}
             </small>
-            <table class="text-muted" style="width: 100%">
+            <table style="width: 100%">
               <tr>
                 <td>S.M.A.R.T</td>
                 <td>{{_('Temperature')}}</td>
@@ -264,7 +264,7 @@ <h5 class="text-white">
       </div>
       {% endif %}
       {% endfor %}
-      <small class="text-muted text-center">{{_('Drive status updated')}} {{drives.rows[0].updated_at | datetimefilter}}</small>
+      <small class="text-center">{{_('Drive status updated')}} {{drives.rows[0].updated_at | datetimefilter}}</small>
       {% endif %}
     </fieldset>
   </form>
diff --git a/web/templates/farming/workers.html b/web/templates/farming/workers.html
index beb7561e..d6695324 100644
--- a/web/templates/farming/workers.html
+++ b/web/templates/farming/workers.html
@@ -145,7 +145,7 @@ <h4 class="text-center">{{ blockchain|capitalize }} - {{_('Daily Summary')}}</h4
                 {% if disk_usage[farmer.hostname] %}
                 <canvas id="disk_{{farmer.hostname}}" width="400"></canvas>
                 {% if disk_usage[farmer.hostname]['paths']|length >= MAX_COLUMNS_ON_CHART %}
-                    <p class="small text-center text-muted" style="padding-top: 15px">
+                    <p class="small text-center" style="padding-top: 15px">
                         {{_('For legibility, the chart shows only a random selection of paths when a worker has many of them.')}}
                     </p>
                 {% endif %}
diff --git a/web/templates/worker.html b/web/templates/worker.html
index 192a75e1..32b98ad1 100644
--- a/web/templates/worker.html
+++ b/web/templates/worker.html
@@ -130,7 +130,7 @@
     <div class="fs-4">Plots</div>
     <canvas id="plots_disk" width="400" style="padding-bottom:10px"></canvas>
     {% if plots_disk_usage[worker.hostname]['paths']|length >= MAX_COLUMNS_ON_CHART %}
-        <p class="small text-center text-muted" style="padding-top: 15px">
+        <p class="small text-center" style="padding-top: 15px">
             {{_('For legibility, the chart shows only a random selection of paths when a worker has many of them.')}}
         </p>
     {% endif %}

From ac1081d1e1ef1306c707258a9eaf57d629e66809 Mon Sep 17 00:00:00 2001
From: Guy Davis <guydavis.ca@gmail.com>
Date: Fri, 16 Jun 2023 11:37:16 -0600
Subject: [PATCH 14/49] Allow recheck of plot even when recent results exist.

---
 web/actions/chia.py              |  4 ++--
 web/routes.py                    |  3 +--
 web/templates/farming/plots.html | 30 +++++++++++++++++++++++-------
 3 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/web/actions/chia.py b/web/actions/chia.py
index 97c59454..8ed90780 100644
--- a/web/actions/chia.py
+++ b/web/actions/chia.py
@@ -384,9 +384,9 @@ def save_cold_wallet_addresses(blockchain, cold_wallet_addresses):
         flash(msg, 'danger')
         return
 
-def check(plot_id):
+def check(plot_id, force_recheck=False):
     check_file = '/root/.chia/plotman/checks/{0}.log'.format(plot_id[:8])
-    if os.path.exists(check_file) and os.path.getsize(check_file):
+    if not force_recheck and os.path.exists(check_file) and os.path.getsize(check_file):
         with open(check_file, 'r+') as fp:
             return fp.read()
     try:
diff --git a/web/routes.py b/web/routes.py
index 21788a14..9374e168 100644
--- a/web/routes.py
+++ b/web/routes.py
@@ -226,8 +226,7 @@ def farming_plots():
         plot_id = request.args.get('analyze')
         return plotman.analyze(plot_id[:8])
     elif request.args.get('check'):  # Xhr with a plot_id
-        plot_id = request.args.get('check')
-        return chia.check(plot_id)
+        return chia.check(request.args.get('check'), request.args.get('force_recheck', default=False, type=lambda v: v.lower() == 'true'))
     gc = globals.load()
     farmers = chia.load_farmers()
     plots = chia.load_plots_farming()
diff --git a/web/templates/farming/plots.html b/web/templates/farming/plots.html
index e7ac44aa..f55eef66 100644
--- a/web/templates/farming/plots.html
+++ b/web/templates/farming/plots.html
@@ -20,13 +20,20 @@ <h5 class="modal-title" id="analyzeModalLabel">{{_('Plotting Analysis')}}</h5>
 <div class="modal fade" id="checkModal" tabindex="-1" aria-labelledby="checkModalLabel" aria-hidden="true">
     <div class="modal-dialog bg-dark rounded-3 modal-lg">
         <div class="modal-content bg-dark">
-            <div class="modal-header bg-dark">
-                <h5 class="modal-title" id="checkModalLabel">{{_('Plot Check')}}</h5>
-                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-            </div>
-            <div class="modal-body bg-dark">
-                <pre id="plotCheckContent"></pre>
-            </div>
+            <form method="POST" id="check-form">
+                <div class="modal-header bg-dark">
+                    <h5 class="modal-title" id="checkModalLabel">{{_('Plot Check')}}</h5>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                </div>
+                <div class="modal-body bg-dark">
+                    <pre id="plotCheckContent" style="height: 40pc; overflow-y: scroll; white-space: pre-wrap;"></pre>
+                    <input type="hidden" name="plot_id" id="plotCheckId"/>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-secondary" id="btnCloseSettings" data-bs-dismiss="modal">{{_('Close')}}</button>
+                    <button type="button" class="btn btn-outline-success" id="btnRecheckPlot" data-bs-dismiss="modal">{{_('Recheck')}}</button>
+                </div>
+            </form>
         </div>
     </div>
 </div>
@@ -303,6 +310,8 @@ <h5 class="modal-title" id="walletModalLabel">{{_('Wallet Settings')}}</h5>
         function PlotCheck(plot) {
             var output = document.getElementById('plotCheckContent');
             output.textContent = ""; // Clear any old check before requesting
+            var plotCheckId = document.getElementById('plotCheckId');
+            plotCheckId.value = plot;
             var xhr = new XMLHttpRequest();
             xhr.open('GET', "{{ url_for('farming_plots') }}?check=" + plot);
             xhr.send();
@@ -319,6 +328,13 @@ <h5 class="modal-title" id="walletModalLabel">{{_('Wallet Settings')}}</h5>
                 );
                 $("#settings-form").submit();
             });
+            $("#btnRecheckPlot").click(function () {
+                var plotCheckId = document.getElementById('plotCheckId');
+                var xhr = new XMLHttpRequest();
+                xhr.open('GET', "{{ url_for('farming_plots') }}?check=" + plotCheckId.value + "&force_recheck=true");
+                xhr.send();
+                alert("Plot check initiated. Please refresh in a few minutes.\n\nNote that all plots will be checked slowly in the background so you don't need to check each one individually.  Please be patient.");
+            });
             $('#data').DataTable({
                 "stateSave": true,
                 "pageLength": 25,

From d208aeb673bbacdb7b010c46f9398df36378ea66 Mon Sep 17 00:00:00 2001
From: Guy Davis <guydavis.ca@gmail.com>
Date: Fri, 16 Jun 2023 11:47:28 -0600
Subject: [PATCH 15/49] Widen check view.

---
 CHANGELOG.md                     | 1 +
 web/templates/farming/plots.html | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fb0ddba1..0b8bf057 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ All notable changes to this project will be documented in this file. The format
 ## [Unreleased] - 2023-?-?
 ### Added
  - [Chia](https://docs.google.com/document/d/1MSJ8JzAQGDGrnEzdr4zK4IcTDbokJfpHypn8Dt60Mx8/) - Alpha GPU-farming, requires manual config changes. [Status](https://github.com/Chia-Network/chia-blockchain/issues)
+ - Request a new plot check, via 'Recheck' button added to Check results dialog on Farming page.  
 ### Changed
  - Deprecated stale blockchains, by hiding from Worker wizards: BPX, N-Chain, Silicoin, Stor
 ### Updated
diff --git a/web/templates/farming/plots.html b/web/templates/farming/plots.html
index f55eef66..02034721 100644
--- a/web/templates/farming/plots.html
+++ b/web/templates/farming/plots.html
@@ -18,7 +18,7 @@ <h5 class="modal-title" id="analyzeModalLabel">{{_('Plotting Analysis')}}</h5>
 </div>
 
 <div class="modal fade" id="checkModal" tabindex="-1" aria-labelledby="checkModalLabel" aria-hidden="true">
-    <div class="modal-dialog bg-dark rounded-3 modal-lg">
+    <div class="modal-dialog bg-dark rounded-3 modal-xl">
         <div class="modal-content bg-dark">
             <form method="POST" id="check-form">
                 <div class="modal-header bg-dark">
@@ -26,7 +26,7 @@ <h5 class="modal-title" id="checkModalLabel">{{_('Plot Check')}}</h5>
                     <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
                 </div>
                 <div class="modal-body bg-dark">
-                    <pre id="plotCheckContent" style="height: 40pc; overflow-y: scroll; white-space: pre-wrap;"></pre>
+                    <pre id="plotCheckContent" style="height: 40pc; overflow-y: scroll;"></pre>
                     <input type="hidden" name="plot_id" id="plotCheckId"/>
                 </div>
                 <div class="modal-footer">

From cbc042c9ec211d84c61dc7df208d16ec28c255d3 Mon Sep 17 00:00:00 2001
From: Guy Davis <guydavis.ca@gmail.com>
Date: Wed, 21 Jun 2023 15:12:27 -0600
Subject: [PATCH 16/49] Special exclusion of certain plots dirs on certain
 hosts during replotting deletion check.

---
 CHANGELOG.md                  |  1 +
 api/schedules/plots_replot.py | 27 ++++++++++++++++++++++-----
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0b8bf057..a5568414 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
  - [Chia](https://docs.google.com/document/d/1MSJ8JzAQGDGrnEzdr4zK4IcTDbokJfpHypn8Dt60Mx8/) - Alpha GPU-farming, requires manual config changes. [Status](https://github.com/Chia-Network/chia-blockchain/issues)
  - Request a new plot check, via 'Recheck' button added to Check results dialog on Farming page.  
+ - Optionally exclude certain plot directories from replotting check to free disk space. Useful for drives only partially dedicated to holding plots.
 ### Changed
  - Deprecated stale blockchains, by hiding from Worker wizards: BPX, N-Chain, Silicoin, Stor
 ### Updated
diff --git a/api/schedules/plots_replot.py b/api/schedules/plots_replot.py
index 9d728c7b..ec65d7a0 100644
--- a/api/schedules/plots_replot.py
+++ b/api/schedules/plots_replot.py
@@ -15,7 +15,7 @@
 import traceback
 
 from flask import g
-from sqlalchemy import and_, or_
+from sqlalchemy import and_, or_, not_
 
 from common.models import plots as p, plottings as pl
 from common.models import workers as w
@@ -23,6 +23,7 @@
 from api import app, utils
 
 REPLOTTING_CONFIG = '/root/.chia/machinaris/config/replotting.json'
+REPLOTTING_EXCEPTIONS = '/root/.chia/machinaris/config/replotting_exceptions.json'
 GIGAHORSE_COMPRESSION_LEVELS = range(1, 10) # Compression levels are 1 thru 9 for Gigahorse (see https://xch.farm/compressed-plots/)
 BLADEBIT_COMPRESSION_LEVELS = range(1, 12) # Compression levels are 01 thru 11 for Bladebit (see https://xch.farm/compressed-plots/)
 
@@ -44,20 +45,36 @@ def gather_harvesters(db, blockchain):
             app.logger.error("Found no worker for {0} at {1}".format(blockchain, hostname))
     return workers
 
+def load_plot_dir_exceptions(displayname):
+    exceptions = []
+    if os.path.exists(REPLOTTING_EXCEPTIONS):
+        with open(REPLOTTING_EXCEPTIONS, 'r') as fp:
+            settings = json.loads(fp.read())
+            if displayname in settings:
+                exceptions = settings[displayname]
+                app.logger.info("Replotting exceptions on worker {0} are {1}.".format(displayname, exceptions))
+    return exceptions
+
 def gather_oldest_solo_plots(db, harvester):
-    return db.session.query(p.Plot).filter(p.Plot.blockchain == harvester.blockchain, p.Plot.hostname == harvester.hostname,
-        p.Plot.type == 'solo').order_by(p.Plot.created_at.asc()).limit(20).all()
+    dir_exceptions = load_plot_dir_exceptions(harvester.displayname)
+    return db.session.query(p.Plot).filter(p.Plot.blockchain == harvester.blockchain, p.Plot.hostname == harvester.hostname, 
+                p.Plot.type == 'solo', not_(p.Plot.dir.in_(dir_exceptions)),
+            ).order_by(p.Plot.created_at.asc()).limit(20).all()
 
 def gather_uncompressed_plots(db, harvester):
+    dir_exceptions = load_plot_dir_exceptions(harvester.displayname)
     return db.session.query(p.Plot).filter(p.Plot.blockchain == harvester.blockchain, p.Plot.hostname == harvester.hostname,
+        not_(p.Plot.dir.in_(dir_exceptions)),
         and_(*[p.Plot.file.notlike("%-c{0}-%".format(level)) for level in GIGAHORSE_COMPRESSION_LEVELS]), 
         and_(*[p.Plot.file.notlike("%-c0{0}-%".format(level)) for level in BLADEBIT_COMPRESSION_LEVELS])).order_by(p.Plot.created_at.asc()).limit(20).all()
 
 def gather_plots_before(db, harvester, delete_before_date):
+    dir_exceptions = load_plot_dir_exceptions(harvester.displayname)
     return db.session.query(p.Plot).filter(p.Plot.blockchain == harvester.blockchain, p.Plot.hostname == harvester.hostname,
-        p.Plot.created_at < "{0} 00:00".format(delete_before_date)).order_by(p.Plot.created_at.asc()).limit(20).all()
+        p.Plot.created_at < "{0} 00:00".format(delete_before_date), not_(p.Plot.dir.in_(dir_exceptions))).order_by(p.Plot.created_at.asc()).limit(20).all()
 
 def gather_plots_by_ksize(db, harvester, delete_by_ksizes):
+    dir_exceptions = load_plot_dir_exceptions(harvester.displayname)
     if len(delete_by_ksizes) == 0:
         app.logger.error("Invalid empty list of ksizes to select plots for deletion.")
         return []
@@ -65,7 +82,7 @@ def gather_plots_by_ksize(db, harvester, delete_by_ksizes):
         if not ksize in p.KSIZES:
             app.logger.error("Invalid target ksize for deletion provided: {0}".format(ksize))
             return []
-    return db.session.query(p.Plot).filter(p.Plot.blockchain == harvester.blockchain, p.Plot.hostname == harvester.hostname,
+    return db.session.query(p.Plot).filter(p.Plot.blockchain == harvester.blockchain, p.Plot.hostname == harvester.hostname, not_(p.Plot.dir.in_(dir_exceptions)),
         or_(*[p.Plot.file.like("%-k{0}-%".format(ksize)) for ksize in delete_by_ksizes])).order_by(p.Plot.created_at.asc()).limit(20).all()
 
 def limit_deletes_to_accomodate_ksize(db, candidate_plots, free_ksize):

From d84321e1b9f40201ad904a0956e83e0a1593b319 Mon Sep 17 00:00:00 2001
From: Guy Davis <guydavis.ca@gmail.com>
Date: Wed, 28 Jun 2023 15:21:26 -0600
Subject: [PATCH 17/49] Next development version.

---
 .github/workflows/develop-pipscoin.yaml | 51 ------------------------
 .github/workflows/main-pipscoin.yaml    | 52 -------------------------
 .github/workflows/test-pipscoin.yaml    | 50 ------------------------
 .gitignore                              |  2 +
 CHANGELOG.md                            |  1 +
 VERSION                                 |  2 +-
 scripts/forks/pipscoin_install.sh       |  3 +-
 7 files changed, 6 insertions(+), 155 deletions(-)
 delete mode 100644 .github/workflows/develop-pipscoin.yaml
 delete mode 100644 .github/workflows/main-pipscoin.yaml
 delete mode 100644 .github/workflows/test-pipscoin.yaml

diff --git a/.github/workflows/develop-pipscoin.yaml b/.github/workflows/develop-pipscoin.yaml
deleted file mode 100644
index b5b5257a..00000000
--- a/.github/workflows/develop-pipscoin.yaml
+++ /dev/null
@@ -1,51 +0,0 @@
-name: develop-pipscoin
-
-on:
-  push:
-    branches:
-      - 'develop'
-
-jobs:
-  docker:
-    runs-on: ubuntu-22.04
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v3
-      -
-        name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-      - 
-        name: Login to DockerHub
-        uses: docker/login-action@v2 
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      -
-        name: Login to GitHub Container Registry
-        uses: docker/login-action@v2 
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      -
-        name: Build and push
-        uses: docker/build-push-action@v3
-        with:
-          file: docker/dockerfile
-          context: .
-          platforms: linux/amd64
-          provenance: false
-          push: true
-          build-args: |
-            "UBUNTU_VER=jammy"
-            "MACHINARIS_STREAM=develop"
-            "CHIADOG_BRANCH=dev"
-            "FDCLI_BRANCH=dev"
-            "PIPSCOIN_BRANCH=main"
-          tags: |
-            ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-pipscoin:develop
-            ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-pipscoin:develop
diff --git a/.github/workflows/main-pipscoin.yaml b/.github/workflows/main-pipscoin.yaml
deleted file mode 100644
index cfb9483f..00000000
--- a/.github/workflows/main-pipscoin.yaml
+++ /dev/null
@@ -1,52 +0,0 @@
-name: release-pipscoin
-
-on: 
-  workflow_dispatch:
-    inputs:
-      version:
-        description: 'Release Version' 
-
-jobs:
-  docker:
-    runs-on: ubuntu-22.04
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v3
-      -
-        name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-      - 
-        name: Login to DockerHub
-        uses: docker/login-action@v2 
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      -
-        name: Login to GitHub Container Registry
-        uses: docker/login-action@v2 
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      -
-        name: Build and push
-        uses: docker/build-push-action@v3
-        with:
-          file: docker/dockerfile
-          context: .
-          platforms: linux/amd64,linux/arm64
-          provenance: false
-          push: true
-          build-args: |
-            "UBUNTU_VER=jammy"
-            "MACHINARIS_STREAM=latest"
-            "PIPSCOIN_BRANCH=main"
-          tags: |
-            ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-pipscoin:latest
-            ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-pipscoin:v${{ github.event.inputs.version }}
-            ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-pipscoin:latest
-            ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-pipscoin:v${{ github.event.inputs.version }}
diff --git a/.github/workflows/test-pipscoin.yaml b/.github/workflows/test-pipscoin.yaml
deleted file mode 100644
index 85c3df32..00000000
--- a/.github/workflows/test-pipscoin.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
-name: test-pipscoin
-
-on:
-  push:
-    branches:
-      - 'integration'
-
-jobs:
-  docker:
-    runs-on: ubuntu-22.04
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v3
-      -
-        name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-      - 
-        name: Login to DockerHub
-        uses: docker/login-action@v2 
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      -
-        name: Login to GitHub Container Registry
-        uses: docker/login-action@v2 
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      -
-        name: Build and push
-        uses: docker/build-push-action@v3
-        with:
-          file: docker/dockerfile
-          context: .
-          platforms: linux/amd64,linux/arm64
-          provenance: false
-          push: true
-          build-args: |
-            "UBUNTU_VER=jammy"
-            "MACHINARIS_STREAM=test"
-            "CHIADOG_BRANCH=dev"
-            "PIPSCOIN_BRANCH=main"
-          tags: |
-            ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-pipscoin:test
-            ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-pipscoin:test
diff --git a/.gitignore b/.gitignore
index 4f33d601..85de40db 100644
--- a/.gitignore
+++ b/.gitignore
@@ -133,3 +133,5 @@ keyfile
 
 # 3rd party css/js 
 web/static/3rd_party
+
+.github/workflows/.nfs*
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 110d5edb..cd458741 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@ All notable changes to this project will be documented in this file. The format
  - Support for new blockchains and tools DOES NOT imply my endorsement for them.  *Only run those you are comfortable with.*
 
 ## [1.8.2] - 2023-06-28
+## Updated
  - [Chia](https://github.com/Chia-Network/chia-blockchain/releases/tag/1.8.2) to v1.8.2
 ### Notes
  - Bladebit still broken on ability to `ramplot` and `diskplot` as they try to match Gigahorse's GPU plotting. Still awaiting a fix...
diff --git a/VERSION b/VERSION
index 0bfbd573..fe4e75fb 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.8.2
\ No newline at end of file
+1.8.3
\ No newline at end of file
diff --git a/scripts/forks/pipscoin_install.sh b/scripts/forks/pipscoin_install.sh
index 87bd034f..251c6b63 100644
--- a/scripts/forks/pipscoin_install.sh
+++ b/scripts/forks/pipscoin_install.sh
@@ -1,6 +1,7 @@
 #!/bin/env bash
 #
-# Installs Pipscoin as per https://github.com/Pipscoin-Network/pipscoin-blockchain"
+# Dead fork, developer removed it from Github.
+# Installs Pipscoin as per https://github.com/Pipscoin-Network/pipscoin-blockchain
 #
 
 PIPSCOIN_BRANCH=$1

From 73631b1ccb10926a96a69c7c4f176d7a228d30a5 Mon Sep 17 00:00:00 2001
From: Guy Davis <guydavis.ca@gmail.com>
Date: Thu, 6 Jul 2023 09:24:44 -0600
Subject: [PATCH 18/49] Updated Gigahorse version.

---
 .github/workflows/develop-chia.yaml | 6 +++---
 .github/workflows/main-chia.yaml    | 6 +++---
 .github/workflows/main-chives.yaml  | 2 +-
 .github/workflows/main-mmx.yaml     | 2 +-
 .github/workflows/test-chia.yaml    | 4 ++--
 .github/workflows/test-chives.yaml  | 2 +-
 .github/workflows/test-mmx.yaml     | 2 +-
 scripts/forks/chia_install.sh       | 4 ++--
 8 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/develop-chia.yaml b/.github/workflows/develop-chia.yaml
index 1f9a944c..4873f170 100644
--- a/.github/workflows/develop-chia.yaml
+++ b/.github/workflows/develop-chia.yaml
@@ -90,9 +90,9 @@ jobs:
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
-            "GIGAHORSE_BRANCH=v1.8.1.giga13"
-            "CHIA_BRANCH=release/1.8.1"
-            "MADMAX_BRANCH=v1.8.1.giga13"
+            "GIGAHORSE_BRANCH=v1.8.2.giga14"
+            "CHIA_BRANCH=release/1.8.2"
+            "MADMAX_BRANCH=v1.8.2.giga14"
             "PLOTMAN_BRANCH=compress"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-gigahorse:develop
diff --git a/.github/workflows/main-chia.yaml b/.github/workflows/main-chia.yaml
index 2addbc40..342679dc 100644
--- a/.github/workflows/main-chia.yaml
+++ b/.github/workflows/main-chia.yaml
@@ -45,7 +45,7 @@ jobs:
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=latest"
             "CHIA_BRANCH=release/1.8.2"
-            "MADMAX_BRANCH=v1.8.1.giga13"
+            "MADMAX_BRANCH=v1.8.2.giga14"
             "BLADEBIT_BRANCH=cuda-compression"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:latest
@@ -90,9 +90,9 @@ jobs:
           build-args: |
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=latest"
-            "GIGAHORSE_BRANCH=v1.8.1.giga13"
+            "GIGAHORSE_BRANCH=v1.8.2.giga14"
             "CHIA_BRANCH=release/1.8.1"
-            "MADMAX_BRANCH=v1.8.1.giga13"
+            "MADMAX_BRANCH=v1.8.2.giga14"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-gigahorse:latest
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-gigahorse:v${{ github.event.inputs.version }}
diff --git a/.github/workflows/main-chives.yaml b/.github/workflows/main-chives.yaml
index 9dc62a7d..495f1379 100644
--- a/.github/workflows/main-chives.yaml
+++ b/.github/workflows/main-chives.yaml
@@ -46,7 +46,7 @@ jobs:
             "MACHINARIS_STREAM=latest"
             "CHIVES_REPO=https://github.com/HiveProject2021/chives-blockchain.git"
             "CHIVES_BRANCH=1.5.4"
-            "MADMAX_BRANCH=v1.8.1.giga13"
+            "MADMAX_BRANCH=v1.8.2.giga14"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chives:latest
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chives:v${{ github.event.inputs.version }}
diff --git a/.github/workflows/main-mmx.yaml b/.github/workflows/main-mmx.yaml
index 8c0b0fa7..79e8c25b 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"
-            "MADMAX_BRANCH=v1.8.1.giga13"
+            "MADMAX_BRANCH=v1.8.2.giga14"
           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 12964b30..8bbd3e39 100644
--- a/.github/workflows/test-chia.yaml
+++ b/.github/workflows/test-chia.yaml
@@ -47,7 +47,7 @@ jobs:
             "CHIA_BRANCH=release/1.8.2"
             "PLOTMAN_BRANCH=development"
             "BLADEBIT_BRANCH=cuda-compression"
-            "MADMAX_BRANCH=v1.8.1.giga13"
+            "MADMAX_BRANCH=v1.8.2.giga14"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:test
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris:test
@@ -90,7 +90,7 @@ jobs:
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=test"
             "CHIADOG_BRANCH=dev"
-            "GIGAHORSE_BRANCH=v1.8.1.giga13"
+            "GIGAHORSE_BRANCH=v1.8.2.giga14"
             "CHIA_BRANCH=release/1.8.1"
             "PLOTMAN_BRANCH=development"
           tags: |
diff --git a/.github/workflows/test-chives.yaml b/.github/workflows/test-chives.yaml
index 2681016f..ac6c7bf9 100644
--- a/.github/workflows/test-chives.yaml
+++ b/.github/workflows/test-chives.yaml
@@ -91,7 +91,7 @@ jobs:
             "CHIVES_REPO=https://github.com/foxypool/chives-blockchain.git"
             "CHIVES_BRANCH=main"
             "PLOTMAN_BRANCH=development"
-            "MADMAX_BRANCH=v1.8.1.giga13"
+            "MADMAX_BRANCH=v1.8.2.giga14"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chivesfoxy:test
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chivesfoxy:test
diff --git a/.github/workflows/test-mmx.yaml b/.github/workflows/test-mmx.yaml
index ea691e38..9f7fe025 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"
-            "MADMAX_BRANCH=v1.8.1.giga13"
+            "MADMAX_BRANCH=v1.8.2.giga14"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:test
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:test
diff --git a/scripts/forks/chia_install.sh b/scripts/forks/chia_install.sh
index a0357255..bd6958ee 100644
--- a/scripts/forks/chia_install.sh
+++ b/scripts/forks/chia_install.sh
@@ -27,11 +27,11 @@ else
     echo "Installing Chia CUDA binaries on ${arch_name}..."
     cd /tmp
     if [[ "${arch_name}" = "x86_64" ]]; then
-        curl -sLJO https://download.chia.net/bladebit/alpha4.3/chia-blockchain-cuda/chia-installers-linux-deb-intel.zip.zip
+        curl -sLJO https://download.chia.net/bladebit/alpha4.4/chia-blockchain-cuda/chia-installers-linux-deb-intel.zip
         unzip *.zip
         apt-get install ./chia-blockchain-cli*.deb
     elif [[ "${arch_name}" = "arm64" ]]; then
-        curl -sLJO https://download.chia.net/bladebit/alpha4.3/chia-blockchain-cuda/chia-installers-linux-deb-arm64.zip.zip
+        curl -sLJO https://download.chia.net/bladebit/alpha4.4/chia-blockchain-cuda/chia-installers-linux-deb-arm64.zip
         unzip *.zip
         apt-get install ./chia-blockchain-cli*.deb
     else

From 60d2c1eb1a14641ceac807508f997033abd00c23 Mon Sep 17 00:00:00 2001
From: Guy Davis <guydavis.ca@gmail.com>
Date: Thu, 6 Jul 2023 13:18:23 -0600
Subject: [PATCH 19/49] Use BB cuda binary for version #.

---
 common/config/globals.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/config/globals.py b/common/config/globals.py
index 008f4bbd..33adbf6b 100644
--- a/common/config/globals.py
+++ b/common/config/globals.py
@@ -28,7 +28,7 @@
 
 PLOTMAN_SCRIPT = '/chia-blockchain/venv/bin/plotman'
 MADMAX_BINARY = '/usr/bin/chia_plot'
-BLADEBIT_BINARY = '/usr/bin/bladebit'
+BLADEBIT_BINARY = '/usr/bin/bladebit_cuda'
 CHIADOG_PATH = '/chiadog'
 
 RELOAD_MINIMUM_DAYS = 1  # Don't run binaries for version again until this time expires

From 7d16c0c317e55443d667839e87c096071b912a3a Mon Sep 17 00:00:00 2001
From: Guy Davis <guydavis.ca@gmail.com>
Date: Fri, 7 Jul 2023 11:37:04 -0600
Subject: [PATCH 20/49] Develop, use upcoming Chia 1.8.3.

---
 .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 4873f170..d5c21824 100644
--- a/.github/workflows/develop-chia.yaml
+++ b/.github/workflows/develop-chia.yaml
@@ -91,7 +91,7 @@ jobs:
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
             "GIGAHORSE_BRANCH=v1.8.2.giga14"
-            "CHIA_BRANCH=release/1.8.2"
+            "CHIA_BRANCH=release/1.8.3"
             "MADMAX_BRANCH=v1.8.2.giga14"
             "PLOTMAN_BRANCH=compress"
           tags: |

From 74e149db2b602163ad611d7d701b74007db0bf1f Mon Sep 17 00:00:00 2001
From: Guy Davis <guydavis.ca@gmail.com>
Date: Sun, 16 Jul 2023 08:58:52 -0600
Subject: [PATCH 21/49] More alpha updates from CNI...

---
 scripts/bladebit_setup.sh     | 6 ++++--
 scripts/forks/chia_install.sh | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/scripts/bladebit_setup.sh b/scripts/bladebit_setup.sh
index 12b12823..3fc7409c 100644
--- a/scripts/bladebit_setup.sh
+++ b/scripts/bladebit_setup.sh
@@ -24,11 +24,13 @@ if [[ (${mode} =~ ^fullnode.*  || ${mode} =~ "plotter") && (${blockchains} == 'c
             ln -s /bladebit/build/bladebit /usr/bin/bladebit
             cd / && echo "Bladebit version: "`bladebit --version`
             cd /bladebit/build
+            # CNI devs actually zipped a tarball, then labelled it as double zipped...
             if [[ "${arch_name}" = "x86_64" ]]; then
-                curl -sLJO https://download.chia.net/bladebit/alpha4.3/bladebit-cuda-plotter/DEB/bladebit-cuda-v3.0.0-alpha4-ubuntu-x86-64.tar.gz
+                curl -sLJO https://download.chia.net/bladebit/alpha4.4/bladebit-cuda-plotter/bladebit-cuda-v3.0.0-alpha4-ubuntu-x86-64.tar.gz.zip.zip
             else
-                curl -sLJO https://download.chia.net/bladebit/alpha4.3/bladebit-cuda-plotter/DEB/bladebit-cuda-v3.0.0-alpha4-ubuntu-arm64.tar.gz
+                curl -sLJO https://download.chia.net/bladebit/alpha4.4/bladebit-cuda-plotter/bladebit-cuda-v3.0.0-alpha4-ubuntu-arm64.tar.gz.zip.zip
             fi
+            unzip *.zip
             tar -xvf *.tar.gz
             chmod 755 bladebit_cuda
             ln -s /bladebit/build/bladebit_cuda /usr/bin/bladebit_cuda
diff --git a/scripts/forks/chia_install.sh b/scripts/forks/chia_install.sh
index bd6958ee..5ae41107 100644
--- a/scripts/forks/chia_install.sh
+++ b/scripts/forks/chia_install.sh
@@ -27,11 +27,11 @@ else
     echo "Installing Chia CUDA binaries on ${arch_name}..."
     cd /tmp
     if [[ "${arch_name}" = "x86_64" ]]; then
-        curl -sLJO https://download.chia.net/bladebit/alpha4.4/chia-blockchain-cuda/chia-installers-linux-deb-intel.zip
+        curl -sLJO https://download.chia.net/bladebit/alpha4.6/chia-blockchain-cuda/chia-installers-linux-deb-intel.zip
         unzip *.zip
         apt-get install ./chia-blockchain-cli*.deb
     elif [[ "${arch_name}" = "arm64" ]]; then
-        curl -sLJO https://download.chia.net/bladebit/alpha4.4/chia-blockchain-cuda/chia-installers-linux-deb-arm64.zip
+        curl -sLJO https://download.chia.net/bladebit/alpha4.6/chia-blockchain-cuda/chia-installers-linux-deb-arm64.zip
         unzip *.zip
         apt-get install ./chia-blockchain-cli*.deb
     else

From 280a885122e66d81a98a88dac62ea0a0c1dc3b59 Mon Sep 17 00:00:00 2001
From: Guy Davis <guydavis.ca@gmail.com>
Date: Mon, 17 Jul 2023 13:38:59 -0600
Subject: [PATCH 22/49] HDDCoin updated.

---
 CHANGELOG.md                     | 1 +
 scripts/forks/hddcoin_install.sh | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cd458741..ddaa0c5e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ All notable changes to this project will be documented in this file. The format
  - [Bladebit](https://downloads.chia.net/bladebit/) to 3.0.0-alpha4.3. [Status](https://github.com/Chia-Network/bladebit/issues)
  - [Cactus](https://github.com/Cactus-Network/cactus-blockchain/releases/tag/1.8.1) to v1.8.1
  - [Gigahorse](https://github.com/madMAx43v3r/chia-gigahorse/releases/tag/v1.8.1.giga13) to v1.8.1.giga13.
+ - [HDDCoin](https://github.com/HDDcoin-Network/hddcoin-blockchain/releases/tag/3.0.0-beta.2) to 3.0.0-beta2 based on Chia 1.8.2.
  - [MMX](https://github.com/madMAx43v3r/mmx-node/releases/tag/v0.10.6) to v0.10.6. 
 ### Notes
  - Bladebit still broken on ability to `ramplot` and `diskplot` as they try to match Gigahorse's GPU plotting. Still awaiting a fix...
diff --git a/scripts/forks/hddcoin_install.sh b/scripts/forks/hddcoin_install.sh
index 2281cc50..7dcf745b 100644
--- a/scripts/forks/hddcoin_install.sh
+++ b/scripts/forks/hddcoin_install.sh
@@ -4,8 +4,8 @@
 #
 
 HDDCOIN_BRANCH=$1
-# On 2023-05-03
-HASH=6159cf9abaccb5e365c4a5ceebce607fd7254944
+# On 2023-07-17
+HASH=e7004bd47b285158b2ede704dce55c91b108283f
 
 if [ -z ${HDDCOIN_BRANCH} ]; then
     echo 'Skipping HDDCoin install as not requested.'

From d3f9f875d4e9a650df3f23c5465da3f75fc99a26 Mon Sep 17 00:00:00 2001
From: Guy Davis <guydavis.ca@gmail.com>
Date: Thu, 20 Jul 2023 10:25:01 -0600
Subject: [PATCH 23/49] Wheat @ v1.8.2

---
 CHANGELOG.md                   | 1 +
 api/commands/chia_cli.py       | 2 +-
 scripts/forks/wheat_install.sh | 8 ++------
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ddaa0c5e..fc8d091b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@ All notable changes to this project will be documented in this file. The format
  - [Gigahorse](https://github.com/madMAx43v3r/chia-gigahorse/releases/tag/v1.8.1.giga13) to v1.8.1.giga13.
  - [HDDCoin](https://github.com/HDDcoin-Network/hddcoin-blockchain/releases/tag/3.0.0-beta.2) to 3.0.0-beta2 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
  - Bladebit still broken on ability to `ramplot` and `diskplot` as they try to match Gigahorse's GPU plotting. Still awaiting a fix...
  - Support for new blockchains and tools DOES NOT imply my endorsement for them.  *Only run those you are comfortable with.*
diff --git a/api/commands/chia_cli.py b/api/commands/chia_cli.py
index 8de92d9a..afaedebf 100644
--- a/api/commands/chia_cli.py
+++ b/api/commands/chia_cli.py
@@ -37,7 +37,7 @@
 WALLET_SETTINGS_FILE = '/root/.chia/machinaris/config/wallet_settings.json'
 
 # Blockchains which dropped compatibility with `show -c` commands around v1.6
-BLOCKCHAINS_USING_PEER_CMD = ['btcgreen', 'cactus', 'chia', 'chinilla', 'flax', 'flora', 'gigahorse', 'hddcoin', 'littlelambocoin', 'maize', 'one', 'pipscoin', 'shibgreen', 'tad']
+BLOCKCHAINS_USING_PEER_CMD = ['btcgreen', 'cactus', 'chia', 'chinilla', 'flax', 'flora', 'gigahorse', 'hddcoin', 'littlelambocoin', 'maize', 'one', 'pipscoin', 'shibgreen', 'tad', 'wheat']
 
 def load_farm_summary(blockchain):
     chia_binary = globals.get_blockchain_binary(blockchain)
diff --git a/scripts/forks/wheat_install.sh b/scripts/forks/wheat_install.sh
index 376681ec..b0f3fa5a 100644
--- a/scripts/forks/wheat_install.sh
+++ b/scripts/forks/wheat_install.sh
@@ -4,8 +4,8 @@
 #
 
 WHEAT_BRANCH=$1
-# On 2022-08-20
-HASH=07f451a4d124f714246391585c00c79332840759
+# On 2023-07-20
+HASH=5185edcd0ae333da6c157783cf4d1f19ee0a252d
 
 if [ -z ${WHEAT_BRANCH} ]; then
     echo 'Skipping Wheat install as not requested.'
@@ -16,10 +16,6 @@ else
     git submodule update --init mozilla-ca 
     git checkout $HASH
     chmod +x install.sh
-    # 2022-01-30: pip broke due to https://github.com/pypa/pip/issues/10825
-    sed -i 's/upgrade\ pip$/upgrade\ "pip<22.0"/' install.sh
-    # 2022-07-20: Python needs 'packaging==21.3'
-    sed -i 's/packaging==21.0/packaging==21.3/g' setup.py
     /usr/bin/sh ./install.sh
 
     if [ ! -d /chia-blockchain/venv ]; then

From a04b9af1f66b0c0e2dd2384926ea91b64ac9440b Mon Sep 17 00:00:00 2001
From: Guy Davis <guydavis.ca@gmail.com>
Date: Thu, 20 Jul 2023 13:12:12 -0600
Subject: [PATCH 24/49] HDDCoin @ v3.0.0

---
 CHANGELOG.md                     | 2 +-
 scripts/forks/hddcoin_install.sh | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fc8d091b..8dfa3b98 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,7 +13,7 @@ All notable changes to this project will be documented in this file. The format
  - [Bladebit](https://downloads.chia.net/bladebit/) to 3.0.0-alpha4.3. [Status](https://github.com/Chia-Network/bladebit/issues)
  - [Cactus](https://github.com/Cactus-Network/cactus-blockchain/releases/tag/1.8.1) to v1.8.1
  - [Gigahorse](https://github.com/madMAx43v3r/chia-gigahorse/releases/tag/v1.8.1.giga13) to v1.8.1.giga13.
- - [HDDCoin](https://github.com/HDDcoin-Network/hddcoin-blockchain/releases/tag/3.0.0-beta.2) to 3.0.0-beta2 based on Chia 1.8.2.
+ - [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
diff --git a/scripts/forks/hddcoin_install.sh b/scripts/forks/hddcoin_install.sh
index 7dcf745b..02875ee8 100644
--- a/scripts/forks/hddcoin_install.sh
+++ b/scripts/forks/hddcoin_install.sh
@@ -4,8 +4,8 @@
 #
 
 HDDCOIN_BRANCH=$1
-# On 2023-07-17
-HASH=e7004bd47b285158b2ede704dce55c91b108283f
+# On 2023-07-20
+HASH=db37cf7d80e83ad10a64266de451f956efe23526
 
 if [ -z ${HDDCOIN_BRANCH} ]; then
     echo 'Skipping HDDCoin install as not requested.'

From 063a307f99b777b3c8c23eb8fe2d3c5e55916f85 Mon Sep 17 00:00:00 2001
From: Guy Davis <guydavis.ca@gmail.com>
Date: Thu, 20 Jul 2023 13:15:00 -0600
Subject: [PATCH 25/49] Fix for wheat keys add.

---
 scripts/forks/wheat_launch.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/scripts/forks/wheat_launch.sh b/scripts/forks/wheat_launch.sh
index bad3fb2c..ef88217d 100644
--- a/scripts/forks/wheat_launch.sh
+++ b/scripts/forks/wheat_launch.sh
@@ -31,12 +31,14 @@ if [ -f /root/.wheat/mainnet/config/config.yaml ]; then
 fi
 
 # Loop over provided list of key paths
+label_num=0
 for k in ${keys//:/ }; do
   if [[ "${k}" == "persistent" ]]; then
     echo "Not touching key directories."
   elif [ -s ${k} ]; then
-    echo "Adding key at path: ${k}"
-    wheat keys add -f ${k} > /dev/null
+    echo "Adding key #${label_num} at path: ${k}"
+    wheat keys add -l "key_${label_num}" -f ${k} > /dev/null
+    ((label_num=label_num+1))
   fi
 done
 

From 486a308d338bd6a860523fee530e52004033328c Mon Sep 17 00:00:00 2001
From: Guy Davis <guydavis.ca@gmail.com>
Date: Mon, 24 Jul 2023 14:32:18 -0600
Subject: [PATCH 26/49] Chia 2.0.0rc1

---
 CREDITS.md                    | 1 +
 scripts/forks/chia_install.sh | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CREDITS.md b/CREDITS.md
index ef171b23..5385ca9a 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -92,6 +92,7 @@ A big thanks to all that contributed with dev and test including:
 * @qoole
 * @miguell
 * @slowfinger
+* @ToTo
 
 ## Trademark Notice
 CHIA NETWORK INC, CHIA™, the CHIA BLOCKCHAIN™, the CHIA PROTOCOL™, CHIALISP™ and the “leaf Logo” (including the leaf logo alone when it refers to or indicates Chia), are trademarks or registered trademarks of Chia Network, Inc., a Delaware corporation.  *There is no affliation between this Machinaris project and the main Chia Network project.*
\ No newline at end of file
diff --git a/scripts/forks/chia_install.sh b/scripts/forks/chia_install.sh
index 5ae41107..9d9baeee 100644
--- a/scripts/forks/chia_install.sh
+++ b/scripts/forks/chia_install.sh
@@ -27,11 +27,11 @@ else
     echo "Installing Chia CUDA binaries on ${arch_name}..."
     cd /tmp
     if [[ "${arch_name}" = "x86_64" ]]; then
-        curl -sLJO https://download.chia.net/bladebit/alpha4.6/chia-blockchain-cuda/chia-installers-linux-deb-intel.zip
+        curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.0.0-rc1/chia-blockchain-cli_2.0.0rc1-1_amd64.deb
         unzip *.zip
         apt-get install ./chia-blockchain-cli*.deb
     elif [[ "${arch_name}" = "arm64" ]]; then
-        curl -sLJO https://download.chia.net/bladebit/alpha4.6/chia-blockchain-cuda/chia-installers-linux-deb-arm64.zip
+        curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.0.0-rc1/chia-blockchain-cli_2.0.0rc1-1_arm64.deb
         unzip *.zip
         apt-get install ./chia-blockchain-cli*.deb
     else

From bd4eefcd5fb09f760bf019d6e7fb741d426557cd Mon Sep 17 00:00:00 2001
From: Guy Davis <guydavis.ca@gmail.com>
Date: Mon, 24 Jul 2023 16:07:46 -0600
Subject: [PATCH 27/49] Bladebit 3.0.0rc1

---
 scripts/bladebit_setup.sh | 30 ++++++++++++------------------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/scripts/bladebit_setup.sh b/scripts/bladebit_setup.sh
index 3fc7409c..cc8a2d52 100644
--- a/scripts/bladebit_setup.sh
+++ b/scripts/bladebit_setup.sh
@@ -3,11 +3,8 @@
 # Installs bladebit - A fast Chia plotter, offering disk, ram, and gpu modes.
 # See https://github.com/Chia-Network/bladebit
 #
-# Can't acutally build on Github servers, must build on each target system 
-# during container launch, otherwise get all sorts of errors.
-#
 
-BLADEBIT_BRANCH=$1
+BLADEBIT_BRANCH=$1  # Now ignored...
 
 if [[ (${mode} =~ ^fullnode.*  || ${mode} =~ "plotter") && (${blockchains} == 'chia') ]]; then
     if [ ! -f /usr/bin/bladebit ] && [[ "${bladebit_skip_build}" != 'true' ]]; then
@@ -15,27 +12,24 @@ if [[ (${mode} =~ ^fullnode.*  || ${mode} =~ "plotter") && (${blockchains} == 'c
         if [[ "${arch_name}" = "x86_64" ]] || [[ "${arch_name}" = "arm64" ]]; then
             apt update && apt install -y build-essential cmake libgmp-dev libnuma-dev
             cd /
-            echo "Cloning bladebit from https://github.com/Chia-Network/bladebit.git on branch:${BLADEBIT_BRANCH}"
-            git clone --recursive --branch ${BLADEBIT_BRANCH} https://github.com/Chia-Network/bladebit.git
-            cd /bladebit && echo "Building bladebit on ${arch_name}..."
-            mkdir -p build && cd build
-            cmake ..
-            cmake --build . --target bladebit --config Release
-            ln -s /bladebit/build/bladebit /usr/bin/bladebit
+            # Link to the bundled bladebit from Chia CLI DEB install...
+            ln -s /opt/chia/bladebit/bladebit /usr/bin/bladebit
             cd / && echo "Bladebit version: "`bladebit --version`
-            cd /bladebit/build
-            # CNI devs actually zipped a tarball, then labelled it as double zipped...
+
+            # Now install CNI's separate binary for actual GPU plotting...
+            cd /opt/chia/bladebit
             if [[ "${arch_name}" = "x86_64" ]]; then
-                curl -sLJO https://download.chia.net/bladebit/alpha4.4/bladebit-cuda-plotter/bladebit-cuda-v3.0.0-alpha4-ubuntu-x86-64.tar.gz.zip.zip
+                curl -sLJO https://github.com/Chia-Network/bladebit/releases/download/v3.0.0-rc1/bladebit-cuda-v3.0.0-rc1-ubuntu-x86-64.tar.gz
             else
-                curl -sLJO https://download.chia.net/bladebit/alpha4.4/bladebit-cuda-plotter/bladebit-cuda-v3.0.0-alpha4-ubuntu-arm64.tar.gz.zip.zip
+                curl -sLJO https://github.com/Chia-Network/bladebit/releases/download/v3.0.0-rc1/bladebit-cuda-v3.0.0-rc1-ubuntu-arm64.tar.gz
             fi
-            unzip *.zip
             tar -xvf *.tar.gz
             chmod 755 bladebit_cuda
-            ln -s /bladebit/build/bladebit_cuda /usr/bin/bladebit_cuda
+            chown root.root ./bladebit*
+            ln -s /opt/chia/bladebit/bladebit_cuda /usr/bin/bladebit_cuda
+            cd / && echo "Bladebit CUDA version: "`bladebit_cuda --version`
         else
-            echo "Building bladebit skipped -> unsupported architecture: ${arch_name}"
+            echo "Bladebit binary download skipped -> unsupported architecture: ${arch_name}"
         fi
     fi
 fi

From ff56f0f76b63f1a9726e8079867958a730e3cc16 Mon Sep 17 00:00:00 2001
From: Guy Davis <guydavis.ca@gmail.com>
Date: Tue, 25 Jul 2023 10:37:57 -0600
Subject: [PATCH 28/49] BPX is dead.

---
 .github/workflows/develop-bpx.yaml | 50 ----------------------------
 .github/workflows/main-bpx.yaml    | 52 ------------------------------
 .github/workflows/test-bpx.yaml    | 50 ----------------------------
 3 files changed, 152 deletions(-)
 delete mode 100644 .github/workflows/develop-bpx.yaml
 delete mode 100644 .github/workflows/main-bpx.yaml
 delete mode 100644 .github/workflows/test-bpx.yaml

diff --git a/.github/workflows/develop-bpx.yaml b/.github/workflows/develop-bpx.yaml
deleted file mode 100644
index 668c09fc..00000000
--- a/.github/workflows/develop-bpx.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
-name: develop-bpx
-
-on:
-  push:
-    branches:
-      - 'develop'
-jobs:
-  docker:
-    runs-on: ubuntu-22.04
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v3
-      -
-        name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-      - 
-        name: Login to DockerHub
-        uses: docker/login-action@v2 
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      -
-        name: Login to GitHub Container Registry
-        uses: docker/login-action@v2 
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      -
-        name: Build and push
-        uses: docker/build-push-action@v4
-        with:
-          file: docker/dockerfile
-          context: .
-          platforms: linux/amd64
-          provenance: false
-          push: true
-          build-args: |
-            "UBUNTU_VER=jammy"
-            "MACHINARIS_STREAM=develop"
-            "CHIADOG_BRANCH=dev"
-            "FDCLI_BRANCH=dev"
-            "BPX_BRANCH=main"
-          tags: |
-            ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-bpx:develop
-            ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-bpx:develop
diff --git a/.github/workflows/main-bpx.yaml b/.github/workflows/main-bpx.yaml
deleted file mode 100644
index f22f1857..00000000
--- a/.github/workflows/main-bpx.yaml
+++ /dev/null
@@ -1,52 +0,0 @@
-name: release-bpx
-
-on: 
-  workflow_dispatch:
-    inputs:
-      version:
-        description: 'Release Version' 
-
-jobs:
-  docker:
-    runs-on: ubuntu-22.04
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v3
-      -
-        name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-      - 
-        name: Login to DockerHub
-        uses: docker/login-action@v2 
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      -
-        name: Login to GitHub Container Registry
-        uses: docker/login-action@v2 
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      -
-        name: Build and push
-        uses: docker/build-push-action@v4
-        with:
-          file: docker/dockerfile
-          context: .
-          platforms: linux/amd64,linux/arm64
-          provenance: false
-          push: true
-          build-args: |
-            "UBUNTU_VER=jammy"
-            "MACHINARIS_STREAM=latest"
-            "BPX_BRANCH=main"
-          tags: |
-            ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-bpx:latest
-            ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-bpx:v${{ github.event.inputs.version }}
-            ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-bpx:latest
-            ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-bpx:v${{ github.event.inputs.version }}
diff --git a/.github/workflows/test-bpx.yaml b/.github/workflows/test-bpx.yaml
deleted file mode 100644
index 6e7656b5..00000000
--- a/.github/workflows/test-bpx.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
-name: test-bpx
-
-on:
-  push:
-    branches:
-      - 'integration'
-
-jobs:
-  docker:
-    runs-on: ubuntu-22.04
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v3
-      -
-        name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-      - 
-        name: Login to DockerHub
-        uses: docker/login-action@v2 
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      -
-        name: Login to GitHub Container Registry
-        uses: docker/login-action@v2 
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      -
-        name: Build and push
-        uses: docker/build-push-action@v4
-        with:
-          file: docker/dockerfile
-          context: .
-          platforms: linux/amd64,linux/arm64
-          provenance: false
-          push: true
-          build-args: |
-            "UBUNTU_VER=jammy"
-            "MACHINARIS_STREAM=test"
-            "CHIADOG_BRANCH=dev"
-            "BPX_BRANCH=main"
-          tags: |
-            ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-bpx:test
-            ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-bpx:test

From 9ac8531a3dd07cc2dd0112e460af66029d4a26eb Mon Sep 17 00:00:00 2001
From: Guy Davis <guydavis.ca@gmail.com>
Date: Wed, 26 Jul 2023 20:55:01 -0600
Subject: [PATCH 29/49] Chia 2.0.0rc2

---
 CHANGELOG.md                  | 5 ++---
 scripts/forks/chia_install.sh | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8dfa3b98..3be7262e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,14 +10,13 @@ All notable changes to this project will be documented in this file. The format
 ### Changed
  - Deprecated stale blockchains, by hiding from Worker wizards: BPX, N-Chain, Silicoin, Stor
 ### Updated
- - [Bladebit](https://downloads.chia.net/bladebit/) to 3.0.0-alpha4.3. [Status](https://github.com/Chia-Network/bladebit/issues)
+ - [Bladebit](https://github.com/Chia-Network/bladebit/releases/tag/v3.0.0-rc1) to 3.0.0rc1.
  - [Cactus](https://github.com/Cactus-Network/cactus-blockchain/releases/tag/1.8.1) to v1.8.1
- - [Gigahorse](https://github.com/madMAx43v3r/chia-gigahorse/releases/tag/v1.8.1.giga13) to v1.8.1.giga13.
+ - [Gigahorse](https://github.com/madMAx43v3r/chia-gigahorse/releases/tag/v1.8.1.giga14) to v1.8.1.giga14.
  - [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
- - Bladebit still broken on ability to `ramplot` and `diskplot` as they try to match Gigahorse's GPU plotting. Still awaiting a fix...
  - Support for new blockchains and tools DOES NOT imply my endorsement for them.  *Only run those you are comfortable with.*
 
 ## [1.8.2] - 2023-06-28
diff --git a/scripts/forks/chia_install.sh b/scripts/forks/chia_install.sh
index 9d9baeee..2cebd92c 100644
--- a/scripts/forks/chia_install.sh
+++ b/scripts/forks/chia_install.sh
@@ -27,11 +27,11 @@ 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.0.0-rc1/chia-blockchain-cli_2.0.0rc1-1_amd64.deb
+        curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.0.0-rc2/chia-blockchain-cli_2.0.0rc2-1_amd64.deb
         unzip *.zip
         apt-get install ./chia-blockchain-cli*.deb
     elif [[ "${arch_name}" = "arm64" ]]; then
-        curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.0.0-rc1/chia-blockchain-cli_2.0.0rc1-1_arm64.deb
+        curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.0.0-rc2/chia-blockchain-cli_2.0.0rc2-1_arm64.deb
         unzip *.zip
         apt-get install ./chia-blockchain-cli*.deb
     else

From 234a70f367c62e0b8232de92d14562fe51554e96 Mon Sep 17 00:00:00 2001
From: Guy Davis <guydavis.ca@gmail.com>
Date: Wed, 26 Jul 2023 21:02:16 -0600
Subject: [PATCH 30/49] Updated Javascript libs.

---
 scripts/pull_3rd_party_libs.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/scripts/pull_3rd_party_libs.sh b/scripts/pull_3rd_party_libs.sh
index 5b8e3752..cb54e06f 100755
--- a/scripts/pull_3rd_party_libs.sh
+++ b/scripts/pull_3rd_party_libs.sh
@@ -4,19 +4,19 @@
 #
 
 # Bootstrap and Icons
-BSI_VERSION=1.10.3
-BOOTSTRAP_VERSION=5.3.0
+BSI_VERSION=1.10.5
+BOOTSTRAP_VERSION=5.3.1
 BASEPATH=${JS_LIBS_BASEPATH:-/machinaris/web/static/3rd_party}
 
 # Mapping library
-LEAFLET_VERSION=1.9.3
+LEAFLET_VERSION=1.9.4
 
 # List of other css/js links
 LIST="
-https://cdn.datatables.net/1.13.2/css/dataTables.bootstrap5.css
-https://cdn.datatables.net/1.13.2/js/dataTables.bootstrap5.js
-https://cdn.datatables.net/1.13.2/js/jquery.dataTables.js
-https://cdn.jsdelivr.net/npm/chart.js@4.2.1/dist/chart.umd.min.js
+https://cdn.datatables.net/1.13.5/css/dataTables.bootstrap5.css
+https://cdn.datatables.net/1.13.5/js/dataTables.bootstrap5.js
+https://cdn.datatables.net/1.13.5/js/jquery.dataTables.js
+https://cdn.jsdelivr.net/npm/chart.js@4.3.2/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.6.3/dist/jquery.min.js

From 635d984417332c8a9f448888268a66b492eb2c69 Mon Sep 17 00:00:00 2001
From: Guy Davis <guydavis.ca@gmail.com>
Date: Sat, 5 Aug 2023 09:52:26 -0600
Subject: [PATCH 31/49] Chia @ 2.0.0rc3

---
 CHANGELOG.md                  |  3 ++-
 scripts/bladebit_setup.sh     | 18 +++++++++++-------
 scripts/forks/chia_install.sh |  4 ++--
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3be7262e..02b0e32c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file. The format
 
 ## [Unreleased] - 2023-?-?
 ### Added
- - [Chia](https://docs.google.com/document/d/1MSJ8JzAQGDGrnEzdr4zK4IcTDbokJfpHypn8Dt60Mx8/) - Alpha GPU-farming, requires manual config changes. [Status](https://github.com/Chia-Network/chia-blockchain/issues)
+ - [Chia](https://docs.google.com/document/d/1MSJ8JzAQGDGrnEzdr4zK4IcTDbokJfpHypn8Dt60Mx8/) - Beta GPU-farming, requires manual config changes. [Status](https://github.com/Chia-Network/chia-blockchain/issues)
  - Request a new plot check, via 'Recheck' button added to Check results dialog on Farming page.  
  - Optionally exclude certain plot directories from replotting check to free disk space. Useful for drives only partially dedicated to holding plots.
 ### Changed
@@ -12,6 +12,7 @@ All notable changes to this project will be documented in this file. The format
 ### Updated
  - [Bladebit](https://github.com/Chia-Network/bladebit/releases/tag/v3.0.0-rc1) to 3.0.0rc1.
  - [Cactus](https://github.com/Cactus-Network/cactus-blockchain/releases/tag/1.8.1) to v1.8.1
+ - [Chia](https://github.com/Chia-Network/chia-blockchain/releases/tag/2.0.0-rc3) to v2.0.0.
  - [Gigahorse](https://github.com/madMAx43v3r/chia-gigahorse/releases/tag/v1.8.1.giga14) to v1.8.1.giga14.
  - [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. 
diff --git a/scripts/bladebit_setup.sh b/scripts/bladebit_setup.sh
index cc8a2d52..d57ae8d1 100644
--- a/scripts/bladebit_setup.sh
+++ b/scripts/bladebit_setup.sh
@@ -4,7 +4,7 @@
 # See https://github.com/Chia-Network/bladebit
 #
 
-BLADEBIT_BRANCH=$1  # Now ignored...
+BLADEBIT_BRANCH=$1  # Now ignored as install binaries from Github.
 
 if [[ (${mode} =~ ^fullnode.*  || ${mode} =~ "plotter") && (${blockchains} == 'chia') ]]; then
     if [ ! -f /usr/bin/bladebit ] && [[ "${bladebit_skip_build}" != 'true' ]]; then
@@ -12,20 +12,24 @@ if [[ (${mode} =~ ^fullnode.*  || ${mode} =~ "plotter") && (${blockchains} == 'c
         if [[ "${arch_name}" = "x86_64" ]] || [[ "${arch_name}" = "arm64" ]]; then
             apt update && apt install -y build-essential cmake libgmp-dev libnuma-dev
             cd /
-            # Link to the bundled bladebit from Chia CLI DEB install...
-            ln -s /opt/chia/bladebit/bladebit /usr/bin/bladebit
-            cd / && echo "Bladebit version: "`bladebit --version`
 
             # 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
-                curl -sLJO https://github.com/Chia-Network/bladebit/releases/download/v3.0.0-rc1/bladebit-cuda-v3.0.0-rc1-ubuntu-x86-64.tar.gz
+                curl -sLJO https://github.com/Chia-Network/bladebit/releases/download/v3.0.0/bladebit-v3.0.0-ubuntu-x86-64.tar.gz
+                curl -sLJO https://github.com/Chia-Network/bladebit/releases/download/v3.0.0/bladebit-cuda-v3.0.0-ubuntu-x86-64.tar.gz
             else
-                curl -sLJO https://github.com/Chia-Network/bladebit/releases/download/v3.0.0-rc1/bladebit-cuda-v3.0.0-rc1-ubuntu-arm64.tar.gz
+                curl -sLJO https://github.com/Chia-Network/bladebit/releases/download/v3.0.0/bladebit-v3.0.0-ubuntu-arm64.tar.gz
+                curl -sLJO https://github.com/Chia-Network/bladebit/releases/download/v3.0.0/bladebit-cuda-v3.0.0-ubuntu-arm64.tar.gz
             fi
             tar -xvf *.tar.gz
-            chmod 755 bladebit_cuda
+            rm -f *tar.gz
+            chmod 755 bladebit*
             chown root.root ./bladebit*
+
+            ln -s /opt/chia/bladebit/bladebit /usr/bin/bladebit
+            cd / && echo "Bladebit version: "`bladebit --version`
             ln -s /opt/chia/bladebit/bladebit_cuda /usr/bin/bladebit_cuda
             cd / && echo "Bladebit CUDA version: "`bladebit_cuda --version`
         else
diff --git a/scripts/forks/chia_install.sh b/scripts/forks/chia_install.sh
index 2cebd92c..6a6f3a5b 100644
--- a/scripts/forks/chia_install.sh
+++ b/scripts/forks/chia_install.sh
@@ -27,11 +27,11 @@ 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.0.0-rc2/chia-blockchain-cli_2.0.0rc2-1_amd64.deb
+        curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.0.0-rc3/chia-blockchain-cli_2.0.0rc3-1_amd64.deb
         unzip *.zip
         apt-get install ./chia-blockchain-cli*.deb
     elif [[ "${arch_name}" = "arm64" ]]; then
-        curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.0.0-rc2/chia-blockchain-cli_2.0.0rc2-1_arm64.deb
+        curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.0.0-rc3/chia-blockchain-cli_2.0.0rc3-1_arm64.deb
         unzip *.zip
         apt-get install ./chia-blockchain-cli*.deb
     else

From 40bc29eacfb5b4f61cb571359b452a97cb2103a2 Mon Sep 17 00:00:00 2001
From: Guy Davis <guydavis.ca@gmail.com>
Date: Sat, 5 Aug 2023 10:18:30 -0600
Subject: [PATCH 32/49] Fix untar of Bladebit.

---
 scripts/bladebit_setup.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/bladebit_setup.sh b/scripts/bladebit_setup.sh
index d57ae8d1..400613e8 100644
--- a/scripts/bladebit_setup.sh
+++ b/scripts/bladebit_setup.sh
@@ -23,7 +23,8 @@ if [[ (${mode} =~ ^fullnode.*  || ${mode} =~ "plotter") && (${blockchains} == 'c
                 curl -sLJO https://github.com/Chia-Network/bladebit/releases/download/v3.0.0/bladebit-v3.0.0-ubuntu-arm64.tar.gz
                 curl -sLJO https://github.com/Chia-Network/bladebit/releases/download/v3.0.0/bladebit-cuda-v3.0.0-ubuntu-arm64.tar.gz
             fi
-            tar -xvf *.tar.gz
+            tar -xvf bladebit-v3.*.tar.gz
+            tar -xvf bladebit-cuda-v3.*.tar.gz
             rm -f *tar.gz
             chmod 755 bladebit*
             chown root.root ./bladebit*

From 67daecd5092b9edb3af844af1f981ec70c1df72d Mon Sep 17 00:00:00 2001
From: Guy Davis <guydavis.ca@gmail.com>
Date: Sun, 6 Aug 2023 08:35:25 -0600
Subject: [PATCH 33/49] Bump Machinaris version to match upcoming Chia.

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index fe4e75fb..359a5b95 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.8.3
\ No newline at end of file
+2.0.0
\ No newline at end of file

From 175730b7a10a9c68436780129e402606ae1ec0ee Mon Sep 17 00:00:00 2001
From: Guy Davis <guydavis.ca@gmail.com>
Date: Tue, 8 Aug 2023 14:12:20 -0600
Subject: [PATCH 34/49] Fix for BSI packaging path change.

---
 scripts/pull_3rd_party_libs.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/pull_3rd_party_libs.sh b/scripts/pull_3rd_party_libs.sh
index cb54e06f..2b8604a8 100755
--- a/scripts/pull_3rd_party_libs.sh
+++ b/scripts/pull_3rd_party_libs.sh
@@ -16,7 +16,8 @@ LIST="
 https://cdn.datatables.net/1.13.5/css/dataTables.bootstrap5.css
 https://cdn.datatables.net/1.13.5/js/dataTables.bootstrap5.js
 https://cdn.datatables.net/1.13.5/js/jquery.dataTables.js
-https://cdn.jsdelivr.net/npm/chart.js@4.3.2/dist/chart.umd.min.js
+https://cdn.jsdelivr.net/npm/chart.js@4.3.3/dist/chart.umd.js.map
+https://cdn.jsdelivr.net/npm/chart.js@4.3.3/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.6.3/dist/jquery.min.js
@@ -31,6 +32,7 @@ done
 wget -nv -O ${BASEPATH}/bsi-icons.zip "https://github.com/twbs/icons/releases/download/v${BSI_VERSION}/bootstrap-icons-${BSI_VERSION}.zip" && \
 unzip -q -o ${BASEPATH}/bsi-icons.zip -d $BASEPATH/ && \
 mv $BASEPATH/bootstrap-icons-${BSI_VERSION} $BASEPATH/icons && \
+mv ${BASEPATH}/icons/font/* ${BASEPATH}/icons/ && rmdir ${BASEPATH}/icons/font/ && \ 
 rm -f ${BASEPATH}/bsi-icons.zip
 
 # Bootstrap

From 738091116d34df7a4474a82659aab11012b035f5 Mon Sep 17 00:00:00 2001
From: Guy Davis <guydavis.ca@gmail.com>
Date: Wed, 9 Aug 2023 16:00:18 -0600
Subject: [PATCH 35/49] Chia @ 2.0.0rc4

---
 .github/workflows/develop-chia.yaml |  2 +-
 .github/workflows/main-chia.yaml    |  2 +-
 .github/workflows/test-chia.yaml    |  2 +-
 CHANGELOG.md                        | 11 ++++-------
 CREDITS.md                          |  1 +
 scripts/forks/chia_install.sh       |  4 ++--
 6 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/develop-chia.yaml b/.github/workflows/develop-chia.yaml
index d5c21824..0862670d 100644
--- a/.github/workflows/develop-chia.yaml
+++ b/.github/workflows/develop-chia.yaml
@@ -44,7 +44,7 @@ jobs:
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
-            "CHIA_BRANCH=main"
+            "CHIA_BRANCH=release/2.0.0"
             "BLADEBIT_BRANCH=cuda-compression"
             "MADMAX_BRANCH=master"
             "PLOTMAN_BRANCH=compress"
diff --git a/.github/workflows/main-chia.yaml b/.github/workflows/main-chia.yaml
index 342679dc..f13077f1 100644
--- a/.github/workflows/main-chia.yaml
+++ b/.github/workflows/main-chia.yaml
@@ -44,7 +44,7 @@ jobs:
           build-args: |
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=latest"
-            "CHIA_BRANCH=release/1.8.2"
+            "CHIA_BRANCH=release/2.0.0"
             "MADMAX_BRANCH=v1.8.2.giga14"
             "BLADEBIT_BRANCH=cuda-compression"
           tags: |
diff --git a/.github/workflows/test-chia.yaml b/.github/workflows/test-chia.yaml
index 8bbd3e39..27f46c47 100644
--- a/.github/workflows/test-chia.yaml
+++ b/.github/workflows/test-chia.yaml
@@ -44,7 +44,7 @@ jobs:
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=test"
             "CHIADOG_BRANCH=dev"
-            "CHIA_BRANCH=release/1.8.2"
+            "CHIA_BRANCH=release/2.0.0"
             "PLOTMAN_BRANCH=development"
             "BLADEBIT_BRANCH=cuda-compression"
             "MADMAX_BRANCH=v1.8.2.giga14"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 02b0e32c..b0e2a6c6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,23 +2,20 @@
 
 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] - 2023-?-?
+## [2.0.0] - 2023-08-?
 ### Added
- - [Chia](https://docs.google.com/document/d/1MSJ8JzAQGDGrnEzdr4zK4IcTDbokJfpHypn8Dt60Mx8/) - Beta GPU-farming, requires manual config changes. [Status](https://github.com/Chia-Network/chia-blockchain/issues)
  - Request a new plot check, via 'Recheck' button added to Check results dialog on Farming page.  
  - Optionally exclude certain plot directories from replotting check to free disk space. Useful for drives only partially dedicated to holding plots.
 ### Changed
- - Deprecated stale blockchains, by hiding from Worker wizards: BPX, N-Chain, Silicoin, Stor
+ - Deprecated stale blockchains, by hiding them from Worker wizards: BPX, N-Chain, Silicoin, Stor
 ### Updated
- - [Bladebit](https://github.com/Chia-Network/bladebit/releases/tag/v3.0.0-rc1) to 3.0.0rc1.
+ - [Bladebit](https://github.com/Chia-Network/bladebit/releases/tag/v3.0.0) to 3.0.0.
  - [Cactus](https://github.com/Cactus-Network/cactus-blockchain/releases/tag/1.8.1) to v1.8.1
- - [Chia](https://github.com/Chia-Network/chia-blockchain/releases/tag/2.0.0-rc3) to v2.0.0.
+ - [Chia](https://github.com/Chia-Network/chia-blockchain/releases/tag/2.0.0) to v2.0.0.
  - [Gigahorse](https://github.com/madMAx43v3r/chia-gigahorse/releases/tag/v1.8.1.giga14) to v1.8.1.giga14.
  - [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
- - Support for new blockchains and tools DOES NOT imply my endorsement for them.  *Only run those you are comfortable with.*
 
 ## [1.8.2] - 2023-06-28
 ## Updated
diff --git a/CREDITS.md b/CREDITS.md
index 5385ca9a..461cf096 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -93,6 +93,7 @@ A big thanks to all that contributed with dev and test including:
 * @miguell
 * @slowfinger
 * @ToTo
+* @Finball
 
 ## Trademark Notice
 CHIA NETWORK INC, CHIA™, the CHIA BLOCKCHAIN™, the CHIA PROTOCOL™, CHIALISP™ and the “leaf Logo” (including the leaf logo alone when it refers to or indicates Chia), are trademarks or registered trademarks of Chia Network, Inc., a Delaware corporation.  *There is no affliation between this Machinaris project and the main Chia Network project.*
\ No newline at end of file
diff --git a/scripts/forks/chia_install.sh b/scripts/forks/chia_install.sh
index 6a6f3a5b..1f272771 100644
--- a/scripts/forks/chia_install.sh
+++ b/scripts/forks/chia_install.sh
@@ -27,11 +27,11 @@ 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.0.0-rc3/chia-blockchain-cli_2.0.0rc3-1_amd64.deb
+        curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.0.0-rc4/chia-blockchain-cli_2.0.0rc4-1_amd64.deb
         unzip *.zip
         apt-get install ./chia-blockchain-cli*.deb
     elif [[ "${arch_name}" = "arm64" ]]; then
-        curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.0.0-rc3/chia-blockchain-cli_2.0.0rc3-1_arm64.deb
+        curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.0.0-rc4/chia-blockchain-cli_2.0.0rc4-1_arm64.deb
         unzip *.zip
         apt-get install ./chia-blockchain-cli*.deb
     else

From 19b00ce5abcb6f6e500f7a089725bc189c924756 Mon Sep 17 00:00:00 2001
From: Guy Davis <guydavis.ca@gmail.com>
Date: Thu, 10 Aug 2023 10:56:19 -0600
Subject: [PATCH 36/49] Test support for running Wallet on Gigahorse fullnode.

---
 api/commands/chia_cli.py          | 6 ------
 api/schedules/status_wallets.py   | 4 +---
 scripts/forks/gigahorse_launch.sh | 8 ++++++--
 web/actions/plotman.py            | 2 --
 web/actions/pools.py              | 2 --
 web/models/chia.py                | 2 --
 web/models/pools.py               | 4 ----
 web/routes.py                     | 2 --
 web/templates/index.html          | 2 --
 9 files changed, 7 insertions(+), 25 deletions(-)

diff --git a/api/commands/chia_cli.py b/api/commands/chia_cli.py
index afaedebf..69b9a68e 100644
--- a/api/commands/chia_cli.py
+++ b/api/commands/chia_cli.py
@@ -169,9 +169,6 @@ def restart_farmer(blockchain):
     Popen("nohup sh -c '{0}' >/dev/null 2>&1 &".format(cmd), cwd=working_dir, stdout=PIPE, stderr=PIPE, shell=True)
 
 def start_wallet(blockchain):
-    if blockchain == 'gigahorse':
-        app.logger.info("Gigahorse doesn't run it's own wallet.  Machinaris uses the wallet of the main Chia container instead.")
-        return
     chia_binary = globals.get_blockchain_binary(blockchain)
     working_dir = globals.get_blockchain_working_dir(blockchain)
     cmd = "{0} start wallet -r".format(chia_binary)
@@ -179,9 +176,6 @@ def start_wallet(blockchain):
     Popen("nohup sh -c '{0}' >/dev/null 2>&1 &".format(cmd), cwd=working_dir, stdout=PIPE, stderr=PIPE, shell=True)
 
 def pause_wallet(blockchain):
-    if blockchain == 'gigahorse':
-        app.logger.info("Gigahorse doesn't run it's own wallet.  Machinaris uses the wallet of the main Chia container instead.")
-        return
     chia_binary = globals.get_blockchain_binary(blockchain)
     working_dir = globals.get_blockchain_working_dir(blockchain)
     if globals.legacy_blockchain(blockchain):  # Old chains will stop fullnode(!) if ask to stop just the wallet...
diff --git a/api/schedules/status_wallets.py b/api/schedules/status_wallets.py
index 795f3f4b..6320c4b2 100644
--- a/api/schedules/status_wallets.py
+++ b/api/schedules/status_wallets.py
@@ -24,9 +24,7 @@ def update():
         try:
             blockchain = globals.enabled_blockchains()[0]
             hostname = utils.get_hostname()
-            if blockchain == 'gigahorse':
-                return # Gigahorse is Chia blockchain with proprietary plot files, no wallet running
-            elif blockchain == 'mmx':
+            if blockchain == 'mmx':
                 public_wallet = mmx_cli.load_wallet_show(blockchain)
             else:
                 public_wallet = chia_cli.load_wallet_show(blockchain)
diff --git a/scripts/forks/gigahorse_launch.sh b/scripts/forks/gigahorse_launch.sh
index c16f2fcc..e30a3ef0 100644
--- a/scripts/forks/gigahorse_launch.sh
+++ b/scripts/forks/gigahorse_launch.sh
@@ -91,9 +91,13 @@ chmod 755 -R /root/.chia/mainnet/config/ssl/ &> /dev/null
 
 /usr/bin/bash /machinaris/scripts/gpu_drivers_setup.sh
 
-# Start services based on mode selected. Always skip a duplicate Chia wallet launch
+# Start services based on mode selected. 
 if [[ ${mode} =~ ^fullnode.* ]]; then
-  /chia-gigahorse-farmer/chia.bin start farmer-no-wallet
+  if [ -f /root/.chia/machinaris/config/wallet_settings.json ]; then
+    /chia-gigahorse-farmer/chia.bin start farmer-no-wallet
+  else
+    /chia-gigahorse-farmer/chia.bin start farmer
+  fi
 elif [[ ${mode} =~ ^farmer.* ]]; then
   /chia-gigahorse-farmer/chia.bin start farmer-only
 elif [[ ${mode} =~ ^harvester.* ]]; then
diff --git a/web/actions/plotman.py b/web/actions/plotman.py
index b7df4ef2..c9b3c75d 100644
--- a/web/actions/plotman.py
+++ b/web/actions/plotman.py
@@ -171,8 +171,6 @@ def load_key_pk(type, blockchain):
 
 def load_pool_contract_address(blockchain):
     pool_blockchain = blockchain
-    if blockchain == 'gigahorse':  # Use the pool settings for Chia when checking for Gigahorse
-        pool_blockchain = 'chia'
     plotnfts = p.load_plotnfts_by_blockchain(pool_blockchain)
     if len(plotnfts.rows) == 1:
         m = re.search('Pool contract address .*: (\w+)'.format(type), plotnfts.rows[0]['details'])
diff --git a/web/actions/pools.py b/web/actions/pools.py
index 0929b8db..04c4c29d 100644
--- a/web/actions/pools.py
+++ b/web/actions/pools.py
@@ -83,8 +83,6 @@ def send_request(fullnode, selected_blockchain, launcher_ids, choices, pool_urls
 def get_pool_configs():
     configs = {}
     for blockchain in po.POOLABLE_BLOCKCHAINS:
-        if blockchain == 'gigahorse':
-            continue
         plotnfts = db.session.query(pn.Plotnft).filter(pn.Plotnft.blockchain == blockchain).all()
         wallets = db.session.query(w.Wallet).filter(w.Wallet.blockchain == blockchain).all()
         configs[blockchain] = PoolConfigs(blockchain, plotnfts, wallets)
diff --git a/web/models/chia.py b/web/models/chia.py
index c67fbdd6..05616af7 100644
--- a/web/models/chia.py
+++ b/web/models/chia.py
@@ -35,8 +35,6 @@ def __init__(self, blockchains, farms, wallets, stats):
                 app.logger.error("No farm summary found for {0}".format(blockchain['blockchain']))
                 continue
             blockhain_for_wallet = blockchain['blockchain']
-            if blockhain_for_wallet == 'gigahorse':
-                blockhain_for_wallet = 'chia' # Same wallet
             wallet = self.find_wallet(wallets, blockhain_for_wallet)
             if not wallet:
                 app.logger.error("No wallet found for {0}".format(blockhain_for_wallet))
diff --git a/web/models/pools.py b/web/models/pools.py
index 03b4b977..c09365bc 100644
--- a/web/models/pools.py
+++ b/web/models/pools.py
@@ -17,8 +17,6 @@ def __init__(self, plotnfts):
         self.columns = ['hostname', 'details', 'updated_at']
         self.rows = []
         for plotnft in plotnfts:
-            if plotnft.blockchain == 'gigahorse':
-                continue  # Ignore these, use Chia instead.
             try:
                 app.logger.debug("Found worker with hostname '{0}'".format(plotnft.hostname))
                 displayname = w.get_worker(plotnft.hostname).displayname
@@ -52,8 +50,6 @@ class Pools:
     def __init__(self, pools, plotnfts):
         self.blockchains = {}
         for pool in pools:
-            if pool.blockchain == 'gigahorse':
-                continue  # Ignore these, use Chia instead.
             try:
                 app.logger.debug("Found worker with hostname '{0}'".format(pool.hostname))
                 displayname = w.get_worker(pool.hostname, pool.blockchain).displayname
diff --git a/web/routes.py b/web/routes.py
index 9374e168..68ff0625 100644
--- a/web/routes.py
+++ b/web/routes.py
@@ -508,8 +508,6 @@ def settings_pools():
     fullnodes_by_blockchain = worker.get_fullnodes_by_blockchain()
     poolable_blockchains = []
     for pb in po.POOLABLE_BLOCKCHAINS:
-        if pb == 'gigahorse':
-            continue
         if pb in fullnodes_by_blockchain:
             poolable_blockchains.append(pb)
     return render_template('settings/pools.html',  global_config=gc, fullnodes_by_blockchain=fullnodes_by_blockchain,
diff --git a/web/templates/index.html b/web/templates/index.html
index 71d1d3e2..c90aef30 100644
--- a/web/templates/index.html
+++ b/web/templates/index.html
@@ -83,7 +83,6 @@ <h6 class="display-6 text-center">{{_('Total Plots Size')}}</h6>
           </div>
         </div>
 
-        {% if blockchain != 'gigahorse' %}
         <div class="row align-items-md-stretch">
           <div class="col-md-4" style="margin-top:5px; margin-bottom:5px;">
             <div class="h-100 p-2 text-white bg-dark rounded-3">
@@ -131,7 +130,6 @@ <h6 class="display-6 text-center">{{blockchain|capitalize}} - {{_('Wallets')}}</
           </div>
         </div>
         {% endif %}
-        {% endif %}
 
         {% if farms[blockchain].challenges.labels|length > 0 %}
         <div class="col-md-12" style="margin-top:5px; margin-bottom:5px;">

From 6e75207b6a04be3a4e59456282aaf7d5a515cd6b Mon Sep 17 00:00:00 2001
From: Guy Davis <guydavis.ca@gmail.com>
Date: Thu, 10 Aug 2023 11:08:55 -0600
Subject: [PATCH 37/49] Gigahorse needs a separate wallet start call.

---
 scripts/forks/gigahorse_launch.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/forks/gigahorse_launch.sh b/scripts/forks/gigahorse_launch.sh
index e30a3ef0..3808b68d 100644
--- a/scripts/forks/gigahorse_launch.sh
+++ b/scripts/forks/gigahorse_launch.sh
@@ -97,6 +97,7 @@ if [[ ${mode} =~ ^fullnode.* ]]; then
     /chia-gigahorse-farmer/chia.bin start farmer-no-wallet
   else
     /chia-gigahorse-farmer/chia.bin start farmer
+    /chia-gigahorse-farmer/chia.bin start wallet
   fi
 elif [[ ${mode} =~ ^farmer.* ]]; then
   /chia-gigahorse-farmer/chia.bin start farmer-only

From a1eecb01f4def1d649dfefa4d77dee7aaef1c7a0 Mon Sep 17 00:00:00 2001
From: Guy Davis <guydavis.ca@gmail.com>
Date: Thu, 10 Aug 2023 17:20:10 -0600
Subject: [PATCH 38/49] More fixes for wallet on Gigahorse.

---
 api/schedules/status_plotnfts.py | 2 +-
 common/config/globals.py         | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/api/schedules/status_plotnfts.py b/api/schedules/status_plotnfts.py
index bf44bf58..c56ceb6b 100644
--- a/api/schedules/status_plotnfts.py
+++ b/api/schedules/status_plotnfts.py
@@ -36,7 +36,7 @@ def update():
     with app.app_context():
         try:
             for blockchain in globals.enabled_blockchains():
-                if not blockchain in ['chia', 'chives']:
+                if not blockchain in ['chia', 'chives', 'gigahorse']:
                     continue
                 hostname = utils.get_hostname()
                 plotnfts = pools_cli.load_plotnft_show(blockchain)
diff --git a/common/config/globals.py b/common/config/globals.py
index 33adbf6b..0982ec35 100644
--- a/common/config/globals.py
+++ b/common/config/globals.py
@@ -492,7 +492,10 @@ def wallet_running():
     blockchain = enabled_blockchains()[0]
     if blockchain == 'mmx':
         return True # Always running for MMX
-    chia_binary_short = get_blockchain_binary(blockchain).split('/')[-1]
+    if blockchain == 'gigahorse':
+        chia_binary_short = 'chia' # wallet process is 'chia_wallet'
+    else:
+        chia_binary_short = get_blockchain_binary(blockchain).split('/')[-1]
     try:
         cmd = "pidof {0}_wallet".format(chia_binary_short)
         proc = Popen(cmd, stdout=PIPE, stderr=PIPE, shell=True)

From 4ef10558367b3a05a9ae8652d93b350292115a42 Mon Sep 17 00:00:00 2001
From: Guy Davis <guydavis.ca@gmail.com>
Date: Tue, 15 Aug 2023 21:02:18 -0600
Subject: [PATCH 39/49] Collect daily effort for Gigahorse.

---
 api/schedules/stats_effort.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/schedules/stats_effort.py b/api/schedules/stats_effort.py
index 3bf04f2e..ca75553d 100644
--- a/api/schedules/stats_effort.py
+++ b/api/schedules/stats_effort.py
@@ -56,7 +56,7 @@ def collect():
         current_datetime = datetime.datetime.now().strftime("%Y%m%d%H%M")
         blockchain = globals.enabled_blockchains()[0]
         try:
-            if blockchain in ['gigahorse', 'mmx']:
+            if blockchain in ['mmx']:
                 app.logger.debug("Unable to calculate effort for MMX blockchain.  Only Chia and forks supported.")
                 return
             farm_summary = chia_cli.load_farm_summary(blockchain)

From 137eca253f07dcf84992875a5a7539f728cec943 Mon Sep 17 00:00:00 2001
From: Guy Davis <guydavis.ca@gmail.com>
Date: Tue, 15 Aug 2023 21:07:08 -0600
Subject: [PATCH 40/49] More EDV calc for Gigahorse.

---
 api/commands/websvcs.py       | 3 ++-
 api/schedules/stats_effort.py | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/api/commands/websvcs.py b/api/commands/websvcs.py
index 5d8898d2..aed6776f 100644
--- a/api/commands/websvcs.py
+++ b/api/commands/websvcs.py
@@ -226,8 +226,9 @@ def cold_wallet_farmed_balance(blockchain):
 
 # Only for Chia on the controller for now.
 def cold_wallet_farmed_most_recent_date(blockchain):
-    if blockchain != 'chia':
+    if blockchain != 'chia' and blockchain != 'gigahorse':
         raise Exception("Most recent cold wallet farmed block lookup not supported off controller.")
+    blockchain = 'chia' # Treat gigahorse like chia
     most_recent_farmed_block_time = 0 # Seconds since epoch
     addresses_per_blockchain = load_cold_wallet_addresses()
     if blockchain in addresses_per_blockchain:
diff --git a/api/schedules/stats_effort.py b/api/schedules/stats_effort.py
index ca75553d..7c0d597b 100644
--- a/api/schedules/stats_effort.py
+++ b/api/schedules/stats_effort.py
@@ -72,7 +72,7 @@ def collect():
                     most_recent_block_reward_time = transaction.created_at_time
                     break
             # For Chia only (on the controller), check for a more recently farmed block time in cold wallet transactions
-            if blockchain == 'chia':
+            if blockchain in ['chia', 'gigahorse']:
                 most_recent_block_reward_time_cold_wallet =  websvcs.cold_wallet_farmed_most_recent_date(blockchain) # Order is reversed; newest to oldest
                 if most_recent_block_reward_time < most_recent_block_reward_time_cold_wallet:
                     app.logger.info("At {0}, a more recent cold wallet fee reward was found.".format(readable(most_recent_block_reward_time_cold_wallet)))

From 73cde65838bd8af00007e6f0a6a77aad50774f3c Mon Sep 17 00:00:00 2001
From: Guy Davis <guydavis.ca@gmail.com>
Date: Thu, 17 Aug 2023 08:16:26 -0600
Subject: [PATCH 41/49] Chia 2.0.0rc5

---
 scripts/forks/chia_install.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/forks/chia_install.sh b/scripts/forks/chia_install.sh
index 1f272771..61c81cf3 100644
--- a/scripts/forks/chia_install.sh
+++ b/scripts/forks/chia_install.sh
@@ -27,11 +27,11 @@ 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.0.0-rc4/chia-blockchain-cli_2.0.0rc4-1_amd64.deb
+        curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.0.0-rc5/chia-blockchain-cli-2.0.0rc5-1.x86_64.rpm
         unzip *.zip
         apt-get install ./chia-blockchain-cli*.deb
     elif [[ "${arch_name}" = "arm64" ]]; then
-        curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.0.0-rc4/chia-blockchain-cli_2.0.0rc4-1_arm64.deb
+        curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.0.0-rc5/chia-blockchain-cli_2.0.0rc5-1_arm64.deb
         unzip *.zip
         apt-get install ./chia-blockchain-cli*.deb
     else

From 9e7ce33571e418fbdd694a5f9dd3ddbebcccbe0d Mon Sep 17 00:00:00 2001
From: Guy Davis <guydavis.ca@gmail.com>
Date: Thu, 17 Aug 2023 08:25:12 -0600
Subject: [PATCH 42/49] amd64 works

---
 scripts/forks/chia_install.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/scripts/forks/chia_install.sh b/scripts/forks/chia_install.sh
index 61c81cf3..d2a5d284 100644
--- a/scripts/forks/chia_install.sh
+++ b/scripts/forks/chia_install.sh
@@ -27,12 +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.0.0-rc5/chia-blockchain-cli-2.0.0rc5-1.x86_64.rpm
-        unzip *.zip
+        curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.0.0-rc5/chia-blockchain-cli_2.0.0rc5-1_amd64.deb
         apt-get install ./chia-blockchain-cli*.deb
     elif [[ "${arch_name}" = "arm64" ]]; then
         curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.0.0-rc5/chia-blockchain-cli_2.0.0rc5-1_arm64.deb
-        unzip *.zip
         apt-get install ./chia-blockchain-cli*.deb
     else
         echo "Installing Chia CUDA binaries skipped -> unsupported architecture: ${arch_name}"

From 1eedf662fa7b3c0f72da685a6ea239bf0be2b31c Mon Sep 17 00:00:00 2001
From: Guy Davis <guydavis.ca@gmail.com>
Date: Fri, 18 Aug 2023 15:13:59 -0600
Subject: [PATCH 43/49] Chia 2.0.0rc6

---
 scripts/forks/chia_install.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/forks/chia_install.sh b/scripts/forks/chia_install.sh
index d2a5d284..a4b68e05 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.0.0-rc5/chia-blockchain-cli_2.0.0rc5-1_amd64.deb
+        curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.0.0-rc6/chia-blockchain-cli_2.0.0rc6-1_amd64.deb
         apt-get install ./chia-blockchain-cli*.deb
     elif [[ "${arch_name}" = "arm64" ]]; then
-        curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.0.0-rc5/chia-blockchain-cli_2.0.0rc5-1_arm64.deb
+        curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.0.0-rc6/chia-blockchain-cli_2.0.0rc6-1_arm64.deb
         apt-get install ./chia-blockchain-cli*.deb
     else
         echo "Installing Chia CUDA binaries skipped -> unsupported architecture: ${arch_name}"

From 4d8567212e58ec2538c07ac4532dc6c73b08ec43 Mon Sep 17 00:00:00 2001
From: Guy Davis <guydavis.ca@gmail.com>
Date: Sun, 20 Aug 2023 11:40:04 -0600
Subject: [PATCH 44/49] Latest Cactus and Chia updates.

---
 CHANGELOG.md                    | 2 +-
 scripts/forks/cactus_install.sh | 4 ++--
 scripts/forks/chia_install.sh   | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b0e2a6c6..d1b85be1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,7 +10,7 @@ All notable changes to this project will be documented in this file. The format
  - Deprecated stale blockchains, by hiding them from Worker wizards: BPX, N-Chain, Silicoin, Stor
 ### Updated
  - [Bladebit](https://github.com/Chia-Network/bladebit/releases/tag/v3.0.0) to 3.0.0.
- - [Cactus](https://github.com/Cactus-Network/cactus-blockchain/releases/tag/1.8.1) to v1.8.1
+ - [Cactus](https://github.com/Cactus-Network/cactus-blockchain/releases/tag/2.0.0) to v2.0.0
  - [Chia](https://github.com/Chia-Network/chia-blockchain/releases/tag/2.0.0) to v2.0.0.
  - [Gigahorse](https://github.com/madMAx43v3r/chia-gigahorse/releases/tag/v1.8.1.giga14) to v1.8.1.giga14.
  - [HDDCoin](https://github.com/HDDcoin-Network/hddcoin-blockchain/releases/tag/3.0.0) to 3.0.0 based on Chia 1.8.2.
diff --git a/scripts/forks/cactus_install.sh b/scripts/forks/cactus_install.sh
index b8237bca..2ff51286 100644
--- a/scripts/forks/cactus_install.sh
+++ b/scripts/forks/cactus_install.sh
@@ -4,8 +4,8 @@
 #
 
 CACTUS_BRANCH=$1
-# On 2023-05-19
-HASH=8c7956d9fdd751235824af2630d472ccd77fa936
+# On 2023-08-20
+HASH=9144b99fa71baa9ab84c178b0fe0cf539613514f
 
 if [ -z ${CACTUS_BRANCH} ]; then
     echo 'Skipping Cactus install as not requested.'
diff --git a/scripts/forks/chia_install.sh b/scripts/forks/chia_install.sh
index a4b68e05..dbedf5f2 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.0.0-rc6/chia-blockchain-cli_2.0.0rc6-1_amd64.deb
+        curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.0.1-b2/chia-blockchain-cli_2.0.1b2-1_amd64.deb
         apt-get install ./chia-blockchain-cli*.deb
     elif [[ "${arch_name}" = "arm64" ]]; then
-        curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.0.0-rc6/chia-blockchain-cli_2.0.0rc6-1_arm64.deb
+        curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.0.1-b2/chia-blockchain-cli_2.0.1b2-1_arm64.deb
         apt-get install ./chia-blockchain-cli*.deb
     else
         echo "Installing Chia CUDA binaries skipped -> unsupported architecture: ${arch_name}"

From 9ef268893e4be40cf9f61ae38765436e910477cd Mon Sep 17 00:00:00 2001
From: Guy Davis <guydavis.ca@gmail.com>
Date: Sun, 20 Aug 2023 22:06:27 -0600
Subject: [PATCH 45/49] Back to rc6 apparently.

---
 scripts/forks/chia_install.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/forks/chia_install.sh b/scripts/forks/chia_install.sh
index dbedf5f2..a4b68e05 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.0.1-b2/chia-blockchain-cli_2.0.1b2-1_amd64.deb
+        curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.0.0-rc6/chia-blockchain-cli_2.0.0rc6-1_amd64.deb
         apt-get install ./chia-blockchain-cli*.deb
     elif [[ "${arch_name}" = "arm64" ]]; then
-        curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.0.1-b2/chia-blockchain-cli_2.0.1b2-1_arm64.deb
+        curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.0.0-rc6/chia-blockchain-cli_2.0.0rc6-1_arm64.deb
         apt-get install ./chia-blockchain-cli*.deb
     else
         echo "Installing Chia CUDA binaries skipped -> unsupported architecture: ${arch_name}"

From 79c4b7ddc31358c4120cfa46e1ba667b5e1da59d Mon Sep 17 00:00:00 2001
From: Guy Davis <guydavis.ca@gmail.com>
Date: Mon, 21 Aug 2023 16:23:24 -0600
Subject: [PATCH 46/49] Support for AUTO_ARCHIVE on startup.

---
 docker/dockerfile           | 1 +
 scripts/plotman_autoplot.sh | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/docker/dockerfile b/docker/dockerfile
index e605eb03..1f60915b 100644
--- a/docker/dockerfile
+++ b/docker/dockerfile
@@ -138,6 +138,7 @@ ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US.UTF-8
 ENV XDG_CONFIG_HOME=/root/.chia
 ENV AUTO_PLOT=false
+ENV AUTO_ARCHIVE=false
 ENV PLOTMAN_BRANCH=${PLOTMAN_BRANCH}
 ENV CHIADOG_BRANCH=${CHIADOG_BRANCH}
 ENV FDCLI_BRANCH=${FDCLI_BRANCH}
diff --git a/scripts/plotman_autoplot.sh b/scripts/plotman_autoplot.sh
index f1bf85e4..b8a0bafa 100644
--- a/scripts/plotman_autoplot.sh
+++ b/scripts/plotman_autoplot.sh
@@ -1,6 +1,6 @@
 #!/bin/env bash
 #
-# Starts Plotman, when AUTO_PLOT enabled, on a Chia/Chives fullnode or a plotter instance
+# Starts Plotman, when AUTO_PLOT/AUTO_ARCHIVE are enabled, on a Chia/Chives/MMX/Gigahorse fullnode or a plotter instance
 #
 
 if [[ (${mode} =~ ^fullnode.*  || ${mode} =~ "plotter") && (${blockchains} == 'chia' || ${blockchains} == 'chives' || ${blockchains} == 'mmx' || ${blockchains} == 'gigahorse') ]]; then
@@ -8,4 +8,8 @@ if [[ (${mode} =~ ^fullnode.*  || ${mode} =~ "plotter") && (${blockchains} == 'c
     if [ ${AUTO_PLOT,,} = "true" ]; then
         nohup plotman plot >> /root/.chia/plotman/logs/plotman.log 2>&1 &
     fi
+    # Start archiving automatically if requested (not the default)
+    if [ ${AUTO_ARCHIVE,,} = "true" ]; then
+        nohup plotman archive >> /root/.chia/plotman/logs/archiver.log 2>&1 &
+    fi
 fi
\ No newline at end of file

From 585da3287326b3d37fa5d642322c986391b00717 Mon Sep 17 00:00:00 2001
From: Guy Davis <guydavis.ca@gmail.com>
Date: Tue, 22 Aug 2023 14:32:45 -0600
Subject: [PATCH 47/49] Fix for torrent link.

---
 scripts/forks/chia_launch.sh      | 4 +---
 scripts/forks/gigahorse_launch.sh | 6 ++----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/scripts/forks/chia_launch.sh b/scripts/forks/chia_launch.sh
index 3a7f52cf..04aa261b 100644
--- a/scripts/forks/chia_launch.sh
+++ b/scripts/forks/chia_launch.sh
@@ -36,13 +36,11 @@ if [[ "${blockchain_db_download}" == 'true' ]] \
   echo "Please be patient as this takes hours now, but saves days of syncing time later."
   mkdir -p /root/.chia/mainnet/db/chia && cd /root/.chia/mainnet/db/chia
   # Latest Blockchain DB, first try direct download, then fallback to slower torrent
-  torrent=$(curl -s https://www.chia.net/downloads/ | grep -Po "https:.*/blockchain_v2_mainnet.\d{4}-\d{2}-\d{2}.sqlite.gz.torrent")
+  torrent=$(curl -s https://www.chia.net/downloads/ | grep -Po "https://torrents.chia.net/databases/mainnet/mainnet.\d{4}-\d{2}-\d{2}.tar.gz.torrent")
   echo "Please be patient! Downloading blockchain database indirectly (via libtorrent) from: "
   echo "    ${torrent}"
   curl -skLJ -O ${torrent}
-  #deactivate # Use the system python
   /usr/bin/python /machinaris/scripts/chiadb_download.py $PWD/*.torrent >> /tmp/chiadb_download.log 2>&1
-  #cd /chia-blockchain && . ./activate # Re-activate
   echo "Now decompressing the blockchain database..."
   cd /root/.chia/mainnet/db/chia && gunzip *.gz
   cd /root/.chia/mainnet/db
diff --git a/scripts/forks/gigahorse_launch.sh b/scripts/forks/gigahorse_launch.sh
index 3808b68d..c6d65d32 100644
--- a/scripts/forks/gigahorse_launch.sh
+++ b/scripts/forks/gigahorse_launch.sh
@@ -32,14 +32,12 @@ if [[ "${blockchain_db_download}" == 'true' ]] \
   echo "Downloading Chia blockchain DB (many GBs in size) on first launch..."
   echo "Please be patient as this takes hours now, but saves days of syncing time later."
   mkdir -p /root/.chia/mainnet/db/chia && cd /root/.chia/mainnet/db/chia
-  # Latest Blockchain DB, first try direct download, then fallback to slower torrent
-  torrent=$(curl -s https://www.chia.net/downloads/ | grep -Po "https:.*/blockchain_v2_mainnet.\d{4}-\d{2}-\d{2}.sqlite.gz.torrent")
+    # Latest Blockchain DB, first try direct download, then fallback to slower torrent
+  torrent=$(curl -s https://www.chia.net/downloads/ | grep -Po "https://torrents.chia.net/databases/mainnet/mainnet.\d{4}-\d{2}-\d{2}.tar.gz.torrent")
   echo "Please be patient! Downloading blockchain database indirectly (via libtorrent) from: "
   echo "    ${torrent}"
   curl -skLJ -O ${torrent}
-  deactivate 2>&1 >/dev/null # Use the system python
   /usr/bin/python /machinaris/scripts/chiadb_download.py $PWD/*.torrent >> /tmp/chiadb_download.log 2>&1
-  cd /chia-blockchain && . ./activate # Re-activate
   echo "Now decompressing the blockchain database..."
   cd /root/.chia/mainnet/db/chia && gunzip *.gz
   cd /root/.chia/mainnet/db

From 01811b2538d64516c221f8dce4a9deccb126c426 Mon Sep 17 00:00:00 2001
From: Guy Davis <guydavis.ca@gmail.com>
Date: Tue, 22 Aug 2023 15:34:44 -0600
Subject: [PATCH 48/49] More changes for CNI torrent download.

---
 scripts/forks/chia_launch.sh      | 2 +-
 scripts/forks/gigahorse_launch.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/forks/chia_launch.sh b/scripts/forks/chia_launch.sh
index 04aa261b..2717bfa5 100644
--- a/scripts/forks/chia_launch.sh
+++ b/scripts/forks/chia_launch.sh
@@ -42,7 +42,7 @@ if [[ "${blockchain_db_download}" == 'true' ]] \
   curl -skLJ -O ${torrent}
   /usr/bin/python /machinaris/scripts/chiadb_download.py $PWD/*.torrent >> /tmp/chiadb_download.log 2>&1
   echo "Now decompressing the blockchain database..."
-  cd /root/.chia/mainnet/db/chia && gunzip *.gz
+  cd /root/.chia/mainnet/db/chia && tar -xf *.gz
   cd /root/.chia/mainnet/db
   mv /root/.chia/mainnet/db/chia/blockchain_v2_mainnet.*.sqlite blockchain_v2_mainnet.sqlite
   rm -rf /root/.chia/mainnet/db/chia
diff --git a/scripts/forks/gigahorse_launch.sh b/scripts/forks/gigahorse_launch.sh
index c6d65d32..6e330e50 100644
--- a/scripts/forks/gigahorse_launch.sh
+++ b/scripts/forks/gigahorse_launch.sh
@@ -39,7 +39,7 @@ if [[ "${blockchain_db_download}" == 'true' ]] \
   curl -skLJ -O ${torrent}
   /usr/bin/python /machinaris/scripts/chiadb_download.py $PWD/*.torrent >> /tmp/chiadb_download.log 2>&1
   echo "Now decompressing the blockchain database..."
-  cd /root/.chia/mainnet/db/chia && gunzip *.gz
+  cd /root/.chia/mainnet/db/chia && tar -xf *.gz
   cd /root/.chia/mainnet/db
   mv /root/.chia/mainnet/db/chia/blockchain_v2_mainnet.*.sqlite blockchain_v2_mainnet.sqlite
   rm -rf /root/.chia/mainnet/db/chia

From 9eee5250851cadf446ff38f718e11223c81699fe Mon Sep 17 00:00:00 2001
From: Guy Davis <guydavis.ca@gmail.com>
Date: Thu, 24 Aug 2023 10:52:49 -0600
Subject: [PATCH 49/49] Eight months after Gigahorse, finally Chia 2.0.0 drops.

---
 CHANGELOG.md                  | 2 +-
 scripts/forks/chia_install.sh | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d1b85be1..30ec9e21 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 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.0.0] - 2023-08-?
+## [2.0.0] - 2023-08-24
 ### Added
  - Request a new plot check, via 'Recheck' button added to Check results dialog on Farming page.  
  - Optionally exclude certain plot directories from replotting check to free disk space. Useful for drives only partially dedicated to holding plots.
diff --git a/scripts/forks/chia_install.sh b/scripts/forks/chia_install.sh
index a4b68e05..fcf74671 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.0.0-rc6/chia-blockchain-cli_2.0.0rc6-1_amd64.deb
+        curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.0.0/chia-blockchain-cli_2.0.0-1_amd64.deb
         apt-get install ./chia-blockchain-cli*.deb
     elif [[ "${arch_name}" = "arm64" ]]; then
-        curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.0.0-rc6/chia-blockchain-cli_2.0.0rc6-1_arm64.deb
+        curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.0.0/chia-blockchain-cli_2.0.0-1_arm64.deb
         apt-get install ./chia-blockchain-cli*.deb
     else
         echo "Installing Chia CUDA binaries skipped -> unsupported architecture: ${arch_name}"