From f3afbba77d02c5a0b672642430210c2d78aa7dcb Mon Sep 17 00:00:00 2001
From: Pratik Mankawde <3397372+pratikmankawde@users.noreply.github.com>
Date: Tue, 2 Jun 2026 15:22:00 +0100
Subject: [PATCH] handle createGuards change and addressed minor pr comment

Signed-off-by: Pratik Mankawde <3397372+pratikmankawde@users.noreply.github.com>
---
 include/xrpl/protocol/Rules.h     |  1 -
 src/libxrpl/protocol/Rules.cpp    |  2 --
 src/libxrpl/protocol/STAmount.cpp | 36 +++++++++++++++----------------
 src/libxrpl/tx/applySteps.cpp     |  2 +-
 4 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/include/xrpl/protocol/Rules.h b/include/xrpl/protocol/Rules.h
index 9c17ff2391..8313b6f096 100644
--- a/include/xrpl/protocol/Rules.h
+++ b/include/xrpl/protocol/Rules.h
@@ -131,7 +131,6 @@ useRulesGuards(Rules const& rules);
 void
 createGuards(
     Rules const& rules,
-    std::optional<NumberSO>& stNumberSO,
     std::optional<CurrentTransactionRulesGuard>& rulesGuard,
     std::optional<NumberMantissaScaleGuard>& mantissaScaleGuard);
 
diff --git a/src/libxrpl/protocol/Rules.cpp b/src/libxrpl/protocol/Rules.cpp
index 08a95145eb..5884c69697 100644
--- a/src/libxrpl/protocol/Rules.cpp
+++ b/src/libxrpl/protocol/Rules.cpp
@@ -83,7 +83,6 @@ useRulesGuards(Rules const& rules)
 void
 createGuards(
     Rules const& rules,
-    std::optional<NumberSO>& stNumberSO,
     std::optional<CurrentTransactionRulesGuard>& rulesGuard,
     std::optional<NumberMantissaScaleGuard>& mantissaScaleGuard)
 {
@@ -91,7 +90,6 @@ createGuards(
     {
         // raii classes for the current ledger rules.
         // fixUniversalNumber predates the rulesGuard and should be replaced.
-        stNumberSO.emplace(rules.enabled(fixUniversalNumber));
         rulesGuard.emplace(rules);
     }
     else
diff --git a/src/libxrpl/protocol/STAmount.cpp b/src/libxrpl/protocol/STAmount.cpp
index 1a721fedaa..449c4232ef 100644
--- a/src/libxrpl/protocol/STAmount.cpp
+++ b/src/libxrpl/protocol/STAmount.cpp
@@ -839,27 +839,25 @@ STAmount::canonicalize()
         if (asset_.holds<MPTIssue>() && offset_ > 18)
             Throw<std::runtime_error>("MPT amount out of range");
 
+        Number const num(isNegative_, value_, offset_, Number::Unchecked{});
+        auto set = [&](auto const& val) {
+            auto const value = val.value();
+            isNegative_ = value < 0;
+            value_ = isNegative_ ? -value : value;
+        };
+        if (native())
         {
-            Number const num(isNegative_, value_, offset_, Number::Unchecked{});
-            auto set = [&](auto const& val) {
-                auto const value = val.value();
-                isNegative_ = value < 0;
-                value_ = isNegative_ ? -value : value;
-            };
-            if (native())
-            {
-                set(XRPAmount{num});
-            }
-            else if (asset_.holds<MPTIssue>())
-            {
-                set(MPTAmount{num});
-            }
-            else
-            {
-                Throw<std::runtime_error>("Unknown integral asset type");
-            }
-            offset_ = 0;
+            set(XRPAmount{num});
         }
+        else if (asset_.holds<MPTIssue>())
+        {
+            set(MPTAmount{num});
+        }
+        else
+        {
+            Throw<std::runtime_error>("Unknown integral asset type");
+        }
+        offset_ = 0;
 
         if (native() && value_ > kMaxNativeN)
         {
diff --git a/src/libxrpl/tx/applySteps.cpp b/src/libxrpl/tx/applySteps.cpp
index 36a1b68e55..336bb2004b 100644
--- a/src/libxrpl/tx/applySteps.cpp
+++ b/src/libxrpl/tx/applySteps.cpp
@@ -71,7 +71,7 @@ withTxnType(Rules const& rules, TxType txnType, F&& f)
     //
     std::optional<CurrentTransactionRulesGuard> rulesGuard;
     std::optional<NumberMantissaScaleGuard> mantissaScaleGuard;
-    createGuards(rules, std::nullopt, rulesGuard, mantissaScaleGuard);
+    createGuards(rules, rulesGuard, mantissaScaleGuard);
 
     switch (txnType)
     {