add logs

.github/actions/xahau-ga-build/action.yml

@@ -59,7 +59,6 @@ runs:
           ${{ runner.os }}-ccache-v${{ inputs.cache_version }}-${{ inputs.compiler-id }}-${{ inputs.configuration }}-${{ inputs.main_branch }}
           ${{ runner.os }}-ccache-v${{ inputs.cache_version }}-${{ inputs.compiler-id }}-${{ inputs.configuration }}-
           ${{ runner.os }}-ccache-v${{ inputs.cache_version }}-${{ inputs.compiler-id }}-
-          ${{ runner.os }}-ccache-v${{ inputs.cache_version }}-
 
     - name: Configure project
       shell: bash

.github/actions/xahau-ga-dependencies/action.yml

@@ -54,13 +54,12 @@ runs:
         restore-keys: |
           ${{ runner.os }}-conan-v${{ inputs.cache_version }}-${{ inputs.compiler-id }}-${{ hashFiles('**/conanfile.txt', '**/conanfile.py') }}-
           ${{ runner.os }}-conan-v${{ inputs.cache_version }}-${{ inputs.compiler-id }}-
-          ${{ runner.os }}-conan-v${{ inputs.cache_version }}-
 
     - name: Export custom recipes
       shell: bash
       run: |
-        conan export external/snappy snappy/1.1.9@
-        conan export external/soci soci/4.0.3@
+        conan export external/snappy snappy/1.1.10@xahaud/stable
+        conan export external/soci soci/4.0.3@xahaud/stable
 
     - name: Install dependencies
       shell: bash
@@ -83,4 +82,4 @@ runs:
         path: |
           ~/.conan
           ~/.conan2
-        key: ${{ steps.cache-restore-conan.outputs.cache-primary-key }}
+        key: ${{ steps.cache-restore-conan.outputs.cache-primary-key }}

.github/workflows/xahau-ga-nix.yml

@@ -22,13 +22,14 @@ jobs:
         configuration: [Debug]
         include:
           - compiler: gcc
-            cc: gcc-11
-            cxx: g++-11
-            compiler_id: gcc-11
+            cc: gcc-13
+            cxx: g++-13
+            compiler_id: gcc-13
+            compiler_version: 13
     env:
       build_dir: .build
       # Bump this number to invalidate all caches globally.
-      CACHE_VERSION: 1
+      CACHE_VERSION: 2
       MAIN_BRANCH_NAME: dev
     steps:
       - name: Checkout
@@ -58,12 +59,8 @@ jobs:
           conan profile update env.CXX=/usr/bin/${{ matrix.cxx }} default
           conan profile update conf.tools.build:compiler_executables='{"c": "/usr/bin/${{ matrix.cc }}", "cpp": "/usr/bin/${{ matrix.cxx }}"}' default
 
-          # Set correct compiler version based on matrix.compiler
-          if [ "${{ matrix.compiler }}" = "gcc" ]; then
-            conan profile update settings.compiler.version=11 default
-          elif [ "${{ matrix.compiler }}" = "clang" ]; then
-            conan profile update settings.compiler.version=14 default
-          fi
+          # Set compiler version from matrix
+          conan profile update settings.compiler.version=${{ matrix.compiler_version }} default
           # Display profile for verification
           conan profile show default
 
@@ -120,4 +117,4 @@ jobs:
           else
              echo "Error: rippled executable not found in ${{ env.build_dir }}"
              exit 1
-          fi
+          fi

BUILD.md

@@ -117,14 +117,14 @@ can't build earlier Boost versions.
    which allows you to statically link it with GCC, if you want.
 
    ```
-   conan export external/snappy snappy/1.1.9@
+   conan export external/snappy snappy/1.1.10@xahaud/stable
    ```
 
 5. Export our [Conan recipe for SOCI](./external/soci).
    It patches their CMake to correctly import its dependencies.
 
    ```
-   conan export external/soci soci/4.0.3@
+   conan export external/soci soci/4.0.3@xahaud/stable
    ```
 
 ### Build and Test

build-core.sh

@@ -43,8 +43,8 @@ export LDFLAGS="-static-libstdc++"
 git config --global --add safe.directory /io &&
 git checkout src/ripple/protocol/impl/BuildInfo.cpp &&
 sed -i s/\"0.0.0\"/\"$(date +%Y).$(date +%-m).$(date +%-d)-$(git rev-parse --abbrev-ref HEAD)$(if [ -n "$4" ]; then echo "+$4"; fi)\"/g src/ripple/protocol/impl/BuildInfo.cpp &&
-conan export external/snappy snappy/1.1.10@ &&
-conan export external/soci soci/4.0.3@ &&
+conan export external/snappy snappy/1.1.10@xahaud/stable &&
+conan export external/soci soci/4.0.3@xahaud/stable &&
 cd release-build &&
 conan install .. --output-folder . --build missing --settings build_type=$BUILD_TYPE &&
 cmake .. -G Ninja \

conanfile.py

@@ -32,8 +32,8 @@ class Xrpl(ConanFile):
         'nudb/2.0.8',
         'openssl/1.1.1u',
         'protobuf/3.21.9',
-        'snappy/1.1.10',
-        'soci/4.0.3',
+        'snappy/1.1.10@xahaud/stable',
+        'soci/4.0.3@xahaud/stable',
         'sqlite3/3.42.0',
         'zlib/1.2.13',
         'wasmedge/0.11.2',

src/ripple/app/hook/Enum.h

@@ -1,3 +1,4 @@
+#include <cstdint>
 #include <map>
 #include <set>
 #include <string>

src/ripple/app/ledger/LedgerHistory.cpp

@@ -339,7 +339,7 @@ LedgerHistory::handleMismatch(
 
     assert(builtLedger->info().seq == validLedger->info().seq);
 
-    if (auto stream = j_.debug())
+    if (auto stream = j_.error())
     {
         stream << "Built: " << getJson({*builtLedger, {}});
         stream << "Valid: " << getJson({*validLedger, {}});

src/test/app/SetHook_test.cpp

@@ -321,7 +321,7 @@ public:
             HSFEE,
             ter(temMALFORMED));
 
-        env(ripple::test::jtx::hook(alice, {{}}, 0),
+        env(ripple::test::jtx::hook(alice, std::vector<Json::Value>{}, 0),
             M("Must have a non-empty hooks field"),
             HSFEE,
             ter(temMALFORMED));