Skip to content

Commit

Permalink
Merge bitcoin#29440: [26.1] final changes for 26.1rc1
Browse files Browse the repository at this point in the history
1e7fb27 [doc] add release notes for 26.1rc1 (glozow)
0ffeaf2 [doc] update manual pages for 26.1rc1 (glozow)
d4aeb4a [build] bump version to 26.1rc1 (glozow)
c277938 qt: 26.1rc1 translations update (Hennadii Stepanov)
40e7693 ci: Switch native macOS CI job to Xcode 15.0 (Hennadii Stepanov)
72eab1c build: Fix `-Xclang -internal-isystem` option (Hennadii Stepanov)

Pull request description:

  Final changes to tag a 26.1rc1.
  Bumps version numbers, man pages, adds release notes etc.

ACKs for top commit:
  hebasto:
    re-ACK 1e7fb27
  fanquake:
    ACK 1e7fb27

Tree-SHA512: 0f4146590d61f4f9322f3147f672ff2af48fc1d85c708b959adcbdb50b8f280570cb732d9f4a424c014046d07e9aa6e408fc3a0337dbaf8cbaea5283697da35a
  • Loading branch information
fanquake committed Feb 19, 2024
2 parents 74df372 + 1e7fb27 commit a469048
Show file tree
Hide file tree
Showing 63 changed files with 6,650 additions and 924 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/ci.yml
Expand Up @@ -89,7 +89,9 @@ jobs:
uses: actions/checkout@v4

- name: Clang version
run: clang --version
run: |
sudo xcode-select --switch /Applications/Xcode_15.0.app
clang --version
- name: Install Homebrew packages
env:
Expand Down
6 changes: 3 additions & 3 deletions configure.ac
@@ -1,8 +1,8 @@
AC_PREREQ([2.69])
define(_CLIENT_VERSION_MAJOR, 26)
define(_CLIENT_VERSION_MINOR, 0)
define(_CLIENT_VERSION_MINOR, 1)
define(_CLIENT_VERSION_BUILD, 0)
define(_CLIENT_VERSION_RC, 0)
define(_CLIENT_VERSION_RC, 1)
define(_CLIENT_VERSION_IS_RELEASE, true)
define(_COPYRIGHT_YEAR, 2023)
define(_COPYRIGHT_HOLDERS,[The %s developers])
Expand Down Expand Up @@ -755,7 +755,7 @@ case $host in
dnl option to system-ify all /usr/local/include paths without adding it to the list
dnl of search paths in case it's not already there.
if test "$suppress_external_warnings" != "no"; then
AX_CHECK_PREPROC_FLAG([-Xclang -internal-isystem/usr/local/include], [CORE_CPPFLAGS="$CORE_CPPFLAGS -Xclang -internal-isystem/usr/local/include"], [], [$CXXFLAG_WERROR])
AX_CHECK_PREPROC_FLAG([-Xclang -internal-isystem -Xclang /usr/local/include/], [CORE_CPPFLAGS="$CORE_CPPFLAGS -Xclang -internal-isystem -Xclang /usr/local/include/"], [], [$CXXFLAG_WERROR])
fi

if test "$use_bdb" != "no" && $BREW list --versions berkeley-db@4 >/dev/null && test "$BDB_CFLAGS" = "" && test "$BDB_LIBS" = ""; then
Expand Down
8 changes: 4 additions & 4 deletions doc/man/bitcoin-cli.1
@@ -1,7 +1,7 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
.TH BITCOIN-CLI "1" "November 2023" "bitcoin-cli v26.0.0" "User Commands"
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.1.
.TH BITCOIN-CLI "1" "February 2024" "bitcoin-cli v26.1.0rc1" "User Commands"
.SH NAME
bitcoin-cli \- manual page for bitcoin-cli v26.0.0
bitcoin-cli \- manual page for bitcoin-cli v26.1.0rc1
.SH SYNOPSIS
.B bitcoin-cli
[\fI\,options\/\fR] \fI\,<command> \/\fR[\fI\,params\/\fR] \fI\,Send command to Bitcoin Core\/\fR
Expand All @@ -15,7 +15,7 @@ bitcoin-cli \- manual page for bitcoin-cli v26.0.0
.B bitcoin-cli
[\fI\,options\/\fR] \fI\,help <command> Get help for a command\/\fR
.SH DESCRIPTION
Bitcoin Core RPC client version v26.0.0
Bitcoin Core RPC client version v26.1.0rc1
.SH OPTIONS
.HP
\-?
Expand Down
8 changes: 4 additions & 4 deletions doc/man/bitcoin-qt.1
@@ -1,12 +1,12 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
.TH BITCOIN-QT "1" "November 2023" "bitcoin-qt v26.0.0" "User Commands"
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.1.
.TH BITCOIN-QT "1" "February 2024" "bitcoin-qt v26.1.0rc1" "User Commands"
.SH NAME
bitcoin-qt \- manual page for bitcoin-qt v26.0.0
bitcoin-qt \- manual page for bitcoin-qt v26.1.0rc1
.SH SYNOPSIS
.B bitcoin-qt
[\fI\,command-line options\/\fR]
.SH DESCRIPTION
Bitcoin Core version v26.0.0
Bitcoin Core version v26.1.0rc1
.SH OPTIONS
.HP
\-?
Expand Down
8 changes: 4 additions & 4 deletions doc/man/bitcoin-tx.1
@@ -1,15 +1,15 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
.TH BITCOIN-TX "1" "November 2023" "bitcoin-tx v26.0.0" "User Commands"
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.1.
.TH BITCOIN-TX "1" "February 2024" "bitcoin-tx v26.1.0rc1" "User Commands"
.SH NAME
bitcoin-tx \- manual page for bitcoin-tx v26.0.0
bitcoin-tx \- manual page for bitcoin-tx v26.1.0rc1
.SH SYNOPSIS
.B bitcoin-tx
[\fI\,options\/\fR] \fI\,<hex-tx> \/\fR[\fI\,commands\/\fR] \fI\,Update hex-encoded bitcoin transaction\/\fR
.br
.B bitcoin-tx
[\fI\,options\/\fR] \fI\,-create \/\fR[\fI\,commands\/\fR] \fI\,Create hex-encoded bitcoin transaction\/\fR
.SH DESCRIPTION
Bitcoin Core bitcoin\-tx utility version v26.0.0
Bitcoin Core bitcoin\-tx utility version v26.1.0rc1
.SH OPTIONS
.HP
\-?
Expand Down
8 changes: 4 additions & 4 deletions doc/man/bitcoin-util.1
@@ -1,12 +1,12 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
.TH BITCOIN-UTIL "1" "November 2023" "bitcoin-util v26.0.0" "User Commands"
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.1.
.TH BITCOIN-UTIL "1" "February 2024" "bitcoin-util v26.1.0rc1" "User Commands"
.SH NAME
bitcoin-util \- manual page for bitcoin-util v26.0.0
bitcoin-util \- manual page for bitcoin-util v26.1.0rc1
.SH SYNOPSIS
.B bitcoin-util
[\fI\,options\/\fR] [\fI\,commands\/\fR] \fI\,Do stuff\/\fR
.SH DESCRIPTION
Bitcoin Core bitcoin\-util utility version v26.0.0
Bitcoin Core bitcoin\-util utility version v26.1.0rc1
.SH OPTIONS
.HP
\-?
Expand Down
8 changes: 4 additions & 4 deletions doc/man/bitcoin-wallet.1
@@ -1,9 +1,9 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
.TH BITCOIN-WALLET "1" "November 2023" "bitcoin-wallet v26.0.0" "User Commands"
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.1.
.TH BITCOIN-WALLET "1" "February 2024" "bitcoin-wallet v26.1.0rc1" "User Commands"
.SH NAME
bitcoin-wallet \- manual page for bitcoin-wallet v26.0.0
bitcoin-wallet \- manual page for bitcoin-wallet v26.1.0rc1
.SH DESCRIPTION
Bitcoin Core bitcoin\-wallet version v26.0.0
Bitcoin Core bitcoin\-wallet version v26.1.0rc1
.PP
bitcoin\-wallet is an offline tool for creating and interacting with Bitcoin Core wallet files.
By default bitcoin\-wallet will act on wallets in the default mainnet wallet directory in the datadir.
Expand Down
8 changes: 4 additions & 4 deletions doc/man/bitcoind.1
@@ -1,12 +1,12 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
.TH BITCOIND "1" "November 2023" "bitcoind v26.0.0" "User Commands"
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.1.
.TH BITCOIND "1" "February 2024" "bitcoind v26.1.0rc1" "User Commands"
.SH NAME
bitcoind \- manual page for bitcoind v26.0.0
bitcoind \- manual page for bitcoind v26.1.0rc1
.SH SYNOPSIS
.B bitcoind
[\fI\,options\/\fR] \fI\,Start Bitcoin Core\/\fR
.SH DESCRIPTION
Bitcoin Core version v26.0.0
Bitcoin Core version v26.1.0rc1
.SH OPTIONS
.HP
\-?
Expand Down
31 changes: 27 additions & 4 deletions doc/release-notes.md
@@ -1,9 +1,9 @@
26.x Release Notes
26.1rc1 Release Notes
==================

Bitcoin Core version 26.x is now available from:
Bitcoin Core version 26.1rc1 is now available from:

<https://bitcoincore.org/bin/bitcoin-core-26.x/>
<https://bitcoincore.org/bin/bitcoin-core-26.1/test.rc1/>

This release includes new features, various bug fixes and performance
improvements, as well as updated translations.
Expand Down Expand Up @@ -50,22 +50,45 @@ Notable changes

- #29003 rpc: fix getrawtransaction segfault

### Logs

- #29227 log mempool loading progress

### P2P and network changes

- #29200 net: create I2P sessions using both ECIES-X25519 and ElGamal encryption

### Build

- #29127 Use hardened runtime on macOS release builds.
- #29195 build: Fix -Xclang -internal-isystem option

### CI

- #28992 ci: Use Ubuntu 24.04 Noble for asan,tsan,tidy,fuzz
- #29080 ci: Set HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK to avoid unrelated failures

### Miscellaneous

- #28391 refactor: Simplify CTxMempool/BlockAssembler fields, remove some external mapTx access
- #29179 test: wallet rescan with reorged parent + IsFromMe child in mempool
- #28791 snapshots: don't core dump when running -checkblockindex after loadtxoutset

Credits
=======

Thanks to everyone who directly contributed to this release:

- Andrew Chow
- fanquake
- furszy
- glozow
- Hennadii Stepanov
- Jon Atack
- MarcoFalke
- Mark Friedenbach
- Martin Zumsande
- Murch
- stickies-v

As well as to everyone that helped with translations on
[Transifex](https://www.transifex.com/bitcoin/bitcoin/).
2 changes: 2 additions & 0 deletions src/Makefile.qt_locale.include
Expand Up @@ -67,6 +67,7 @@ QT_TS = \
qt/locale/bitcoin_lt.ts \
qt/locale/bitcoin_lv.ts \
qt/locale/bitcoin_mg.ts \
qt/locale/bitcoin_mi.ts \
qt/locale/bitcoin_mk.ts \
qt/locale/bitcoin_ml.ts \
qt/locale/bitcoin_mn.ts \
Expand All @@ -87,6 +88,7 @@ QT_TS = \
qt/locale/bitcoin_ro.ts \
qt/locale/bitcoin_ru.ts \
qt/locale/bitcoin_sc.ts \
qt/locale/bitcoin_sd.ts \
qt/locale/bitcoin_si.ts \
qt/locale/bitcoin_sk.ts \
qt/locale/bitcoin_sl.ts \
Expand Down
2 changes: 2 additions & 0 deletions src/qt/bitcoin_locale.qrc
Expand Up @@ -68,6 +68,7 @@
<file alias="lt">locale/bitcoin_lt.qm</file>
<file alias="lv">locale/bitcoin_lv.qm</file>
<file alias="mg">locale/bitcoin_mg.qm</file>
<file alias="mi">locale/bitcoin_mi.qm</file>
<file alias="mk">locale/bitcoin_mk.qm</file>
<file alias="ml">locale/bitcoin_ml.qm</file>
<file alias="mn">locale/bitcoin_mn.qm</file>
Expand All @@ -88,6 +89,7 @@
<file alias="ro">locale/bitcoin_ro.qm</file>
<file alias="ru">locale/bitcoin_ru.qm</file>
<file alias="sc">locale/bitcoin_sc.qm</file>
<file alias="sd">locale/bitcoin_sd.qm</file>
<file alias="si">locale/bitcoin_si.qm</file>
<file alias="sk">locale/bitcoin_sk.qm</file>
<file alias="sl">locale/bitcoin_sl.qm</file>
Expand Down
10 changes: 9 additions & 1 deletion src/qt/locale/bitcoin_am.ts
Expand Up @@ -3,7 +3,7 @@
<name>AddressBookPage</name>
<message>
<source>Right-click to edit address or label</source>
<translation type="unfinished">አድራሻ ወይም መለያ ስም ለማርተዕ ቀኙን ጠቅ ያድርጉ</translation>
<translation type="unfinished">አድራሻ ወይም መለያ ስም ለመቀየር ቀኙን ጠቅ ያድርጉ</translation>
</message>
<message>
<source>Create a new address</source>
Expand Down Expand Up @@ -93,6 +93,14 @@ Signing is only possible with addresses of the type 'legacy'.</source>
<extracomment>An error message. %1 is a stand-in argument for the name of the file we attempted to save to.</extracomment>
<translation type="unfinished">የአድራሻ ዝርዝሩን ወደ %1 ለማስቀመጥ ሲሞከር ስህተት አጋጥሟል:: እባክዎ መልሰው ይሞክሩ::</translation>
</message>
<message>
<source>Sending addresses - %1</source>
<translation type="unfinished">አድራሻዎችን በመላክ ላይ - %1</translation>
</message>
<message>
<source>Receiving addresses - %1</source>
<translation type="unfinished">አድራሻዎችን በማቀበል ላይ - %1</translation>
</message>
<message>
<source>Exporting Failed</source>
<translation type="unfinished">ወደ ውጪ መላክ አልተሳካም</translation>
Expand Down
4 changes: 2 additions & 2 deletions src/qt/locale/bitcoin_az.ts
Expand Up @@ -3,11 +3,11 @@
<name>AddressBookPage</name>
<message>
<source>Right-click to edit address or label</source>
<translation type="unfinished">Ünvana və ya etiketə düzəliş etmək üçün sağ klikləyin</translation>
<translation type="unfinished">Ünvana və ya etiketə düzəliş etmək üçün sağ düyməni klikləyin</translation>
</message>
<message>
<source>Create a new address</source>
<translation type="unfinished">Yeni bir ünvan yaradın</translation>
<translation type="unfinished">Yeni ünvan yaradın</translation>
</message>
<message>
<source>&amp;New</source>
Expand Down
59 changes: 59 additions & 0 deletions src/qt/locale/bitcoin_bg.ts
Expand Up @@ -92,6 +92,14 @@ Signing is only possible with addresses of the type 'legacy'.</source>
<extracomment>An error message. %1 is a stand-in argument for the name of the file we attempted to save to.</extracomment>
<translation type="unfinished">Получи се грешка при запазването на листа с адреси към %1. Моля опитайте пак.</translation>
</message>
<message>
<source>Sending addresses - %1</source>
<translation type="unfinished">Изпращащ адрес - %1</translation>
</message>
<message>
<source>Receiving addresses - %1</source>
<translation type="unfinished">Получаващ адрес - %1</translation>
</message>
<message>
<source>Exporting Failed</source>
<translation type="unfinished">Изнасянето се провали</translation>
Expand Down Expand Up @@ -686,6 +694,14 @@ Signing is only possible with addresses of the type 'legacy'.</source>
<source>Close all wallets</source>
<translation type="unfinished">Затвори всички портфейли</translation>
</message>
<message>
<source>Migrate Wallet</source>
<translation type="unfinished">Мигрирайте портфейла</translation>
</message>
<message>
<source>Migrate a wallet</source>
<translation type="unfinished">Мигрирайте портфейл</translation>
</message>
<message>
<source>Show the %1 help message to get a list with possible Bitcoin command-line options</source>
<translation type="unfinished">Покажи %1 помощно съобщение за да получиш лист с възможни Биткойн команди</translation>
Expand Down Expand Up @@ -782,6 +798,14 @@ Signing is only possible with addresses of the type 'legacy'.</source>
<extracomment>A context menu item. The network activity was disabled previously.</extracomment>
<translation type="unfinished">Разреши мрежова активност</translation>
</message>
<message>
<source>Pre-syncing Headers (%1%)…</source>
<translation type="unfinished">Предварителна синхронизация на Headers (%1%)…</translation>
</message>
<message>
<source>Error creating wallet</source>
<translation type="unfinished">Грешка при създаването на портфейл</translation>
</message>
<message>
<source>Error: %1</source>
<translation type="unfinished">Грешка: %1</translation>
Expand Down Expand Up @@ -1043,6 +1067,37 @@ Signing is only possible with addresses of the type 'legacy'.</source>
<translation type="unfinished">Зареждане на уолети...</translation>
</message>
</context>
<context>
<name>MigrateWalletActivity</name>
<message>
<source>Migrate wallet</source>
<translation type="unfinished">Мигрирайте портфейла</translation>
</message>
<message>
<source>Are you sure you wish to migrate the wallet &lt;i&gt;%1&lt;/i&gt;?</source>
<translation type="unfinished">Сигурни ли сте, че желаете да мигрирате портфейла &lt;i&gt;%1&lt;/i&gt;?</translation>
</message>
<message>
<source>Migrate Wallet</source>
<translation type="unfinished">Мигрирайте портфейла</translation>
</message>
<message>
<source>Migrating Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
<translation type="unfinished">Миграция на портфейла &lt;b&gt;%1&lt;/b&gt;…</translation>
</message>
<message>
<source>The wallet '%1' was migrated successfully.</source>
<translation type="unfinished">Портфейлът "%1" беше мигриран успешно.</translation>
</message>
<message>
<source>Migration failed</source>
<translation type="unfinished">Грешка при миграцията</translation>
</message>
<message>
<source>Migration Successful</source>
<translation type="unfinished">Миграцията е успешна</translation>
</message>
</context>
<context>
<name>OpenWalletActivity</name>
<message>
Expand Down Expand Up @@ -1125,6 +1180,10 @@ Signing is only possible with addresses of the type 'legacy'.</source>
<source>Create Wallet</source>
<translation type="unfinished">Създайте портфейл</translation>
</message>
<message>
<source>You are one step away from creating your new wallet!</source>
<translation type="unfinished">Вие сте само на крачка от създаването на вашия нов портфейл!</translation>
</message>
<message>
<source>Wallet Name</source>
<translation type="unfinished">Име на портфейл</translation>
Expand Down

0 comments on commit a469048

Please sign in to comment.