From 932fe23501bf481f53340bf8343ed423348a5108 Mon Sep 17 00:00:00 2001
From: Guillaume Ballet <3272758+gballet@users.noreply.github.com>
Date: Thu, 23 Oct 2025 08:14:47 +0200
Subject: [PATCH] move ziren keccak state definition to the main ziren file

---
 crypto/keccak_ziren.go       | 60 ++++++++++++++++++++++++++
 crypto/keccak_ziren_state.go | 83 ------------------------------------
 2 files changed, 60 insertions(+), 83 deletions(-)
 delete mode 100644 crypto/keccak_ziren_state.go

diff --git a/crypto/keccak_ziren.go b/crypto/keccak_ziren.go
index e8ee0408ce..8e967c6dbf 100644
--- a/crypto/keccak_ziren.go
+++ b/crypto/keccak_ziren.go
@@ -23,6 +23,66 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 )
 
+// zirenKeccakState implements the KeccakState 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 {
+	return &zirenKeccakState{
+		buf: make([]byte, 0, 512), // pre-allocate reasonable capacity
+	}
+}
+
+func (s *zirenKeccakState) Write(p []byte) (n int, err error) {
+	s.buf = append(s.buf, p...)
+	s.dirty = true
+	return len(p), nil
+}
+
+func (s *zirenKeccakState) Sum(b []byte) []byte {
+	s.computeHashIfNeeded()
+	return append(b, s.result...)
+}
+
+func (s *zirenKeccakState) Reset() {
+	s.buf = s.buf[:0]
+	s.result = nil
+	s.dirty = false
+}
+
+func (s *zirenKeccakState) Size() int {
+	return 32
+}
+
+func (s *zirenKeccakState) BlockSize() int {
+	return 136 // Keccak256 rate
+}
+
+func (s *zirenKeccakState) Read(p []byte) (n int, err error) {
+	s.computeHashIfNeeded()
+
+	if len(p) == 0 {
+		return 0, nil
+	}
+
+	// After computeHashIfNeeded(), s.result is always a 32-byte slice
+	n = copy(p, s.result)
+	return n, nil
+}
+
+func (s *zirenKeccakState) computeHashIfNeeded() {
+	if s.dirty || s.result == nil {
+		// Use the zkvm_runtime Keccak256 which uses SyscallKeccakSponge
+		hashArray := zkvm_runtime.Keccak256(s.buf)
+		s.result = hashArray[:]
+		s.dirty = false
+	}
+}
+
 // NewKeccakState creates a new KeccakState
 // This uses a Ziren-optimized implementation that leverages the zkvm_runtime.Keccak256 system call.
 func NewKeccakState() KeccakState {
diff --git a/crypto/keccak_ziren_state.go b/crypto/keccak_ziren_state.go
deleted file mode 100644
index d355eeb9df..0000000000
--- a/crypto/keccak_ziren_state.go
+++ /dev/null
@@ -1,83 +0,0 @@
-// Copyright 2025 The go-ethereum Authors
-// This file is part of the go-ethereum library.
-//
-// The go-ethereum library is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// The go-ethereum library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
-
-//go:build ziren
-
-package crypto
-
-import (
-	"github.com/ProjectZKM/Ziren/crates/go-runtime/zkvm_runtime"
-)
-
-// zirenKeccakState implements the KeccakState 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 {
-	return &zirenKeccakState{
-		buf: make([]byte, 0, 512), // pre-allocate reasonable capacity
-	}
-}
-
-func (s *zirenKeccakState) Write(p []byte) (n int, err error) {
-	s.buf = append(s.buf, p...)
-	s.dirty = true
-	return len(p), nil
-}
-
-func (s *zirenKeccakState) Sum(b []byte) []byte {
-	s.computeHashIfNeeded()
-	return append(b, s.result...)
-}
-
-func (s *zirenKeccakState) Reset() {
-	s.buf = s.buf[:0]
-	s.result = nil
-	s.dirty = false
-}
-
-func (s *zirenKeccakState) Size() int {
-	return 32
-}
-
-func (s *zirenKeccakState) BlockSize() int {
-	return 136 // Keccak256 rate
-}
-
-func (s *zirenKeccakState) Read(p []byte) (n int, err error) {
-	s.computeHashIfNeeded()
-
-	if len(p) == 0 {
-		return 0, nil
-	}
-
-	// After computeHashIfNeeded(), s.result is always a 32-byte slice
-	n = copy(p, s.result)
-	return n, nil
-}
-
-func (s *zirenKeccakState) computeHashIfNeeded() {
-	if s.dirty || s.result == nil {
-		// Use the zkvm_runtime Keccak256 which uses SyscallKeccakSponge
-		hashArray := zkvm_runtime.Keccak256(s.buf)
-		s.result = hashArray[:]
-		s.dirty = false
-	}
-}