Remove CryptoConditionsSuite stub amendment:

The amendment was partially complete, included no functional code
and, even if activated, it would result in no changes to transaction
proessing. Despite this, removing the amendment is the prudent course
of action and avoids the possibility of an accidental activation.

If additional cryptoconditions are implemented, they will be each
assigned a new, unique amendment code.
This commit is contained in:
seelabs
2020-06-15 06:29:34 -07:00
committed by manojsdoshi
parent 4e33a1abf7
commit d3798f6290
3 changed files with 3 additions and 8 deletions

View File

@@ -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;
}

View File

@@ -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;

View File

@@ -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"),