Merge branch 'blackbird'

bitcoin-sv · Oct 18, 2023 · e31cc43 · e31cc43
2 parents 89d55a8 + 1728cfb
commit e31cc43
Show file tree

Hide file tree

Showing 75 changed files with 1,081 additions and 428 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -25,7 +25,7 @@ endforeach()
 
 option(enable_debug "Enable debug (lockorder)" OFF)
 if(enable_debug)
-    add_definitions(-DDEBUG -DDEBUG_LOCKORDER)
+    add_definitions(-DDEBUG -DDEBUG_LOCKORDER -D_GLIBCXX_ASSERTIONS)
 endif()
 
 option(enable_metrics "Enable metrics" OFF)
@@ -110,6 +110,8 @@ set(CMAKE_MODULE_PATH
 	${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules
 )
 
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+
 # If ccache is available, then use it.
 find_program(CCACHE ccache)
 if(CCACHE)

diff --git a/configure.ac b/configure.ac
@@ -2,8 +2,8 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 1)
 define(_CLIENT_VERSION_MINOR, 0)
-define(_CLIENT_VERSION_REVISION, 15)
-define(_CLIENT_VERSION_BUILD, 1)
+define(_CLIENT_VERSION_REVISION, 16)
+define(_CLIENT_VERSION_BUILD, 0)
 define(_COPYRIGHT_YEAR, 2023)
 define(_COPYRIGHT_HOLDERS,[The %s Association])
 define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Bitcoin]])

diff --git a/contrib/devtools/README.md b/contrib/devtools/README.md
@@ -8,18 +8,6 @@ check-doc.py
 Check if all command line args are documented. The return value indicates the
 number of undocumented args.
 
-clang-format-diff.py
-===================
-
-A script to format unified git diffs according to [.clang-format](../../src/.clang-format).
-
-For instance, to format the last commit with 0 lines of context,
-the script should be called from the git root folder as follows.
-
-```
-git diff -U0 HEAD~1.. | ./contrib/devtools/clang-format-diff.py -p1 -i -v
-```
-
 copyright\_header.py
 ====================
 

diff --git a/contrib/devtools/clang-format-diff.py b/contrib/devtools/clang-format-diff.py
diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml
@@ -1,5 +1,5 @@
 ---
-name: "bitcoin-sv-1.0.15.1-linux"
+name: "bitcoin-sv-1.0.16-linux"
 enable_cache: true
 suites:
 - "focal"

diff --git a/contrib/gitian-descriptors/gitian-win.yml b/contrib/gitian-descriptors/gitian-win.yml
@@ -1,5 +1,5 @@
 ---
-name: "bitcoin-sv-1.0.15.1-win"
+name: "bitcoin-sv-1.0.16-win"
 enable_cache: true
 suites:
 - "bionic"

diff --git a/doc/Doxyfile b/doc/Doxyfile
@@ -38,7 +38,7 @@ PROJECT_NAME           = "Bitcoin SV"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 1.0.15.1
+PROJECT_NUMBER         = 1.0.16
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

diff --git a/doc/developer-notes.md b/doc/developer-notes.md
@@ -7,9 +7,8 @@ accepting code contributions.
 Various coding styles have been used during the history of the codebase,
 and the result is not very consistent. However, we're now trying to converge to
 a single style, so please use it in new code. Old code will be converted
-gradually and you are encouraged to use the provided
-[clang-format-diff script](/contrib/devtools/README.md#clang-format-diffpy)
-to clean up the patch automatically before submitting a pull request.
+gradually and you are encouraged to use clang-format-diff to clean up the patch
+automatically before submitting a pull request.
 
 - Basic rules specified in [src/.clang-format](/src/.clang-format).
   - Braces on new lines for namespaces, classes, functions, methods.

diff --git a/doc/man/bitcoin-cli.1 b/doc/man/bitcoin-cli.1
@@ -1,9 +1,9 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.48.1.
-.TH BITCOIN-CLI "1" "June 2023" "bitcoin-cli v1.0.15.1" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.3.
+.TH BITCOIN-CLI "1" "September 2023" "bitcoin-cli v1.0.16.0" "User Commands"
 .SH NAME
-bitcoin-cli \- manual page for bitcoin-cli v1.0.15.1
+bitcoin-cli \- manual page for bitcoin-cli v1.0.16.0
 .SH DESCRIPTION
-Bitcoin SV RPC client version v1.0.15.1\-dev
+Bitcoin SV RPC client version v1.0.16.0\-dev
 .SS "Usage:"
 .IP
 bitcoin\-cli [options] Send command to Bitcoin SV

diff --git a/doc/man/bitcoin-tx.1 b/doc/man/bitcoin-tx.1
@@ -1,9 +1,9 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.48.1.
-.TH BITCOIN-TX "1" "June 2023" "bitcoin-tx v1.0.15.1" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.3.
+.TH BITCOIN-TX "1" "September 2023" "bitcoin-tx v1.0.16.0" "User Commands"
 .SH NAME
-bitcoin-tx \- manual page for bitcoin-tx v1.0.15.1
+bitcoin-tx \- manual page for bitcoin-tx v1.0.16.0
 .SH DESCRIPTION
-Bitcoin SV bitcoin\-tx utility version v1.0.15.1\-dev
+Bitcoin SV bitcoin\-tx utility version v1.0.16.0\-dev
 .SS "Usage:"
 .TP
 bitcoin\-tx [options] <hex\-tx> [commands]

diff --git a/doc/man/bitcoind.1 b/doc/man/bitcoind.1
@@ -1,9 +1,9 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.48.1.
-.TH BITCOIND "1" "June 2023" "bitcoind v1.0.15.1" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.3.
+.TH BITCOIND "1" "September 2023" "bitcoind v1.0.16.0" "User Commands"
 .SH NAME
-bitcoind \- manual page for bitcoind v1.0.15.1
+bitcoind \- manual page for bitcoind v1.0.16.0
 .SH DESCRIPTION
-Bitcoin SV version v1.0.15.1\-dev
+Bitcoin SV version v1.0.16.0\-dev
 .SS "Usage:"
 .TP
 bitcoind [options]

diff --git a/doc/release-notes-v1.0.15.1.md b/doc/release-notes-v1.0.15.1.md
@@ -0,0 +1,22 @@
+# Bitcoin SV Node software – v1.0.15.1 Release
+
+Overview
+========
+
+The 1.0.15.1 node release is a recommended upgrade from version 1.0.15.
+
+Features in 1.0.15.1
+--------------------
+
+* Refactor to remove possible exploit in p2p layer.
+* Ecosystem improvement proposal.
+
+Other items
+-----------
+
+* Additional functional tests.
+
+New or modified configuration options
+-------------------------------------
+
+* None
diff --git a/doc/release-notes.md b/doc/release-notes.md
@@ -1,22 +1,27 @@
-# Bitcoin SV Node software – v1.0.15.1 Release
+# Bitcoin SV Node software – v1.0.16 Release
+
 
 Overview
 ========
 
-The 1.0.15.1 node release is a recommended upgrade from version 1.0.15.
+The 1.0.16 node release is a recommended upgrade from version 1.0.15.1.
+
 
-Features in 1.0.15.1
+Features in 1.0.16
 --------------------
 
-* Refactor to remove possible exploit in p2p layer.
+* SAST scan updates to improve code safety.
+* Tuned compiler configuration parameters.
+* Tuned build benchmark configuration parameters.
+* Fixed core dump in shutdown routine occasionally encountered while running the functional tests framework.
+* Address sanitizer bug fixes.
+* Guards against a potential race condition.
+* Thread management optimisation.
 * Ecosystem improvement proposal.
 
+
 Other items
 -----------
 
-* Additional functional tests.
-
-New or modified configuration options
--------------------------------------
+* STN Reset - includes an updated chain height block hash.
 
-* None
diff --git a/src/Makefile.test.include b/src/Makefile.test.include
@@ -30,6 +30,7 @@ BITCOIN_TESTS =\
   test/addrman_tests.cpp \
   test/amount_tests.cpp \
   test/allocator_tests.cpp \
+  test/array_parser_tests.cpp \
   test/base32_tests.cpp \
   test/base58_tests.cpp \
   test/base64_tests.cpp \
@@ -118,6 +119,7 @@ BITCOIN_TESTS =\
   test/miner_info_ref_tests.cpp \
   test/miner_tests.cpp \
   test/minerid_tests.cpp \
+  test/mod_n_byte_parser.h \
   test/msg_buffer_tests.cpp \
   test/msg_parser_buffer_tests.cpp \
   test/multisig_tests.cpp \

diff --git a/src/arith_uint256.cpp b/src/arith_uint256.cpp
@@ -175,7 +175,8 @@ template unsigned int base_uint<256>::bits() const;
 // This implementation directly uses shifts instead of going through an
 // intermediate MPI representation.
 arith_uint256 &arith_uint256::SetCompact(uint32_t nCompact, bool *pfNegative,
-                                         bool *pfOverflow) {
+                                         bool *pfOverflow)
+{
     int nSize = nCompact >> 24;
     uint32_t nWord = nCompact & 0x007fffff;
     if (nSize <= 3) {
@@ -228,3 +229,10 @@ arith_uint256 UintToArith256(const uint256 &a) {
         b.pn[x] = ReadLE32(a.begin() + x * 4);
     return b;
 }
+
+std::ostream& operator<<(std::ostream& os, const arith_uint256& a)
+{
+    os << a.ToString();
+    return os;
+}
+
diff --git a/src/arith_uint256.h b/src/arith_uint256.h
@@ -293,6 +293,7 @@ class arith_uint256 : public base_uint<256> {
                               bool *pfOverflow = nullptr);
     uint32_t GetCompact(bool fNegative = false) const;
 
+    friend std::ostream& operator<<(std::ostream&, const arith_uint256&);
     friend uint256 ArithToUint256(const arith_uint256 &);
     friend arith_uint256 UintToArith256(const uint256 &);
 };