From db0611f2277e8e2f3dadc92ba36de582861acae6 Mon Sep 17 00:00:00 2001 From: Scott Determan Date: Fri, 15 Sep 2023 11:08:17 -0400 Subject: [PATCH] Change `XChainBridge` amendment to `Supported::yes` (#4709) --- src/ripple/protocol/impl/BuildInfo.cpp | 2 +- src/ripple/protocol/impl/Feature.cpp | 2 +- src/test/app/XChain_test.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ripple/protocol/impl/BuildInfo.cpp b/src/ripple/protocol/impl/BuildInfo.cpp index f6ca21e43e4..933cca3a7e9 100644 --- a/src/ripple/protocol/impl/BuildInfo.cpp +++ b/src/ripple/protocol/impl/BuildInfo.cpp @@ -33,7 +33,7 @@ namespace BuildInfo { // and follow the format described at http://semver.org/ //------------------------------------------------------------------------------ // clang-format off -char const* const versionString = "1.12.0" +char const* const versionString = "2.0.0-b1" // clang-format on #if defined(DEBUG) || defined(SANITIZER) diff --git a/src/ripple/protocol/impl/Feature.cpp b/src/ripple/protocol/impl/Feature.cpp index dcb35641360..aa41b7d5b6e 100644 --- a/src/ripple/protocol/impl/Feature.cpp +++ b/src/ripple/protocol/impl/Feature.cpp @@ -455,7 +455,7 @@ REGISTER_FIX (fixNFTokenRemint, Supported::yes, VoteBehavior::De REGISTER_FIX (fixReducedOffersV1, Supported::yes, VoteBehavior::DefaultNo); REGISTER_FEATURE(Clawback, Supported::yes, VoteBehavior::DefaultNo); REGISTER_FEATURE(AMM, Supported::yes, VoteBehavior::DefaultNo); -REGISTER_FEATURE(XChainBridge, Supported::no, VoteBehavior::DefaultNo); +REGISTER_FEATURE(XChainBridge, Supported::yes, VoteBehavior::DefaultNo); // The following amendments are obsolete, but must remain supported // because they could potentially get enabled. diff --git a/src/test/app/XChain_test.cpp b/src/test/app/XChain_test.cpp index 14fcf8bf3cd..a27370dbf02 100644 --- a/src/test/app/XChain_test.cpp +++ b/src/test/app/XChain_test.cpp @@ -532,7 +532,7 @@ struct XChain_test : public beast::unit_test::suite, // coverage test: BridgeCreate::preflight() - create bridge when feature // disabled. { - Env env(*this); + Env env(*this, supported_amendments() - featureXChainBridge); env(create_bridge(Account::master, jvb), ter(temDISABLED)); }