move Update out of Select Transaction

node/node_newblock.go

@@ -63,6 +63,9 @@ func (node *Node) WaitForConsensusReadyv2(readySignal chan struct{}, stopChan ch
 					selectedTxs := types.Transactions{} // Empty transaction list
 					if node.NodeConfig.GetNetworkType() != nodeconfig.Mainnet {
 						selectedTxs = node.getTransactionsForNewBlock(MaxNumberOfTransactionsPerBlock, coinbase)
+						if err := node.Worker.UpdateCurrent(coinbase); err != nil {
+							utils.GetLogger().Error("Failed updating worker's state", "Error", err)
+						}
 					}
 					utils.GetLogInstance().Info("PROPOSING NEW BLOCK ------------------------------------------------", "blockNum", node.Blockchain().CurrentBlock().NumberU64()+1, "selectedTxs", len(selectedTxs))
 					if err := node.Worker.CommitTransactions(selectedTxs, coinbase); err != nil {

node/worker/worker.go

@@ -67,9 +67,6 @@ func (w *Worker) SelectTransactionsForNewBlock(txs types.Transactions, maxNumTxs
 			}
 		}
 	}
-	if err := w.UpdateCurrent(coinbase); err != nil {
-		utils.GetLogger().Error("Failed updating worker's state", "Error", err)
-	}
 	return selected, unselected, invalid
 }