Amendment table clean up (Improve amendment processing and activation logic)

src/ripple/app/main/Application.cpp

@@ -77,11 +77,6 @@
 
 namespace ripple {
 
-// 204/256 about 80%
-static int const MAJORITY_FRACTION_OLD(204);
-// 8/10 = 80%
-static int const MAJORITY_FRACTION(8);
-
 //------------------------------------------------------------------------------
 
 namespace detail {
@@ -1536,7 +1531,7 @@ ApplicationImp::setup()
 
         m_amendmentTable = make_AmendmentTable(
             config().AMENDMENT_MAJORITY_TIME,
-            {MAJORITY_FRACTION_OLD, MAJORITY_FRACTION},
+            {amendmentMajorityFractionOld, amendmentMajorityFraction},
             supportedAmendments,
             enabledAmendments,
             config_->section(SECTION_VETO_AMENDMENTS),

src/ripple/core/Config.h

@@ -174,7 +174,7 @@ class Config : public BasicConfig
     bool COMPRESSION = false;
 
     // Amendment majority time
-    std::chrono::seconds AMENDMENT_MAJORITY_TIME = weeks{2};
+    std::chrono::seconds AMENDMENT_MAJORITY_TIME = defaultAmendmentMajorityTime;
 
     // Thread pool configuration
     std::size_t WORKERS = 0;

src/ripple/core/impl/Config.cpp

@@ -485,24 +485,29 @@ Config::loadFromString(std::string const& fileContents)
     {
         using namespace std::chrono;
         boost::regex const re(
-            "^\\s*(\\d+)\\s*(seconds|minutes|hours|days|weeks)\\s*(\\s+.*)?$");
+            "^\\s*(\\d+)\\s*(minutes|hours|days|weeks)\\s*(\\s+.*)?$");
         boost::smatch match;
         if (!boost::regex_match(strTemp, match, re))
             Throw<std::runtime_error>(
                 "Invalid " SECTION_AMENDMENT_MAJORITY_TIME
-                ", must be: [0-9]+ [seconds|minutes|hours|days|weeks]");
+                ", must be: [0-9]+ [minutes|hours|days|weeks]");
+
         std::uint32_t duration =
             beast::lexicalCastThrow<std::uint32_t>(match[1].str());
-        if (boost::iequals(match[2], "seconds"))
-            AMENDMENT_MAJORITY_TIME = seconds(duration);
-        else if (boost::iequals(match[2], "minutes"))
+
+        if (boost::iequals(match[2], "minutes"))
             AMENDMENT_MAJORITY_TIME = minutes(duration);
         else if (boost::iequals(match[2], "hours"))
             AMENDMENT_MAJORITY_TIME = hours(duration);
         else if (boost::iequals(match[2], "days"))
             AMENDMENT_MAJORITY_TIME = days(duration);
         else if (boost::iequals(match[2], "weeks"))
             AMENDMENT_MAJORITY_TIME = weeks(duration);
+
+        if (AMENDMENT_MAJORITY_TIME < defaultAmendmentMajorityTime)
+            Throw<std::runtime_error>(
+                    "Invalid " SECTION_AMENDMENT_MAJORITY_TIME
+                    ", the minimum amount of time an amendment must hold a majority is 15 minutes");
     }
 
     // Do not load trusted validator configuration for standalone mode

src/ripple/protocol/SystemParameters.h

@@ -21,6 +21,7 @@
 #define RIPPLE_PROTOCOL_SYSTEMPARAMETERS_H_INCLUDED
 
 #include <ripple/basics/XRPAmount.h>
+#include <ripple/basics/chrono.h>
 #include <cstdint>
 #include <string>
 
@@ -59,6 +60,18 @@ systemCurrencyCode()
 /** The XRP ledger network's earliest allowed sequence */
 static std::uint32_t constexpr XRP_LEDGER_EARLIEST_SEQ{32570};
 
+/** The minimum amount of support an amendment should have.
+
+    @note This value is used by legacy code and will become obsolete
+          once the fix3396 amendment activates.
+*/
+    constexpr int const amendmentMajorityFractionOld = 204;
+
+    constexpr int const amendmentMajorityFraction = 8;
+
+/** The minimum amount of time an amendment must hold a majority */
+    constexpr std::chrono::seconds const defaultAmendmentMajorityTime = weeks{2};
+
 }  // namespace ripple
 
 #endif