diff --git a/src/ripple/app/tx/impl/Escrow.cpp b/src/ripple/app/tx/impl/Escrow.cpp index 30a74c138c..07d72f7875 100644 --- a/src/ripple/app/tx/impl/Escrow.cpp +++ b/src/ripple/app/tx/impl/Escrow.cpp @@ -147,10 +147,7 @@ EscrowCreate::preflight(PreflightContext const& ctx) return temMALFORMED; } - // Conditions other than PrefixSha256 require the - // "CryptoConditionsSuite" amendment: - if (condition->type != Type::preimageSha256 && - !ctx.rules.enabled(featureCryptoConditionsSuite)) + if (condition->type != Type::preimageSha256) return temDISABLED; } diff --git a/src/ripple/protocol/Feature.h b/src/ripple/protocol/Feature.h index ae05c8c1d1..e378ec49ee 100644 --- a/src/ripple/protocol/Feature.h +++ b/src/ripple/protocol/Feature.h @@ -83,7 +83,7 @@ class FeatureCollections "TickSize", "fix1368", "Escrow", - "CryptoConditionsSuite", + // "CryptoConditionsSuite", "fix1373", "EnforceInvariants", "SortedDirectories", @@ -348,7 +348,6 @@ extern uint256 const featureOwnerPaysFee; extern uint256 const featureFlow; extern uint256 const featureCompareTakerFlowCross; extern uint256 const featureFlowCross; -extern uint256 const featureCryptoConditionsSuite; extern uint256 const fix1513; extern uint256 const featureDepositAuth; extern uint256 const featureChecks; diff --git a/src/ripple/protocol/impl/Feature.cpp b/src/ripple/protocol/impl/Feature.cpp index 9d88c9d211..b9c9567393 100644 --- a/src/ripple/protocol/impl/Feature.cpp +++ b/src/ripple/protocol/impl/Feature.cpp @@ -102,7 +102,7 @@ detail::supportedAmendments() "TickSize", "fix1368", "Escrow", - "CryptoConditionsSuite", + // "CryptoConditionsSuite", DO NOT REUSE "fix1373", "EnforceInvariants", "FlowCross", @@ -163,7 +163,6 @@ uint256 const featureFlow = *getRegisteredFeature("Flow"), featureCompareTakerFlowCross = *getRegisteredFeature("CompareTakerFlowCross"), featureFlowCross = *getRegisteredFeature("FlowCross"), - featureCryptoConditionsSuite = *getRegisteredFeature("CryptoConditionsSuite"), fix1513 = *getRegisteredFeature("fix1513"), featureDepositAuth = *getRegisteredFeature("DepositAuth"), featureChecks = *getRegisteredFeature("Checks"),