prover: use Keccak256 implementation from Gnark

In `keccak` package add a wrapper converting []frontend.Variable to []uints.U8 expected by NewLegacykeccak256. Use the wrapper in insertion and deletion circuits instead of our Keccak256 implementation. Remove the existing Keccak implementation. Add tests of the new implementation. Signed-off-by: Wojciech Zmuda <[email protected]>
worldcoin · Mar 29, 2024 · 64aeeeb · 64aeeeb
1 parent 5374181
commit 64aeeeb
Show file tree

Hide file tree

Showing 5 changed files with 109 additions and 477 deletions.
diff --git a/prover/deletion_circuit.go b/prover/deletion_circuit.go
@@ -49,7 +49,10 @@ func (circuit *DeletionMbuCircuit) Define(api frontend.API) error {
 	bits_post := abstractor.Call1(api, ToReducedBigEndian{Variable: circuit.PostRoot, Size: 256})
 	bits = append(bits, bits_post...)
 
-	hash := keccak.NewKeccak256(api, circuit.BatchSize*32+2*256, bits...)
+	hash, err := keccak.Keccak256(api, bits)
+	if err != nil {
+		return err
+	}
 	sum := abstractor.Call(api, FromBinaryBigEndian{Variable: hash})
 
 	// The same endianness conversion has been performed in the hash generation

diff --git a/prover/insertion_circuit.go b/prover/insertion_circuit.go
@@ -50,7 +50,10 @@ func (circuit *InsertionMbuCircuit) Define(api frontend.API) error {
 		bits = append(bits, bits_id...)
 	}
 
-	hash := keccak.NewKeccak256(api, (circuit.BatchSize+2)*256+32, bits...)
+	hash, err := keccak.Keccak256(api, bits)
+	if err != nil {
+		return err
+	}
 	sum := abstractor.Call(api, FromBinaryBigEndian{Variable: hash})
 
 	// The same endianness conversion has been performed in the hash generation

diff --git a/prover/keccak/constants.go b/prover/keccak/constants.go