fix

stellar · Jul 5, 2023 · 3e16572 · 3e16572 · latobarita · Jul 5, 2023
1 parent a2a114c
commit 3e16572
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/src/herder/HerderImpl.cpp b/src/herder/HerderImpl.cpp
@@ -2064,8 +2064,11 @@ HerderImpl::updateTransactionQueue(TxSetFrameConstPtr txSet)
     updateQueue(mTransactionQueue,
                 txSet->getTxsForPhase(TxSetFrame::Phase::CLASSIC));
 #ifdef ENABLE_NEXT_PROTOCOL_VERSION_UNSAFE_FOR_PRODUCTION
-    updateQueue(mSorobanTransactionQueue,
-                txSet->getTxsForPhase(TxSetFrame::Phase::SOROBAN));
+    if (txSet->numPhases() > static_cast<size_t>(TxSetFrame::Phase::SOROBAN))
+    {
+        updateQueue(mSorobanTransactionQueue,
+                    txSet->getTxsForPhase(TxSetFrame::Phase::SOROBAN));
+    }
 #endif
 }
 

diff --git a/src/herder/TxSetFrame.cpp b/src/herder/TxSetFrame.cpp
@@ -496,6 +496,7 @@ TxSetFrame::previousLedgerHash() const
 TxSetFrame::Transactions const&
 TxSetFrame::getTxsForPhase(Phase phase) const
 {
+    releaseAssert(static_cast<size_t>(phase) < mTxPhases.size());
     return mTxPhases.at(static_cast<size_t>(phase));
 }
 
@@ -705,7 +706,14 @@ TxSetFrame::size(LedgerHeader const& lh, std::optional<Phase> phase) const
 {
     size_t sz = 0;
 #ifdef ENABLE_NEXT_PROTOCOL_VERSION_UNSAFE_FOR_PRODUCTION
-    if (!phase || phase.value() == Phase::SOROBAN)
+    if (!phase)
+    {
+        if (numPhases() > static_cast<size_t>(Phase::SOROBAN))
+        {
+            sz += sizeOp(Phase::SOROBAN);
+        }
+    }
+    else if (phase.value() == Phase::SOROBAN)
     {
         sz += sizeOp(Phase::SOROBAN);
     }