Merge develop into master (after a while) #2734

volhovm · 2024-10-29T11:53:13Z

Develop has not been merged into master for a year or so. Ideally master should contain all the changes from develop.

Highlighting some changes in master (but not develop) that I found hard to reconcile with develop:

Move tests to sub-directories
SRS refactoring in poly-commitment/src that gets rid of srs.rs etc.
- This was annoying to resolve since it's a big refactoring.
posedidon changes: see commit 34dd760 and around
chunked.rs was removed from poly-commitment
Precomputed srs stuff, master has precomputed srs for bn256 too.

Make lagrange basis handling safe

Poseidon benchmark that also runs in Wasm

…24-10-25

…4-10-25

codecov · 2024-10-29T12:35:42Z

Codecov Report

Attention: Patch coverage is 80.13245% with 60 lines in your changes missing coverage. Please review.

Project coverage is 73.00%. Comparing base (ba2d00c) to head (295c19f).
Report is 263 commits behind head on master.

Files with missing lines	Patch %	Lines
kimchi/src/circuits/constraints.rs	0.00%	20 Missing ⚠️
utils/src/serialization.rs	75.36%	17 Missing ⚠️
kimchi/src/circuits/expr.rs	0.00%	4 Missing ⚠️
poly-commitment/src/hash_map_cache.rs	89.65%	3 Missing ⚠️
poly-commitment/src/kzg.rs	57.14%	3 Missing ⚠️
kimchi/src/precomputed_srs.rs	60.00%	2 Missing ⚠️
msm/src/test/logup.rs	0.00%	2 Missing ⚠️
o1vm/src/legacy/main.rs	0.00%	2 Missing ⚠️
o1vm/src/pickles/main.rs	0.00%	2 Missing ⚠️
poly-commitment/src/ipa.rs	98.16%	2 Missing ⚠️
... and 3 more

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #2734      +/-   ##
==========================================
+ Coverage   72.50%   73.00%   +0.49%     
==========================================
  Files         247      247              
  Lines       57706    57443     -263     
==========================================
+ Hits        41842    41937      +95     
+ Misses      15864    15506     -358

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

shimkiv

Small change requested, other than that looks good CI wise.

.github/workflows/ci.yml

dannywillems · 2024-10-30T09:19:26Z

curves/src/pasta/fields/mod.rs

@@ -43,3 +43,7 @@ pub trait SquareRootField: Field {
    /// Sets `self` to be the square root of `self`, if it exists.
    fn sqrt_in_place(&mut self) -> Option<&mut Self>;
 }
+
+// @volhovm: do we need this?


It seems tests are duplicated. See curves/tests.

dannywillems · 2024-10-30T09:20:33Z

docker-compose.yml

@@ -0,0 +1,86 @@
+name: proof-systems-github-runners


What's this? I have never seen it before.

Added here: https://github.com/o1-labs/proof-systems/pull/2570/files#diff-e45e45baeda1c1e73482975a664062aa56f20c03dd9d64a827aba57775bed0d3

(Dunno what this is, all questions to Serhii 😁)

dannywillems · 2024-10-30T09:20:46Z

curves/src/pasta/fields/tests.rs

@@ -0,0 +1,5 @@
+use crate::pasta::fields::{Fp as Fr, Fq};


Seems duplicated. See curves/tests.

Yep, nice catch, thanks! Duplicates removed now.

dannywillems · 2024-10-30T09:23:54Z

poly-commitment/src/tests/mod.rs

@@ -0,0 +1,3 @@
+mod batch_15_wires;


This can be removed. Tests are in poly-commitment/tests, not in poly-commitment/src/tests anymore.

dannywillems

Only small comments that can be done in a follow-up.

shimkiv

LGTM!

dannywillems · 2024-10-31T11:57:17Z

~~You'll need to rebase on top of master to get the new CI configuration (sorry :( )~~

Ah, no, my bad. We need to update the CI configuration.

dannywillems · 2024-11-01T08:14:40Z

I updated the CI branch protection. node was added to version 20, and therefore branch protection had to changed.
I removed:

Run checks and tests (1.73, 4.14) 
Run checks and tests (1.73, 4.14) 
Run checks and tests (1.73, 4.14) 
Run checks and tests (1.73, 4.14)

and added

CI / Run checks and tests (1.71, 4.14, 20) 
CI / Run checks and tests (1.72, 4.14, 20) 
CI / Run checks and tests (1.73, 4.14, 20) 
CI / Run checks and tests (1.74, 4.14, 20)

dannywillems · 2024-11-01T08:14:57Z

Feel free to merge @volhovm

mrmr1993 added 30 commits August 18, 2023 17:04

Add public_input_only_prover module

8b84ab0

Purge lookups from public_input_only_prover

5fd2ea5

Remove zk rows from public input only prover

3be0857

Only provide 1 witness column

47d47ae

Remove unused gates

2b42287

Remove optional gates

8356aab

Replace z_poly with the constant polynomial 1

3d7cbbe

Inline contents of new_index_for_test_with_lookups

df13da2

Inline ConstraintSystem::build

6ae7048

Begin using public input directly

cdd3ad7

Tweak test to generate a constant function for generic selector

09a88a7

Skip unnecessary columns

b34953f

Hard-code the selector evaluations to the expected values

762c751

Use functions directly instead of from the index

25fff6c

Generate the verifier index explicitly

d881374

Remove unused code

cbdbfa3

Add more representative timing info

929b288

Remove constraints that entirely cancel out

ae68310

Skip linearization apart from permutation

df13474

Remove quotient_poly, hard-code to 0

a9509fb

Remove unused code

7d7f071

Only evaluate the non-zero witness column

971aa2a

Only commit directly to the first witness column

a402e4e

Use the explicit zero polynomial for other witness columns

c91a141

Remove other witness_poly terms

fac2ad1

Remove additional unused witness columns

beea102

Use explicit coefficient polynomials

2e2a182

Label inputs to opening proof

687a22c

Remove calculation for z_comm

b90ec83

Commit only once for public input and witness polynomial

e28bc13

mrmr1993 and others added 12 commits October 8, 2024 00:51

Implement and use HashMapCache

70ed0b7

Update book

0e110b7

Add HashMapCache.contains_key

16e4cc6

imply lifetime annotation

90f6494

format and lint working

558168f

remove deprecated references to add_lagrange_basis

a70e020

Merge pull request #2672 from o1-labs/feature/safe-lagrange-basis

3689889

Make lagrange basis handling safe

Move bench-wasm.sh into a sub-directory

23de603

Add dependency checks into bench-wasm, improve readme

67c7d9a

Merge pull request #2633 from o1-labs/perf/poseidon-wasm

befc0ae

Poseidon benchmark that also runs in Wasm

Merge branch 'develop' into volhovm/merge-develop-into-master-epic-20…

7730d58

…24-10-25

Merge branch 'master' into volhovm/merge-develop-into-master-epic-202…

9721695

…4-10-25

volhovm requested review from dannywillems and shimkiv October 29, 2024 11:56

Cargo fmt

a771be1

shimkiv requested changes Oct 29, 2024

View reviewed changes

.github/workflows/ci.yml Show resolved Hide resolved

Add node version 20 into CI

e27d81f

dannywillems reviewed Oct 30, 2024

View reviewed changes

dannywillems approved these changes Oct 30, 2024

View reviewed changes

Remove duplicate tests

295c19f

shimkiv approved these changes Oct 31, 2024

View reviewed changes

volhovm merged commit 99eb8ff into master Nov 1, 2024
8 checks passed

volhovm deleted the volhovm/merge-develop-into-master-epic-2024-10-25 branch November 1, 2024 08:15

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge develop into master (after a while) #2734

Merge develop into master (after a while) #2734

volhovm commented Oct 29, 2024 •

edited

Loading

codecov bot commented Oct 29, 2024 •

edited

Loading

shimkiv left a comment

dannywillems Oct 30, 2024

dannywillems Oct 30, 2024

volhovm Oct 31, 2024

dannywillems Oct 30, 2024

volhovm Oct 31, 2024

dannywillems Oct 30, 2024

dannywillems left a comment

shimkiv left a comment

dannywillems commented Oct 31, 2024 •

edited

Loading

dannywillems commented Nov 1, 2024

dannywillems commented Nov 1, 2024

Merge develop into master (after a while) #2734

Merge develop into master (after a while) #2734

Conversation

volhovm commented Oct 29, 2024 • edited Loading

codecov bot commented Oct 29, 2024 • edited Loading

Codecov Report

shimkiv left a comment

Choose a reason for hiding this comment

dannywillems Oct 30, 2024

Choose a reason for hiding this comment

dannywillems Oct 30, 2024

Choose a reason for hiding this comment

volhovm Oct 31, 2024

Choose a reason for hiding this comment

dannywillems Oct 30, 2024

Choose a reason for hiding this comment

volhovm Oct 31, 2024

Choose a reason for hiding this comment

dannywillems Oct 30, 2024

Choose a reason for hiding this comment

dannywillems left a comment

Choose a reason for hiding this comment

shimkiv left a comment

Choose a reason for hiding this comment

dannywillems commented Oct 31, 2024 • edited Loading

dannywillems commented Nov 1, 2024

dannywillems commented Nov 1, 2024

volhovm commented Oct 29, 2024 •

edited

Loading

codecov bot commented Oct 29, 2024 •

edited

Loading

dannywillems commented Oct 31, 2024 •

edited

Loading