fix: bundle verifier

Author: noel2004

coordinator/cmd/tool/verify.go

@@ -28,7 +28,7 @@ func verify(cCtx *cli.Context) error {
 		proofType = cCtx.Args().Get(1)
 		proofPath = cCtx.Args().Get(2)
 	}
-	log.Info("verify proof in: ", proofPath, "type", proofType, "forkName", forkName)
+	log.Info("verify proof", "in", proofPath, "type", proofType, "forkName", forkName)
 
 	// Load the content of the proof file
 	data, err := os.ReadFile(filepath.Clean(proofPath))
@@ -53,7 +53,7 @@ func verify(cCtx *cli.Context) error {
 			return fmt.Errorf("no vk loaded for fork %s", forkName)
 		}
 		if len(proof.Vk) != 0 {
-			if bytes.Equal(proof.Vk, vk) {
+			if !bytes.Equal(proof.Vk, vk) {
 				return fmt.Errorf("unmatch vk with expected: expected %s, get %s",
 					base64.StdEncoding.EncodeToString(vk),
 					base64.StdEncoding.EncodeToString(proof.Vk),
@@ -74,7 +74,7 @@ func verify(cCtx *cli.Context) error {
 			return fmt.Errorf("no vk loaded for fork %s", forkName)
 		}
 		if len(proof.Vk) != 0 {
-			if bytes.Equal(proof.Vk, vk) {
+			if !bytes.Equal(proof.Vk, vk) {
 				return fmt.Errorf("unmatch vk with expected: expected %s, get %s",
 					base64.StdEncoding.EncodeToString(vk),
 					base64.StdEncoding.EncodeToString(proof.Vk),
@@ -94,16 +94,7 @@ func verify(cCtx *cli.Context) error {
 		if !ok {
 			return fmt.Errorf("no vk loaded for fork %s", forkName)
 		}
-		if len(proof.Vk) != 0 {
-			if bytes.Equal(proof.Vk, vk) {
-				return fmt.Errorf("unmatch vk with expected: expected %s, get %s",
-					base64.StdEncoding.EncodeToString(vk),
-					base64.StdEncoding.EncodeToString(proof.Vk),
-				)
-			}
-		} else {
-			proof.Vk = vk
-		}
+		proof.Vk = vk
 
 		ret, err = vf.VerifyBundleProof(proof, forkName)
 	default:

crates/prover-bin/src/prover.rs

@@ -203,6 +203,7 @@ impl LocalProver {
             .get(hard_fork_name)
             .ok_or_else(|| eyre::eyre!("no corresponding config for fork {hard_fork_name}"))?;
 
+        let workspace_path = &config.workspace_path;
         let universal_prover = EuclidV2Handler::new(config);
         let _ = universal_prover
             .get_prover()
@@ -224,6 +225,21 @@ impl LocalProver {
         let f = File::create(out_path.join("openVmVk.json"))?;
         serde_json::to_writer(f, &dump)?;
 
+        // Copy verifier.bin from workspace bundle directory to output path
+        let bundle_verifier_path = Path::new(workspace_path)
+            .join("bundle")
+            .join("verifier.bin");
+        if bundle_verifier_path.exists() {
+            let dest_path = out_path.join("verifier.bin");
+            std::fs::copy(&bundle_verifier_path, &dest_path)
+                .map_err(|e| eyre::eyre!("Failed to copy verifier.bin: {}", e))?;
+        } else {
+            eprintln!(
+                "Warning: verifier.bin not found at {:?}",
+                bundle_verifier_path
+            );
+        }
+
         Ok(())
     }
 }

crates/prover-bin/src/zk_circuits_handler/euclidV2.rs

@@ -70,7 +70,7 @@ impl EuclidV2Handler {
             ProofType::Batch => self.cached_vks[&ProofType::Batch]
                 .get_or_init(|| BASE64_STANDARD.encode(self.batch_prover.get_app_vk())),
             ProofType::Bundle => self.cached_vks[&ProofType::Bundle]
-                .get_or_init(|| BASE64_STANDARD.encode(self.bundle_prover.get_evm_vk())),
+                .get_or_init(|| BASE64_STANDARD.encode(self.bundle_prover.get_app_vk())),
             _ => unreachable!("Unsupported proof type {:?}", task_type),
         }
         .clone()