Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove CryptoConditionsSuite amendment: #3453

Closed
wants to merge 2 commits into from
Closed

Remove CryptoConditionsSuite amendment: #3453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d85d39f
Remove CryptoConditionsSuite amendment:
seelabs Jun 15, 2020
10f000c
[fold] Fix typo
seelabs Jun 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions src/ripple/app/tx/impl/Escrow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
3 changes: 1 addition & 2 deletions src/ripple/protocol/Feature.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ class FeatureCollections
"TickSize",
"fix1368",
"Escrow",
"CryptoConditionsSuite",
// "CryptoConditionsSuite",
"fix1373",
"EnforceInvariants",
"SortedDirectories",
Expand Down Expand Up @@ -347,7 +347,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;
Expand Down
3 changes: 1 addition & 2 deletions src/ripple/protocol/impl/Feature.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ detail::supportedAmendments()
"TickSize",
"fix1368",
"Escrow",
"CryptoConditionsSuite",
// "CryptoConditionsSuite", DO NOT REUSE
"fix1373",
"EnforceInvariants",
"FlowCross",
Expand Down Expand Up @@ -162,7 +162,6 @@ uint256 const
featureFlow = *getRegisteredFeature("Flow"),
featureCompareTakerFlowCross = *getRegisteredFeature("CompareTakerFlowCross"),
featureFlowCross = *getRegisteredFeature("FlowCross"),
featureCryptoConditionsSuite = *getRegisteredFeature("CryptoConditionsSuite"),
fix1513 = *getRegisteredFeature("fix1513"),
featureDepositAuth = *getRegisteredFeature("DepositAuth"),
featureChecks = *getRegisteredFeature("Checks"),
Expand Down