fix(galoisd): include public commitment when creating fixed vk

Signed-off-by: aeryz <[email protected]>

Author: aeryz

galoisd/grpc/bls12381_server.go

@@ -32,7 +32,7 @@ import (
 	"github.com/consensys/gnark/frontend"
 	// "github.com/consensys/gnark/frontend/cs/r1cs"
 	gadget "github.com/consensys/gnark/std/algebra/emulated/sw_bn254"
-	"github.com/consensys/gnark/std/math/emulated"
+	// "github.com/consensys/gnark/std/math/emulated"
 	"github.com/consensys/gnark/std/recursion/groth16"
 	"github.com/holiman/uint256"
 	"github.com/rs/zerolog/log"
@@ -142,7 +142,6 @@ func (p *proverServerBls12381) Poll(ctx context.Context, pollReq *grpc.PollReque
 		commitmentHash := cometbn254.HashToField(innerProof.ProofCommitment.Marshal())
 		bls12381Witness := &bls12381gadget.Circuit{
 			// verifying key is baked in, so we don't set here since it has no effect on the witness generation
-			// VerifyingKey:    circuitVk,
 			InnerWitness:    circuitWitness,
 			Proof:           circuitProof,
 			CommitmentHash:  commitmentHash.BigInt(new(big.Int)),
@@ -377,6 +376,7 @@ func loadOrCreateBls12381(r1csPath, pkPath, vkPath, innerR1csPath, innerPkPath,
 	}
 
 	verifyingKey, err := groth16.ValueOfVerifyingKeyFixed[gadget.G1Affine, gadget.G2Affine, gadget.GTEl](&vkInner)
+	verifyingKey.PublicAndCommitmentCommitted = vkInner.PublicAndCommitmentCommitted
 
 	if err != nil {
 		return cs, pk, vk, csInner, pkInner, vkInner, err
@@ -385,13 +385,10 @@ func loadOrCreateBls12381(r1csPath, pkPath, vkPath, innerR1csPath, innerPkPath,
 	log.Info().Msg("Compiling circuit...")
 	r1csInstance, err := bls12381gadget.Compile(
 		groth16.PlaceholderProof[gadget.G1Affine, gadget.G2Affine](&csInner),
-		groth16.Witness[gadget.ScalarField]{
-			Public: make([]emulated.Element[gadget.ScalarField], csInner.GetNbPublicVariables()),
-		},
+		groth16.PlaceholderWitness[gadget.ScalarField](&csInner),
 		verifyingKey,
 	)
 
-	// r1csInstance, err := frontend.Compile(ecc.BLS12_381.ScalarField(), r1cs.NewBuilder, circuit, frontend.WithCompressThreshold(300))
 	if err != nil {
 		return cs, pk, vk, csInner, pkInner, vkInner, err
 	}

galoisd/pkg/lightclient/bls12381/circuit.go

@@ -17,7 +17,7 @@ import (
 
 type Circuit struct {
 	Proof        groth16.Proof[sw_bn254.G1Affine, sw_bn254.G2Affine]
-	InnerWitness groth16.Witness[sw_bn254.ScalarField]
+	InnerWitness groth16.Witness[sw_bn254.ScalarField] `gnark:",public"`
 	// we are using an embedded constant verifying key since it's easier and doesn't require a vkhash
 	verifyingKey    groth16.VerifyingKey[sw_bn254.G1Affine, sw_bn254.G2Affine, sw_bn254.GTEl] `gnark:"-"`
 	CommitmentHash  frontend.Variable                                                         `gnark:",public"`