XRPLF · Tapanito · May 28, 2025 · May 28, 2025 · May 28, 2025 · May 28, 2025
diff --git a/src/test/overlay/reduce_relay_test.cpp → src/test/overlay/base_squelch_test.cpp b/src/test/overlay/reduce_relay_test.cpp → src/test/overlay/base_squelch_test.cpp
diff --git a/src/test/overlay/enhanced_squelch_test.cpp b/src/test/overlay/enhanced_squelch_test.cpp
diff --git a/src/xrpld/core/Config.h b/src/xrpld/core/Config.h
@@ -254,6 +254,9 @@ class Config : public BasicConfig
     std::size_t VP_REDUCE_RELAY_SQUELCH_MAX_SELECTED_PEERS = 5;
     /////////////////    END OF TEMPORARY CODE BLOCK    /////////////////////
 
+    // Enable enhanced squelching of unique untrusted validator messages
+    bool VP_REDUCE_RELAY_ENHANCED_SQUELCH_ENABLE = false;
+
     // Transaction reduce-relay feature
     bool TX_REDUCE_RELAY_ENABLE = false;
     // If tx reduce-relay feature is disabled

diff --git a/src/xrpld/core/detail/Config.cpp b/src/xrpld/core/detail/Config.cpp
@@ -775,6 +775,9 @@ Config::loadFromString(std::string const& fileContents)
                 "greater than or equal to 3");
         /////////////////  !!END OF TEMPORARY CODE BLOCK!! /////////////////////
 
+        VP_REDUCE_RELAY_ENHANCED_SQUELCH_ENABLE =
+            sec.value_or("vp_enhanced_squelch_enable", false);
+
         TX_REDUCE_RELAY_ENABLE = sec.value_or("tx_enable", false);
         TX_REDUCE_RELAY_METRICS = sec.value_or("tx_metrics", false);
         TX_REDUCE_RELAY_MIN_PEERS = sec.value_or("tx_min_peers", 20);

diff --git a/src/xrpld/overlay/ReduceRelayCommon.h b/src/xrpld/overlay/ReduceRelayCommon.h
@@ -21,6 +21,7 @@
 #define RIPPLE_OVERLAY_REDUCERELAYCOMMON_H_INCLUDED
 
 #include <chrono>
+#include <cstdint>
 
 namespace ripple {
 
@@ -39,19 +40,31 @@ static constexpr auto MIN_UNSQUELCH_EXPIRE = std::chrono::seconds{300};
 static constexpr auto MAX_UNSQUELCH_EXPIRE_DEFAULT = std::chrono::seconds{600};
 static constexpr auto SQUELCH_PER_PEER = std::chrono::seconds(10);
 static constexpr auto MAX_UNSQUELCH_EXPIRE_PEERS = std::chrono::seconds{3600};
+
 // No message received threshold before identifying a peer as idled
-static constexpr auto IDLED = std::chrono::seconds{8};
+static constexpr auto PEER_IDLED = std::chrono::seconds{8};
+
 // Message count threshold to start selecting peers as the source
 // of messages from the validator. We add peers who reach
 // MIN_MESSAGE_THRESHOLD to considered pool once MAX_SELECTED_PEERS
 // reach MAX_MESSAGE_THRESHOLD.
 static constexpr uint16_t MIN_MESSAGE_THRESHOLD = 19;
 static constexpr uint16_t MAX_MESSAGE_THRESHOLD = 20;
+
 // Max selected peers to choose as the source of messages from validator
 static constexpr uint16_t MAX_SELECTED_PEERS = 5;
+
+// Max number of untrusted slots the server will maintain
+static constexpr uint16_t MAX_UNTRUSTED_SLOTS = 5;
+
+// The maximum of seconds an untrusted validator can go without sending a
+// validation message. After this, a validator may be squelched
+static constexpr auto MAX_UNTRUSTED_VALIDATOR_IDLE = std::chrono::seconds{30};
+
 // Wait before reduce-relay feature is enabled on boot up to let
 // the server establish peer connections
 static constexpr auto WAIT_ON_BOOTUP = std::chrono::minutes{10};
+
 // Maximum size of the aggregated transaction hashes per peer.
 // Once we get to high tps throughput, this cap will prevent
 // TMTransactions from exceeding the current protocol message