From 4852daf69590e0410a31ebad4a4a63f17ee75d61 Mon Sep 17 00:00:00 2001
From: seelabs <scott.determan@yahoo.com>
Date: Fri, 6 Mar 2020 13:49:14 -0800
Subject: [PATCH] Remove entry for fix1781 amendment:

The fix1781 amendment was incorrectly introduced during conflict
resolution and support for it is not included at this time. This commit
removes the definition of the amendment identifier.
---
 src/ripple/protocol/Feature.h        | 4 +---
 src/ripple/protocol/impl/Feature.cpp | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/ripple/protocol/Feature.h b/src/ripple/protocol/Feature.h
index ac41b76dbe..d11a7e3e64 100644
--- a/src/ripple/protocol/Feature.h
+++ b/src/ripple/protocol/Feature.h
@@ -110,8 +110,7 @@ class FeatureCollections
         "DeletableAccounts",
         // fixQualityUpperBound should be activated before FlowCross
         "fixQualityUpperBound",
-        "fix1781", // XRPEndpointSteps should be included in the circular payment check
-        "RequireFullyCanonicalSig"
+        "RequireFullyCanonicalSig",
     };
 
     std::vector<uint256> features;
@@ -399,7 +398,6 @@ extern uint256 const fixCheckThreading;
 extern uint256 const fixPayChanRecipientOwnerDir;
 extern uint256 const featureDeletableAccounts;
 extern uint256 const fixQualityUpperBound;
-extern uint256 const fix1781;
 extern uint256 const featureRequireFullyCanonicalSig;
 
 } // ripple
diff --git a/src/ripple/protocol/impl/Feature.cpp b/src/ripple/protocol/impl/Feature.cpp
index 7b2191bbb4..db96583a05 100644
--- a/src/ripple/protocol/impl/Feature.cpp
+++ b/src/ripple/protocol/impl/Feature.cpp
@@ -129,8 +129,7 @@ detail::supportedAmendments ()
         "fixPayChanRecipientOwnerDir",
         "DeletableAccounts",
         "fixQualityUpperBound",
-        "fix1781",
-        "RequireFullyCanonicalSig"
+        "RequireFullyCanonicalSig",
     };
     return supported;
 }
@@ -189,7 +188,6 @@ uint256 const fixCheckThreading = *getRegisteredFeature("fixCheckThreading");
 uint256 const fixPayChanRecipientOwnerDir = *getRegisteredFeature("fixPayChanRecipientOwnerDir");
 uint256 const featureDeletableAccounts = *getRegisteredFeature("DeletableAccounts");
 uint256 const fixQualityUpperBound = *getRegisteredFeature("fixQualityUpperBound");
-uint256 const fix1781 = *getRegisteredFeature("fix1781");
 uint256 const featureRequireFullyCanonicalSig = *getRegisteredFeature("RequireFullyCanonicalSig");
 
 } // ripple