Merged
Conversation
ledwards2225
commented
Feb 25, 2025
barretenberg/cpp/src/barretenberg/client_ivc/mock_kernel_pinning.test.cpp
Show resolved
Hide resolved
ledwards2225
commented
Feb 25, 2025
barretenberg/cpp/src/barretenberg/plonk_honk_shared/execution_trace/mega_execution_trace.hpp
Show resolved
Hide resolved
iakovenkos
reviewed
Feb 26, 2025
barretenberg/cpp/src/barretenberg/stdlib/goblin_verifier/merge_recursive_verifier.cpp
Show resolved
Hide resolved
iakovenkos
reviewed
Feb 26, 2025
iakovenkos
reviewed
Feb 26, 2025
barretenberg/cpp/src/barretenberg/stdlib/goblin_verifier/merge_verifier.test.cpp
Show resolved
Hide resolved
iakovenkos
reviewed
Feb 26, 2025
barretenberg/cpp/src/barretenberg/stdlib_circuit_builders/op_queue/ecc_op_queue.hpp
Show resolved
Hide resolved
iakovenkos
reviewed
Feb 26, 2025
barretenberg/cpp/src/barretenberg/stdlib_circuit_builders/op_queue/ecc_op_queue.hpp
Outdated
Show resolved
Hide resolved
iakovenkos
reviewed
Feb 26, 2025
barretenberg/cpp/src/barretenberg/stdlib_circuit_builders/op_queue/ecc_op_queue.test.cpp
Outdated
Show resolved
Hide resolved
iakovenkos
reviewed
Feb 26, 2025
barretenberg/cpp/src/barretenberg/stdlib_circuit_builders/op_queue/ecc_op_queue.test.cpp
Outdated
Show resolved
Hide resolved
iakovenkos
reviewed
Feb 26, 2025
barretenberg/cpp/src/barretenberg/stdlib_circuit_builders/op_queue/ecc_ops_table.hpp
Outdated
Show resolved
Hide resolved
iakovenkos
reviewed
Feb 26, 2025
iakovenkos
reviewed
Feb 26, 2025
iakovenkos
approved these changes
Feb 26, 2025
Contributor
iakovenkos
left a comment
iakovenkos
left a comment
There was a problem hiding this comment.
LGTM! Spotted a couple of typos and minor inconsistencies. Overall, the merge logic seems much cleaner now thanks to better functionality and abstractions separation
TomAFrench
added a commit
that referenced
this pull request
Feb 26, 2025
* master: (31 commits) feat: Slack message to ci channel tagging owners on flakes. (#12284) fix: slack notify was broken by quoted commit titles revert: "chore: Fix and reenable fees-settings test (#12302)" fix: run arm64 on master (#12307) yolo fix chore: Fix and reenable fees-settings test (#12302) feat!: rename compute_nullifier_without_context (#12308) chore: Lazy loading artifacts everywhere (#12285) chore: Reenable dapp subscription test (#12304) chore: Run prover test with fake proofs when requested (#12305) chore: Do not set CI_FULL outside CI (#12300) chore: new mnemonic deployments on sepolia (#12076) chore!: enable multiple L1 nodes to be used (#11945) chore: remove no longer supported extension from vscode/extension.json (#12303) fix(e2e): p2p_reqresp (#12297) feat: Sync from noir (#12298) chore: enabling `e2e_contract_updates` in CI + nuking irrelevant test (#12293) feat: prepend based merge (#12093) feat: fetch addresses from registry (#12000) feat: live logs (#12271) ...
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Reorganize the existing merge protocol to establish the pre-pending of subtables of ecc ops from each circuit, rather than appending. This is facilitated by classes
UltraEccOpsTableandEccvmOpsTable(implemented in a previous PR) that handle the storage and virtual pre-pending of subtables.The merge protocol proceeds by opening univariate polynomials T_j, T_{j,prev}, and t_j (columns of full table, previous full table, and current subtable respectively) and checking the identity T_j(x) = t_j(x) + x^k * T_{j,prev}(x) at a single challenge point. (Polynomials t_j are explicitly degree checked in main protocol via a relation that checks that they are zero beyond idx k-1).
Note: Missing pieces in the merge are (1) connecting [t] from the main protocol to [t] in the merge and (2) connecting [T] from step i-1 to [T_prev] at step i. These will be handled in follow ons.