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

amm_info: fetch by amm account id; add AMM object entry (#4682)

Browse Source 
- Update amm_info to fetch AMM by amm account id.
  - This is an additional way to retrieve an AMM object.
  - Alternatively, AMM can still be fetched by the asset pair as well.
- Add owner directory entry for AMM object.

Context:

- Add back the AMM object directory entry, which was deleted by #4626.
  - This fixes `account_objects` for `amm` type.
This commit is contained in:
Gregory Tsipenyuk
2023-09-01 18:50:58 -04:00
committed by GitHub
parent a61a88ea81
commit b014b79d88
12 changed files with 343 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -136,26 +136,36 @@ Json::Value
AMM::ammRpcInfo(
std::optional<AccountID> const& account,
std::optional<std::string> const& ledgerIndex,
std::optional<std::pair<Issue, Issue>> tokens) const
std::optional<Issue> issue1,
std::optional<Issue> issue2,
std::optional<AccountID> const& ammAccount,
bool ignoreParams) const
{
Json::Value jv;
if (account)
jv[jss::account] = to_string(*account);
if (ledgerIndex)
jv[jss::ledger_index] = *ledgerIndex;
if (tokens)
if (!ignoreParams)
{
jv[jss::asset] =
STIssue(sfAsset, tokens->first).getJson(JsonOptions::none);
jv[jss::asset2] =
STIssue(sfAsset2, tokens->second).getJson(JsonOptions::none);
}
else
{
jv[jss::asset] =
STIssue(sfAsset, asset1_.issue()).getJson(JsonOptions::none);
jv[jss::asset2] =
STIssue(sfAsset2, asset2_.issue()).getJson(JsonOptions::none);
if (issue1 || issue2)
{
if (issue1)
jv[jss::asset] =
STIssue(sfAsset, *issue1).getJson(JsonOptions::none);
if (issue2)
jv[jss::asset2] =
STIssue(sfAsset2, *issue2).getJson(JsonOptions::none);
}
else if (!ammAccount)
{
jv[jss::asset] =
STIssue(sfAsset, asset1_.issue()).getJson(JsonOptions::none);
jv[jss::asset2] =
STIssue(sfAsset2, asset2_.issue()).getJson(JsonOptions::none);
}
if (ammAccount)
jv[jss::amm_account] = to_string(*ammAccount);
}
auto jr = env_.rpc("json", "amm_info", to_string(jv));
if (jr.isObject() && jr.isMember(jss::result) &&
@@ -292,9 +302,11 @@ AMM::expectAmmRpcInfo(
STAmount const& asset2,
IOUAmount const& balance,
std::optional<AccountID> const& account,
std::optional<std::string> const& ledger_index) const
std::optional<std::string> const& ledger_index,
std::optional<AccountID> const& ammAccount) const
{
auto const jv = ammRpcInfo(account, ledger_index);
auto const jv = ammRpcInfo(
account, ledger_index, std::nullopt, std::nullopt, ammAccount);
return expectAmmInfo(asset1, asset2, balance, jv);
}