ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2026-06-03 00:36:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix build

Browse Source
This commit is contained in:
Mayukha Vadari
2026-05-29 10:23:21 -04:00
parent e2103b1bef
commit 4dc61deeb4
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/xrpl/protocol/detail/features.macro
View File

@@ -15,7 +15,7 @@
// Add new amendments to the top of this list.
// Keep it sorted in reverse chronological order.
XRPL_FIX (ConstantInvariant, Supported::No, VoteBehavior::DefaultNo)
XRPL_FIX (ImmutableInvariant, Supported::No, VoteBehavior::DefaultNo)
XRPL_FIX (Cleanup3_2_0, Supported::Yes, VoteBehavior::DefaultNo)
XRPL_FEATURE(MPTokensV2, Supported::No, VoteBehavior::DefaultNo)
XRPL_FIX (Cleanup3_1_3, Supported::Yes, VoteBehavior::DefaultYes)

16
src/libxrpl/tx/invariants/InvariantCheck.cpp
View File

@@ -983,34 +983,34 @@ NoModifiedImmutableFields::visitEntry(
changedEntries_.emplace(before, after);
}
// Check whether any constant (or unannotated) fields in the given template
// Check whether any immutable (or unannotated) fields in the given template
// have been modified between before and after.
// TODO(future): recurse into STObject and STArray fields using InnerObjectFormats
static bool
hasConstantFieldChanged(STObject const& before, STObject const& after, SOTemplate const& tmpl)
hasImmutableFieldChanged(STObject const& before, STObject const& after, SOTemplate const& tmpl)
{
for (auto const& elem : tmpl)
{
auto const& sf = elem.sField();
auto const constant = elem.constant();
auto const mutability = elem.mutability();
auto const* bField = before.peekAtPField(sf);
auto const* aField = after.peekAtPField(sf);
bool const bPresent = (bField != nullptr) && bField->getSType() != STI_NOTPRESENT;
bool const aPresent = (aField != nullptr) && aField->getSType() != STI_NOTPRESENT;
if (constant == SoeImmutable)
if (mutability == SoeImmutable)
{
// Field must not change at all, including transitions between
// default (not-present) and explicit values.
if (bPresent != aPresent || (bPresent && aPresent && *bField != *aField))
return true;
}
else if (constant == SoeImmutableSetOnce)
else if (mutability == SoeImmutableSetOnce)
{
XRPL_ASSERT(
elem.style() == SoeOptional,
"xrpl::hasConstantFieldChanged : set-once fields must be optional");
"xrpl::hasImmutableFieldChanged : set-once fields must be optional");
// Field may be set once, but cannot be removed or changed after
// it is present.
@@ -1043,7 +1043,7 @@ NoModifiedImmutableFields::finalize(
return beforeField != afterField || (afterField && before->at(field) != after->at(field));
};
bool const useTemplate = view.rules().enabled(fixConstantInvariant);
bool const useTemplate = view.rules().enabled(fixImmutableInvariant);
for (auto const& slePair : changedEntries_)
{
@@ -1061,7 +1061,7 @@ NoModifiedImmutableFields::finalize(
bool bad = false;
auto const* format = LedgerFormats::getInstance().findByType(type);
if (format != nullptr)
bad = hasConstantFieldChanged(*before, *after, format->getSOTemplate());
bad = hasImmutableFieldChanged(*before, *after, format->getSOTemplate());
// sfLedgerIndex is a non-serialized (discardable) field
// that is not reliably present via peekAtPField, so we