Skip to content

Commit d6b225f

Browse files
fanquakefanquake
committed
Merge bitcoin#31104: [28.x] Backports & 28.1rc1
8fef83a doc: update manual pages for 28.1rc1 (fanquake) df77646 build: bump version to 28.1rc1 (fanquake) 9add853 doc: update release notes for 28.1rc1 (fanquake) 1025090 build: disable compiling fuzz/utxo_snapshot.cpp with MSVC (fanquake) 446f5d2 refactor: Drop deprecated space in operator""_mst (MarcoFalke) 9976162 addrman: change nid_type from int to int64_t (Martin Zumsande) 1d0411d addrman, refactor: introduce user-defined type for internal nId (Martin Zumsande) 7fec638 depends: For mingw cross compile use -gcc-posix to prevent library conflict (laanwj) f998ac6 key: clear out secret data in `DecodeExtKey` (Sebastian Falbesoner) 0773560 ci: add LLVM_SYMBOLIZER_PATH to Valgrind fuzz job (fanquake) b917334 test: add missing sync to feature_fee_estimation.py (Martin Zumsande) f072721 doc: add testnet4 section header for config file (Marnix) 6643fd2 doc: Archive 28.0 release notes (Ava Chow) Pull request description: Backports: * bitcoin#30568 * bitcoin#31007 * bitcoin#31013 * bitcoin#31016 * bitcoin#31035 * bitcoin#31166 Contains: * A commit to do the same as bitcoin#31307. ACKs for top commit: willcl-ark: ACK 8fef83a Tree-SHA512: 58f0c6cb9e5b7ac17ad20141acdc5423dbe8e79cc3a2cf1c4e503d289b75940632c9838c64e3ac733b1a55e65723fc1071ccdd9a860a710256cc88e29f42ccdb
2 parents 8952237 + 8fef83a commit d6b225f

23 files changed

+495
-380
lines changed

‎build_msvc/fuzz/fuzz.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
1010
</PropertyGroup>
1111
<ItemGroup>
12-
<ClCompile Include="..\..\src\test\fuzz\*.cpp" />
12+
<ClCompile Include="..\..\src\test\fuzz\*.cpp" Exclude="..\..\src\test\fuzz\utxo_snapshot.cpp" />
1313
<ClCompile Include="..\..\src\test\fuzz\util\descriptor.cpp">
1414
<ObjectFileName>$(IntDir)test_fuzz_util_descriptor.obj</ObjectFileName>
1515
</ClCompile>

‎ci/test/00_setup_env_native_fuzz_with_valgrind.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,4 @@ export FUZZ_TESTS_CONFIG="--valgrind"
1717
export GOAL="install"
1818
export BITCOIN_CONFIG="--enable-fuzz --with-sanitizers=fuzzer CC=clang-16 CXX=clang++-16"
1919
export CCACHE_MAXSIZE=200M
20+
export LLVM_SYMBOLIZER_PATH="/usr/bin/llvm-symbolizer-16"

‎configure.ac

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
AC_PREREQ([2.69])
22
define(_CLIENT_VERSION_MAJOR, 28)
3-
define(_CLIENT_VERSION_MINOR, 0)
3+
define(_CLIENT_VERSION_MINOR, 1)
44
define(_CLIENT_VERSION_BUILD, 0)
5-
define(_CLIENT_VERSION_RC, 0)
5+
define(_CLIENT_VERSION_RC, 1)
66
define(_CLIENT_VERSION_IS_RELEASE, true)
77
define(_COPYRIGHT_YEAR, 2024)
88
define(_COPYRIGHT_HOLDERS,[The %s developers])

‎contrib/devtools/gen-bitcoin-conf.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,12 @@ cat >> "${EXAMPLE_CONF_FILE}" << 'EOF'
7272
# Options for mainnet
7373
[main]
7474
75-
# Options for testnet
75+
# Options for testnet3
7676
[test]
7777
78+
# Options for testnet4
79+
[testnet4]
80+
7881
# Options for signet
7982
[signet]
8083

‎depends/hosts/mingw32.mk

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
ifneq ($(shell $(SHELL) $(.SHELLFLAGS) "command -v $(host)-gcc-posix"),)
2+
mingw32_CC := $(host)-gcc-posix
3+
endif
14
ifneq ($(shell $(SHELL) $(.SHELLFLAGS) "command -v $(host)-g++-posix"),)
25
mingw32_CXX := $(host)-g++-posix
36
endif

‎doc/bitcoin-conf.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Comments may appear in two ways:
3131
### Network specific options
3232

3333
Network specific options can be:
34-
- placed into sections with headers `[main]` (not `[mainnet]`), `[test]` (not `[testnet]`), `[signet]` or `[regtest]`;
34+
- placed into sections with headers `[main]` (not `[mainnet]`), `[test]` (not `[testnet]`, for testnet3), `[testnet4]`, `[signet]` or `[regtest]`;
3535
- prefixed with a chain name; e.g., `regtest.maxmempool=100`.
3636

3737
Network specific options take precedence over non-network specific options.

‎doc/man/bitcoin-cli.1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
2-
.TH BITCOIN-CLI "1" "September 2024" "bitcoin-cli v28.0.0" "User Commands"
2+
.TH BITCOIN-CLI "1" "December 2024" "bitcoin-cli v28.1.0rc1" "User Commands"
33
.SH NAME
4-
bitcoin-cli \- manual page for bitcoin-cli v28.0.0
4+
bitcoin-cli \- manual page for bitcoin-cli v28.1.0rc1
55
.SH SYNOPSIS
66
.B bitcoin-cli
77
[\fI\,options\/\fR] \fI\,<command> \/\fR[\fI\,params\/\fR] \fI\,Send command to Bitcoin Core\/\fR
@@ -15,7 +15,7 @@ bitcoin-cli \- manual page for bitcoin-cli v28.0.0
1515
.B bitcoin-cli
1616
[\fI\,options\/\fR] \fI\,help <command> Get help for a command\/\fR
1717
.SH DESCRIPTION
18-
Bitcoin Core RPC client version v28.0.0
18+
Bitcoin Core RPC client version v28.1.0rc1
1919
.SH OPTIONS
2020
.HP
2121
\-?

‎doc/man/bitcoin-qt.1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
2-
.TH BITCOIN-QT "1" "September 2024" "bitcoin-qt v28.0.0" "User Commands"
2+
.TH BITCOIN-QT "1" "December 2024" "bitcoin-qt v28.1.0rc1" "User Commands"
33
.SH NAME
4-
bitcoin-qt \- manual page for bitcoin-qt v28.0.0
4+
bitcoin-qt \- manual page for bitcoin-qt v28.1.0rc1
55
.SH SYNOPSIS
66
.B bitcoin-qt
77
[\fI\,command-line options\/\fR] [\fI\,URI\/\fR]
88
.SH DESCRIPTION
9-
Bitcoin Core version v28.0.0
9+
Bitcoin Core version v28.1.0rc1
1010
.PP
1111
Optional URI is a Bitcoin address in BIP21 URI format.
1212
.SH OPTIONS

‎doc/man/bitcoin-tx.1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
2-
.TH BITCOIN-TX "1" "September 2024" "bitcoin-tx v28.0.0" "User Commands"
2+
.TH BITCOIN-TX "1" "December 2024" "bitcoin-tx v28.1.0rc1" "User Commands"
33
.SH NAME
4-
bitcoin-tx \- manual page for bitcoin-tx v28.0.0
4+
bitcoin-tx \- manual page for bitcoin-tx v28.1.0rc1
55
.SH SYNOPSIS
66
.B bitcoin-tx
77
[\fI\,options\/\fR] \fI\,<hex-tx> \/\fR[\fI\,commands\/\fR] \fI\,Update hex-encoded bitcoin transaction\/\fR
88
.br
99
.B bitcoin-tx
1010
[\fI\,options\/\fR] \fI\,-create \/\fR[\fI\,commands\/\fR] \fI\,Create hex-encoded bitcoin transaction\/\fR
1111
.SH DESCRIPTION
12-
Bitcoin Core bitcoin\-tx utility version v28.0.0
12+
Bitcoin Core bitcoin\-tx utility version v28.1.0rc1
1313
.SH OPTIONS
1414
.HP
1515
\-?

‎doc/man/bitcoin-util.1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
2-
.TH BITCOIN-UTIL "1" "September 2024" "bitcoin-util v28.0.0" "User Commands"
2+
.TH BITCOIN-UTIL "1" "December 2024" "bitcoin-util v28.1.0rc1" "User Commands"
33
.SH NAME
4-
bitcoin-util \- manual page for bitcoin-util v28.0.0
4+
bitcoin-util \- manual page for bitcoin-util v28.1.0rc1
55
.SH SYNOPSIS
66
.B bitcoin-util
77
[\fI\,options\/\fR] [\fI\,commands\/\fR] \fI\,Do stuff\/\fR
88
.SH DESCRIPTION
9-
Bitcoin Core bitcoin\-util utility version v28.0.0
9+
Bitcoin Core bitcoin\-util utility version v28.1.0rc1
1010
.SH OPTIONS
1111
.HP
1212
\-?

0 commit comments

Comments
 (0)