initial input/ordering txs split

ergoplatform · Jan 14, 2025 · 41f2d59 · 41f2d59
1 parent 5773c17
commit 41f2d59
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/main/scala/org/ergoplatform/mining/CandidateGenerator.scala b/src/main/scala/org/ergoplatform/mining/CandidateGenerator.scala
@@ -548,15 +548,21 @@ object CandidateGenerator extends ScorexLogging {
         version
       )
 
-      val transactionCandidates = emissionTxOpt.toSeq ++ prioritizedTransactions ++ poolTxs.map(_.transaction)
+      // returns txs which may and may not be included into input-block
+      def filterInputBlockTransactions(candidates: Seq[ErgoTransaction]): (Seq[ErgoTransaction], Seq[ErgoTransaction]) = {
+        (candidates, Seq.empty) // todo: real implemenation
+      }
+
+      val (inputBlockTransactionCandidates, txsNotIncludedIntoInput) = filterInputBlockTransactions(prioritizedTransactions ++ poolTxs.map(_.transaction))
+      val orderingBlocktransactionCandidates = emissionTxOpt.toSeq ++ inputBlockTransactionCandidates ++ txsNotIncludedIntoInput
 
       val (txs, toEliminate) = collectTxs(
         minerPk,
         state.stateContext.currentParameters.maxBlockCost - safeGap,
         state.stateContext.currentParameters.maxBlockSize,
         state,
         upcomingContext,
-        transactionCandidates
+        orderingBlocktransactionCandidates
       )
 
       val eliminateTransactions = EliminateTransactions(toEliminate)