Merge develop: resolve conflicts and fix log message style

Agent-Logs-Url: https://github.com/XRPLF/rippled/sessions/f9109d51-261e-4dbf-9745-d4160b0d80f9

Co-authored-by: mvadari <8029314+mvadari@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot]
2026-04-02 17:11:50 +00:00
committed by GitHub
parent a911c1059f
commit 988a227c92

View File

@@ -224,15 +224,15 @@ OfferCreate::checkAcceptAsset(
// Read the trustline once for multiple flag checks to optimize performance
auto const trustLine = view.read(keylet::line(id, issue.account, issue.currency));
// Check if the issuer has lsfDisallowIncomingTrustline set
// If so, the account must already have a trustline to receive tokens
// Check if the issuer has lsfDisallowIncomingTrustline set.
// If so, the account must already have a trustline to receive tokens.
if (view.rules().enabled(fixDisallowIncomingV1_1) &&
((*issuerAccount)[sfFlags] & lsfDisallowIncomingTrustline) != 0u)
{
if (!trustLine)
{
JLOG(j.debug())
<< "delay: can't receive IOUs from issuer with DisallowIncomingTrustline set.";
<< "delay: can't receive IOUs from issuer with DisallowIncomingTrustline set";
return ((flags & tapRETRY) != 0u) ? TER{terNO_LINE} : TER{tecNO_LINE};
}
}