Skip to content

fix: bind EmbedMachine::verify to embed VK #102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
eason1981 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: bind EmbedMachine::verify to embed VK #102

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions vm/src/instances/machine/embed.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use crate::{
machine::{
chip::{ChipBehavior, MetaChip},
folder::{DebugConstraintFolder, ProverConstraintFolder, VerifierConstraintFolder},
keys::HashableKey,
keys::{BaseVerifyingKey, HashableKey},
machine::{BaseMachine, MachineBehavior},
proof::MetaProof,
utils::assert_riscv_vk_digest,
Expand All @@ -19,15 +19,15 @@ use crate::{
};
use p3_air::Air;
use p3_field::{FieldAlgebra, PrimeField32};
use std::{any::type_name, borrow::Borrow, marker::PhantomData};
use std::{any::type_name, borrow::Borrow, marker::PhantomData, sync::OnceLock};
use tracing::{debug, debug_span, instrument};

pub struct EmbedMachine<PrevSC, SC, C, I>
where
SC: StarkGenericConfig,
{
base_machine: BaseMachine<SC, C>,

vk: OnceLock<BaseVerifyingKey<SC>>,
phantom: std::marker::PhantomData<(PrevSC, I)>,
}

Expand Down Expand Up @@ -74,7 +74,9 @@ where
.in_scope(|| self.base_machine.prove_ensemble(witness.pk(), &records));

// construct meta proof
let vks = vec![witness.vk.clone().unwrap()].into();
let vk = witness.vk.clone().unwrap();
self.vk.get_or_init(|| vk.clone());
let vks = vec![vk].into();

debug!("EMBED chip log degrees:");
proofs.iter().enumerate().for_each(|(i, proof)| {
Expand Down Expand Up @@ -102,8 +104,6 @@ where
where
C: for<'a> Air<VerifierConstraintFolder<'a, EmbedSC>>,
{
let vk = proof.vks().first().unwrap();

assert_eq!(proof.num_proofs(), 1);

let public_values: &RecursionPublicValues<_> =
Expand All @@ -119,6 +119,11 @@ where

assert_riscv_vk_digest(proof, riscv_vk);

let vk = self
.vk
.get()
.unwrap_or_else(|| proof.vks().first().unwrap());

// verify
self.base_machine.verify_ensemble(vk, &proof.proofs())?;
Ok(())
Expand All @@ -138,6 +143,7 @@ where
pub fn new(config: SC, chips: Vec<MetaChip<Val<SC>, C>>, num_public_values: usize) -> Self {
Self {
base_machine: BaseMachine::<SC, C>::new(config, chips, num_public_values),
vk: OnceLock::new(),
phantom: PhantomData,
}
}
Expand Down
Loading