Skip to content
Merged
Show file tree
Hide file tree
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
5 changes: 3 additions & 2 deletions barretenberg/cpp/src/barretenberg/ultra_honk/merge_prover.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,9 @@ MergeProver_<Flavor>::MergeProver_(const std::shared_ptr<ECCOpQueue>& op_queue)
* @details Let T_i^(j) be the jth column of the aggregate op queue after incorporating the contribution from the
* present circuit. T_{i-1}^(j) corresponds to the aggregate op queue at the previous stage and $t_i^(j)$ represents
* the contribution from the present circuit only. For each j, we have the relationship T_i = T_{i-1} + right_shift(t_i,
* M_{i-1}), where the shift magnitude M_{i-1} is the length of T_{i-1}. This protocol demonstrates that the aggregate
* op queue has been constructed correctly via a simple Schwartz-Zippel check. Evaluations are proven via batched KZG.
* M_{i-1}), where the shift magnitude M_{i-1} is the honest length of T_{i-1}. This protocol demonstrates, assuming the
* length of T_{i-1} is at most M_{i-1}, that the aggregate op queue has been constructed correctly via a simple
* Schwartz-Zippel check. Evaluations are proven via batched KZG.
*
* TODO(#746): Prove connection between t_i^{shift}, committed to herein, and t_i, used in the main protocol. See issue
* for details (https://github.com/AztecProtocol/barretenberg/issues/746).
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@ MergeVerifier_<Flavor>::MergeVerifier_()
* @details Let T_i^(j) be the jth column of the aggregate op queue after incorporating the contribution from the
* present circuit. T_{i-1}^(j) corresponds to the aggregate op queue at the previous stage and $t_i^(j)$ represents
* the contribution from the present circuit only. For each j, we have the relationship T_i = T_{i-1} + right_shift(t_i,
* M_{i-1}), where the shift magnitude M_{i-1} is the length of T_{i-1}. This protocol verfies that the aggregate op
* queue has been constructed correctly via a simple Schwartz-Zippel check. Evaluations are checked via batched KZG.
* M_{i-1}), where the shift magnitude M_{i-1} is the honest length of T_{i-1}. This protocol verfies, assuming the
* length of T_{i-1} is at most M_{i-1}, that the aggregate op queue has been constructed correctly via a simple
* Schwartz-Zippel check. Evaluations are checked via batched KZG.
*
* @tparam Flavor
* @return HonkProof&
Expand Down