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 berkeley into main #1405

Merged
merged 36 commits into from
Feb 2, 2024
Merged

Merge berkeley into main #1405

merged 36 commits into from
Feb 2, 2024

Conversation

mitschabaude
Copy link
Collaborator

@mitschabaude mitschabaude commented Feb 2, 2024

merging berkeley into main

note: currently the base branch is berkeley. this is not a mistake. we want to run CI against the berkeley Mina node. will change the base to main later

mina: MinaProtocol/mina#15038
bindings: o1-labs/o1js-bindings#239

Trivo25 and others added 30 commits October 30, 2023 15:29
add txnVersion to verification key permission
…prevent Jest from running tests in this directory
…build scripts

- Replace opam with Dune in the list of required tools to reflect changes in the build process
- Add a new section about build scripts, explaining the role of update-snarkyjs-bindings.sh
- Expand on the OCaml bindings section, detailing the use of Dune and Js_of_ocaml in the build process
- Add information about the WebAssembly bindings build process, including the output files
- Introduce a section about generated constant types, explaining how they are created and their role in ensuring protocol consistency

Co-authored-by: Gregor Mitscha-Baude <[email protected]>
…directory structure, ensuring correct files are ignored by Prettier
[berkeley] Add mina as a git submodule for o1js
@mitschabaude mitschabaude changed the base branch from berkeley to main February 2, 2024 20:55
@mitschabaude mitschabaude merged commit 2c55ad7 into main Feb 2, 2024
10 of 11 checks passed
@mitschabaude mitschabaude deleted the merge/berkeley-develop-main branch February 2, 2024 21:24
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.

3 participants