diff --git a/.github/workflows/develop-chia.yaml b/.github/workflows/develop-chia.yaml index 0862670d..32815ee9 100644 --- a/.github/workflows/develop-chia.yaml +++ b/.github/workflows/develop-chia.yaml @@ -44,8 +44,8 @@ jobs: "UBUNTU_VER=jammy" "MACHINARIS_STREAM=develop" "CHIADOG_BRANCH=dev" - "CHIA_BRANCH=release/2.0.0" - "BLADEBIT_BRANCH=cuda-compression" + "CHIA_BRANCH=main" + "BLADEBIT_BRANCH=master" "MADMAX_BRANCH=master" "PLOTMAN_BRANCH=compress" tags: | diff --git a/.github/workflows/main-chia.yaml b/.github/workflows/main-chia.yaml index f13077f1..5df3bf05 100644 --- a/.github/workflows/main-chia.yaml +++ b/.github/workflows/main-chia.yaml @@ -46,7 +46,7 @@ jobs: "MACHINARIS_STREAM=latest" "CHIA_BRANCH=release/2.0.0" "MADMAX_BRANCH=v1.8.2.giga14" - "BLADEBIT_BRANCH=cuda-compression" + "BLADEBIT_BRANCH=master" tags: | ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:latest ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:v${{ github.event.inputs.version }} diff --git a/.github/workflows/test-chia.yaml b/.github/workflows/test-chia.yaml index 27f46c47..2ec86f53 100644 --- a/.github/workflows/test-chia.yaml +++ b/.github/workflows/test-chia.yaml @@ -46,7 +46,7 @@ jobs: "CHIADOG_BRANCH=dev" "CHIA_BRANCH=release/2.0.0" "PLOTMAN_BRANCH=development" - "BLADEBIT_BRANCH=cuda-compression" + "BLADEBIT_BRANCH=master" "MADMAX_BRANCH=v1.8.2.giga14" tags: | ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:test diff --git a/CHANGELOG.md b/CHANGELOG.md index 30ec9e21..569061d1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ 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 + - [Chia](https://github.com/Chia-Network/chia-blockchain/releases/tag/2.0.1) to v2.0.1. - Patches GUI/CLI plotting error that DID NOT AFFECT MACHINARIS 2.0.0 USERS. + ## [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/VERSION b/VERSION index 359a5b95..10bf840e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.0 \ No newline at end of file +2.0.1 \ No newline at end of file diff --git a/scripts/bladebit_setup.sh b/scripts/bladebit_setup.sh index 400613e8..64756b8e 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.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 + curl -sLJO https://github.com/Chia-Network/bladebit/releases/download/v3.1.0-beta1/bladebit-v3.1.0-beta1-ubuntu-x86-64.tar.gz + curl -sLJO https://github.com/Chia-Network/bladebit/releases/download/v3.1.0-beta1/bladebit-cuda-v3.1.0-beta1-ubuntu-x86-64.tar.gz else - 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 + curl -sLJO https://github.com/Chia-Network/bladebit/releases/download/v3.1.0-beta1/bladebit-v3.1.0-beta1-ubuntu-arm64.tar.gz + curl -sLJO https://github.com/Chia-Network/bladebit/releases/download/v3.1.0-beta1/bladebit-cuda-v3.1.0-beta1-ubuntu-arm64.tar.gz fi tar -xvf bladebit-v3.*.tar.gz tar -xvf bladebit-cuda-v3.*.tar.gz diff --git a/scripts/forks/chia_install.sh b/scripts/forks/chia_install.sh index fcf74671..7e714db5 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/chia-blockchain-cli_2.0.0-1_amd64.deb + curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.0.1/chia-blockchain-cli_2.0.1-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/chia-blockchain-cli_2.0.0-1_arm64.deb + curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.0.1/chia-blockchain-cli_2.0.1-1_arm64.deb apt-get install ./chia-blockchain-cli*.deb else echo "Installing Chia CUDA binaries skipped -> unsupported architecture: ${arch_name}" diff --git a/web/models/pools.py b/web/models/pools.py index c31d5f11..be004652 100644 --- a/web/models/pools.py +++ b/web/models/pools.py @@ -109,8 +109,12 @@ def extract_unique_errors(self, pool_state): errors = [] if 'pool_errors_24h' in pool_state: for error in pool_state['pool_errors_24h']: - if not error['error_message'] in errors: - errors.append(error['error_message']) + try: + if not error['error_message'] in errors: + errors.append(error['error_message']) + except:# Some errors don't have an 'error_message' for some reason + if not str(error) in errors: + errors.append(str(error)) return errors class PartialsChartData: