From bc85a8b24f86e04bec619fda0bd0256f5e2091de Mon Sep 17 00:00:00 2001 From: Nik Bougalis Date: Tue, 21 Apr 2015 13:33:24 -0700 Subject: [PATCH] Set TX processing change date to 2015-05-12 13:00:00PDT --- src/ripple/legacy/0.27/Emulate027.cpp | 4 ++-- src/ripple/protocol/impl/STTx.cpp | 11 ----------- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/src/ripple/legacy/0.27/Emulate027.cpp b/src/ripple/legacy/0.27/Emulate027.cpp index c64b9b57b1..73e30209ee 100644 --- a/src/ripple/legacy/0.27/Emulate027.cpp +++ b/src/ripple/legacy/0.27/Emulate027.cpp @@ -34,8 +34,8 @@ emulate027 (Ledger::ref ledger) return false; // The server also uses 0.28 semantics for all ledgers whose parent - // closed after 2015-04-28 13:00:00 PDT. - static std::uint32_t const legacy_cutoff = 483566400; + // closed after 2015-05-12 13:00:00 PDT. + static std::uint32_t const legacy_cutoff = 484776000; if (ledger->getParentCloseTimeNC () > legacy_cutoff) return false; diff --git a/src/ripple/protocol/impl/STTx.cpp b/src/ripple/protocol/impl/STTx.cpp index a6185918b5..fcec6a0f2f 100644 --- a/src/ripple/protocol/impl/STTx.cpp +++ b/src/ripple/protocol/impl/STTx.cpp @@ -32,7 +32,6 @@ #include #include #include -#include "boost/date_time/posix_time/posix_time.hpp" #include namespace ripple { @@ -292,13 +291,6 @@ isMemoOkay (STObject const& st, std::string& reason) if (!st.isFieldPresent (sfMemos)) return true; - // We switch to new semantics on April 15, 2015 at 1:00pm PDT: - static boost::posix_time::ptime const cutoff ( - boost::posix_time::time_from_string ("2015-04-15 20:00:00")); - - bool const emulate027 = - boost::posix_time::second_clock::universal_time () < cutoff; - auto const& memos = st.getFieldArray (sfMemos); // The number 2048 is a preallocation hint, not a hard limit @@ -336,9 +328,6 @@ isMemoOkay (STObject const& st, std::string& reason) return false; } - if (emulate027) - continue; - // The raw data is stored as hex-octets, which we want to decode. auto data = strUnHex (memoElement.getText ());