generate proof challenges instead of receiving through JSON

plonky2_verifier/data/dummy_2^14_gates/proof_challenges.json

@@ -1 +0,0 @@
-{"plonk_betas":[11216469004148781751,6201977337075152249],"plonk_gammas":[8369751006669847974,3610024170884289835],"plonk_alphas":[970160439138448145,2402201283787401921],"plonk_zeta":[17377750363769967882,11921191651424768462],"fri_challenges":{"fri_alpha":[14107038880704607350,2206343865181400103],"fri_betas":[],"fri_pow_response":189028802052971,"fri_query_indices":[14,19,40,37,6,4,23,18,34,22,43,35,12,45,52,50,23,9,31,61,48,37,10,37,38,7,2,48]}}

plonky2_verifier/data/fibonacci/proof_challenges.json

@@ -1 +0,0 @@
-{"plonk_betas":[12971851817998460587,10437175405489723736],"plonk_gammas":[8479625606955782945,3810097167144316198],"plonk_alphas":[9298386058996050960,3314375019423950587],"plonk_zeta":[16024275880526593214,9166642105134614584],"fri_challenges":{"fri_alpha":[9179060524700746859,5307687266418646185],"fri_betas":[],"fri_pow_response":182691749083890,"fri_query_indices":[4,61,0,34,24,53,10,46,44,20,40,53,39,5,29,32,20,13,1,20,50,36,4,33,41,60,14,2]}}

plonky2_verifier/deserialize.go

@@ -144,9 +144,6 @@ type CommonCircuitDataRaw struct {
 	NumPublicInputs      uint64   `json:"num_public_inputs"`
 	KIs                  []uint64 `json:"k_is"`
 	NumPartialProducts   uint64   `json:"num_partial_products"`
-	CircuitDigest        struct {
-		Elements []uint64 `json:"elements"`
-	} `json:"circuit_digest"`
 }
 
 type ProofChallengesRaw struct {
@@ -166,6 +163,9 @@ type VerifierOnlyCircuitDataRaw struct {
 	ConstantsSigmasCap []struct {
 		Elements []uint64 `json:"elements"`
 	} `json:"constants_sigmas_cap"`
+	CircuitDigest struct {
+		Elements []uint64 `json:"elements"`
+	} `json:"circuit_digest"`
 }
 
 func DeserializeMerkleCap(merkleCapRaw []struct{ Elements []uint64 }) MerkleCap {
@@ -408,7 +408,6 @@ func DeserializeCommonCircuitData(path string) CommonCircuitData {
 	commonCircuitData.NumPublicInputs = raw.NumPublicInputs
 	commonCircuitData.KIs = utils.Uint64ArrayToFArray(raw.KIs)
 	commonCircuitData.NumPartialProducts = raw.NumPartialProducts
-	copy(commonCircuitData.CircuitDigest[:], utils.Uint64ArrayToFArray(raw.CircuitDigest.Elements))
 
 	return commonCircuitData
 }
@@ -428,7 +427,9 @@ func DeserializeVerifierOnlyCircuitData(path string) VerifierOnlyCircuitData {
 		panic(err)
 	}
 
-	return VerifierOnlyCircuitData{
-		ConstantSigmasCap: DeserializeMerkleCap([]struct{ Elements []uint64 }(raw.ConstantsSigmasCap)),
-	}
+	var verifierOnlyCircuitData VerifierOnlyCircuitData
+	verifierOnlyCircuitData.ConstantSigmasCap = DeserializeMerkleCap([]struct{ Elements []uint64 }(raw.ConstantsSigmasCap))
+	copy(verifierOnlyCircuitData.CircuitDigest[:], utils.Uint64ArrayToFArray(raw.CircuitDigest.Elements))
+
+	return verifierOnlyCircuitData
 }

plonky2_verifier/plonk_test.go

@@ -10,23 +10,26 @@ import (
 )
 
 type TestPlonkCircuit struct {
-	proofWithPIsFilename      string `gnark:"-"`
-	commonCircuitDataFilename string `gnark:"-"`
-	proofChallengesFilename   string `gnark:"-"`
+	proofWithPIsFilename            string `gnark:"-"`
+	commonCircuitDataFilename       string `gnark:"-"`
+	verifierOnlyCircuitDataFilename string `gnark:"-"`
 }
 
 func (circuit *TestPlonkCircuit) Define(api frontend.API) error {
 	proofWithPis := DeserializeProofWithPublicInputs(circuit.proofWithPIsFilename)
 	commonCircuitData := DeserializeCommonCircuitData(circuit.commonCircuitDataFilename)
-	proofChallenges := DeserializeProofChallenges(circuit.proofChallengesFilename)
+	verifierOnlyCircuitData := DeserializeVerifierOnlyCircuitData(circuit.verifierOnlyCircuitDataFilename)
 
 	fieldAPI := NewFieldAPI(api)
 	qeAPI := NewQuadraticExtensionAPI(fieldAPI, commonCircuitData.DegreeBits)
-
+	hashAPI := NewHashAPI(fieldAPI)
+	poseidonChip := poseidon.NewPoseidonChip(api, fieldAPI, qeAPI)
+	friChip := NewFriChip(api, fieldAPI, qeAPI, hashAPI, poseidonChip, &commonCircuitData.FriParams)
 	plonkChip := NewPlonkChip(api, qeAPI, commonCircuitData)
 
-	poseidonChip := poseidon.NewPoseidonChip(api, fieldAPI, qeAPI)
-	publicInputsHash := poseidonChip.HashNoPad(proofWithPis.PublicInputs)
+	verifierChip := NewVerifierChip(api, fieldAPI, qeAPI, poseidonChip, plonkChip, friChip)
+	publicInputsHash := verifierChip.GetPublicInputsHash(proofWithPis.PublicInputs)
+	proofChallenges := verifierChip.GetChallenges(proofWithPis, publicInputsHash, commonCircuitData, verifierOnlyCircuitData)
 
 	plonkChip.Verify(proofChallenges, proofWithPis.Proof.Openings, publicInputsHash)
 	return nil
@@ -37,9 +40,9 @@ func TestPlonkFibonacci(t *testing.T) {
 
 	testCase := func() {
 		circuit := TestPlonkCircuit{
-			proofWithPIsFilename:      "./data/fibonacci/proof_with_public_inputs.json",
-			commonCircuitDataFilename: "./data/fibonacci/common_circuit_data.json",
-			proofChallengesFilename:   "./data/fibonacci/proof_challenges.json",
+			proofWithPIsFilename:            "./data/fibonacci/proof_with_public_inputs.json",
+			commonCircuitDataFilename:       "./data/fibonacci/common_circuit_data.json",
+			verifierOnlyCircuitDataFilename: "./data/fibonacci/verifier_only_circuit_data.json",
 		}
 		witness := TestPlonkCircuit{}
 		err := test.IsSolved(&circuit, &witness, TEST_CURVE.ScalarField())
@@ -54,9 +57,9 @@ func TestPlonkDummy(t *testing.T) {
 
 	testCase := func() {
 		circuit := TestPlonkCircuit{
-			proofWithPIsFilename:      "./data/dummy_2^14_gates/proof_with_public_inputs.json",
-			commonCircuitDataFilename: "./data/dummy_2^14_gates/common_circuit_data.json",
-			proofChallengesFilename:   "./data/dummy_2^14_gates/proof_challenges.json",
+			proofWithPIsFilename:            "./data/dummy_2^14_gates/proof_with_public_inputs.json",
+			commonCircuitDataFilename:       "./data/dummy_2^14_gates/common_circuit_data.json",
+			verifierOnlyCircuitDataFilename: "./data/dummy_2^14_gates/verifier_only_circuit_data.json",
 		}
 		witness := TestPlonkCircuit{}
 		err := test.IsSolved(&circuit, &witness, TEST_CURVE.ScalarField())

plonky2_verifier/structs.go

@@ -65,6 +65,7 @@ type ProofWithPublicInputs struct {
 
 type VerifierOnlyCircuitData struct {
 	ConstantSigmasCap MerkleCap
+	CircuitDigest     Hash
 }
 
 type FriConfig struct {
@@ -110,7 +111,6 @@ type CommonCircuitData struct {
 	NumPublicInputs      uint64
 	KIs                  []F
 	NumPartialProducts   uint64
-	CircuitDigest        Hash
 }
 
 type ProofChallenges struct {

plonky2_verifier/verifier.go

@@ -31,12 +31,12 @@ func (c *VerifierChip) GetPublicInputsHash(publicInputs []F) Hash {
 	return c.poseidonChip.HashNoPad(publicInputs)
 }
 
-func (c *VerifierChip) GetChallenges(proofWithPis ProofWithPublicInputs, publicInputsHash Hash, commonData CommonCircuitData) ProofChallenges {
+func (c *VerifierChip) GetChallenges(proofWithPis ProofWithPublicInputs, publicInputsHash Hash, commonData CommonCircuitData, verifierData VerifierOnlyCircuitData) ProofChallenges {
 	config := commonData.Config
 	numChallenges := config.NumChallenges
 	challenger := NewChallengerChip(c.api, c.fieldAPI, c.poseidonChip)
 
-	var circuitDigest = commonData.CircuitDigest
+	var circuitDigest = verifierData.CircuitDigest
 
 	challenger.ObserveHash(circuitDigest)
 	challenger.ObserveHash(publicInputsHash)
@@ -71,7 +71,7 @@ func (c *VerifierChip) Verify(proofWithPis ProofWithPublicInputs, verifierData V
 	// TODO: Verify shape of the proof?
 
 	publicInputsHash := c.GetPublicInputsHash(proofWithPis.PublicInputs)
-	proofChallenges := c.GetChallenges(proofWithPis, publicInputsHash, commonData)
+	proofChallenges := c.GetChallenges(proofWithPis, publicInputsHash, commonData, verifierData)
 
 	c.plonkChip.Verify(proofChallenges, proofWithPis.Proof.Openings, publicInputsHash)
 

plonky2_verifier/verifier_test.go

@@ -41,7 +41,7 @@ func (c *TestVerifierChallengesCircuit) GetChallengesSanityCheck(
 	commonData CommonCircuitData,
 ) {
 	publicInputsHash := c.verifierChip.GetPublicInputsHash(proofWithPis.PublicInputs)
-	proofChallenges := c.verifierChip.GetChallenges(proofWithPis, publicInputsHash, commonData)
+	proofChallenges := c.verifierChip.GetChallenges(proofWithPis, publicInputsHash, commonData, verifierData)
 
 	c.hashAPI.AssertIsEqualHash(publicInputsHash, c.expectedPublicInputsHash)