Proposed 2.0.0-rc2 (#4818)

* Support for the mold linker (#4807) * Promote API version 2 to supported (#4803) * Promote API version 2 to be supported * Switch the command line to API version 1 * Fix LedgerRequestRPC test * Remove obsolete tx_account method This method is not implemented, the only parts which are removed are related to command-line parsing * Fix RPCCall test * Reduce diff size, small test improvements * Minor fixes * Support for the mold linker * Fix TransactionEntry_test * Fix AccountTx_test --------- Co-authored-by: seelabs <[email protected]> * Update Linux smoketest distros (#4813) * Fix 2.0 regression in tx method with binary output (#4812) * Fix binary output from tx method * Formatting fix * Minor test improvement * Minor test improvements * Optimize calculation of close time to avoid impasse and minimize gratuitous proposal changes (#4760) * Optimize the calculation of close time to avoid impasse and minimize gratuitous proposal changes. * git apply clang-format.patch * Scott S review fixes. Also clang-format. * Set version to 2.0.0-rc2 --------- Co-authored-by: manoj <[email protected]> Co-authored-by: Scott Determan <[email protected]> Co-authored-by: Bronek Kozicki <[email protected]> Co-authored-by: Michael Legleux <[email protected]> Co-authored-by: Mark Travis <[email protected]>
XRPLF · Nov 20, 2023 · 4977a5d · 4977a5d
1 parent cf4e9e5
commit 4977a5d
Show file tree

Hide file tree

Showing 17 changed files with 724 additions and 708 deletions.
diff --git a/Builds/CMake/RippledCompiler.cmake b/Builds/CMake/RippledCompiler.cmake
@@ -131,7 +131,16 @@ else ()
       >)
 endif ()
 
-if (use_gold AND is_gcc)
+if (use_mold)
+  # use mold linker if available
+  execute_process (
+    COMMAND ${CMAKE_CXX_COMPILER} -fuse-ld=mold -Wl,--version
+    ERROR_QUIET OUTPUT_VARIABLE LD_VERSION)
+  if ("${LD_VERSION}" MATCHES "mold")
+    target_link_libraries (common INTERFACE -fuse-ld=mold)
+  endif ()
+  unset (LD_VERSION)
+elseif (use_gold AND is_gcc)
   # use gold linker if available
   execute_process (
     COMMAND ${CMAKE_CXX_COMPILER} -fuse-ld=gold -Wl,--version
@@ -163,9 +172,7 @@ if (use_gold AND is_gcc)
         $<$<NOT:$<BOOL:${static}>>:-Wl,--disable-new-dtags>)
   endif ()
   unset (LD_VERSION)
-endif ()
-
-if (use_lld)
+elseif (use_lld)
   # use lld linker if available
   execute_process (
     COMMAND ${CMAKE_CXX_COMPILER} -fuse-ld=lld -Wl,--version
@@ -176,6 +183,7 @@ if (use_lld)
   unset (LD_VERSION)
 endif()
 
+
 if (assert)
   foreach (var_ CMAKE_C_FLAGS_RELEASE CMAKE_CXX_FLAGS_RELEASE)
     STRING (REGEX REPLACE "[-/]DNDEBUG" "" ${var_} "${${var_}}")

diff --git a/Builds/CMake/RippledSettings.cmake b/Builds/CMake/RippledSettings.cmake
@@ -37,6 +37,7 @@ if (is_linux)
   option (static "link protobuf, openssl, libc++, and boost statically" ON)
   option (perf "Enables flags that assist with perf recording" OFF)
   option (use_gold "enables detection of gold (binutils) linker" ON)
+  option (use_mold "enables detection of mold (binutils) linker" ON)
 else ()
   # we are not ready to allow shared-libs on windows because it would require
   # export declarations. On macos it's more feasible, but static openssl
@@ -45,6 +46,7 @@ else ()
   set (static ON CACHE BOOL "static link, linux only. ON for WIN/macos" FORCE)
   set (perf OFF CACHE BOOL "perf flags, linux only" FORCE)
   set (use_gold OFF CACHE BOOL "gold linker, linux only" FORCE)
+  set (use_mold OFF CACHE BOOL "mold linker, linux only" FORCE)
 endif ()
 if (is_clang)
   option (use_lld "enables detection of lld linker" ON)

diff --git a/Builds/containers/gitlab-ci/pkgbuild.yml b/Builds/containers/gitlab-ci/pkgbuild.yml
@@ -193,12 +193,30 @@ rocky_8_smoketest:
     name: artifactory.ops.ripple.com/rockylinux/rockylinux:8
   <<: *run_local_smoketest
 
-fedora_37_smoketest:
+rocky_9_smoketest:
   stage: smoketest
   dependencies:
     - rpm_build
   image:
-    name: artifactory.ops.ripple.com/fedora:37
+    name: artifactory.ops.ripple.com/rockylinux/rockylinux:9
+
+  <<: *run_local_smoketest
+
+alma_8_smoketest:
+  stage: smoketest
+  dependencies:
+    - rpm_build
+  image:
+    name: artifactory.ops.ripple.com/almalinux:8
+  <<: *run_local_smoketest
+
+alma_9_smoketest:
+  stage: smoketest
+  dependencies:
+    - rpm_build
+  image:
+    name: artifactory.ops.ripple.com/almalinux:9
+
   <<: *run_local_smoketest
 
 fedora_38_smoketest:
@@ -209,6 +227,14 @@ fedora_38_smoketest:
     name: artifactory.ops.ripple.com/fedora:38
   <<: *run_local_smoketest
 
+fedora_39_smoketest:
+  stage: smoketest
+  dependencies:
+    - rpm_build
+  image:
+    name: artifactory.ops.ripple.com/fedora:39
+  <<: *run_local_smoketest
+
 ubuntu_18_smoketest:
   stage: smoketest
   dependencies:
@@ -249,6 +275,14 @@ debian_11_smoketest:
     name: artifactory.ops.ripple.com/debian:11
   <<: *run_local_smoketest
 
+debian_12_smoketest:
+  stage: smoketest
+  dependencies:
+    - dpkg_build
+  image:
+    name: artifactory.ops.ripple.com/debian:12
+  <<: *run_local_smoketest
+
 #########################################################################
 ##                                                                     ##
 ##  stage: verify_sig                                                  ##
@@ -345,7 +379,6 @@ centos_7_verify_repo_test:
   <<: *only_primary
   <<: *run_repo_smoketest
 
-
 rocky_8_verify_repo_test:
   stage: verify_from_test
   variables:
@@ -357,12 +390,34 @@ rocky_8_verify_repo_test:
   <<: *only_primary
   <<: *run_repo_smoketest
 
-fedora_37_verify_repo_test:
+rocky_9_verify_repo_test:
   stage: verify_from_test
   variables:
     RPM_REPO: "rippled-rpm-test-mirror"
   image:
-    name: artifactory.ops.ripple.com/fedora:37
+    name: artifactory.ops.ripple.com/rockylinux/rockylinux:9
+  dependencies:
+    - rpm_sign
+  <<: *only_primary
+  <<: *run_repo_smoketest
+
+almalinux_8_verify_repo_test:
+  stage: verify_from_test
+  variables:
+    RPM_REPO: "rippled-rpm-test-mirror"
+  image:
+    name: artifactory.ops.ripple.com/almalinux:8
+  dependencies:
+    - rpm_sign
+  <<: *only_primary
+  <<: *run_repo_smoketest
+
+almalinux_9_verify_repo_test:
+  stage: verify_from_test
+  variables:
+    RPM_REPO: "rippled-rpm-test-mirror"
+  image:
+    name: artifactory.ops.ripple.com/almalinux:9
   dependencies:
     - rpm_sign
   <<: *only_primary
@@ -379,6 +434,18 @@ fedora_38_verify_repo_test:
   <<: *only_primary
   <<: *run_repo_smoketest
 
+fedora_39_verify_repo_test:
+  stage: verify_from_test
+  variables:
+    RPM_REPO: "rippled-rpm-test-mirror"
+  image:
+    name: artifactory.ops.ripple.com/fedora:39
+
+  dependencies:
+    - rpm_sign
+  <<: *only_primary
+  <<: *run_repo_smoketest
+
 ubuntu_18_verify_repo_test:
   stage: verify_from_test
   variables:
@@ -439,6 +506,18 @@ debian_11_verify_repo_test:
   <<: *only_primary
   <<: *run_repo_smoketest
 
+debian_12_verify_repo_test:
+  stage: verify_from_test
+  variables:
+    DISTRO: "bookworm"
+    DEB_REPO: "rippled-deb-test-mirror"
+  image:
+    name: artifactory.ops.ripple.com/debian:12
+  dependencies:
+    - dpkg_sign
+  <<: *only_primary
+  <<: *run_repo_smoketest
+
 #########################################################################
 ##                                                                     ##
 ##  stage: wait_approval_prod                                          ##
@@ -515,6 +594,39 @@ rocky_8_verify_repo_prod:
   <<: *only_primary
   <<: *run_repo_smoketest
 
+rocky_9_verify_repo_prod:
+  stage: verify_from_prod
+  variables:
+    RPM_REPO: "rippled-rpm"
+  image:
+    name: artifactory.ops.ripple.com/rockylinux/rockylinux:9
+  dependencies:
+    - rpm_sign
+  <<: *only_primary
+  <<: *run_repo_smoketest
+
+alma_8_verify_repo_prod:
+  stage: verify_from_prod
+  variables:
+    RPM_REPO: "rippled-rpm"
+  image:
+    name: artifactory.ops.ripple.com/almalinux:8
+  dependencies:
+    - rpm_sign
+  <<: *only_primary
+  <<: *run_repo_smoketest
+
+alma_9_verify_repo_prod:
+  stage: verify_from_prod
+  variables:
+    RPM_REPO: "rippled-rpm"
+  image:
+    name: artifactory.ops.ripple.com/almalinux:9
+  dependencies:
+    - rpm_sign
+  <<: *only_primary
+  <<: *run_repo_smoketest
+
 fedora_37_verify_repo_prod:
   stage: verify_from_prod
   variables:
@@ -597,6 +709,19 @@ debian_11_verify_repo_prod:
   <<: *only_primary
   <<: *run_repo_smoketest
 
+debian_12_verify_repo_prod:
+  stage: verify_from_prod
+  variables:
+    DISTRO: "bookworm"
+    DEB_REPO: "rippled-deb"
+  image:
+    name: artifactory.ops.ripple.com/debian:12
+  dependencies:
+    - dpkg_sign
+  <<: *only_primary
+  <<: *run_repo_smoketest
+
+
 #########################################################################
 ##                                                                     ##
 ##  stage: get_final_hashes                                            ##

diff --git a/Builds/containers/gitlab-ci/smoketest.sh b/Builds/containers/gitlab-ci/smoketest.sh
@@ -16,7 +16,7 @@ case ${ID} in
     ubuntu|debian)
         pkgtype="dpkg"
         ;;
-    fedora|centos|rhel|scientific|rocky)
+    fedora|centos|rhel|scientific|rocky|almalinux)
         pkgtype="rpm"
         ;;
     *)
@@ -79,16 +79,8 @@ else
         # yum --showduplicates list rippled
         yum -y install ${rpm_version_release}
     elif [ "${install_from}" = "local" ] ; then
-        # cached pkg install
-        pkgs=("yum-utils openssl-static zlib-static")
-        if [[ "$ID" =~ rocky|fedora ]]; then
-            if [[ "$ID" =~ "rocky" ]]; then
-                sed -i 's/enabled=0/enabled=1/g' /etc/yum.repos.d/Rocky-PowerTools.repo
-            fi
-            pkgs="${pkgs[@]/openssl-static}"
-        fi
-        yum install -y $pkgs
         rm -f build/rpm/packages/rippled-debug*.rpm
+        rm -f build/rpm/packages/rippled-devel*.rpm
         rm -f build/rpm/packages/*.src.rpm
         rpm -i build/rpm/packages/*.rpm
     else

diff --git a/src/ripple/app/misc/impl/Transaction.cpp b/src/ripple/app/misc/impl/Transaction.cpp
@@ -171,7 +171,8 @@ Transaction::getJson(JsonOptions options, bool binary) const
     Json::Value ret(
         mTransaction->getJson(options & ~JsonOptions::include_date, binary));
 
-    if (mLedgerIndex)
+    // NOTE Binary STTx::getJson output might not be a JSON object
+    if (ret.isObject() && mLedgerIndex)
     {
         if (!(options & JsonOptions::disable_API_prior_V2))
         {