From 86be91b3e2dff5df28ee53c59df1ecfe9f97e007 Mon Sep 17 00:00:00 2001
From: kimmylin <30611210+kimmylin@users.noreply.github.com>
Date: Tue, 24 Apr 2018 15:39:03 +0800
Subject: [PATCH] core/types: avoid duplicating transactions on changing signer
 (#16435)

---
 core/types/transaction.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/core/types/transaction.go b/core/types/transaction.go
index 92fd8f898..c1cb7a043 100644
--- a/core/types/transaction.go
+++ b/core/types/transaction.go
@@ -339,11 +339,14 @@ type TransactionsByPriceAndNonce struct {
 func NewTransactionsByPriceAndNonce(signer Signer, txs map[common.Address]Transactions) *TransactionsByPriceAndNonce {
 	// Initialize a price based heap with the head transactions
 	heads := make(TxByPrice, 0, len(txs))
-	for _, accTxs := range txs {
+	for from, accTxs := range txs {
 		heads = append(heads, accTxs[0])
 		// Ensure the sender address is from the signer
 		acc, _ := Sender(signer, accTxs[0])
 		txs[acc] = accTxs[1:]
+		if from != acc {
+			delete(txs, from)
+		}
 	}
 	heap.Init(&heads)