Oops

fix240918
---------

Co-authored-by: Denis Angell <dangell@transia.co>

build-full.sh

@@ -9,6 +9,15 @@ echo "-- GITHUB_RUN_NUMBER: $4"
 
 umask 0000;
 
+echo "Fixing CentOS 7 EOL"
+
+sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*
+sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*
+yum clean all
+yum-config-manager --disable centos-sclo-sclo
+
+####
+
 cd /io;
 mkdir src/certs;
 curl --silent -k https://raw.githubusercontent.com/RichardAH/rippled-release-builder/main/ca-bundle/certbundle.h -o src/certs/certbundle.h;

src/ripple/app/consensus/RCLConsensus.cpp

@@ -134,8 +134,12 @@ RCLConsensus::Adaptor::acquireLedger(LedgerHash const& hash)
             acquiringLedger_ = hash;
 
             app_.getJobQueue().addJob(
-                jtADVANCE, "getConsensusLedger", [id = hash, &app = app_]() {
-                    app.getInboundLedgers().acquire(
+                jtADVANCE,
+                "getConsensusLedger1",
+                [id = hash, &app = app_, this]() {
+                    JLOG(j_.debug())
+                        << "JOB advanceLedger getConsensusLedger1 started";
+                    app.getInboundLedgers().acquireAsync(
                         id, 0, InboundLedger::Reason::CONSENSUS);
                 });
         }

src/ripple/app/consensus/RCLValidations.cpp

@@ -135,8 +135,10 @@ RCLValidationsAdaptor::acquire(LedgerHash const& hash)
         Application* pApp = &app_;
 
         app_.getJobQueue().addJob(
-            jtADVANCE, "getConsensusLedger", [pApp, hash]() {
-                pApp->getInboundLedgers().acquire(
+            jtADVANCE, "getConsensusLedger2", [pApp, hash, this]() {
+                JLOG(j_.debug())
+                    << "JOB advanceLedger getConsensusLedger2 started";
+                pApp->getInboundLedgers().acquireAsync(
                     hash, 0, InboundLedger::Reason::CONSENSUS);
             });
         return std::nullopt;
@@ -152,7 +154,9 @@ void
 handleNewValidation(
     Application& app,
     std::shared_ptr<STValidation> const& val,
-    std::string const& source)
+    std::string const& source,
+    BypassAccept const bypassAccept,
+    std::optional<beast::Journal> j)
 {
     auto const& signingKey = val->getSignerPublic();
     auto const& hash = val->getLedgerHash();
@@ -177,7 +181,23 @@ handleNewValidation(
     if (outcome == ValStatus::current)
     {
         if (val->isTrusted())
-            app.getLedgerMaster().checkAccept(hash, seq);
+        {
+            // Was: app.getLedgerMaster().checkAccept(hash, seq);
+            // https://github.com/XRPLF/rippled/commit/fbbea9e6e25795a8a6bd1bf64b780771933a9579
+            if (bypassAccept == BypassAccept::yes)
+            {
+                assert(j.has_value());
+                if (j.has_value())
+                {
+                    JLOG(j->trace()) << "Bypassing checkAccept for validation "
+                                     << val->getLedgerHash();
+                }
+            }
+            else
+            {
+                app.getLedgerMaster().checkAccept(hash, seq);
+            }
+        }
         return;
     }
 

src/ripple/app/consensus/RCLValidations.h

@@ -25,12 +25,16 @@
 #include <ripple/protocol/Protocol.h>
 #include <ripple/protocol/RippleLedgerHash.h>
 #include <ripple/protocol/STValidation.h>
+#include <optional>
+#include <set>
 #include <vector>
 
 namespace ripple {
 
 class Application;
 
+enum class BypassAccept : bool { no = false, yes };
+
 /** Wrapper over STValidation for generic Validation code
 
     Wraps an STValidation for compatibility with the generic validation code.
@@ -248,7 +252,9 @@ void
 handleNewValidation(
     Application& app,
     std::shared_ptr<STValidation> const& val,
-    std::string const& source);
+    std::string const& source,
+    BypassAccept const bypassAccept = BypassAccept::no,
+    std::optional<beast::Journal> j = std::nullopt);
 
 }  // namespace ripple
 

src/ripple/app/ledger/InboundLedgers.h

@@ -38,10 +38,21 @@ public:
     virtual ~InboundLedgers() = default;
 
     // VFALCO TODO Should this be called findOrAdd ?
+    // Callers should use this if they possibly need an authoritative
+    // response immediately.
     //
     virtual std::shared_ptr<Ledger const>
     acquire(uint256 const& hash, std::uint32_t seq, InboundLedger::Reason) = 0;
 
+    // Callers should use this if they are known to be executing on the Job
+    // Queue. TODO review whether all callers of acquire() can use this
+    // instead. Inbound ledger acquisition is asynchronous anyway.
+    virtual void
+    acquireAsync(
+        uint256 const& hash,
+        std::uint32_t seq,
+        InboundLedger::Reason reason) = 0;
+
     virtual std::shared_ptr<InboundLedger>
     find(LedgerHash const& hash) = 0;
 

src/ripple/app/ledger/impl/InboundLedger.cpp

@@ -560,7 +560,7 @@ InboundLedger::trigger(std::shared_ptr<Peer> const& peer, TriggerReason reason)
         return;
     }
 
-    if (auto stream = journal_.trace())
+    if (auto stream = journal_.debug())
     {
         if (peer)
             stream << "Trigger acquiring ledger " << hash_ << " from " << peer;

src/ripple/app/ledger/impl/InboundLedgers.cpp

@@ -28,6 +28,7 @@
 #include <ripple/core/JobQueue.h>
 #include <ripple/nodestore/DatabaseShard.h>
 #include <ripple/protocol/jss.h>
+#include <exception>
 #include <memory>
 #include <mutex>
 #include <vector>
@@ -141,6 +142,37 @@ public:
         return inbound->getLedger();
     }
 
+    void
+    acquireAsync(
+        uint256 const& hash,
+        std::uint32_t seq,
+        InboundLedger::Reason reason) override
+    {
+        std::unique_lock lock(acquiresMutex_);
+        try
+        {
+            if (pendingAcquires_.contains(hash))
+                return;
+            pendingAcquires_.insert(hash);
+            lock.unlock();
+            acquire(hash, seq, reason);
+        }
+        catch (std::exception const& e)
+        {
+            JLOG(j_.warn())
+                << "Exception thrown for acquiring new inbound ledger " << hash
+                << ": " << e.what();
+        }
+        catch (...)
+        {
+            JLOG(j_.warn())
+                << "Unknown exception thrown for acquiring new inbound ledger "
+                << hash;
+        }
+        lock.lock();
+        pendingAcquires_.erase(hash);
+    }
+
     std::shared_ptr<InboundLedger>
     find(uint256 const& hash) override
     {
@@ -426,6 +458,9 @@ private:
     beast::insight::Counter mCounter;
 
     std::unique_ptr<PeerSetBuilder> mPeerSetBuilder;
+
+    std::set<uint256> pendingAcquires_;
+    std::mutex acquiresMutex_;
 };
 
 //------------------------------------------------------------------------------

src/ripple/app/misc/NetworkOPs.cpp

@@ -70,7 +70,9 @@
 #include <boost/asio/ip/host_name.hpp>
 #include <boost/asio/steady_timer.hpp>
 
+#include <exception>
 #include <mutex>
+#include <set>
 #include <string>
 #include <tuple>
 #include <unordered_map>
@@ -776,6 +778,9 @@ private:
 
     StateAccounting accounting_{};
 
+    std::set<uint256> pendingValidations_;
+    std::mutex validationsMutex_;
+
 private:
     struct Stats
     {
@@ -1142,8 +1147,12 @@ NetworkOPsImp::submitTransaction(std::shared_ptr<STTx const> const& iTrans)
     // Enforce Network bar for emitted txn
     if (view->rules().enabled(featureHooks) && hook::isEmittedTxn(*iTrans))
     {
-        JLOG(m_journal.warn())
-            << "Submitted transaction invalid: EmitDetails present.";
+        // RH NOTE: Warning removed here due to ConsesusSet using this function
+        // which continually triggers this bar. Doesn't seem dangerous, just
+        // annoying.
+
+        // JLOG(m_journal.warn())
+        //    << "Submitted transaction invalid: EmitDetails present.";
         return;
     }
 
@@ -1155,7 +1164,11 @@ NetworkOPsImp::submitTransaction(std::shared_ptr<STTx const> const& iTrans)
 
     if ((flags & SF_BAD) != 0)
     {
-        JLOG(m_journal.warn()) << "Submitted transaction cached bad";
+        // RH NOTE: Warning removed here due to ConsesusSet using this function
+        // which continually triggers this bar. Doesn't seem dangerous, just
+        // annoying.
+
+        // JLOG(m_journal.warn()) << "Submitted transaction cached bad";
         return;
     }
 
@@ -1783,7 +1796,8 @@ NetworkOPsImp::checkLastClosedLedger(
     }
 
     JLOG(m_journal.warn()) << "We are not running on the consensus ledger";
-    JLOG(m_journal.info()) << "Our LCL: " << getJson({*ourClosed, {}});
+    JLOG(m_journal.info()) << "Our LCL: " << ourClosed->info().hash
+                           << getJson({*ourClosed, {}});
     JLOG(m_journal.info()) << "Net LCL " << closedLedger;
 
     if ((mMode == OperatingMode::TRACKING) || (mMode == OperatingMode::FULL))
@@ -2337,7 +2351,37 @@ NetworkOPsImp::recvValidation(
     JLOG(m_journal.trace())
         << "recvValidation " << val->getLedgerHash() << " from " << source;
 
-    handleNewValidation(app_, val, source);
+    // handleNewValidation(app_, val, source);
+    // https://github.com/XRPLF/rippled/commit/fbbea9e6e25795a8a6bd1bf64b780771933a9579
+    std::unique_lock lock(validationsMutex_);
+    BypassAccept bypassAccept = BypassAccept::no;
+    try
+    {
+        if (pendingValidations_.contains(val->getLedgerHash()))
+            bypassAccept = BypassAccept::yes;
+        else
+            pendingValidations_.insert(val->getLedgerHash());
+        lock.unlock();
+        handleNewValidation(app_, val, source, bypassAccept, m_journal);
+    }
+    catch (std::exception const& e)
+    {
+        JLOG(m_journal.warn())
+            << "Exception thrown for handling new validation "
+            << val->getLedgerHash() << ": " << e.what();
+    }
+    catch (...)
+    {
+        JLOG(m_journal.warn())
+            << "Unknown exception thrown for handling new validation "
+            << val->getLedgerHash();
+    }
+    if (bypassAccept == BypassAccept::no)
+    {
+        lock.lock();
+        pendingValidations_.erase(val->getLedgerHash());
+        lock.unlock();
+    }
 
     pubValidation(val);
 

src/ripple/app/rdb/impl/UnitaryShard.cpp

@@ -173,6 +173,11 @@ updateLedgerDBs(
 
         auto const sParentHash{to_string(ledger->info().parentHash)};
         auto const sDrops{to_string(ledger->info().drops)};
+        auto const closingTime{
+            ledger->info().closeTime.time_since_epoch().count()};
+        auto const prevClosingTime{
+            ledger->info().parentCloseTime.time_since_epoch().count()};
+        auto const closeTimeRes{ledger->info().closeTimeResolution.count()};
         auto const sAccountHash{to_string(ledger->info().accountHash)};
         auto const sTxHash{to_string(ledger->info().txHash)};
 
@@ -188,11 +193,8 @@ updateLedgerDBs(
                    ":closingTime, :prevClosingTime, :closeTimeRes,"
                    ":closeFlags, :accountSetHash, :transSetHash);",
             soci::use(sHash), soci::use(ledgerSeq), soci::use(sParentHash),
-            soci::use(sDrops),
-            soci::use(ledger->info().closeTime.time_since_epoch().count()),
-            soci::use(
-                ledger->info().parentCloseTime.time_since_epoch().count()),
-            soci::use(ledger->info().closeTimeResolution.count()),
+            soci::use(sDrops), soci::use(closingTime),
+            soci::use(prevClosingTime), soci::use(closeTimeRes),
             soci::use(ledger->info().closeFlags), soci::use(sAccountHash),
             soci::use(sTxHash);
 

src/ripple/app/rdb/impl/Wallet.cpp

@@ -205,19 +205,20 @@ insertPeerReservation(
     PublicKey const& nodeId,
     std::string const& description)
 {
+    auto const sNodeId = toBase58(TokenType::NodePublic, nodeId);
     session << "INSERT INTO PeerReservations (PublicKey, Description) "
                "VALUES (:nodeId, :desc) "
                "ON CONFLICT (PublicKey) DO UPDATE SET "
                "Description=excluded.Description",
-        soci::use(toBase58(TokenType::NodePublic, nodeId)),
-        soci::use(description);
+        soci::use(sNodeId), soci::use(description);
 }
 
 void
 deletePeerReservation(soci::session& session, PublicKey const& nodeId)
 {
+    auto const sNodeId = toBase58(TokenType::NodePublic, nodeId);
     session << "DELETE FROM PeerReservations WHERE PublicKey = :nodeId",
-        soci::use(toBase58(TokenType::NodePublic, nodeId));
+        soci::use(sNodeId);
 }
 
 bool

src/ripple/app/tx/impl/Transactor.cpp

@@ -1921,6 +1921,12 @@ Transactor::operator()()
         STObject const meta = metaRaw.getAsObject();
 
         uint32_t lgrCur = view().seq();
+
+        bool const has240819 = view().rules().enabled(fix240819);
+
+        auto const& sfRewardFields =
+            *(ripple::SField::knownCodeToField.at(917511 - has240819));
+
         // iterate all affected balances
         for (auto const& node : meta.getFieldArray(sfAffectedNodes))
         {
@@ -1932,7 +1938,7 @@ Transactor::operator()()
             if (nodeType != ltACCOUNT_ROOT || metaType == sfDeletedNode)
                 continue;
 
-            if (!node.isFieldPresent(sfFinalFields) ||
+            if (!node.isFieldPresent(sfRewardFields) ||
                 !node.isFieldPresent(sfLedgerIndex))
                 continue;
 
@@ -1948,7 +1954,7 @@ Transactor::operator()()
                 continue;
 
             STObject& finalFields = (const_cast<STObject&>(node))
-                                        .getField(sfFinalFields)
+                                        .getField(sfRewardFields)
                                         .downcast<STObject>();
 
             if (!finalFields.isFieldPresent(sfBalance))

src/ripple/core/impl/Config.cpp

@@ -127,7 +127,7 @@ sizedItems
     {SizedItem::txnDBCache,         {{      4,      12,      24,      64,     128 }}},
     {SizedItem::lgrDBCache,         {{      4,       8,      16,      32,     128 }}},
     {SizedItem::openFinalLimit,     {{      8,      16,      32,      64,     128 }}},
-    {SizedItem::burstSize,          {{      4,       8,      16,      32,      48 }}},
+    {SizedItem::burstSize,          {{      4,       8,      16,      32,      64*1024*1024 }}},
     {SizedItem::ramSizeGB,          {{      8,      12,      16,      24,      32 }}},
     {SizedItem::accountIdCacheSize, {{  20047,   50053,   77081,  150061,  300007 }}}
 }};

src/ripple/protocol/Email.h

@@ -1,493 +0,0 @@
-#include <iostream>
-#include <string>
-#include <vector>
-#include <regex>
-#include <sstream>
-#include <stdexcept>
-
-// make this typedef to keep dkim happy
-typedef int _Bool;
-#include <opendkim/dkim.h>
-
-using namespace ripple;
-namespace Email
-{
-
-    enum EmailType : uint8_t
-    {
-        INVALID = 0,
-        REMIT = 1,
-        REKEY = 2
-    };
-
-    struct EmailDetails
-    {
-        std::string domain; // from address domain
-        std::string dkimDomain; // dkim signature domain
-
-        AccountID from;
-        std::string fromEmail;
-
-        std::optional<std::string> toEmail;
-        std::optional<AccountID> to;
-
-        EmailType emailType { EmailType::INVALID };
-        std::optional<STAmount> amount; // only valid if REMIT type
-        std::optional<AccountID> rekey; // only valid if REKEY type
-    };
-
-    class OpenDKIM
-    {
-    private:
-        DKIM_STAT status;
-    public:
-        DKIM_LIB* dkim_lib;
-        DKIM* dkim;
-
-        bool sane()
-        {
-            return !!dkim_lib && !!dkim;
-        }
-
-        OpenDKIM()
-        { 
-            // do nothing
-        }
-
-        // setup is in its own function not the constructor to make failure graceful
-        bool setup(beast::Journal& j)
-        {
-            dkim_lib = dkim_init(nullptr, nullptr);
-            if (!dkim_lib)
-            {
-                JLOG(j.warn()) << "EmailAmendment: Failed to init dkim_lib.";
-                return false;
-            }
-
-            DKIM_STAT status;
-            DKIM* dkim = dkim_verify(dkim_lib, (uint8_t const*)"id", nullptr, &status);
-            if (!dkim_lib)
-            {
-                JLOG(j.warn()) << "EmailAmendment: Failed to init dkim_verify.";
-                return false;
-            }
-
-            return true;
-        }
-        
-        ~OpenDKIM()
-        {
-            if (dkim)
-            {
-                dkim_free(dkim);
-                dkim = nullptr;
-            }
-
-            if (dkim_lib)
-            {
-                dkim_close(dkim_lib);
-                dkim_lib = nullptr;
-            }
-        }
-    };
-
-    inline
-    std::optional<std::pair<std::string /* canonical email addr */, std::string /* canonical domain */>>
-    canonicalizeEmailAddress(const std::string& rawEmailAddr)
-    {
-        if (rawEmailAddr.empty())
-            return {};
-
-        // trim
-        auto start = std::find_if_not(str.begin(), str.end(), ::isspace);
-        auto end = std::find_if_not(str.rbegin(), str.rend(), ::isspace).base();
-
-        if (end >= start)
-            return {};
-
-        std::email = std::string(start, end);
-       
-        if (email.empty())
-            return {};
-        
-        // to lower
-        std::transform(email.begin(), email.end(), email.begin(), ::tolower);
-
-        // find the @
-        size_t atPos = email.find('@');
-        if (atPos == std::string::npos || atPos == email.size() - 1)
-            return {};
-
-        std::string localPart = email.substr(0, atPos);
-        std::string domain = email.substr(atPos + 1);
-
-        if (domain.empty() || localPart.empty())
-            return {};
-        
-        // ensure there's only one @
-        if (domain.find('@') != std::string::npos)
-            return {};
-        
-        // canonicalize domain part
-        {
-            std::string result = domain;
-            std::transform(result.begin(), result.end(), result.begin(), ::tolower);
-            while (!result.empty() && result.back() == '.')
-                result.pop_back();
-
-            doamin = result;
-        }        
-        
-        if (domain.empty())
-            return {};
-
-        // canonicalize local part
-        {
-            std::string part = localPart;
-            part.erase(std::remove_if(
-                        part.begin(), part.end(), 
-                        [](char c) { return c == '(' || c == ')' || std::isspace(c); }), part.end());
-
-            size_t plusPos = part.find('+');
-            if (plusPos != std::string::npos)
-                part = part.substr(0, plusPos);
-
-            while (!part.empty() && part.back() == '.')
-                part.pop_back();
-
-            // gmail ignores dots
-            if (domain == "gmail.com")
-                part.erase(std::remove(part.begin(), part.end(), '.'), part.end());
-
-            localPart = part;
-        }
-
-        if (localPart.empty())
-            return {};
-
-        return {{localPart + "@" + domain, domain}};
-    };
-
-    // Warning: must supply already canonicalzied email
-    inline
-    std::optional<AccountID>
-    emailToAccountID(const std::string& canonicalEmail)
-    {
-        uint8_t innerHash[SHA512_DIGEST_LENGTH + 4];
-        SHA512_CTX sha512;
-        SHA512_Init(&sha512);
-        SHA512_Update(&sha512, canonicalEmail.c_str(), canonicalEmail.size());
-        SHA512_Final(innerHash + 4, &sha512);
-        innerHash[0] = 0xEEU;
-        innerHash[1] = 0xEEU;
-        innerHash[2] = 0xFFU;
-        innerHash[3] = 0xFFU;
-        {
-            uint8_t hash[SHA512_DIGEST_LENGTH];
-            SHA512_CTX sha512;
-            SHA512_Init(&sha512);
-            SHA512_Update(&sha512, innerHash, sizeof(innerHash));
-            SHA512_Final(hash, &sha512);
-
-            return AccountID::fromVoid((void*)hash);
-        }
-    }
-
-
-    inline
-    std::optional<EmailDetails>
-    parseEmail(std::string const& rawEmail, beast::Journal& j)
-    {
-        EmailDetails out;
-
-        // parse email into headers and body
-        std::vector<std::string> headers;
-        std::string body;
-        {
-            std::istringstream stream(rawEmail);
-            std::string line;
-
-            while (std::getline(stream, line))
-            {
-                if (line.empty() || line == "\r")
-                    break;
-
-                // Handle header line continuations
-                while (stream.peek() == ' ' || stream.peek() == '\t') {
-                    std::string continuation;
-                    std::getline(stream, continuation);
-                    line += '\n' + continuation;
-                }
-                if (!line.empty()) {
-                    headers.push_back(line.substr(0, line.size() - (line.back() == '\r' ? 1 : 0)));
-                }
-            }
-
-            std::ostringstream body_stream;
-            while (std::getline(stream, line))
-                body_stream << line << "\n";
-            body = body_stream.str();
-        }
-
-
-        // find the from address, canonicalize it and extract the domain
-        bool foundFrom = false;
-        bool foundTo = false;
-        {
-            static const std::regex
-                from_regex(R"(^From:\s*(?:.*<)?([^<>\s]+@[^<>\s]+)(?:>)?)", std::regex::icase);
-
-            static const std::regex
-                to_regex(R"(^To:\s*(?:.*<)?([^<>\s]+@[^<>\s]+)(?:>)?)", std::regex::icase);
-
-            for (const auto& header : headers)
-            {
-                if (foundFrom && foundTo)
-                    break;
-
-                std::smatch match;
-                if (!foundFrom && std::regex_search(header, match, from_regex) && match.size() > 1)
-                {
-                    auto canon = canonicalizeEmailAddress(match[1].str());
-                    if (!canon)
-                    {
-                        JLOG(j.warn())
-                            << "EmailAmendment: Cannot parse From address: `"
-                            << match[1].str() << "`";
-                        return {};
-                    }
-
-                    out.fromEmail = canon->first;
-                    out.domain = canon->second;
-                    out.from = emailToAccountID(out.fromEmail);
-                    foundFrom = true;
-
-                    continue;
-                }
-
-                if (std::regex_search(header, match, to_regex) && match.size() > 1)
-                {
-                    auto canon = canonicalizeEmailAddress(match[1].str());
-                    if (!canon)
-                    {
-                        JLOG(j.warn())
-                            << "EmailAmendment: Cannot parse To address: `"
-                            << match[1].str() << "`";
-                        return {};
-                    }
-
-                    out.toEmail = canon->first;
-                    out.to = emailToAccountID(out.toEmail);
-
-                    foundTo = true;
-                    continue;
-                }
-            }
-
-            if (!foundFrom)
-            {
-                JLOG(j.warn()) << "EmailAmendment: No From address present in email.";
-                return {};
-            }
-        }
-
-        // execution to here means we have:
-        //  1. Parsed headers and body
-        //  2. Found a from address and canonicalzied it
-        //  3. Potentially found a to address and canonicalized it.
-
-        // Find instructions
-        {
-            static const std::regex
-                remitPattern(R"(^REMIT (\d+(?:\.\d+)?) ([A-Z]{3})(?:/([r][a-zA-Z0-9]{24,34}))?)");
-            
-            static const std::regex
-                rekeyPattern(R"(^REKEY ([r][a-zA-Z0-9]{24,34}))");
-
-            std::istringstream stream(body);
-            std::string line;
-
-            out.emailType = EmailType::INVALID;
-
-            while (std::getline(stream, line, '\n'))
-            {
-                if (!line.empty() && line.back() == '\r')
-                    line.pop_back(); // Remove '\r' if present
-
-                std::smatch match;
-                if (std::regex_match(line, match, remitPattern))
-                {
-                    try
-                    {
-                        Currency cur;
-                        if (!to_currency(cur, match[2]))
-                        {
-                            JLOG(j.warn()) << "EmailAmendment: Could not parse currency code.";
-                            return {};
-                        }
-
-
-                        AccountID issuer = noAccount();
-                        if (match[3].matched)
-                        {
-                            if (isXRP(cur))
-                            {
-                                JLOG(j.warn()) << "EmailAmendment: Native currency cannot specify issuer.";
-                                return {};
-                            }
-
-                            issuer = decodeBase58Token(match[3], TokenType::AccountID);
-                            if (issuer.empty())
-                            {
-                                JLOG(j.warn()) << "EmailAmendment: Could not parse issuer address.";
-                                return {};
-                            }
-                        }
-
-                        out.amount = amountFromString({cur, issuer}, match[1]);
-
-                    }
-                    catch (std::exception const& e)
-                    {
-                        JLOG(j.warn()) << "EmailAmendment: Exception while parsing REMIT. " << e.what();
-                        return {};
-                    }
-
-                    out.emailType = EmailType::REMIT;
-                    break;
-                }
-
-                if (std::regex_match(line, match, rekeyPattern))
-                {
-                    AccountID rekey = decodeBase58Token(match[1], TokenType::AccountID);
-                    if (rekey.empty())
-                    {
-                        JLOG(j.warn()) << "EmailAmendment: Could not parse rekey address.";
-                        return {};
-                    }
-
-                    out.rekey = rekey;                
-                    out.emailType = EmailType::REKEY;
-                    break;
-                }
-            }
-
-            if (out.emailType == EmailType::INVALID)
-            {
-                JLOG(j.warn()) << "EmailAmendment: Invalid email type, could not find REMIT or REKEY.";
-                return{};
-            }
-        }    
-
-
-        // perform DKIM checks...
-        // to do this we will use OpenDKIM, and manage it with a smart pointer to prevent
-        // any leaks from uncommon exit pathways
-
-        std::unique<OpenDKIM> odkim;
-
-        // perform setup
-        if (!odkim->setup(j) || !odkim->sane())
-            return {};
-
-        // when odkim goes out of scope it will call the C-apis to destroy the dkim instances
-
-        DKIM_STAT status;
-        DKIM_LIB* dkim_lib = odkim->dkim_lib;
-        DKIM* dkim = odkim->dkim;
-
-        // feed opendkim all headers
-        {
-            for (const auto& header : headers)
-            {
-                status = dkim_header(dkim, (uint8_t*)header.c_str(), header.length());
-                if (status != DKIM_STAT_OK)
-                {
-                    JLOG(j.warn())
-                        << "EmailAmendment: OpenDKIM Failed to process header: "
-                        << dkim_geterror(dkim);
-                    return {};
-                }
-            }
-
-            status = dkim_eoh(dkim);
-            if (status != DKIM_STAT_OK)
-            {
-                JLOG(j.warn())
-                    << "EmailAmendment: OpenDKIM Failed to send end-of-headers"l
-                return {};
-            }
-        }
-
-        // feed opendkim email body
-        {
-            status = dkim_body(dkim, (uint8_t*)body.c_str(), body.size());
-            if (status != DKIM_STAT_OK)
-            {
-                JLOG(j.warn())
-                    << "EmailAmendment: OpenDKIM Failed to process body: " 
-                    << dkim_geterror(dkim);
-                return {};
-            }
-
-            _Bool testkey;
-            status = dkim_eom(dkim, &testkey);
-            if (status != DKIM_STAT_OK)
-            {
-                JLOG(j.warn())
-                    << "EmailAmendment: OpenDKIM end-of-message error: "
-                    << dkim_geterror(dkim);
-                return {};
-            }
-
-            DKIM_SIGINFO* sig = dkim_getsignature(dkim);
-            if (!sig)
-            {
-                JLOG(j.warn())
-                   << "EmailAmendment: No DKIM signature found";
-                return {};
-            }
-
-            if (dkim_sig_getbh(sig) != DKIM_SIGBH_MATCH)
-            {
-                JLOG(j.warn())
-                    << "EmailAmendment: DKIM body hash mismatch";
-                return {};
-            }
-
-
-            DKIM_SIGINFO* sig = dkim_getsignature(dkim);
-            if (!sig)
-            {
-                JLOG(j.warn())
-                    << "EmailAmendment: DKIM signature not found.";
-                return {};
-            }
-
-            out.dkimDomain = 
-                std::string(reinterpret_cast<char const*>(
-                            reinterpret_cast<void const*>(dkim_sig_getdomain(sig))));
-
-            if (out.dkimDomain.empty())
-            {
-                JLOG(j.warn())
-                    << "EmailAmendment: DKIM signature domain empty.";
-                return {};
-            }
-
-            // RH TODO: decide whether to relax this or not
-            // strict domain check
-            if (out.dkimDomain != out.domain)
-            {
-                JLOG(j.warn())
-                    << "EmailAmendment: DKIM domain does not match From address domain.";
-                return {};
-            }
-        }
-
-        // execution to here means all checks passed and the instruction was correctly parsed
-        return out;
-    }
-
-
-}

src/ripple/protocol/Feature.h

@@ -358,7 +358,7 @@ extern uint256 const fixXahauV2;
 extern uint256 const featureRemit;
 extern uint256 const featureZeroB2M;
 extern uint256 const fixNSDelete;
-extern uint256 const featureEmail;
+extern uint256 const fix240819;
 
 }  // namespace ripple
 

src/ripple/protocol/STTx.h

@@ -30,7 +30,6 @@
 #include <ripple/protocol/TxFormats.h>
 #include <boost/container/flat_set.hpp>
 #include <functional>
-#include <ripple/protocol/Email.h>
 
 namespace ripple {
 

src/ripple/protocol/TxFlags.h

@@ -57,9 +57,8 @@ namespace ripple {
 // Universal Transaction flags:
 enum UniversalFlags : uint32_t {
     tfFullyCanonicalSig = 0x80000000,
-    tfEmailSig          = 0x40000000,
 };
-constexpr std::uint32_t tfUniversal                        = tfFullyCanonicalSig | tfEmailSig;
+constexpr std::uint32_t tfUniversal                        = tfFullyCanonicalSig;
 constexpr std::uint32_t tfUniversalMask                    = ~tfUniversal;
 
 // AccountSet flags:

src/ripple/protocol/impl/Feature.cpp

@@ -464,7 +464,7 @@ REGISTER_FIX    (fixXahauV2,                    Supported::yes, VoteBehavior::De
 REGISTER_FEATURE(Remit,                         Supported::yes, VoteBehavior::DefaultNo);
 REGISTER_FEATURE(ZeroB2M,                       Supported::yes, VoteBehavior::DefaultNo);
 REGISTER_FIX    (fixNSDelete,                   Supported::yes, VoteBehavior::DefaultNo);
-REGISTER_FEATURE(Email,                         Supported::yes, VoteBehavior::DefaultNo);
+REGISTER_FIX    (fix240819,                     Supported::yes, VoteBehavior::DefaultYes);
 
 // The following amendments are obsolete, but must remain supported
 // because they could potentially get enabled.

src/ripple/protocol/impl/STTx.cpp

@@ -304,60 +304,9 @@ STTx::checkSingleSign(RequireFullyCanonicalSig requireCanonicalSig) const
     bool const isWildcardNetwork =
         isFieldPresent(sfNetworkID) && getFieldU32(sfNetworkID) == 65535;
 
-    // email signature flag signals that the txn is authorized
-    // only by the presence of a DKIM signed email in memos[0] 
-
-    bool const isEmailSig =
-        getFlags() & tfEmailSig;
-
-
     bool validSig = false;
-    do
     try
     {
-    
-        if (isEmailSig)
-        {
-    
-            if (!isFieldPresent(sfMemos))
-                break;
-
-            auto const& memos = st.getFieldArray(sfMemos);
-            auto const& memo = memos[0];
-            auto memoObj = dynamic_cast<STObject const*>(&memo);
-            if (!memoObj || (memoObj->getFName() != sfMemo))
-                break;
-
-            bool emailValid = false;
-
-            for (auto const& memoElement : *memoObj)
-            {
-                auto const& name = memoElement.getFName();
-
-                if (name != sfMemoType && name != sfMemoData &&
-                    name != sfMemoFormat)
-                    break;
-
-                // The raw data is stored as hex-octets, which we want to decode.
-                std::optional<Blob> optData = strUnHex(memoElement.getText());
-
-                if (!optData)
-                    break;
-
-                if (name != sfMemoData)
-                    continue;
-
-                std::string const emailContent((char const*)(optData->data()), optData->size());
-
-
-                // RH UPTO
-
-
-            }
-        }
-            
-        }
-
         bool const fullyCanonical = (getFlags() & tfFullyCanonicalSig) ||
             (requireCanonicalSig == RequireFullyCanonicalSig::yes);
 
@@ -379,8 +328,7 @@ STTx::checkSingleSign(RequireFullyCanonicalSig requireCanonicalSig) const
     {
         // Assume it was a signature failure.
         validSig = false;
-    } while (0);
-
+    }
     if (validSig == false)
         return Unexpected("Invalid signature.");
     // Signature was verified.

src/ripple/server/impl/BaseWSPeer.h

@@ -256,6 +256,8 @@ BaseWSPeer<Handler, Impl>::close(
         return post(strand_, [self = impl().shared_from_this(), reason] {
             self->close(reason);
         });
+    if (do_close_)
+        return;
     do_close_ = true;
     if (wq_.empty())
     {

src/test/app/LedgerReplay_test.cpp

@@ -106,6 +106,14 @@ public:
         return {};
     }
 
+    virtual void
+    acquireAsync(
+        uint256 const& hash,
+        std::uint32_t seq,
+        InboundLedger::Reason reason) override
+    {
+    }
+
     virtual std::shared_ptr<InboundLedger>
     find(LedgerHash const& hash) override
     {

src/test/app/XahauGenesis_test.cpp

@@ -3968,8 +3968,8 @@ struct XahauGenesis_test : public beast::unit_test::suite
         using namespace std::chrono_literals;
         testcase("test claim reward valid without unl report");
 
-        Env env{
-            *this, envconfig(), supported_amendments() - featureXahauGenesis};
+        Env env{*this, envconfig(), features - featureXahauGenesis};
+        bool const has240819 = env.current()->rules().enabled(fix240819);
 
         double const rateDrops = 0.00333333333 * 1'000'000;
         STAmount const feesXRP = XRP(1);
@@ -4050,7 +4050,12 @@ struct XahauGenesis_test : public beast::unit_test::suite
         // validate account fields
         STAmount const postUser = preUser + netReward;
         BEAST_EXPECT(expectAccountFields(
-            env, user, preLedger, preLedger + 1, postUser, preTime));
+            env,
+            user,
+            preLedger,
+            preLedger + 1,
+            has240819 ? (preUser - feesXRP) : postUser,
+            preTime));
 
         env(claimReward(user, env.master), fee(feesXRP), ter(tecHOOK_REJECTED));
         env.close();
@@ -4095,7 +4100,12 @@ struct XahauGenesis_test : public beast::unit_test::suite
         // validate account fields
         STAmount const postUser1 = preUser1 + netReward1;
         BEAST_EXPECT(expectAccountFields(
-            env, user, preLedger1, preLedger1 + 1, postUser1, preTime1));
+            env,
+            user,
+            preLedger1,
+            preLedger1 + 1,
+            has240819 ? (preUser1 - feesXRP) : postUser1,
+            preTime1));
     }
 
     void
@@ -4219,8 +4229,14 @@ struct XahauGenesis_test : public beast::unit_test::suite
 
         // validate account fields
         STAmount const postUser = preUser + netReward;
+        bool const has240819 = env.current()->rules().enabled(fix240819);
         BEAST_EXPECT(expectAccountFields(
-            env, user, preLedger, preLedger + 1, postUser, preTime));
+            env,
+            user,
+            preLedger,
+            preLedger + 1,
+            has240819 ? (preUser - feesXRP) : postUser,
+            preTime));
     }
 
     void
@@ -4352,10 +4368,15 @@ struct XahauGenesis_test : public beast::unit_test::suite
             // validate account fields
             STAmount const postAlice = preAlice + netReward + l1Reward;
             bool const boolResult = withXahauV1 ? true : false;
+            bool const has240819 = env.current()->rules().enabled(fix240819);
             BEAST_EXPECT(
                 expectAccountFields(
-                    env, alice, preLedger, preLedger + 1, postAlice, preTime) ==
-                boolResult);
+                    env,
+                    alice,
+                    preLedger,
+                    preLedger + 1,
+                    has240819 ? (preAlice - feesXRP) : postAlice,
+                    preTime) == boolResult);
         }
     }
 
@@ -4367,6 +4388,7 @@ struct XahauGenesis_test : public beast::unit_test::suite
         testcase("test claim reward optin optout");
 
         Env env{*this, envconfig(), features - featureXahauGenesis};
+        bool const has240819 = env.current()->rules().enabled(fix240819);
 
         double const rateDrops = 0.00333333333 * 1'000'000;
         STAmount const feesXRP = XRP(1);
@@ -4436,7 +4458,12 @@ struct XahauGenesis_test : public beast::unit_test::suite
         // validate account fields
         STAmount const postUser = preUser + netReward;
         BEAST_EXPECT(expectAccountFields(
-            env, user, preLedger, preLedger + 1, postUser, preTime));
+            env,
+            user,
+            preLedger,
+            preLedger + 1,
+            has240819 ? (preUser - feesXRP) : postUser,
+            preTime));
 
         // opt out of claim rewards
         env(claimReward(user, std::nullopt, 1), fee(feesXRP), ter(tesSUCCESS));
@@ -4461,7 +4488,7 @@ struct XahauGenesis_test : public beast::unit_test::suite
             user,
             preLedger1,
             preLedger1 + 1,
-            env.balance(user),
+            has240819 ? (env.balance(user) + feesXRP) : env.balance(user),
             preTime1));
     }
 
@@ -4543,8 +4570,14 @@ struct XahauGenesis_test : public beast::unit_test::suite
 
         // validate account fields
         STAmount const postUser = preUser + netReward;
+        bool const has240819 = env.current()->rules().enabled(fix240819);
         BEAST_EXPECT(expectAccountFields(
-            env, user, preLedger, preLedger + 1, postUser, preTime));
+            env,
+            user,
+            preLedger,
+            has240819 ? preLedger : preLedger + 1,
+            has240819 ? (preUser - feesXRP) : postUser,
+            preTime));
     }
 
     void
@@ -4618,8 +4651,14 @@ struct XahauGenesis_test : public beast::unit_test::suite
 
         // validate account fields
         STAmount const postUser = preUser + netReward;
+        bool const has240819 = env.current()->rules().enabled(fix240819);
         BEAST_EXPECT(expectAccountFields(
-            env, user, preLedger, preLedger + 1, postUser, preTime));
+            env,
+            user,
+            preLedger,
+            preLedger + 1,
+            has240819 ? (preUser - feesXRP) : postUser,
+            preTime));
     }
 
     void
@@ -4824,13 +4863,13 @@ struct XahauGenesis_test : public beast::unit_test::suite
         Env env{
             *this,
             makeGenesisConfig(
-                supported_amendments() - featureXahauGenesis,
+                features - featureXahauGenesis,
                 21337,
                 "10",
                 "1000000",
                 "200000",
                 0),
-            supported_amendments() - featureXahauGenesis};
+            features - featureXahauGenesis};
 
         STAmount const feesXRP = XRP(1);
 
@@ -4890,8 +4929,7 @@ struct XahauGenesis_test : public beast::unit_test::suite
         using namespace std::chrono_literals;
         testcase("test compound interest over 12 claims");
 
-        Env env{
-            *this, envconfig(), supported_amendments() - featureXahauGenesis};
+        Env env{*this, envconfig(), features - featureXahauGenesis};
 
         double const rateDrops = 0.00333333333 * 1'000'000;
         STAmount const feesXRP = XRP(1);
@@ -4965,8 +5003,14 @@ struct XahauGenesis_test : public beast::unit_test::suite
 
             // validate account fields
             STAmount const postUser = preUser + netReward;
+            bool const has240819 = env.current()->rules().enabled(fix240819);
             BEAST_EXPECT(expectAccountFields(
-                env, user, preLedger, preLedger + 1, postUser, preTime));
+                env,
+                user,
+                preLedger,
+                preLedger + 1,
+                has240819 ? (preUser - feesXRP) : postUser,
+                preTime));
         }
 
         STAmount const endBal = env.balance(user);
@@ -5012,6 +5056,7 @@ struct XahauGenesis_test : public beast::unit_test::suite
         using namespace test::jtx;
         auto const sa = supported_amendments();
         testGovernHookWithFeats(sa);
+        testRewardHookWithFeats(sa - fix240819);
         testRewardHookWithFeats(sa);
     }
 };