refactor: add vk in bitvm challenge data

fiamma-chain · Nov 7, 2024 · be520ff · be520ff
1 parent 6c5e54f
commit be520ff
Show file tree

Hide file tree

Showing 6 changed files with 215 additions and 85 deletions.
diff --git a/api/fiamma/zkpverify/zkpverify.pulsar.go b/api/fiamma/zkpverify/zkpverify.pulsar.go
diff --git a/docs/static/openapi.yml b/docs/static/openapi.yml
diff --git a/proto/fiamma/zkpverify/zkpverify.proto b/proto/fiamma/zkpverify/zkpverify.proto
@@ -13,9 +13,9 @@ enum VerificationStatus {
 // DataLocation is the proof data location enum for the proof verification
 enum DataLocation {
   FIAMMA = 0; 
-  NUBITDA = 1;
+  NUBIT = 1;
   CELESTIA = 2;
-  AVAILDA = 3;
+  AVAIL = 3;
 }
 
 // ProofSystem is the proof system enum for the proof verification
@@ -64,5 +64,6 @@ message VerifyResult {
 // BitVMChallengeData is the data structure for the bitvm challenge data
 message BitVMChallengeData {
   bytes witness = 1;
-  string proposer = 2;
+  bytes vk = 2;
+  string proposer = 3;
 }
diff --git a/x/zkpverify/keeper/msg_server_submit_proof.go b/x/zkpverify/keeper/msg_server_submit_proof.go
@@ -64,6 +64,7 @@ func (k msgServer) SubmitProof(goCtx context.Context, msg *types.MsgSubmitProof)
 
 	bitVMChallengeData := types.BitVMChallengeData{
 		Witness:  witness,
+		Vk:       msg.Vk,
 		Proposer: proposerAddress,
 	}
 	k.SetBitVMChallengeData(ctx, proofId[:], bitVMChallengeData)

diff --git a/x/zkpverify/module/autocli.go b/x/zkpverify/module/autocli.go
@@ -106,7 +106,7 @@ func (am AppModule) AutoCLIOptions() *autocliv1.ModuleOptions {
 				{
 					RpcMethod:      "SubmitCommunityVerification",
 					Use:            "submit-community-verification [proof_id] [verify_result]",
-					Short:          "submit a community zkp proof verify tx" + "\n" + "Currently supported proof systems: " + "[GROTH16_BN254_BITVM, FFPLONK_BN254_BITVM]",
+					Short:          "submit a community zkp proof verify tx",
 					PositionalArgs: []*autocliv1.PositionalArgDescriptor{{ProtoField: "proof_id"}, {ProtoField: "verify_result"}},
 				},