small fixes

Author: dmkozh

src/herder/TxSetFrame.cpp

@@ -852,8 +852,12 @@ TxSetXDRFrame::makeEmpty(LedgerHeaderHistoryEntry const& lclHeader)
     if (protocolVersionStartsFrom(lclHeader.header.ledgerVersion,
                                   SOROBAN_PROTOCOL_VERSION))
     {
+        // Create only non-parallel phases for now. Later we'll need to add an
+        // empty Soroban parallel stage starting from the respective protocol
+        // version.
         std::vector<TxSetPhaseFrame> emptyPhases(
-            static_cast<size_t>(TxSetPhase::PHASE_COUNT));
+            static_cast<size_t>(TxSetPhase::PHASE_COUNT),
+            TxSetPhaseFrame::makeEmpty(false));
         GeneralizedTransactionSet txSet;
         transactionsToGeneralizedTransactionSetXDR(emptyPhases, lclHeader.hash,
                                                    txSet);
@@ -1002,7 +1006,6 @@ TxSetXDRFrame::prepareForApply(Application& app) const
     else
     {
         auto const& xdrTxSet = std::get<TransactionSet>(mXDRTxSet);
-        phaseFrames.emplace_back();
         auto maybePhase = TxSetPhaseFrame::makeFromWireLegacy(
             app.getLedgerManager().getLastClosedLedgerHeader().header,
             app.getNetworkID(), xdrTxSet.txs);
@@ -1406,6 +1409,17 @@ TxSetPhaseFrame::makeFromWireLegacy(
                                                inclusionFeeMapPtr);
 }
 
+TxSetPhaseFrame
+TxSetPhaseFrame::makeEmpty(bool isParallel)
+{
+    if (isParallel)
+    {
+        return TxSetPhaseFrame(TxStageFrameList{},
+                               std::make_shared<InclusionFeeMap>());
+    }
+    return TxSetPhaseFrame(TxFrameList{}, std::make_shared<InclusionFeeMap>());
+}
+
 TxSetPhaseFrame::TxSetPhaseFrame(
     TxFrameList&& txs, std::shared_ptr<InclusionFeeMap> inclusionFeeMap)
     : mTxs(txs), mInclusionFeeMap(inclusionFeeMap)

src/herder/TxSetFrame.h

@@ -203,11 +203,12 @@ class TxSetPhaseFrame
     makeFromWireLegacy(LedgerHeader const& lclHeader, Hash const& networkID,
                        xdr::xvector<TransactionEnvelope> const& xdrTxs);
 
+    static TxSetPhaseFrame makeEmpty(bool isParallel);
+
     TxSetPhaseFrame(TxFrameList&& txs,
                     std::shared_ptr<InclusionFeeMap> inclusionFeeMap);
     TxSetPhaseFrame(TxStageFrameList&& txs,
                     std::shared_ptr<InclusionFeeMap> inclusionFeeMap);
-    TxSetPhaseFrame() = default;
 
     bool isParallel() const;
 

src/main/ApplicationImpl.cpp

@@ -355,7 +355,7 @@ ApplicationImpl::initialize(bool createNewDB, bool forceRebuild)
     }
 
     AccountSubEntriesCountIsValid::registerInvariant(*this);
-    //ConservationOfLumens::registerInvariant(*this);
+    ConservationOfLumens::registerInvariant(*this);
     LedgerEntryIsValid::registerInvariant(*this);
     LiabilitiesMatchOffers::registerInvariant(*this);
     SponsorshipCountIsValid::registerInvariant(*this);