diff --git a/core/types/transaction_signing.go b/core/types/transaction_signing.go
index 4ac9dec15ce6d5bb137f4ae7540e4e7afbee3d4e..d747d5c60b2799a421186c9c12eab3ba220c75ca 100644
--- a/core/types/transaction_signing.go
+++ b/core/types/transaction_signing.go
@@ -24,6 +24,7 @@ import (
"github.com/ledgerwatch/turbo-geth/common"
"github.com/ledgerwatch/turbo-geth/crypto"
+ "github.com/ledgerwatch/turbo-geth/crypto/secp256k1"
"github.com/ledgerwatch/turbo-geth/params"
)
@@ -79,6 +80,9 @@ func Sender(signer Signer, tx *Transaction) (common.Address, error) {
type Signer interface {
// Sender returns the sender address of the transaction.
Sender(tx *Transaction) (common.Address, error)
+ // SenderWithContext returns the sender address of the transaction.
+ SenderWithContext(context *secp256k1.Context, tx *Transaction) (common.Address, error)
+
// SignatureValues returns the raw R, S, V values corresponding to the
// given signature.
SignatureValues(tx *Transaction, sig []byte) (r, s, v *big.Int, err error)
@@ -113,6 +117,10 @@ func (s EIP155Signer) Equal(s2 Signer) bool {
var big8 = big.NewInt(8)
func (s EIP155Signer) Sender(tx *Transaction) (common.Address, error) {
+ return s.SenderWithContext(secp256k1.DefaultContext, tx)
+}
+
+func (s EIP155Signer) SenderWithContext(context *secp256k1.Context, tx *Transaction) (common.Address, error) {
if !tx.Protected() {
return HomesteadSigner{}.Sender(tx)
}
@@ -121,7 +129,7 @@ func (s EIP155Signer) Sender(tx *Transaction) (common.Address, error) {
}
V := new(big.Int).Sub(tx.data.V, s.chainIdMul)
V.Sub(V, big8)
- return recoverPlain(s.Hash(tx), tx.data.R, tx.data.S, V, true)
+ return recoverPlain(context, s.Hash(tx), tx.data.R, tx.data.S, V, true)
}
// SignatureValues returns signature values. This signature
@@ -160,7 +168,7 @@ func (s EIP155Signer) ChainId() *big.Int {
// homestead rules.
type HomesteadSigner struct{ FrontierSigner }
-func (s HomesteadSigner) Equal(s2 Signer) bool {
+func (hs HomesteadSigner) Equal(s2 Signer) bool {
_, ok := s2.(HomesteadSigner)
return ok
}
@@ -172,12 +180,16 @@ func (hs HomesteadSigner) SignatureValues(tx *Transaction, sig []byte) (r, s, v
}
func (hs HomesteadSigner) Sender(tx *Transaction) (common.Address, error) {
- return recoverPlain(hs.Hash(tx), tx.data.R, tx.data.S, tx.data.V, true)
+ return hs.SenderWithContext(secp256k1.DefaultContext, tx)
+}
+
+func (hs HomesteadSigner) SenderWithContext(context *secp256k1.Context, tx *Transaction) (common.Address, error) {
+ return recoverPlain(context, hs.Hash(tx), tx.data.R, tx.data.S, tx.data.V, true)
}
type FrontierSigner struct{}
-func (s FrontierSigner) Equal(s2 Signer) bool {
+func (fs FrontierSigner) Equal(s2 Signer) bool {
_, ok := s2.(FrontierSigner)
return ok
}
@@ -208,14 +220,18 @@ func (fs FrontierSigner) Hash(tx *Transaction) common.Hash {
}
func (fs FrontierSigner) Sender(tx *Transaction) (common.Address, error) {
- return recoverPlain(fs.Hash(tx), tx.data.R, tx.data.S, tx.data.V, false)
+ return fs.SenderWithContext(secp256k1.DefaultContext, tx)
+}
+
+func (fs FrontierSigner) SenderWithContext(context *secp256k1.Context, tx *Transaction) (common.Address, error) {
+ return recoverPlain(context, fs.Hash(tx), tx.data.R, tx.data.S, tx.data.V, false)
}
func (fs FrontierSigner) ChainId() *big.Int {
return big.NewInt(0)
}
-func recoverPlain(sighash common.Hash, R, S, Vb *big.Int, homestead bool) (common.Address, error) {
+func recoverPlain(context *secp256k1.Context, sighash common.Hash, R, S, Vb *big.Int, homestead bool) (common.Address, error) {
if Vb.BitLen() > 8 {
return common.Address{}, ErrInvalidSig
}
@@ -230,7 +246,7 @@ func recoverPlain(sighash common.Hash, R, S, Vb *big.Int, homestead bool) (commo
copy(sig[64-len(s):64], s)
sig[64] = V
// recover the public key from the signature
- pub, err := crypto.Ecrecover(sighash[:], sig)
+ pub, err := crypto.EcrecoverWithContext(context, sighash[:], sig)
if err != nil {
return common.Address{}, err
}
diff --git a/crypto/secp256k1/secp256.go b/crypto/secp256k1/secp256.go
index 35d0eef34acee3835299731820c25d29e026c76c..8d5ba4bedb76d8e77160c1d6a7edbf3df789f7f2 100644
--- a/crypto/secp256k1/secp256.go
+++ b/crypto/secp256k1/secp256.go
@@ -30,13 +30,29 @@ import (
"unsafe"
)
+type Context struct {
+ context *C.secp256k1_context
+}
+
var context *C.secp256k1_context
+var DefaultContext *Context // to avoid allocating structures every time on `RecoverPubkey` w/o context
func init() {
+ context = initContext()
+ DefaultContext = &Context{context}
+}
+
+func initContext() *C.secp256k1_context {
// around 20 ms on a modern CPU.
- context = C.secp256k1_context_create_sign_verify()
- C.secp256k1_context_set_illegal_callback(context, C.callbackFunc(C.secp256k1GoPanicIllegal), nil)
- C.secp256k1_context_set_error_callback(context, C.callbackFunc(C.secp256k1GoPanicError), nil)
+ ctx := C.secp256k1_context_create_sign_verify()
+ C.secp256k1_context_set_illegal_callback(ctx, C.callbackFunc(C.secp256k1GoPanicIllegal), nil)
+ C.secp256k1_context_set_error_callback(ctx, C.callbackFunc(C.secp256k1GoPanicError), nil)
+ return ctx
+}
+
+func NewContext() *Context {
+ ctx := initContext()
+ return &Context{ctx}
}
var (
@@ -91,6 +107,10 @@ func Sign(msg []byte, seckey []byte) ([]byte, error) {
// sig must be a 65-byte compact ECDSA signature containing the
// recovery id as the last element.
func RecoverPubkey(msg []byte, sig []byte) ([]byte, error) {
+ return RecoverPubkeyWithContext(DefaultContext, msg, sig)
+}
+
+func RecoverPubkeyWithContext(context *Context, msg []byte, sig []byte) ([]byte, error) {
if len(msg) != 32 {
return nil, ErrInvalidMsgLen
}
@@ -103,7 +123,7 @@ func RecoverPubkey(msg []byte, sig []byte) ([]byte, error) {
sigdata = (*C.uchar)(unsafe.Pointer(&sig[0]))
msgdata = (*C.uchar)(unsafe.Pointer(&msg[0]))
)
- if C.secp256k1_ext_ecdsa_recover(context, (*C.uchar)(unsafe.Pointer(&pubkey[0])), sigdata, msgdata) == 0 {
+ if C.secp256k1_ext_ecdsa_recover(context.context, (*C.uchar)(unsafe.Pointer(&pubkey[0])), sigdata, msgdata) == 0 {
return nil, ErrRecoverFailed
}
return pubkey, nil
diff --git a/crypto/signature_cgo.go b/crypto/signature_cgo.go
index dce050e26aeb9e97a118ab72991c9cc7e61d5f9c..902701ebd44dcbb4b5e8efba246b7dfda6366f8d 100644
--- a/crypto/signature_cgo.go
+++ b/crypto/signature_cgo.go
@@ -32,6 +32,11 @@ func Ecrecover(hash, sig []byte) ([]byte, error) {
return secp256k1.RecoverPubkey(hash, sig)
}
+// Ecrecover returns the uncompressed public key that created the given signature.
+func EcrecoverWithContext(context *secp256k1.Context, hash, sig []byte) ([]byte, error) {
+ return secp256k1.RecoverPubkeyWithContext(context, hash, sig)
+}
+
// SigToPub returns the public key that created the given signature.
func SigToPub(hash, sig []byte) (*ecdsa.PublicKey, error) {
s, err := Ecrecover(hash, sig)
diff --git a/eth/downloader/stagedsync_state_senders.go b/eth/downloader/stagedsync_state_senders.go
index 480ed79533e00710003315dd64826fbb384a9f4d..a4e784a9a80345e1f8c9b4fd40cefc00909f69a3 100644
--- a/eth/downloader/stagedsync_state_senders.go
+++ b/eth/downloader/stagedsync_state_senders.go
@@ -11,9 +11,23 @@ import (
"github.com/ledgerwatch/turbo-geth/common"
"github.com/ledgerwatch/turbo-geth/core/rawdb"
"github.com/ledgerwatch/turbo-geth/core/types"
+ "github.com/ledgerwatch/turbo-geth/crypto/secp256k1"
"github.com/ledgerwatch/turbo-geth/log"
)
+var numOfGoroutines int
+var cryptoContexts []*secp256k1.Context
+
+func init() {
+ // To avoid bothering with creating/releasing the resources
+ // but still not leak the contexts
+ numOfGoroutines = runtime.NumCPU()
+ cryptoContexts = make([]*secp256k1.Context, numOfGoroutines)
+ for i := 0; i < numOfGoroutines; i++ {
+ cryptoContexts[i] = secp256k1.NewContext()
+ }
+}
+
func (d *Downloader) spawnRecoverSendersStage() error {
lastProcessedBlockNumber, err := GetStageProgress(d.stateDB, Senders)
if err != nil {
@@ -44,10 +58,9 @@ func (d *Downloader) spawnRecoverSendersStage() error {
close(out)
}()
- var numOfGoroutines = runtime.NumCPU()
-
for i := 0; i < numOfGoroutines; i++ {
- go recoverSenders(jobs, out)
+ // each goroutine gets it's own crypto context to make sure they are really parallel
+ go recoverSenders(cryptoContexts[i], jobs, out)
}
log.Info("Sync (Senders): Started recoverer goroutines", "numOfGoroutines", numOfGoroutines)
@@ -107,7 +120,7 @@ type senderRecoveryJob struct {
err error
}
-func recoverSenders(in chan *senderRecoveryJob, out chan *senderRecoveryJob) {
+func recoverSenders(cryptoContext *secp256k1.Context, in chan *senderRecoveryJob, out chan *senderRecoveryJob) {
var job *senderRecoveryJob
for {
job = <-in
@@ -115,7 +128,7 @@ func recoverSenders(in chan *senderRecoveryJob, out chan *senderRecoveryJob) {
return
}
for _, tx := range job.blockBody.Transactions {
- from, err := types.Sender(job.signer, tx)
+ from, err := job.signer.SenderWithContext(cryptoContext, tx)
if err != nil {
job.err = errors.Wrap(err, fmt.Sprintf("error recovering sender for tx=%x\n", tx.Hash()))
break
diff --git a/ethclient/signer.go b/ethclient/signer.go
index 48e6487bf419b4eb77229f6e4b2e58a9c2e1b8c0..6c9d10880e42b7d47e061c20b3bf856973ed8ceb 100644
--- a/ethclient/signer.go
+++ b/ethclient/signer.go
@@ -22,6 +22,7 @@ import (
"github.com/ledgerwatch/turbo-geth/common"
"github.com/ledgerwatch/turbo-geth/core/types"
+ "github.com/ledgerwatch/turbo-geth/crypto/secp256k1"
)
// senderFromServer is a types.Signer that remembers the sender address returned by the RPC
@@ -45,6 +46,10 @@ func (s *senderFromServer) Equal(other types.Signer) bool {
}
func (s *senderFromServer) Sender(tx *types.Transaction) (common.Address, error) {
+ return s.SenderWithContext(nil, tx)
+}
+
+func (s *senderFromServer) SenderWithContext(_ *secp256k1.Context, tx *types.Transaction) (common.Address, error) {
if s.blockhash == (common.Hash{}) {
return common.Address{}, errNotCached
}