From aaff5dd10cdb03f31afe291d48f063bab969de31 Mon Sep 17 00:00:00 2001 From: Scott Sadler Date: Sat, 17 Mar 2018 15:13:10 -0300 Subject: [PATCH] explicitly disable replacementpool if cryptoconditions is not enabled --- src/main.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main.cpp b/src/main.cpp index 62fa0c726..fa366964f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1116,6 +1116,11 @@ CAmount GetMinRelayFee(const CTransaction& tx, unsigned int nBytes, bool fAllowF */ bool AcceptToReplacementPool(const CTransaction &tx, CValidationState &state) { + // This is not actually required; if crypto-conditions is disabled, then transactions + // with replaceable outputs will not be accepted as standard. However, just to be a + // bit more explicit. + if (!IsCryptoConditionsEnabled()) return false; + CTxReplacementPoolItem item(tx, GetHeight()); if (!SetReplacementParams(item)) return false;