From bcb48fbad3de8f00a190a6e99cdec7a72c7721d2 Mon Sep 17 00:00:00 2001
From: Denis Angell <dangell@transia.co>
Date: Tue, 24 Mar 2026 14:09:44 +0100
Subject: [PATCH] misc review comments

---
 include/xrpl/protocol_autogen/transactions/Batch.h | 2 +-
 src/libxrpl/ledger/OpenView.cpp                    | 2 +-
 src/libxrpl/protocol/STTx.cpp                      | 1 +
 src/libxrpl/tx/Transactor.cpp                      | 2 +-
 src/libxrpl/tx/transactors/payment/Payment.cpp     | 4 ++--
 src/libxrpl/tx/transactors/system/Batch.cpp        | 4 ++--
 src/test/app/TxQ_test.cpp                          | 1 -
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/include/xrpl/protocol_autogen/transactions/Batch.h b/include/xrpl/protocol_autogen/transactions/Batch.h
index 0bb638435c..747287439a 100644
--- a/include/xrpl/protocol_autogen/transactions/Batch.h
+++ b/include/xrpl/protocol_autogen/transactions/Batch.h
@@ -20,7 +20,7 @@ class BatchBuilder;
  *
  * Type: ttBATCH (71)
  * Delegable: Delegation::notDelegable
- * Amendment: featureBatch
+ * Amendment: featureBatchV1_1
  * Privileges: noPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
diff --git a/src/libxrpl/ledger/OpenView.cpp b/src/libxrpl/ledger/OpenView.cpp
index b5e358053c..605accb6b3 100644
--- a/src/libxrpl/ledger/OpenView.cpp
+++ b/src/libxrpl/ledger/OpenView.cpp
@@ -185,7 +185,7 @@ OpenView::txsEnd() const -> std::unique_ptr<txs_type::iter_base>
 bool
 OpenView::txExists(key_type const& key) const
 {
-    return txs_.contains(key);
+    return txs_.contains(key) || base_->txExists(key);
 }
 
 auto
diff --git a/src/libxrpl/protocol/STTx.cpp b/src/libxrpl/protocol/STTx.cpp
index 7f6e12d95a..09a0811a3f 100644
--- a/src/libxrpl/protocol/STTx.cpp
+++ b/src/libxrpl/protocol/STTx.cpp
@@ -511,6 +511,7 @@ multiSignHelper(
             return Unexpected(
                 std::string("Invalid signature on account ") + toBase58(accountID) +
                 (errorWhat ? ": " + *errorWhat : "") + ".");
+        }
     }
     // All signatures verified.
     return {};
diff --git a/src/libxrpl/tx/Transactor.cpp b/src/libxrpl/tx/Transactor.cpp
index 8d2ba2571f..8c813b8faa 100644
--- a/src/libxrpl/tx/Transactor.cpp
+++ b/src/libxrpl/tx/Transactor.cpp
@@ -983,7 +983,7 @@ Transactor::reset(XRPAmount fee)
 
     // balance should have already been checked in checkFee / preFlight.
     XRPL_ASSERT(
-        balance != beast::zero && (!view().open() || balance >= fee),
+        (fee == beast::zero || balance != beast::zero) && (!view().open() || balance >= fee),
         "xrpl::Transactor::reset : valid balance");
 
     // We retry/reject the transaction if the account balance is zero or
diff --git a/src/libxrpl/tx/transactors/payment/Payment.cpp b/src/libxrpl/tx/transactors/payment/Payment.cpp
index 8bf86b7b38..886fe32984 100644
--- a/src/libxrpl/tx/transactors/payment/Payment.cpp
+++ b/src/libxrpl/tx/transactors/payment/Payment.cpp
@@ -286,7 +286,7 @@ Payment::preclaim(PreclaimContext const& ctx)
             // transaction would succeed.
             return tecNO_DST;
         }
-        if (ctx.view.open() && partialPaymentAllowed)
+        if (partialPaymentAllowed)
         {
             // You cannot fund an account with a partial payment.
             // Make retry work smaller, by rejecting this.
@@ -323,7 +323,7 @@ Payment::preclaim(PreclaimContext const& ctx)
     }
 
     // Payment with at least one intermediate step and uses transitive balances.
-    if ((hasPaths || sendMax || !dstAmount.native()) && ctx.view.open())
+    if (hasPaths || sendMax || !dstAmount.native())
     {
         STPathSet const& paths = ctx.tx.getFieldPathSet(sfPaths);
 
diff --git a/src/libxrpl/tx/transactors/system/Batch.cpp b/src/libxrpl/tx/transactors/system/Batch.cpp
index f509460e6b..fd674b1771 100644
--- a/src/libxrpl/tx/transactors/system/Batch.cpp
+++ b/src/libxrpl/tx/transactors/system/Batch.cpp
@@ -89,7 +89,7 @@ Batch::calculateBaseFee(ReadView const& view, STTx const& tx)
     }
 
     // Calculate the Signers/BatchSigners Fees
-    std::int32_t signerCount = 0;
+    std::uint32_t signerCount = 0;
     if (tx.isFieldPresent(sfBatchSigners))
     {
         auto const& signers = tx.getFieldArray(sfBatchSigners);
@@ -413,7 +413,7 @@ Batch::preflightSigValidated(PreflightContext const& ctx)
         STArray const& signers = ctx.tx.getFieldArray(sfBatchSigners);
 
         // Check that the batch signers array is not too large.
-        if (signers.size() > maxBatchTxCount)
+        if (signers.size() > rawTxns.size())
         {
             JLOG(ctx.j.debug()) << "BatchTrace[" << parentBatchId << "]: "
                                 << "signers array exceeds 8 entries.";
diff --git a/src/test/app/TxQ_test.cpp b/src/test/app/TxQ_test.cpp
index cadd93529b..4dddd939b4 100644
--- a/src/test/app/TxQ_test.cpp
+++ b/src/test/app/TxQ_test.cpp
@@ -20,7 +20,6 @@ namespace test {
 
 class TxQPosNegFlows_test : public beast::unit_test::suite
 {
-
     void
     fillQueue(jtx::Env& env, jtx::Account const& account)
     {