Skip to content
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.

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

feat: prepend based merge #12093

Merged
merged 38 commits into from
Feb 26, 2025
Merged

feat: prepend based merge #12093

merged 38 commits into from
Feb 26, 2025

Conversation

ledwards2225
Copy link
Contributor

@ledwards2225 ledwards2225 commented Feb 18, 2025

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 UltraEccOpsTable and EccvmOpsTable (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.

@ledwards2225 ledwards2225 self-assigned this Feb 18, 2025
@ledwards2225 ledwards2225 marked this pull request as ready for review February 18, 2025 20:12
Copy link
Contributor

@iakovenkos iakovenkos left a comment

Choose a reason for hiding this comment

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

LGTM! Spotted a couple of typos and minor inconsistencies. Overall, the merge logic seems much cleaner now thanks to better functionality and abstractions separation

@ledwards2225 ledwards2225 merged commit 6749596 into master Feb 26, 2025
9 checks passed
@ledwards2225 ledwards2225 deleted the lde/prepend_merge branch February 26, 2025 18:01
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)
  ...
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