ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2026-06-04 01:06:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix merge issue

Browse Source
This commit is contained in:
Mayukha Vadari
2026-03-24 12:12:03 -07:00
parent 40363ce525
commit 0621a12c61
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libxrpl/ledger/helpers/AccountRootHelpers.cpp
View File

@@ -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;
}

6
src/libxrpl/ledger/helpers/MPTokenHelpers.cpp
View File

@@ -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;
}