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.

Sign up for GitHub

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

Jump to bottom

Merge o1js-main one last time #15594

Merged
merged 124 commits into from
May 17, 2024
Merged

Merge o1js-main one last time #15594

merged 124 commits into from
May 17, 2024

Conversation

mitschabaude
Copy link
Member

@mitschabaude mitschabaude commented May 1, 2024 •
edited

After merging this, the plan is that o1js uses develop

mitschabaude and others added 30 commits December 20, 2023 14:48
@mitschabaude
Merge pull request #14743 from MinaProtocol/merge-rampup-main
00e3aa4 
Merge rampup -> main
@MartinMinkov
refactor(kimchi_bindings): replace params() with static_params()
94ae65b
@mrmr1993
Merge pull request #14921 from MinaProtocol/perf/poseidon-hash-bottle…
f4e67fe 
…neck

Modify the generation of kimchi parameters to use static function for Poseidon hashing
@mitschabaude
Merge branch 'berkeley' into merge/berkeley-develop-main
9600d09
@mitschabaude
fixup earlier merge
b1b443f
@MartinMinkov
Revert "Remove ppx_dhall_type [develop]"
ecfbc6f 
This reverts commit 434dbb1.
@mitschabaude
Revert "Revert "Remove ppx_dhall_type [develop]""
23c4479 
This reverts commit ecfbc6f.
@mitschabaude
fixup
bde314f
@mitschabaude
dump blockchain snark verification key
45e149b
@shimkiv
Nix fix attempt.
627f844
@mitschabaude
attempt to fix nix ci script
6354f2f
@mitschabaude
Merge pull request #15038 from MinaProtocol/merge/berkeley-develop-main
a5c7f66 
Merge berkeley into main
@mrmr1993
Update snarky to expose callback-oriented helpers, use in pickles step
1a2c7ed
@mrmr1993
WIP Pickles nearly compiling
8918371
@mrmr1993
Pickles compiles!
d975e61
@mrmr1993
Fixup default Pickles.compile to use non-async inductive rules
38a7848
@mrmr1993
Add Pickles.compile_async
08165df
@mrmr1993
Fixup compilation errors (nearly)
95d6757
@MartinMinkov
feat(transaction_hash.mli): add hash_zkapp_command function to suppor…
b9ed54f 
…t hashing of Zkapp_command objects
@mitschabaude
make test_fix_domains compile
0c59d1f
@mitschabaude
adapt tx snark intf
7463898
@mitschabaude
adapt some tests
1d7f4c2
@mitschabaude
adapt some methods which already return a Deferred
5a99295
@mitschabaude
fixup zkapp examples build
8ea7cfd
@mitschabaude
missing dune file change
40c10bb
@MartinMinkov
Merge pull request #15137 from MinaProtocol/feat/add-zkapp-command-hash
72744e2 
Expose `hash_zkapp_command`
@mitschabaude
progress: fix_domains runs circuits in order
8e75713
@mitschabaude
work towards running circuits for key generation in sequence
d3e025b
@mitschabaude
run stuff in sequence, but for some reason it doesn't work yet
eebd9a8
@mitschabaude
fix locking
114a1d9
@mitschabaude
Copy link
Member Author

!ci-build-me

@mrmr1993
Copy link
Member

mrmr1993 commented May 2, 2024

!ci-build-me

@mrmr1993
Copy link
Member

mrmr1993 commented May 2, 2024

!ci-nightly-me

@mrmr1993
Copy link
Member

mrmr1993 commented May 2, 2024

!ci-nightly-me

@mrmr1993
Copy link
Member

mrmr1993 commented May 2, 2024

Nightly run: https://buildkite.com/o-1-labs-2/mina-end-to-end-nightlies/builds/1937

@mrmr1993
Copy link
Member

mrmr1993 commented May 2, 2024

!ci-build-me

@mitschabaude
Copy link
Member Author

!ci-nightly-me

@mitschabaude
Copy link
Member Author

!ci-nightly-me

@mitschabaude
Copy link
Member Author

!ci-build-me

@mitschabaude
Copy link
Member Author

!ci-build-me

@mitschabaude
Copy link
Member Author

!ci-nightly-me

@mitschabaude
Copy link
Member Author

!ci-build-me

@mitschabaude
Copy link
Member Author

!ci-build-me

@mitschabaude
Copy link
Member Author

!ci-nightly-me

@mitschabaude mitschabaude merged commit 02accb5 into develop May 17, 2024
63 checks passed
@mitschabaude mitschabaude deleted the merge/o1js-main-develop branch May 17, 2024 15:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mrmr1993 mrmr1993 mrmr1993 approved these changes

@dannywillems dannywillems dannywillems approved these changes

@MartinMinkov MartinMinkov MartinMinkov approved these changes

@dkijania dkijania dkijania approved these changes

@nholland94 nholland94 Awaiting requested review from nholland94 nholland94 is a code owner

@bkase bkase Awaiting requested review from bkase bkase is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@mitschabaude @mrmr1993 @dannywillems @MartinMinkov @dkijania @shimkiv @SanabriaRusso @emberian