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

Merge develop into o1js-main #15500

Merged
merged 1,106 commits into from
Apr 10, 2024
Merged

Merge develop into o1js-main #15500

merged 1,106 commits into from
Apr 10, 2024

Conversation

mitschabaude
Copy link
Contributor

@mitschabaude mitschabaude commented Apr 10, 2024

proof systems: o1-labs/proof-systems#2066

closes #15444

rbonichon and others added 30 commits February 26, 2024 15:53
Thanks to @emberian

Co-authored-by: emberian <ember.arlynx@o1labs.org>
[develop] Fix integration tests for fast seed startup
Simple refactoring/cleanup of `Rocksdb` wrapper
…o-develop

Merge berkeley to develop (Feb 27, 2024)
… into joaosreis/node-stats-simplified-develop
…lified-develop2

Fix merge conflicts for #15242 (no files changes)
Treat *.ml{i} in Linguist as OCaml
@mitschabaude
Copy link
Contributor Author

!ci-build-me

@mitschabaude
Copy link
Contributor Author

!ci-toolchain-me

@mitschabaude
Copy link
Contributor Author

!ci-build-me

@mitschabaude mitschabaude marked this pull request as ready for review April 10, 2024 13:55
@mitschabaude mitschabaude requested review from a team and aneesharaines as code owners April 10, 2024 13:55
@rbonichon
Copy link
Contributor

@mitschabaude Unit tests are failing atm. Do you understand why?

@mitschabaude
Copy link
Contributor Author

@rbonichon yes, last commit fixed it

@mitschabaude
Copy link
Contributor Author

!ci-build-me

@mrmr1993 mrmr1993 merged commit 898f759 into o1js-main Apr 10, 2024
64 checks passed
@mrmr1993 mrmr1993 deleted the merge/develop-main-2 branch April 10, 2024 23:59
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.