From 7c7ba59746df18c1505c87a03abdd9cd7df834a0 Mon Sep 17 00:00:00 2001 From: Shawn Xie Date: Mon, 30 Oct 2023 16:36:38 -0400 Subject: [PATCH] flag renaming --- src/ripple/protocol/LedgerFormats.h | 4 ++-- src/ripple/protocol/TxFlags.h | 6 +++--- src/ripple/protocol/impl/LedgerFormats.cpp | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ripple/protocol/LedgerFormats.h b/src/ripple/protocol/LedgerFormats.h index 1a74855d626..6631b97fbdd 100644 --- a/src/ripple/protocol/LedgerFormats.h +++ b/src/ripple/protocol/LedgerFormats.h @@ -311,8 +311,8 @@ enum LedgerSpecificFlags { lsfSellNFToken = 0x00000001, // ltCFTOKEN_ISSUANCE - lsfCFTIsLocked = 0x00000001, - lsfCFTCannotLockBalances = 0x00000002, + lsfCFTLocked = 0x00000001, + lsfCFTCanLock = 0x00000002, lsfCFTRequireAuth = 0x00000004, lsfCFTCanEscrow = 0x00000008, lsfCFTCanTrade = 0x00000010, diff --git a/src/ripple/protocol/TxFlags.h b/src/ripple/protocol/TxFlags.h index a7a68c8707e..dd94350a5f9 100644 --- a/src/ripple/protocol/TxFlags.h +++ b/src/ripple/protocol/TxFlags.h @@ -134,8 +134,8 @@ constexpr std::uint32_t const tfTransferable = 0x00000008; // CFTokenIssuanceCreate flags: // NOTE - there is intentionally no flag here for 0x01 because that -// corresponds to lsfCFTIsLocked, which this transaction cannot mutate. -constexpr std::uint32_t const tfCFTCannotLockBalances = lsfCFTCannotLockBalances; +// corresponds to lsfCFTLocked, which this transaction cannot mutate. +constexpr std::uint32_t const tfCFTCanLock = lsfCFTCanLock; constexpr std::uint32_t const tfCFTRequireAuth = lsfCFTRequireAuth; constexpr std::uint32_t const tfCFTCanEscrow = lsfCFTCanEscrow; constexpr std::uint32_t const tfCFTCanTrade = lsfCFTCanTrade; @@ -199,7 +199,7 @@ constexpr std::uint32_t tfBridgeModifyMask = ~(tfUniversal | tfClearAccountCreat // CFTokenIssuanceCreate flags: constexpr std::uint32_t const tfCFTokenIssuanceCreateMask = - ~(tfCFTCannotLockBalances | tfCFTRequireAuth | tfCFTCanEscrow | tfCFTCanTrade | tfCFTCanTransfer | tfCFTCanClawback | tfUniversal); + ~(tfCFTCanLock | tfCFTRequireAuth | tfCFTCanEscrow | tfCFTCanTrade | tfCFTCanTransfer | tfCFTCanClawback | tfUniversal); // clang-format on diff --git a/src/ripple/protocol/impl/LedgerFormats.cpp b/src/ripple/protocol/impl/LedgerFormats.cpp index 7915defe4c0..9e86a61000e 100644 --- a/src/ripple/protocol/impl/LedgerFormats.cpp +++ b/src/ripple/protocol/impl/LedgerFormats.cpp @@ -349,7 +349,7 @@ LedgerFormats::LedgerFormats() {sfAssetScale, soeDEFAULT}, {sfMaximumAmount, soeOPTIONAL}, {sfOutstandingAmount, soeREQUIRED}, - {sfLockedAmount, soeREQUIRED}, + {sfLockedAmount, soeDEFAULT}, {sfCFTokenMetadata, soeOPTIONAL}, }, commonFields);