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.

Sign up for GitHub

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

Jump to bottom

Merge develop -> main #1621

Closed
wants to merge 78 commits into from
Closed

Merge develop -> main #1621

wants to merge 78 commits into from

Conversation

mitschabaude
Copy link
Contributor

@mitschabaude mitschabaude commented Dec 19, 2023 •
edited
Loading

mrmr1993 and others added 30 commits June 1, 2023 16:39
@mrmr1993
Capture zk_rows as a variable in the expression framework
1990bf5
@mrmr1993
cargo fmt
a85f2cd
@dannywillems
Add link to GitHub
4f1a904
@dannywillems
This TODO is done
5e91825
@dannywillems
Remove snarky
9be01f7
@mrmr1993
Add helpers for inferring feature flags
99b35be
@mrmr1993
Derive binding types for FeatureFlags
33252de
@mrmr1993
Improve errors around domain creation
6cac18b
@mrmr1993
Fixup edge-case around chunking in constraint system
0467bce
Merge pull request #1276 from o1-labs/feature/better-domain-errors
51d7da6 
Improve errors around domain creation
@dannywillems
Merge branch 'develop' into dannywillems/remove-snarky-section
6280cfa
Merge pull request #1277 from o1-labs/feature/fix-edge-case-around-ch…
a6782ca 
…unks

Fixup edge-case around chunking in constraint system
@dannywillems
Merge pull request #1259 from o1-labs/dannywillems/remove-snarky-section
b270e38 
Remove snarky
@mrmr1993
Merge branch 'feature/num-zk-rows-variable' into feature/num-zk-rows-…
1adc8a7 
…variable2
@mrmr1993
Clippy :')
b1bc089
@volhovm
[#14070] Add a unit check for the table id zero value condition
488ad18
@volhovm
[#14070] Fix the table dummy rows bug
74b5b0c
@volhovm
[#14097,#14070] Move lookup table consistency checks into LookupTable…
eaf3184 
…#create()
@mrmr1993
More opinionated clippy changes
6ec48aa
@mrmr1993
Merge branch 'develop' into feature/num-zk-rows-variable2
21dfdf6
@mrmr1993
Fixup compilation after clippy's 'help'
a2e577c
@mrmr1993
Fixup test
fe78e35
@mrmr1993
cargo fmt
09ba6e2
@mrmr1993
Merge pull request #1279 from o1-labs/feature/num-zk-rows-variable2
88bf986 
Capture zk_rows as a variable in the expression framework
@volhovm
Cosmetics on the lookup RFC
2cf2ea4
@volhovm
Capitalize book summary titles
c5d1459
@volhovm
Add .ignore file to .gitignore
d71b06b
@volhovm
Improve RFC3, fix rendering in kimchi/overview.md
51e2672
@rbonichon
Cargo: use wasm-bindgen 0.2.87
f38a2c3
@dannywillems
Merge pull request #1302 from o1-labs/rb/wasm-bindgen-0.2.87
57a3d8b 
Cargo: use wasm-bindgen 0.2.87
volhovm and others added 27 commits November 21, 2023 16:57
@volhovm
Merge pull request #1304 from o1-labs/volhovm/mina14442-move-old-rfcs…
2f94807 
…-chapters

Revamp mina book structure
@dannywillems
Bare URL's are not supported and must be wrapped.
8920a01
@dannywillems
Update specifications
25156a2 
Run make build
@dannywillems
Merge pull request #1200 from o1-labs/misc/link-todo-with-gh-issues
901033a 
Explain TODOs
@dannywillems
Fix resolver warnings
6c6adca 
https://doc.rust-lang.org/edition-guide/rust-2021/default-cargo-resolver.html
Merge pull request #1348 from o1-labs/dw/fix-resolver-warnings-develop
3908626 
[develop] Fix resolver warnings
@dannywillems
Additional comment on the table_id_combiner
1c30635
@dannywillems
Merge pull request #1355 from o1-labs/dw/additional-comments-on-combi…
bde1c05 
…ne-table-develop

Additional comment on the table_id_combiner [develop]
@mrmr1993
Revert "Merge pull request #1263 from o1-labs/volhovm/mina14070-table…
267105a 
…-id-zero-row"

This reverts commit 7f6eba0, reversing
changes made to 88c1776.
@mrmr1993
Merge pull request #1378 from o1-labs/feature/revert-bad-par
5685f41 
Revert bad PR #1263
@dannywillems
Activate feature std_rng
8e0c0af
@dannywillems
Generate seed, print in case of errors and initialize a RNG with
cbaa107 
Make tests reproducible. Useful when we want to debug.
@dannywillems
Merge pull request #1442 from o1-labs/dw/use-seedable-rng-for-some-tests
86df71f 
[develop] Use seedable rng for some tests
@dannywillems
Constraint: add explanation on the + 1
3200191
@dannywillems
Merge pull request #1446 from o1-labs/dw/add-comment-constraint
94f2d22 
Constraint: add explanation on the + 1
@dannywillems
Add test checking that the zero dummy value is always present
4597308 
A virtual table with ID zero is added with a single zero row is added when no
such table exists
@dannywillems @volhovm
Update kimchi/src/tests/lookup.rs
f1b5691 
Co-authored-by: Misha Volkhov <[email protected]>
@mrmr1993
Merge pull request #1445 from o1-labs/dw/add-check-dummy-value-lookup
dfb2b67 
A check only dummy value looked up, without XOR table
@dannywillems
Fix 1362: add the dummy entry in the domain size count
8b97256
@dannywillems
Merge pull request #1457 from o1-labs/dw/fix-1362
ac8fc43 
Fix 1362: add the dummy entry in the domain size count
@dannywillems
Lookup: a table with ID 0 *must* contain a row with 0 only
c2d289f
@dannywillems
Merge pull request #1454 from o1-labs/dw/add-test-when-table-with-zer…
272504d 
…o-has-no-zero-entry

[develop] Lookup: a table with ID 0 *must* contain a row with 0 only
@dannywillems
Lookup: add more documentation regarding the dummy value
de0c54c
@dannywillems
Merge pull request #1455 from o1-labs/dw/doc-lookup-dummy-value-explain
73410f2 
Lookup: add more documentation regarding the dummy value
@dannywillems
Test: number of gates should be at least 2.
83148db
@dannywillems
Merge pull request #1510 from o1-labs/dw/fix-nb-gates-develop
be69da0 
Test: number of gates should be at least 2 [develop]
@mitschabaude
Merge branch 'develop' into o1js-main
719f856
@mitschabaude mitschabaude mentioned this pull request Dec 19, 2023
Closed
@mitschabaude
Copy link
Contributor Author

closing, see MinaProtocol/mina#14744 (comment)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@mitschabaude @mrmr1993 @dannywillems @volhovm @rbonichon