Merge pull request #1378 from evoskuil/master

Resolve issues resulting from build platform drift.
libbitcoin · Feb 8, 2024 · e886a1c · e886a1c
2 parents 4d43d08 + 8948079
commit e886a1c
Show file tree

Hide file tree

Showing 40 changed files with 490 additions and 166 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -18,28 +18,28 @@ jobs:
       matrix:
         include:
           - os: ubuntu-22.04
-            cxx: "clang++-14"
+            cxx: "clang++-15"
             link: "dynamic"
             optimization: "size"
             assert: "debug"
             coverage: "nocov"
             boost: "--build-boost"
             icu: ""
-            cc: "clang-14"
+            cc: "clang-15"
             flags: "-Os -fPIE"
             options: "--enable-isystem --enable-avx2 --enable-sse4"
             packager: "apt"
             packages: ""
 
           - os: ubuntu-22.04
-            cxx: "clang++-14"
+            cxx: "clang++-15"
             link: "static"
             optimization: "size"
             assert: "ndebug"
             coverage: "nocov"
             boost: "--build-boost"
             icu: "--build-icu --with-icu"
-            cc: "clang-14"
+            cc: "clang-15"
             flags: "-Os -fPIE"
             options: "--enable-isystem --enable-avx2"
             packager: "apt"
@@ -74,28 +74,28 @@ jobs:
             packages: "lcov"
 
           - os: macos-latest
-            cxx: "clang++-14"
+            cxx: "clang++"
             link: "dynamic"
             optimization: "size"
             assert: "ndebug"
             coverage: "nocov"
             boost: "--build-boost"
             icu: "--with-icu"
-            cc: "clang-14"
+            cc: "clang"
             flags: "-Os -fPIE"
             options: "--enable-isystem"
             packager: "brew"
             packages: "icu4c"
 
           - os: macos-latest
-            cxx: "clang++-14"
+            cxx: "clang++"
             link: "static"
             optimization: "size"
             assert: "ndebug"
             coverage: "nocov"
             boost: "--build-boost"
             icu: "--build-icu --with-icu"
-            cc: "clang-14"
+            cc: "clang"
             flags: "-Os -fvisibility=hidden -fPIE"
             options: "--enable-isystem"
             packager: "brew"
@@ -149,6 +149,12 @@ jobs:
             echo "LDFLAGS=-Wl,-rpath,$WORKSPACE_SUBPATH/prefix/lib" >> $GITHUB_ENV
           fi
 
+      - name: Display Compiler details
+        shell: bash
+        run: |
+          ${CC} -v
+          ${CXX} -v
+
       - name: Display CPU details
         if: ${{ (runner.os == 'Linux') }}
         shell: bash
@@ -158,8 +164,8 @@ jobs:
       - name: Execute install.sh
         run: >
           ./install.sh
-          --build-dir=$LIBBITCOIN_SRC_PATH ${{ matrix.options }}
-          --prefix=$LIBBITCOIN_SRC_PATH/prefix
+          --build-dir=${{ env.LIBBITCOIN_SRC_PATH }} ${{ matrix.options }}
+          --prefix=${{ env.LIBBITCOIN_SRC_PATH }}prefix
           ${{ env.LINKAGE }}
           ${{ env.ASSERT_NDEBUG }}
           ${{ matrix.boost }}
@@ -235,28 +241,28 @@ jobs:
       matrix:
         include:
           - os: ubuntu-22.04
-            cxx: "clang++-14"
+            cxx: "clang++-15"
             link: "dynamic"
             optimization: "size"
             assert: "debug"
             coverage: "nocov"
             boost: "--build-boost"
             icu: ""
-            cc: "clang-14"
+            cc: "clang-15"
             flags: "-Os -fPIE"
             options: "-Denable-avx2=on -Denable-sse4=on"
             packager: "apt"
             packages: ""
 
           - os: ubuntu-22.04
-            cxx: "clang++-14"
+            cxx: "clang++-15"
             link: "static"
             optimization: "size"
             assert: "ndebug"
             coverage: "nocov"
             boost: "--build-boost"
             icu: "--build-icu --with-icu"
-            cc: "clang-14"
+            cc: "clang-15"
             flags: "-Os -fPIE"
             options: "-Denable-avx2=on"
             packager: "apt"
@@ -291,28 +297,28 @@ jobs:
             packages: ""
 
           - os: macos-latest
-            cxx: "clang++-14"
+            cxx: "clang++"
             link: "dynamic"
             optimization: "size"
             assert: "ndebug"
             coverage: "nocov"
             boost: "--build-boost"
             icu: "--with-icu"
-            cc: "clang-14"
+            cc: "clang"
             flags: "-Os -fPIE"
             options: ""
             packager: "brew"
             packages: "icu4c"
 
           - os: macos-latest
-            cxx: "clang++-14"
+            cxx: "clang++"
             link: "static"
             optimization: "size"
             assert: "ndebug"
             coverage: "nocov"
             boost: "--build-boost"
             icu: "--build-icu --with-icu"
-            cc: "clang-14"
+            cc: "clang"
             flags: "-Os -fvisibility=hidden -fPIE"
             options: ""
             packager: "brew"
@@ -369,6 +375,12 @@ jobs:
             echo "LDFLAGS=-Wl,-rpath,$WORKSPACE_SUBPATH/prefix/lib" >> $GITHUB_ENV
           fi
 
+      - name: Display Compiler details
+        shell: bash
+        run: |
+          ${CC} -v
+          ${CXX} -v
+
       - name: Display CPU details
         if: ${{ (runner.os == 'Linux') }}
         shell: bash
@@ -378,8 +390,8 @@ jobs:
       - name: Execute install-cmake.sh
         run: >
           ./install-cmake.sh
-          --build-dir=$LIBBITCOIN_SRC_PATH ${{ matrix.options }}
-          --prefix=$LIBBITCOIN_SRC_PATH/prefix
+          --build-dir=${{ env.LIBBITCOIN_SRC_PATH }} ${{ matrix.options }}
+          --prefix=${{ env.LIBBITCOIN_SRC_PATH }}prefix
           ${{ env.LINKAGE }}
           ${{ env.ASSERT_NDEBUG }}
           ${{ matrix.boost }}
@@ -466,29 +478,29 @@ jobs:
         include:
           - os: ubuntu-22.04
             preset: "nix-gnu-debug-shared-without_icu"
-            cxx: "clang++-14"
+            cxx: "clang++-15"
             link: "dynamic"
             optimization: "size"
             assert: "debug"
             coverage: "nocov"
             boost: "--build-boost"
             icu: ""
-            cc: "clang-14"
+            cc: "clang-15"
             flags: "-Os -fPIE"
             options: "-Denable-avx2=on -Denable-sse4=on"
             packager: "apt"
             packages: ""
 
           - os: ubuntu-22.04
             preset: "nix-gnu-release-static-size-with_icu"
-            cxx: "clang++-14"
+            cxx: "clang++-15"
             link: "static"
             optimization: "size"
             assert: "ndebug"
             coverage: "nocov"
             boost: "--build-boost"
             icu: "--build-icu --with-icu"
-            cc: "clang-14"
+            cc: "clang-15"
             flags: "-Os -fPIE"
             options: "-Denable-avx2=on"
             packager: "apt"
@@ -560,6 +572,12 @@ jobs:
             echo "LDFLAGS=-Wl,-rpath,$WORKSPACE_SUBPATH/prefix/${{ matrix.preset }}/lib" >> $GITHUB_ENV
           fi
 
+      - name: Display Compiler details
+        shell: bash
+        run: |
+          ${CC} -v
+          ${CXX} -v
+
       - name: Display CPU details
         if: ${{ (runner.os == 'Linux') }}
         shell: bash
@@ -569,8 +587,8 @@ jobs:
       - name: Execute install-cmakepresets.sh
         run: >
           ./install-cmakepresets.sh
-          --build-dir=$LIBBITCOIN_SRC_PATH ${{ matrix.options }}
-          --prefix=$LIBBITCOIN_SRC_PATH/prefix/${{ matrix.preset }}
+          --build-dir=${{ env.LIBBITCOIN_SRC_PATH }} ${{ matrix.options }}
+          --prefix=${{ env.LIBBITCOIN_SRC_PATH }}prefix/${{ matrix.preset }}
           --preset=${{ matrix.preset }}
           ${{ env.LINKAGE }}
           ${{ env.ASSERT_NDEBUG }}

diff --git a/include/bitcoin/system/chain/block.hpp b/include/bitcoin/system/chain/block.hpp
@@ -54,6 +54,8 @@ class BC_API block
         const transactions_cptr& txs) NOEXCEPT;
 
     block(const data_slice& data, bool witness) NOEXCEPT;
+    ////block(stream::in::fast&& stream, bool witness) NOEXCEPT;
+    block(stream::in::fast& stream, bool witness) NOEXCEPT;
     block(std::istream&& stream, bool witness) NOEXCEPT;
     block(std::istream& stream, bool witness) NOEXCEPT;
     block(reader&& source, bool witness) NOEXCEPT;

diff --git a/include/bitcoin/system/chain/header.hpp b/include/bitcoin/system/chain/header.hpp
@@ -65,6 +65,8 @@ class BC_API header
         uint32_t nonce) NOEXCEPT;
 
     header(const data_slice& data) NOEXCEPT;
+    ////header(stream::in::fast&& stream) NOEXCEPT;
+    header(stream::in::fast& stream) NOEXCEPT;
     header(std::istream&& stream) NOEXCEPT;
     header(std::istream& stream) NOEXCEPT;
     header(reader&& source) NOEXCEPT;

diff --git a/include/bitcoin/system/chain/input.hpp b/include/bitcoin/system/chain/input.hpp
@@ -68,6 +68,8 @@ class BC_API input
         const chain::witness::cptr& witness, uint32_t sequence) NOEXCEPT;
 
     input(const data_slice& data) NOEXCEPT;
+    ////input(stream::in::fast&& stream) NOEXCEPT;
+    input(stream::in::fast& stream) NOEXCEPT;
     input(std::istream&& stream) NOEXCEPT;
     input(std::istream& stream) NOEXCEPT;
     input(reader&& source) NOEXCEPT;

diff --git a/include/bitcoin/system/chain/operation.hpp b/include/bitcoin/system/chain/operation.hpp
@@ -365,6 +365,8 @@ class BC_API operation
 
     /// These deserialize operations (with codes), not from push-data.
     operation(const data_slice& op_data) NOEXCEPT;
+    ////operation(stream::in::fast&& stream) NOEXCEPT;
+    operation(stream::in::fast& stream) NOEXCEPT;
     operation(std::istream&& stream) NOEXCEPT;
     operation(std::istream& stream) NOEXCEPT;
     operation(reader&& source) NOEXCEPT;

diff --git a/include/bitcoin/system/chain/output.hpp b/include/bitcoin/system/chain/output.hpp
@@ -51,6 +51,8 @@ class BC_API output
     output(uint64_t value, const chain::script::cptr& script) NOEXCEPT;
 
     output(const data_slice& data) NOEXCEPT;
+    ////output(stream::in::fast&& stream) NOEXCEPT;
+    output(stream::in::fast& stream) NOEXCEPT;
     output(std::istream&& stream) NOEXCEPT;
     output(std::istream& stream) NOEXCEPT;
     output(reader&& source) NOEXCEPT;

diff --git a/include/bitcoin/system/chain/point.hpp b/include/bitcoin/system/chain/point.hpp
@@ -57,6 +57,8 @@ class BC_API point
     point(const hash_digest& hash, uint32_t index) NOEXCEPT;
 
     point(const data_slice& data) NOEXCEPT;
+    ////point(stream::in::fast&& stream) NOEXCEPT;
+    point(stream::in::fast& stream) NOEXCEPT;
     point(std::istream&& stream) NOEXCEPT;
     point(std::istream& stream) NOEXCEPT;
     point(reader&& source) NOEXCEPT;

diff --git a/include/bitcoin/system/chain/script.hpp b/include/bitcoin/system/chain/script.hpp
@@ -443,6 +443,8 @@ class BC_API script
     script(operations&& ops, bool prefail) NOEXCEPT;
     script(const operations& ops, bool prefail) NOEXCEPT;
     script(const data_slice& data, bool prefix) NOEXCEPT;
+    ////script(stream::in::fast&& stream, bool prefix) NOEXCEPT;
+    script(stream::in::fast& stream, bool prefix) NOEXCEPT;
     script(std::istream&& stream, bool prefix) NOEXCEPT;
     script(std::istream& stream, bool prefix) NOEXCEPT;
     script(reader&& source, bool prefix) NOEXCEPT;

diff --git a/include/bitcoin/system/chain/transaction.hpp b/include/bitcoin/system/chain/transaction.hpp
@@ -63,6 +63,8 @@ class BC_API transaction
         const outputs_cptr& outputs, uint32_t locktime) NOEXCEPT;
 
     transaction(const data_slice& data, bool witness) NOEXCEPT;
+    ////transaction(stream::in::fast&& stream, bool witness) NOEXCEPT;
+    transaction(stream::in::fast& stream, bool witness) NOEXCEPT;
     transaction(std::istream&& stream, bool witness) NOEXCEPT;
     transaction(std::istream& stream, bool witness) NOEXCEPT;
     transaction(reader&& source, bool witness) NOEXCEPT;

diff --git a/include/bitcoin/system/chain/witness.hpp b/include/bitcoin/system/chain/witness.hpp
@@ -56,6 +56,8 @@ class BC_API witness
     witness(const chunk_cptrs& stack) NOEXCEPT;
 
     witness(const data_slice& data, bool prefix) NOEXCEPT;
+    ////witness(stream::in::fast&& stream, bool prefix) NOEXCEPT;
+    witness(stream::in::fast& stream, bool prefix) NOEXCEPT;
     witness(std::istream&& stream, bool prefix) NOEXCEPT;
     witness(std::istream& stream, bool prefix) NOEXCEPT;
     witness(reader&& source, bool prefix) NOEXCEPT;