Merge pull request #728 from gzliudan/fix-pend-tx

core/txpool: fix very high pending special transactions

Author: gzliudan

core/txpool/txpool.go

@@ -570,7 +570,7 @@ func (pool *TxPool) Pending(enforceTips bool) map[common.Address]types.Transacti
 		// If the miner requests tip enforcement, cap the lists now
 		if enforceTips && !pool.locals.contains(addr) {
 			for i, tx := range txs {
-				if tx.EffectiveGasTipIntCmp(pool.gasPrice, pool.priced.urgent.baseFee) < 0 {
+				if !tx.IsSpecialTransaction() && tx.EffectiveGasTipIntCmp(pool.gasPrice, pool.priced.urgent.baseFee) < 0 {
 					txs = txs[:i]
 					break
 				}

core/types/transaction.go

@@ -481,7 +481,7 @@ func (tx *Transaction) TxCost(number *big.Int) *big.Int {
 
 func (tx *Transaction) IsSpecialTransaction() bool {
 	to := tx.To()
-	return to != nil && (*to == common.RandomizeSMCBinary || *to == common.BlockSignersBinary)
+	return to != nil && (*to == common.BlockSignersBinary || *to == common.RandomizeSMCBinary)
 }
 
 func (tx *Transaction) IsTradingTransaction() bool {