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

Merge main and adapt TS bindings to develop #14312

Merged
merged 38 commits into from
Oct 11, 2023
Merged

Merge main and adapt TS bindings to develop #14312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
a3c2cdd
simplify pickles dummy changes
mitschabaude Aug 18, 2023
823abda
revert changes that cause vk change
mitschabaude Aug 18, 2023
d7d2349
clean up
mitschabaude Aug 18, 2023
99d1a70
oops
mitschabaude Aug 18, 2023
d093b48
Revert "faster top level integer to field conversions"
mitschabaude Aug 22, 2023
752a1fa
address feedback - don't override ! operator in dummy.ml
mitschabaude Aug 22, 2023
c036def
address feedback - don't override ! operator in proof.ml
mitschabaude Aug 22, 2023
a54b279
fix dune src/lib compilation
mitschabaude Aug 23, 2023
357f45d
fixup rebase
mitschabaude Aug 23, 2023
e0a232d
snarkyjs
mitschabaude Aug 23, 2023
d7c6f1d
Merge remote-tracking branch 'origin/berkeley' into fix/merge-berk-ra…
deepthiskumar Aug 23, 2023
b45a0f3
submodules
mitschabaude Aug 24, 2023
91c659b
remove unnecessary field parsing
mitschabaude Aug 24, 2023
b9c1eb8
submodules
mitschabaude Aug 28, 2023
861e367
Merge pull request #13925 from MinaProtocol/snarkyjs/loading-time-main
mitschabaude Aug 28, 2023
3e0778c
Merge remote-tracking branch 'origin/berkeley' into fix/merge-berk-ra…
deepthiskumar Aug 31, 2023
67da96f
Merge pull request #13933 from MinaProtocol/fix/merge-berk-rampup-08-26
deepthiskumar Sep 2, 2023
9810247
snarkyjs
mitschabaude Sep 6, 2023
264bcac
berkeley testnet ledger timestamp bump
stevenplatt Sep 6, 2023
0155bb8
berkeley ledger timestamp bump
stevenplatt Sep 13, 2023
2ea6db2
Merge pull request #14116 from MinaProtocol/rampup-ledger-bump-sept13
stevenplatt Sep 13, 2023
14047c5
Empty commit to sign Berkeley 2.0.0rampup4
dkijania Sep 13, 2023
366a360
Merge branch 'rampup' into snarkyjs-main
Trivo25 Sep 14, 2023
56d2db5
Revert "Merge branch 'rampup' into snarkyjs-main"
Trivo25 Sep 14, 2023
004da9a
Merge branch 'snarkyjs-main' into perf/bigint-backend
mitschabaude Sep 18, 2023
f4fe927
Revert "Revert "Merge branch 'rampup' into snarkyjs-main""
mitschabaude Sep 21, 2023
a98206f
Merge branch 'rampup' into o1js-fix-merge-rampup
mitschabaude Sep 22, 2023
37d78d9
Revert "Revert "Merge branch 'rampup' into snarkyjs-main""
mitschabaude Sep 22, 2023
e154647
Merge branch 'o1js-fix-merge-rampup' into o1js-fix-merge-rampup-2
mitschabaude Sep 22, 2023
2892c43
Merge pull request #14183 from MinaProtocol/o1js-fix-merge-rampup-2
mitschabaude Sep 22, 2023
7a975d3
fixup bad merge
mitschabaude Sep 28, 2023
891d2ff
Merge branch 'snarkyjs-main' into perf/bigint-backend
mitschabaude Oct 3, 2023
f8e2d74
adapt to handler.run returning option
mitschabaude Oct 3, 2023
c774984
submodules
mitschabaude Oct 3, 2023
43436cf
fix build for o1js lucy tests
mitschabaude Oct 3, 2023
ee90a3e
submodules
mitschabaude Oct 3, 2023
5a4bd4a
Merge pull request #13966 from MinaProtocol/perf/bigint-backend
mitschabaude Oct 3, 2023
e2b96ab
Merge branch 'snarkyjs-main' into merge-main-develop
mitschabaude Oct 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions buildkite/scripts/build-js-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ make snarkyjs

echo "Prepare SnarkyJS test module and pack into archive"
npm pack src/lib/snarkyjs
mv snarkyjs-*.tgz snarkyjs.tgz
mv o1js-*.tgz o1js.tgz
cd src/lib/snarkyjs/tests/integration
npm i ../../../../../snarkyjs.tgz
npm i ../../../../../o1js.tgz
cp $(which node) ./node
cd ../../../../..
tar -chzf snarkyjs_test.tar.gz src/lib/snarkyjs/tests/integration
Expand Down
Loading