Merge pull request #906 from guydavis/integration

Machinaris v1.8.1

.github/workflows/develop-chia.yaml

@@ -44,7 +44,7 @@ jobs:
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
-            "CHIA_BRANCH=release/1.8.0"
+            "CHIA_BRANCH=release/1.8.1"
             "BLADEBIT_BRANCH=cuda-compression"
             "MADMAX_BRANCH=master"
             "PLOTMAN_BRANCH=compress"
@@ -90,9 +90,9 @@ jobs:
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
-            "GIGAHORSE_BRANCH=v1.8.0.giga10"
+            "GIGAHORSE_BRANCH=v1.8.0.giga11"
             "CHIA_BRANCH=release/1.8.0"
-            "MADMAX_BRANCH=v1.8.0.giga10"
+            "MADMAX_BRANCH=v1.8.0.giga11"
             "PLOTMAN_BRANCH=compress"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-gigahorse:develop

.github/workflows/develop-flora.yaml

@@ -41,11 +41,11 @@ jobs:
           provenance: false
           push: true
           build-args: |
-            "UBUNTU_VER=focal"
+            "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
             "FDCLI_BRANCH=dev"
-            "FLORA_BRANCH=main"
+            "FLORA_BRANCH=latest"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-flora:develop
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-flora:develop

.github/workflows/main-chia.yaml

@@ -44,8 +44,8 @@ jobs:
           build-args: |
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=latest"
-            "CHIA_BRANCH=release/1.8.0"
-            "MADMAX_BRANCH=v1.8.0.giga10"
+            "CHIA_BRANCH=release/1.8.1"
+            "MADMAX_BRANCH=v1.8.0.giga11"
             "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.giga10"
+            "GIGAHORSE_BRANCH=v1.8.0.giga11"
             "CHIA_BRANCH=release/1.8.0"
-            "MADMAX_BRANCH=v1.8.0.giga10"
+            "MADMAX_BRANCH=v1.8.0.giga11"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-gigahorse:latest
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-gigahorse:v${{ github.event.inputs.version }}

.github/workflows/main-chives.yaml

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

.github/workflows/main-flora.yaml

@@ -42,9 +42,9 @@ jobs:
           provenance: false
           push: true
           build-args: |
-            "UBUNTU_VER=focal"
+            "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=latest"
-            "FLORA_BRANCH=main"
+            "FLORA_BRANCH=latest"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-flora:latest
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-flora:v${{ github.event.inputs.version }}

.github/workflows/main-mmx.yaml

@@ -46,7 +46,7 @@ jobs:
             "MACHINARIS_STREAM=latest"
             "CHIA_BRANCH=latest"
             "MMX_BRANCH=v0.10.2"
-            "MADMAX_BRANCH=v1.8.0.giga10"
+            "MADMAX_BRANCH=v1.8.0.giga11"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:latest
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:v${{ github.event.inputs.version }}

.github/workflows/test-chia.yaml

@@ -44,10 +44,10 @@ jobs:
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=test"
             "CHIADOG_BRANCH=dev"
-            "CHIA_BRANCH=release/1.8.0"
+            "CHIA_BRANCH=release/1.8.1"
             "PLOTMAN_BRANCH=development"
             "BLADEBIT_BRANCH=cuda-compression"
-            "MADMAX_BRANCH=v1.8.0.giga10"
+            "MADMAX_BRANCH=v1.8.0.giga11"
           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.0.giga10"
+            "GIGAHORSE_BRANCH=v1.8.0.giga11"
             "CHIA_BRANCH=release/1.8.0"
             "PLOTMAN_BRANCH=development"
           tags: |

.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.giga10"
+            "MADMAX_BRANCH=v1.8.0.giga11"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chivesfoxy:test
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chivesfoxy:test

.github/workflows/test-flora.yaml

@@ -41,10 +41,10 @@ jobs:
           provenance: false
           push: true
           build-args: |
-            "UBUNTU_VER=focal"
+            "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=test"
             "CHIADOG_BRANCH=dev"
-            "FLORA_BRANCH=main"
+            "FLORA_BRANCH=latest"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-flora:test
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-flora:test

.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.giga10"
+            "MADMAX_BRANCH=v1.8.0.giga11"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:test
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:test

CHANGELOG.md

@@ -2,38 +2,53 @@
 
 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).
 
+## [1.8.1] - 2023-05-17
+### Changed
+ - 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
+ - [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
+ - [Flora](https://github.com/ageorge95/flora-blockchain/releases/tag/1.8.0_flora) to v1.8.0, updated by @ageorge95.
+ - [Gigahorse](https://github.com/madMAx43v3r/chia-gigahorse/releases/tag/v1.8.0.giga11) to v1.8.0.giga11.
+### 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.0] - 2023-05-04
 ### Added
  - Concurrent plot transfers to both remote and local archive paths. Previously was one plot transferred at a time.
  - Checking for adequate free space on both tmp and dst paths before starting another plotting job.
  - Replotting selection (Farming page settings) can now target uncompressed plots for deletion.
-## Changed
+### Changed
  - Fix for Download button on Settings pages that were providing the wrong config file. Thanks @TuftyBruno.
- - Updated German and Portugese translations.  Thanks to @slowfinger and @antcasq. All contributions are appreciated.
+ - Updated German and Portuguese translations.  Thanks to @slowfinger and @antcasq. All contributions are appreciated.
  - Follow Chia version numbers (like 1.8.0) from now on, as Machinaris is on their release cadence.
-## Updated 
+### Updated 
  - [Cactus](https://github.com/Cactus-Network/cactus-blockchain/releases/tag/1.7.1) to v1.7.1
  - [Chia](https://github.com/Chia-Network/chia-blockchain/releases/tag/1.8.0) to v1.8.0
- - [Gigahorse](https://github.com/madMAx43v3r/chia-gigahorse/releases/tag/v1.7.1.giga10) to v1.7.1.giga10.
+ - [Gigahorse](https://github.com/madMAx43v3r/chia-gigahorse/releases/tag/v1.8.0.giga10) to v1.8.0.giga10.
  - [HDDCoin](https://github.com/HDDcoin-Network/hddcoin-blockchain/releases/tag/3.0.0-beta.1) to 3.0.0-beta1 based on Chia 1.7.0.
  - [MMX](https://github.com/madMAx43v3r/mmx-node/releases/tag/v0.10.2) to (v0.10.2) on `testnet10`. 
 
 ## [0.8.8] - 2023-03-23
 ### Added
  - Support for running a blockchain timelord with environment variable `mode` set to `fullnode,timelord`.
  - Optional config setting to restart fork fullnodes if they consume too much memory. Looking at you Flora, HDDCoin, N-Chain, etc...
-## Changed
+### Changed
  - On fresh install, optionally download (via libtorrent) a recent [Chia database checkpoint](https://www.chia.net/downloads/).
  - Fixes for Gigahorse GPU plotting including 64 GB RAM mode using the `tmp3` SSD plotting path.
  - Fix for Gigahorse Alerts, please reset [earlier broken settings file](https://github.com/guydavis/machinaris/blob/develop/config/chiadog/gigahorse.sample.yaml).
  - Fix for container stop signal to cleanly shutdown forks too, as was already happening for Chia.
-## Updated 
+### Updated 
  - [Bladebit](https://downloads.chia.net/bladebit/) to 3.0.0-alpha3. Unstable, see: https://github.com/Chia-Network/bladebit/issues
  - [Chia](https://github.com/Chia-Network/chia-blockchain/releases/tag/1.7.1) to v1.7.1
  - [Gigahorse](https://github.com/madMAx43v3r/chia-gigahorse/releases/tag/v1.6.2.giga7) to v1.6.2.giga7 with OpenCL support for AMD GPUs.
  - [MMX](https://github.com/madMAx43v3r/mmx-node/releases/tag/v0.9.14) to (v0.9.14) on `testnet9`.  Supporting the latest AMD GPU driver.
  - [One](https://github.com/xone-network/one-blockchain/releases/tag/1.7.0) to v1.7.0
-## Notes
+### Notes
  - Bladebit has regressed on the 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.*
 
@@ -44,19 +59,19 @@ All notable changes to this project will be documented in this file. The format
  - [Gigahorse](https://github.com/guydavis/machinaris/wiki/Gigahorse) - beta GPU plotting and farming support in new Machinaris-Gigahorse image. Set `mode: gpuplot` under `madmax` on Settings | Plotting page.
  - [Ballcoin](https://github.com/ball-network/ballcoin-blockchain) blockchain at version 1.6.0, another slow Silicoin fork.
  - [Pipscoin](https://github.com/Pipscoin-Network/pipscoin-blockchain) blockchain at version 1.7.0.
-## Changed
+### Changed
  - Fix missing Connections listing for Flax and MMX blockchains.  Thanks @ekersey!
  - Fix for Bladebit ramplot relaunching.  Thanks @JoeZotacExperience!
  - Multiple functionality & performance cleanups from excellent code review by @qoole.
  - Display compression level for active plotting jobs on Gigahorse and MMX.
-## Updated 
+### Updated 
  - [BTCGreen](https://github.com/BTCgreen-Network/btcgreen-blockchain/releases/tag/1.7.0b) to v1.7.0b
  - [Cactus](https://github.com/Cactus-Network/cactus-blockchain/releases/tag/1.6.2) to v1.6.2
  - [Chia](https://github.com/Chia-Network/chia-blockchain/releases/tag/1.7.0) to v1.7.0
  - [Chives](https://github.com/HiveProject2021/chives-blockchain/releases/tag/1.5.4) to v1.5.4, including staking.
  - [SHIBGreen](https://github.com/BTCgreen-Network/shibgreen-blockchain/releases/tag/1.7.0.1) to v1.7.0.1
  - [Staicoin](https://github.com/STATION-I/stai-blockchain/releases/tag/1.3.0) to v1.3.0. Note, they require a fresh `config.yaml`.
-## Notes
+### Notes
  - Support for new blockchains and tools DOES NOT imply my endorsement for them.  *Only run those you are comfortable with.*
 
 ## [0.8.6] - 2023-01-03

VERSION

@@ -1 +1 @@
-1.8.0
+1.8.1

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', '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']
 
 def load_farm_summary(blockchain):
     chia_binary = globals.get_blockchain_binary(blockchain)

api/commands/rpc.py

@@ -100,12 +100,12 @@
     from flax.util.ints import uint16
     from flax.util.config import load_config as load_fork_config
 elif blockchain == "flora":
-    from chia.rpc.full_node_rpc_client import FullNodeRpcClient
-    from chia.rpc.farmer_rpc_client import FarmerRpcClient
-    from chia.rpc.wallet_rpc_client import WalletRpcClient
-    from chia.util.default_root import DEFAULT_ROOT_PATH
-    from chia.util.ints import uint16
-    from chia.util.config import load_config as load_fork_config
+    from flora.rpc.full_node_rpc_client import FullNodeRpcClient
+    from flora.rpc.farmer_rpc_client import FarmerRpcClient
+    from flora.rpc.wallet_rpc_client import WalletRpcClient
+    from flora.util.default_root import DEFAULT_ROOT_PATH
+    from flora.util.ints import uint16
+    from flora.util.config import load_config as load_fork_config
 elif blockchain == "greenbtc":
     from greenbtc.rpc.full_node_rpc_client import FullNodeRpcClient
     from greenbtc.rpc.farmer_rpc_client import FarmerRpcClient

api/schedules/plots_check.py

@@ -12,7 +12,7 @@
 import traceback
 
 from flask import g
-from sqlalchemy import or_
+from sqlalchemy import and_, or_
 
 from common.models import plots as p, plottings as pl
 from common.models import workers as w
@@ -228,8 +228,8 @@ def execute(plot_id=None):
         if plot_id:
             plots = db.session.query(p.Plot).filter(p.Plot.plot_id == plot_id).all()
         else:    
-            plots = db.session.query(p.Plot).filter(or_(p.Plot.plot_check.is_(None), 
-                p.Plot.plot_analyze.is_(None))).order_by(p.Plot.created_at.desc()).all()
+            plots = db.session.query(p.Plot).filter(and_(or_(p.Plot.plot_check.is_(None), 
+                p.Plot.plot_analyze.is_(None)), p.Plot.blockchain != 'gigahorse')).order_by(p.Plot.created_at.desc()).all()
         status = open_status_json()
         requested_status_count = 0
         #app.logger.info("Querying for plots...")

common/config/globals.py

@@ -460,7 +460,7 @@ def get_alltheblocks_name(blockchain):
     return blockchain
 
 def legacy_blockchain(blockchain):
-    return blockchain in ['ballcoin', 'coffee', 'ecostake', 'flora', 'greenbtc', 'gold', 'hddcoin', 'mint', 'nchain', 'petroleum', 'profit', 'silicoin', 'stor']
+    return blockchain in ['ballcoin', 'coffee', 'ecostake', 'greenbtc', 'gold', 'mint', 'nchain', 'petroleum', 'profit', 'silicoin', 'stor']
 
 last_mmx_reward = None
 last_mmx_reward_load_time = None

config/chiadog/flora.sample.yaml

@@ -11,7 +11,7 @@ coin_symbol: 'xfl'
 chia_logs:
   file_log_consumer:
     enable: true
-    prefix: 'flora_proxy: chia'
+    prefix: 'flora'
     file_path: '~/.chia/flora/mainnet/log/debug.log'
 
 # Enable this and chiadog will ping a remote server every 5 minutes

scripts/bladebit_setup.sh

@@ -23,11 +23,9 @@ if [[ (${mode} =~ ^fullnode.*  || ${mode} =~ "plotter") && (${blockchains} == 'c
             cmake --build . --target bladebit --config Release
             ln -s /bladebit/build/bladebit /usr/bin/bladebit
             cd / && echo "Bladebit version: "`bladebit --version`
-            # Now go get the Bladebit closed source binary of 3.0.0 alpha, very securely zipped twice :)
             cd /bladebit/build
-            curl -sLJO https://download.chia.net/bladebit/alpha3/bladebit-cuda-v3.0.0-alpha3-ubuntu-x86-64.tar.gz.zip
-            unzip bladebit-cuda-v3.0.0-alpha3-ubuntu-x86-64.tar.gz.zip
-            tar -xzf bladebit-cuda-v3.0.0-alpha3-ubuntu-x86-64.tar.gz
+            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
             chmod 755 bladebit_cuda
             ln -s /bladebit/build/bladebit_cuda /usr/bin/bladebit_cuda
         else

scripts/forks/bpx_install.sh

@@ -4,8 +4,8 @@
 #
 
 BPX_BRANCH=$1
-# On 2022-07-28
-HASH=9c96494c576e112e093d5c7fbab0db531b12bbf8
+# On 2023-05-12
+HASH=1394187d7af70b03fe670141e4f0058047b15e02
 
 if [ -z ${BPX_BRANCH} ]; then
     echo 'Skipping BPX install as not requested.'

scripts/forks/cactus_install.sh

@@ -4,8 +4,8 @@
 #
 
 CACTUS_BRANCH=$1
-# On 2023-03-26
-HASH=31d37fea4e000152962d1a13d75ee156e7779837
+# On 2023-05-05
+HASH=167b5edeb3363a625a15663cf4729fd7b8b0373e
 
 if [ -z ${CACTUS_BRANCH} ]; then
     echo 'Skipping Cactus install as not requested.'

scripts/forks/chia_install.sh

@@ -15,10 +15,20 @@ else
 
     git clone --branch ${CHIA_BRANCH} --recurse-submodules=mozilla-ca https://github.com/Chia-Network/chia-blockchain.git /chia-blockchain
     cd /chia-blockchain
-
+    
     # Log "Added Coins" at info, not debug level.  See: https://github.com/Chia-Network/chia-blockchain/issues/11955
     sed -i -e 's/^        self.log.debug($/        self.log.info(/g' chia/wallet/wallet_state_manager.py
 
     /bin/sh ./install.sh
 
+    # Drop GPU-enabled binaries in as well.
+    arch_name="$(uname -m)"
+    ubuntu_ver=`lsb_release -r -s`
+    echo "Installing Chia CUDA binaries on ${arch_name}..."
+    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
+        apt-get install ./chia-blockchain*.deb
+    else
+        echo "Installing Chia CUDA binaries skipped -> unsupported architecture: ${arch_name}"
+    fi
 fi

scripts/forks/flora_install.sh

@@ -1,26 +1,28 @@
 #!/bin/env bash
 #
-# Installs Flora as per https://github.com/Flora-Network/flora-blockchain
+# Installs Flora as per https://github.com/ageorge95/flora-blockchain.git
 #
 
 FLORA_BRANCH=$1
-# On 2021-11-06
-HASH=f4da13dd7160de772ea5daa333984bed3882e84c
+# On 2023-05-06
+HASH=f3ee4b1a2c09c3449cab31bfb814b2551ae13b45
 
 if [ -z ${FLORA_BRANCH} ]; then
     echo 'Skipping Flora install as not requested.'
 else
     rm -rf /root/.cache
-    git clone --branch ${FLORA_BRANCH} --single-branch https://github.com/Flora-Network/flora-blockchain.git /flora-blockchain
+    git clone --branch ${FLORA_BRANCH} --single-branch https://github.com/ageorge95/flora-blockchain.git /flora-blockchain
     cd /flora-blockchain 
     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
+
+    # Log "Added Coins" at info, not debug level.  See: https://github.com/Chia-Network/chia-blockchain/issues/11955
+    sed -i -e 's/^        self.log.debug($/        self.log.info(/g' flora/wallet/wallet_state_manager.py
+
+    python -m venv venv
+    . ./venv/bin/activate
+    pip wheel --use-pep517  --use-deprecated=legacy-resolver --extra-index-url https://pypi.chia.net/simple/  -f . --wheel-dir=./build .
+    pip install --no-index --find-links=./build flora-blockchain
 
     if [ ! -d /chia-blockchain/venv ]; then
         cd /