refactor based on ED's comment

PeterChen13579 · Jul 27, 2023 · cdbcd37 · cdbcd37
1 parent e5fabb8
commit cdbcd37
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/src/ripple/app/tx/impl/DeleteAccount.cpp b/src/ripple/app/tx/impl/DeleteAccount.cpp
@@ -28,6 +28,7 @@
 #include <ripple/protocol/Feature.h>
 #include <ripple/protocol/Indexes.h>
 #include <ripple/protocol/Protocol.h>
+#include <ripple/protocol/SystemParameters.h>
 #include <ripple/protocol/TxFlags.h>
 #include <ripple/protocol/st.h>
 
@@ -210,8 +211,7 @@ DeleteAccount::preclaim(PreclaimContext const& ctx)
     //
     // We look at the account's Sequence rather than the transaction's
     // Sequence in preparation for Tickets.
-    constexpr std::uint32_t seqDelta{255};
-    if ((*sleAccount)[sfSequence] + seqDelta > ctx.view.seq())
+    if ((*sleAccount)[sfSequence] + accountDeleteSeqDelta > ctx.view.seq())
         return tecTOO_SOON;
 
     // When fixNFTokenRemint is enabled, we don't allow an account to be
@@ -227,7 +227,8 @@ DeleteAccount::preclaim(PreclaimContext const& ctx)
     // authorized minter minted in a previous ledger.
     if (ctx.view.rules().enabled(fixNFTokenRemint) &&
         ((*sleAccount)[~sfFirstNFTokenSequence].value_or(0) +
-             (*sleAccount)[~sfMintedNFTokens].value_or(0) + seqDelta >
+             (*sleAccount)[~sfMintedNFTokens].value_or(0) +
+             accountDeleteSeqDelta >
          ctx.view.seq()))
         return tecTOO_SOON;
 

diff --git a/src/ripple/protocol/SystemParameters.h b/src/ripple/protocol/SystemParameters.h
@@ -87,6 +87,8 @@ constexpr std::ratio<80, 100> postFixAmendmentMajorityCalcThreshold;
 /** The minimum amount of time an amendment must hold a majority */
 constexpr std::chrono::seconds const defaultAmendmentMajorityTime = weeks{2};
 
+static constexpr std::uint32_t accountDeleteSeqDelta{255u};
+
 }  // namespace ripple
 
 /** Default peer port (IANA registered) */

diff --git a/src/ripple/rpc/handlers/AccountTx.cpp b/src/ripple/rpc/handlers/AccountTx.cpp
@@ -29,6 +29,7 @@
 #include <ripple/ledger/ReadView.h>
 #include <ripple/net/RPCErr.h>
 #include <ripple/protocol/ErrorCodes.h>
+#include <ripple/protocol/SystemParameters.h>
 #include <ripple/protocol/UintTypes.h>
 #include <ripple/protocol/jss.h>
 #include <ripple/resource/Fees.h>
@@ -245,12 +246,17 @@ doAccountTxHelp(RPC::Context& context, AccountTxArgs const& args)
     if (context.apiVersion > 1u)
     {
         bool accountFound = false;
-        for (unsigned int idx = result.ledgerRange.min;
-             idx <= result.ledgerRange.max;
-             ++idx)
+        unsigned int const rangeEnd =
+            result.ledgerRange.max + AccountDeleteSeqDelta;
+        for (unsigned int idx = result.ledgerRange.min; idx < rangeEnd;
+             idx += AccountDeleteSeqDelta)
         {
+            if (idx > result.ledgerRange.max)
+                idx = result.ledgerRange.max;
             std::shared_ptr<ReadView const> ledger;
             auto const status = getLedger(ledger, idx, context);
+            if (status.codeString() == "ledgerNotFound")
+                continue;
             if (ledger->exists(keylet::account(args.account)))
             {
                 accountFound = true;