Skip to content

chore: Modify the MergeVerifier so that it gets the subtable commitments as input and returns the commitment to the merged table#15949

Merged
federicobarbacovi merged 15 commits into
merge-train/barretenbergfrom
fb/merge_verifier_api_2
Jul 25, 2025
Merged

chore: Modify the MergeVerifier so that it gets the subtable commitments as input and returns the commitment to the merged table#15949
federicobarbacovi merged 15 commits into
merge-train/barretenbergfrom
fb/merge_verifier_api_2

Conversation

@federicobarbacovi

Copy link
Copy Markdown
Contributor

As per title. The reason for this change is that given the new structure of ClientIVC following #15704, we can't access the merged table commitments from inside complete_hiding_circuit_logic.

This PR is in preparation for #15829

@federicobarbacovi federicobarbacovi changed the title chore: Modify the MergeVerifier so that it gets the subtable commitments as input and return the commitment to the merged table chore: Modify the MergeVerifier so that it gets the subtable commitments as input and returns the commitment to the merged table Jul 24, 2025
@federicobarbacovi federicobarbacovi marked this pull request as ready for review July 24, 2025 13:31
@fcarreiro fcarreiro removed their request for review July 24, 2025 14:14
Base automatically changed from merge-train/barretenberg to next July 24, 2025 18:20

@ledwards2225 ledwards2225 left a comment

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.

Good stuff! Couple tiny comments

Comment thread barretenberg/cpp/src/barretenberg/common/ref_array.hpp Outdated
// Goblin verification (final merge, eccvm, translator)
bool goblin_verified = Goblin::verify(
proof.goblin_proof, merge_commitments, merge_commitments.T_commitments, civc_verifier_transcript);
auto [goblin_verified, _merged_table_commitments] =

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.

Curious why the _ prefix here?

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.

Because in contrast to the other variables that I have set up with this same, this is a variable that is not going to be used, and I wanted to highlight that (but I can't use _ because it's used above. This is going to change in a following PR when the _ above will be used, so its name will change)

@federicobarbacovi federicobarbacovi changed the base branch from next to merge-train/barretenberg July 25, 2025 08:38
@federicobarbacovi federicobarbacovi merged commit 78021ea into merge-train/barretenberg Jul 25, 2025
4 checks passed
@federicobarbacovi federicobarbacovi deleted the fb/merge_verifier_api_2 branch July 25, 2025 08:55
github-merge-queue Bot pushed a commit that referenced this pull request Jul 30, 2025
See
[merge-train-readme.md](https://github.com/AztecProtocol/aztec-packages/blob/next/.github/workflows/merge-train-readme.md).

BEGIN_COMMIT_OVERRIDE
chore: remove `logic` operations from `uint` (#15975)
chore: Modify the `MergeVerifier` so that it gets the subtable
commitments as input and returns the commitment to the merged table
(#15949)
fix: delete tar generated by test-vk-havent-changed script (#15988)
chore: replace q_arith with q_3 in memory relation (#15953)
chore: simplify `uint` logic by removing `witness_status` (#15976)
Revert "chore: remove `logic` operations from `uint`" (#15997)
Revert "chore: simplify `uint` logic by removing `witness_status`"
(#16000)
feat: Add the last merged table to the public inputs of the hiding
circuit (#15829)
chore: combined `uint` audit (#16030)
chore: delete and ignore barretenberg/src/honk/keys/ (#16042)
fix: Fix tube proof construction (#16052)
feat: Link successive recursive Merge verifications (#16032)
chore: Package inputs to Merge verifier into a single struct (#16075)
END_COMMIT_OVERRIDE

---------

Co-authored-by: AztecBot <tech@aztecprotocol.com>
Co-authored-by: Suyash Bagad <suyash@aztecprotocol.com>
Co-authored-by: federicobarbacovi <171914500+federicobarbacovi@users.noreply.github.com>
Co-authored-by: Jonathan Hao <jonathan@aztec-labs.com>
Co-authored-by: ledwards2225 <98505400+ledwards2225@users.noreply.github.com>
Co-authored-by: sergei iakovenko <105737703+iakovenkos@users.noreply.github.com>
Co-authored-by: ludamad <adam.domurad@gmail.com>
Co-authored-by: Raju Krishnamoorthy <krishnamoorthy@gmail.com>
Co-authored-by: notnotraju <raju@aztec-labs.com>
Co-authored-by: Lucas Xia <lucasxia01@gmail.com>
Co-authored-by: Khashayar Barooti <khashayar@aztecprotocol.com>
Co-authored-by: Jean M <132435771+jeanmon@users.noreply.github.com>
Co-authored-by: Alex Gherghisan <alexghr@users.noreply.github.com>
Co-authored-by: Santiago Palladino <spalladino@users.noreply.github.com>
Co-authored-by: Santiago Palladino <santiago@aztec-labs.com>
Co-authored-by: ludamad <domuradical@gmail.com>
Co-authored-by: maramihali <mara@aztecprotocol.com>
Co-authored-by: Sarkoxed <75146596+Sarkoxed@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants