merged code from 0xPolygonHermez/pull/1636

Author: dloghin

zk/stages/stage_sequence_execute.go

@@ -369,26 +369,15 @@ func sequencingBatchStep(
 						return err
 					}
 				} else if !batchState.isL1Recovery() {
-
-					var allConditionsOK bool
 					var newTransactions []types.Transaction
 					var newIds []common.Hash
 
-					newTransactions, newIds, allConditionsOK, err = getNextPoolTransactions(ctx, cfg, executionAt, batchState.forkId, batchState.yieldedTransactions)
+					newTransactions, newIds, _, err = getNextPoolTransactions(ctx, cfg, executionAt, batchState.forkId, batchState.yieldedTransactions)
 					if err != nil {
 						return err
 					}
 
-					if len(newTransactions) == 0 {
-						if allConditionsOK {
-							log.Info(fmt.Sprintf("[%s] Sleep for %v ms", logPrefix, batchContext.cfg.zk.SequencerTimeoutOnEmptyTxPool.Milliseconds()))
-							time.Sleep(batchContext.cfg.zk.SequencerTimeoutOnEmptyTxPool)
-
-						} else {
-							log.Info(fmt.Sprintf("[%s] Sleep for %v ms", logPrefix, batchContext.cfg.zk.SequencerTimeoutOnEmptyTxPool.Milliseconds()/5))
-							time.Sleep(batchContext.cfg.zk.SequencerTimeoutOnEmptyTxPool / 5) // we do not need to sleep too long for txpool not ready
-						}
-					} else {
+					if len(newTransactions) > 0 {
 						hashResults := make([]common.Hash, len(newTransactions))
 						var wg sync.WaitGroup
 
@@ -412,7 +401,12 @@ func sequencingBatchStep(
 				}
 
 				start := time.Now()
-
+				if len(batchState.blockState.transactionsForInclusion) == 0 {
+					log.Trace(fmt.Sprintf("[%s] Sleep on SequencerTimeoutOnEmptyTxPool", logPrefix), "time in ms", batchContext.cfg.zk.SequencerTimeoutOnEmptyTxPool.Milliseconds())
+					time.Sleep(batchContext.cfg.zk.SequencerTimeoutOnEmptyTxPool)
+				} else {
+					log.Trace(fmt.Sprintf("[%s] Yielded transactions from the pool", logPrefix), "txCount", len(batchState.blockState.transactionsForInclusion))
+				}
 				badTxHashes := make([]common.Hash, 0)
 				minedTxHashes := make([]common.Hash, 0)
 
@@ -432,6 +426,22 @@ func sequencingBatchStep(
 					}
 
 					txHash := transaction.Hash()
+
+					if _, ok := transaction.GetSender(); !ok {
+						signer := types.MakeSigner(cfg.chainConfig, executionAt, 0)
+						sender, err := signer.Sender(transaction)
+						if err != nil {
+							log.Warn("[extractTransaction] Failed to recover sender from transaction, skipping and removing from pool",
+								"error", err,
+								"hash", transaction.Hash())
+							badTxHashes = append(badTxHashes, txHash)
+							batchState.blockState.transactionsToDiscard = append(batchState.blockState.transactionsToDiscard, batchState.blockState.transactionHashesToSlots[txHash])
+							continue
+						}
+
+						transaction.SetSender(sender)
+					}
+
 					effectiveGas := batchState.blockState.getL1EffectiveGases(cfg, i)
 
 					// The copying of this structure is intentional

zk/stages/stage_sequence_execute_transactions.go

@@ -17,7 +17,6 @@ import (
 	"github.com/ledgerwatch/erigon/core/vm/evmtypes"
 	"github.com/ledgerwatch/erigon/zk/utils"
 	"github.com/ledgerwatch/log/v3"
-	"github.com/ledgerwatch/secp256k1"
 )
 
 func getNextPoolTransactions(ctx context.Context, cfg SequenceBlockCfg, executionAt, forkId uint64, alreadyYielded mapset.Set[[32]byte]) ([]types.Transaction, []common.Hash, bool, error) {
@@ -90,8 +89,6 @@ func extractTransactionsFromSlot(slot *types2.TxsRlp, currentHeight uint64, cfg
 	transactions := make([]types.Transaction, 0, len(slot.Txs))
 	toRemove := make([]common.Hash, 0)
 
-	signer := types.MakeSigner(cfg.chainConfig, currentHeight, 0)
-
 	type result struct {
 		index       int
 		transaction types.Transaction
@@ -104,8 +101,6 @@ func extractTransactionsFromSlot(slot *types2.TxsRlp, currentHeight uint64, cfg
 
 	// we do this in sequnce to avoid concurrent map writes
 	for idx, txBytes := range slot.Txs {
-		cryptoContext := secp256k1.ContextForThread(1)
-
 		res := &result{index: idx}
 
 		var err error = nil
@@ -130,24 +125,7 @@ func extractTransactionsFromSlot(slot *types2.TxsRlp, currentHeight uint64, cfg
 			continue
 		}
 
-		err = nil
-		var sender common.Address
-		senderPtr, found := cfg.senderCache[slot.TxIds[idx]]
-		if !found {
-			sender, err = signer.SenderWithContext(cryptoContext, transaction)
-			if err != nil {
-				res.toRemove = true
-				res.id = slot.TxIds[idx]
-				res.err = err
-				results[idx] = res
-				continue
-			}
-			cfg.senderCache[slot.TxIds[idx]] = &sender
-		} else {
-			sender = *senderPtr
-		}
-
-		transaction.SetSender(sender)
+		// Recover sender later only for those transactions that are included in the block
 		res.transaction = transaction
 		res.id = slot.TxIds[idx]
 		results[idx] = res

zk/stages/stage_sequence_execute_utils.go

@@ -86,8 +86,7 @@ type SequenceBlockCfg struct {
 
 	infoTreeUpdater *l1infotree.Updater
 
-	txCache     map[common.Hash]*types.Transaction
-	senderCache map[common.Hash]*common.Address
+	txCache map[common.Hash]*types.Transaction
 }
 
 func StageSequenceBlocksCfg(
@@ -145,7 +144,6 @@ func StageSequenceBlocksCfg(
 		yieldSize:        yieldSize,
 		infoTreeUpdater:  infoTreeUpdater,
 		txCache:          make(map[common.Hash]*types.Transaction),
-		senderCache:      make(map[common.Hash]*common.Address),
 	}
 }