diff --git a/.github/workflows/develop-blockchains.yaml b/.github/workflows/develop-blockchains.yaml index 88aa816f..b253e191 100644 --- a/.github/workflows/develop-blockchains.yaml +++ b/.github/workflows/develop-blockchains.yaml @@ -90,6 +90,7 @@ jobs: "CHIADOG_BRANCH=dev" "CHIA_BRANCH=2.5.2" "BLADEBIT_BRANCH=master" + "MADMAX_BRANCH=v2.5.3.giga36" "PLOTMAN_BRANCH=compress" tags: | ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:develop @@ -133,8 +134,9 @@ jobs: "UBUNTU_VER=noble" "MACHINARIS_STREAM=develop" "CHIADOG_BRANCH=dev" - "GIGAHORSE_BRANCH=v2.5.2.giga36" + "GIGAHORSE_BRANCH=v2.5.3.giga36" "CHIA_BRANCH=2.5.2" + "MADMAX_BRANCH=v2.5.3.giga36" "PLOTMAN_BRANCH=compress" tags: | ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-gigahorse:develop diff --git a/.github/workflows/main-blockchains.yaml b/.github/workflows/main-blockchains.yaml index 165d84b9..8025bf28 100644 --- a/.github/workflows/main-blockchains.yaml +++ b/.github/workflows/main-blockchains.yaml @@ -88,6 +88,7 @@ jobs: "MACHINARIS_STREAM=latest" "CHIA_BRANCH=2.5.2" "BLADEBIT_BRANCH=master" + "MADMAX_BRANCH=v2.5.3.giga36" tags: | ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:latest ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:v${{ github.event.inputs.version }} @@ -131,7 +132,8 @@ jobs: build-args: | "UBUNTU_VER=noble" "MACHINARIS_STREAM=latest" - "GIGAHORSE_BRANCH=v2.5.2.giga36" + "GIGAHORSE_BRANCH=v2.5.3.giga36" + "MADMAX_BRANCH=v2.5.3.giga36" "CHIA_BRANCH=2.5.2" tags: | ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-gigahorse:latest diff --git a/.github/workflows/test-blockchains.yaml b/.github/workflows/test-blockchains.yaml index 0d34ea3e..4c9e5128 100644 --- a/.github/workflows/test-blockchains.yaml +++ b/.github/workflows/test-blockchains.yaml @@ -90,6 +90,7 @@ jobs: "CHIA_BRANCH=2.5.2" "PLOTMAN_BRANCH=development" "BLADEBIT_BRANCH=master" + "MADMAX_BRANCH=v2.5.3.giga36" tags: | ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:test ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris:test @@ -132,8 +133,9 @@ jobs: "UBUNTU_VER=noble" "MACHINARIS_STREAM=test" "CHIADOG_BRANCH=dev" - "GIGAHORSE_BRANCH=v2.5.2.giga36" + "GIGAHORSE_BRANCH=v2.5.3.giga36" "CHIA_BRANCH=2.5.2" + "MADMAX_BRANCH=v2.5.3.giga36" "PLOTMAN_BRANCH=development" tags: | ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-gigahorse:test diff --git a/CHANGELOG.md b/CHANGELOG.md index 618683bd..f8b2fc83 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,14 @@ 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.5.4] - 2025-05-29 +### Added +### Changed + - [Madmax](https://github.com/madMAx43v3r/chia-plotter) - Dropping support for pre-compression Madmax chia plotter, as it won't build on current OS versions. Using his Gigahorse plotter binaries instead. Bladebit plotter support remains unchanged. +### Updated + - [Chia](https://github.com/Chia-Network/chia-blockchain/releases/tag/2.5.4) to v2.5.4 - misc improvements, see their release notes. + - [Gigahorse](https://github.com/madMAx43v3r/chia-gigahorse/releases/tag/v2.5.3.giga36) to v2.5.3.giga36. NOTE: Only for AMD64, so ARM64 uses an old version. + ## [2.5.3] - 2025-03-28 ### Added ### Changed diff --git a/VERSION b/VERSION index a4db534a..d21aa93c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.5.3 \ No newline at end of file +2.5.4 \ No newline at end of file diff --git a/docker/dockerfile b/docker/dockerfile index 7503cb21..04091d22 100644 --- a/docker/dockerfile +++ b/docker/dockerfile @@ -9,6 +9,7 @@ ARG CHIADOG_BRANCH=main ARG FDCLI_BRANCH=master ARG FORKTOOLS_BRANCH=main ARG BLADEBIT_BRANCH=master +ARG MADMAX_BRANCH=master ARG ACHI_BRANCH ARG APPLE_BRANCH @@ -149,6 +150,7 @@ ENV FDCLI_BRANCH=${FDCLI_BRANCH} ENV FORKTOOLS_BRANCH=${FORKTOOLS_BRANCH} ENV BLADEBIT_BRANCH=${BLADEBIT_BRANCH} ENV GIGAHORSE_BRANCH=${GIGAHORSE_BRANCH} +ENV MADMAX_BRANCH=${MADMAX_BRANCH} ENV MMX_HOME=/root/.mmx/ VOLUME [ "/id_rsa" ] diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index e245306b..2058ff50 100644 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -104,7 +104,7 @@ if /usr/bin/bash /machinaris/scripts/forks/${blockchains}_launch.sh; then /usr/bin/bash /machinaris/scripts/bladebit_setup.sh ${BLADEBIT_BRANCH} > /tmp/bladebit_setup.log 2>&1 # Conditionally madmax on plotters and fullnodes, sleep a bit first - /usr/bin/bash /machinaris/scripts/madmax_setup.sh ${GIGAHORSE_BRANCH} > /tmp/madmax_setup.log 2>&1 + /usr/bin/bash /machinaris/scripts/madmax_setup.sh ${MADMAX_BRANCH} > /tmp/madmax_setup.log 2>&1 # Conditionally install plotman on plotters and fullnodes, after the plotters setup /usr/bin/bash /machinaris/scripts/plotman_autoplot.sh > /tmp/plotman_autoplot.log 2>&1 diff --git a/scripts/forks/chia_install.sh b/scripts/forks/chia_install.sh index 4f746b33..96fbdfa6 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.5.3/chia-blockchain-cli_2.5.3-1_amd64.deb + curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.5.4/chia-blockchain-cli_2.5.4-1_amd64.deb apt-get install ./chia-blockchain-cli*.deb else - curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.5.3/chia-blockchain-cli_2.5.3-1_arm64.deb + curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.5.4/chia-blockchain-cli_2.5.4-1_arm64.deb apt-get install ./chia-blockchain-cli*.deb fi diff --git a/scripts/forks/gigahorse_install.sh b/scripts/forks/gigahorse_install.sh index 18f115bb..ec6e664f 100644 --- a/scripts/forks/gigahorse_install.sh +++ b/scripts/forks/gigahorse_install.sh @@ -24,7 +24,7 @@ else tar -xzf chia-gigahorse-farmer* else # Max broke ARM64 support in v2.4.4.giga36, have to downgrade to 2.4.1 - if [[ "${GIGAHORSE_BRANCH}" == "v2.5.2.giga36" ]]; then + if [[ "${GIGAHORSE_BRANCH}" == "v2.5.3.giga36" ]]; then GIGAHORSE_BRANCH="v2.4.1.giga36" # old version GIGAHORSE_VERSION=${GIGAHORSE_BRANCH#?} fi diff --git a/scripts/madmax_setup.sh b/scripts/madmax_setup.sh index 67ddb73c..49444bcd 100644 --- a/scripts/madmax_setup.sh +++ b/scripts/madmax_setup.sh @@ -5,51 +5,27 @@ # * Closed source binary for the Madmax Gigahorse farmer image # -# As of 2022-08-20 -HASH=d1a9e88b44ba37f61bfabcb68e80e83f8b939648 -CLASSIC_MADMAX_BRANCH=master - -if [[ (${mode} =~ ^fullnode.* || ${mode} =~ "plotter") && (${blockchains} == 'chia' || ${blockchains} == 'chives') ]]; then - if [ ! -f /usr/bin/chia_plot ] && [[ "${madmax_skip_build}" != 'true' ]]; then - arch_name="$(uname -m)" - apt update && apt install -y libsodium-dev cmake g++ git build-essential - cd / - git clone --branch ${CLASSIC_MADMAX_BRANCH} https://github.com/madMAx43v3r/chia-plotter.git - cd chia-plotter && echo "Building madmax on ${arch_name}..." - if [[ -z "${madmax_relic_main}" ]]; then # Hack on 2021-11-29 due to failed builds on some systems... - sed -i 's/set(ENV{RELIC_MAIN} "1")/#set(ENV{RELIC_MAIN} "1")/g' CMakeLists.txt - fi - git submodule update --init - git checkout $HASH - ./make_devel.sh - mkdir -p /usr/lib/chia-plotter - cp -r ./build/* /usr/lib/chia-plotter - ln -s /usr/lib/chia-plotter/chia_plot /usr/bin/chia_plot - ln -s /usr/lib/chia-plotter/chia_plot_k34 /usr/bin/chia_plot_k34 - cd / - rm -rf chia-plotter - fi -fi +MADMAX_BRANCH=$1 # MMX Plotter binaries, https://github.com/madMAx43v3r/chia-gigahorse -# MMX and Gigahorse container gets the "new" Madmax plotters with compression, only available as binaries -if [[ (${mode} =~ ^fullnode.* || ${mode} =~ "plotter") && (${blockchains} == 'mmx' || ${blockchains} == 'gigahorse') ]]; then +# Uses the "new" Madmax plotters with compression, only available as binaries +if [[ (${mode} =~ ^fullnode.* || ${mode} =~ "plotter") ]]; then if [ ! -f /usr/bin/chia_plot ] && [[ "${madmax_skip_build}" != 'true' ]]; then arch_name="$(uname -m)" if [[ "${arch_name}" == "x86_64" ]]; then pushd /usr/bin - curl -sLJO https://github.com/madMAx43v3r/chia-gigahorse/raw/${GIGAHORSE_BRANCH}/cpu-plotter/linux/x86_64/chia_plot - curl -sLJO https://github.com/madMAx43v3r/chia-gigahorse/raw/${GIGAHORSE_BRANCH}/cpu-plotter/linux/x86_64/chia_plot_k34 + curl -sLJO https://github.com/madMAx43v3r/chia-gigahorse/raw/${MADMAX_BRANCH}/cpu-plotter/linux/x86_64/chia_plot + curl -sLJO https://github.com/madMAx43v3r/chia-gigahorse/raw/${MADMAX_BRANCH}/cpu-plotter/linux/x86_64/chia_plot_k34 chmod 755 chia_plot* - curl -sLJO https://github.com/madMAx43v3r/chia-gigahorse/raw/${GIGAHORSE_BRANCH}/cuda-plotter/linux/x86_64/cuda_plot_k26 - curl -sLJO https://github.com/madMAx43v3r/chia-gigahorse/raw/${GIGAHORSE_BRANCH}/cuda-plotter/linux/x86_64/cuda_plot_k29 - curl -sLJO https://github.com/madMAx43v3r/chia-gigahorse/raw/${GIGAHORSE_BRANCH}/cuda-plotter/linux/x86_64/cuda_plot_k30 - curl -sLJO https://github.com/madMAx43v3r/chia-gigahorse/raw/${GIGAHORSE_BRANCH}/cuda-plotter/linux/x86_64/cuda_plot_k31 - curl -sLJO https://github.com/madMAx43v3r/chia-gigahorse/raw/${GIGAHORSE_BRANCH}/cuda-plotter/linux/x86_64/cuda_plot_k32 - curl -sLJO https://github.com/madMAx43v3r/chia-gigahorse/raw/${GIGAHORSE_BRANCH}/cuda-plotter/linux/x86_64/cuda_plot_k32_v3 - curl -sLJO https://github.com/madMAx43v3r/chia-gigahorse/raw/${GIGAHORSE_BRANCH}/cuda-plotter/linux/x86_64/cuda_plot_k33 + curl -sLJO https://github.com/madMAx43v3r/chia-gigahorse/raw/${MADMAX_BRANCH}/cuda-plotter/linux/x86_64/cuda_plot_k26 + curl -sLJO https://github.com/madMAx43v3r/chia-gigahorse/raw/${MADMAX_BRANCH}/cuda-plotter/linux/x86_64/cuda_plot_k29 + curl -sLJO https://github.com/madMAx43v3r/chia-gigahorse/raw/${MADMAX_BRANCH}/cuda-plotter/linux/x86_64/cuda_plot_k30 + curl -sLJO https://github.com/madMAx43v3r/chia-gigahorse/raw/${MADMAX_BRANCH}/cuda-plotter/linux/x86_64/cuda_plot_k31 + curl -sLJO https://github.com/madMAx43v3r/chia-gigahorse/raw/${MADMAX_BRANCH}/cuda-plotter/linux/x86_64/cuda_plot_k32 + curl -sLJO https://github.com/madMAx43v3r/chia-gigahorse/raw/${MADMAX_BRANCH}/cuda-plotter/linux/x86_64/cuda_plot_k32_v3 + curl -sLJO https://github.com/madMAx43v3r/chia-gigahorse/raw/${MADMAX_BRANCH}/cuda-plotter/linux/x86_64/cuda_plot_k33 chmod 755 cuda_plot* - curl -sLJO https://github.com/madMAx43v3r/chia-gigahorse/raw/${GIGAHORSE_BRANCH}/chiapos/linux/x86_64/ProofOfSpace + curl -sLJO https://github.com/madMAx43v3r/chia-gigahorse/raw/${MADMAX_BRANCH}/chiapos/linux/x86_64/ProofOfSpace chmod 755 ProofOfSpace popd echo "Completed download of Madmax binaries for plotting:" diff --git a/scripts/pull_3rd_party_libs.sh b/scripts/pull_3rd_party_libs.sh index d745d432..2bab37bc 100755 --- a/scripts/pull_3rd_party_libs.sh +++ b/scripts/pull_3rd_party_libs.sh @@ -4,8 +4,8 @@ # # Bootstrap and Icons -BSI_VERSION=1.11.3 -BOOTSTRAP_VERSION=5.3.3 +BSI_VERSION=1.12.1 +BOOTSTRAP_VERSION=5.3.6 BASEPATH=${JS_LIBS_BASEPATH:-/machinaris/web/static/3rd_party} # Mapping library @@ -13,15 +13,15 @@ LEAFLET_VERSION=1.9.4 # List of other css/js links LIST=" -https://cdn.datatables.net/2.1.8/css/dataTables.bootstrap5.css -https://cdn.datatables.net/2.1.8/js/dataTables.bootstrap5.js -https://cdn.datatables.net/2.1.8/js/dataTables.min.js -https://cdn.jsdelivr.net/npm/chart.js@4.4.4/dist/chart.umd.js.map -https://cdn.jsdelivr.net/npm/chart.js@4.4.4/dist/chart.umd.min.js +https://cdn.datatables.net/2.3.0/css/dataTables.bootstrap5.css +https://cdn.datatables.net/2.3.0/js/dataTables.bootstrap5.js +https://cdn.datatables.net/2.3.0/js/dataTables.min.js +https://cdn.jsdelivr.net/npm/chart.js@4.4.9/dist/chart.umd.js.map +https://cdn.jsdelivr.net/npm/chart.js@4.4.9/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.7.1/dist/jquery.min.js -https://cdn.jsdelivr.net/npm/luxon@3.5.0/build/global/luxon.min.js" +https://cdn.jsdelivr.net/npm/luxon@3.6.1/build/global/luxon.min.js" mkdir -p $BASEPATH for url in $LIST ; do