Skip to content

Commit 84bba97

Browse files
committed
Merge remote-tracking branch 'origin/main' into full-node-simulator-pool-reward
2 parents dcfeb8c + 064eaa2 commit 84bba97

File tree

6 files changed

+63
-33
lines changed

6 files changed

+63
-33
lines changed

.github/workflows/build-macos-installers.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
matrix:
5454
python-version: ["3.12"]
5555
os:
56-
- runs-on: ${{ github.repository_owner == 'Chia-Network' && 'macos-13-intel' || 'macos-13' }}
56+
- runs-on: ${{ github.repository_owner == 'Chia-Network' && 'macos-13-intel' || 'macos-15-intel' }}
5757
name: intel
5858
bladebit-suffix: macos-x86-64.tar.gz
5959
arch-artifact-name: intel
@@ -296,7 +296,7 @@ jobs:
296296
- name: 13
297297
matrix: 13
298298
runs-on:
299-
intel: ${{ github.repository_owner == 'Chia-Network' && 'macos-13-intel' || 'macos-13' }}
299+
intel: ${{ github.repository_owner == 'Chia-Network' && 'macos-13-intel' || 'macos-15-intel' }}
300300
- name: 14
301301
matrix: 14
302302
runs-on:

.github/workflows/check_wheel_availability.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- name: macOS
3333
matrix: macos
3434
runs-on:
35-
intel: ${{ github.repository_owner == 'Chia-Network' && 'macos-13-intel' || 'macos-13' }}
35+
intel: ${{ github.repository_owner == 'Chia-Network' && 'macos-13-intel' || 'macos-15-intel' }}
3636
arm: ${{ github.repository_owner == 'Chia-Network' && 'macos-13-arm64' || 'macos-15' }}
3737
- name: Windows
3838
matrix: windows

.github/workflows/pre-commit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- name: macOS
3030
matrix: macos
3131
runs-on:
32-
intel: ${{ github.repository_owner == 'Chia-Network' && 'macos-13-intel' || 'macos-13' }}
32+
intel: ${{ github.repository_owner == 'Chia-Network' && 'macos-13-intel' || 'macos-15-intel' }}
3333
arm: macos-latest
3434
- name: Windows
3535
matrix: windows

.github/workflows/test-install-scripts.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
emoji: 🍎
4545
runs-on:
4646
arm: macos-15
47-
intel: ${{ github.repository_owner == 'Chia-Network' && 'macos-13-intel' || 'macos-13' }}
47+
intel: ${{ github.repository_owner == 'Chia-Network' && 'macos-13-intel' || 'macos-15-intel' }}
4848
matrix: macos
4949
- name: Windows
5050
emoji: 🪟

.github/workflows/test.yml

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -235,32 +235,32 @@ jobs:
235235
env:
236236
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
237237

238-
- name: Download Results
239-
if: false
240-
uses: actions/download-artifact@v6
241-
with:
242-
merge-multiple: true
243-
pattern: junit-data-*
244-
path: junit-data
245-
246-
- name: Format JUnit data and prepare results
247-
if: false
248-
run: |
249-
sudo snap install yq
250-
find junit-data -maxdepth 1 -name '*.xml' -print0 | xargs -0 --max-procs=10 --replace={} yq eval '.testsuites.testsuite.testcase |= sort_by(.+@classname, .+@name)' --inplace {}
251-
252-
sudo apt-get install junitparser
253-
mkdir junit-results
254-
junitparser merge junit-data/*.xml junit-results/junit.xml
255-
find junit-results -maxdepth 1 -name '*.xml' -print0 | xargs -0 --max-procs=10 --replace={} yq eval '.testsuites.testsuite |= sort_by(.+@name) | .testsuites.testsuite[].testcase |= sort_by(.+@classname, .+@name)' --inplace {}
256-
257-
- name: Publish formatted JUnit data
258-
if: false
259-
uses: actions/upload-artifact@v5
260-
with:
261-
name: junit-data
262-
path: junit-data/*
263-
if-no-files-found: error
238+
# - name: Download Results
239+
# if: false
240+
# uses: actions/download-artifact@v6
241+
# with:
242+
# merge-multiple: true
243+
# pattern: junit-data-*
244+
# path: junit-data
245+
246+
# - name: Format JUnit data and prepare results
247+
# if: false
248+
# run: |
249+
# sudo snap install yq
250+
# find junit-data -maxdepth 1 -name '*.xml' -print0 | xargs -0 --max-procs=10 --replace={} yq eval '.testsuites.testsuite.testcase |= sort_by(.+@classname, .+@name)' --inplace {}
251+
252+
# sudo apt-get install junitparser
253+
# mkdir junit-results
254+
# junitparser merge junit-data/*.xml junit-results/junit.xml
255+
# find junit-results -maxdepth 1 -name '*.xml' -print0 | xargs -0 --max-procs=10 --replace={} yq eval '.testsuites.testsuite |= sort_by(.+@name) | .testsuites.testsuite[].testcase |= sort_by(.+@classname, .+@name)' --inplace {}
256+
257+
# - name: Publish formatted JUnit data
258+
# if: false
259+
# uses: actions/upload-artifact@v5
260+
# with:
261+
# name: junit-data
262+
# path: junit-data/*
263+
# if-no-files-found: error
264264

265265
- name: Download Coverage
266266
uses: actions/download-artifact@v6

CHANGELOG.md

Lines changed: 32 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,43 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project does not yet adhere to [Semantic Versioning](https://semver.org/spec/v2.0.0.html)
77
for setuptools_scm/PEP 440 reasons.
88

9-
## Next Release
9+
## 2.5.7 Chia blockchain 2025-11-12
1010

1111
## What's Changed
1212

13+
### Added
14+
15+
- New Datalayer delta file format for improved performance
16+
- New Datalayer delta file migration and increased logging
17+
- New Datalayer config option `merkle_blobs_cache_size`
18+
- Work in Progress - preliminary support for V2 plot format (eg: `chia plots check`)
19+
- Add Enum support to `streamable` framework
20+
- New option `-i/--include-pool-rewards` for `chia farm summary` (thanks @wallentx)
21+
1322
### Changed
1423

15-
- Updated ChiaLisp dependency from 'clvm_tools_rs' to new repo 'chialisp'
24+
- Improved Datalayer performance significantly with migration to Rust (via `chia_rs`)
25+
- Improved Mempool performance and fast forward support
26+
- Modified wallet RPC `add_key` to support providing a key label
27+
- Integrated `PLOT_V1_PHASE_OUT` constant
28+
- Optimixed code related to node handling of new peaks
29+
- Simplified `install-gui.sh` script to remove code that attempts to find and install NodeJS
30+
- Bump `chia_rs` to `0.30`
31+
- Bump `chiavdf` to `1.1.13`
32+
- Bump `cryptography` to `45.0.5`
33+
- Bump `cffi` to `1.17.1`
34+
- Bump `markupsafe` to `3.0.2`
35+
36+
### Fixed
37+
38+
- Changed logging of `NO_OVERFLOWS_IN_FIRST_SUB_SLOT_NEW_EPOCH` from `error` to `info` as this is expected in certain situations
39+
- Fixed signage point lookup edge case at genesis in the first slot
40+
- Change default limit for `get_transactions` to 65536 (uint16)
41+
42+
### Removed
43+
44+
- Removed the following unsupported Wallet RPC APIs: `did_update_recovery_ids`, `did_recovery_spend`, `did_get_recovery_list`, `did_create_attest`, `did_get_information_needed_for_recovery`
45+
- Python 3.9 is no longer supported
1646

1747
## 2.5.6 Chia blockchain 2025-9-24
1848

0 commit comments

Comments
 (0)