Merge pull request #931 from guydavis/integration

Version 2.1.0
guydavis · Oct 6, 2023 · bdfd643 · bdfd643
2 parents 4a34ead + 8334459
commit bdfd643
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 25 deletions.
diff --git 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=release/2.1.0"
+            "BLADEBIT_BRANCH=master"
             "MADMAX_BRANCH=master"
             "PLOTMAN_BRANCH=compress"
           tags: |

diff --git a/.github/workflows/main-chia.yaml b/.github/workflows/main-chia.yaml
@@ -44,9 +44,9 @@ jobs:
           build-args: |
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=latest"
-            "CHIA_BRANCH=release/2.0.0"
+            "CHIA_BRANCH=release/2.1.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
@@ -44,9 +44,9 @@ jobs:
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=test"
             "CHIADOG_BRANCH=dev"
-            "CHIA_BRANCH=release/2.0.0"
+            "CHIA_BRANCH=release/2.1.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
@@ -2,6 +2,11 @@
 
 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).
 
+## [2.1.0] - 2023-10-06
+### Updated
+ - [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 - misc improvements, see their release notes.
+
 ## [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
@@ -1 +1 @@
-2.0.0
+2.1.0
diff --git 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/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/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.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/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

diff --git 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.1.0/chia-blockchain-cli_2.1.0-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.1.0/chia-blockchain-cli_2.1.0-1_arm64.deb
         apt-get install ./chia-blockchain-cli*.deb
     else
         echo "Installing Chia CUDA binaries skipped -> unsupported architecture: ${arch_name}"

diff --git a/scripts/pull_3rd_party_libs.sh b/scripts/pull_3rd_party_libs.sh
@@ -4,24 +4,24 @@
 #
 
 # Bootstrap and Icons
-BSI_VERSION=1.10.5
-BOOTSTRAP_VERSION=5.3.1
+BSI_VERSION=1.11.0
+BOOTSTRAP_VERSION=5.3.2
 BASEPATH=${JS_LIBS_BASEPATH:-/machinaris/web/static/3rd_party}
 
 # Mapping library
 LEAFLET_VERSION=1.9.4
 
 # List of other css/js links
 LIST="
-https://cdn.datatables.net/1.13.5/css/dataTables.bootstrap5.css
-https://cdn.datatables.net/1.13.5/js/dataTables.bootstrap5.js
-https://cdn.datatables.net/1.13.5/js/jquery.dataTables.js
-https://cdn.jsdelivr.net/npm/chart.js@4.3.3/dist/chart.umd.js.map
-https://cdn.jsdelivr.net/npm/chart.js@4.3.3/dist/chart.umd.min.js
+https://cdn.datatables.net/1.13.6/css/dataTables.bootstrap5.css
+https://cdn.datatables.net/1.13.6/js/dataTables.bootstrap5.js
+https://cdn.datatables.net/1.13.6/js/jquery.dataTables.js
+https://cdn.jsdelivr.net/npm/chart.js@4.4.0/dist/chart.umd.js.map
+https://cdn.jsdelivr.net/npm/chart.js@4.4.0/dist/chart.umd.min.js
 https://cdn.jsdelivr.net/npm/chartjs-adapter-luxon@1.3.1/dist/chartjs-adapter-luxon.umd.min.js
 https://cdn.jsdelivr.net/npm/chartjs-plugin-datalabels@2.2.0/dist/chartjs-plugin-datalabels.min.js
-https://cdn.jsdelivr.net/npm/jquery@3.6.3/dist/jquery.min.js
-https://moment.github.io/luxon/global/luxon.min.js"
+https://cdn.jsdelivr.net/npm/jquery@3.7.1/dist/jquery.min.js
+https://cdn.jsdelivr.net/npm/luxon@3.4.3/build/global/luxon.min.js"
 
 mkdir -p $BASEPATH
 for url in $LIST ; do

diff --git 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: