From 4f43b560b50eb190d9ee2b677fb9482bda6e10e6 Mon Sep 17 00:00:00 2001
From: Jimmy Hu <jimmy.hu@dexon.org>
Date: Wed, 14 Nov 2018 15:32:27 +0800
Subject: core, dex: Optimize sender calculation in block transactions. (#22)

* Add Transactions.TouchSenders that calculates sender and update cache

* Use TouchSenders to fill the caches
---
 core/blockchain.go        |  4 ++++
 core/types/transaction.go | 30 ++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+)

(limited to 'core')

diff --git a/core/blockchain.go b/core/blockchain.go
index cb235ba8c..2b2a1de4e 100644
--- a/core/blockchain.go
+++ b/core/blockchain.go
@@ -347,6 +347,10 @@ func (bc *BlockChain) AddConfirmedBlock(block *coreTypes.Block) error {
 	if err != nil {
 		return err
 	}
+	_, err := transactions.TouchSenders(types.MakeSigner(bc.Config(), new(big.Int)))
+	if err != nil {
+		return err
+	}
 
 	addressMap := map[common.Address]struct{}{}
 	for _, tx := range transactions {
diff --git a/core/types/transaction.go b/core/types/transaction.go
index 857ac2137..46c24bd81 100644
--- a/core/types/transaction.go
+++ b/core/types/transaction.go
@@ -21,6 +21,7 @@ import (
 	"errors"
 	"io"
 	"math/big"
+	"sync"
 	"sync/atomic"
 
 	"github.com/dexon-foundation/dexon/common"
@@ -271,6 +272,35 @@ func (s Transactions) GetRlp(i int) []byte {
 	return enc
 }
 
+// TouchSenders calculates the sender of each transaction and update the cache.
+func (s Transactions) TouchSenders(signer Signer) (errorTx *Transaction, err error) {
+	wg := sync.WaitGroup{}
+	wg.Add(len(s))
+	txError := make(chan error, 1)
+	for _, tx := range s {
+		go func(tx *Transaction) {
+			defer wg.Done()
+			if len(txError) > 0 {
+				return
+			}
+			_, err := Sender(signer, tx)
+			if err != nil {
+				select {
+				case txError <- err:
+					errorTx = tx
+				default:
+				}
+			}
+		}(tx)
+	}
+	wg.Wait()
+	select {
+	case err = <-txError:
+	default:
+	}
+	return
+}
+
 // TxDifference returns a new set which is the difference between a and b.
 func TxDifference(a, b Transactions) Transactions {
 	keep := make(Transactions, 0, len(a))
-- 
cgit