refactor: add rpcName to LEDGER_ENTRY macro (#5202)

The LEDGER_ENTRY macro now takes an additional parameter, which makes it easier to avoid missing including the new field in jss.h and to the list of account_objects/ledger_data filters.

include/xrpl/protocol/LedgerFormats.h

@@ -56,7 +56,7 @@ enum LedgerEntryType : std::uint16_t
 #pragma push_macro("LEDGER_ENTRY")
 #undef LEDGER_ENTRY
 
-#define LEDGER_ENTRY(tag, value, name, fields) tag = value,
+#define LEDGER_ENTRY(tag, value, name, rpcName, fields) tag = value,
 
 #include <xrpl/protocol/detail/ledger_entries.macro>
 

include/xrpl/protocol/detail/ledger_entries.macro

@@ -21,6 +21,17 @@
 #error "undefined macro: LEDGER_ENTRY"
 #endif
 
+#ifndef LEDGER_ENTRY_DUPLICATE
+// The EXPAND macro is needed for Windows
+// https://stackoverflow.com/questions/5134523/msvc-doesnt-expand-va-args-correctly
+#define EXPAND(x) x
+
+// The `LEDGER_ENTRY_DUPLICATE macro is needed to avoid JSS conflicts
+// Since some transactions and ledger entries have the same name (like `DepositPreauth`)
+// The compiler won't accept two instances of `JSS(DepositPreauth)`
+#define LEDGER_ENTRY_DUPLICATE(...) EXPAND(LEDGER_ENTRY(__VA_ARGS__))
+#endif
+
 /**
  * These objects are listed in order of increasing ledger type ID.
  * There are many gaps between these IDs.
@@ -31,7 +42,7 @@
 
     \sa keylet::nftoffer
  */
-LEDGER_ENTRY(ltNFTOKEN_OFFER, 0x0037, NFTokenOffer, ({
+LEDGER_ENTRY(ltNFTOKEN_OFFER, 0x0037, NFTokenOffer, nft_offer, ({
     {sfOwner,                soeREQUIRED},
     {sfNFTokenID,            soeREQUIRED},
     {sfAmount,               soeREQUIRED},
@@ -47,7 +58,7 @@ LEDGER_ENTRY(ltNFTOKEN_OFFER, 0x0037, NFTokenOffer, ({
 
     \sa keylet::check
  */
-LEDGER_ENTRY(ltCHECK, 0x0043, Check, ({
+LEDGER_ENTRY(ltCHECK, 0x0043, Check, check, ({
     {sfAccount,              soeREQUIRED},
     {sfDestination,          soeREQUIRED},
     {sfSendMax,              soeREQUIRED},
@@ -66,7 +77,7 @@ LEDGER_ENTRY(ltCHECK, 0x0043, Check, ({
 
    \sa keylet::did
 */
-LEDGER_ENTRY(ltDID, 0x0049, DID, ({
+LEDGER_ENTRY(ltDID, 0x0049, DID, did, ({
     {sfAccount,              soeREQUIRED},
     {sfDIDDocument,          soeOPTIONAL},
     {sfURI,                  soeOPTIONAL},
@@ -82,7 +93,7 @@ LEDGER_ENTRY(ltDID, 0x0049, DID, ({
 
     \sa keylet::negativeUNL
  */
-LEDGER_ENTRY(ltNEGATIVE_UNL, 0x004e, NegativeUNL, ({
+LEDGER_ENTRY(ltNEGATIVE_UNL, 0x004e, NegativeUNL, nunl, ({
     {sfDisabledValidators,   soeOPTIONAL},
     {sfValidatorToDisable,   soeOPTIONAL},
     {sfValidatorToReEnable,  soeOPTIONAL},
@@ -94,7 +105,7 @@ LEDGER_ENTRY(ltNEGATIVE_UNL, 0x004e, NegativeUNL, ({
 
     \sa keylet::nftpage_min, keylet::nftpage_max, keylet::nftpage
  */
-LEDGER_ENTRY(ltNFTOKEN_PAGE, 0x0050, NFTokenPage, ({
+LEDGER_ENTRY(ltNFTOKEN_PAGE, 0x0050, NFTokenPage, nft_page, ({
     {sfPreviousPageMin,      soeOPTIONAL},
     {sfNextPageMin,          soeOPTIONAL},
     {sfNFTokens,             soeREQUIRED},
@@ -108,7 +119,7 @@ LEDGER_ENTRY(ltNFTOKEN_PAGE, 0x0050, NFTokenPage, ({
  */
 // All fields are soeREQUIRED because there is always a SignerEntries.
 // If there are no SignerEntries the node is deleted.
-LEDGER_ENTRY(ltSIGNER_LIST, 0x0053, SignerList, ({
+LEDGER_ENTRY(ltSIGNER_LIST, 0x0053, SignerList, signer_list, ({
     {sfOwnerNode,            soeREQUIRED},
     {sfSignerQuorum,         soeREQUIRED},
     {sfSignerEntries,        soeREQUIRED},
@@ -121,7 +132,7 @@ LEDGER_ENTRY(ltSIGNER_LIST, 0x0053, SignerList, ({
 
     \sa keylet::ticket
  */
-LEDGER_ENTRY(ltTICKET, 0x0054, Ticket, ({
+LEDGER_ENTRY(ltTICKET, 0x0054, Ticket, ticket, ({
     {sfAccount,              soeREQUIRED},
     {sfOwnerNode,            soeREQUIRED},
     {sfTicketSequence,       soeREQUIRED},
@@ -133,7 +144,7 @@ LEDGER_ENTRY(ltTICKET, 0x0054, Ticket, ({
 
     \sa keylet::account
  */
-LEDGER_ENTRY(ltACCOUNT_ROOT, 0x0061, AccountRoot, ({
+LEDGER_ENTRY(ltACCOUNT_ROOT, 0x0061, AccountRoot, account, ({
     {sfAccount,              soeREQUIRED},
     {sfSequence,             soeREQUIRED},
     {sfBalance,              soeREQUIRED},
@@ -162,7 +173,7 @@ LEDGER_ENTRY(ltACCOUNT_ROOT, 0x0061, AccountRoot, ({
     \sa keylet::page, keylet::quality, keylet::book, keylet::next and
         keylet::ownerDir
  */
-LEDGER_ENTRY(ltDIR_NODE, 0x0064, DirectoryNode, ({
+LEDGER_ENTRY(ltDIR_NODE, 0x0064, DirectoryNode, directory, ({
     {sfOwner,                soeOPTIONAL},  // for owner directories
     {sfTakerPaysCurrency,    soeOPTIONAL},  // order book directories
     {sfTakerPaysIssuer,      soeOPTIONAL},  // order book directories
@@ -184,7 +195,7 @@ LEDGER_ENTRY(ltDIR_NODE, 0x0064, DirectoryNode, ({
 
     \sa keylet::amendments
  */
-LEDGER_ENTRY(ltAMENDMENTS, 0x0066, Amendments, ({
+LEDGER_ENTRY(ltAMENDMENTS, 0x0066, Amendments, amendments, ({
     {sfAmendments,           soeOPTIONAL},  // Enabled
     {sfMajorities,           soeOPTIONAL},
     {sfPreviousTxnID,        soeOPTIONAL},
@@ -199,7 +210,7 @@ LEDGER_ENTRY(ltAMENDMENTS, 0x0066, Amendments, ({
 
     \sa keylet::skip
  */
-LEDGER_ENTRY(ltLEDGER_HASHES, 0x0068, LedgerHashes, ({
+LEDGER_ENTRY(ltLEDGER_HASHES, 0x0068, LedgerHashes, hashes, ({
     {sfFirstLedgerSequence,  soeOPTIONAL},
     {sfLastLedgerSequence,   soeOPTIONAL},
     {sfHashes,               soeREQUIRED},
@@ -209,7 +220,7 @@ LEDGER_ENTRY(ltLEDGER_HASHES, 0x0068, LedgerHashes, ({
 
     \sa keylet::bridge
 */
-LEDGER_ENTRY(ltBRIDGE, 0x0069, Bridge, ({
+LEDGER_ENTRY(ltBRIDGE, 0x0069, Bridge, bridge, ({
     {sfAccount,                  soeREQUIRED},
     {sfSignatureReward,          soeREQUIRED},
     {sfMinAccountCreateAmount,   soeOPTIONAL},
@@ -226,7 +237,7 @@ LEDGER_ENTRY(ltBRIDGE, 0x0069, Bridge, ({
 
     \sa keylet::offer
  */
-LEDGER_ENTRY(ltOFFER, 0x006f, Offer, ({
+LEDGER_ENTRY(ltOFFER, 0x006f, Offer, offer, ({
     {sfAccount,              soeREQUIRED},
     {sfSequence,             soeREQUIRED},
     {sfTakerPays,            soeREQUIRED},
@@ -243,7 +254,7 @@ LEDGER_ENTRY(ltOFFER, 0x006f, Offer, ({
 
     \sa keylet::depositPreauth
  */
-LEDGER_ENTRY(ltDEPOSIT_PREAUTH, 0x0070, DepositPreauth, ({
+LEDGER_ENTRY_DUPLICATE(ltDEPOSIT_PREAUTH, 0x0070, DepositPreauth, deposit_preauth, ({
     {sfAccount,              soeREQUIRED},
     {sfAuthorize,            soeOPTIONAL},
     {sfOwnerNode,            soeREQUIRED},
@@ -256,7 +267,7 @@ LEDGER_ENTRY(ltDEPOSIT_PREAUTH, 0x0070, DepositPreauth, ({
 
     \sa keylet::xChainClaimID
 */
-LEDGER_ENTRY(ltXCHAIN_OWNED_CLAIM_ID, 0x0071, XChainOwnedClaimID, ({
+LEDGER_ENTRY(ltXCHAIN_OWNED_CLAIM_ID, 0x0071, XChainOwnedClaimID, xchain_owned_claim_id, ({
     {sfAccount,                 soeREQUIRED},
     {sfXChainBridge,            soeREQUIRED},
     {sfXChainClaimID,           soeREQUIRED},
@@ -274,7 +285,7 @@ LEDGER_ENTRY(ltXCHAIN_OWNED_CLAIM_ID, 0x0071, XChainOwnedClaimID, ({
 
     \sa keylet::line
  */
-LEDGER_ENTRY(ltRIPPLE_STATE, 0x0072, RippleState, ({
+LEDGER_ENTRY(ltRIPPLE_STATE, 0x0072, RippleState, state, ({
     {sfBalance,              soeREQUIRED},
     {sfLowLimit,             soeREQUIRED},
     {sfHighLimit,            soeREQUIRED},
@@ -294,7 +305,7 @@ LEDGER_ENTRY(ltRIPPLE_STATE, 0x0072, RippleState, ({
 
     \sa keylet::fees
  */
-LEDGER_ENTRY(ltFEE_SETTINGS, 0x0073, FeeSettings, ({
+LEDGER_ENTRY(ltFEE_SETTINGS, 0x0073, FeeSettings, fee, ({
     // Old version uses raw numbers
     {sfBaseFee,                soeOPTIONAL},
     {sfReferenceFeeUnits,      soeOPTIONAL},
@@ -312,7 +323,7 @@ LEDGER_ENTRY(ltFEE_SETTINGS, 0x0073, FeeSettings, ({
 
     \sa keylet::xChainCreateAccountClaimID
 */
-LEDGER_ENTRY(ltXCHAIN_OWNED_CREATE_ACCOUNT_CLAIM_ID, 0x0074, XChainOwnedCreateAccountClaimID, ({
+LEDGER_ENTRY(ltXCHAIN_OWNED_CREATE_ACCOUNT_CLAIM_ID, 0x0074, XChainOwnedCreateAccountClaimID, xchain_owned_create_account_claim_id, ({
     {sfAccount,                         soeREQUIRED},
     {sfXChainBridge,                    soeREQUIRED},
     {sfXChainAccountCreateCount,        soeREQUIRED},
@@ -326,7 +337,7 @@ LEDGER_ENTRY(ltXCHAIN_OWNED_CREATE_ACCOUNT_CLAIM_ID, 0x0074, XChainOwnedCreateAc
 
     \sa keylet::escrow
  */
-LEDGER_ENTRY(ltESCROW, 0x0075, Escrow, ({
+LEDGER_ENTRY(ltESCROW, 0x0075, Escrow, escrow, ({
     {sfAccount,              soeREQUIRED},
     {sfDestination,          soeREQUIRED},
     {sfAmount,               soeREQUIRED},
@@ -345,7 +356,7 @@ LEDGER_ENTRY(ltESCROW, 0x0075, Escrow, ({
 
     \sa keylet::payChan
  */
-LEDGER_ENTRY(ltPAYCHAN, 0x0078, PayChannel, ({
+LEDGER_ENTRY(ltPAYCHAN, 0x0078, PayChannel, payment_channel, ({
     {sfAccount,              soeREQUIRED},
     {sfDestination,          soeREQUIRED},
     {sfAmount,               soeREQUIRED},
@@ -366,7 +377,7 @@ LEDGER_ENTRY(ltPAYCHAN, 0x0078, PayChannel, ({
 
    \sa keylet::amm
 */
-LEDGER_ENTRY(ltAMM, 0x0079, AMM, ({
+LEDGER_ENTRY(ltAMM, 0x0079, AMM, amm, ({
     {sfAccount,              soeREQUIRED},
     {sfTradingFee,           soeDEFAULT},
     {sfVoteSlots,            soeOPTIONAL},
@@ -382,7 +393,7 @@ LEDGER_ENTRY(ltAMM, 0x0079, AMM, ({
 /** A ledger object which tracks Oracle
     \sa keylet::oracle
  */
-LEDGER_ENTRY(ltORACLE, 0x0080, Oracle, ({
+LEDGER_ENTRY(ltORACLE, 0x0080, Oracle, oracle, ({
     {sfOwner,                soeREQUIRED},
     {sfProvider,             soeREQUIRED},
     {sfPriceDataSeries,      soeREQUIRED},
@@ -397,7 +408,7 @@ LEDGER_ENTRY(ltORACLE, 0x0080, Oracle, ({
 /** A ledger object which tracks MPTokenIssuance
     \sa keylet::mptIssuance
  */
-LEDGER_ENTRY(ltMPTOKEN_ISSUANCE, 0x007e, MPTokenIssuance, ({
+LEDGER_ENTRY(ltMPTOKEN_ISSUANCE, 0x007e, MPTokenIssuance, mpt_issuance, ({
     {sfIssuer,                   soeREQUIRED},
     {sfSequence,                 soeREQUIRED},
     {sfTransferFee,              soeDEFAULT},
@@ -413,7 +424,7 @@ LEDGER_ENTRY(ltMPTOKEN_ISSUANCE, 0x007e, MPTokenIssuance, ({
 /** A ledger object which tracks MPToken
     \sa keylet::mptoken
  */
-LEDGER_ENTRY(ltMPTOKEN, 0x007f, MPToken, ({
+LEDGER_ENTRY(ltMPTOKEN, 0x007f, MPToken, mptoken, ({
     {sfAccount,                  soeREQUIRED},
     {sfMPTokenIssuanceID,        soeREQUIRED},
     {sfMPTAmount,                soeDEFAULT},
@@ -425,7 +436,7 @@ LEDGER_ENTRY(ltMPTOKEN, 0x007f, MPToken, ({
 /** A ledger object which tracks Credential
     \sa keylet::credential
  */
-LEDGER_ENTRY(ltCREDENTIAL, 0x0081, Credential, ({
+LEDGER_ENTRY(ltCREDENTIAL, 0x0081, Credential, credential, ({
     {sfSubject,              soeREQUIRED},
     {sfIssuer,               soeREQUIRED},
     {sfCredentialType,       soeREQUIRED},
@@ -436,3 +447,6 @@ LEDGER_ENTRY(ltCREDENTIAL, 0x0081, Credential, ({
     {sfPreviousTxnID,        soeREQUIRED},
     {sfPreviousTxnLgrSeq,    soeREQUIRED},
 }))
+
+#undef EXPAND
+#undef LEDGER_ENTRY_DUPLICATE

include/xrpl/protocol/jss.h

@@ -45,10 +45,7 @@ namespace jss {
 JSS(AL_size);              // out: GetCounts
 JSS(AL_hit_rate);          // out: GetCounts
 JSS(Account);              // in: TransactionSign; field.
-JSS(AccountRoot);          // ledger type.
-JSS(AMM);                  // ledger type
 JSS(AMMID);                // field
-JSS(Amendments);           // ledger type.
 JSS(Amount);               // in: TransactionSign; field.
 JSS(Amount2);              // in/out: AMM IOU/XRP pool, deposit, withdraw amount
 JSS(Asset);                // in: AMM Asset1
@@ -60,70 +57,49 @@ JSS(AuthAccounts);         // in: AMM Auction Slot
 JSS(BaseAsset);            // in: Oracle
 JSS(BidMax);               // in: AMM Bid
 JSS(BidMin);               // in: AMM Bid
-JSS(Bridge);               // ledger type.
-JSS(Check);                // ledger type.
 JSS(ClearFlag);            // field.
-JSS(Credential);           // ledger type.
-JSS(DID);                  // ledger type.
 JSS(DeliverMax);           // out: alias to Amount
 JSS(DeliverMin);           // in: TransactionSign
 JSS(Destination);          // in: TransactionSign; field.
-JSS(DirectoryNode);        // ledger type.
 JSS(EPrice);               // in: AMM Deposit option
-JSS(Escrow);               // ledger type.
 JSS(Fee);                  // in/out: TransactionSign; field.
-JSS(FeeSettings);          // ledger type.
 JSS(Flags);                // in/out: TransactionSign; field.
 JSS(Holder);               // field.
 JSS(Invalid);              //
 JSS(Issuer);               // in: Credential transactions
 JSS(LastLedgerSequence);   // in: TransactionSign; field
 JSS(LastUpdateTime);       // field.
-JSS(LedgerHashes);         // ledger type.
 JSS(LimitAmount);          // field.
-JSS(MPToken);              // ledger type.
-JSS(MPTokenIssuance);      // ledger type.
 JSS(NetworkID);            // field.
-JSS(NFTokenOffer);         // ledger type.
-JSS(NFTokenPage);          // ledger type.
 JSS(LPTokenOut);           // in: AMM Liquidity Provider deposit tokens
 JSS(LPTokenIn);            // in: AMM Liquidity Provider withdraw tokens
 JSS(LPToken);              // out: AMM Liquidity Provider tokens info
-JSS(Offer);                // ledger type.
 JSS(OfferSequence);        // field.
-JSS(Oracle);               // ledger type.
 JSS(OracleDocumentID);     // field
 JSS(Owner);                // field
 JSS(Paths);                // in/out: TransactionSign
-JSS(PayChannel);           // ledger type.
 JSS(PriceDataSeries);                    // field.
 JSS(PriceData);                          // field.
 JSS(Provider);                           // field.
 JSS(QuoteAsset);                         // in: Oracle.
-JSS(RippleState);                        // ledger type.
 JSS(SLE_hit_rate);                       // out: GetCounts.
 JSS(Scale);                              // field.
 JSS(SettleDelay);                        // in: TransactionSign
 JSS(SendMax);                            // in: TransactionSign
 JSS(Sequence);                           // in/out: TransactionSign; field.
 JSS(SetFlag);                            // field.
-JSS(SignerList);                         // ledger type.
 JSS(SigningPubKey);                      // field.
 JSS(Subject);                            // in: Credential transactions
 JSS(TakerGets);                          // field.
 JSS(TakerPays);                          // field.
-JSS(Ticket);                             // ledger type.
 JSS(TxnSignature);                       // field.
 JSS(TradingFee);                         // in/out: AMM trading fee
 JSS(TransactionType);                    // in: TransactionSign.
 JSS(TransferRate);                       // in: TransferRate.
 JSS(URI);                                // field.
 JSS(VoteSlots);                          // out: AMM Vote
-JSS(XChainOwnedClaimID);                 // ledger type.
-JSS(XChainOwnedCreateAccountClaimID);    // ledger type.
 JSS(aborted);                            // out: InboundLedger
 JSS(accepted);               // out: LedgerToJson, OwnerInfo, SubmitTransaction
-JSS(account);                // in/out: many
 JSS(accountState);           // out: LedgerToJson
 JSS(accountTreeHash);        // out: ledger/Ledger.cpp
 JSS(account_data);           // out: AccountInfo
@@ -150,8 +126,6 @@ JSS(affected);                // out: AcceptedLedgerTx
 JSS(age);                     // out: NetworkOPs, Peers
 JSS(alternatives);            // out: PathRequest, RipplePathFind
 JSS(amendment_blocked);       // out: NetworkOPs
-JSS(amendments);              // in: AccountObjects, out: NetworkOPs
-JSS(amm);                     // out: amm_info
 JSS(amm_account);             // in: amm_info
 JSS(amount);                  // out: AccountChannels, amm_info
 JSS(amount2);                 // out: amm_info
@@ -191,21 +165,17 @@ JSS(books);                   // in: Subscribe, Unsubscribe
 JSS(both);                    // in: Subscribe, Unsubscribe
 JSS(both_sides);              // in: Subscribe, Unsubscribe
 JSS(broadcast);               // out: SubmitTransaction
-JSS(bridge);                  // in: LedgerEntry
 JSS(bridge_account);          // in: LedgerEntry
 JSS(build_path);              // in: TransactionSign
 JSS(build_version);           // out: NetworkOPs
 JSS(cancel_after);            // out: AccountChannels
 JSS(can_delete);              // out: CanDelete
 JSS(mpt_amount);              // out: mpt_holders
-JSS(mpt_issuance);            // in: LedgerEntry, AccountObjects
 JSS(mpt_issuance_id);         // in: Payment, mpt_holders
-JSS(mptoken);                 // in: LedgerEntry, AccountObjects
 JSS(mptoken_index);           // out: mpt_holders
 JSS(changes);                 // out: BookChanges
 JSS(channel_id);              // out: AccountChannels
 JSS(channels);                // out: AccountChannels
-JSS(check);                   // in: AccountObjects
 JSS(check_nodes);             // in: LedgerCleaner
 JSS(clear);                   // in/out: FetchInfo
 JSS(close);                   // out: BookChanges
@@ -232,7 +202,6 @@ JSS(converge_time_s);         // out: NetworkOPs
 JSS(cookie);                  // out: NetworkOPs
 JSS(count);                   // in: AccountTx*, ValidatorList
 JSS(counters);                // in/out: retrieve counters
-JSS(credential);              // in: LedgerEntry Credential
 JSS(credentials);             // in: deposit_authorized
 JSS(credential_type);         // in: LedgerEntry DepositPreauth
 JSS(ctid);                    // in/out: Tx RPC
@@ -254,7 +223,6 @@ JSS(debug_signing);           // in: TransactionSign
 JSS(deletion_blockers_only);  // in: AccountObjects
 JSS(delivered_amount);        // out: insertDeliveredAmount
 JSS(deposit_authorized);      // out: deposit_authorized
-JSS(deposit_preauth);         // in: AccountObjects, LedgerData
 JSS(deprecated);              // out
 JSS(descending);              // in: AccountTx*
 JSS(description);             // in/out: Reservations
@@ -266,11 +234,9 @@ JSS(destination_currencies);  // in: PathRequest, RipplePathFind
 JSS(destination_tag);         // in: PathRequest
                               // out: AccountChannels
 JSS(details);                 // out: Manifest, server_info
-JSS(did);                     // in: LedgerEntry
 JSS(dir_entry);               // out: DirectoryEntryIterator
 JSS(dir_index);               // out: DirectoryEntryIterator
 JSS(dir_root);                // out: DirectoryEntryIterator
-JSS(directory);               // in: LedgerEntry
 JSS(discounted_fee);          // out: amm_info
 JSS(domain);                  // out: ValidatorInfo, Manifest
 JSS(drops);                   // out: TxQ
@@ -289,7 +255,6 @@ JSS(errored);
 JSS(error_code);              // out: error
 JSS(error_exception);         // out: Submit
 JSS(error_message);           // out: error
-JSS(escrow);                  // in: LedgerEntry
 JSS(expand);                  // in: handler/Ledger
 JSS(expected_date);           // out: any (warnings)
 JSS(expected_date_UTC);       // out: any (warnings)
@@ -300,7 +265,6 @@ JSS(fail_hard);               // in: Sign, Submit
 JSS(failed);                  // out: InboundLedger
 JSS(feature);                 // in: Feature
 JSS(features);                // out: Feature
-JSS(fee);                     // out: NetworkOPs, Peers
 JSS(fee_base);                // out: NetworkOPs
 JSS(fee_div_max);             // in: TransactionSign
 JSS(fee_level);               // out: AccountInfo
@@ -324,7 +288,6 @@ JSS(fullbelow_size);          // out: GetCounts
 JSS(good);                    // out: RPCVersion
 JSS(hash);                    // out: NetworkOPs, InboundLedger,
                               //      LedgerToJson, STTx; field
-JSS(hashes);                  // in: AccountObjects
 JSS(have_header);             // out: InboundLedger
 JSS(have_state);              // out: InboundLedger
 JSS(have_transactions);       // out: InboundLedger
@@ -462,9 +425,7 @@ JSS(network_id);              // out: NetworkOPs
 JSS(network_ledger);          // out: NetworkOPs
 JSS(next_refresh_time);       // out: ValidatorSite
 JSS(nft_id);                  // in: nft_sell_offers, nft_buy_offers
-JSS(nft_offer);               // in: LedgerEntry
 JSS(nft_offer_index);         // out nft_buy_offers, nft_sell_offers
-JSS(nft_page);                // in: LedgerEntry
 JSS(nft_serial);              // out: account_nfts
 JSS(nft_taxon);               // out: nft_info (clio)
 JSS(nftoken_id);              // out: insertNFTokenID
@@ -487,9 +448,7 @@ JSS(node_writes_duration_us); // out: GetCounts
 JSS(node_write_retries);      // out: GetCounts
 JSS(node_writes_delayed);     // out::GetCounts
 JSS(nth);                     // out: RPC server_definitions
-JSS(nunl);                    // in: AccountObjects
 JSS(obligations);             // out: GatewayBalances
-JSS(offer);                   // in: LedgerEntry
 JSS(offers);                  // out: NetworkOPs, AccountOffers, Subscribe
 JSS(offer_id);                // out: insertNFTokenOfferID
 JSS(offline);                 // in: TransactionSign
@@ -498,7 +457,6 @@ JSS(open);                    // out: handlers/Ledger
 JSS(open_ledger_cost);        // out: SubmitTransaction
 JSS(open_ledger_fee);         // out: TxQ
 JSS(open_ledger_level);       // out: TxQ
-JSS(oracle);                  // in: LedgerEntry
 JSS(oracles);                 // in: get_aggregate_price
 JSS(oracle_document_id);      // in: get_aggregate_price
 JSS(owner);                   // in: LedgerEntry, out: NetworkOPs
@@ -513,7 +471,6 @@ JSS(password);                // in: Subscribe
 JSS(paths);                   // in: RipplePathFind
 JSS(paths_canonical);         // out: RipplePathFind
 JSS(paths_computed);          // out: PathRequest, RipplePathFind
-JSS(payment_channel);         // in: LedgerEntry
 JSS(peer);                    // in: AccountLines
 JSS(peer_authorized);         // out: AccountLines
 JSS(peer_id);                 // out: RCLCxPeerPos
@@ -599,7 +556,6 @@ JSS(signature_verified);      // out: ChannelVerify
 JSS(signing_key);             // out: NetworkOPs
 JSS(signing_keys);            // out: ValidatorList
 JSS(signing_time);            // out: NetworkOPs
-JSS(signer_list);             // in: AccountObjects
 JSS(signer_lists);            // in/out: AccountInfo
 JSS(size);                    // out: get_aggregate_price
 JSS(snapshot);                // in: Subscribe
@@ -611,7 +567,6 @@ JSS(stand_alone);             // out: NetworkOPs
 JSS(standard_deviation);      // out: get_aggregate_price
 JSS(start);                   // in: TxHistory
 JSS(started);
-JSS(state);                   // out: Logic.h, ServerState, LedgerData
 JSS(state_accounting);        // out: NetworkOPs
 JSS(state_now);               // in: Subscribe
 JSS(status);                  // error
@@ -633,7 +588,6 @@ JSS(taker_gets_funded);       // out: NetworkOPs
 JSS(taker_pays);              // in: Subscribe, Unsubscribe, BookOffers
 JSS(taker_pays_funded);       // out: NetworkOPs
 JSS(threshold);               // in: Blacklist
-JSS(ticket);                  // in: AccountObjects
 JSS(ticket_count);            // out: AccountInfo
 JSS(ticket_seq);              // in: LedgerEntry
 JSS(time);
@@ -732,9 +686,6 @@ JSS(warning);                 // rpc:
 JSS(warnings);                // out: server_info, server_state
 JSS(workers);
 JSS(write_load);              // out: GetCounts
-JSS(xchain_owned_claim_id);   // in: LedgerEntry, AccountObjects
-JSS(xchain_owned_create_account_claim_id);  // in: LedgerEntry
-JSS(NegativeUNL);                           // out: ValidatorList; ledger type
 // clang-format on
 
 #pragma push_macro("TRANSACTION")
@@ -747,6 +698,24 @@ JSS(NegativeUNL);                           // out: ValidatorList; ledger type
 #undef TRANSACTION
 #pragma pop_macro("TRANSACTION")
 
+#pragma push_macro("LEDGER_ENTRY")
+#undef LEDGER_ENTRY
+#pragma push_macro("LEDGER_ENTRY_DUPLICATE")
+#undef LEDGER_ENTRY_DUPLICATE
+
+#define LEDGER_ENTRY(tag, value, name, rpcName, fields) \
+    JSS(name);                                          \
+    JSS(rpcName);
+
+#define LEDGER_ENTRY_DUPLICATE(tag, value, name, rpcName, fields) JSS(rpcName);
+
+#include <xrpl/protocol/detail/ledger_entries.macro>
+
+#undef LEDGER_ENTRY
+#pragma pop_macro("LEDGER_ENTRY")
+#undef LEDGER_ENTRY_DUPLICATE
+#pragma pop_macro("LEDGER_ENTRY_DUPLICATE")
+
 #undef JSS
 
 }  // namespace jss