remove temp vector

.github/workflows/libxrpl.yml

@@ -1,6 +1,6 @@
 name: Check libXRPL compatibility with Clio
 env:
-  CONAN_URL: http://18.143.149.228:8081/artifactory/api/conan/dev
+  CONAN_URL: http://18.143.149.228:8081/artifactory/api/conan/conan-non-prod
   CONAN_LOGIN_USERNAME_RIPPLE: ${{ secrets.CONAN_USERNAME }}
   CONAN_PASSWORD_RIPPLE: ${{ secrets.CONAN_TOKEN }}
 on:

src/libxrpl/protocol/BuildInfo.cpp

@@ -36,7 +36,7 @@ namespace BuildInfo {
 //  and follow the format described at http://semver.org/
 //------------------------------------------------------------------------------
 // clang-format off
-char const* const versionString = "2.5.0"
+char const* const versionString = "2.5.0-rc2"
 // clang-format on
 
 #if defined(DEBUG) || defined(SANITIZER)

src/libxrpl/protocol/STTx.cpp

@@ -760,12 +760,6 @@ isRawTransactionOkay(STObject const& st, std::string& reason)
         {
             TxType const tt =
                 safe_cast<TxType>(raw.getFieldU16(sfTransactionType));
-            if (tt == ttBATCH)
-            {
-                reason = "Raw Transactions may not contain batch transactions.";
-                return false;
-            }
-
             raw.applyTemplate(getTxFormat(tt)->getSOTemplate());
         }
         catch (std::exception const& e)

src/test/app/AccountDelete_test.cpp

@@ -18,10 +18,8 @@
 //==============================================================================
 
 #include <test/jtx.h>
-#include <test/jtx/permissioned_domains.h>
 
 #include <xrpl/protocol/Feature.h>
-#include <xrpl/protocol/TER.h>
 #include <xrpl/protocol/jss.h>
 
 namespace ripple {
@@ -1253,48 +1251,21 @@ public:
         }
     }
 
-    void
-    testDeletePermissionedDomainOwner()
-    {
-        using namespace jtx;
-
-        Env env{*this};
-        Account alice{"alice"};
-        Account becky{"becky"};
-        env.fund(XRP(1000), alice, becky);
-        env.close();
-        env(fset(becky, asfDepositAuth));
-        env.close();
-
-        pdomain::Credentials const credentials1{
-            {.issuer = alice, .credType = "foobaz"}};
-
-        env(pdomain::setTx(alice, credentials1));
-        // Close 256 ledgers
-        for (int i = 0; i < 256; ++i)
-            env.close();
-
-        auto const acctDelFee{drops(env.current()->fees().increment)};
-        env(acctdelete(alice, becky), fee(acctDelFee), ter{tecNO_PERMISSION});
-        env.close();
-    }
-
     void
     run() override
     {
-        // testBasics();
+        testBasics();
-        // testDirectories();
+        testDirectories();
-        // testOwnedTypes();
+        testOwnedTypes();
-        // testResurrection();
+        testResurrection();
-        // testAmendmentEnable();
+        testAmendmentEnable();
-        // testTooManyOffers();
+        testTooManyOffers();
-        // testImplicitlyCreatedTrustline();
+        testImplicitlyCreatedTrustline();
-        // testBalanceTooSmallForFee();
+        testBalanceTooSmallForFee();
-        // testWithTickets();
+        testWithTickets();
-        // testDest();
+        testDest();
-        // testDestinationDepositAuthCredentials();
+        testDestinationDepositAuthCredentials();
-        // testDeleteCredentialsOwner();
+        testDeleteCredentialsOwner();
-        testDeletePermissionedDomainOwner();
     }
 };
 

src/test/app/Batch_test.cpp

@@ -24,7 +24,6 @@
 #include <xrpld/app/misc/HashRouter.h>
 #include <xrpld/app/misc/Transaction.h>
 #include <xrpld/app/tx/apply.h>
-#include <xrpld/app/tx/detail/Batch.h>
 
 #include <xrpl/protocol/Batch.h>
 #include <xrpl/protocol/Feature.h>
@@ -318,8 +317,7 @@ class Batch_test : public beast::unit_test::suite
             env.close();
         }
 
-        // DEFENSIVE: temINVALID: Batch: batch cannot have inner batch txn.
+        // temINVALID: Batch: batch cannot have inner batch txn.
-        // ACTUAL: telENV_RPC_FAILED: isRawTransactionOkay()
         {
             auto const seq = env.seq(alice);
             auto const batchFee = batch::calcBatchFee(env, 0, 2);
@@ -327,7 +325,7 @@ class Batch_test : public beast::unit_test::suite
                 batch::inner(
                     batch::outer(alice, seq, batchFee, tfAllOrNothing), seq),
                 batch::inner(pay(alice, bob, XRP(1)), seq + 2),
-                ter(telENV_RPC_FAILED));
+                ter(temINVALID));
             env.close();
         }
 
@@ -3955,176 +3953,6 @@ class Batch_test : public beast::unit_test::suite
         }
     }
 
-    void
-    testValidateRPCResponse(FeatureBitset features)
-    {
-        // Verifying that the RPC response from submit includes
-        // the account_sequence_available, account_sequence_next,
-        // open_ledger_cost and validated_ledger_index fields.
-        testcase("Validate RPC response");
-
-        using namespace jtx;
-        Env env(*this);
-        Account const alice("alice");
-        Account const bob("bob");
-        env.fund(XRP(10000), alice, bob);
-        env.close();
-
-        // tes
-        {
-            auto const baseFee = env.current()->fees().base;
-            auto const aliceSeq = env.seq(alice);
-            auto jtx = env.jt(pay(alice, bob, XRP(1)));
-
-            Serializer s;
-            jtx.stx->add(s);
-            auto const jr = env.rpc("submit", strHex(s.slice()))[jss::result];
-            env.close();
-
-            BEAST_EXPECT(jr.isMember(jss::account_sequence_available));
-            BEAST_EXPECT(
-                jr[jss::account_sequence_available].asUInt() == aliceSeq + 1);
-            BEAST_EXPECT(jr.isMember(jss::account_sequence_next));
-            BEAST_EXPECT(
-                jr[jss::account_sequence_next].asUInt() == aliceSeq + 1);
-            BEAST_EXPECT(jr.isMember(jss::open_ledger_cost));
-            BEAST_EXPECT(jr[jss::open_ledger_cost] == to_string(baseFee));
-            BEAST_EXPECT(jr.isMember(jss::validated_ledger_index));
-        }
-
-        // tec failure
-        {
-            auto const baseFee = env.current()->fees().base;
-            auto const aliceSeq = env.seq(alice);
-            env(fset(bob, asfRequireDest));
-            auto jtx = env.jt(pay(alice, bob, XRP(1)), seq(aliceSeq));
-
-            Serializer s;
-            jtx.stx->add(s);
-            auto const jr = env.rpc("submit", strHex(s.slice()))[jss::result];
-            env.close();
-
-            BEAST_EXPECT(jr.isMember(jss::account_sequence_available));
-            BEAST_EXPECT(
-                jr[jss::account_sequence_available].asUInt() == aliceSeq + 1);
-            BEAST_EXPECT(jr.isMember(jss::account_sequence_next));
-            BEAST_EXPECT(
-                jr[jss::account_sequence_next].asUInt() == aliceSeq + 1);
-            BEAST_EXPECT(jr.isMember(jss::open_ledger_cost));
-            BEAST_EXPECT(jr[jss::open_ledger_cost] == to_string(baseFee));
-            BEAST_EXPECT(jr.isMember(jss::validated_ledger_index));
-        }
-
-        // tem failure
-        {
-            auto const baseFee = env.current()->fees().base;
-            auto const aliceSeq = env.seq(alice);
-            auto jtx = env.jt(pay(alice, bob, XRP(1)), seq(aliceSeq + 1));
-
-            Serializer s;
-            jtx.stx->add(s);
-            auto const jr = env.rpc("submit", strHex(s.slice()))[jss::result];
-            env.close();
-
-            BEAST_EXPECT(jr.isMember(jss::account_sequence_available));
-            BEAST_EXPECT(
-                jr[jss::account_sequence_available].asUInt() == aliceSeq);
-            BEAST_EXPECT(jr.isMember(jss::account_sequence_next));
-            BEAST_EXPECT(jr[jss::account_sequence_next].asUInt() == aliceSeq);
-            BEAST_EXPECT(jr.isMember(jss::open_ledger_cost));
-            BEAST_EXPECT(jr[jss::open_ledger_cost] == to_string(baseFee));
-            BEAST_EXPECT(jr.isMember(jss::validated_ledger_index));
-        }
-    }
-
-    void
-    testBatchCalculateBaseFee(FeatureBitset features)
-    {
-        using namespace jtx;
-        Env env(*this);
-        Account const alice("alice");
-        Account const bob("bob");
-        Account const carol("carol");
-        env.fund(XRP(10000), alice, bob, carol);
-        env.close();
-
-        auto getBaseFee = [&](JTx const& jtx) -> XRPAmount {
-            Serializer s;
-            jtx.stx->add(s);
-            return Batch::calculateBaseFee(*env.current(), *jtx.stx);
-        };
-
-        // bad: Inner Batch transaction found
-        {
-            auto const seq = env.seq(alice);
-            XRPAmount const batchFee = batch::calcBatchFee(env, 0, 2);
-            auto jtx = env.jt(
-                batch::outer(alice, seq, batchFee, tfAllOrNothing),
-                batch::inner(
-                    batch::outer(alice, seq, batchFee, tfAllOrNothing), seq),
-                batch::inner(pay(alice, bob, XRP(1)), seq + 2));
-            XRPAmount const txBaseFee = getBaseFee(jtx);
-            BEAST_EXPECT(txBaseFee == XRPAmount(INITIAL_XRP));
-        }
-
-        // bad: Raw Transactions array exceeds max entries.
-        {
-            auto const seq = env.seq(alice);
-            XRPAmount const batchFee = batch::calcBatchFee(env, 0, 2);
-
-            auto jtx = env.jt(
-                batch::outer(alice, seq, batchFee, tfAllOrNothing),
-                batch::inner(pay(alice, bob, XRP(1)), seq + 1),
-                batch::inner(pay(alice, bob, XRP(1)), seq + 2),
-                batch::inner(pay(alice, bob, XRP(1)), seq + 3),
-                batch::inner(pay(alice, bob, XRP(1)), seq + 4),
-                batch::inner(pay(alice, bob, XRP(1)), seq + 5),
-                batch::inner(pay(alice, bob, XRP(1)), seq + 6),
-                batch::inner(pay(alice, bob, XRP(1)), seq + 7),
-                batch::inner(pay(alice, bob, XRP(1)), seq + 8),
-                batch::inner(pay(alice, bob, XRP(1)), seq + 9));
-
-            XRPAmount const txBaseFee = getBaseFee(jtx);
-            BEAST_EXPECT(txBaseFee == XRPAmount(INITIAL_XRP));
-        }
-
-        // bad: Signers array exceeds max entries.
-        {
-            auto const seq = env.seq(alice);
-            XRPAmount const batchFee = batch::calcBatchFee(env, 0, 2);
-
-            auto jtx = env.jt(
-                batch::outer(alice, seq, batchFee, tfAllOrNothing),
-                batch::inner(pay(alice, bob, XRP(10)), seq + 1),
-                batch::inner(pay(alice, bob, XRP(5)), seq + 2),
-                batch::sig(
-                    bob,
-                    carol,
-                    alice,
-                    bob,
-                    carol,
-                    alice,
-                    bob,
-                    carol,
-                    alice,
-                    alice));
-            XRPAmount const txBaseFee = getBaseFee(jtx);
-            BEAST_EXPECT(txBaseFee == XRPAmount(INITIAL_XRP));
-        }
-
-        // good:
-        {
-            auto const seq = env.seq(alice);
-            XRPAmount const batchFee = batch::calcBatchFee(env, 0, 2);
-            auto jtx = env.jt(
-                batch::outer(alice, seq, batchFee, tfAllOrNothing),
-                batch::inner(pay(alice, bob, XRP(1)), seq + 1),
-                batch::inner(pay(bob, alice, XRP(2)), seq + 2));
-            XRPAmount const txBaseFee = getBaseFee(jtx);
-            BEAST_EXPECT(txBaseFee == batchFee);
-        }
-    }
-
     void
     testWithFeats(FeatureBitset features)
     {
@@ -4155,8 +3983,6 @@ class Batch_test : public beast::unit_test::suite
         testBatchTxQueue(features);
         testBatchNetworkOps(features);
         testBatchDelegate(features);
-        testValidateRPCResponse(features);
-        testBatchCalculateBaseFee(features);
     }
 
 public:

src/test/jtx/impl/Env.cpp

@@ -96,7 +96,7 @@ Env::AppBundle::~AppBundle()
     if (app)
     {
         app->getJobQueue().rendezvous();
-        app->signalStop("~AppBundle");
+        app->signalStop();
     }
     if (thread.joinable())
         thread.join();

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

@@ -384,17 +384,10 @@ public:
     {
         auto const start = m_clock.now();
 
-        // Make a list of things to sweep, while holding the lock
-        std::vector<MapType::mapped_type> stuffToSweep;
-        std::size_t total;
-
         {
             ScopedLockType sl(mLock);
             MapType::iterator it(mLedgers.begin());
-            total = mLedgers.size();
+            
-
-            stuffToSweep.reserve(total);
-
             while (it != mLedgers.end())
             {
                 auto const la = it->second->getLastAction();
@@ -404,11 +397,8 @@ public:
                     it->second->touch();
                     ++it;
                 }
-                else if ((la + std::chrono::minutes(1)) < start)
+                else if ((la + std::chrono::seconds(10)) < start)
                 {
-                    stuffToSweep.push_back(it->second);
-                    // shouldn't cause the actual final delete
-                    // since we are holding a reference in the vector.
                     it = mLedgers.erase(it);
                 }
                 else
@@ -419,14 +409,6 @@ public:
 
             beast::expire(mRecentFailures, kReacquireInterval);
         }
-
-        JLOG(j_.debug())
-            << "Swept " << stuffToSweep.size() << " out of " << total
-            << " inbound ledgers. Duration: "
-            << std::chrono::duration_cast<std::chrono::milliseconds>(
-                   m_clock.now() - start)
-                   .count()
-            << "ms";
     }
 
     void

src/xrpld/app/main/Application.cpp

@@ -285,7 +285,7 @@ public:
                   config_->CONFIG_DIR),
               *this,
               logs_->journal("PerfLog"),
-              [this] { signalStop("PerfLog"); }))
+              [this] { signalStop(); }))
 
         , m_txMaster(*this)
 
@@ -505,7 +505,7 @@ public:
     void
     run() override;
     void
-    signalStop(std::string msg) override;
+    signalStop(std::string msg = "") override;
     bool
     checkSigs() const override;
     void
@@ -977,7 +977,7 @@ public:
         if (!config_->standalone() &&
             !getRelationalDatabase().transactionDbHasSpace(*config_))
         {
-            signalStop("Out of transaction DB space");
+            signalStop();
         }
 
         // VFALCO NOTE Does the order of calls matter?
@@ -1193,7 +1193,7 @@ ApplicationImp::setup(boost::program_options::variables_map const& cmdline)
             JLOG(m_journal.info()) << "Received signal " << signum;
 
             if (signum == SIGTERM || signum == SIGINT)
-                signalStop("Signal: " + to_string(signum));
+                signalStop();
         });
 
     auto debug_log = config_->getDebugLogFile();

src/xrpld/app/main/Application.h

@@ -141,7 +141,7 @@ public:
     virtual void
     run() = 0;
     virtual void
-    signalStop(std::string msg) = 0;
+    signalStop(std::string msg = "") = 0;
     virtual bool
     checkSigs() const = 0;
     virtual void

src/xrpld/app/misc/NetworkOPs.cpp

@@ -1701,7 +1701,7 @@ NetworkOPsImp::apply(std::unique_lock<std::mutex>& batchLock)
                 }
             }
 
-            if (validatedLedgerIndex)
+            if (!isTemMalformed(e.result) && validatedLedgerIndex)
             {
                 auto [fee, accountSeq, availableSeq] =
                     app_.getTxQ().getTxRequiredFeeAndSeq(

src/xrpld/app/tx/detail/Batch.cpp

@@ -61,10 +61,7 @@ Batch::calculateBaseFee(ReadView const& view, STTx const& tx)
 
     // LCOV_EXCL_START
     if (baseFee > maxAmount - view.fees().base)
-    {
+        throw std::overflow_error("XRPAmount overflow");
-        JLOG(debugLog().error()) << "BatchTrace: Base fee overflow detected.";
-        return XRPAmount{INITIAL_XRP};
-    }
     // LCOV_EXCL_STOP
 
     XRPAmount const batchBase = view.fees().base + baseFee;
@@ -75,36 +72,32 @@ Batch::calculateBaseFee(ReadView const& view, STTx const& tx)
     {
         auto const& txns = tx.getFieldArray(sfRawTransactions);
 
+        XRPL_ASSERT(
+            txns.size() <= maxBatchTxCount,
+            "Raw Transactions array exceeds max entries.");
+
         // LCOV_EXCL_START
         if (txns.size() > maxBatchTxCount)
-        {
+            throw std::length_error(
-            JLOG(debugLog().error())
+                "Raw Transactions array exceeds max entries");
-                << "BatchTrace: Raw Transactions array exceeds max entries.";
-            return XRPAmount{INITIAL_XRP};
-        }
         // LCOV_EXCL_STOP
 
         for (STObject txn : txns)
         {
             STTx const stx = STTx{std::move(txn)};
 
+            XRPL_ASSERT(
+                stx.getTxnType() != ttBATCH, "Inner Batch transaction found.");
+
             // LCOV_EXCL_START
             if (stx.getTxnType() == ttBATCH)
-            {
+                throw std::invalid_argument("Inner Batch transaction found");
-                JLOG(debugLog().error())
-                    << "BatchTrace: Inner Batch transaction found.";
-                return XRPAmount{INITIAL_XRP};
-            }
             // LCOV_EXCL_STOP
 
             auto const fee = ripple::calculateBaseFee(view, stx);
             // LCOV_EXCL_START
             if (txnFees > maxAmount - fee)
-            {
+                throw std::overflow_error("XRPAmount overflow");
-                JLOG(debugLog().error())
-                    << "BatchTrace: XRPAmount overflow in txnFees calculation.";
-                return XRPAmount{INITIAL_XRP};
-            }
             // LCOV_EXCL_STOP
             txnFees += fee;
         }
@@ -115,14 +108,13 @@ Batch::calculateBaseFee(ReadView const& view, STTx const& tx)
     if (tx.isFieldPresent(sfBatchSigners))
     {
         auto const& signers = tx.getFieldArray(sfBatchSigners);
+        XRPL_ASSERT(
+            signers.size() <= maxBatchTxCount,
+            "Batch Signers array exceeds max entries.");
 
         // LCOV_EXCL_START
         if (signers.size() > maxBatchTxCount)
-        {
+            throw std::length_error("Batch Signers array exceeds max entries");
-            JLOG(debugLog().error())
-                << "BatchTrace: Batch Signers array exceeds max entries.";
-            return XRPAmount{INITIAL_XRP};
-        }
         // LCOV_EXCL_STOP
 
         for (STObject const& signer : signers)
@@ -136,28 +128,16 @@ Batch::calculateBaseFee(ReadView const& view, STTx const& tx)
 
     // LCOV_EXCL_START
     if (signerCount > 0 && view.fees().base > maxAmount / signerCount)
-    {
+        throw std::overflow_error("XRPAmount overflow");
-        JLOG(debugLog().error())
-            << "BatchTrace: XRPAmount overflow in signerCount calculation.";
-        return XRPAmount{INITIAL_XRP};
-    }
     // LCOV_EXCL_STOP
 
     XRPAmount signerFees = signerCount * view.fees().base;
 
     // LCOV_EXCL_START
     if (signerFees > maxAmount - txnFees)
-    {
+        throw std::overflow_error("XRPAmount overflow");
-        JLOG(debugLog().error())
-            << "BatchTrace: XRPAmount overflow in signerFees calculation.";
-        return XRPAmount{INITIAL_XRP};
-    }
     if (txnFees + signerFees > maxAmount - batchBase)
-    {
+        throw std::overflow_error("XRPAmount overflow");
-        JLOG(debugLog().error())
-            << "BatchTrace: XRPAmount overflow in total fee calculation.";
-        return XRPAmount{INITIAL_XRP};
-    }
     // LCOV_EXCL_STOP
 
     // 10 drops per batch signature + sum of inner tx fees + batchBase

src/xrpld/overlay/detail/PeerImp.cpp

@@ -3440,7 +3440,7 @@ PeerImp::processLedgerRequest(std::shared_ptr<protocol::TMGetLedger> const& m)
                 if (!m->has_ledgerhash())
                     info += ", no hash specified";
 
-                JLOG(p_journal_.warn())
+                JLOG(p_journal_.error())
                     << "processLedgerRequest: getNodeFat with nodeId "
                     << *shaMapNodeId << " and ledger info type " << info
                     << " throws exception: " << e.what();

src/xrpld/rpc/handlers/Stop.cpp

@@ -31,7 +31,7 @@ struct JsonContext;
 Json::Value
 doStop(RPC::JsonContext& context)
 {
-    context.app.signalStop("RPC");
+    context.app.signalStop();
     return RPC::makeObjectValue(systemName() + " server stopping");
 }