Merge pull request #2390 from CortexFoundation/dev

reuse global hash buffer

Author: ucwong

core/rawdb/database.go

@@ -607,7 +607,6 @@ func SafeDeleteRange(db ctxcdb.KeyValueStore, start, end []byte, hashScheme bool
 
 	var (
 		count, deleted, skipped int
-		buff                    = crypto.NewKeccakState()
 		startTime               = time.Now()
 	)
 
@@ -620,7 +619,7 @@ func SafeDeleteRange(db ctxcdb.KeyValueStore, start, end []byte, hashScheme bool
 
 	for it.Next() && bytes.Compare(end, it.Key()) > 0 {
 		// Prevent deletion for trie nodes in hash mode
-		if len(it.Key()) != 32 || crypto.HashData(buff, it.Value()) != common.BytesToHash(it.Key()) {
+		if len(it.Key()) != 32 || crypto.Keccak256Hash(it.Value()) != common.BytesToHash(it.Key()) {
 			if err := batch.Delete(it.Key()); err != nil {
 				return err
 			}

core/state/state_object.go

@@ -22,7 +22,7 @@ import (
 	"io"
 	"maps"
 	"math/big"
-	"sync"
+	//"sync"
 	"time"
 
 	"github.com/CortexFoundation/CortexTheseus/common"
@@ -35,11 +35,11 @@ import (
 
 // hasherPool holds a pool of hashers used by state objects during concurrent
 // trie updates.
-var hasherPool = sync.Pool{
-	New: func() interface{} {
-		return crypto.NewKeccakState()
-	},
-}
+//var hasherPool = sync.Pool{
+//	New: func() interface{} {
+//		return crypto.NewKeccakState()
+//	},
+//}
 
 type Storage map[common.Hash]common.Hash
 
@@ -344,8 +344,8 @@ func (s *stateObject) updateTrie() (Trie, error) {
 	)
 	// Insert all the pending storage updates into the trie
 
-	hasher := hasherPool.Get().(crypto.KeccakState)
-	defer hasherPool.Put(hasher)
+	//hasher := hasherPool.Get().(crypto.KeccakState)
+	//defer hasherPool.Put(hasher)
 
 	// Perform trie updates before deletions.  This prevents resolution of unnecessary trie nodes
 	//  in circumstances similar to the following:
@@ -390,7 +390,8 @@ func (s *stateObject) updateTrie() (Trie, error) {
 			}
 			s.db.storagesLock.Unlock()
 		}
-		khash := crypto.HashData(hasher, key[:])
+		//khash := crypto.HashData(hasher, key[:])
+		khash := crypto.Keccak256Hash(key[:])
 		storage[khash] = v // encoded will be nil if it's deleted
 
 		// Cache the original value of mutated storage slots

core/state/statedb.go

@@ -82,8 +82,8 @@ type StateDB struct {
 	db         Database
 	prefetcher *triePrefetcher
 	trie       Trie
-	hasher     crypto.KeccakState
-	snap       snapshot.Snapshot // Nil if snapshot is not available
+	//hasher     crypto.KeccakState
+	snap snapshot.Snapshot // Nil if snapshot is not available
 
 	// originalRoot is the pre-state root, before any changes were made.
 	// It will be updated when the Commit is called.
@@ -186,7 +186,7 @@ func New(root common.Hash, db Database) (*StateDB, error) {
 		journal:              newJournal(),
 		accessList:           newAccessList(),
 		transientStorage:     newTransientStorage(),
-		hasher:               crypto.NewKeccakState(),
+		//hasher:               crypto.NewKeccakState(),
 	}
 	if snaps := sdb.db.Snapshot(); snaps != nil {
 		sdb.snap = snaps.Snapshot(root)
@@ -645,7 +645,8 @@ func (s *StateDB) getStateObject(addr common.Address) *stateObject {
 	var data *types.StateAccount
 	if s.snap != nil {
 		start := time.Now()
-		acc, err := s.snap.Account(crypto.HashData(s.hasher, addr.Bytes()))
+		addrHash := crypto.Keccak256Hash(addr.Bytes())
+		acc, err := s.snap.Account(addrHash)
 		s.SnapshotAccountReads += time.Since(start)
 		if err == nil {
 			if acc == nil {
@@ -781,9 +782,9 @@ func (db *StateDB) ForEachStorage(addr common.Address, cb func(key, value common
 func (s *StateDB) Copy() *StateDB {
 	// Copy all the basic fields, initialize the memory ones
 	state := &StateDB{
-		db:                   s.db,
-		trie:                 s.db.CopyTrie(s.trie),
-		hasher:               crypto.NewKeccakState(),
+		db:   s.db,
+		trie: s.db.CopyTrie(s.trie),
+		//hasher:               crypto.NewKeccakState(),
 		originalRoot:         s.originalRoot,
 		accounts:             copySet(s.accounts),
 		storages:             copy2DSet(s.storages),

crypto/crypto_test.go

@@ -19,6 +19,7 @@ package crypto
 import (
 	"bytes"
 	"crypto/ecdsa"
+	"crypto/rand"
 	"encoding/hex"
 	"math/big"
 	"os"
@@ -254,3 +255,38 @@ func TestPythonIntegration(t *testing.T) {
 	t.Logf("msg: %x, privkey: %s sig: %x\n", msg0, kh, sig0)
 	t.Logf("msg: %x, privkey: %s sig: %x\n", msg1, kh, sig1)
 }
+
+// goos: darwin
+// goarch: arm64
+// pkg: github.com/ethereum/go-ethereum/crypto
+// cpu: Apple M1 Pro
+// BenchmarkKeccak256Hash
+// BenchmarkKeccak256Hash-8   	  931095	      1270 ns/op	      32 B/op	       1 allocs/op
+func BenchmarkKeccak256Hash(b *testing.B) {
+	var input [512]byte
+	rand.Read(input[:])
+
+	b.ReportAllocs()
+	for i := 0; i < b.N; i++ {
+		Keccak256Hash(input[:])
+	}
+}
+
+// goos: darwin
+// goarch: arm64
+// pkg: github.com/ethereum/go-ethereum/crypto
+// cpu: Apple M1 Pro
+// BenchmarkHashData
+// BenchmarkHashData-8   	  793386	      1278 ns/op	      32 B/op	       1 allocs/op
+func BenchmarkHashData(b *testing.B) {
+	var (
+		input  [512]byte
+		buffer = NewKeccakState()
+	)
+	rand.Read(input[:])
+
+	b.ReportAllocs()
+	for i := 0; i < b.N; i++ {
+		HashData(buffer, input[:])
+	}
+}