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 main and adapt TS bindings to develop #14312

Merged
merged 38 commits into from
Oct 11, 2023
Merged

Conversation

mitschabaude
Copy link
Contributor

@mitschabaude mitschabaude commented Oct 9, 2023

Related: o1js and bindings

mitschabaude and others added 30 commits August 23, 2023 08:16
This reverts commit 366a360, reversing
changes made to 861e367.
@mitschabaude
Copy link
Contributor Author

!ci-build-me

@psteckler
Copy link
Member

@mitschabaude Do we need the changes to the berkeley genesis ledger in this PR?

@mitschabaude
Copy link
Contributor Author

@mitschabaude Do we need the changes to the berkeley genesis ledger in this PR?

@psteckler I guess we don't need them, but they come naturally from the series of merges (rampup -> snarkyjs-main -> develop) which reflect our development process and it's awkward to exclude a change from merging a PR

@mitschabaude mitschabaude merged commit 1e021fc into develop Oct 11, 2023
@mitschabaude mitschabaude deleted the merge-main-develop branch October 11, 2023 12:31
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.

8 participants