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

Merge branch 'develop' into ximinez/number-fix-maxrepcusp

Browse Source
This commit is contained in:
Ed Hennis
2026-05-12 16:26:09 -04:00
committed by GitHub
parent 5a40416673 45b1f4dbeb
commit 7c9a56ff24
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/xrpld/app/ledger/detail/LedgerToJson.cpp
View File

@@ -297,13 +297,24 @@ fillJsonQueue(json::Value& json, LedgerFill const& fill)
txJson["last_result"] = transToken(*tx.lastResult);
auto&& temp = fillJsonTx(fill, bBinary, bExpanded, tx.txn, nullptr);
if (fill.context->apiVersion > 1)
if (temp.isObject())
{
copyFrom(txJson, temp);
if (fill.context->apiVersion > 1)
{
copyFrom(txJson, temp);
}
else
{
copyFrom(txJson[jss::tx], temp);
}
}
else if (fill.context->apiVersion > 1)
{
txJson[jss::hash] = temp;
}
else
{
copyFrom(txJson[jss::tx], temp);
txJson[jss::tx] = temp;
}
}
}