diff --git a/src/libxrpl/tx/PreflightHelpers.h b/src/libxrpl/tx/PreflightHelpers.h index 3ee665e490..a1f3f272b0 100644 --- a/src/libxrpl/tx/PreflightHelpers.h +++ b/src/libxrpl/tx/PreflightHelpers.h @@ -45,14 +45,14 @@ isZeroId(T const& id) // Checks whether an amount is a strictly positive XRP amount. inline bool -checkPositiveXRPAmount(xrpl::STAmount const& amount) +isPositiveXRPAmount(xrpl::STAmount const& amount) { return xrpl::isXRP(amount) && amount > beast::kZero; } // Checks whether an amount (of any asset type) is strictly positive. inline bool -checkPositiveAmount(xrpl::STAmount const& amount) +isPositiveAmount(xrpl::STAmount const& amount) { return amount > beast::kZero; } diff --git a/src/libxrpl/tx/transactors/escrow/EscrowCreate.cpp b/src/libxrpl/tx/transactors/escrow/EscrowCreate.cpp index 7979e69ec7..498f9fd692 100644 --- a/src/libxrpl/tx/transactors/escrow/EscrowCreate.cpp +++ b/src/libxrpl/tx/transactors/escrow/EscrowCreate.cpp @@ -102,7 +102,7 @@ NotTEC escrowCreatePreflightHelper(PreflightContext const& ctx) { STAmount const amount = ctx.tx[sfAmount]; - if (amount.native() || !checkPositiveAmount(amount)) + if (amount.native() || !isPositiveAmount(amount)) return temBAD_AMOUNT; if (isBadCurrency(amount.get().currency)) @@ -119,8 +119,7 @@ escrowCreatePreflightHelper(PreflightContext const& ctx) return temDISABLED; auto const amount = ctx.tx[sfAmount]; - if (amount.native() || amount.mpt() > MPTAmount{kMaxMpTokenAmount} || - !checkPositiveAmount(amount)) + if (amount.native() || amount.mpt() > MPTAmount{kMaxMpTokenAmount} || !isPositiveAmount(amount)) return temBAD_AMOUNT; return tesSUCCESS; @@ -143,7 +142,7 @@ EscrowCreate::preflight(PreflightContext const& ctx) } else { - if (!checkPositiveXRPAmount(amount)) + if (!isPositiveXRPAmount(amount)) return temBAD_AMOUNT; } diff --git a/src/libxrpl/tx/transactors/lending/LoanBrokerCoverDeposit.cpp b/src/libxrpl/tx/transactors/lending/LoanBrokerCoverDeposit.cpp index a605734d5c..94682fc8e7 100644 --- a/src/libxrpl/tx/transactors/lending/LoanBrokerCoverDeposit.cpp +++ b/src/libxrpl/tx/transactors/lending/LoanBrokerCoverDeposit.cpp @@ -33,7 +33,7 @@ LoanBrokerCoverDeposit::preflight(PreflightContext const& ctx) return temINVALID; auto const dstAmount = ctx.tx[sfAmount]; - if (!checkPositiveAmount(dstAmount)) + if (!isPositiveAmount(dstAmount)) return temBAD_AMOUNT; if (!isLegalNet(dstAmount)) diff --git a/src/libxrpl/tx/transactors/lending/LoanBrokerCoverWithdraw.cpp b/src/libxrpl/tx/transactors/lending/LoanBrokerCoverWithdraw.cpp index 2186f194c9..406953f940 100644 --- a/src/libxrpl/tx/transactors/lending/LoanBrokerCoverWithdraw.cpp +++ b/src/libxrpl/tx/transactors/lending/LoanBrokerCoverWithdraw.cpp @@ -36,7 +36,7 @@ LoanBrokerCoverWithdraw::preflight(PreflightContext const& ctx) return temINVALID; auto const dstAmount = ctx.tx[sfAmount]; - if (!checkPositiveAmount(dstAmount)) + if (!isPositiveAmount(dstAmount)) return temBAD_AMOUNT; if (!isLegalNet(dstAmount)) diff --git a/src/libxrpl/tx/transactors/lending/LoanPay.cpp b/src/libxrpl/tx/transactors/lending/LoanPay.cpp index 0062ef6092..b19889733f 100644 --- a/src/libxrpl/tx/transactors/lending/LoanPay.cpp +++ b/src/libxrpl/tx/transactors/lending/LoanPay.cpp @@ -53,7 +53,7 @@ LoanPay::preflight(PreflightContext const& ctx) if (isZeroId(ctx.tx[sfLoanID])) return temINVALID; - if (!checkPositiveAmount(ctx.tx[sfAmount])) + if (!isPositiveAmount(ctx.tx[sfAmount])) return temBAD_AMOUNT; // The loan payment flags are all mutually exclusive. If more than one is diff --git a/src/libxrpl/tx/transactors/payment/Payment.cpp b/src/libxrpl/tx/transactors/payment/Payment.cpp index b67742490e..932e04af1e 100644 --- a/src/libxrpl/tx/transactors/payment/Payment.cpp +++ b/src/libxrpl/tx/transactors/payment/Payment.cpp @@ -185,13 +185,13 @@ Payment::preflight(PreflightContext const& ctx) << "Payment destination account not specified."; return temDST_NEEDED; } - if (hasMax && !checkPositiveAmount(maxSourceAmount)) + if (hasMax && !isPositiveAmount(maxSourceAmount)) { JLOG(j.trace()) << "Malformed transaction: bad max amount: " << maxSourceAmount.getFullText(); return temBAD_AMOUNT; } - if (!checkPositiveAmount(dstAmount)) + if (!isPositiveAmount(dstAmount)) { JLOG(j.trace()) << "Malformed transaction: bad dst amount: " << dstAmount.getFullText(); return temBAD_AMOUNT; diff --git a/src/libxrpl/tx/transactors/payment_channel/PaymentChannelClaim.cpp b/src/libxrpl/tx/transactors/payment_channel/PaymentChannelClaim.cpp index 0e9042a51c..dd7acb85a4 100644 --- a/src/libxrpl/tx/transactors/payment_channel/PaymentChannelClaim.cpp +++ b/src/libxrpl/tx/transactors/payment_channel/PaymentChannelClaim.cpp @@ -48,11 +48,11 @@ PaymentChannelClaim::preflight(PreflightContext const& ctx) return temMALFORMED; auto const bal = ctx.tx[~sfBalance]; - if (bal && !checkPositiveXRPAmount(*bal)) + if (bal && !isPositiveXRPAmount(*bal)) return temBAD_AMOUNT; auto const amt = ctx.tx[~sfAmount]; - if (amt && !checkPositiveXRPAmount(*amt)) + if (amt && !isPositiveXRPAmount(*amt)) return temBAD_AMOUNT; if (bal && amt && *bal > *amt) diff --git a/src/libxrpl/tx/transactors/payment_channel/PaymentChannelCreate.cpp b/src/libxrpl/tx/transactors/payment_channel/PaymentChannelCreate.cpp index 7c04613b27..e06997b6ed 100644 --- a/src/libxrpl/tx/transactors/payment_channel/PaymentChannelCreate.cpp +++ b/src/libxrpl/tx/transactors/payment_channel/PaymentChannelCreate.cpp @@ -58,7 +58,7 @@ PaymentChannelCreate::makeTxConsequences(PreflightContext const& ctx) NotTEC PaymentChannelCreate::preflight(PreflightContext const& ctx) { - if (!checkPositiveXRPAmount(ctx.tx[sfAmount])) + if (!isPositiveXRPAmount(ctx.tx[sfAmount])) return temBAD_AMOUNT; if (ctx.tx[sfAccount] == ctx.tx[sfDestination]) diff --git a/src/libxrpl/tx/transactors/payment_channel/PaymentChannelFund.cpp b/src/libxrpl/tx/transactors/payment_channel/PaymentChannelFund.cpp index 51fd977d1d..ffaba363ea 100644 --- a/src/libxrpl/tx/transactors/payment_channel/PaymentChannelFund.cpp +++ b/src/libxrpl/tx/transactors/payment_channel/PaymentChannelFund.cpp @@ -35,7 +35,7 @@ PaymentChannelFund::preflight(PreflightContext const& ctx) if (ctx.rules.enabled(fixCleanup3_2_0) && isZeroId(ctx.tx[sfChannel])) return temMALFORMED; - if (!checkPositiveXRPAmount(ctx.tx[sfAmount])) + if (!isPositiveXRPAmount(ctx.tx[sfAmount])) return temBAD_AMOUNT; return tesSUCCESS; diff --git a/src/libxrpl/tx/transactors/token/Clawback.cpp b/src/libxrpl/tx/transactors/token/Clawback.cpp index 82e5e60509..23c0995b12 100644 --- a/src/libxrpl/tx/transactors/token/Clawback.cpp +++ b/src/libxrpl/tx/transactors/token/Clawback.cpp @@ -46,7 +46,7 @@ preflightHelper(PreflightContext const& ctx) // The issuer field is used for the token holder instead AccountID const& holder = clawAmount.getIssuer(); - if (issuer == holder || isXRP(clawAmount) || !checkPositiveAmount(clawAmount)) + if (issuer == holder || isXRP(clawAmount) || !isPositiveAmount(clawAmount)) return temBAD_AMOUNT; return tesSUCCESS; @@ -69,7 +69,7 @@ preflightHelper(PreflightContext const& ctx) if (ctx.tx[sfAccount] == *mptHolder) return temMALFORMED; - if (clawAmount.mpt() > MPTAmount{kMaxMpTokenAmount} || !checkPositiveAmount(clawAmount)) + if (clawAmount.mpt() > MPTAmount{kMaxMpTokenAmount} || !isPositiveAmount(clawAmount)) return temBAD_AMOUNT; return tesSUCCESS; diff --git a/src/libxrpl/tx/transactors/vault/VaultWithdraw.cpp b/src/libxrpl/tx/transactors/vault/VaultWithdraw.cpp index b2935b6693..f39063f432 100644 --- a/src/libxrpl/tx/transactors/vault/VaultWithdraw.cpp +++ b/src/libxrpl/tx/transactors/vault/VaultWithdraw.cpp @@ -50,7 +50,7 @@ VaultWithdraw::preflight(PreflightContext const& ctx) return temMALFORMED; } - if (!checkPositiveAmount(ctx.tx[sfAmount])) + if (!isPositiveAmount(ctx.tx[sfAmount])) return temBAD_AMOUNT; if (auto const destination = ctx.tx[~sfDestination])