ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Factor out static Number getShareTotal() from View.cpp

Browse Source
This commit is contained in:
Bronek Kozicki
2025-03-10 15:01:14 +00:00
parent 7b4e901dd7
commit 90fef02164
5 changed files with 33 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/xrpld/app/tx/detail/VaultClawback.cpp
View File

@@ -103,6 +103,11 @@ VaultClawback::doApply()
if (!vault)
return tecOBJECT_NOT_FOUND;
auto const mptIssuanceID = (*vault)[sfMPTokenIssuanceID];
auto const sleIssuance = view().read(keylet::mptIssuance(mptIssuanceID));
if (!sleIssuance)
return tefINTERNAL;
Asset const asset = vault->at(sfAsset);
STAmount const amount = [&]() -> STAmount {
auto const maybeAmount = tx[~sfAmount];
@@ -126,12 +131,12 @@ VaultClawback::doApply()
FreezeHandling::fhIGNORE_FREEZE,
AuthHandling::ahIGNORE_AUTH,
j_);
assets = sharesToAssetsWithdraw(view(), vault, shares);
assets = sharesToAssetsWithdraw(vault, sleIssuance, shares);
}
else
{
assets = amount;
shares = assetsToSharesWithdraw(view(), vault, assets);
shares = assetsToSharesWithdraw(vault, sleIssuance, assets);
}
// Clamp to maximum.
@@ -139,7 +144,7 @@ VaultClawback::doApply()
if (assets > maxAssets)
{
assets = maxAssets;
shares = assetsToSharesWithdraw(view(), vault, assets);
shares = assetsToSharesWithdraw(vault, sleIssuance, assets);
}
if (shares == beast::zero)

2
src/xrpld/app/tx/detail/VaultDeposit.cpp
View File

@@ -146,7 +146,7 @@ VaultDeposit::doApply()
}
// Compute exchange before transferring any amounts.
auto const shares = assetsToSharesDeposit(view(), vault, assets);
auto const shares = assetsToSharesDeposit(vault, sleIssuance, assets);
XRPL_ASSERT(
shares.asset() != assets.asset(),
"ripple::VaultDeposit::doApply : assets are not shares");

11
src/xrpld/app/tx/detail/VaultWithdraw.cpp
View File

@@ -82,6 +82,11 @@ VaultWithdraw::doApply()
if (!vault)
return tecOBJECT_NOT_FOUND;
auto const mptIssuanceID = (*vault)[sfMPTokenIssuanceID];
auto const sleIssuance = view().read(keylet::mptIssuance(mptIssuanceID));
if (!sleIssuance)
return tefINTERNAL;
// Note, we intentionally do not check lsfVaultPrivate flag on the Vault. If
// you have a share in the vault, it means you were at some point authorized
// to deposit into it, and this means you are also indefinitely authorized
@@ -89,19 +94,19 @@ VaultWithdraw::doApply()
auto amount = ctx_.tx[sfAmount];
auto const asset = vault->at(sfAsset);
auto const share = MPTIssue(vault->at(sfMPTokenIssuanceID));
auto const share = MPTIssue(mptIssuanceID);
STAmount shares, assets;
if (amount.asset() == asset)
{
// Fixed assets, variable shares.
assets = amount;
shares = assetsToSharesWithdraw(view(), vault, assets);
shares = assetsToSharesWithdraw(vault, sleIssuance, assets);
}
else if (amount.asset() == share)
{
// Fixed shares, variable assets.
shares = amount;
assets = sharesToAssetsWithdraw(view(), vault, shares);
assets = sharesToAssetsWithdraw(vault, sleIssuance, shares);
}
else
return tefINTERNAL;

12
src/xrpld/ledger/View.h
View File

@@ -723,8 +723,8 @@ deleteAMMTrustLine(
// when they deposit a fixed amount of assets.
[[nodiscard]] STAmount
assetsToSharesDeposit(
ReadView const& view,
std::shared_ptr<SLE> const& vault,
std::shared_ptr<SLE const> const& vault,
std::shared_ptr<SLE const> const& issuance,
STAmount const& assets);
// From the perspective of a vault,
@@ -732,8 +732,8 @@ assetsToSharesDeposit(
// when they ask to withdraw a fixed amount of assets.
[[nodiscard]] STAmount
assetsToSharesWithdraw(
ReadView const& view,
std::shared_ptr<SLE> const& vault,
std::shared_ptr<SLE const> const& vault,
std::shared_ptr<SLE const> const& issuance,
STAmount const& assets);
// From the perspective of a vault,
@@ -741,8 +741,8 @@ assetsToSharesWithdraw(
// when they redeem a fixed amount of shares.
[[nodiscard]] STAmount
sharesToAssetsWithdraw(
ReadView const& view,
std::shared_ptr<SLE> const& vault,
std::shared_ptr<SLE const> const& vault,
std::shared_ptr<SLE const> const& issuance,
STAmount const& shares);
} // namespace ripple

28
src/xrpld/ledger/detail/View.cpp
View File

@@ -2504,37 +2504,29 @@ rippleCredit(
saAmount.asset().value());
}
static Number
getShareTotal(ReadView const& view, std::shared_ptr<SLE> const& vault)
{
auto issuance =
view.read(keylet::mptIssuance(vault->at(sfMPTokenIssuanceID)));
return issuance->at(sfOutstandingAmount);
}
[[nodiscard]] STAmount
assetsToSharesDeposit(
ReadView const& view,
std::shared_ptr<SLE> const& vault,
std::shared_ptr<SLE const> const& vault,
std::shared_ptr<SLE const> const& issuance,
STAmount const& assets)
{
XRPL_ASSERT(
assets.asset() == vault->at(sfAsset),
"ripple::assetsToSharesDeposit : assets and vault match");
Number assetTotal = *vault->at(sfAssetTotal);
Number assetTotal = vault->at(sfAssetTotal);
STAmount shares{
vault->at(sfMPTokenIssuanceID), static_cast<Number>(assets)};
if (assetTotal == 0)
return shares;
Number shareTotal = getShareTotal(view, vault);
Number shareTotal = issuance->at(sfOutstandingAmount);
shares = shareTotal * (assets / assetTotal);
return shares;
}
[[nodiscard]] STAmount
assetsToSharesWithdraw(
ReadView const& view,
std::shared_ptr<SLE> const& vault,
std::shared_ptr<SLE const> const& vault,
std::shared_ptr<SLE const> const& issuance,
STAmount const& assets)
{
XRPL_ASSERT(
@@ -2545,15 +2537,15 @@ assetsToSharesWithdraw(
STAmount shares{vault->at(sfMPTokenIssuanceID)};
if (assetTotal == 0)
return shares;
Number shareTotal = getShareTotal(view, vault);
Number shareTotal = issuance->at(sfOutstandingAmount);
shares = shareTotal * (assets / assetTotal);
return shares;
}
[[nodiscard]] STAmount
sharesToAssetsWithdraw(
ReadView const& view,
std::shared_ptr<SLE> const& vault,
std::shared_ptr<SLE const> const& vault,
std::shared_ptr<SLE const> const& issuance,
STAmount const& shares)
{
XRPL_ASSERT(
@@ -2564,7 +2556,7 @@ sharesToAssetsWithdraw(
STAmount assets{vault->at(sfAsset)};
if (assetTotal == 0)
return assets;
Number shareTotal = getShareTotal(view, vault);
Number shareTotal = issuance->at(sfOutstandingAmount);
assets = assetTotal * (shares / shareTotal);
return assets;
}