From db6d686df6c60b12880f4f04f3c781c8db0dd4ca Mon Sep 17 00:00:00 2001
From: JCW <a1q123456@users.noreply.github.com>
Date: Mon, 17 Nov 2025 15:06:28 +0000
Subject: [PATCH] Clean up the code

Signed-off-by: JCW <a1q123456@users.noreply.github.com>
---
 include/xrpl/protocol/PublicKey.h  |  9 ++-------
 src/libxrpl/protocol/PublicKey.cpp | 15 ++++-----------
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/include/xrpl/protocol/PublicKey.h b/include/xrpl/protocol/PublicKey.h
index 445e0e3b97..ed63cf23e9 100644
--- a/include/xrpl/protocol/PublicKey.h
+++ b/include/xrpl/protocol/PublicKey.h
@@ -223,19 +223,14 @@ publicKeyType(PublicKey const& publicKey)
 verifyDigest(
     PublicKey const& publicKey,
     uint256 const& digest,
-    Slice const& sig,
-    bool mustBeFullyCanonical = true) noexcept;
+    Slice const& sig) noexcept;
 
 /** Verify a signature on a message.
     With secp256k1 signatures, the data is first hashed with
     SHA512-Half, and the resulting digest is signed.
 */
 [[nodiscard]] bool
-verify(
-    PublicKey const& publicKey,
-    Slice const& m,
-    Slice const& sig,
-    bool mustBeFullyCanonical = true) noexcept;
+verify(PublicKey const& publicKey, Slice const& m, Slice const& sig) noexcept;
 
 /** Calculate the 160-bit node ID from a node public key. */
 NodeID
diff --git a/src/libxrpl/protocol/PublicKey.cpp b/src/libxrpl/protocol/PublicKey.cpp
index 0a29af7d32..bd4084655d 100644
--- a/src/libxrpl/protocol/PublicKey.cpp
+++ b/src/libxrpl/protocol/PublicKey.cpp
@@ -220,16 +220,14 @@ bool
 verifyDigest(
     PublicKey const& publicKey,
     uint256 const& digest,
-    Slice const& sig,
-    bool mustBeFullyCanonical) noexcept
+    Slice const& sig) noexcept
 {
     if (publicKeyType(publicKey) != KeyType::secp256k1)
         LogicError("sign: secp256k1 required for digest signing");
     auto const canonicality = ecdsaCanonicality(sig);
     if (!canonicality)
         return false;
-    if (mustBeFullyCanonical &&
-        (*canonicality != ECDSACanonicality::fullyCanonical))
+    if (*canonicality != ECDSACanonicality::fullyCanonical)
         return false;
 
     secp256k1_pubkey pubkey_imp;
@@ -267,18 +265,13 @@ verifyDigest(
 }
 
 bool
-verify(
-    PublicKey const& publicKey,
-    Slice const& m,
-    Slice const& sig,
-    bool mustBeFullyCanonical) noexcept
+verify(PublicKey const& publicKey, Slice const& m, Slice const& sig) noexcept
 {
     if (auto const type = publicKeyType(publicKey))
     {
         if (*type == KeyType::secp256k1)
         {
-            return verifyDigest(
-                publicKey, sha512Half(m), sig, mustBeFullyCanonical);
+            return verifyDigest(publicKey, sha512Half(m), sig);
         }
         else if (*type == KeyType::ed25519)
         {