Merge branch '1mgas-txpool-v0.3.0-demote' into 1mgas.vbase.v.improve

core/txpool/legacypool/legacypool.go

@@ -1503,14 +1503,18 @@ func (pool *LegacyPool) reset(oldHead, newHead *types.Header) (demoteAddrs []com
 	var collectAddr = func(txs types.Transactions) {
 		addrs := make(map[common.Address]struct{})
 		for _, tx := range txs {
+			if !pool.Filter(tx) {
+				continue
+			}
+			// it is heavy to get sender from tx, so we try to get it from the pool
+			if oldtx := pool.all.Get(tx.Hash()); oldtx != nil {
+				tx = oldtx
+			}
 			addr, err := types.Sender(pool.signer, tx)
 			//it might come from other pool, by other signer
 			if err != nil {
 				continue
 			}
-			if !pool.Filter(tx) {
-				continue
-			}
 			addrs[addr] = struct{}{}
 		}
 		demoteAddrs = make([]common.Address, 0, len(addrs))