fix signers

XRPLF · Dec 13, 2024 · 749bac0 · 749bac0
1 parent d06b899
commit 749bac0
Show file tree

Hide file tree

Showing 15 changed files with 341 additions and 320 deletions.
diff --git a/include/xrpl/protocol/Firewall.h b/include/xrpl/protocol/Firewall.h
diff --git a/include/xrpl/protocol/HashPrefix.h b/include/xrpl/protocol/HashPrefix.h
@@ -87,9 +87,6 @@ enum class HashPrefix : std::uint32_t {
 
     /** Credentials signature */
     credential = detail::make_hash_prefix('C', 'R', 'D'),
-
-    /** Firewall signature */
-    firewall = detail::make_hash_prefix('F', 'I', 'R'),
 };
 
 template <class Hasher>

diff --git a/include/xrpl/protocol/detail/sfields.macro b/include/xrpl/protocol/detail/sfields.macro
@@ -379,4 +379,4 @@ UNTYPED_SFIELD(sfPriceDataSeries,        ARRAY,     24)
 UNTYPED_SFIELD(sfAuthAccounts,           ARRAY,     25)
 UNTYPED_SFIELD(sfAuthorizeCredentials,   ARRAY,     26)
 UNTYPED_SFIELD(sfUnauthorizeCredentials, ARRAY,     27)
-UNTYPED_SFIELD(sfFirewallSigners,        ARRAY,     28)
+UNTYPED_SFIELD(sfFirewallSigners,        ARRAY,     28, SField::sMD_Default, SField::notSigning)
diff --git a/include/xrpl/protocol/detail/transactions.macro b/include/xrpl/protocol/detail/transactions.macro
@@ -461,8 +461,7 @@ TRANSACTION(ttFIREWALL_SET, 62, FirewallSet, ({
     {sfAuthorize, soeOPTIONAL},
     {sfAmount, soeOPTIONAL},
     {sfTimePeriod, soeOPTIONAL},
-    {sfPublicKey, soeOPTIONAL},
-    {sfSignature, soeOPTIONAL},
+    {sfFirewallSigners, soeOPTIONAL},
 }))
 
 // /** This transaction type deletes an Firewall instance */

diff --git a/src/libxrpl/protocol/InnerObjectFormats.cpp b/src/libxrpl/protocol/InnerObjectFormats.cpp
@@ -154,6 +154,14 @@ InnerObjectFormats::InnerObjectFormats()
             {sfIssuer, soeREQUIRED},
             {sfCredentialType, soeREQUIRED},
         });
+
+    add(sfFirewallSigner.jsonName.c_str(),
+        sfFirewallSigner.getCode(),
+        {
+            {sfAccount, soeREQUIRED},
+            {sfSigningPubKey, soeREQUIRED},
+            {sfTxnSignature, soeREQUIRED},
+        });
 }
 
 InnerObjectFormats const&

diff --git a/src/libxrpl/protocol/STTx.cpp b/src/libxrpl/protocol/STTx.cpp
@@ -239,9 +239,10 @@ STTx::checkFirewallSign(
         for (auto const& signer : signers)
         {
             Blob const& signingPubKey = signer.getFieldVL(sfSigningPubKey);
-            auto const result = signingPubKey.empty()
-                ? checkMultiSign(signer, requireCanonicalSig, rules)
-                : checkSingleSign(signer, requireCanonicalSig);
+            auto const result = checkSingleSign(signer, requireCanonicalSig);
+            // auto const result = signingPubKey.empty()
+            //     ? checkMultiSign(signer, requireCanonicalSig, rules)
+            //     : checkSingleSign(signer, requireCanonicalSig);
 
             if (!result)
                 return result;