From d7ec90cfaa10b2b78289870c2cfed65218c80fc0 Mon Sep 17 00:00:00 2001 From: Mayukha Vadari Date: Thu, 30 Apr 2026 15:23:43 -0400 Subject: [PATCH] keylet::signers -> keylet::signerList --- include/xrpl/protocol/Indexes.h | 4 ++-- include/xrpl/protocol/detail/ledger_entries.macro | 2 +- src/libxrpl/protocol/Indexes.cpp | 6 +++--- src/libxrpl/tx/Transactor.cpp | 3 ++- src/libxrpl/tx/transactors/account/AccountSet.cpp | 2 +- src/libxrpl/tx/transactors/account/SetRegularKey.cpp | 2 +- src/libxrpl/tx/transactors/account/SignerListSet.cpp | 6 +++--- src/libxrpl/tx/transactors/bridge/XChainBridge.cpp | 2 +- src/test/app/AccountDelete_test.cpp | 4 ++-- src/test/app/MultiSign_test.cpp | 2 +- src/xrpld/rpc/detail/RPCHelpers.cpp | 2 +- src/xrpld/rpc/handlers/account/AccountInfo.cpp | 2 +- 12 files changed, 19 insertions(+), 18 deletions(-) diff --git a/include/xrpl/protocol/Indexes.h b/include/xrpl/protocol/Indexes.h index 7080cbd300..0202c01164 100644 --- a/include/xrpl/protocol/Indexes.h +++ b/include/xrpl/protocol/Indexes.h @@ -149,7 +149,7 @@ static ticket_t const ticket{}; /** A SignerList */ Keylet -signers(AccountID const& account) noexcept; +signerList(AccountID const& account) noexcept; /** A Check */ /** @{ */ @@ -376,7 +376,7 @@ struct keyletDesc std::array, 6> const directAccountKeylets{ {{.function = &keylet::account, .expectedLEName = jss::AccountRoot, .includeInTests = false}, {.function = &keylet::ownerDir, .expectedLEName = jss::DirectoryNode, .includeInTests = true}, - {.function = &keylet::signers, .expectedLEName = jss::SignerList, .includeInTests = true}, + {.function = &keylet::signerList, .expectedLEName = jss::SignerList, .includeInTests = true}, // It's normally impossible to create an item at nftpage_min, but // test it anyway, since the invariant checks for it. {.function = &keylet::nftpage_min, .expectedLEName = jss::NFTokenPage, .includeInTests = true}, diff --git a/include/xrpl/protocol/detail/ledger_entries.macro b/include/xrpl/protocol/detail/ledger_entries.macro index 9566dd5d31..0c70d0a7a5 100644 --- a/include/xrpl/protocol/detail/ledger_entries.macro +++ b/include/xrpl/protocol/detail/ledger_entries.macro @@ -96,7 +96,7 @@ LEDGER_ENTRY(ltNFTOKEN_PAGE, 0x0050, NFTokenPage, nft_page, ({ /** A ledger object which contains a signer list for an account. - \sa keylet::signers + \sa keylet::signerList */ // All fields are soeREQUIRED because there is always a SignerEntries. // If there are no SignerEntries the node is deleted. diff --git a/src/libxrpl/protocol/Indexes.cpp b/src/libxrpl/protocol/Indexes.cpp index 43f0df3ad6..7bf88a15d8 100644 --- a/src/libxrpl/protocol/Indexes.cpp +++ b/src/libxrpl/protocol/Indexes.cpp @@ -308,15 +308,15 @@ ticket_t::operator()(AccountID const& id, SeqProxy ticketSeq) const // else. If we ever support multiple pages of signer lists, this would be the // keylet used to locate them. static Keylet -signers(AccountID const& account, std::uint32_t page) noexcept +signerList(AccountID const& account, std::uint32_t page) noexcept { return {ltSIGNER_LIST, indexHash(LedgerNameSpace::SIGNER_LIST, account, page)}; } Keylet -signers(AccountID const& account) noexcept +signerList(AccountID const& account) noexcept { - return signers(account, 0); + return signerList(account, 0); } Keylet diff --git a/src/libxrpl/tx/Transactor.cpp b/src/libxrpl/tx/Transactor.cpp index 9791ee4c9b..208e8e4dbc 100644 --- a/src/libxrpl/tx/Transactor.cpp +++ b/src/libxrpl/tx/Transactor.cpp @@ -815,7 +815,8 @@ Transactor::checkMultiSign( beast::Journal const j) { // Get id's SignerList and Quorum. - std::shared_ptr const sleAccountSigners = view.read(keylet::signers(id)); + std::shared_ptr const sleAccountSigners = + view.read(keylet::signerList(id)); // If the signer list doesn't exist the account is not multi-signing. if (!sleAccountSigners) { diff --git a/src/libxrpl/tx/transactors/account/AccountSet.cpp b/src/libxrpl/tx/transactors/account/AccountSet.cpp index e8555ecc04..8514ad0853 100644 --- a/src/libxrpl/tx/transactors/account/AccountSet.cpp +++ b/src/libxrpl/tx/transactors/account/AccountSet.cpp @@ -382,7 +382,7 @@ AccountSet::doApply() return tecNEED_MASTER_KEY; } - if ((!sle->isFieldPresent(sfRegularKey)) && (!view().peek(keylet::signers(account_)))) + if ((!sle->isFieldPresent(sfRegularKey)) && (!view().peek(keylet::signerList(account_)))) { // Account has no regular key or multi-signer signer list. return tecNO_ALTERNATIVE_KEY; diff --git a/src/libxrpl/tx/transactors/account/SetRegularKey.cpp b/src/libxrpl/tx/transactors/account/SetRegularKey.cpp index bc59ed4fc1..2d407a7ccb 100644 --- a/src/libxrpl/tx/transactors/account/SetRegularKey.cpp +++ b/src/libxrpl/tx/transactors/account/SetRegularKey.cpp @@ -69,7 +69,7 @@ SetRegularKey::doApply() else { // Account has disabled master key and no multi-signer signer list. - if (sle->isFlag(lsfDisableMaster) && !view().peek(keylet::signers(account_))) + if (sle->isFlag(lsfDisableMaster) && !view().peek(keylet::signerList(account_))) return tecNO_ALTERNATIVE_KEY; sle->makeFieldAbsent(sfRegularKey); diff --git a/src/libxrpl/tx/transactors/account/SignerListSet.cpp b/src/libxrpl/tx/transactors/account/SignerListSet.cpp index ee4cf583f4..7168631b73 100644 --- a/src/libxrpl/tx/transactors/account/SignerListSet.cpp +++ b/src/libxrpl/tx/transactors/account/SignerListSet.cpp @@ -232,7 +232,7 @@ SignerListSet::removeFromLedger( { auto const accountKeylet = keylet::account(account); auto const ownerDirKeylet = keylet::ownerDir(account); - auto const signerListKeylet = keylet::signers(account); + auto const signerListKeylet = keylet::signerList(account); return removeSignersFromLedger( registry, view, accountKeylet, ownerDirKeylet, signerListKeylet, j); @@ -302,7 +302,7 @@ SignerListSet::replaceSignerList() { auto const accountKeylet = keylet::account(account_); auto const ownerDirKeylet = keylet::ownerDir(account_); - auto const signerListKeylet = keylet::signers(account_); + auto const signerListKeylet = keylet::signerList(account_); // This may be either a create or a replace. Preemptively remove any // old signer list. May reduce the reserve, so this is done before @@ -367,7 +367,7 @@ SignerListSet::destroySignerList() return tecNO_ALTERNATIVE_KEY; auto const ownerDirKeylet = keylet::ownerDir(account_); - auto const signerListKeylet = keylet::signers(account_); + auto const signerListKeylet = keylet::signerList(account_); return removeSignersFromLedger( ctx_.registry, view(), accountKeylet, ownerDirKeylet, signerListKeylet, j_); } diff --git a/src/libxrpl/tx/transactors/bridge/XChainBridge.cpp b/src/libxrpl/tx/transactors/bridge/XChainBridge.cpp index 461c4ee207..7f47c9165f 100644 --- a/src/libxrpl/tx/transactors/bridge/XChainBridge.cpp +++ b/src/libxrpl/tx/transactors/bridge/XChainBridge.cpp @@ -759,7 +759,7 @@ getSignersListAndQuorum(ReadView const& view, SLE const& sleBridge, beast::Journ return {r, q, tecINTERNAL}; } - auto const sleS = view.read(keylet::signers(sleBridge[sfAccount])); + auto const sleS = view.read(keylet::signerList(sleBridge[sfAccount])); if (!sleS) { return {r, q, tecXCHAIN_NO_SIGNERS_LIST}; diff --git a/src/test/app/AccountDelete_test.cpp b/src/test/app/AccountDelete_test.cpp index c2ecb91a84..2debdc1985 100644 --- a/src/test/app/AccountDelete_test.cpp +++ b/src/test/app/AccountDelete_test.cpp @@ -215,7 +215,7 @@ public: BEAST_EXPECT(env.closed()->exists(keylet::depositPreauth(carol.id(), becky.id()))); BEAST_EXPECT(env.closed()->exists(keylet::offer(carol.id(), carolOfferSeq))); BEAST_EXPECT(env.closed()->exists(keylet::ticket(carol.id(), carolTicketSeq))); - BEAST_EXPECT(env.closed()->exists(keylet::signers(carol.id()))); + BEAST_EXPECT(env.closed()->exists(keylet::signerList(carol.id()))); // Delete carol's account even with stuff in her directory. Show // that multisigning for the delete does not increase carol's fee. @@ -229,7 +229,7 @@ public: BEAST_EXPECT(!env.closed()->exists(keylet::depositPreauth(carol.id(), becky.id()))); BEAST_EXPECT(!env.closed()->exists(keylet::offer(carol.id(), carolOfferSeq))); BEAST_EXPECT(!env.closed()->exists(keylet::ticket(carol.id(), carolTicketSeq))); - BEAST_EXPECT(!env.closed()->exists(keylet::signers(carol.id()))); + BEAST_EXPECT(!env.closed()->exists(keylet::signerList(carol.id()))); // Verify that Carol's XRP, minus the fee, was transferred to becky. BEAST_EXPECT(env.balance(becky) == carolOldBalance + beckyOldBalance - acctDelFee); diff --git a/src/test/app/MultiSign_test.cpp b/src/test/app/MultiSign_test.cpp index f41042644f..0777cc450b 100644 --- a/src/test/app/MultiSign_test.cpp +++ b/src/test/app/MultiSign_test.cpp @@ -1509,7 +1509,7 @@ public: env.close(); // Verify that the SignerList object was created correctly. - auto const& sle = env.le(keylet::signers(alice.id())); + auto const& sle = env.le(keylet::signerList(alice.id())); BEAST_EXPECT(sle); BEAST_EXPECT(sle->getFieldArray(sfSignerEntries).size() == 2); if (features[fixIncludeKeyletFields]) diff --git a/src/xrpld/rpc/detail/RPCHelpers.cpp b/src/xrpld/rpc/detail/RPCHelpers.cpp index 1bf6d32bf9..c81a491f6d 100644 --- a/src/xrpld/rpc/detail/RPCHelpers.cpp +++ b/src/xrpld/rpc/detail/RPCHelpers.cpp @@ -90,7 +90,7 @@ isRelatedToAccount( } if (sle->getType() == ltSIGNER_LIST) { - Keylet const accountSignerList = keylet::signers(accountID); + Keylet const accountSignerList = keylet::signerList(accountID); return sle->key() == accountSignerList.key; } if (sle->getType() == ltNFTOKEN_OFFER) diff --git a/src/xrpld/rpc/handlers/account/AccountInfo.cpp b/src/xrpld/rpc/handlers/account/AccountInfo.cpp index c1c6c71339..ba25e905c3 100644 --- a/src/xrpld/rpc/handlers/account/AccountInfo.cpp +++ b/src/xrpld/rpc/handlers/account/AccountInfo.cpp @@ -222,7 +222,7 @@ doAccountInfo(RPC::JsonContext& context) // This code will need to be revisited if in the future we support // multiple SignerLists on one account. - auto const sleSigners = ledger->read(keylet::signers(accountID)); + auto const sleSigners = ledger->read(keylet::signerList(accountID)); if (sleSigners) jvSignerList.append(sleSigners->getJson(JsonOptions::none));