From d0008a36f6331c3b1b14bc7fb64456ee5194ee5d Mon Sep 17 00:00:00 2001 From: Mayukha Vadari Date: Tue, 11 Aug 2026 17:26:40 -0400 Subject: [PATCH] fix build issues --- include/xrpl/ledger/helpers/CheckEntry.h | 3 +- include/xrpl/ledger/helpers/EscrowEntry.h | 3 +- include/xrpl/ledger/helpers/LoanBrokerEntry.h | 3 +- include/xrpl/ledger/helpers/LoanEntry.h | 3 +- .../ledger/helpers/MPTokenIssuanceEntry.h | 2 +- .../xrpl/ledger/helpers/NFTokenOfferEntry.h | 3 +- include/xrpl/ledger/helpers/OfferEntry.h | 3 +- include/xrpl/ledger/helpers/PayChannelEntry.h | 3 +- .../ledger/helpers/PermissionedDomainEntry.h | 3 +- include/xrpl/ledger/helpers/TicketEntry.h | 11 +------ include/xrpl/ledger/helpers/VaultEntry.h | 3 +- src/test/ledger/SLEWrapper_test.cpp | 33 +++++++++++++++++-- 12 files changed, 51 insertions(+), 22 deletions(-) diff --git a/include/xrpl/ledger/helpers/CheckEntry.h b/include/xrpl/ledger/helpers/CheckEntry.h index ceab7d5618..76254d1b5d 100644 --- a/include/xrpl/ledger/helpers/CheckEntry.h +++ b/include/xrpl/ledger/helpers/CheckEntry.h @@ -8,6 +8,7 @@ #include #include #include +#include #include @@ -25,7 +26,7 @@ public: explicit CheckEntry( AccountID const& id, - std::uint32_t seq, + SeqProxy const& seq, Base::view_ref_type view, beast::Journal j = beast::Journal{beast::Journal::getNullSink()}) : Base(keylet::check(id, seq), view, j) diff --git a/include/xrpl/ledger/helpers/EscrowEntry.h b/include/xrpl/ledger/helpers/EscrowEntry.h index 2e6edbbeef..03b9ac5429 100644 --- a/include/xrpl/ledger/helpers/EscrowEntry.h +++ b/include/xrpl/ledger/helpers/EscrowEntry.h @@ -7,6 +7,7 @@ #include #include #include +#include #include @@ -24,7 +25,7 @@ public: explicit EscrowEntry( AccountID const& src, - std::uint32_t seq, + SeqProxy const& seq, Base::view_ref_type view, beast::Journal j = beast::Journal{beast::Journal::getNullSink()}) : Base(keylet::escrow(src, seq), view, j) diff --git a/include/xrpl/ledger/helpers/LoanBrokerEntry.h b/include/xrpl/ledger/helpers/LoanBrokerEntry.h index c0b850fc04..9a583fae06 100644 --- a/include/xrpl/ledger/helpers/LoanBrokerEntry.h +++ b/include/xrpl/ledger/helpers/LoanBrokerEntry.h @@ -8,6 +8,7 @@ #include #include #include +#include #include @@ -25,7 +26,7 @@ public: explicit LoanBrokerEntry( AccountID const& owner, - std::uint32_t seq, + SeqProxy const& seq, Base::view_ref_type view, beast::Journal j = beast::Journal{beast::Journal::getNullSink()}) : Base(keylet::loanBroker(owner, seq), view, j) diff --git a/include/xrpl/ledger/helpers/LoanEntry.h b/include/xrpl/ledger/helpers/LoanEntry.h index b668ea98b8..0ec12c01bb 100644 --- a/include/xrpl/ledger/helpers/LoanEntry.h +++ b/include/xrpl/ledger/helpers/LoanEntry.h @@ -7,6 +7,7 @@ #include #include #include +#include #include @@ -24,7 +25,7 @@ public: explicit LoanEntry( uint256 const& loanBrokerID, - std::uint32_t loanSeq, + SeqProxy const& loanSeq, Base::view_ref_type view, beast::Journal j = beast::Journal{beast::Journal::getNullSink()}) : Base(keylet::loan(loanBrokerID, loanSeq), view, j) diff --git a/include/xrpl/ledger/helpers/MPTokenIssuanceEntry.h b/include/xrpl/ledger/helpers/MPTokenIssuanceEntry.h index 0bb454993f..1227e742fd 100644 --- a/include/xrpl/ledger/helpers/MPTokenIssuanceEntry.h +++ b/include/xrpl/ledger/helpers/MPTokenIssuanceEntry.h @@ -29,7 +29,7 @@ public: AccountID const& issuer, Base::view_ref_type view, beast::Journal j = beast::Journal{beast::Journal::getNullSink()}) - : Base(keylet::mptokenIssuance(seq, issuer), view, j) + : Base(keylet::mptokenIssuance(makeMptID(seq, issuer)), view, j) { } diff --git a/include/xrpl/ledger/helpers/NFTokenOfferEntry.h b/include/xrpl/ledger/helpers/NFTokenOfferEntry.h index 4642963197..1ee8a4f928 100644 --- a/include/xrpl/ledger/helpers/NFTokenOfferEntry.h +++ b/include/xrpl/ledger/helpers/NFTokenOfferEntry.h @@ -8,6 +8,7 @@ #include #include #include +#include #include @@ -25,7 +26,7 @@ public: explicit NFTokenOfferEntry( AccountID const& owner, - std::uint32_t seq, + SeqProxy const& seq, Base::view_ref_type view, beast::Journal j = beast::Journal{beast::Journal::getNullSink()}) : Base(keylet::nftokenOffer(owner, seq), view, j) diff --git a/include/xrpl/ledger/helpers/OfferEntry.h b/include/xrpl/ledger/helpers/OfferEntry.h index 4df0cfc043..78926f027c 100644 --- a/include/xrpl/ledger/helpers/OfferEntry.h +++ b/include/xrpl/ledger/helpers/OfferEntry.h @@ -8,6 +8,7 @@ #include #include #include +#include #include @@ -25,7 +26,7 @@ public: explicit OfferEntry( AccountID const& id, - std::uint32_t seq, + SeqProxy const& seq, Base::view_ref_type view, beast::Journal j = beast::Journal{beast::Journal::getNullSink()}) : Base(keylet::offer(id, seq), view, j) diff --git a/include/xrpl/ledger/helpers/PayChannelEntry.h b/include/xrpl/ledger/helpers/PayChannelEntry.h index 73b6eeb61a..70cb1d8357 100644 --- a/include/xrpl/ledger/helpers/PayChannelEntry.h +++ b/include/xrpl/ledger/helpers/PayChannelEntry.h @@ -7,6 +7,7 @@ #include #include #include +#include #include @@ -25,7 +26,7 @@ public: explicit PayChannelEntry( AccountID const& src, AccountID const& dst, - std::uint32_t seq, + SeqProxy const& seq, Base::view_ref_type view, beast::Journal j = beast::Journal{beast::Journal::getNullSink()}) : Base(keylet::payChannel(src, dst, seq), view, j) diff --git a/include/xrpl/ledger/helpers/PermissionedDomainEntry.h b/include/xrpl/ledger/helpers/PermissionedDomainEntry.h index 3176a45a5a..a445200776 100644 --- a/include/xrpl/ledger/helpers/PermissionedDomainEntry.h +++ b/include/xrpl/ledger/helpers/PermissionedDomainEntry.h @@ -8,6 +8,7 @@ #include #include #include +#include #include @@ -25,7 +26,7 @@ public: explicit PermissionedDomainEntry( AccountID const& account, - std::uint32_t seq, + SeqProxy const& seq, Base::view_ref_type view, beast::Journal j = beast::Journal{beast::Journal::getNullSink()}) : Base(keylet::permissionedDomain(account, seq), view, j) diff --git a/include/xrpl/ledger/helpers/TicketEntry.h b/include/xrpl/ledger/helpers/TicketEntry.h index 1dc12236e6..5e754e2fe6 100644 --- a/include/xrpl/ledger/helpers/TicketEntry.h +++ b/include/xrpl/ledger/helpers/TicketEntry.h @@ -26,16 +26,7 @@ public: explicit TicketEntry( AccountID const& id, - std::uint32_t ticketSeq, - Base::view_ref_type view, - beast::Journal j = beast::Journal{beast::Journal::getNullSink()}) - : Base(keylet::ticket(id, ticketSeq), view, j) - { - } - - explicit TicketEntry( - AccountID const& id, - SeqProxy ticketSeq, + SeqProxy const& ticketSeq, Base::view_ref_type view, beast::Journal j = beast::Journal{beast::Journal::getNullSink()}) : Base(keylet::ticket(id, ticketSeq), view, j) diff --git a/include/xrpl/ledger/helpers/VaultEntry.h b/include/xrpl/ledger/helpers/VaultEntry.h index b164d4e0f8..291183d817 100644 --- a/include/xrpl/ledger/helpers/VaultEntry.h +++ b/include/xrpl/ledger/helpers/VaultEntry.h @@ -8,6 +8,7 @@ #include #include #include +#include #include @@ -25,7 +26,7 @@ public: explicit VaultEntry( AccountID const& owner, - std::uint32_t seq, + SeqProxy const& seq, Base::view_ref_type view, beast::Journal j = beast::Journal{beast::Journal::getNullSink()}) : Base(keylet::vault(owner, seq), view, j) diff --git a/src/test/ledger/SLEWrapper_test.cpp b/src/test/ledger/SLEWrapper_test.cpp index 2761958bbc..d0d2b8bcab 100644 --- a/src/test/ledger/SLEWrapper_test.cpp +++ b/src/test/ledger/SLEWrapper_test.cpp @@ -6,12 +6,41 @@ #include #include #include +#include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include +#include +#include +#include +#include #include +#include +#include #include +#include +#include +#include #include #include +#include #include @@ -122,10 +151,10 @@ class SLEWrapper_test : public beast::unit_test::Suite // Entry that does not exist yet: newSLE() -> insert(). { - WTicketEntry ticket(keylet::ticket(alice.id(), 1), av); + WTicketEntry ticket(keylet::ticket(alice.id(), SeqProxy::rawTicket(1)), av); BEAST_EXPECT(!ticket.exists()); BEAST_EXPECT(!ticket.canModify()); - BEAST_EXPECT(ticket.key() == keylet::ticket(alice.id(), 1).key); + BEAST_EXPECT(ticket.key() == keylet::ticket(alice.id(), SeqProxy::rawTicket(1)).key); BEAST_EXPECT(ticket.type() == ltTICKET); BEAST_EXPECT(ticket.keylet().type == ltTICKET);