From 5820b9cad75bf35078f99320b86834d702828f84 Mon Sep 17 00:00:00 2001
From: TimothyBanks <tbanks@ripple.com>
Date: Tue, 28 Jul 2026 13:30:00 -0400
Subject: [PATCH] fix: Merge upstream branch

---
 .github/scripts/levelization/results/loops.txt    | 2 +-
 .github/scripts/levelization/results/ordering.txt | 1 +
 src/test/app/TestHostFunctions.h                  | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/scripts/levelization/results/loops.txt b/.github/scripts/levelization/results/loops.txt
index d12ef2adfc..cf70468e32 100644
--- a/.github/scripts/levelization/results/loops.txt
+++ b/.github/scripts/levelization/results/loops.txt
@@ -8,7 +8,7 @@ Loop: xrpld.app xrpld.rpc
   xrpld.rpc > xrpld.app
 
 Loop: xrpld.app xrpld.shamap
-  xrpld.shamap ~= xrpld.app
+  xrpld.shamap > xrpld.app
 
 Loop: xrpld.overlay xrpld.rpc
   xrpld.rpc ~= xrpld.overlay
diff --git a/.github/scripts/levelization/results/ordering.txt b/.github/scripts/levelization/results/ordering.txt
index e7fde9f30b..ffb6cfeb95 100644
--- a/.github/scripts/levelization/results/ordering.txt
+++ b/.github/scripts/levelization/results/ordering.txt
@@ -207,6 +207,7 @@ xrpl.conditions > xrpl.basics
 xrpl.conditions > xrpl.protocol
 xrpl.config > xrpl.basics
 xrpl.core > xrpl.basics
+xrpl.core > xrpl.config
 xrpl.core > xrpl.json
 xrpl.core > xrpl.protocol
 xrpl.json > xrpl.basics
diff --git a/src/test/app/TestHostFunctions.h b/src/test/app/TestHostFunctions.h
index 4633ac50d2..38405eaa59 100644
--- a/src/test/app/TestHostFunctions.h
+++ b/src/test/app/TestHostFunctions.h
@@ -8,7 +8,6 @@
 #include <xrpl/beast/insight/Event.h>
 #include <xrpl/beast/insight/EventImpl.h>
 #include <xrpl/beast/utility/Journal.h>
-#include <xrpl/ledger/AmendmentTable.h>
 #include <xrpl/ledger/detail/ApplyViewBase.h>
 #include <xrpl/protocol/AccountID.h>
 #include <xrpl/protocol/Asset.h>
@@ -28,6 +27,7 @@
 #include <expected>
 #include <iostream>
 #include <iterator>
+#include <memory>
 #include <string>
 #include <string_view>
 #include <vector>
@@ -133,7 +133,7 @@ public:
     }
 
     [[nodiscard]] std::shared_ptr<RecordingEventImpl>&
-    getExecutionTimeEventImpl() 
+    getExecutionTimeEventImpl()
     {
         return execTimeEvent_;
     }