refactor(zk_verifier): reuse HashToField from cometbls/crypto/bn254

Author: Himess

11-cometbls/zk_verifier.go

@@ -10,6 +10,7 @@ import (
 	"math/big"
 	"time"
 
+	comet "github.com/unionlabs/cometbls/crypto/bn254"
 	curve "github.com/consensys/gnark-crypto/ecc/bn254"
 	"github.com/consensys/gnark-crypto/ecc/bn254/fr"
 	backend "github.com/consensys/gnark/backend/groth16"
@@ -155,25 +156,6 @@ func (zkp ZKP) Verify(trustedValidatorsHash []byte, header ProverLightHeader) er
 	return verifyingKey.CommitmentKey.Verify(zkp.ProofCommitment, zkp.ProofCommitmentPoK)
 }
 
-func hashToField(msg []byte) fr.Element {
-	hmac := hmac.New(Hash, []byte(CometblsHMACKey))
-	hmac.Write(msg)
-	modMinusOne := new(big.Int).Sub(fr.Modulus(), big.NewInt(1))
-	num := new(big.Int).SetBytes(hmac.Sum(nil))
-	num.Mod(num, modMinusOne)
-	num.Add(num, big.NewInt(1))
-	val, overflow := uint256.FromBig(num)
-	if overflow {
-		panic("impossible; qed;")
-	}
-	valBytes := val.Bytes32()
-	var element fr.Element
-	err := element.SetBytesCanonical(valBytes[:])
-	if err != nil {
-		panic("impossible; qed;")
-	}
-	return element
-}
 
 func commitmentsHash(proofCommitment curve.G1Affine) fr.Element {
 	var buffer [64]byte
@@ -184,7 +166,7 @@ func commitmentsHash(proofCommitment curve.G1Affine) fr.Element {
 	y := proofCommitment.Y.Bytes()
 	copy(buffer[32:64], y[:])
 
-	return hashToField(buffer[:])
+	return comet.HashToField(buffer[:])
 }
 
 func inputsHash(header ProverLightHeader, trustedValidatorsHash []byte) fr.Element {
@@ -214,4 +196,4 @@ func inputsHash(header ProverLightHeader, trustedValidatorsHash []byte) fr.Eleme
 	var e fr.Element
 	e.SetBytes(hash[1:])
 	return e
-}
+}

11-cometbls/zk_verifier_test.go

@@ -21,7 +21,7 @@ func TestVerifier(t *testing.T) {
 	err = zkp.Verify(
 
 		trustedValHash,
-		LightHeader{
+		ProverLightHeader{
 			ChainId:            "union-devnet-1337",
 			Height:             3405691582,
 			Time:               time.Unix(1710783278, 499600406),