Merge branch 'auxpow-26.x' into 26.x

domob1812 · Nov 27, 2023 · 108cb70 · 108cb70
2 parents 5d01bd2 + 8c2d18d
commit 108cb70
Show file tree

Hide file tree

Showing 17 changed files with 440 additions and 61 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -60,7 +60,9 @@ jobs:
           # ancestors from the rev-list output as described in:
           # https://git-scm.com/docs/git-rev-list
           echo "TEST_BASE=$(git rev-list -n$((${{ env.MAX_COUNT }} + 1)) --reverse HEAD ^$(git rev-list -n1 --merges HEAD)^@ | head -1)" >> "$GITHUB_ENV"
-      - run: sudo apt install clang ccache build-essential libtool autotools-dev automake pkg-config bsdmainutils python3-zmq libevent-dev libboost-dev libsqlite3-dev libdb++-dev systemtap-sdt-dev libminiupnpc-dev libnatpmp-dev libqt5gui5 libqt5core5a libqt5dbus5 qttools5-dev qttools5-dev-tools qtwayland5 libqrencode-dev -y
+      - run: |
+          sudo apt-get update
+          sudo apt-get install clang ccache build-essential libtool autotools-dev automake pkg-config bsdmainutils python3-zmq libevent-dev libboost-dev libsqlite3-dev libdb++-dev systemtap-sdt-dev libminiupnpc-dev libnatpmp-dev libqt5gui5 libqt5core5a libqt5dbus5 qttools5-dev qttools5-dev-tools qtwayland5 libqrencode-dev -y
       - name: Compile and run tests
         run: |
           # Run tests on commits after the last merge commit and before the PR head commit
@@ -137,29 +139,47 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Fix Visual Studio installation
-        # See: https://github.com/actions/runner-images/issues/7832#issuecomment-1617585694.
+        # Avoid toolset ambiguity that MSVC can't handle.
         run: |
           Set-Location "C:\Program Files (x86)\Microsoft Visual Studio\Installer\"
           $InstallPath = "C:\Program Files\Microsoft Visual Studio\2022\Enterprise"
           $componentsToRemove= @(
-            "Microsoft.VisualStudio.Component.VC.14.35.17.5.ARM"
-            "Microsoft.VisualStudio.Component.VC.14.35.17.5.ARM.Spectre"
-            "Microsoft.VisualStudio.Component.VC.14.35.17.5.ARM64"
-            "Microsoft.VisualStudio.Component.VC.14.35.17.5.ARM64.Spectre"
-            "Microsoft.VisualStudio.Component.VC.14.35.17.5.x86.x64"
-            "Microsoft.VisualStudio.Component.VC.14.35.17.5.x86.x64.Spectre"
-            "Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL"
-            "Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL.Spectre"
-            "Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL.ARM"
-            "Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL.ARM.Spectre"
-            "Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL.ARM64"
-            "Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL.ARM64.Spectre"
-            "Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC"
-            "Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC.Spectre"
-            "Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC.ARM"
-            "Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC.ARM.Spectre"
-            "Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC.ARM64"
-            "Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC.ARM64.Spectre"
+            "Microsoft.VisualStudio.Component.VC.14.37.17.7.ARM.Spectre"
+            "Microsoft.VisualStudio.Component.VC.14.37.17.7.ARM"
+            "Microsoft.VisualStudio.Component.VC.14.37.17.7.ARM64.Spectre"
+            "Microsoft.VisualStudio.Component.VC.14.37.17.7.ARM64"
+            "Microsoft.VisualStudio.Component.VC.14.37.17.7.ATL.ARM.Spectre"
+            "Microsoft.VisualStudio.Component.VC.14.37.17.7.ATL.ARM"
+            "Microsoft.VisualStudio.Component.VC.14.37.17.7.ATL.ARM64.Spectre"
+            "Microsoft.VisualStudio.Component.VC.14.37.17.7.ATL.ARM64"
+            "Microsoft.VisualStudio.Component.VC.14.37.17.7.ATL.Spectre"
+            "Microsoft.VisualStudio.Component.VC.14.37.17.7.ATL"
+            "Microsoft.VisualStudio.Component.VC.14.37.17.7.MFC.ARM.Spectre"
+            "Microsoft.VisualStudio.Component.VC.14.37.17.7.MFC.ARM"
+            "Microsoft.VisualStudio.Component.VC.14.37.17.7.MFC.ARM64.Spectre"
+            "Microsoft.VisualStudio.Component.VC.14.37.17.7.MFC.ARM64"
+            "Microsoft.VisualStudio.Component.VC.14.37.17.7.MFC.Spectre"
+            "Microsoft.VisualStudio.Component.VC.14.37.17.7.MFC"
+            "Microsoft.VisualStudio.Component.VC.14.37.17.7.x86.x64.Spectre"
+            "Microsoft.VisualStudio.Component.VC.14.37.17.7.x86.x64"
+            "Microsoft.VisualStudio.Component.VC.14.38.17.8.ARM"
+            "Microsoft.VisualStudio.Component.VC.14.38.17.8.ARM.Spectre"
+            "Microsoft.VisualStudio.Component.VC.14.38.17.8.ARM64"
+            "Microsoft.VisualStudio.Component.VC.14.38.17.8.ARM64.Spectre"
+            "Microsoft.VisualStudio.Component.VC.14.38.17.8.ATL"
+            "Microsoft.VisualStudio.Component.VC.14.38.17.8.ATL.ARM"
+            "Microsoft.VisualStudio.Component.VC.14.38.17.8.ATL.ARM.Spectre"
+            "Microsoft.VisualStudio.Component.VC.14.38.17.8.ATL.ARM64"
+            "Microsoft.VisualStudio.Component.VC.14.38.17.8.ATL.ARM64.Spectre"
+            "Microsoft.VisualStudio.Component.VC.14.38.17.8.ATL.Spectre"
+            "Microsoft.VisualStudio.Component.VC.14.38.17.8.MFC"
+            "Microsoft.VisualStudio.Component.VC.14.38.17.8.MFC.ARM"
+            "Microsoft.VisualStudio.Component.VC.14.38.17.8.MFC.ARM.Spectre"
+            "Microsoft.VisualStudio.Component.VC.14.38.17.8.MFC.ARM64"
+            "Microsoft.VisualStudio.Component.VC.14.38.17.8.MFC.ARM64.Spectre"
+            "Microsoft.VisualStudio.Component.VC.14.38.17.8.MFC.Spectre"
+            "Microsoft.VisualStudio.Component.VC.14.38.17.8.x86.x64"
+            "Microsoft.VisualStudio.Component.VC.14.38.17.8.x86.x64.Spectre"
           )
           [string]$workloadArgs = $componentsToRemove | ForEach-Object {" --remove " +  $_}
           $Arguments = ('/c', "vs_installer.exe", 'modify', '--installPath', "`"$InstallPath`"",$workloadArgs, '--quiet', '--norestart', '--nocache')

diff --git a/configure.ac b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ([2.69])
 define(_CLIENT_VERSION_MAJOR, 26)
 define(_CLIENT_VERSION_MINOR, 0)
 define(_CLIENT_VERSION_BUILD, 0)
-define(_CLIENT_VERSION_RC, 2)
+define(_CLIENT_VERSION_RC, 3)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2023)
 define(_COPYRIGHT_HOLDERS,[The %s developers])
@@ -584,7 +584,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 CXXFLAGS="$TEMP_CXXFLAGS"
 
 # ARM
-AX_CHECK_COMPILE_FLAG([-march=armv8-a+crc], [ARM_CRC_CXXFLAGS="-march=armv8-a+crc"], [], [$CXXFLAG_WERROR])
+AX_CHECK_COMPILE_FLAG([-march=armv8-a+crc+crypto], [ARM_CRC_CXXFLAGS="-march=armv8-a+crc+crypto"], [], [$CXXFLAG_WERROR])
 AX_CHECK_COMPILE_FLAG([-march=armv8-a+crypto], [ARM_SHANI_CXXFLAGS="-march=armv8-a+crypto"], [], [$CXXFLAG_WERROR])
 
 TEMP_CXXFLAGS="$CXXFLAGS"

diff --git a/doc/man/namecoin-cli.1 b/doc/man/namecoin-cli.1
@@ -1,7 +1,7 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.48.1.
-.TH NAMECOIN-CLI "1" "November 2023" "namecoin-cli v26.0.0rc2" "User Commands"
+.TH NAMECOIN-CLI "1" "November 2023" "namecoin-cli v26.0.0rc3" "User Commands"
 .SH NAME
-namecoin-cli \- manual page for namecoin-cli v26.0.0rc2
+namecoin-cli \- manual page for namecoin-cli v26.0.0rc3
 .SH SYNOPSIS
 .B namecoin-cli
 [\fI\,options\/\fR] \fI\,<command> \/\fR[\fI\,params\/\fR]  \fI\,Send command to Namecoin Core\/\fR
@@ -15,7 +15,7 @@ namecoin-cli \- manual page for namecoin-cli v26.0.0rc2
 .B namecoin-cli
 [\fI\,options\/\fR] \fI\,help <command>      Get help for a command\/\fR
 .SH DESCRIPTION
-Namecoin Core RPC client version v26.0.0rc2
+Namecoin Core RPC client version v26.0.0rc3
 .SH OPTIONS
 .HP
 \-?

diff --git a/doc/man/namecoin-qt.1 b/doc/man/namecoin-qt.1
@@ -1,12 +1,12 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.48.1.
-.TH NAMECOIN-QT "1" "November 2023" "namecoin-qt v26.0.0rc2" "User Commands"
+.TH NAMECOIN-QT "1" "November 2023" "namecoin-qt v26.0.0rc3" "User Commands"
 .SH NAME
-namecoin-qt \- manual page for namecoin-qt v26.0.0rc2
+namecoin-qt \- manual page for namecoin-qt v26.0.0rc3
 .SH SYNOPSIS
 .B namecoin-qt
 [\fI\,command-line options\/\fR]
 .SH DESCRIPTION
-Namecoin Core version v26.0.0rc2
+Namecoin Core version v26.0.0rc3
 .SH OPTIONS
 .HP
 \-?
@@ -129,7 +129,7 @@ Keep track of the full name history (default: 0)
 .HP
 \fB\-par=\fR<n>
 .IP
-Set the number of script verification threads (\fB\-24\fR to 15, 0 = auto, <0 =
+Set the number of script verification threads (0 = auto, up to 15, <0 =
 leave that many cores free, default: 0)
 .HP
 \fB\-persistmempool\fR

diff --git a/doc/man/namecoin-tx.1 b/doc/man/namecoin-tx.1
@@ -1,15 +1,15 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.48.1.
-.TH NAMECOIN-TX "1" "November 2023" "namecoin-tx v26.0.0rc2" "User Commands"
+.TH NAMECOIN-TX "1" "November 2023" "namecoin-tx v26.0.0rc3" "User Commands"
 .SH NAME
-namecoin-tx \- manual page for namecoin-tx v26.0.0rc2
+namecoin-tx \- manual page for namecoin-tx v26.0.0rc3
 .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 v26.0.0rc2
+Namecoin Core namecoin\-tx utility version v26.0.0rc3
 .SH OPTIONS
 .HP
 \-?

diff --git a/doc/man/namecoin-util.1 b/doc/man/namecoin-util.1
@@ -1,12 +1,12 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.48.1.
-.TH NAMECOIN-UTIL "1" "November 2023" "namecoin-util v26.0.0rc2" "User Commands"
+.TH NAMECOIN-UTIL "1" "November 2023" "namecoin-util v26.0.0rc3" "User Commands"
 .SH NAME
-namecoin-util \- manual page for namecoin-util v26.0.0rc2
+namecoin-util \- manual page for namecoin-util v26.0.0rc3
 .SH SYNOPSIS
 .B bitcoin-util
 [\fI\,options\/\fR] [\fI\,commands\/\fR]  \fI\,Do stuff\/\fR
 .SH DESCRIPTION
-Namecoin Core bitcoin\-util utility version v26.0.0rc2
+Namecoin Core bitcoin\-util utility version v26.0.0rc3
 .SH OPTIONS
 .HP
 \-?

diff --git a/doc/man/namecoin-wallet.1 b/doc/man/namecoin-wallet.1
@@ -1,9 +1,9 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.48.1.
-.TH NAMECOIN-WALLET "1" "November 2023" "namecoin-wallet v26.0.0rc2" "User Commands"
+.TH NAMECOIN-WALLET "1" "November 2023" "namecoin-wallet v26.0.0rc3" "User Commands"
 .SH NAME
-namecoin-wallet \- manual page for namecoin-wallet v26.0.0rc2
+namecoin-wallet \- manual page for namecoin-wallet v26.0.0rc3
 .SH DESCRIPTION
-Namecoin Core namecoin\-wallet version v26.0.0rc2
+Namecoin Core namecoin\-wallet version v26.0.0rc3
 .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.

diff --git a/doc/man/namecoind.1 b/doc/man/namecoind.1
@@ -1,12 +1,12 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.48.1.
-.TH NAMECOIND "1" "November 2023" "namecoind v26.0.0rc2" "User Commands"
+.TH NAMECOIND "1" "November 2023" "namecoind v26.0.0rc3" "User Commands"
 .SH NAME
-namecoind \- manual page for namecoind v26.0.0rc2
+namecoind \- manual page for namecoind v26.0.0rc3
 .SH SYNOPSIS
 .B namecoind
 [\fI\,options\/\fR]                     \fI\,Start Namecoin Core\/\fR
 .SH DESCRIPTION
-Namecoin Core version v26.0.0rc2
+Namecoin Core version v26.0.0rc3
 .SH OPTIONS
 .HP
 \-?
@@ -129,7 +129,7 @@ Keep track of the full name history (default: 0)
 .HP
 \fB\-par=\fR<n>
 .IP
-Set the number of script verification threads (\fB\-24\fR to 15, 0 = auto, <0 =
+Set the number of script verification threads (0 = auto, up to 15, <0 =
 leave that many cores free, default: 0)
 .HP
 \fB\-persistmempool\fR