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

continuations: Remove the need for dummy segments #245

Merged
merged 38 commits into from
Jul 1, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
02a2849
Implement single-segment aggregations
hratoanina Apr 24, 2024
65d8771
Change log test
hratoanina Apr 25, 2024
6141e52
Don't generate dummy segment data
hratoanina Apr 25, 2024
b7c0fe0
Fix dummy proof setting
hratoanina Apr 25, 2024
5b22d34
Make dummy proof out of dummy circuit
hratoanina Apr 25, 2024
db9a8f2
Try to generate dummy proof
hratoanina Apr 26, 2024
26d02b6
Add import
hratoanina Apr 26, 2024
187e96e
Add pis to dummy proof
hratoanina Apr 26, 2024
f8806fd
Update method name
hratoanina Apr 26, 2024
2a2d4a4
Fix PV connection
Nashtare Apr 29, 2024
4c00a54
Fix wire set twice
LindaGuiga Apr 29, 2024
2891246
Update ranges
Nashtare Apr 29, 2024
7c9f63a
Merge remote-tracking branch 'origin/feat/continuations' into no_dumm…
Nashtare Apr 29, 2024
0804c38
Add getter and handle single segment
Nashtare Apr 30, 2024
ee16349
Dummy segments, new version
hratoanina May 21, 2024
73fdf94
Fix AggChildWithDummy
LindaGuiga May 21, 2024
2941d72
Update to latest version of zkevm_no_dummy_segment
LindaGuiga May 21, 2024
483de98
Add is_dummy to ProverOutputData, remove the special logic for dummy …
LindaGuiga May 21, 2024
bc3933b
Update proof_gen
LindaGuiga May 23, 2024
540949e
Merge branch 'feat/continuations' into no_dummy_segment_no_pis
LindaGuiga May 24, 2024
58d1e6a
Cleanup and add missing connections in create_segment_aggregation_cir…
LindaGuiga May 24, 2024
37fdf73
Merge branch 'feat/continuations' into no_dummy_segment_no_pis
LindaGuiga May 28, 2024
8205e53
Merge branch 'feat/continuations' into no_dummy_segment_no_pis
LindaGuiga May 30, 2024
08dd0ab
Create generate_next_segment and make_dummy_segment
LindaGuiga May 29, 2024
5578e8b
Add debug log
LindaGuiga May 29, 2024
717d29c
Have teh SegmentDataIterator in zk_evm and change prove_all_segments …
LindaGuiga May 30, 2024
3261e62
Remove dummy segment in SegmentDataIterator
LindaGuiga May 31, 2024
a289b7a
Clippy and cleanup
LindaGuiga May 31, 2024
6eee424
Merge branch 'feat/continuations' into no_dummy_segment_no_pis
LindaGuiga Jun 5, 2024
60f67a8
Apply comments
LindaGuiga Jun 6, 2024
0153a62
Remove segments from AggregatableTxnProofs
LindaGuiga Jun 6, 2024
0f5c185
Rename SegmentAggregatableProof variant
hratoanina Jun 6, 2024
cfd1fcf
Fix generate_segment_agg_proof
LindaGuiga Jun 7, 2024
e3d7220
Merge branch 'feat/continuations' into no_dummy_segment_no_pis
LindaGuiga Jun 7, 2024
354db88
Merge branch 'continuations-next-segment' into no_dummy_segment_no_pis
hratoanina Jun 10, 2024
87fa930
Apply comments
LindaGuiga Jun 11, 2024
1380841
Use reference for GenerationInputs in SegmentDataIterator
LindaGuiga Jun 13, 2024
b9c1ce7
Reintroduce changes to TxnAggregatableProof for zero-bin compatibility
LindaGuiga Jun 14, 2024
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
2 changes: 1 addition & 1 deletion evm_arithmetization/src/fixed_recursive_verifier.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1564,7 +1564,7 @@ where
abort_signal: Option<Arc<AtomicBool>>,
) -> anyhow::Result<Vec<ProverOutputData<F, C, D>>> {
let mut it_segment_data = SegmentDataIterator {
inputs: generation_inputs.clone(),
inputs: &generation_inputs,
partial_next_data: None,
max_cpu_len_log: Some(max_cpu_len_log),
};
Expand Down
8 changes: 4 additions & 4 deletions evm_arithmetization/src/prover.rs
Original file line number Diff line number Diff line change
Expand Up @@ -523,20 +523,20 @@ fn build_segment_data<F: RichField>(
}
}

pub struct SegmentDataIterator {
pub struct SegmentDataIterator<'a> {
pub partial_next_data: Option<GenerationSegmentData>,
pub inputs: GenerationInputs,
pub inputs: &'a GenerationInputs,
pub max_cpu_len_log: Option<usize>,
}

type F = GoldilocksField;
impl Iterator for SegmentDataIterator {
impl<'a> Iterator for SegmentDataIterator<'a> {
type Item = (GenerationInputs, GenerationSegmentData);

fn next(&mut self) -> Option<Self::Item> {
let cur_and_next_data = generate_next_segment::<F>(
self.max_cpu_len_log,
&self.inputs,
self.inputs,
self.partial_next_data.clone(),
);

Expand Down