diff --git a/include/xrpl/protocol/Feature.h b/include/xrpl/protocol/Feature.h index 0e3a04cd5..0fe67e179 100644 --- a/include/xrpl/protocol/Feature.h +++ b/include/xrpl/protocol/Feature.h @@ -80,7 +80,7 @@ namespace detail { // Feature.cpp. Because it's only used to reserve storage, and determine how // large to make the FeatureBitset, it MAY be larger. It MUST NOT be less than // the actual number of amendments. A LogicError on startup will verify this. -static constexpr std::size_t numFeatures = 117; +static constexpr std::size_t numFeatures = 116; /** Amendments that this server supports and the default voting behavior. Whether they are enabled depends on the Rules defined in the validated diff --git a/include/xrpl/protocol/detail/features.macro b/include/xrpl/protocol/detail/features.macro index 7dea751ae..fdc9bb6d5 100644 --- a/include/xrpl/protocol/detail/features.macro +++ b/include/xrpl/protocol/detail/features.macro @@ -45,7 +45,6 @@ XRPL_FIX (ReducedOffersV2, Supported::yes, VoteBehavior::DefaultNo XRPL_FEATURE(NFTokenMintOffer, Supported::yes, VoteBehavior::DefaultNo) XRPL_FIX (AMMv1_1, Supported::yes, VoteBehavior::DefaultNo) XRPL_FIX (PreviousTxnID, Supported::yes, VoteBehavior::DefaultNo) -XRPL_FIX (XChainRewardRounding, Supported::yes, VoteBehavior::DefaultNo) XRPL_FEATURE(PriceOracle, Supported::yes, VoteBehavior::DefaultNo) XRPL_FIX (AMMOverflowOffer, Supported::yes, VoteBehavior::DefaultYes) XRPL_FIX (InnerObjTemplate, Supported::yes, VoteBehavior::DefaultNo) diff --git a/src/xrpld/app/tx/detail/XChainBridge.cpp b/src/xrpld/app/tx/detail/XChainBridge.cpp index e49bbed26..589ae1084 100644 --- a/src/xrpld/app/tx/detail/XChainBridge.cpp +++ b/src/xrpld/app/tx/detail/XChainBridge.cpp @@ -678,10 +678,7 @@ finalizeClaimHelper( // if the transfer failed, distribute the pool for "OnTransferFail" // cases (the attesters did their job) STAmount const share = [&] { - auto const round_mode = - innerSb.rules().enabled(fixXChainRewardRounding) - ? Number::rounding_mode::downward - : Number::getround(); + auto const round_mode = Number::rounding_mode::downward; saveNumberRoundMode _{Number::setround(round_mode)}; STAmount const den{rewardAccounts.size()};