From 8940f054ce5bbf259d42b9beaf8d9e0e4a63a9f1 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Mon, 2 Oct 2023 17:35:33 -0600 Subject: [PATCH 1/5] 2.1.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 be26d5f1..6fff969e 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.1.0-rc4/chia-blockchain-cli_2.1.0rc4-1_amd64.deb + curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.1.0-rc4/chia-blockchain-cli_2.1.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.1.0-rc4/chia-blockchain-cli_2.1.0rc4-1_arm64.deb + curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.1.0-rc4/chia-blockchain-cli_2.1.0rc5-1_arm64.deb apt-get install ./chia-blockchain-cli*.deb else echo "Installing Chia CUDA binaries skipped -> unsupported architecture: ${arch_name}" From bdd078956374cb2d7a91a5827bba9525be3b89a1 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Mon, 2 Oct 2023 17:35:58 -0600 Subject: [PATCH 2/5] Chia 2.1.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 6fff969e..fd51fa33 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.1.0-rc4/chia-blockchain-cli_2.1.0rc5-1_amd64.deb + curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.1.0-rc5/chia-blockchain-cli_2.1.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.1.0-rc4/chia-blockchain-cli_2.1.0rc5-1_arm64.deb + curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.1.0-rc5/chia-blockchain-cli_2.1.0rc5-1_arm64.deb apt-get install ./chia-blockchain-cli*.deb else echo "Installing Chia CUDA binaries skipped -> unsupported architecture: ${arch_name}" From 290ea32113e386bc61ad79842de07bfa0bbf4f72 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Mon, 2 Oct 2023 19:51:28 -0600 Subject: [PATCH 3/5] Workaround for stale flask-smorest. --- scripts/machinaris_install.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/machinaris_install.sh b/scripts/machinaris_install.sh index bce38545..b9765718 100644 --- a/scripts/machinaris_install.sh +++ b/scripts/machinaris_install.sh @@ -9,6 +9,11 @@ cd /chia-blockchain venv/bin/pip3 install -r /machinaris/docker/requirements.txt +# Issue with stale flask-smorest, force an install +./venv/bin/pip list installed | grep smorest +./venv/bin/pip install --force flask-smorest +./venv/bin/pip list installed | grep smorest + cp -f /machinaris/docker/entrypoint.sh /chia-blockchain/ chmod 755 /machinaris/scripts/* /chia-blockchain/entrypoint.sh From 488f6b879aacb05fb6da1f6fa82b23c5ce08371b Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Tue, 3 Oct 2023 06:39:04 -0600 Subject: [PATCH 4/5] Force a recent version of flask-smorest. --- docker/requirements.txt | 2 +- scripts/machinaris_install.sh | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/docker/requirements.txt b/docker/requirements.txt index 9c54bba1..1d7ae590 100644 --- a/docker/requirements.txt +++ b/docker/requirements.txt @@ -2,7 +2,7 @@ apscheduler click jinja2 flask -flask-smorest +flask-smorest >= 0.42.1 python-dotenv marshmallow sqlalchemy diff --git a/scripts/machinaris_install.sh b/scripts/machinaris_install.sh index b9765718..bce38545 100644 --- a/scripts/machinaris_install.sh +++ b/scripts/machinaris_install.sh @@ -9,11 +9,6 @@ cd /chia-blockchain venv/bin/pip3 install -r /machinaris/docker/requirements.txt -# Issue with stale flask-smorest, force an install -./venv/bin/pip list installed | grep smorest -./venv/bin/pip install --force flask-smorest -./venv/bin/pip list installed | grep smorest - cp -f /machinaris/docker/entrypoint.sh /chia-blockchain/ chmod 755 /machinaris/scripts/* /chia-blockchain/entrypoint.sh From d422b5e3c5e4e9a7972dd90c24c98d3909803f5f Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Tue, 3 Oct 2023 16:33:21 -0600 Subject: [PATCH 5/5] Bladebit @ v3.1.0 --- CHANGELOG.md | 7 ++----- scripts/bladebit_setup.sh | 8 ++++---- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ed202177..ee8b65cf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,12 +3,9 @@ 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 - - [Bladebit](https://github.com/Chia-Network/bladebit/releases/tag/v3.1.0-beta1) to v3.1.0-beta1 - Supporting hybrid GPU/disk plotting with either 128 GB or 16 GB RAM. - - [Chia](https://github.com/Chia-Network/chia-blockchain/releases/tag/2.1.0-rc1) to v2.1.0 - Patches GUI/CLI plotting error that DID NOT AFFECT MACHINARIS 2.0.0 USERS. - + - [Bladebit](https://github.com/Chia-Network/bladebit/releases/tag/v3.1.0) to v3.1.0 - Supporting hybrid GPU/disk plotting with either 128 GB or 16 GB RAM. + - [Chia](https://github.com/Chia-Network/chia-blockchain/releases/tag/2.1.0) to v2.1.0 ## [2.0.0] - 2023-08-24 ### Added - Request a new plot check, via 'Recheck' button added to Check results dialog on Farming page. diff --git a/scripts/bladebit_setup.sh b/scripts/bladebit_setup.sh index 04aa8c09..5d6242a5 100644 --- a/scripts/bladebit_setup.sh +++ b/scripts/bladebit_setup.sh @@ -17,11 +17,11 @@ if [[ (${mode} =~ ^fullnode.* || ${mode} =~ "plotter") && (${blockchains} == 'c 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.1.0-rc2/bladebit-v3.1.0-rc2-ubuntu-x86-64.tar.gz - curl -sLJO https://github.com/Chia-Network/bladebit/releases/download/v3.1.0-rc2/bladebit-cuda-v3.1.0-rc2-ubuntu-x86-64.tar.gz + curl -sLJO https://github.com/Chia-Network/bladebit/releases/download/v3.1.0/bladebit-v3.1.0-ubuntu-x86-64.tar.gz + curl -sLJO https://github.com/Chia-Network/bladebit/releases/download/v3.1.0/bladebit-cuda-v3.1.0-ubuntu-x86-64.tar.gz else - curl -sLJO https://github.com/Chia-Network/bladebit/releases/download/v3.1.0-rc2/bladebit-v3.1.0-rc2-ubuntu-arm64.tar.gz - curl -sLJO https://github.com/Chia-Network/bladebit/releases/download/v3.1.0-rc2/bladebit-cuda-v3.1.0-rc2-ubuntu-arm64.tar.gz + curl -sLJO https://github.com/Chia-Network/bladebit/releases/download/v3.1.0/bladebit-v3.1.0-ubuntu-arm64.tar.gz + curl -sLJO https://github.com/Chia-Network/bladebit/releases/download/v3.1.0/bladebit-cuda-v3.1.0-ubuntu-arm64.tar.gz fi tar -xvf bladebit-v3.*.tar.gz tar -xvf bladebit-cuda-v3.*.tar.gz