Merge pull request #929 from guydavis/develop

Chia 2.1.0rc5 and Bladebit 3.1.0

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.  

docker/requirements.txt

@@ -2,7 +2,7 @@ apscheduler
 click
 jinja2
 flask
-flask-smorest
+flask-smorest >= 0.42.1
 python-dotenv
 marshmallow
 sqlalchemy

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

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-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.0rc4-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}"