diff options
| -rw-r--r-- | core/types/transaction.go | 32 | ||||
| -rw-r--r-- | dex/handler.go | 1 |
2 files changed, 20 insertions, 13 deletions
diff --git a/core/types/transaction.go b/core/types/transaction.go index 46c24bd81..5e11c0dbc 100644 --- a/core/types/transaction.go +++ b/core/types/transaction.go @@ -21,6 +21,7 @@ import ( "errors" "io" "math/big" + "runtime" "sync" "sync/atomic" @@ -274,24 +275,29 @@ func (s Transactions) GetRlp(i int) []byte { // TouchSenders calculates the sender of each transaction and update the cache. func (s Transactions) TouchSenders(signer Signer) (errorTx *Transaction, err error) { + num := runtime.NumCPU() + batchSize := len(s) / num wg := sync.WaitGroup{} - wg.Add(len(s)) + wg.Add(num) txError := make(chan error, 1) - for _, tx := range s { - go func(tx *Transaction) { + for i := 0; i < num; i++ { + go func(txs Transactions) { defer wg.Done() - if len(txError) > 0 { - return - } - _, err := Sender(signer, tx) - if err != nil { - select { - case txError <- err: - errorTx = tx - default: + for _, tx := range txs { + if len(txError) > 0 { + return + } + _, err := Sender(signer, tx) + if err != nil { + select { + case txError <- err: + errorTx = tx + default: + } + return } } - }(tx) + }(s[i*batchSize : (i+1)*batchSize]) } wg.Wait() select { diff --git a/dex/handler.go b/dex/handler.go index 3c8d25ea3..a74c78e3b 100644 --- a/dex/handler.go +++ b/dex/handler.go @@ -724,6 +724,7 @@ func (pm *ProtocolManager) handleMsg(p *peer) error { } p.MarkTransaction(tx.Hash()) } + types.Transactions(txs).TouchSenders(types.MakeSigner(pm.blockchain.Config(), new(big.Int))) pm.txpool.AddRemotes(txs) case msg.Code == MetaMsg: |