Merge branch '1mgas-txpool-add-parallel' into 1mgas-txpool-profiling

andyzhang2023 · Mar 21, 2024 · 8021765 · 8021765
2 parents 770344d + 549bfed
commit 8021765
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/core/txpool/legacypool/legacypool.go b/core/txpool/legacypool/legacypool.go
@@ -758,7 +758,14 @@ func (pool *LegacyPool) validateTx(tx *types.Transaction, local bool) error {
 			}
 			return nil
 		},
-		L1CostFn: pool.l1CostFn,
+		L1CostFn: func(dataGas types.RollupGasData) *big.Int {
+			pool.mu.Lock()
+			defer pool.mu.Unlock()
+			if pool.l1CostFn != nil {
+				return pool.l1CostFn(dataGas)
+			}
+			return nil
+		},
 	}
 	if err := txpool.ValidateTransactionWithState(tx, pool.signer, opts); err != nil {
 		return err