ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2026-08-23 07:10:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Additional RPC validation checks on ammRpcInfo account and amm_account fields. (#7324)

Browse Source
This commit is contained in:
Timothy Banks
2026-06-24 08:23:12 -04:00
committed by GitHub
parent 69d289a388
commit bb7c4d1c9f
4 changed files with 66 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/test/jtx/impl/AMM.cpp
View File

@@ -183,15 +183,37 @@ json::Value
AMM::ammRpcInfo(
std::optional<AccountID> const& account,
std::optional<std::string> const& ledgerIndex,
std::optional<Asset> asset1,
std::optional<Asset> asset2,
std::optional<Asset> const& asset1,
std::optional<Asset> const& asset2,
std::optional<AccountID> const& ammAccount,
bool ignoreParams,
unsigned apiVersion) const
{
auto const toJson = [](AccountID const& a) { return json::Value{to_string(a)}; };
return ammRpcInfo(
account.transform(toJson),
ledgerIndex,
asset1,
asset2,
ammAccount.transform(toJson),
ignoreParams,
apiVersion);
}
json::Value
AMM::ammRpcInfo(
std::optional<json::Value> const& account,
std::optional<std::string> const& ledgerIndex,
std::optional<Asset> const& asset1,
std::optional<Asset> const& asset2,
std::optional<json::Value> const& ammAccount,
bool ignoreParams,
unsigned apiVersion) const
{
json::Value jv;
if (account)
jv[jss::account] = to_string(*account);
jv[jss::account] = *account;
if (ledgerIndex)
jv[jss::ledger_index] = *ledgerIndex;
if (!ignoreParams)
@@ -209,7 +231,7 @@ AMM::ammRpcInfo(
jv[jss::asset2] = STIssue(sfAsset2, asset2_.asset()).getJson(JsonOptions::Values::None);
}
if (ammAccount)
jv[jss::amm_account] = to_string(*ammAccount);
jv[jss::amm_account] = *ammAccount;
}
auto jr =
(apiVersion == RPC::kApiInvalidVersion