From 2eb873a59042aa01025a4504a5217c9818a95edd Mon Sep 17 00:00:00 2001 From: yinyiqian1 Date: Wed, 15 Jul 2026 19:55:29 -0400 Subject: [PATCH] address comment --- include/xrpl/protocol/TxFlags.h | 4 ++-- .../token/MPTokenIssuanceCreate.cpp | 2 +- src/test/app/ConfidentialTransfer_test.cpp | 22 +++++-------------- src/test/app/MPToken_test.cpp | 7 ++---- src/test/app/Vault_test.cpp | 3 +-- 5 files changed, 12 insertions(+), 26 deletions(-) diff --git a/include/xrpl/protocol/TxFlags.h b/include/xrpl/protocol/TxFlags.h index 6aa359c38e..9cee3947e9 100644 --- a/include/xrpl/protocol/TxFlags.h +++ b/include/xrpl/protocol/TxFlags.h @@ -356,7 +356,7 @@ inline constexpr FlagValue tfMPTPaymentMask = ~(tfUniversal | tfPartialPayment); inline constexpr FlagValue tfTrustSetPermissionMask = ~(tfUniversal | tfSetfAuth | tfSetFreeze | tfClearFreeze); -// MPTokenIssuanceCreate MutableFlags: +// MPTokenIssuanceCreate ImmutableFlags: // Indicating specific fields or flags may be changed after issuance. inline constexpr FlagValue tifMPTCannotEnableCanLock = lsifMPTCannotEnableCanLock; inline constexpr FlagValue tifMPTCannotEnableRequireAuth = lsifMPTCannotEnableRequireAuth; @@ -368,7 +368,7 @@ inline constexpr FlagValue tifMPTCannotMutateMetadata = lsifMPTCannotMutateMetad inline constexpr FlagValue tifMPTCannotMutateTransferFee = lsifMPTCannotMutateTransferFee; inline constexpr FlagValue tifMPTCannotEnableCanHoldConfidentialBalance = lsifMPTCannotEnableCanHoldConfidentialBalance; -inline constexpr FlagValue tmfMPTokenIssuanceCreateImmutableMask = +inline constexpr FlagValue tifMPTokenIssuanceCreateImmutableMask = ~(tifMPTCannotEnableCanLock | tifMPTCannotEnableRequireAuth | tifMPTCannotEnableCanEscrow | tifMPTCannotEnableCanTrade | tifMPTCannotEnableCanTransfer | tifMPTCannotEnableCanClawback | tifMPTCannotMutateMetadata | tifMPTCannotMutateTransferFee | diff --git a/src/libxrpl/tx/transactors/token/MPTokenIssuanceCreate.cpp b/src/libxrpl/tx/transactors/token/MPTokenIssuanceCreate.cpp index 1d008ad3f0..916e03c568 100644 --- a/src/libxrpl/tx/transactors/token/MPTokenIssuanceCreate.cpp +++ b/src/libxrpl/tx/transactors/token/MPTokenIssuanceCreate.cpp @@ -68,7 +68,7 @@ MPTokenIssuanceCreate::preflight(PreflightContext const& ctx) // specified. if (auto const immutableFlags = ctx.tx[~sfImmutableFlags]; immutableFlags && ((*immutableFlags == 0u) || - ((*immutableFlags & tmfMPTokenIssuanceCreateImmutableMask) != 0u))) + ((*immutableFlags & tifMPTokenIssuanceCreateImmutableMask) != 0u))) return temINVALID_FLAG; if (auto const fee = ctx.tx[~sfTransferFee]) diff --git a/src/test/app/ConfidentialTransfer_test.cpp b/src/test/app/ConfidentialTransfer_test.cpp index 314f643eef..c95cea783d 100644 --- a/src/test/app/ConfidentialTransfer_test.cpp +++ b/src/test/app/ConfidentialTransfer_test.cpp @@ -965,11 +965,7 @@ class ConfidentialTransfer_test : public ConfidentialTransferTestBase Account const alice("alice"); MPTTester mptAlice(env, alice, {.holders = {}}); - mptAlice.create({ - .ownerCount = 1, - .flags = tfMPTCanTransfer | tfMPTCanLock, - .immutableFlags = tifMPTCannotMutateTransferFee, - }); + mptAlice.create({.ownerCount = 1, .flags = tfMPTCanTransfer | tfMPTCanLock}); mptAlice.set({ .account = alice, @@ -986,12 +982,8 @@ class ConfidentialTransfer_test : public ConfidentialTransferTestBase Account const alice("alice"); MPTTester mptAlice(env, alice, {.holders = {}}); - mptAlice.create({ - .transferFee = 100, - .ownerCount = 1, - .flags = tfMPTCanTransfer | tfMPTCanLock, - .immutableFlags = tifMPTCannotMutateTransferFee, - }); + mptAlice.create( + {.transferFee = 100, .ownerCount = 1, .flags = tfMPTCanTransfer | tfMPTCanLock}); mptAlice.set({ .account = alice, @@ -1007,11 +999,9 @@ class ConfidentialTransfer_test : public ConfidentialTransferTestBase Account const alice("alice"); MPTTester mptAlice(env, alice, {.holders = {}}); - mptAlice.create({ - .ownerCount = 1, - .flags = tfMPTCanTransfer | tfMPTCanLock | tfMPTCanHoldConfidentialBalance, - .immutableFlags = tifMPTCannotMutateTransferFee, - }); + mptAlice.create( + {.ownerCount = 1, + .flags = tfMPTCanTransfer | tfMPTCanLock | tfMPTCanHoldConfidentialBalance}); mptAlice.set({ .account = alice, diff --git a/src/test/app/MPToken_test.cpp b/src/test/app/MPToken_test.cpp index f299a1febe..9c0546d825 100644 --- a/src/test/app/MPToken_test.cpp +++ b/src/test/app/MPToken_test.cpp @@ -3482,10 +3482,7 @@ class MPToken_test : public beast::unit_test::Suite { Env env{*this, features}; MPTTester mptAlice(env, alice, {.holders = {bob}}); - mptAlice.create( - {.ownerCount = 1, - .immutableFlags = tifMPTCannotMutateMetadata | tifMPTCannotEnableCanLock | - tifMPTCannotMutateTransferFee}); + mptAlice.create({.ownerCount = 1}); // Setting flags is not allowed when MutableFlags is present mptAlice.set( @@ -7673,7 +7670,7 @@ public: // Test offer crossing testOfferCrossing(all); - // // Test cross asset payment + // Test cross asset payment testCrossAssetPayment(all); // Test path finding diff --git a/src/test/app/Vault_test.cpp b/src/test/app/Vault_test.cpp index 9d9f7df20c..418d6e9589 100644 --- a/src/test/app/Vault_test.cpp +++ b/src/test/app/Vault_test.cpp @@ -2205,8 +2205,7 @@ class Vault_test : public beast::unit_test::Suite Vault const vault{env}; MPTTester mptt{env, issuer, kMptInitNoFund}; - mptt.create( - {.flags = tfMPTCanTransfer | tfMPTCanLock}); + mptt.create({.flags = tfMPTCanTransfer | tfMPTCanLock}); PrettyAsset const asset = mptt.issuanceID(); mptt.authorize({.account = owner}); mptt.authorize({.account = alice});