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 into develop #61

Merged
merged 47 commits into from
Jun 29, 2023
Merged

Conversation

dannywillems
Copy link
Member

Requesting @mitschabaude to review.
Commands to reproduce:

cd mina
git checkout develop
cd src/lib/snarkyjs
# # should be already the case.
git checkout develop
# # fetch latest main changes
git checkout main
git pull origin main
git checkout develop
# # create a new branch to merge the main changes into develop
git checkout -b dannywillems/main-into-develop
# For bindings
cd src/bindings
# # fetch latest main changes
git checkout main
git pull origin main
git checkout develop
# # create a new branch to merge the main changes into develop
git checkout -b dannywillems/main-into-develop
git merge main
# Fix conflicts not related to compiled
# (**) see below
npm run bindings
git merge --continue
git add ocaml/lib/consistency_test.ml
git commit -m "Fixup to make npm run bindings happy"

** I added 6763ac5. source_pk is not a field of Payment anymore.

rbonichon and others added 30 commits May 8, 2023 13:04
- group *_example_* custom gates test functions together at the end
- provide simple int64_of_int32 missing conversion function
- add caml_fq_srs_add_lagrange_basis, whichs an updating function (no return value)
Improve error when reading variable in provable code
Fix invalid code in bindings.js
Fix: window not supported in workers
Copy link
Member

@mitschabaude mitschabaude left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @dannywillems!

@dannywillems dannywillems merged commit dc12b76 into develop Jun 29, 2023
@dannywillems dannywillems deleted the dannywillems/main-into-develop branch June 29, 2023 15:50
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.

None yet

5 participants