Merge remote-tracking branch 'upstream/develop' into sponsor

This commit is contained in:
tequ
2026-04-10 03:38:07 +09:00
227 changed files with 35483 additions and 4750 deletions

View File

@@ -1863,8 +1863,8 @@ public:
Json::Value jv;
jv[jss::TransactionType] = jss::AMMDeposit;
jv[jss::Account] = account.human();
jv[jss::Asset] = STIssue(sfAsset, amount1.issue()).getJson(JsonOptions::none);
jv[jss::Asset2] = STIssue(sfAsset, amount2.issue()).getJson(JsonOptions::none);
jv[jss::Asset] = STIssue(sfAsset, amount1.asset()).getJson(JsonOptions::none);
jv[jss::Asset2] = STIssue(sfAsset, amount2.asset()).getJson(JsonOptions::none);
jv[jss::Amount] = amount1.value().getJson(JsonOptions::none);
jv[jss::Amount2] = amount2.value().getJson(JsonOptions::none);
jv[jss::Flags] = tfTwoAsset;