Skip to content
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ class AvmGoblinRecursiveVerifier {
{
// Types for MegaHonk and Goblin recursive verifiers arithmetized with Ultra
using MegaRecursiveFlavor = MegaRecursiveFlavor_<UltraBuilder>;
using MegaRecursiveVerificationKey = MegaRecursiveFlavor::VerificationKey;
using MegaRecursiveVKAndHash = MegaRecursiveFlavor::VKAndHash;
using MegaRecursiveVerifier = stdlib::recursion::honk::UltraRecursiveVerifier_<MegaRecursiveFlavor>;
using GoblinRecursiveVerifier = stdlib::recursion::honk::GoblinRecursiveVerifier;
using GoblinRecursiveVerifierOutput = stdlib::recursion::honk::GoblinRecursiveVerifierOutput;
Expand All @@ -130,8 +130,8 @@ class AvmGoblinRecursiveVerifier {
// All verifier components share a single transcript
auto transcript = std::make_shared<MegaRecursiveFlavor::Transcript>();
// TODO(https://github.com/AztecProtocol/barretenberg/issues/1305): Mega + Goblin VKs must be circuit constants.
auto mega_vk = std::make_shared<MegaRecursiveVerificationKey>(&ultra_builder, inner_output.mega_vk);
MegaRecursiveVerifier mega_verifier(&ultra_builder, mega_vk, transcript);
auto mega_vk_and_hash = std::make_shared<MegaRecursiveVKAndHash>(ultra_builder, inner_output.mega_vk);

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe a vk hash should be passed in here?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, that would avoid recomputation. I guess we can add that when we make inner_output.mega_vk a circuit constant

MegaRecursiveVerifier mega_verifier(&ultra_builder, mega_vk_and_hash, transcript);
stdlib::Proof<UltraBuilder> mega_proof(ultra_builder, inner_output.mega_proof);
auto mega_verifier_output = mega_verifier.verify_proof(mega_proof);

Expand Down
Loading