From 0621a12c6147464c0cdbc8b7ad20ef0ad7f0f8d9 Mon Sep 17 00:00:00 2001 From: Mayukha Vadari Date: Tue, 24 Mar 2026 12:12:03 -0700 Subject: [PATCH] fix merge issue --- src/libxrpl/ledger/helpers/AccountRootHelpers.cpp | 6 +----- src/libxrpl/ledger/helpers/MPTokenHelpers.cpp | 6 +++++- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/libxrpl/ledger/helpers/AccountRootHelpers.cpp b/src/libxrpl/ledger/helpers/AccountRootHelpers.cpp index 03161933b1..399494bc5f 100644 --- a/src/libxrpl/ledger/helpers/AccountRootHelpers.cpp +++ b/src/libxrpl/ledger/helpers/AccountRootHelpers.cpp @@ -99,11 +99,7 @@ transferRate(ReadView const& view, AccountID const& issuer) auto const sle = view.read(keylet::account(issuer)); if (sle && sle->isFieldPresent(sfTransferRate)) - { - auto const fee = sle->getFieldU16(sfTransferFee); - XRPL_ASSERT(fee <= maxTransferFee, "xrpl::transferRate : fee is too large"); - return Rate{1'000'000'000u + 10'000 * fee}; - } + return Rate{sle->getFieldU32(sfTransferRate)}; return parityRate; } diff --git a/src/libxrpl/ledger/helpers/MPTokenHelpers.cpp b/src/libxrpl/ledger/helpers/MPTokenHelpers.cpp index cbf37a06a8..724c5f0207 100644 --- a/src/libxrpl/ledger/helpers/MPTokenHelpers.cpp +++ b/src/libxrpl/ledger/helpers/MPTokenHelpers.cpp @@ -83,7 +83,11 @@ transferRate(ReadView const& view, MPTID const& issuanceID) // which represents 50% of 1,000,000,000 if (auto const sle = view.read(keylet::mptIssuance(issuanceID)); sle && sle->isFieldPresent(sfTransferFee)) - return Rate{1'000'000'000u + 10'000 * sle->getFieldU16(sfTransferFee)}; + { + auto const fee = sle->getFieldU16(sfTransferFee); + XRPL_ASSERT(fee <= maxTransferFee, "xrpl::transferRate : fee is too large"); + return Rate{1'000'000'000u + (10'000 * fee)}; + } return parityRate; }