@@ -137,7 +137,8 @@ func (bp *blockProcessor) PrepareBlockForDB(obh *outport.OutportBlockWithHeader)
137137
138138 bp .addEpochStartInfoForMeta (obh .Header , elasticBlock )
139139
140- elasticBlock .MiniBlocksDetails = prepareMiniBlockDetails (obh .Header .GetMiniBlockHeaderHandlers (), obh .BlockData .Body , obh .TransactionPool )
140+ areProposedMBs := obh .Header .IsHeaderV3 ()
141+ elasticBlock .MiniBlocksDetails = prepareMiniBlockDetails (obh .Header .GetMiniBlockHeaderHandlers (), obh .BlockData .Body , obh .TransactionPool , areProposedMBs )
141142
142143 appendBlockDetailsFromIntraShardMbs (elasticBlock , obh .BlockData .IntraShardMiniBlocks , obh .TransactionPool , len (obh .Header .GetMiniBlockHeaderHandlers ()))
143144
@@ -188,12 +189,12 @@ func (bp *blockProcessor) prepareExecutionResult(baseExecutionResult coreData.Ba
188189
189190 switch t := baseExecutionResult .(type ) {
190191 case * nodeBlock.MetaExecutionResult :
191- executionResult .MiniBlocksDetails = prepareMiniBlockDetails (t .GetMiniBlockHeadersHandlers (), executionResultData .Body , executionResultData .TransactionPool )
192+ executionResult .MiniBlocksDetails = prepareMiniBlockDetails (t .GetMiniBlockHeadersHandlers (), executionResultData .Body , executionResultData .TransactionPool , false )
192193 executionResult .AccumulatedFees = t .AccumulatedFees .String ()
193194 executionResult .DeveloperFees = t .DeveloperFees .String ()
194195 executionResult .TxCount = t .ExecutedTxCount
195196 case * nodeBlock.ExecutionResult :
196- executionResult .MiniBlocksDetails = prepareMiniBlockDetails (t .GetMiniBlockHeadersHandlers (), executionResultData .Body , executionResultData .TransactionPool )
197+ executionResult .MiniBlocksDetails = prepareMiniBlockDetails (t .GetMiniBlockHeadersHandlers (), executionResultData .Body , executionResultData .TransactionPool , false )
197198 executionResult .AccumulatedFees = t .AccumulatedFees .String ()
198199 executionResult .DeveloperFees = t .DeveloperFees .String ()
199200 executionResult .TxCount = t .ExecutedTxCount
@@ -360,7 +361,7 @@ func (bp *blockProcessor) getEncodedMBSHashes(body *nodeBlock.Body, intraShardMb
360361 return miniblocksHashes
361362}
362363
363- func prepareMiniBlockDetails (mbHeaders []coreData.MiniBlockHeaderHandler , body * nodeBlock.Body , pool * outport.TransactionPool ) []* data.MiniBlocksDetails {
364+ func prepareMiniBlockDetails (mbHeaders []coreData.MiniBlockHeaderHandler , body * nodeBlock.Body , pool * outport.TransactionPool , areProposed bool ) []* data.MiniBlocksDetails {
364365 mbsDetails := make ([]* data.MiniBlocksDetails , 0 , len (mbHeaders ))
365366 for idx , mbHeader := range mbHeaders {
366367 mbType := nodeBlock .Type (mbHeader .GetTypeInt32 ())
@@ -369,17 +370,22 @@ func prepareMiniBlockDetails(mbHeaders []coreData.MiniBlockHeaderHandler, body *
369370 }
370371
371372 txsHashes := body .MiniBlocks [idx ].TxHashes
372- mbsDetails = append (mbsDetails , & data.MiniBlocksDetails {
373- IndexFirstProcessedTx : mbHeader .GetIndexOfFirstTxProcessed (),
374- IndexLastProcessedTx : mbHeader .GetIndexOfLastTxProcessed (),
375- MBIndex : idx ,
376- ProcessingType : nodeBlock .ProcessingType (mbHeader .GetProcessingType ()).String (),
377- Type : mbType .String (),
378- SenderShardID : mbHeader .GetSenderShardID (),
379- ReceiverShardID : mbHeader .GetReceiverShardID (),
380- TxsHashes : hexEncodeSlice (txsHashes ),
381- ExecutionOrderTxsIndices : extractExecutionOrderIndicesFromPool (mbHeader , txsHashes , pool ),
382- })
373+ mbDetails := & data.MiniBlocksDetails {
374+ IndexFirstProcessedTx : mbHeader .GetIndexOfFirstTxProcessed (),
375+ IndexLastProcessedTx : mbHeader .GetIndexOfLastTxProcessed (),
376+ MBIndex : idx ,
377+ ProcessingType : nodeBlock .ProcessingType (mbHeader .GetProcessingType ()).String (),
378+ Type : mbType .String (),
379+ SenderShardID : mbHeader .GetSenderShardID (),
380+ ReceiverShardID : mbHeader .GetReceiverShardID (),
381+ TxsHashes : hexEncodeSlice (txsHashes ),
382+ }
383+ if ! areProposed {
384+ mbDetails .ExecutionOrderTxsIndices = extractExecutionOrderIndicesFromPool (mbHeader , txsHashes , pool )
385+ }
386+
387+ mbsDetails = append (mbsDetails , mbDetails )
388+
383389 }
384390
385391 return mbsDetails
0 commit comments