From a0d2d174c3ad10bb3523e79708b1edd95e037e05 Mon Sep 17 00:00:00 2001 From: Mayukha Vadari Date: Thu, 11 Jun 2026 14:25:47 -0400 Subject: [PATCH] fix merge issues --- src/libxrpl/ledger/helpers/LendingHelpers.cpp | 6 +++--- src/libxrpl/ledger/helpers/MPTokenHelpers.cpp | 17 ++++++++++++++++- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/src/libxrpl/ledger/helpers/LendingHelpers.cpp b/src/libxrpl/ledger/helpers/LendingHelpers.cpp index 6925670d1a..6e3ce0d717 100644 --- a/src/libxrpl/ledger/helpers/LendingHelpers.cpp +++ b/src/libxrpl/ledger/helpers/LendingHelpers.cpp @@ -1818,7 +1818,7 @@ loanMakePayment( return std::unexpected(tecINTERNAL); } - std::int32_t const loanScale = loan->at(sfLoanScale) = 0; + std::int32_t const loanScale = loan->at(sfLoanScale); TenthBips32 const interestRate{loan->at(sfInterestRate)}; @@ -1828,9 +1828,9 @@ loanMakePayment( Number const periodicPayment = loan->at(sfPeriodicPayment); auto prevPaymentDateProxy = loan->at(sfPreviousPaymentDueDate); - std::uint32_t const startDate = loan->at(sfStartDate) = 0; + std::uint32_t const startDate = loan->at(sfStartDate); - std::uint32_t const paymentInterval = loan->at(sfPaymentInterval) = 0; + std::uint32_t const paymentInterval = loan->at(sfPaymentInterval); // Compute the periodic rate that will be used for calculations // throughout diff --git a/src/libxrpl/ledger/helpers/MPTokenHelpers.cpp b/src/libxrpl/ledger/helpers/MPTokenHelpers.cpp index 30703be7cb..8f5026677f 100644 --- a/src/libxrpl/ledger/helpers/MPTokenHelpers.cpp +++ b/src/libxrpl/ledger/helpers/MPTokenHelpers.cpp @@ -72,7 +72,22 @@ isAnyFrozen( MPTIssue const& mptIssue, std::uint8_t depth) { - return isGlobalFrozen(view, mptIssue); + if (isGlobalFrozen(view, mptIssue)) + return true; + + for (auto const& account : accounts) + { + if (isIndividualFrozen(view, account, mptIssue)) + return true; + } + + for (auto const& account : accounts) + { + if (isVaultPseudoAccountFrozen(view, account, mptIssue, depth)) + return true; + } + + return false; } Rate