Remove pragma once

.github/scripts/levelization/results/loops.txt

@@ -5,7 +5,7 @@ Loop: test.jtx test.unit_test
   test.unit_test == test.jtx
 
 Loop: xrpld.app xrpld.overlay
-  xrpld.overlay ~= xrpld.app
+  xrpld.overlay == xrpld.app
 
 Loop: xrpld.app xrpld.peerfinder
   xrpld.peerfinder == xrpld.app

include/xrpl/proto/xrpl.proto

@@ -244,7 +244,15 @@ message TMGetObjectByHash {
 
 message TMLedgerNode {
   required bytes nodedata = 1;
+
+  // Used when fixLedgerNodeID is disabled.
   optional bytes nodeid = 2;  // missing for ledger base data
+
+  // Used when fixLedgerNodeID is enabled. Neither value is set for ledger base data.
+  oneof reference {
+    bytes id = 3;      // Set for inner nodes.
+    uint32 depth = 4;  // Set for leaf nodes.
+  }
 }
 
 enum TMLedgerInfoType {

include/xrpl/protocol/detail/features.macro

@@ -15,6 +15,7 @@
 
 // Add new amendments to the top of this list.
 // Keep it sorted in reverse chronological order.
+XRPL_FIX    (LedgerNodeID,               Supported::yes, VoteBehavior::DefaultYes)
 XRPL_FIX   (PermissionedDomainInvariant, Supported::yes, VoteBehavior::DefaultNo)
 XRPL_FIX    (ExpiredNFTokenOfferRemoval, Supported::yes, VoteBehavior::DefaultNo)
 XRPL_FIX    (BatchInnerSigs,             Supported::yes, VoteBehavior::DefaultNo)

include/xrpl/shamap/SHAMap.h

@@ -252,7 +252,7 @@ public:
     bool
     getNodeFat(
         SHAMapNodeID const& wanted,
-        std::vector<std::pair<SHAMapNodeID, Blob>>& data,
+        std::vector<std::tuple<SHAMapNodeID, Blob, bool>>& data,
         bool fatLeaves,
         std::uint32_t depth) const;
 
@@ -280,9 +280,12 @@ public:
     serializeRoot(Serializer& s) const;
 
     SHAMapAddNode
-    addRootNode(SHAMapHash const& hash, Slice const& rootNode, SHAMapSyncFilter* filter);
+    addRootNode(SHAMapHash const& hash, intr_ptr::SharedPtr<SHAMapTreeNode> rootNode, SHAMapSyncFilter const* filter);
     SHAMapAddNode
-    addKnownNode(SHAMapNodeID const& nodeID, Slice const& rawNode, SHAMapSyncFilter* filter);
+    addKnownNode(
+        SHAMapNodeID const& nodeID,
+        intr_ptr::SharedPtr<SHAMapTreeNode> treeNode,
+        SHAMapSyncFilter const* filter);
 
     // status functions
     void
@@ -333,7 +336,7 @@ private:
     cacheLookup(SHAMapHash const& hash) const;
 
     void
-    canonicalize(SHAMapHash const& hash, intr_ptr::SharedPtr<SHAMapTreeNode>&) const;
+    canonicalize(SHAMapHash const& hash, intr_ptr::SharedPtr<SHAMapTreeNode>& node) const;
 
     // database operations
     intr_ptr::SharedPtr<SHAMapTreeNode>
@@ -341,11 +344,11 @@ private:
     intr_ptr::SharedPtr<SHAMapTreeNode>
     fetchNodeNT(SHAMapHash const& hash) const;
     intr_ptr::SharedPtr<SHAMapTreeNode>
-    fetchNodeNT(SHAMapHash const& hash, SHAMapSyncFilter* filter) const;
+    fetchNodeNT(SHAMapHash const& hash, SHAMapSyncFilter const* filter) const;
     intr_ptr::SharedPtr<SHAMapTreeNode>
     fetchNode(SHAMapHash const& hash) const;
     intr_ptr::SharedPtr<SHAMapTreeNode>
-    checkFilter(SHAMapHash const& hash, SHAMapSyncFilter* filter) const;
+    checkFilter(SHAMapHash const& hash, SHAMapSyncFilter const* filter) const;
 
     /** Update hashes up to the root */
     void
@@ -405,10 +408,11 @@ private:
     // If pending, callback is called as if it called fetchNodeNT
     using descendCallback = std::function<void(intr_ptr::SharedPtr<SHAMapTreeNode>, SHAMapHash const&)>;
     SHAMapTreeNode*
-    descendAsync(SHAMapInnerNode* parent, int branch, SHAMapSyncFilter* filter, bool& pending, descendCallback&&) const;
+    descendAsync(SHAMapInnerNode* parent, int branch, SHAMapSyncFilter const* filter, bool& pending, descendCallback&&)
+        const;
 
     std::pair<SHAMapTreeNode*, SHAMapNodeID>
-    descend(SHAMapInnerNode* parent, SHAMapNodeID const& parentID, int branch, SHAMapSyncFilter* filter) const;
+    descend(SHAMapInnerNode* parent, SHAMapNodeID const& parentID, int branch, SHAMapSyncFilter const* filter) const;
 
     // Non-storing
     // Does not hook the returned node to its parent

src/libxrpl/shamap/SHAMap.cpp

@@ -172,7 +172,7 @@ SHAMap::finishFetch(SHAMapHash const& hash, std::shared_ptr<NodeObject> const& o
 
 // See if a sync filter has a node
 intr_ptr::SharedPtr<SHAMapTreeNode>
-SHAMap::checkFilter(SHAMapHash const& hash, SHAMapSyncFilter* filter) const
+SHAMap::checkFilter(SHAMapHash const& hash, SHAMapSyncFilter const* filter) const
 {
     if (auto nodeData = filter->getNode(hash))
     {
@@ -198,7 +198,7 @@ SHAMap::checkFilter(SHAMapHash const& hash, SHAMapSyncFilter* filter) const
 // Get a node without throwing
 // Used on maps where missing nodes are expected
 intr_ptr::SharedPtr<SHAMapTreeNode>
-SHAMap::fetchNodeNT(SHAMapHash const& hash, SHAMapSyncFilter* filter) const
+SHAMap::fetchNodeNT(SHAMapHash const& hash, SHAMapSyncFilter const* filter) const
 {
     auto node = cacheLookup(hash);
     if (node)
@@ -307,7 +307,7 @@ SHAMap::descendNoStore(SHAMapInnerNode& parent, int branch) const
 }
 
 std::pair<SHAMapTreeNode*, SHAMapNodeID>
-SHAMap::descend(SHAMapInnerNode* parent, SHAMapNodeID const& parentID, int branch, SHAMapSyncFilter* filter) const
+SHAMap::descend(SHAMapInnerNode* parent, SHAMapNodeID const& parentID, int branch, SHAMapSyncFilter const* filter) const
 {
     XRPL_ASSERT(parent->isInner(), "xrpl::SHAMap::descend : valid parent input");
     XRPL_ASSERT((branch >= 0) && (branch < branchFactor), "xrpl::SHAMap::descend : valid branch input");
@@ -334,7 +334,7 @@ SHAMapTreeNode*
 SHAMap::descendAsync(
     SHAMapInnerNode* parent,
     int branch,
-    SHAMapSyncFilter* filter,
+    SHAMapSyncFilter const* filter,
     bool& pending,
     descendCallback&& callback) const
 {

src/libxrpl/shamap/SHAMapNodeID.cpp

@@ -113,7 +113,7 @@ selectBranch(SHAMapNodeID const& id, uint256 const& hash)
 SHAMapNodeID
 SHAMapNodeID::createID(int depth, uint256 const& key)
 {
-    XRPL_ASSERT((depth >= 0) && (depth < 65), "xrpl::SHAMapNodeID::createID : valid branch input");
+    XRPL_ASSERT(depth >= 0 && depth <= SHAMap::leafDepth, "xrpl::SHAMapNodeID::createID : valid branch input");
     return SHAMapNodeID(depth, key & depthMask(depth));
 }
 

src/libxrpl/shamap/SHAMapSync.cpp

@@ -374,7 +374,7 @@ SHAMap::getMissingNodes(int max, SHAMapSyncFilter* filter)
 bool
 SHAMap::getNodeFat(
     SHAMapNodeID const& wanted,
-    std::vector<std::pair<SHAMapNodeID, Blob>>& data,
+    std::vector<std::tuple<SHAMapNodeID, Blob, bool>>& data,
     bool fatLeaves,
     std::uint32_t depth) const
 {
@@ -419,7 +419,7 @@ SHAMap::getNodeFat(
         // Add this node to the reply
         s.erase();
         node->serializeForWire(s);
-        data.emplace_back(std::make_pair(nodeID, s.getData()));
+        data.emplace_back(std::make_tuple(nodeID, s.getData(), node->isLeaf()));
 
         if (node->isInner())
         {
@@ -449,7 +449,7 @@ SHAMap::getNodeFat(
                             // Just include this node
                             s.erase();
                             childNode->serializeForWire(s);
-                            data.emplace_back(std::make_pair(childID, s.getData()));
+                            data.emplace_back(std::make_tuple(childID, s.getData(), childNode->isLeaf()));
                         }
                     }
                 }
@@ -467,7 +467,10 @@ SHAMap::serializeRoot(Serializer& s) const
 }
 
 SHAMapAddNode
-SHAMap::addRootNode(SHAMapHash const& hash, Slice const& rootNode, SHAMapSyncFilter* filter)
+SHAMap::addRootNode(
+    SHAMapHash const& hash,
+    intr_ptr::SharedPtr<SHAMapTreeNode> rootNode,
+    SHAMapSyncFilter const* filter)
 {
     // we already have a root_ node
     if (root_->getHash().isNonZero())
@@ -478,14 +481,13 @@ SHAMap::addRootNode(SHAMapHash const& hash, Slice const& rootNode, SHAMapSyncFil
     }
 
     XRPL_ASSERT(cowid_ >= 1, "xrpl::SHAMap::addRootNode : valid cowid");
-    auto node = SHAMapTreeNode::makeFromWire(rootNode);
-    if (!node || node->getHash() != hash)
+    if (rootNode->getHash() != hash)
         return SHAMapAddNode::invalid();
 
     if (backed_)
-        canonicalize(hash, node);
+        canonicalize(hash, rootNode);
 
-    root_ = node;
+    root_ = rootNode;
 
     if (root_->isLeaf())
         clearSynching();
@@ -501,9 +503,12 @@ SHAMap::addRootNode(SHAMapHash const& hash, Slice const& rootNode, SHAMapSyncFil
 }
 
 SHAMapAddNode
-SHAMap::addKnownNode(SHAMapNodeID const& node, Slice const& rawNode, SHAMapSyncFilter* filter)
+SHAMap::addKnownNode(
+    SHAMapNodeID const& nodeID,
+    intr_ptr::SharedPtr<SHAMapTreeNode> treeNode,
+    SHAMapSyncFilter const* filter)
 {
-    XRPL_ASSERT(!node.isRoot(), "xrpl::SHAMap::addKnownNode : valid node input");
+    XRPL_ASSERT(!nodeID.isRoot(), "xrpl::SHAMap::addKnownNode : valid node input");
 
     if (!isSynching())
     {
@@ -516,14 +521,14 @@ SHAMap::addKnownNode(SHAMapNodeID const& node, Slice const& rawNode, SHAMapSyncF
     auto currNode = root_.get();
 
     while (currNode->isInner() && !static_cast<SHAMapInnerNode*>(currNode)->isFullBelow(generation) &&
-           (currNodeID.getDepth() < node.getDepth()))
+           (currNodeID.getDepth() < nodeID.getDepth()))
     {
-        int const branch = selectBranch(currNodeID, node.getNodeID());
+        int const branch = selectBranch(currNodeID, nodeID.getNodeID());
         XRPL_ASSERT(branch >= 0, "xrpl::SHAMap::addKnownNode : valid branch");
         auto inner = static_cast<SHAMapInnerNode*>(currNode);
         if (inner->isEmptyBranch(branch))
         {
-            JLOG(journal_.warn()) << "Add known node for empty branch" << node;
+            JLOG(journal_.warn()) << "Add known node for empty branch" << nodeID;
             return SHAMapAddNode::invalid();
         }
 
@@ -539,62 +544,41 @@ SHAMap::addKnownNode(SHAMapNodeID const& node, Slice const& rawNode, SHAMapSyncF
         if (currNode != nullptr)
             continue;
 
-        auto newNode = SHAMapTreeNode::makeFromWire(rawNode);
-
-        if (!newNode || childHash != newNode->getHash())
+        if (childHash != treeNode->getHash())
         {
             JLOG(journal_.warn()) << "Corrupt node received";
             return SHAMapAddNode::invalid();
         }
 
-        // In rare cases, a node can still be corrupt even after hash
-        // validation. For leaf nodes, we perform an additional check to
-        // ensure the node's position in the tree is consistent with its
-        // content to prevent inconsistencies that could
-        // propagate further down the line.
-        if (newNode->isLeaf())
-        {
-            auto const& actualKey = static_cast<SHAMapLeafNode const*>(newNode.get())->peekItem()->key();
-
-            // Validate that this leaf belongs at the target position
-            auto const expectedNodeID = SHAMapNodeID::createID(node.getDepth(), actualKey);
-            if (expectedNodeID.getNodeID() != node.getNodeID())
-            {
-                JLOG(journal_.debug()) << "Leaf node position mismatch: "
-                                       << "expected=" << expectedNodeID.getNodeID() << ", actual=" << node.getNodeID();
-                return SHAMapAddNode::invalid();
-            }
-        }
-
         // Inner nodes must be at a level strictly less than 64
         // but leaf nodes (while notionally at level 64) can be
         // at any depth up to and including 64:
-        if ((currNodeID.getDepth() > leafDepth) || (newNode->isInner() && currNodeID.getDepth() == leafDepth))
+        if ((currNodeID.getDepth() > leafDepth) || (treeNode->isInner() && currNodeID.getDepth() == leafDepth))
         {
             // Map is provably invalid
             state_ = SHAMapState::Invalid;
             return SHAMapAddNode::useful();
         }
 
-        if (currNodeID != node)
+        if (currNodeID != nodeID)
         {
             // Either this node is broken or we didn't request it (yet)
-            JLOG(journal_.warn()) << "unable to hook node " << node;
+            JLOG(journal_.warn()) << "unable to hook node " << nodeID;
             JLOG(journal_.info()) << " stuck at " << currNodeID;
-            JLOG(journal_.info()) << "got depth=" << node.getDepth() << ", walked to= " << currNodeID.getDepth();
+            JLOG(journal_.info()) << "got depth=" << nodeID.getDepth() << ", walked to= " << currNodeID.getDepth();
             return SHAMapAddNode::useful();
         }
 
         if (backed_)
-            canonicalize(childHash, newNode);
+            canonicalize(childHash, treeNode);
 
-        newNode = prevNode->canonicalizeChild(branch, std::move(newNode));
+        treeNode = prevNode->canonicalizeChild(branch, std::move(treeNode));
 
         if (filter)
         {
             Serializer s;
-            newNode->serializeWithPrefix(s);
-            filter->gotNode(false, childHash, ledgerSeq_, std::move(s.modData()), newNode->getType());
+            treeNode->serializeWithPrefix(s);
+            filter->gotNode(false, childHash, ledgerSeq_, std::move(s.modData()), treeNode->getType());
         }
 
         return SHAMapAddNode::useful();

src/test/app/LedgerNodeHelpers_test.cpp

@@ -0,0 +1,352 @@
+#include <test/jtx.h>
+#include <test/jtx/Env.h>
+#include <test/shamap/common.h>
+#include <test/unit_test/SuiteJournal.h>
+
+#include <xrpld/app/ledger/detail/LedgerNodeHelpers.h>
+
+#include <xrpl/basics/random.h>
+#include <xrpl/beast/unit_test.h>
+#include <xrpl/proto/xrpl.pb.h>
+#include <xrpl/shamap/SHAMap.h>
+#include <xrpl/shamap/SHAMapItem.h>
+#include <xrpl/shamap/SHAMapLeafNode.h>
+
+namespace xrpl {
+namespace tests {
+
+class LedgerNodeHelpers_test : public beast::unit_test::suite
+{
+    // Helper to create a simple SHAMapItem for testing
+    boost::intrusive_ptr<SHAMapItem>
+    makeTestItem(std::uint32_t seed)
+    {
+        Serializer s;
+        s.add32(seed);
+        s.add32(seed + 1);
+        s.add32(seed + 2);
+        return make_shamapitem(s.getSHA512Half(), s.slice());
+    }
+
+    // Helper to serialize a tree node to wire format
+    std::string
+    serializeNode(intr_ptr::SharedPtr<SHAMapTreeNode> const& node)
+    {
+        Serializer s;
+        node->serializeWithPrefix(s);
+        auto const slice = s.slice();
+        return std::string(reinterpret_cast<char const*>(slice.data()), slice.size());
+    }
+
+    void
+    testValidateLedgerNode()
+    {
+        testcase("validateLedgerNode");
+
+        using namespace test::jtx;
+
+        /*// Test with amendment disabled.
+        {
+            Env env{*this, testable_amendments() - fixLedgerNodeID};
+            auto& app = env.app();
+
+            // Valid node with nodeid.
+            protocol::TMLedgerNode node1;
+            node1.set_nodedata("test_data");
+            node1.set_nodeid("test_nodeid");
+            BEAST_EXPECT(validateLedgerNode(app, node1));
+
+            // Invalid: missing nodedata.
+            protocol::TMLedgerNode node2;
+            node2.set_nodeid("test_nodeid");
+            BEAST_EXPECT(!validateLedgerNode(app, node2));
+
+            // Invalid: has new field (id).
+            protocol::TMLedgerNode node3;
+            node3.set_nodedata("test_data");
+            node3.set_nodeid("test_nodeid");
+            node3.set_id("test_id");
+            BEAST_EXPECT(!validateLedgerNode(app, node3));
+
+            // Invalid: has new field (depth).
+            protocol::TMLedgerNode node4;
+            node4.set_nodedata("test_data");
+            node4.set_nodeid("test_nodeid");
+            node4.set_depth(5);
+            BEAST_EXPECT(!validateLedgerNode(app, node4));
+        }
+
+        // Test with amendment enabled.
+        {
+            Env env{*this, testable_amendments() | fixLedgerNodeID};
+            auto& app = env.app();
+
+            // Valid inner node with id.
+            protocol::TMLedgerNode node1;
+            node1.set_nodedata("test_data");
+            node1.set_id("test_id");
+            BEAST_EXPECT(validateLedgerNode(app, node1));
+
+            // Valid leaf node with depth.
+            protocol::TMLedgerNode node2;
+            node2.set_nodedata("test_data");
+            node2.set_depth(5);
+            BEAST_EXPECT(validateLedgerNode(app, node2));
+
+            // Valid leaf node at max depth.
+            protocol::TMLedgerNode node3;
+            node3.set_nodedata("test_data");
+            node3.set_depth(SHAMap::leafDepth);
+            BEAST_EXPECT(validateLedgerNode(app, node3));
+
+            // Invalid: depth exceeds max depth.
+            protocol::TMLedgerNode node4;
+            node4.set_nodedata("test_data");
+            node4.set_depth(SHAMap::leafDepth + 1);
+            BEAST_EXPECT(!validateLedgerNode(app, node4));
+
+            // Invalid: has legacy field (nodeid).
+            protocol::TMLedgerNode node5;
+            node5.set_nodedata("test_data");
+            node5.set_nodeid("test_nodeid");
+            BEAST_EXPECT(!validateLedgerNode(app, node5));
+
+            // Invalid: missing both id and depth.
+            protocol::TMLedgerNode node6;
+            node6.set_nodedata("test_data");
+            BEAST_EXPECT(!validateLedgerNode(app, node6));
+
+            // Invalid: missing nodedata.
+            protocol::TMLedgerNode node7;
+            node7.set_id("test_id");
+            BEAST_EXPECT(!validateLedgerNode(app, node7));
+        }*/
+    }
+
+    /*void
+    testGetTreeNode()
+    {
+        testcase("getTreeNode");
+
+        using namespace test::jtx;
+        test::SuiteJournal journal("LedgerNodeHelpers_test", *this);
+        TestNodeFamily f(journal);
+
+        // Test with valid inner node
+        {
+            auto innerNode = std::make_shared<SHAMapInnerNode>(1);
+            auto serialized = serializeNode(innerNode);
+            auto result = getTreeNode(serialized);
+            BEAST_EXPECT(result.has_value());
+            BEAST_EXPECT((*result)->isInner());
+        }
+
+        // Test with valid leaf node
+        {
+            auto item = makeTestItem(12345);
+            auto leafNode =
+                std::make_shared<SHAMapLeafNode>(item, SHAMapNodeType::tnACCOUNT_STATE);
+            auto serialized = serializeNode(leafNode);
+            auto result = getTreeNode(serialized);
+            BEAST_EXPECT(result.has_value());
+            BEAST_EXPECT((*result)->isLeaf());
+        }
+
+        // Test with invalid data - empty string
+        {
+            auto result = getTreeNode("");
+            BEAST_EXPECT(!result.has_value());
+        }
+
+        // Test with invalid data - garbage data
+        {
+            std::string garbage = "This is not a valid serialized node!";
+            auto result = getTreeNode(garbage);
+            BEAST_EXPECT(!result.has_value());
+        }
+
+        // Test with malformed data - truncated
+        {
+            auto item = makeTestItem(54321);
+            auto leafNode =
+                std::make_shared<SHAMapLeafNode>(item, SHAMapNodeType::tnACCOUNT_STATE);
+            auto serialized = serializeNode(leafNode);
+            // Truncate the data
+            serialized = serialized.substr(0, 5);
+            auto result = getTreeNode(serialized);
+            BEAST_EXPECT(!result.has_value());
+        }
+    }
+
+    void
+    testGetSHAMapNodeID()
+    {
+        testcase("getSHAMapNodeID");
+
+        using namespace test::jtx;
+        test::SuiteJournal journal("LedgerNodeHelpers_test", *this);
+        TestNodeFamily f(journal);
+
+        auto item = makeTestItem(99999);
+        auto leafNode =
+            std::make_shared<SHAMapLeafNode>(item, SHAMapNodeType::tnACCOUNT_STATE);
+        auto innerNode = std::make_shared<SHAMapInnerNode>(1);
+
+        // Test with amendment disabled
+        {
+            Env env{*this};
+            auto& app = env.app();
+
+            // Test with leaf node - valid nodeid
+            {
+                auto nodeID = SHAMapNodeID::createID(5, item->key());
+                protocol::TMLedgerNode ledgerNode;
+                ledgerNode.set_nodedata("test_data");
+                ledgerNode.set_nodeid(nodeID.getRawString());
+
+                auto result = getSHAMapNodeID(app, ledgerNode, leafNode);
+                BEAST_EXPECT(result.has_value());
+                BEAST_EXPECT(*result == nodeID);
+            }
+
+            // Test with leaf node - invalid nodeid (wrong depth)
+            {
+                auto nodeID = SHAMapNodeID::createID(7, item->key());
+                protocol::TMLedgerNode ledgerNode;
+                ledgerNode.set_nodedata("test_data");
+                ledgerNode.set_nodeid(nodeID.getRawString());
+
+                auto wrongNodeID = SHAMapNodeID::createID(5, item->key());
+                ledgerNode.set_nodeid(wrongNodeID.getRawString());
+
+                auto result = getSHAMapNodeID(app, ledgerNode, leafNode);
+                // Should fail because nodeid doesn't match the leaf's key at the
+                // given depth
+                BEAST_EXPECT(!result.has_value());
+            }
+
+            // Test with inner node
+            {
+                auto nodeID = SHAMapNodeID::createID(3, uint256{});
+                protocol::TMLedgerNode ledgerNode;
+                ledgerNode.set_nodedata("test_data");
+                ledgerNode.set_nodeid(nodeID.getRawString());
+
+                auto result = getSHAMapNodeID(app, ledgerNode, innerNode);
+                BEAST_EXPECT(result.has_value());
+                BEAST_EXPECT(*result == nodeID);
+            }
+
+            // Test missing nodeid
+            {
+                protocol::TMLedgerNode ledgerNode;
+                ledgerNode.set_nodedata("test_data");
+
+                auto result = getSHAMapNodeID(app, ledgerNode, leafNode);
+                BEAST_EXPECT(!result.has_value());
+            }
+        }
+
+        // Test with amendment enabled
+        {
+            Env env{*this, testable_amendments() | fixLedgerNodeID};
+            auto& app = env.app();
+
+            // Test with leaf node - valid depth
+            {
+                std::uint32_t depth = 5;
+                protocol::TMLedgerNode ledgerNode;
+                ledgerNode.set_nodedata("test_data");
+                ledgerNode.set_depth(depth);
+
+                auto result = getSHAMapNodeID(app, ledgerNode, leafNode);
+                BEAST_EXPECT(result.has_value());
+                auto expectedID = SHAMapNodeID::createID(depth, item->key());
+                BEAST_EXPECT(*result == expectedID);
+            }
+
+            // Test with leaf node - missing depth
+            {
+                protocol::TMLedgerNode ledgerNode;
+                ledgerNode.set_nodedata("test_data");
+
+                auto result = getSHAMapNodeID(app, ledgerNode, leafNode);
+                BEAST_EXPECT(!result.has_value());
+            }
+
+            // Test with inner node - valid id
+            {
+                auto nodeID = SHAMapNodeID::createID(3, uint256{});
+                protocol::TMLedgerNode ledgerNode;
+                ledgerNode.set_nodedata("test_data");
+                ledgerNode.set_id(nodeID.getRawString());
+
+                auto result = getSHAMapNodeID(app, ledgerNode, innerNode);
+                BEAST_EXPECT(result.has_value());
+                BEAST_EXPECT(*result == nodeID);
+            }
+
+            // Test with inner node - missing id
+            {
+                protocol::TMLedgerNode ledgerNode;
+                ledgerNode.set_nodedata("test_data");
+
+                auto result = getSHAMapNodeID(app, ledgerNode, innerNode);
+                BEAST_EXPECT(!result.has_value());
+            }
+
+            // Test that nodeid is rejected when amendment is enabled
+            {
+                auto nodeID = SHAMapNodeID::createID(5, item->key());
+                protocol::TMLedgerNode ledgerNode;
+                ledgerNode.set_nodedata("test_data");
+                ledgerNode.set_nodeid(nodeID.getRawString());
+
+                // Should fail validation before getSHAMapNodeID is called,
+                // but let's verify getSHAMapNodeID behavior
+                // Note: validateLedgerNode should be called first in practice
+                BEAST_EXPECT(!validateLedgerNode(app, ledgerNode));
+            }
+
+            // Test with root node (inner node at depth 0)
+            {
+                auto rootNode = std::make_shared<SHAMapInnerNode>(1);
+                auto nodeID = SHAMapNodeID{};  // root node ID
+                protocol::TMLedgerNode ledgerNode;
+                ledgerNode.set_nodedata("test_data");
+                ledgerNode.set_id(nodeID.getRawString());
+
+                auto result = getSHAMapNodeID(app, ledgerNode, rootNode);
+                BEAST_EXPECT(result.has_value());
+                BEAST_EXPECT(*result == nodeID);
+            }
+
+            // Test with leaf at maximum depth
+            {
+                std::uint32_t depth = SHAMap::leafDepth;
+                protocol::TMLedgerNode ledgerNode;
+                ledgerNode.set_nodedata("test_data");
+                ledgerNode.set_depth(depth);
+
+                auto result = getSHAMapNodeID(app, ledgerNode, leafNode);
+                BEAST_EXPECT(result.has_value());
+                auto expectedID = SHAMapNodeID::createID(depth, item->key());
+                BEAST_EXPECT(*result == expectedID);
+            }
+        }
+    }*/
+
+public:
+    void
+    run() override
+    {
+        testValidateLedgerNode();
+        // testGetTreeNode();
+        // testGetSHAMapNodeID();
+    }
+};
+
+BEAST_DEFINE_TESTSUITE(LedgerNodeHelpers, app, xrpl);
+
+}  // namespace tests
+}  // namespace xrpl

src/test/app/TxQ_test.cpp

@@ -1010,7 +1010,7 @@ public:
         // Charlie - queue a transaction, with a higher fee
         // than default
         env(noop(charlie), fee(15), queued);
-        checkMetrics(*this, env, 6, initQueueMax, 4, 3, 257);
+        checkMetrics(*this, env, 6, initQueueMax, 4, 3, 256);
 
         BEAST_EXPECT(env.seq(alice) == aliceSeq);
         BEAST_EXPECT(env.seq(bob) == bobSeq);

src/test/shamap/SHAMapSync_test.cpp

@@ -103,13 +103,14 @@ public:
         destination.setSynching();
 
         {
-            std::vector<std::pair<SHAMapNodeID, Blob>> a;
+            std::vector<std::tuple<SHAMapNodeID, Blob, bool>> a;
 
             BEAST_EXPECT(source.getNodeFat(SHAMapNodeID(), a, rand_bool(eng_), rand_int(eng_, 2)));
 
             unexpected(a.size() < 1, "NodeSize");
 
-            BEAST_EXPECT(destination.addRootNode(source.getHash(), makeSlice(a[0].second), nullptr).isGood());
+            auto node = SHAMapTreeNode::makeFromWire(makeSlice(std::get<1>(a[0])));
+            BEAST_EXPECT(destination.addRootNode(source.getHash(), std::move(node), nullptr).isGood());
         }
 
         do
@@ -123,7 +124,7 @@ public:
                 break;
 
             // get as many nodes as possible based on this information
-            std::vector<std::pair<SHAMapNodeID, Blob>> b;
+            std::vector<std::tuple<SHAMapNodeID, Blob, bool>> b;
 
             for (auto& it : nodesMissing)
             {
@@ -145,7 +146,8 @@ public:
                 // Don't use BEAST_EXPECT here b/c it will be called a
                 // non-deterministic number of times and the number of tests run
                 // should be deterministic
-                if (!destination.addKnownNode(b[i].first, makeSlice(b[i].second), nullptr).isUseful())
+                auto node = SHAMapTreeNode::makeFromWire(makeSlice(std::get<1>(b[i])));
+                if (!destination.addKnownNode(std::get<0>(b[i]), std::move(node), nullptr).isUseful())
                     fail("", __FILE__, __LINE__);
             }
         } while (true);

src/xrpld/app/ledger/InboundLedger.h

@@ -137,10 +137,10 @@ private:
     receiveNode(protocol::TMLedgerData& packet, SHAMapAddNode&);
 
     bool
-    takeTxRootNode(Slice const& data, SHAMapAddNode&);
+    takeTxRootNode(std::string const& data, SHAMapAddNode&);
 
     bool
-    takeAsRootNode(Slice const& data, SHAMapAddNode&);
+    takeAsRootNode(std::string const& data, SHAMapAddNode&);
 
     std::vector<uint256>
     neededTxHashes(int max, SHAMapSyncFilter* filter) const;

src/xrpld/app/ledger/detail/InboundLedger.cpp

@@ -3,6 +3,7 @@
 #include <xrpld/app/ledger/InboundLedgers.h>
 #include <xrpld/app/ledger/LedgerMaster.h>
 #include <xrpld/app/ledger/TransactionStateSF.h>
+#include <xrpld/app/ledger/detail/LedgerNodeHelpers.h>
 #include <xrpld/app/main/Application.h>
 #include <xrpld/overlay/Overlay.h>
 
@@ -815,38 +816,43 @@ InboundLedger::receiveNode(protocol::TMLedgerData& packet, SHAMapAddNode& san)
             std::make_unique<AccountStateSF>(mLedger->stateMap().family().db(), app_.getLedgerMaster())};
     }();
 
-    try
-    {
-        auto const f = filter.get();
+    auto const f = filter.get();
 
-        for (auto const& node : packet.nodes())
+    for (auto const& ledger_node : packet.nodes())
+    {
+        if (!validateLedgerNode(app_, ledger_node))
         {
-            auto const nodeID = deserializeSHAMapNodeID(node.nodeid());
-
-            if (!nodeID)
-                throw std::runtime_error("data does not properly deserialize");
-
-            if (nodeID->isRoot())
-            {
-                san += map.addRootNode(rootHash, makeSlice(node.nodedata()), f);
-            }
-            else
-            {
-                san += map.addKnownNode(*nodeID, makeSlice(node.nodedata()), f);
-            }
-
-            if (!san.isGood())
-            {
-                JLOG(journal_.warn()) << "Received bad node data";
-                return;
-            }
+            JLOG(journal_.warn()) << "Got malformed ledger node";
+            san.incInvalid();
+            return;
+        }
+
+        auto treeNode = getTreeNode(ledger_node.nodedata());
+        if (!treeNode)
+        {
+            JLOG(journal_.warn()) << "Got invalid node data";
+            san.incInvalid();
+            return;
+        }
+
+        auto const nodeID = getSHAMapNodeID(app_, ledger_node, *treeNode);
+        if (!nodeID)
+        {
+            JLOG(journal_.warn()) << "Got invalid node id";
+            san.incInvalid();
+            return;
+        }
+
+        if (nodeID->isRoot())
+            san += map.addRootNode(rootHash, std::move(*treeNode), f);
+        else
+            san += map.addKnownNode(*nodeID, std::move(*treeNode), f);
+
+        if (!san.isGood())
+        {
+            JLOG(journal_.warn()) << "Received bad node data";
+            return;
         }
-    }
-    catch (std::exception const& e)
-    {
-        JLOG(journal_.error()) << "Received bad node data: " << e.what();
-        san.incInvalid();
-        return;
     }
 
     if (!map.isSynching())
@@ -868,7 +874,7 @@ InboundLedger::receiveNode(protocol::TMLedgerData& packet, SHAMapAddNode& san)
     Call with a lock
 */
 bool
-InboundLedger::takeAsRootNode(Slice const& data, SHAMapAddNode& san)
+InboundLedger::takeAsRootNode(std::string const& data, SHAMapAddNode& san)
 {
     if (failed_ || mHaveState)
     {
@@ -884,8 +890,16 @@ InboundLedger::takeAsRootNode(Slice const& data, SHAMapAddNode& san)
         // LCOV_EXCL_STOP
     }
 
+    auto treeNode = getTreeNode(data);
+    if (!treeNode)
+    {
+        JLOG(journal_.warn()) << "Got invalid node data";
+        san.incInvalid();
+        return false;
+    }
+
     AccountStateSF filter(mLedger->stateMap().family().db(), app_.getLedgerMaster());
-    san += mLedger->stateMap().addRootNode(SHAMapHash{mLedger->header().accountHash}, data, &filter);
+    san += mLedger->stateMap().addRootNode(SHAMapHash{mLedger->header().accountHash}, *treeNode, &filter);
     return san.isGood();
 }
 
@@ -893,7 +907,7 @@ InboundLedger::takeAsRootNode(Slice const& data, SHAMapAddNode& san)
     Call with a lock
 */
 bool
-InboundLedger::takeTxRootNode(Slice const& data, SHAMapAddNode& san)
+InboundLedger::takeTxRootNode(std::string const& data, SHAMapAddNode& san)
 {
     if (failed_ || mHaveTransactions)
     {
@@ -909,8 +923,16 @@ InboundLedger::takeTxRootNode(Slice const& data, SHAMapAddNode& san)
         // LCOV_EXCL_STOP
     }
 
+    auto treeNode = getTreeNode(data);
+    if (!treeNode)
+    {
+        JLOG(journal_.warn()) << "Got invalid node data";
+        san.incInvalid();
+        return false;
+    }
+
     TransactionStateSF filter(mLedger->txMap().family().db(), app_.getLedgerMaster());
-    san += mLedger->txMap().addRootNode(SHAMapHash{mLedger->header().txHash}, data, &filter);
+    san += mLedger->txMap().addRootNode(SHAMapHash{mLedger->header().txHash}, *treeNode, &filter);
     return san.isGood();
 }
 
@@ -1004,14 +1026,12 @@ InboundLedger::processData(std::shared_ptr<Peer> peer, protocol::TMLedgerData& p
                 san.incUseful();
             }
 
-            if (!mHaveState && (packet.nodes().size() > 1) &&
-                !takeAsRootNode(makeSlice(packet.nodes(1).nodedata()), san))
+            if (!mHaveState && (packet.nodes().size() > 1) && !takeAsRootNode(packet.nodes(1).nodedata(), san))
             {
                 JLOG(journal_.warn()) << "Included AS root invalid";
             }
 
-            if (!mHaveTransactions && (packet.nodes().size() > 2) &&
-                !takeTxRootNode(makeSlice(packet.nodes(2).nodedata()), san))
+            if (!mHaveTransactions && (packet.nodes().size() > 2) && !takeTxRootNode(packet.nodes(2).nodedata(), san))
             {
                 JLOG(journal_.warn()) << "Included TX root invalid";
             }
@@ -1044,13 +1064,13 @@ InboundLedger::processData(std::shared_ptr<Peer> peer, protocol::TMLedgerData& p
 
         ScopedLockType sl(mtx_);
 
-        // Verify node IDs and data are complete
-        for (auto const& node : packet.nodes())
+        // Verify nodes are complete
+        for (auto const& ledger_node : packet.nodes())
         {
-            if (!node.has_nodeid() || !node.has_nodedata())
+            if (!validateLedgerNode(app_, ledger_node))
             {
-                JLOG(journal_.warn()) << "Got bad node";
-                peer->charge(Resource::feeMalformedRequest, "ledger_data bad node");
+                JLOG(journal_.warn()) << "Got malformed ledger node";
+                peer->charge(Resource::feeMalformedRequest, "ledger_node");
                 return -1;
             }
         }

src/xrpld/app/ledger/detail/InboundLedgers.cpp

@@ -1,5 +1,6 @@
 #include <xrpld/app/ledger/InboundLedgers.h>
 #include <xrpld/app/ledger/LedgerMaster.h>
+#include <xrpld/app/ledger/detail/LedgerNodeHelpers.h>
 #include <xrpld/app/main/Application.h>
 
 #include <xrpl/basics/DecayingSample.h>
@@ -213,29 +214,20 @@ public:
     gotStaleData(std::shared_ptr<protocol::TMLedgerData> packet_ptr) override
     {
         Serializer s;
-        try
+        for (auto const& ledger_node : packet_ptr->nodes())
         {
-            for (int i = 0; i < packet_ptr->nodes().size(); ++i)
-            {
-                auto const& node = packet_ptr->nodes(i);
+            if (!validateLedgerNode(app_, ledger_node))
+                return;
 
-                if (!node.has_nodeid() || !node.has_nodedata())
-                    return;
+            auto const treeNode = getTreeNode(ledger_node.nodedata());
+            if (!treeNode)
+                return;
+            auto const tn = *treeNode;
 
-                auto newNode = SHAMapTreeNode::makeFromWire(makeSlice(node.nodedata()));
+            s.erase();
+            tn->serializeWithPrefix(s);
 
-                if (!newNode)
-                    return;
-
-                s.erase();
-                newNode->serializeWithPrefix(s);
-
-                app_.getLedgerMaster().addFetchPack(
-                    newNode->getHash().as_uint256(), std::make_shared<Blob>(s.begin(), s.end()));
-            }
-        }
-        catch (std::exception const&)
-        {
+            app_.getLedgerMaster().addFetchPack(tn->getHash().as_uint256(), std::make_shared<Blob>(s.begin(), s.end()));
         }
     }
 

src/xrpld/app/ledger/detail/InboundTransactions.cpp

@@ -1,5 +1,6 @@
 #include <xrpld/app/ledger/InboundLedgers.h>
 #include <xrpld/app/ledger/InboundTransactions.h>
+#include <xrpld/app/ledger/detail/LedgerNodeHelpers.h>
 #include <xrpld/app/ledger/detail/TransactionAcquire.h>
 #include <xrpld/app/main/Application.h>
 
@@ -127,26 +128,35 @@ public:
             return;
         }
 
-        std::vector<std::pair<SHAMapNodeID, Slice>> data;
+        std::vector<std::pair<SHAMapNodeID, intr_ptr::SharedPtr<SHAMapTreeNode>>> data;
         data.reserve(packet.nodes().size());
 
-        for (auto const& node : packet.nodes())
+        for (auto const& ledger_node : packet.nodes())
         {
-            if (!node.has_nodeid() || !node.has_nodedata())
+            if (!validateLedgerNode(app_, ledger_node))
             {
-                peer->charge(Resource::feeMalformedRequest, "ledger_data");
+                JLOG(j_.warn()) << "Got malformed ledger node";
+                peer->charge(Resource::feeMalformedRequest, "ledger_node");
                 return;
             }
 
-            auto const id = deserializeSHAMapNodeID(node.nodeid());
-
-            if (!id)
+            auto const treeNode = getTreeNode(ledger_node.nodedata());
+            if (!treeNode)
             {
-                peer->charge(Resource::feeInvalidData, "ledger_data");
+                JLOG(j_.warn()) << "Got invalid node data";
+                peer->charge(Resource::feeInvalidData, "node_data");
                 return;
             }
 
-            data.emplace_back(std::make_pair(*id, makeSlice(node.nodedata())));
+            auto const nodeID = getSHAMapNodeID(app_, ledger_node, *treeNode);
+            if (!nodeID)
+            {
+                JLOG(j_.warn()) << "Got invalid node id";
+                peer->charge(Resource::feeInvalidData, "node_id");
+                return;
+            }
+
+            data.emplace_back(std::make_pair(*nodeID, *treeNode));
         }
 
         if (!ta->takeNodes(data, peer).isUseful())

src/xrpld/app/ledger/detail/LedgerNodeHelpers.cpp

@@ -0,0 +1,163 @@
+#include <xrpld/app/ledger/detail/LedgerNodeHelpers.h>
+#include <xrpld/app/main/Application.h>
+
+#include <xrpl/basics/IntrusivePointer.h>
+#include <xrpl/beast/utility/instrumentation.h>
+#include <xrpl/ledger/AmendmentTable.h>
+#include <xrpl/shamap/SHAMapLeafNode.h>
+#include <xrpl/shamap/SHAMapNodeID.h>
+#include <xrpl/shamap/SHAMapTreeNode.h>
+
+namespace xrpl {
+
+/**
+ * @brief Validates a ledger node based on the fixLedgerNodeID amendment status.
+ *
+ * This function checks whether a ledger node has the expected fields based on
+ * whether the fixLedgerNodeID amendment is enabled. The validation rules differ
+ * depending on the amendment state:
+ *
+ * When the amendment is enabled:
+ * - The node must have `nodedata`.
+ * - The legacy `nodeid` field must NOT be present.
+ * - For inner nodes: the `id` field must be present.
+ * - For leaf nodes: the `depth` field must be present and <= SHAMap::leafDepth.
+ *
+ * When the amendment is disabled:
+ * - The node must have `nodedata`.
+ * - The `nodeid` field must be present.
+ * - The new `id` and `depth` fields must NOT be present.
+ *
+ * @param app The application instance used to check amendment status.
+ * @param ledger_node The ledger node to validate.
+ * @return true if the ledger node has the expected fields, false otherwise.
+ */
+bool
+validateLedgerNode(Application& app, protocol::TMLedgerNode const& ledger_node)
+{
+    if (!ledger_node.has_nodedata())
+        return false;
+
+    if (app.getAmendmentTable().isEnabled(fixLedgerNodeID))
+    {
+        // Note that we cannot confirm here whether the node is actually an
+        // inner or leaf node, and will need to perform additional checks
+        // separately.
+        if (ledger_node.has_nodeid())
+            return false;
+        if (ledger_node.has_id())
+            return true;
+        return ledger_node.has_depth() && ledger_node.depth() <= SHAMap::leafDepth;
+    }
+
+    if (ledger_node.has_id() || ledger_node.has_depth())
+        return false;
+    return ledger_node.has_nodeid();
+}
+
+/**
+ * @brief Deserializes a SHAMapTreeNode from wire format data.
+ *
+ * This function attempts to create a SHAMapTreeNode from the provided data
+ * string. If the data is malformed or deserialization fails, the function
+ * returns std::nullopt instead of throwing an exception.
+ *
+ * @param data The serialized node data in wire format.
+ * @return An optional containing the deserialized tree node if successful, or
+ *         std::nullopt if deserialization fails.
+ */
+std::optional<intr_ptr::SharedPtr<SHAMapTreeNode>>
+getTreeNode(std::string const& data)
+{
+    auto const slice = makeSlice(data);
+    try
+    {
+        return SHAMapTreeNode::makeFromWire(slice);
+    }
+    catch (std::exception const&)
+    {
+        return std::nullopt;
+    }
+}
+
+/**
+ * @brief Extracts or reconstructs the SHAMapNodeID from a ledger node.
+ *
+ * This function retrieves the SHAMapNodeID for a tree node, with behavior that
+ * depends on the fixLedgerNodeID amendment status and the node type (inner vs.
+ * leaf).
+ *
+ * When the fixLedgerNodeID amendment is enabled:
+ * - For inner nodes: Deserializes the node ID from the `ledger_node.id` field.
+ *   Note that root nodes are also inner nodes.
+ * - For leaf nodes: Reconstructs the node ID using both the depth from the
+ *   `ledger_node.depth` field and the key from the leaf node's item.
+ *
+ * When the amendment is disabled:
+ * - For all nodes: Deserializes the node ID from the `ledger_node.nodeid`
+ *   field.
+ * - For leaf nodes: Validates that the node ID is consistent with the leaf's
+ *   key.
+ *
+ * @param app The application instance used to check amendment status.
+ * @param ledger_node The protocol message containing the ledger node data.
+ * @param treeNode The deserialized tree node (inner or leaf node).
+ * @return An optional containing the node ID if extraction/reconstruction
+ *         succeeds, or std::nullopt if the required fields are missing or
+ *         validation fails.
+ */
+std::optional<SHAMapNodeID>
+getSHAMapNodeID(
+    Application& app,
+    protocol::TMLedgerNode const& ledger_node,
+    intr_ptr::SharedPtr<SHAMapTreeNode> const& treeNode)
+{
+    // When the amendment is enabled and a node depth is present, we can calculate the node ID.
+    if (app.getAmendmentTable().isEnabled(fixLedgerNodeID))
+    {
+        if (treeNode->isInner())
+        {
+            XRPL_ASSERT(ledger_node.has_id(), "xrpl::getSHAMapNodeID : node ID is present");
+            if (!ledger_node.has_id())
+                return std::nullopt;
+
+            return deserializeSHAMapNodeID(ledger_node.id());
+        }
+
+        if (treeNode->isLeaf())
+        {
+            XRPL_ASSERT(ledger_node.has_depth(), "xrpl::getSHAMapNodeID : node depth is present");
+            if (!ledger_node.has_depth())
+                return std::nullopt;
+
+            auto const key = static_cast<SHAMapLeafNode const*>(treeNode.get())->peekItem()->key();
+            return SHAMapNodeID::createID(ledger_node.depth(), key);
+        }
+
+        UNREACHABLE("xrpl::getSHAMapNodeID : tree node is neither inner nor leaf");
+        return std::nullopt;
+    }
+
+    // When the amendment is disabled, we expect the node ID to always be present. For leaf nodes
+    // we perform an extra check to ensure the node's position in the tree is consistent with its
+    // content.
+    XRPL_ASSERT(ledger_node.has_nodeid(), "xrpl::getSHAMapNodeID : node ID is present");
+    if (!ledger_node.has_nodeid())
+        return std::nullopt;
+
+    auto const nodeID = deserializeSHAMapNodeID(ledger_node.nodeid());
+    if (!nodeID)
+        return std::nullopt;
+
+    if (treeNode->isLeaf())
+    {
+        auto const key = static_cast<SHAMapLeafNode const*>(treeNode.get())->peekItem()->key();
+        auto const expected_id = SHAMapNodeID::createID(static_cast<int>(nodeID->getDepth()), key);
+        if (nodeID->getNodeID() != expected_id.getNodeID())
+            return std::nullopt;
+    }
+
+    return nodeID;
+}
+
+}  // namespace xrpl

src/xrpld/app/ledger/detail/LedgerNodeHelpers.h

@@ -0,0 +1,83 @@
+#pragma once
+
+#include <xrpld/app/main/Application.h>
+
+#include <xrpl/basics/IntrusivePointer.h>
+#include <xrpl/shamap/SHAMapLeafNode.h>
+#include <xrpl/shamap/SHAMapNodeID.h>
+#include <xrpl/shamap/SHAMapTreeNode.h>
+
+namespace xrpl {
+
+/**
+ * @brief Validates a ledger node based on the fixLedgerNodeID amendment status.
+ *
+ * This function checks whether a ledger node has the expected fields based on
+ * whether the fixLedgerNodeID amendment is enabled. The validation rules differ
+ * depending on the amendment state:
+ *
+ * When the amendment is enabled:
+ * - The node must have `nodedata`.
+ * - The legacy `nodeid` field must NOT be present.
+ * - For inner nodes: the `id` field must be present.
+ * - For leaf nodes: the `depth` field must be present and <= SHAMap::leafDepth.
+ *
+ * When the amendment is disabled:
+ * - The node must have `nodedata`.
+ * - The `nodeid` field must be present.
+ * - The new `id` and `depth` fields must NOT be present.
+ *
+ * @param app The application instance used to check amendment status.
+ * @param ledger_node The ledger node to validate.
+ * @return true if the ledger node has the expected fields, false otherwise.
+ */
+bool
+validateLedgerNode(Application& app, protocol::TMLedgerNode const& ledger_node);
+
+/**
+ * @brief Deserializes a SHAMapTreeNode from wire format data.
+ *
+ * This function attempts to create a SHAMapTreeNode from the provided data
+ * string. If the data is malformed or deserialization fails, the function
+ * returns std::nullopt instead of throwing an exception.
+ *
+ * @param data The serialized node data in wire format.
+ * @return An optional containing the deserialized tree node if successful, or
+ *         std::nullopt if deserialization fails.
+ */
+std::optional<intr_ptr::SharedPtr<SHAMapTreeNode>>
+getTreeNode(std::string const& data);
+
+/**
+ * @brief Extracts or reconstructs the SHAMapNodeID from a ledger node.
+ *
+ * This function retrieves the SHAMapNodeID for a tree node, with behavior that
+ * depends on the fixLedgerNodeID amendment status and the node type (inner vs.
+ * leaf).
+ *
+ * When the fixLedgerNodeID amendment is enabled:
+ * - For inner nodes: Deserializes the node ID from the `ledger_node.id` field.
+ *   Note that root nodes are also inner nodes.
+ * - For leaf nodes: Reconstructs the node ID using both the depth from the
+ *   `ledger_node.depth` field and the key from the leaf node's item.
+ *
+ * When the amendment is disabled:
+ * - For all nodes: Deserializes the node ID from the `ledger_node.nodeid`
+ *   field.
+ * - For leaf nodes: Validates that the node ID is consistent with the leaf's
+ *   key.
+ *
+ * @param app The application instance used to check amendment status.
+ * @param ledger_node The protocol message containing the ledger node data.
+ * @param treeNode The deserialized tree node (inner or leaf node).
+ * @return An optional containing the node ID if extraction/reconstruction
+ *         succeeds, or std::nullopt if the required fields are missing or
+ *         validation fails.
+ */
+std::optional<SHAMapNodeID>
+getSHAMapNodeID(
+    Application& app,
+    protocol::TMLedgerNode const& ledger_node,
+    intr_ptr::SharedPtr<SHAMapTreeNode> const& treeNode);
+
+}  // namespace xrpl

src/xrpld/app/ledger/detail/TransactionAcquire.cpp

@@ -144,7 +144,7 @@ TransactionAcquire::trigger(std::shared_ptr<Peer> const& peer)
 
 SHAMapAddNode
 TransactionAcquire::takeNodes(
-    std::vector<std::pair<SHAMapNodeID, Slice>> const& data,
+    std::vector<std::pair<SHAMapNodeID, intr_ptr::SharedPtr<SHAMapTreeNode>>>& data,
     std::shared_ptr<Peer> const& peer)
 {
     ScopedLockType sl(mtx_);
@@ -168,20 +168,22 @@ TransactionAcquire::takeNodes(
 
         ConsensusTransSetSF sf(app_, app_.getTempNodeCache());
 
-        for (auto const& d : data)
+        for (auto& d : data)
         {
+            if (d.first.isRoot() && mHaveRoot)
+            {
+                JLOG(journal_.debug()) << "Got root TXS node, already have it";
+                continue;
+            }
+
             if (d.first.isRoot())
             {
-                if (mHaveRoot)
-                    JLOG(journal_.debug()) << "Got root TXS node, already have it";
-                else if (!mMap->addRootNode(SHAMapHash{hash_}, d.second, nullptr).isGood())
-                {
+                if (!mMap->addRootNode(SHAMapHash{hash_}, std::move(d.second), nullptr).isGood())
                     JLOG(journal_.warn()) << "TX acquire got bad root node";
-                }
                 else
                     mHaveRoot = true;
             }
-            else if (!mMap->addKnownNode(d.first, d.second, &sf).isGood())
+            else if (!mMap->addKnownNode(d.first, std::move(d.second), &sf).isGood())
             {
                 JLOG(journal_.warn()) << "TX acquire got bad non-root node";
                 return SHAMapAddNode::invalid();

src/xrpld/app/ledger/detail/TransactionAcquire.h

@@ -19,7 +19,9 @@ public:
     ~TransactionAcquire() = default;
 
     SHAMapAddNode
-    takeNodes(std::vector<std::pair<SHAMapNodeID, Slice>> const& data, std::shared_ptr<Peer> const&);
+    takeNodes(
+        std::vector<std::pair<SHAMapNodeID, intr_ptr::SharedPtr<SHAMapTreeNode>>>& data,
+        std::shared_ptr<Peer> const&);
 
     void
     init(int startPeers);

src/xrpld/overlay/detail/PeerImp.cpp

@@ -15,6 +15,7 @@
 #include <xrpl/basics/safe_cast.h>
 #include <xrpl/core/HashRouter.h>
 #include <xrpl/core/PerfLog.h>
+#include <xrpl/ledger/AmendmentTable.h>
 #include <xrpl/protocol/TxFlags.h>
 #include <xrpl/protocol/digest.h>
 #include <xrpl/server/LoadFeeTrack.h>
@@ -3131,7 +3132,7 @@ PeerImp::processLedgerRequest(std::shared_ptr<protocol::TMGetLedger> const& m)
     {
         auto const queryDepth{m->has_querydepth() ? m->querydepth() : (isHighLatency() ? 2 : 1)};
 
-        std::vector<std::pair<SHAMapNodeID, Blob>> data;
+        std::vector<std::tuple<SHAMapNodeID, Blob, bool>> data;
 
         for (int i = 0; i < m->nodeids_size() && ledgerData.nodes_size() < Tuning::softMaxReplyNodes; ++i)
         {
@@ -3150,9 +3151,21 @@ PeerImp::processLedgerRequest(std::shared_ptr<protocol::TMGetLedger> const& m)
                     {
                         if (ledgerData.nodes_size() >= Tuning::hardMaxReplyNodes)
                             break;
+
                         protocol::TMLedgerNode* node{ledgerData.add_nodes()};
-                        node->set_nodeid(d.first.getRawString());
-                        node->set_nodedata(d.second.data(), d.second.size());
+
+                        auto const& node_data = std::get<1>(d);
+                        node->set_nodedata(node_data.data(), node_data.size());
+
+                        // When the amendment is disabled, we always set the node ID. However, when the amendment is
+                        // enabled, we only set it for inner nodes, while for leaf nodes we set the node depth instead.
+                        auto const& nodeID = std::get<0>(d);
+                        if (!app_.getAmendmentTable().isEnabled(fixLedgerNodeID))
+                            node->set_nodeid(nodeID.getRawString());
+                        else if (std::get<2>(d))
+                            node->set_depth(nodeID.getDepth());
+                        else
+                            node->set_id(nodeID.getRawString());
                     }
                 }
                 else