ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-20 11:05:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Remove CryptoConditionsSuite stub amendment:"

Browse Source 
This reverts commit d3798f6290.
This commit is contained in:
seelabs
2020-08-07 16:10:52 -04:00
committed by manojsdoshi
parent 7bb6b75f3c
commit f79a4a8cdb
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/ripple/app/tx/impl/Escrow.cpp
View File

@@ -147,7 +147,10 @@ EscrowCreate::preflight(PreflightContext const& ctx)
return temMALFORMED; return temMALFORMED;
} }
if (condition->type != Type::preimageSha256) // Conditions other than PrefixSha256 require the
// "CryptoConditionsSuite" amendment:
if (condition->type != Type::preimageSha256 &&
!ctx.rules.enabled(featureCryptoConditionsSuite))
return temDISABLED; return temDISABLED;
} }

3
src/ripple/protocol/Feature.h
View File

@@ -83,7 +83,7 @@ class FeatureCollections
"TickSize", "TickSize",
"fix1368", "fix1368",
"Escrow", "Escrow",
// "CryptoConditionsSuite", "CryptoConditionsSuite",
"fix1373", "fix1373",
"EnforceInvariants", "EnforceInvariants",
"SortedDirectories", "SortedDirectories",
@@ -348,6 +348,7 @@ extern uint256 const featureOwnerPaysFee;
extern uint256 const featureFlow; extern uint256 const featureFlow;
extern uint256 const featureCompareTakerFlowCross; extern uint256 const featureCompareTakerFlowCross;
extern uint256 const featureFlowCross; extern uint256 const featureFlowCross;
extern uint256 const featureCryptoConditionsSuite;
extern uint256 const fix1513; extern uint256 const fix1513;
extern uint256 const featureDepositAuth; extern uint256 const featureDepositAuth;
extern uint256 const featureChecks; extern uint256 const featureChecks;

3
src/ripple/protocol/impl/Feature.cpp
View File

@@ -102,7 +102,7 @@ detail::supportedAmendments()
"TickSize", "TickSize",
"fix1368", "fix1368",
"Escrow", "Escrow",
// "CryptoConditionsSuite", DO NOT REUSE "CryptoConditionsSuite",
"fix1373", "fix1373",
"EnforceInvariants", "EnforceInvariants",
"FlowCross", "FlowCross",
@@ -165,6 +165,7 @@ uint256 const
featureFlow = *getRegisteredFeature("Flow"), featureFlow = *getRegisteredFeature("Flow"),
featureCompareTakerFlowCross = *getRegisteredFeature("CompareTakerFlowCross"), featureCompareTakerFlowCross = *getRegisteredFeature("CompareTakerFlowCross"),
featureFlowCross = *getRegisteredFeature("FlowCross"), featureFlowCross = *getRegisteredFeature("FlowCross"),
featureCryptoConditionsSuite = *getRegisteredFeature("CryptoConditionsSuite"),
fix1513 = *getRegisteredFeature("fix1513"), fix1513 = *getRegisteredFeature("fix1513"),
featureDepositAuth = *getRegisteredFeature("DepositAuth"), featureDepositAuth = *getRegisteredFeature("DepositAuth"),
featureChecks = *getRegisteredFeature("Checks"), featureChecks = *getRegisteredFeature("Checks"),