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 o1js-main into develop #1365

Merged
merged 1,407 commits into from
Jan 11, 2024
Merged

Merge o1js-main into develop #1365

merged 1,407 commits into from
Jan 11, 2024

Conversation

mitschabaude
Copy link
Collaborator

@mitschabaude mitschabaude commented Jan 11, 2024

merges main into develop, including resolving the nasty conflicts that resulted from moving the kimchi-wasm bindings to the mina repo in 2 different versions on the two branches

bindings: o1-labs/o1js-bindings#234
mina: MinaProtocol/mina#14834
proof-systems: o1-labs/proof-systems#1686

mitschabaude and others added 30 commits December 5, 2023 12:14
Add verification key hash to the return type of ZkProgram compile
Foreign fields 5: Optimized multiplication of sums
@mitschabaude mitschabaude merged commit 5288a54 into develop Jan 11, 2024
13 checks passed
@mitschabaude mitschabaude deleted the merge/main-develop branch January 11, 2024 16:29
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.

9 participants