Skip to content

Commit 75c412b

Browse files
guydavisguydavis
authored
Merge pull request #1034 from guydavis/integration
Chia v2.5.4
2 parents 494615a + 04327c5 commit 75c412b

File tree

11 files changed

+45
-53
lines changed

11 files changed

+45
-53
lines changed

‎.github/workflows/develop-blockchains.yaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ jobs:
9090
"CHIADOG_BRANCH=dev"
9191
"CHIA_BRANCH=2.5.2"
9292
"BLADEBIT_BRANCH=master"
93+
"MADMAX_BRANCH=v2.5.3.giga36"
9394
"PLOTMAN_BRANCH=compress"
9495
tags: |
9596
${{ secrets.DOCKERHUB_USERNAME }}/machinaris:develop
@@ -133,8 +134,9 @@ jobs:
133134
"UBUNTU_VER=noble"
134135
"MACHINARIS_STREAM=develop"
135136
"CHIADOG_BRANCH=dev"
136-
"GIGAHORSE_BRANCH=v2.5.2.giga36"
137+
"GIGAHORSE_BRANCH=v2.5.3.giga36"
137138
"CHIA_BRANCH=2.5.2"
139+
"MADMAX_BRANCH=v2.5.3.giga36"
138140
"PLOTMAN_BRANCH=compress"
139141
tags: |
140142
${{ secrets.DOCKERHUB_USERNAME }}/machinaris-gigahorse:develop

‎.github/workflows/main-blockchains.yaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ jobs:
8888
"MACHINARIS_STREAM=latest"
8989
"CHIA_BRANCH=2.5.2"
9090
"BLADEBIT_BRANCH=master"
91+
"MADMAX_BRANCH=v2.5.3.giga36"
9192
tags: |
9293
${{ secrets.DOCKERHUB_USERNAME }}/machinaris:latest
9394
${{ secrets.DOCKERHUB_USERNAME }}/machinaris:v${{ github.event.inputs.version }}
@@ -131,7 +132,8 @@ jobs:
131132
build-args: |
132133
"UBUNTU_VER=noble"
133134
"MACHINARIS_STREAM=latest"
134-
"GIGAHORSE_BRANCH=v2.5.2.giga36"
135+
"GIGAHORSE_BRANCH=v2.5.3.giga36"
136+
"MADMAX_BRANCH=v2.5.3.giga36"
135137
"CHIA_BRANCH=2.5.2"
136138
tags: |
137139
${{ secrets.DOCKERHUB_USERNAME }}/machinaris-gigahorse:latest

‎.github/workflows/test-blockchains.yaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ jobs:
9090
"CHIA_BRANCH=2.5.2"
9191
"PLOTMAN_BRANCH=development"
9292
"BLADEBIT_BRANCH=master"
93+
"MADMAX_BRANCH=v2.5.3.giga36"
9394
tags: |
9495
${{ secrets.DOCKERHUB_USERNAME }}/machinaris:test
9596
ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris:test
@@ -132,8 +133,9 @@ jobs:
132133
"UBUNTU_VER=noble"
133134
"MACHINARIS_STREAM=test"
134135
"CHIADOG_BRANCH=dev"
135-
"GIGAHORSE_BRANCH=v2.5.2.giga36"
136+
"GIGAHORSE_BRANCH=v2.5.3.giga36"
136137
"CHIA_BRANCH=2.5.2"
138+
"MADMAX_BRANCH=v2.5.3.giga36"
137139
"PLOTMAN_BRANCH=development"
138140
tags: |
139141
${{ secrets.DOCKERHUB_USERNAME }}/machinaris-gigahorse:test

‎CHANGELOG.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@
22

33
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).
44

5+
## [2.5.4] - 2025-05-29
6+
### Added
7+
### Changed
8+
- [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.
9+
### Updated
10+
- [Chia](https://github.com/Chia-Network/chia-blockchain/releases/tag/2.5.4) to v2.5.4 - misc improvements, see their release notes.
11+
- [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.
12+
513
## [2.5.3] - 2025-03-28
614
### Added
715
### Changed

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.5.3
1+
2.5.4

‎docker/dockerfile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ ARG CHIADOG_BRANCH=main
99
ARG FDCLI_BRANCH=master
1010
ARG FORKTOOLS_BRANCH=main
1111
ARG BLADEBIT_BRANCH=master
12+
ARG MADMAX_BRANCH=master
1213

1314
ARG ACHI_BRANCH
1415
ARG APPLE_BRANCH
@@ -149,6 +150,7 @@ ENV FDCLI_BRANCH=${FDCLI_BRANCH}
149150
ENV FORKTOOLS_BRANCH=${FORKTOOLS_BRANCH}
150151
ENV BLADEBIT_BRANCH=${BLADEBIT_BRANCH}
151152
ENV GIGAHORSE_BRANCH=${GIGAHORSE_BRANCH}
153+
ENV MADMAX_BRANCH=${MADMAX_BRANCH}
152154
ENV MMX_HOME=/root/.mmx/
153155

154156
VOLUME [ "/id_rsa" ]

‎docker/entrypoint.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ if /usr/bin/bash /machinaris/scripts/forks/${blockchains}_launch.sh; then
104104
/usr/bin/bash /machinaris/scripts/bladebit_setup.sh ${BLADEBIT_BRANCH} > /tmp/bladebit_setup.log 2>&1
105105

106106
# Conditionally madmax on plotters and fullnodes, sleep a bit first
107-
/usr/bin/bash /machinaris/scripts/madmax_setup.sh ${GIGAHORSE_BRANCH} > /tmp/madmax_setup.log 2>&1
107+
/usr/bin/bash /machinaris/scripts/madmax_setup.sh ${MADMAX_BRANCH} > /tmp/madmax_setup.log 2>&1
108108

109109
# Conditionally install plotman on plotters and fullnodes, after the plotters setup
110110
/usr/bin/bash /machinaris/scripts/plotman_autoplot.sh > /tmp/plotman_autoplot.log 2>&1

‎scripts/forks/chia_install.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ else
2727
echo "Installing Chia CUDA binaries on ${arch_name}..."
2828
cd /tmp
2929
if [[ "${arch_name}" == "x86_64" ]]; then
30-
curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.5.3/chia-blockchain-cli_2.5.3-1_amd64.deb
30+
curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.5.4/chia-blockchain-cli_2.5.4-1_amd64.deb
3131
apt-get install ./chia-blockchain-cli*.deb
3232
else
33-
curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.5.3/chia-blockchain-cli_2.5.3-1_arm64.deb
33+
curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.5.4/chia-blockchain-cli_2.5.4-1_arm64.deb
3434
apt-get install ./chia-blockchain-cli*.deb
3535
fi
3636

‎scripts/forks/gigahorse_install.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ else
2424
tar -xzf chia-gigahorse-farmer*
2525
else
2626
# Max broke ARM64 support in v2.4.4.giga36, have to downgrade to 2.4.1
27-
if [[ "${GIGAHORSE_BRANCH}" == "v2.5.2.giga36" ]]; then
27+
if [[ "${GIGAHORSE_BRANCH}" == "v2.5.3.giga36" ]]; then
2828
GIGAHORSE_BRANCH="v2.4.1.giga36" # old version
2929
GIGAHORSE_VERSION=${GIGAHORSE_BRANCH#?}
3030
fi

‎scripts/madmax_setup.sh‎

Lines changed: 13 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -5,51 +5,27 @@
55
# * Closed source binary for the Madmax Gigahorse farmer image
66
#
77

8-
# As of 2022-08-20
9-
HASH=d1a9e88b44ba37f61bfabcb68e80e83f8b939648
10-
CLASSIC_MADMAX_BRANCH=master
11-
12-
if [[ (${mode} =~ ^fullnode.* || ${mode} =~ "plotter") && (${blockchains} == 'chia' || ${blockchains} == 'chives') ]]; then
13-
if [ ! -f /usr/bin/chia_plot ] && [[ "${madmax_skip_build}" != 'true' ]]; then
14-
arch_name="$(uname -m)"
15-
apt update && apt install -y libsodium-dev cmake g++ git build-essential
16-
cd /
17-
git clone --branch ${CLASSIC_MADMAX_BRANCH} https://github.com/madMAx43v3r/chia-plotter.git
18-
cd chia-plotter && echo "Building madmax on ${arch_name}..."
19-
if [[ -z "${madmax_relic_main}" ]]; then # Hack on 2021-11-29 due to failed builds on some systems...
20-
sed -i 's/set(ENV{RELIC_MAIN} "1")/#set(ENV{RELIC_MAIN} "1")/g' CMakeLists.txt
21-
fi
22-
git submodule update --init
23-
git checkout $HASH
24-
./make_devel.sh
25-
mkdir -p /usr/lib/chia-plotter
26-
cp -r ./build/* /usr/lib/chia-plotter
27-
ln -s /usr/lib/chia-plotter/chia_plot /usr/bin/chia_plot
28-
ln -s /usr/lib/chia-plotter/chia_plot_k34 /usr/bin/chia_plot_k34
29-
cd /
30-
rm -rf chia-plotter
31-
fi
32-
fi
8+
MADMAX_BRANCH=$1
339

3410
# MMX Plotter binaries, https://github.com/madMAx43v3r/chia-gigahorse
35-
# MMX and Gigahorse container gets the "new" Madmax plotters with compression, only available as binaries
36-
if [[ (${mode} =~ ^fullnode.* || ${mode} =~ "plotter") && (${blockchains} == 'mmx' || ${blockchains} == 'gigahorse') ]]; then
11+
# Uses the "new" Madmax plotters with compression, only available as binaries
12+
if [[ (${mode} =~ ^fullnode.* || ${mode} =~ "plotter") ]]; then
3713
if [ ! -f /usr/bin/chia_plot ] && [[ "${madmax_skip_build}" != 'true' ]]; then
3814
arch_name="$(uname -m)"
3915
if [[ "${arch_name}" == "x86_64" ]]; then
4016
pushd /usr/bin
41-
curl -sLJO https://github.com/madMAx43v3r/chia-gigahorse/raw/${GIGAHORSE_BRANCH}/cpu-plotter/linux/x86_64/chia_plot
42-
curl -sLJO https://github.com/madMAx43v3r/chia-gigahorse/raw/${GIGAHORSE_BRANCH}/cpu-plotter/linux/x86_64/chia_plot_k34
17+
curl -sLJO https://github.com/madMAx43v3r/chia-gigahorse/raw/${MADMAX_BRANCH}/cpu-plotter/linux/x86_64/chia_plot
18+
curl -sLJO https://github.com/madMAx43v3r/chia-gigahorse/raw/${MADMAX_BRANCH}/cpu-plotter/linux/x86_64/chia_plot_k34
4319
chmod 755 chia_plot*
44-
curl -sLJO https://github.com/madMAx43v3r/chia-gigahorse/raw/${GIGAHORSE_BRANCH}/cuda-plotter/linux/x86_64/cuda_plot_k26
45-
curl -sLJO https://github.com/madMAx43v3r/chia-gigahorse/raw/${GIGAHORSE_BRANCH}/cuda-plotter/linux/x86_64/cuda_plot_k29
46-
curl -sLJO https://github.com/madMAx43v3r/chia-gigahorse/raw/${GIGAHORSE_BRANCH}/cuda-plotter/linux/x86_64/cuda_plot_k30
47-
curl -sLJO https://github.com/madMAx43v3r/chia-gigahorse/raw/${GIGAHORSE_BRANCH}/cuda-plotter/linux/x86_64/cuda_plot_k31
48-
curl -sLJO https://github.com/madMAx43v3r/chia-gigahorse/raw/${GIGAHORSE_BRANCH}/cuda-plotter/linux/x86_64/cuda_plot_k32
49-
curl -sLJO https://github.com/madMAx43v3r/chia-gigahorse/raw/${GIGAHORSE_BRANCH}/cuda-plotter/linux/x86_64/cuda_plot_k32_v3
50-
curl -sLJO https://github.com/madMAx43v3r/chia-gigahorse/raw/${GIGAHORSE_BRANCH}/cuda-plotter/linux/x86_64/cuda_plot_k33
20+
curl -sLJO https://github.com/madMAx43v3r/chia-gigahorse/raw/${MADMAX_BRANCH}/cuda-plotter/linux/x86_64/cuda_plot_k26
21+
curl -sLJO https://github.com/madMAx43v3r/chia-gigahorse/raw/${MADMAX_BRANCH}/cuda-plotter/linux/x86_64/cuda_plot_k29
22+
curl -sLJO https://github.com/madMAx43v3r/chia-gigahorse/raw/${MADMAX_BRANCH}/cuda-plotter/linux/x86_64/cuda_plot_k30
23+
curl -sLJO https://github.com/madMAx43v3r/chia-gigahorse/raw/${MADMAX_BRANCH}/cuda-plotter/linux/x86_64/cuda_plot_k31
24+
curl -sLJO https://github.com/madMAx43v3r/chia-gigahorse/raw/${MADMAX_BRANCH}/cuda-plotter/linux/x86_64/cuda_plot_k32
25+
curl -sLJO https://github.com/madMAx43v3r/chia-gigahorse/raw/${MADMAX_BRANCH}/cuda-plotter/linux/x86_64/cuda_plot_k32_v3
26+
curl -sLJO https://github.com/madMAx43v3r/chia-gigahorse/raw/${MADMAX_BRANCH}/cuda-plotter/linux/x86_64/cuda_plot_k33
5127
chmod 755 cuda_plot*
52-
curl -sLJO https://github.com/madMAx43v3r/chia-gigahorse/raw/${GIGAHORSE_BRANCH}/chiapos/linux/x86_64/ProofOfSpace
28+
curl -sLJO https://github.com/madMAx43v3r/chia-gigahorse/raw/${MADMAX_BRANCH}/chiapos/linux/x86_64/ProofOfSpace
5329
chmod 755 ProofOfSpace
5430
popd
5531
echo "Completed download of Madmax binaries for plotting:"

0 commit comments

Comments
 (0)