Skip to content

Commit 4e23c3a

Browse files
ajtownsajtowns
authored
Merge pull request #70 from ajtowns/202501-inq28-28.1
Include patches from 28.1
2 parents 7c4322c + 32efe85 commit 4e23c3a

38 files changed

+630
-408
lines changed

‎build_msvc/fuzz/fuzz.vcxproj

+1-1
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

+1
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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
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)
55
define(_CLIENT_VERSION_RC, 0)
66
define(_CLIENT_VERSION_IS_RELEASE, true)

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

+4-1
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

+3
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

‎depends/hosts/netbsd.mk

-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ netbsd_NM = $(host_toolchain)gcc-nm
77
netbsd_RANLIB = $(host_toolchain)gcc-ranlib
88
endif
99

10-
netbsd_CXXFLAGS=$(netbsd_CFLAGS)
11-
1210
netbsd_release_CFLAGS=-O2
1311
netbsd_release_CXXFLAGS=$(netbsd_release_CFLAGS)
1412

‎doc/bitcoin-conf.md

+1-1
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

+3-3
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.0" "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.0
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.0
1919
.SH OPTIONS
2020
.HP
2121
\-?

‎doc/man/bitcoin-qt.1

+5-4
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.0" "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.0
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.0
1010
.PP
1111
Optional URI is a Bitcoin address in BIP21 URI format.
1212
.SH OPTIONS
@@ -352,7 +352,8 @@ Support filtering of blocks and transaction with bloom filters (default:
352352
.IP
353353
Listen for connections on <port> (default: 8333, testnet3: 18333,
354354
testnet4: 48333, signet: 38333, regtest: 18444). Not relevant for
355-
I2P (see doc/i2p.md).
355+
I2P (see doc/i2p.md). If set to a value x, the default onion
356+
listening port will be set to x+1.
356357
.HP
357358
\fB\-proxy=\fR<ip:port|path>
358359
.IP

‎doc/man/bitcoin-tx.1

+3-3
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.0" "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.0
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.0
1313
.SH OPTIONS
1414
.HP
1515
\-?

‎doc/man/bitcoin-util.1

+3-3
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.0" "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.0
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.0
1010
.SH OPTIONS
1111
.HP
1212
\-?

‎doc/man/bitcoin-wallet.1

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
2-
.TH BITCOIN-WALLET "1" "September 2024" "bitcoin-wallet v28.0.0" "User Commands"
2+
.TH BITCOIN-WALLET "1" "December 2024" "bitcoin-wallet v28.1.0" "User Commands"
33
.SH NAME
4-
bitcoin-wallet \- manual page for bitcoin-wallet v28.0.0
4+
bitcoin-wallet \- manual page for bitcoin-wallet v28.1.0
55
.SH DESCRIPTION
6-
Bitcoin Core bitcoin\-wallet version v28.0.0
6+
Bitcoin Core bitcoin\-wallet version v28.1.0
77
.PP
88
bitcoin\-wallet is an offline tool for creating and interacting with Bitcoin Core wallet files.
99
By default bitcoin\-wallet will act on wallets in the default mainnet wallet directory in the datadir.

‎doc/man/bitcoind.1

+5-4
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 BITCOIND "1" "September 2024" "bitcoind v28.0.0" "User Commands"
2+
.TH BITCOIND "1" "December 2024" "bitcoind v28.1.0" "User Commands"
33
.SH NAME
4-
bitcoind \- manual page for bitcoind v28.0.0
4+
bitcoind \- manual page for bitcoind v28.1.0
55
.SH SYNOPSIS
66
.B bitcoind
77
[\fI\,options\/\fR] \fI\,Start Bitcoin Core\/\fR
88
.SH DESCRIPTION
9-
Bitcoin Core version v28.0.0
9+
Bitcoin Core version v28.1.0
1010
.SH OPTIONS
1111
.HP
1212
\-?
@@ -350,7 +350,8 @@ Support filtering of blocks and transaction with bloom filters (default:
350350
.IP
351351
Listen for connections on <port> (default: 8333, testnet3: 18333,
352352
testnet4: 48333, signet: 38333, regtest: 18444). Not relevant for
353-
I2P (see doc/i2p.md).
353+
I2P (see doc/i2p.md). If set to a value x, the default onion
354+
listening port will be set to x+1.
354355
.HP
355356
\fB\-proxy=\fR<ip:port|path>
356357
.IP

0 commit comments

Comments
 (0)