Skip to content

Commit

Permalink
Merge branch 'auxpow-28.x' into 28.x
Browse files Browse the repository at this point in the history
  • Loading branch information
domob1812 committed Dec 9, 2024
2 parents a08218e + af88539 commit 50ff9d9
Show file tree
Hide file tree
Showing 23 changed files with 499 additions and 384 deletions.
2 changes: 1 addition & 1 deletion build_msvc/fuzz/fuzz.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
</PropertyGroup>
<ItemGroup>
<ClCompile Include="..\..\src\test\fuzz\*.cpp" />
<ClCompile Include="..\..\src\test\fuzz\*.cpp" Exclude="..\..\src\test\fuzz\utxo_snapshot.cpp" />
<ClCompile Include="..\..\src\test\fuzz\util\descriptor.cpp">
<ObjectFileName>$(IntDir)test_fuzz_util_descriptor.obj</ObjectFileName>
</ClCompile>
Expand Down
1 change: 1 addition & 0 deletions ci/test/00_setup_env_native_fuzz_with_valgrind.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@ export FUZZ_TESTS_CONFIG="--valgrind"
export GOAL="install"
export BITCOIN_CONFIG="--enable-fuzz --with-sanitizers=fuzzer CC=clang-16 CXX=clang++-16"
export CCACHE_MAXSIZE=200M
export LLVM_SYMBOLIZER_PATH="/usr/bin/llvm-symbolizer-16"
4 changes: 2 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
AC_PREREQ([2.69])
define(_CLIENT_VERSION_MAJOR, 28)
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, 2024)
define(_COPYRIGHT_HOLDERS,[The %s developers])
Expand Down
5 changes: 4 additions & 1 deletion contrib/devtools/gen-bitcoin-conf.sh
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,12 @@ cat >> "${EXAMPLE_CONF_FILE}" << 'EOF'
# Options for mainnet
[main]
# Options for testnet
# Options for testnet3
[test]
# Options for testnet4
[testnet4]
# Options for signet
[signet]
Expand Down
3 changes: 3 additions & 0 deletions depends/hosts/mingw32.mk
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
ifneq ($(shell $(SHELL) $(.SHELLFLAGS) "command -v $(host)-gcc-posix"),)
mingw32_CC := $(host)-gcc-posix
endif
ifneq ($(shell $(SHELL) $(.SHELLFLAGS) "command -v $(host)-g++-posix"),)
mingw32_CXX := $(host)-g++-posix
endif
Expand Down
2 changes: 1 addition & 1 deletion doc/bitcoin-conf.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Comments may appear in two ways:
### Network specific options

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

Network specific options take precedence over non-network specific options.
Expand Down
6 changes: 3 additions & 3 deletions doc/man/namecoin-cli.1
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.1.
.TH NAMECOIN-CLI "1" "October 2024" "namecoin-cli v28.0.0" "User Commands"
.TH NAMECOIN-CLI "1" "December 2024" "namecoin-cli v28.1.0rc1" "User Commands"
.SH NAME
namecoin-cli \- manual page for namecoin-cli v28.0.0
namecoin-cli \- manual page for namecoin-cli v28.1.0rc1
.SH SYNOPSIS
.B namecoin-cli
[\fI\,options\/\fR] \fI\,<command> \/\fR[\fI\,params\/\fR] \fI\,Send command to Namecoin Core\/\fR
Expand All @@ -15,7 +15,7 @@ namecoin-cli \- manual page for namecoin-cli v28.0.0
.B namecoin-cli
[\fI\,options\/\fR] \fI\,help <command> Get help for a command\/\fR
.SH DESCRIPTION
Namecoin Core RPC client version v28.0.0
Namecoin Core RPC client version v28.1.0rc1
.SH OPTIONS
.HP
\-?
Expand Down
10 changes: 5 additions & 5 deletions doc/man/namecoin-qt.1
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.1.
.TH NAMECOIN-QT "1" "October 2024" "namecoin-qt v28.0.0" "User Commands"
.TH NAMECOIN-QT "1" "December 2024" "namecoin-qt v28.1.0rc1" "User Commands"
.SH NAME
namecoin-qt \- manual page for namecoin-qt v28.0.0
namecoin-qt \- manual page for namecoin-qt v28.1.0rc1
.SH SYNOPSIS
.B namecoin-qt
[\fI\,command-line options\/\fR] [\fI\,URI\/\fR]
.SH DESCRIPTION
Namecoin Core version v28.0.0
Namecoin Core version v28.1.0rc1
.PP
Optional URI is a Namecoin address in BIP21 URI format.
.SH OPTIONS
Expand Down Expand Up @@ -238,8 +238,8 @@ Default duration (in seconds) of manually configured bans (default:
Bind to given address and always listen on it (default: 0.0.0.0). Use
[host]:port notation for IPv6. Append =onion to tag any incoming
connections to that address and port as incoming Tor connections
(default: 127.0.0.1:8334=onion, testnet3: 127.0.0.1:18334=onion,
testnet4: 127.0.0.1:48334=onion, signet: 127.0.0.1:38334=onion,
(default: 127.0.0.1:8536=onion, testnet3: 127.0.0.1:18536=onion,
testnet4: 127.0.0.1:48536=onion, signet: 127.0.0.1:38536=onion,
regtest: 127.0.0.1:18445=onion)
.HP
\fB\-cjdnsreachable\fR
Expand Down
6 changes: 3 additions & 3 deletions doc/man/namecoin-tx.1
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.1.
.TH NAMECOIN-TX "1" "October 2024" "namecoin-tx v28.0.0" "User Commands"
.TH NAMECOIN-TX "1" "December 2024" "namecoin-tx v28.1.0rc1" "User Commands"
.SH NAME
namecoin-tx \- manual page for namecoin-tx v28.0.0
namecoin-tx \- manual page for namecoin-tx v28.1.0rc1
.SH SYNOPSIS
.B namecoin-tx
[\fI\,options\/\fR] \fI\,<hex-tx> \/\fR[\fI\,commands\/\fR] \fI\,Update hex-encoded transaction\/\fR
.br
.B namecoin-tx
[\fI\,options\/\fR] \fI\,-create \/\fR[\fI\,commands\/\fR] \fI\,Create hex-encoded transaction\/\fR
.SH DESCRIPTION
Namecoin Core namecoin\-tx utility version v28.0.0
Namecoin Core namecoin\-tx utility version v28.1.0rc1
.SH OPTIONS
.HP
\-?
Expand Down
6 changes: 3 additions & 3 deletions doc/man/namecoin-util.1
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.1.
.TH NAMECOIN-UTIL "1" "October 2024" "namecoin-util v28.0.0" "User Commands"
.TH NAMECOIN-UTIL "1" "December 2024" "namecoin-util v28.1.0rc1" "User Commands"
.SH NAME
namecoin-util \- manual page for namecoin-util v28.0.0
namecoin-util \- manual page for namecoin-util v28.1.0rc1
.SH SYNOPSIS
.B bitcoin-util
[\fI\,options\/\fR] [\fI\,commands\/\fR] \fI\,Do stuff\/\fR
.SH DESCRIPTION
Namecoin Core bitcoin\-util utility version v28.0.0
Namecoin Core bitcoin\-util utility version v28.1.0rc1
.SH OPTIONS
.HP
\-?
Expand Down
6 changes: 3 additions & 3 deletions doc/man/namecoin-wallet.1
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.1.
.TH NAMECOIN-WALLET "1" "October 2024" "namecoin-wallet v28.0.0" "User Commands"
.TH NAMECOIN-WALLET "1" "December 2024" "namecoin-wallet v28.1.0rc1" "User Commands"
.SH NAME
namecoin-wallet \- manual page for namecoin-wallet v28.0.0
namecoin-wallet \- manual page for namecoin-wallet v28.1.0rc1
.SH DESCRIPTION
Namecoin Core namecoin\-wallet version v28.0.0
Namecoin Core namecoin\-wallet version v28.1.0rc1
.PP
namecoin\-wallet is an offline tool for creating and interacting with Namecoin Core wallet files.
By default namecoin\-wallet will act on wallets in the default mainnet wallet directory in the datadir.
Expand Down
10 changes: 5 additions & 5 deletions doc/man/namecoind.1
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.1.
.TH NAMECOIND "1" "October 2024" "namecoind v28.0.0" "User Commands"
.TH NAMECOIND "1" "December 2024" "namecoind v28.1.0rc1" "User Commands"
.SH NAME
namecoind \- manual page for namecoind v28.0.0
namecoind \- manual page for namecoind v28.1.0rc1
.SH SYNOPSIS
.B namecoind
[\fI\,options\/\fR] \fI\,Start Namecoin Core\/\fR
.SH DESCRIPTION
Namecoin Core version v28.0.0
Namecoin Core version v28.1.0rc1
.SH OPTIONS
.HP
\-?
Expand Down Expand Up @@ -236,8 +236,8 @@ Default duration (in seconds) of manually configured bans (default:
Bind to given address and always listen on it (default: 0.0.0.0). Use
[host]:port notation for IPv6. Append =onion to tag any incoming
connections to that address and port as incoming Tor connections
(default: 127.0.0.1:8334=onion, testnet3: 127.0.0.1:18334=onion,
testnet4: 127.0.0.1:48334=onion, signet: 127.0.0.1:38334=onion,
(default: 127.0.0.1:8536=onion, testnet3: 127.0.0.1:18536=onion,
testnet4: 127.0.0.1:48536=onion, signet: 127.0.0.1:38536=onion,
regtest: 127.0.0.1:18445=onion)
.HP
\fB\-cjdnsreachable\fR
Expand Down
Loading

0 comments on commit 50ff9d9

Please sign in to comment.