From 346762e8cfaf48047e1522ebba0d2424a1a161a3 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Fri, 5 May 2023 10:46:45 -0600 Subject: [PATCH 01/19] Start testing against upcoming Chia 1.8.1 --- .github/workflows/develop-chia.yaml | 2 +- .github/workflows/main-chia.yaml | 2 +- .github/workflows/test-chia.yaml | 2 +- CHANGELOG.md | 26 ++++++++++++++++---------- VERSION | 2 +- scripts/forks/gigahorse_launch.sh | 3 +-- 6 files changed, 21 insertions(+), 16 deletions(-) diff --git a/.github/workflows/develop-chia.yaml b/.github/workflows/develop-chia.yaml index b84cb5b1..05f01557 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.0" + "CHIA_BRANCH=release/1.8.1" "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 62fce811..9804a136 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.0" + "CHIA_BRANCH=release/1.8.1" "MADMAX_BRANCH=v1.8.0.giga10" "BLADEBIT_BRANCH=cuda-compression" tags: | diff --git a/.github/workflows/test-chia.yaml b/.github/workflows/test-chia.yaml index f9727a37..e43c9d03 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.0" + "CHIA_BRANCH=release/1.8.1" "PLOTMAN_BRANCH=development" "BLADEBIT_BRANCH=cuda-compression" "MADMAX_BRANCH=v1.8.0.giga10" diff --git a/CHANGELOG.md b/CHANGELOG.md index 35303ecf..fac56cc5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,19 +2,25 @@ 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] +### Added +### Changed +### Updated + - [Chia](https://github.com/Chia-Network/chia-blockchain/releases/tag/1.8.1) to v1.8.1 + ## [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`. @@ -22,18 +28,18 @@ All notable changes to this project will be documented in this file. The format ### 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 +50,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 diff --git a/VERSION b/VERSION index afa2b351..b9268dae 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.8.0 \ No newline at end of file +1.8.1 \ No newline at end of file diff --git a/scripts/forks/gigahorse_launch.sh b/scripts/forks/gigahorse_launch.sh index 79092574..c16f2fcc 100644 --- a/scripts/forks/gigahorse_launch.sh +++ b/scripts/forks/gigahorse_launch.sh @@ -33,12 +33,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 - # 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") echo "Please be patient! Downloading blockchain database indirectly (via libtorrent) from: " echo " ${torrent}" curl -skLJ -O ${torrent} - deactivate # Use the system python + 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..." From d62286eae7f2f9a455b51c5087e10a1d2a9c00ce Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Fri, 5 May 2023 15:22:01 -0600 Subject: [PATCH 02/19] Cactus to v1.8.0 --- 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 fac56cc5..60657137 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 ### Changed ### Updated + - [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 ## [1.8.0] - 2023-05-04 diff --git a/scripts/forks/cactus_install.sh b/scripts/forks/cactus_install.sh index c69a1b15..df6d57e2 100644 --- a/scripts/forks/cactus_install.sh +++ b/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.' From 7fe8e6b821db01203dfa92bc31864bdcd1e02481 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Sat, 6 May 2023 07:29:36 -0600 Subject: [PATCH 03/19] Try an updated fork of Flora. --- .github/workflows/develop-flora.yaml | 2 +- .github/workflows/main-flora.yaml | 2 +- .github/workflows/test-flora.yaml | 2 +- CHANGELOG.md | 1 + api/commands/chia_cli.py | 2 +- scripts/forks/flora_install.sh | 16 ++++++++-------- scripts/forks/flora_launch.sh | 8 ++++++-- 7 files changed, 19 insertions(+), 14 deletions(-) diff --git a/.github/workflows/develop-flora.yaml b/.github/workflows/develop-flora.yaml index 2c609d81..1cd7dd8a 100644 --- a/.github/workflows/develop-flora.yaml +++ b/.github/workflows/develop-flora.yaml @@ -45,7 +45,7 @@ jobs: "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 diff --git a/.github/workflows/main-flora.yaml b/.github/workflows/main-flora.yaml index 813d7b9e..942cb996 100644 --- a/.github/workflows/main-flora.yaml +++ b/.github/workflows/main-flora.yaml @@ -44,7 +44,7 @@ jobs: build-args: | "UBUNTU_VER=focal" "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 }} diff --git a/.github/workflows/test-flora.yaml b/.github/workflows/test-flora.yaml index d25f5bf8..09eeb51b 100644 --- a/.github/workflows/test-flora.yaml +++ b/.github/workflows/test-flora.yaml @@ -44,7 +44,7 @@ jobs: "UBUNTU_VER=focal" "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 diff --git a/CHANGELOG.md b/CHANGELOG.md index 60657137..4a976b6d 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 ### Updated - [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. ## [1.8.0] - 2023-05-04 ### Added diff --git a/api/commands/chia_cli.py b/api/commands/chia_cli.py index b32c90c6..8de92d9a 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', '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) diff --git a/scripts/forks/flora_install.sh b/scripts/forks/flora_install.sh index 53a0bd09..b87aa868 100644 --- a/scripts/forks/flora_install.sh +++ b/scripts/forks/flora_install.sh @@ -1,25 +1,25 @@ #!/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 + + # 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 + /usr/bin/sh ./install.sh if [ ! -d /chia-blockchain/venv ]; then diff --git a/scripts/forks/flora_launch.sh b/scripts/forks/flora_launch.sh index 5174f6ef..5f83b177 100644 --- a/scripts/forks/flora_launch.sh +++ b/scripts/forks/flora_launch.sh @@ -33,12 +33,16 @@ if [ -f /root/.flora/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}" - flora keys add -f ${k} > /dev/null + echo "Adding key #${label_num} at path: ${k}" + flora keys add -l "key_${label_num}" -f ${k} > /dev/null + ((label_num=label_num+1)) + elif [[ ${mode} =~ ^fullnode.* ]]; then + echo "Skipping 'chia keys add' as no file found at: ${k}" fi done From 2e4f7620db5ec0a251349a3f49b2837a308d17df Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Sat, 6 May 2023 07:38:01 -0600 Subject: [PATCH 04/19] Try with Jammy. --- .github/workflows/develop-flora.yaml | 2 +- .github/workflows/main-flora.yaml | 2 +- .github/workflows/test-flora.yaml | 2 +- scripts/forks/flora_install.sh | 8 +++++++- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/develop-flora.yaml b/.github/workflows/develop-flora.yaml index 1cd7dd8a..ce77cca2 100644 --- a/.github/workflows/develop-flora.yaml +++ b/.github/workflows/develop-flora.yaml @@ -41,7 +41,7 @@ jobs: provenance: false push: true build-args: | - "UBUNTU_VER=focal" + "UBUNTU_VER=jammy" "MACHINARIS_STREAM=develop" "CHIADOG_BRANCH=dev" "FDCLI_BRANCH=dev" diff --git a/.github/workflows/main-flora.yaml b/.github/workflows/main-flora.yaml index 942cb996..4b5c40b2 100644 --- a/.github/workflows/main-flora.yaml +++ b/.github/workflows/main-flora.yaml @@ -42,7 +42,7 @@ jobs: provenance: false push: true build-args: | - "UBUNTU_VER=focal" + "UBUNTU_VER=jammy" "MACHINARIS_STREAM=latest" "FLORA_BRANCH=latest" tags: | diff --git a/.github/workflows/test-flora.yaml b/.github/workflows/test-flora.yaml index 09eeb51b..82257e31 100644 --- a/.github/workflows/test-flora.yaml +++ b/.github/workflows/test-flora.yaml @@ -41,7 +41,7 @@ jobs: provenance: false push: true build-args: | - "UBUNTU_VER=focal" + "UBUNTU_VER=jammy" "MACHINARIS_STREAM=test" "CHIADOG_BRANCH=dev" "FLORA_BRANCH=latest" diff --git a/scripts/forks/flora_install.sh b/scripts/forks/flora_install.sh index b87aa868..ec24aa12 100644 --- a/scripts/forks/flora_install.sh +++ b/scripts/forks/flora_install.sh @@ -20,7 +20,13 @@ else # 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 - /usr/bin/sh ./install.sh + python -m venv venv + cd venv/Scripts + activate + python -m pip install --upgrade pip + 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 + ls -al . if [ ! -d /chia-blockchain/venv ]; then cd / From bc3bf7574f19d004620808fd66f42484c753dfc3 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Sat, 6 May 2023 07:46:37 -0600 Subject: [PATCH 05/19] More testing of Flora build. --- scripts/forks/flora_install.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/forks/flora_install.sh b/scripts/forks/flora_install.sh index ec24aa12..41c884bc 100644 --- a/scripts/forks/flora_install.sh +++ b/scripts/forks/flora_install.sh @@ -15,7 +15,6 @@ else cd /flora-blockchain git submodule update --init mozilla-ca git checkout $HASH - chmod +x 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 @@ -23,7 +22,6 @@ else python -m venv venv cd venv/Scripts activate - python -m pip install --upgrade pip 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 ls -al . From 9d8382df232df8de5f1e3142efff71398b6fcaa6 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Sat, 6 May 2023 08:11:02 -0600 Subject: [PATCH 06/19] Another attempt. --- scripts/forks/flora_install.sh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/scripts/forks/flora_install.sh b/scripts/forks/flora_install.sh index 41c884bc..1c2f63d9 100644 --- a/scripts/forks/flora_install.sh +++ b/scripts/forks/flora_install.sh @@ -20,11 +20,9 @@ else sed -i -e 's/^ self.log.debug($/ self.log.info(/g' flora/wallet/wallet_state_manager.py python -m venv venv - cd venv/Scripts - 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 - ls -al . + . ./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 / From f945978b172710a53afaa86e6e6fd1cc7878a3a3 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Sat, 6 May 2023 08:33:16 -0600 Subject: [PATCH 07/19] Fix flora module name. --- api/commands/rpc.py | 12 ++++++------ config/chiadog/flora.sample.yaml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/api/commands/rpc.py b/api/commands/rpc.py index 1b546e37..2c301c57 100644 --- a/api/commands/rpc.py +++ b/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 diff --git a/config/chiadog/flora.sample.yaml b/config/chiadog/flora.sample.yaml index d608d26c..c8dc94ea 100644 --- a/config/chiadog/flora.sample.yaml +++ b/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 From 4380651c8df51d0a2806402f8423739a8a0aeca6 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Wed, 10 May 2023 08:02:01 -0600 Subject: [PATCH 08/19] Gigahorse 1.8.0giga11 version. --- .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 | 1 + scripts/forks/flora_launch.sh | 2 +- 9 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.github/workflows/develop-chia.yaml b/.github/workflows/develop-chia.yaml index 05f01557..20dbb0bd 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.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 diff --git a/.github/workflows/main-chia.yaml b/.github/workflows/main-chia.yaml index 9804a136..ca89c8d4 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.giga10" + "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 }} diff --git a/.github/workflows/main-chives.yaml b/.github/workflows/main-chives.yaml index d43ac9f8..5ab8502f 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.giga10" + "MADMAX_BRANCH=v1.8.0.giga11" 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 4e3cdd4f..fdc650ff 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.giga10" + "MADMAX_BRANCH=v1.8.0.giga11" 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 e43c9d03..1d09091d 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.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: | diff --git a/.github/workflows/test-chives.yaml b/.github/workflows/test-chives.yaml index aa86b0e9..14cc6982 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.giga10" + "MADMAX_BRANCH=v1.8.0.giga11" 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 77a89246..6d8e6a38 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.giga10" + "MADMAX_BRANCH=v1.8.0.giga11" tags: | ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:test ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:test diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a976b6d..cdeaf2c6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,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.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. ## [1.8.0] - 2023-05-04 ### Added diff --git a/scripts/forks/flora_launch.sh b/scripts/forks/flora_launch.sh index 5f83b177..4a40f5e4 100644 --- a/scripts/forks/flora_launch.sh +++ b/scripts/forks/flora_launch.sh @@ -5,7 +5,7 @@ cd /flora-blockchain -. ./activate +. ./venv/bin/activate # Only the /root/.chia folder is volume-mounted so store flora within mkdir -p /root/.chia/flora From be33c77dfd717ef6b93ae851e27cf6b0cb1cffb0 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Wed, 10 May 2023 10:41:24 -0600 Subject: [PATCH 09/19] Skip automated plots check of Gigahorse plots due to poor "ProofOfSpace" performance. --- CHANGELOG.md | 2 ++ api/schedules/plots_check.py | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cdeaf2c6..3af857fb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,9 @@ All notable changes to this project will be documented in this file. The format ## [Unreleased] ### Added + - ### Changed + - By default, exclude Gigahorse plots from automated plot check due to poor performance of the 'ProofOfSpace' binary. ### Updated - [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/api/schedules/plots_check.py b/api/schedules/plots_check.py index efa77036..8df859cb 100644 --- a/api/schedules/plots_check.py +++ b/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...") From 3ae48e6a2b76bf50fdacd1c20f1f35d0e896ce25 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Thu, 11 May 2023 12:03:23 -0600 Subject: [PATCH 10/19] Treat Flora and HDDCoin as no longer legacy. --- 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 ae21ef05..008f4bbd 100644 --- a/common/config/globals.py +++ b/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 From 062c333a2d4a4ab20cc2a323dced1ce53598f649 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Fri, 12 May 2023 08:28:41 -0600 Subject: [PATCH 11/19] BPX to 2.1.0 --- CHANGELOG.md | 1 + scripts/forks/bpx_install.sh | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3af857fb..95ede591 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 - By default, exclude Gigahorse plots from automated plot check due to poor performance of the 'ProofOfSpace' binary. ### Updated + - [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. diff --git a/scripts/forks/bpx_install.sh b/scripts/forks/bpx_install.sh index d62b194c..5586956a 100644 --- a/scripts/forks/bpx_install.sh +++ b/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.' From e83e12029975cfc907db7b924e2ba5465f053ac7 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Mon, 15 May 2023 17:02:44 -0600 Subject: [PATCH 12/19] Bladebit alpha4 --- CHANGELOG.md | 3 ++- scripts/bladebit_setup.sh | 6 ++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 95ede591..ec7cf7ee 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] ### Added - - + ### Changed - By default, exclude Gigahorse plots from automated plot check due to poor performance of the 'ProofOfSpace' binary. ### 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 diff --git a/scripts/bladebit_setup.sh b/scripts/bladebit_setup.sh index 003129b6..dfc69277 100644 --- a/scripts/bladebit_setup.sh +++ b/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 -xzf 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 From 6c9853d23d02af1f9631e0c57d33358b962ff830 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Mon, 15 May 2023 18:07:13 -0600 Subject: [PATCH 13/19] Not actually compressed. --- scripts/bladebit_setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/bladebit_setup.sh b/scripts/bladebit_setup.sh index dfc69277..7ae8ed40 100644 --- a/scripts/bladebit_setup.sh +++ b/scripts/bladebit_setup.sh @@ -25,7 +25,7 @@ if [[ (${mode} =~ ^fullnode.* || ${mode} =~ "plotter") && (${blockchains} == 'c 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 -xzf 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 From 9d97c8493fa7fb5daaf6aa62d36315d2dd74c737 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Tue, 16 May 2023 10:00:16 -0600 Subject: [PATCH 14/19] Test out the cuda-enabled Chia farming binaries. --- scripts/forks/chia_install.sh | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/scripts/forks/chia_install.sh b/scripts/forks/chia_install.sh index bee759ee..b9d92e18 100644 --- a/scripts/forks/chia_install.sh +++ b/scripts/forks/chia_install.sh @@ -13,12 +13,14 @@ else apt-get update && apt-get install -y dialog apt-utils /usr/bin/bash /machinaris/scripts/gpu_drivers_install.sh - git clone --branch ${CHIA_BRANCH} --recurse-submodules=mozilla-ca https://github.com/Chia-Network/chia-blockchain.git /chia-blockchain - cd /chia-blockchain + 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 + ls -al /chia-blockchain + # For testing of new GPU farming binaries, comment out build from source for now. + #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 - + #sed -i -e 's/^ self.log.debug($/ self.log.info(/g' chia/wallet/wallet_state_manager.py + #/bin/sh ./install.sh fi From 9c139c2c33ef510eb66ea751467ae4e91ec8e44e Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Tue, 16 May 2023 11:31:04 -0600 Subject: [PATCH 15/19] Install from local package. --- 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 b9d92e18..085eaadb 100644 --- a/scripts/forks/chia_install.sh +++ b/scripts/forks/chia_install.sh @@ -14,7 +14,7 @@ else /usr/bin/bash /machinaris/scripts/gpu_drivers_install.sh 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 + apt-get install ./chia-blockchain*.deb ls -al /chia-blockchain # For testing of new GPU farming binaries, comment out build from source for now. From dfd84383481537dcf02bfea4d34f67fe716a40b3 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Tue, 16 May 2023 11:47:51 -0600 Subject: [PATCH 16/19] Another attempt. --- scripts/forks/chia_install.sh | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/scripts/forks/chia_install.sh b/scripts/forks/chia_install.sh index 085eaadb..837fc245 100644 --- a/scripts/forks/chia_install.sh +++ b/scripts/forks/chia_install.sh @@ -13,14 +13,15 @@ else apt-get update && apt-get install -y dialog apt-utils /usr/bin/bash /machinaris/scripts/gpu_drivers_install.sh + 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. 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 - ls -al /chia-blockchain - - # For testing of new GPU farming binaries, comment out build from source for now. - #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 fi From 0e9c2c6c328e2eec57e30d7c3a0e12763f321d88 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Tue, 16 May 2023 15:39:23 -0600 Subject: [PATCH 17/19] Fix for arm platform. --- scripts/forks/chia_install.sh | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/scripts/forks/chia_install.sh b/scripts/forks/chia_install.sh index 837fc245..9bbd3fd9 100644 --- a/scripts/forks/chia_install.sh +++ b/scripts/forks/chia_install.sh @@ -22,6 +22,13 @@ else /bin/sh ./install.sh # Drop GPU-enabled binaries in as well. - 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 + 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 From 578d9c040281e6695f16be4f6822cf3053b75359 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Wed, 17 May 2023 14:18:41 -0600 Subject: [PATCH 18/19] v1.8.1 --- CHANGELOG.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ec7cf7ee..ae564218 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,11 +2,10 @@ 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] -### Added - +## [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 From 8ac5ac75e1904d93bfc81aaeaaf49b4b8b934d34 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Wed, 17 May 2023 14:20:45 -0600 Subject: [PATCH 19/19] Disclaimer --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ae564218..bcf0a4bc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,9 @@ All notable changes to this project will be documented in this file. The format - [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