historicalTraceWorker: add logs and small fix (#591)

node-real · Jan 8, 2025 · a53da48 · a53da48
1 parent 3b99128
commit a53da48
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/cmd/state/exec3/historical_trace_worker.go b/cmd/state/exec3/historical_trace_worker.go
@@ -419,13 +419,15 @@ func processResultQueueHistorical(consumer TraceConsumer, rws *state.ResultsQueu
 		stopedAtBlockEnd = txTask.Final
 
 		if txTask.Error != nil {
+			log.Error("txTask exec error", "block", txTask.BlockNum, "txIndex", txTask.TxIndex, "err", txTask.Error)
 			return outputTxNum, false, txTask.Error
 		}
 
 		if txTask.TxIndex >= 0 && !txTask.Final {
 			txTask.CreateReceipt(tx)
 		}
 		if err := consumer.Reduce(txTask, tx); err != nil {
+			log.Error("Reduce exec error", "block", txTask.BlockNum, "txIndex", txTask.TxIndex, "err", err)
 			return outputTxNum, false, err
 		}
 

diff --git a/consensus/parlia/feynmanfork.go b/consensus/parlia/feynmanfork.go
@@ -108,8 +108,10 @@ func (p *Parlia) updateValidatorSetV2(chain consensus.ChainHeaderReader, ibs *st
 		return true, err
 	}
 
+	_, historyMode := ibs.StateReader.(*state.HistoryReaderV3)
+
 	// On case exec at middle of block, the cache is nil.
-	if validatorItemsCache == nil && maxElectedValidatorsCache == big.NewInt(0) {
+	if historyMode || (validatorItemsCache == nil && maxElectedValidatorsCache == big.NewInt(0)) {
 		data = (*txs)[*curIndex].GetData()
 	}
 

diff --git a/consensus/parlia/parlia.go b/consensus/parlia/parlia.go
@@ -974,7 +974,7 @@ func (p *Parlia) finalize(header *types.Header, ibs *state.IntraBlockState, txs
 		if txIndex == len(txs)-1 && finish {
 			if fs := finality.GetFinalizationService(); fs != nil {
 				curSnap, _ := p.snapshot(chain, number, header.Hash(), nil, true)
-				if curSnap.Attestation != nil {
+				if curSnap != nil && curSnap.Attestation != nil {
 					fs.UpdateFinality(curSnap.Attestation.SourceHash, curSnap.Attestation.TargetHash)
 				}
 			}
@@ -1436,7 +1436,6 @@ func (p *Parlia) distributeToSystem(val libcommon.Address, ibs *state.IntraBlock
 func (p *Parlia) distributeToValidator(val libcommon.Address, ibs *state.IntraBlockState, header *types.Header,
 	txs *types.Transactions, receipts *types.Receipts, systemTxs *types.Transactions,
 	usedGas *uint64, mining bool, systemTxCall consensus.SystemTxCall, curIndex, txIndex *int) (bool, error) {
-
 	if *curIndex == *txIndex {
 		bal, err := ibs.GetBalance(consensus.SystemAddress)
 		if err != nil {