From d56d99df7a7955bbe1f1f512de4484bce7bb31c2 Mon Sep 17 00:00:00 2001 From: mDuo13 Date: Thu, 24 Aug 2023 15:55:41 -0700 Subject: [PATCH 1/3] AMMBid: use tecINTERNAL for 'impossible' errors Upgrade log level to warning since it indicates some kind of (possibly network-wide) unexpected condition when these two errors occur. --- src/ripple/app/tx/impl/AMMBid.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/ripple/app/tx/impl/AMMBid.cpp b/src/ripple/app/tx/impl/AMMBid.cpp index d059f88c76c..5db09e0afa6 100644 --- a/src/ripple/app/tx/impl/AMMBid.cpp +++ b/src/ripple/app/tx/impl/AMMBid.cpp @@ -223,9 +223,11 @@ applyBid( lptAMMBalance, toSTAmount(lptAMMBalance.issue(), burn), false); if (saBurn >= lptAMMBalance) { - JLOG(ctx_.journal.debug()) - << "AMM Bid: invalid burn " << burn << " " << lptAMMBalance; - return tecAMM_BALANCE; + // This error case should never occur. + JLOG(ctx_.journal.warn()) + << "AMM Bid: LP Token burn exceeds AMM balance " << burn + << " " << lptAMMBalance; + return tecINTERNAL; } auto res = redeemIOU(sb, account_, saBurn, lpTokens.issue(), ctx_.journal); @@ -316,9 +318,10 @@ applyBid( auto const refund = fractionRemaining * pricePurchased; if (refund > *payPrice) { - JLOG(ctx_.journal.debug()) - << "AMM Bid: invalid refund " << refund << " " << *payPrice; - return {tecINSUFFICIENT_PAYMENT, false}; + // This error case should never occur. + JLOG(ctx_.journal.warn()) + << "AMM Bid: refund exceeds payPrice " << refund << " " << *payPrice; + return {tecINTERNAL, false}; } res = accountSend( sb, From 6e33b6e35d26c08d6a903111e3301d9455d8bb8b Mon Sep 17 00:00:00 2001 From: Elliot Lee Date: Thu, 24 Aug 2023 19:28:11 -0700 Subject: [PATCH 2/3] git apply clang-format.patch --- src/ripple/app/tx/impl/AMMBid.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ripple/app/tx/impl/AMMBid.cpp b/src/ripple/app/tx/impl/AMMBid.cpp index 5db09e0afa6..aa953d45382 100644 --- a/src/ripple/app/tx/impl/AMMBid.cpp +++ b/src/ripple/app/tx/impl/AMMBid.cpp @@ -225,8 +225,8 @@ applyBid( { // This error case should never occur. JLOG(ctx_.journal.warn()) - << "AMM Bid: LP Token burn exceeds AMM balance " << burn - << " " << lptAMMBalance; + << "AMM Bid: LP Token burn exceeds AMM balance " << burn << " " + << lptAMMBalance; return tecINTERNAL; } auto res = @@ -319,8 +319,8 @@ applyBid( if (refund > *payPrice) { // This error case should never occur. - JLOG(ctx_.journal.warn()) - << "AMM Bid: refund exceeds payPrice " << refund << " " << *payPrice; + JLOG(ctx_.journal.warn()) << "AMM Bid: refund exceeds payPrice " + << refund << " " << *payPrice; return {tecINTERNAL, false}; } res = accountSend( From 514acdc62dcf2dadf4c42c8de8600536b9f69798 Mon Sep 17 00:00:00 2001 From: mDuo13 Date: Wed, 30 Aug 2023 11:24:22 -0700 Subject: [PATCH 3/3] [FOLD] Update AMMBid tecINTERNAL logs to fatal --- src/ripple/app/tx/impl/AMMBid.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ripple/app/tx/impl/AMMBid.cpp b/src/ripple/app/tx/impl/AMMBid.cpp index aa953d45382..822e72203a6 100644 --- a/src/ripple/app/tx/impl/AMMBid.cpp +++ b/src/ripple/app/tx/impl/AMMBid.cpp @@ -224,7 +224,7 @@ applyBid( if (saBurn >= lptAMMBalance) { // This error case should never occur. - JLOG(ctx_.journal.warn()) + JLOG(ctx_.journal.fatal()) << "AMM Bid: LP Token burn exceeds AMM balance " << burn << " " << lptAMMBalance; return tecINTERNAL; @@ -319,8 +319,8 @@ applyBid( if (refund > *payPrice) { // This error case should never occur. - JLOG(ctx_.journal.warn()) << "AMM Bid: refund exceeds payPrice " - << refund << " " << *payPrice; + JLOG(ctx_.journal.fatal()) << "AMM Bid: refund exceeds payPrice " + << refund << " " << *payPrice; return {tecINTERNAL, false}; } res = accountSend(