Merge develop #1550
Merged
Merge develop #1550
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some systems do not have bash in /bin, e.g., Nix-based setups.
Use `/usr/bin/env bash` instead of `/bin/bash` in shell scripts
Update o1js-bindings
Lookup tests assertions
…ndings Revert snarkyjs bindings
…essary compilation of mina directory
…prevent Jest from running tests in this directory
…t tests This change is temporary until 'snarkyjs' is removed from the mina repo.
…om jest tests This change was made because the 'snarkyjs' inside the mina repo has been removed, making the condition unnecessary.
…n and README-dev.md for better clarity and consistency
…directory structure, ensuring correct files are ignored by Prettier
…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 <gregor.mitscha-baude@gmx.at>
Co-authored-by: Gregor Mitscha-Baude <gregor.mitscha-baude@gmx.at>
Co-authored-by: Gregor Mitscha-Baude <gregor.mitscha-baude@gmx.at>
…lity and maintainability feat(package.json): add new build commands for bindings, update-bindings, and wasm chore(src/bindings): update subproject commit hash for latest changes
This reverts commit 78452c4.
[develop] Add mina as a git submodule for o1js
Submodule follow-up
Fix bindings build on develop
Merge o1js-main into develop
…kups-pr-chunk2 Resurrecting lookups PR: Add table ID collision assertions
Merge main to develop
…ment-shifting Remove commitment shifting (Part 1)
ymekuria
approved these changes
Apr 10, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
this finally brings o1js up to date with mina/develop!
bindings: o1-labs/o1js-bindings#266
mina: MinaProtocol/mina#15500
proof-systems: o1-labs/proof-systems#2066