Optimisations and fixed a couple of DDOS issues in the miner

1 files changed, 24 insertions, 9 deletions

diff --git a/core/transaction_pool.go b/core/transaction_pool.go
index 7a901fcae..894b6c440 100644
--- a/core/transaction_pool.go
+++ b/core/transaction_pool.go
@@ -3,6 +3,7 @@ package core
 import (
 	"errors"
 	"fmt"
+	"sync"
 
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/ethutil"
@@ -35,6 +36,7 @@ type TxProcessor interface {
 // guarantee a non blocking pool we use a queue channel which can be
 // independently read without needing access to the actual pool.
 type TxPool struct {
+	mu sync.RWMutex
 	// Queueing channel for reading and writing incoming
 	// transactions to
 	queueChan chan *types.Transaction
@@ -97,7 +99,7 @@ func (self *TxPool) addTx(tx *types.Transaction) {
 	self.txs[string(tx.Hash())] = tx
 }
 
-func (self *TxPool) Add(tx *types.Transaction) error {
+func (self *TxPool) add(tx *types.Transaction) error {
 	if self.txs[string(tx.Hash())] != nil {
 		return fmt.Errorf("Known transaction (%x)", tx.Hash()[0:4])
 	}
@@ -128,17 +130,28 @@ func (self *TxPool) Size() int {
 	return len(self.txs)
 }
 
+func (self *TxPool) Add(tx *types.Transaction) error {
+	self.mu.Lock()
+	defer self.mu.Unlock()
+	return self.add(tx)
+}
 func (self *TxPool) AddTransactions(txs []*types.Transaction) {
+	self.mu.Lock()
+	defer self.mu.Unlock()
+
 	for _, tx := range txs {
-		if err := self.Add(tx); err != nil {
-			txplogger.Infoln(err)
+		if err := self.add(tx); err != nil {
+			txplogger.Debugln(err)
 		} else {
-			txplogger.Infof("tx %x\n", tx.Hash()[0:4])
+			txplogger.Debugf("tx %x\n", tx.Hash()[0:4])
 		}
 	}
 }
 
 func (self *TxPool) GetTransactions() (txs types.Transactions) {
+	self.mu.RLock()
+	defer self.mu.RUnlock()
+
 	txs = make(types.Transactions, self.Size())
 	i := 0
 	for _, tx := range self.txs {
@@ -150,30 +163,32 @@ func (self *TxPool) GetTransactions() (txs types.Transactions) {
 }
 
 func (pool *TxPool) RemoveInvalid(query StateQuery) {
+	pool.mu.Lock()
+
 	var removedTxs types.Transactions
 	for _, tx := range pool.txs {
 		sender := query.GetAccount(tx.From())
 		err := pool.ValidateTransaction(tx)
-		fmt.Println(err, sender.Nonce, tx.Nonce())
 		if err != nil || sender.Nonce >= tx.Nonce() {
 			removedTxs = append(removedTxs, tx)
 		}
 	}
+	pool.mu.Unlock()
 
 	pool.RemoveSet(removedTxs)
 }
 
 func (self *TxPool) RemoveSet(txs types.Transactions) {
+	self.mu.Lock()
+	defer self.mu.Unlock()
+
 	for _, tx := range txs {
 		delete(self.txs, string(tx.Hash()))
 	}
 }
 
-func (pool *TxPool) Flush() []*types.Transaction {
-	txList := pool.GetTransactions()
+func (pool *TxPool) Flush() {
 	pool.txs = make(map[string]*types.Transaction)
-
-	return txList
 }
 
 func (pool *TxPool) Start() {