Merge branch 'develop' into ximinez/lending-transitive-amendments

- Optimize to do the quicker check first.

src/libxrpl/protocol/Rules.cpp

@@ -116,12 +116,47 @@ Rules::presets() const
     return impl_->presets();
 }
 
+/** Define features that can be considered enabled based on other features.
+ *
+ * This is a simple key-value map where
+ *   - the key is the feature being checked
+ *   - the value is a set of other features, which, in any of them are enabled,
+ *     will cause the key feature to be considered enabled.
+ *
+ */
+std::map<uint256, std::vector<uint256>> const&
+getTransitiveFeatureMap()
+{
+    static std::map<uint256, std::vector<uint256>> const featureToOverride{
+        // In this example, if LendingProtocol is enabled, then
+        // SingleAssetVault can also be considered enabled. This example
+        // is commented because both amendments have been released as
+        // supported, and this would change their behaviors. Only new
+        // amendments my be included in the value set.
+        //
+        // {featureSingleAssetVault, {featureLendingProtocol}},
+    };
+    return featureToOverride;
+}
+
 bool
 Rules::enabled(uint256 const& feature) const
 {
     XRPL_ASSERT(impl_, "xrpl::Rules::enabled : initialized");
 
-    return impl_->enabled(feature);
+    if (impl_->enabled(feature))
+        return true;
+
+    // Some features can be considered enabled based on other enabled features.
+    static auto const& transitiveFeatureMap = getTransitiveFeatureMap();
+    // If this feature is not one of them, then we're done.
+    if (!transitiveFeatureMap.contains(feature))
+        return false;
+
+    auto const& transitiveFeatures = transitiveFeatureMap.at(feature);
+    return std::any_of(transitiveFeatures.begin(), transitiveFeatures.end(), [this](auto const& f) {
+        return impl_->enabled(f);
+    });
 }
 
 bool