diff --git a/include/xrpl/protocol/detail/features.macro b/include/xrpl/protocol/detail/features.macro index fc9561e4104..aa0782b1378 100644 --- a/include/xrpl/protocol/detail/features.macro +++ b/include/xrpl/protocol/detail/features.macro @@ -30,7 +30,7 @@ // in include/xrpl/protocol/Feature.h. // Check flags in Credential transactions -XRPL_FIX (TransactionFlags, Supported::yes, VoteBehavior::DefaultNo) +XRPL_FIX (InvalidTxFlags, Supported::yes, VoteBehavior::DefaultNo) XRPL_FIX (FrozenLPTokenTransfer, Supported::yes, VoteBehavior::DefaultNo) XRPL_FEATURE(DeepFreeze, Supported::yes, VoteBehavior::DefaultNo) XRPL_FEATURE(PermissionedDomains, Supported::no, VoteBehavior::DefaultNo) diff --git a/src/test/app/Credentials_test.cpp b/src/test/app/Credentials_test.cpp index 48386c2770c..481850562fd 100644 --- a/src/test/app/Credentials_test.cpp +++ b/src/test/app/Credentials_test.cpp @@ -1063,7 +1063,7 @@ struct Credentials_test : public beast::unit_test::suite { using namespace test::jtx; - bool const enabled = features[fixTransactionFlags]; + bool const enabled = features[fixInvalidTxFlags]; testcase( std::string("Test flag, fix ") + (enabled ? "enabled" : "disabled")); @@ -1106,7 +1106,7 @@ struct Credentials_test : public beast::unit_test::suite testAcceptFailed(all); testDeleteFailed(all); testFeatureFailed(all - featureCredentials); - testFlags(all - fixTransactionFlags); + testFlags(all - fixInvalidTxFlags); testFlags(all); testRPC(); } diff --git a/src/test/app/MultiSign_test.cpp b/src/test/app/MultiSign_test.cpp index d9d9f405604..9648bed886f 100644 --- a/src/test/app/MultiSign_test.cpp +++ b/src/test/app/MultiSign_test.cpp @@ -1683,7 +1683,7 @@ class MultiSign_test : public beast::unit_test::suite env.fund(XRP(1000), alice); env.close(); - bool const enabled = features[fixTransactionFlags]; + bool const enabled = features[fixInvalidTxFlags]; testcase( std::string("SignerListSet flag, fix ") + (enabled ? "enabled" : "disabled")); @@ -1732,7 +1732,7 @@ class MultiSign_test : public beast::unit_test::suite testAll(all - featureExpandedSignerList); testAll(all); - test_signerListSetFlags(all - fixTransactionFlags); + test_signerListSetFlags(all - fixInvalidTxFlags); test_signerListSetFlags(all); test_amendmentTransition(); diff --git a/src/xrpld/app/tx/detail/Credentials.cpp b/src/xrpld/app/tx/detail/Credentials.cpp index de38917d288..ca80bc159e3 100644 --- a/src/xrpld/app/tx/detail/Credentials.cpp +++ b/src/xrpld/app/tx/detail/Credentials.cpp @@ -65,7 +65,7 @@ CredentialCreate::preflight(PreflightContext const& ctx) auto const& tx = ctx.tx; auto& j = ctx.j; - if (ctx.rules.enabled(fixTransactionFlags) && + if (ctx.rules.enabled(fixInvalidTxFlags) && (tx.getFlags() & tfUniversalMask)) { JLOG(ctx.j.debug()) << "CredentialCreate: invalid flags."; @@ -216,7 +216,7 @@ CredentialDelete::preflight(PreflightContext const& ctx) if (auto const ret = preflight1(ctx); !isTesSuccess(ret)) return ret; - if (ctx.rules.enabled(fixTransactionFlags) && + if (ctx.rules.enabled(fixInvalidTxFlags) && (ctx.tx.getFlags() & tfUniversalMask)) { JLOG(ctx.j.debug()) << "CredentialDelete: invalid flags."; @@ -303,7 +303,7 @@ CredentialAccept::preflight(PreflightContext const& ctx) if (auto const ret = preflight1(ctx); !isTesSuccess(ret)) return ret; - if (ctx.rules.enabled(fixTransactionFlags) && + if (ctx.rules.enabled(fixInvalidTxFlags) && (ctx.tx.getFlags() & tfUniversalMask)) { JLOG(ctx.j.debug()) << "CredentialAccept: invalid flags."; diff --git a/src/xrpld/app/tx/detail/SetSignerList.cpp b/src/xrpld/app/tx/detail/SetSignerList.cpp index 363889db3da..173107e02ae 100644 --- a/src/xrpld/app/tx/detail/SetSignerList.cpp +++ b/src/xrpld/app/tx/detail/SetSignerList.cpp @@ -83,7 +83,7 @@ SetSignerList::preflight(PreflightContext const& ctx) if (auto const ret = preflight1(ctx); !isTesSuccess(ret)) return ret; - if (ctx.rules.enabled(fixTransactionFlags) && + if (ctx.rules.enabled(fixInvalidTxFlags) && (ctx.tx.getFlags() & tfUniversalMask)) { JLOG(ctx.j.debug()) << "SetSignerList: invalid flags.";