refactor

Author: pmikolajczyk41

consensus/clique/clique.go

@@ -645,7 +645,7 @@ func (c *Clique) Close() error {
 func SealHash(header *types.Header) (hash common.Hash) {
 	hasher := sha3.NewLegacyKeccak256()
 	encodeSigHeader(hasher, header)
-	hasher.(crypto.KeccakState).Read(hash[:])
+	hasher.(crypto.KeccakSponge).Read(hash[:])
 	return hash
 }
 

crypto/crypto.go

@@ -59,10 +59,10 @@ type EllipticCurve interface {
 	Unmarshal(data []byte) (x, y *big.Int)
 }
 
-// KeccakState wraps sha3.state. In addition to the usual hash methods, it also supports
+// KeccakSponge wraps sha3.state. In addition to the usual hash methods, it also supports
 // Read to get a variable amount of data from the hash state. Read is faster than Sum
 // because it doesn't copy the internal state, but also modifies the internal state.
-type KeccakState interface {
+type KeccakSponge interface {
 	hash.Hash
 	Read([]byte) (int, error)
 }

crypto/keccak.go

@@ -25,39 +25,38 @@ import (
 	"golang.org/x/crypto/sha3"
 )
 
-// NewKeccakState creates a new KeccakState
-func NewKeccakState() KeccakState {
-	return sha3.NewLegacyKeccak256().(KeccakState)
+// NewKeccakSponge creates a new KeccakSponge
+func NewKeccakSponge() KeccakSponge {
+	return sha3.NewLegacyKeccak256().(KeccakSponge)
 }
 
 var hasherPool = sync.Pool{
 	New: func() any {
-		return sha3.NewLegacyKeccak256().(KeccakState)
+		return sha3.NewLegacyKeccak256().(KeccakSponge)
 	},
 }
 
-// Keccak256 calculates and returns the Keccak256 hash of the input data.
-func Keccak256(data ...[]byte) []byte {
-	b := make([]byte, 32)
-	d := hasherPool.Get().(KeccakState)
+// keccak256Sum is a helper that hashes the input data using the provided KeccakSponge and writes the result to out.
+func keccak256Sum(out []byte, data ...[]byte) {
+	d := hasherPool.Get().(KeccakSponge)
 	d.Reset()
 	for _, b := range data {
 		d.Write(b)
 	}
-	d.Read(b)
+	d.Read(out)
 	hasherPool.Put(d)
+}
+
+// Keccak256 calculates and returns the Keccak256 hash of the input data.
+func Keccak256(data ...[]byte) []byte {
+	b := make([]byte, 32)
+	keccak256Sum(b, data...)
 	return b
 }
 
 // Keccak256Hash calculates and returns the Keccak256 hash of the input data,
 // converting it to an internal Hash data structure.
 func Keccak256Hash(data ...[]byte) (h common.Hash) {
-	d := hasherPool.Get().(KeccakState)
-	d.Reset()
-	for _, b := range data {
-		d.Write(b)
-	}
-	d.Read(h[:])
-	hasherPool.Put(d)
+	keccak256Sum(h[:], data...)
 	return h
 }

crypto/keccak_ziren.go

@@ -23,15 +23,15 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 )
 
-// zirenKeccakState implements the KeccakState interface using the Ziren zkvm_runtime.
+// zirenKeccakState implements the KeccakSponge interface using the Ziren zkvm_runtime.
 // It accumulates data written to it and uses the zkvm's Keccak256 system call for hashing.
 type zirenKeccakState struct {
 	buf    []byte // accumulated data
 	result []byte // cached result
 	dirty  bool   // whether new data has been written since last hash
 }
 
-func newZirenKeccakState() KeccakState {
+func newZirenKeccakState() KeccakSponge {
 	return &zirenKeccakState{
 		buf: make([]byte, 0, 512), // pre-allocate reasonable capacity
 	}
@@ -83,9 +83,9 @@ func (s *zirenKeccakState) computeHashIfNeeded() {
 	}
 }
 
-// NewKeccakState creates a new KeccakState
+// NewKeccakSponge creates a new KeccakSponge
 // This uses a Ziren-optimized implementation that leverages the zkvm_runtime.Keccak256 system call.
-func NewKeccakState() KeccakState {
+func NewKeccakState() KeccakSponge {
 	return newZirenKeccakState()
 }
 

trie/trie_test.go

@@ -899,7 +899,7 @@ func TestCommitSequence(t *testing.T) {
 		addresses, accounts := makeAccounts(tc.count)
 
 		// This spongeDb is used to check the sequence of disk-db-writes
-		s := &spongeDb{sponge: crypto.NewKeccakState()}
+		s := &spongeDb{sponge: crypto.NewKeccakSponge()}
 		db := newTestDatabase(rawdb.NewDatabase(s), rawdb.HashScheme)
 
 		// Fill the trie with elements
@@ -933,7 +933,7 @@ func TestCommitSequenceRandomBlobs(t *testing.T) {
 	} {
 		// This spongeDb is used to check the sequence of disk-db-writes
 		prng := rand.New(rand.NewSource(int64(i)))
-		s := &spongeDb{sponge: crypto.NewKeccakState()}
+		s := &spongeDb{sponge: crypto.NewKeccakSponge()}
 		db := newTestDatabase(rawdb.NewDatabase(s), rawdb.HashScheme)
 
 		// Fill the trie with elements