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 develop back to main #181

Merged
merged 196 commits into from
Oct 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
196 commits
Select commit Hold shift + click to select a range
effaa01
Merge pull request #33 from o1-labs/fix/wasm-build-develop
mitschabaude Jun 5, 2023
7df774b
Fixup bindings for hex serialization
mrmr1993 Jun 7, 2023
34b87c2
If recompiling the WASM changes it, something has gone very wrong
mrmr1993 Jun 7, 2023
ef552a3
Merge pull request #37 from o1-labs/feature/fixup-proof-system-serial…
mitschabaude Jun 8, 2023
e7b83fc
Merge branch 'main' into merge-main-develop
mitschabaude Jun 14, 2023
e709682
bindings
mitschabaude Jun 14, 2023
0d3ccff
Merge pull request #43 from o1-labs/merge-main-develop
mitschabaude Jun 14, 2023
1db852e
separate type checking from build script
mitschabaude Jun 16, 2023
4ac0036
fixup
mitschabaude Jun 20, 2023
0202843
move bindings location and add guarding d.ts
mitschabaude Jun 20, 2023
29ffb32
Merge pull request #50 from o1-labs/feature/revive-snarkyjs-ci-develop
mitschabaude Jun 22, 2023
985536a
Merge branch 'main' into dannywillems/main-into-develop
dannywillems Jun 28, 2023
6763ac5
Fixup to make npm run bindings happy
dannywillems Jun 28, 2023
50a5281
tweak how merge conflict is resolved
mitschabaude Jun 29, 2023
dc12b76
Merge pull request #61 from o1-labs/dannywillems/main-into-develop
dannywillems Jun 29, 2023
d4f9616
Run prettier on bindings.js
dannywillems Jul 10, 2023
e946979
wasm/{wasm_vector, plonk_proof?: move WasmVecVecF{p,q}
dannywillems Jun 29, 2023
f87442d
wasm/src/index: define wasm lookup table
dannywillems Jun 27, 2023
a44d15f
wasm/src/index: define wasm runtime table cfg
dannywillems Jun 30, 2023
4465014
Merge pull request #69 from o1-labs/dannywillems/run-prettier-on-bind…
dannywillems Jul 10, 2023
fdd67e4
Merge pull request #70 from o1-labs/dannywillems/extract-wasmvecvec
dannywillems Jul 10, 2023
e715478
Merge pull request #71 from o1-labs/dannywillems/define-wasm-lookup-t…
dannywillems Jul 10, 2023
4875ac6
Merge pull request #73 from o1-labs/dannywillems/define-wasm-runtime-…
dannywillems Jul 10, 2023
aea34b7
Merge branch 'main' into merge-main-develop
mitschabaude Jul 12, 2023
d3bef40
update bindings
mitschabaude Jul 12, 2023
b8342e7
Merge pull request #84 from o1-labs/merge-main-develop
mitschabaude Jul 12, 2023
af7aac3
wasm/src/plonk_proof.rs: define wasm runtime tables
dannywillems Jun 27, 2023
a257145
kimchi/js/bindings.js: add runtime_tables to proof_create
dannywillems Jun 29, 2023
c3613c0
bindings.js: remove duplicated definition
dannywillems Jul 10, 2023
6880ffe
kimchi/js/bindings.js: define js/wasm converters for lookup tables
dannywillems Jun 29, 2023
b0b6b24
bindings_js_test: add empty runtime table cfg arg
dannywillems Jun 30, 2023
e9c0cca
wasm/index: add runtime table cfgs arg
dannywillems Jul 10, 2023
79bdbd9
bindings.js: add runtime_table_cfgs arg
dannywillems Jul 10, 2023
4697a14
kimchi/js/bindings.js: define converters for runtime table cfg
dannywillems Jul 10, 2023
aaa0d26
Run npm run bindings
dannywillems Jul 13, 2023
bbcce27
Merge branch 'origin/develop' into feature/evaluate-selectors_develop
mrmr1993 Jul 20, 2023
1f709e4
Merge pull request #89 from o1-labs/feature/evaluate-selectors_develop
rbonichon Jul 21, 2023
4c7596e
Merge branch 'feature/evaluate-selectors_develop' into feature/evalua…
mrmr1993 Jul 23, 2023
1a75a69
Merge branch 'feature/evaluate-optional-gate-selectors_develop' into …
mrmr1993 Jul 23, 2023
b707522
Merge branch 'feature/stop-linearizing-optional-gate-selectors_develo…
mrmr1993 Jul 23, 2023
6ec1d8f
Update bindings
mrmr1993 Jul 23, 2023
7612233
Update bindings
mrmr1993 Jul 24, 2023
fcd962a
Merge branch 'feature/remove-special-casing-of-lookups_develop' into …
mrmr1993 Jul 24, 2023
62d0b8c
Merge pull request #90 from o1-labs/feature/evaluate-optional-gate-se…
mitschabaude Jul 27, 2023
2f4998f
deduplicate logic of parsing override_wrap_domain
mitschabaude Jul 26, 2023
7db5b54
Merge branch 'develop' into feature/stop-linearizing-optional-gate-se…
mitschabaude Jul 27, 2023
6e0ce7b
Merge pull request #92 from o1-labs/feature/stop-linearizing-optional…
mitschabaude Jul 27, 2023
0866575
Merge remote-tracking branch 'origin/develop' into feature/evaluate-l…
dannywillems Jul 27, 2023
6aba5bd
Merge pull request #95 from o1-labs/feature/evaluate-lookup-selectors…
mitschabaude Jul 27, 2023
7a6cceb
Merge branch 'develop' into dannywillems/add-runtime-table-cfg-to-pro…
dannywillems Jul 27, 2023
4cd4b95
Run prettier -w kimchi/js/bindings.js
dannywillems Jul 28, 2023
3a60367
CI: add basic workflow to run prettier
dannywillems Jul 28, 2023
2d1b7e6
Merge pull request #100 from o1-labs/dannywillems/add-gh-actions-for-…
dannywillems Aug 1, 2023
4583b4a
Run prettier -w kimchi/js/bindings.js
dannywillems Aug 1, 2023
a3fef7d
Import prettier config from snarkyjs
dannywillems Aug 1, 2023
88e7090
update worker spec
mitschabaude Jul 27, 2023
bf2a3f7
kimchi/js/bindings.js: fix runtime table cfg field access
dannywillems Jul 28, 2023
b255ba8
kimchi/js/bindings.js: change converters for runtime, lookup table an…
dannywillems Aug 1, 2023
927dc1d
kimchi/js/bindings.js: unify field access of caml record
dannywillems Aug 2, 2023
410a97b
Run npm run bindings
dannywillems Jul 27, 2023
d72b7d7
Merge pull request #104 from o1-labs/dannywillems/quickfix-prettier
dannywillems Aug 2, 2023
4f5aaee
Merge branch 'berkeley' into dannywillems/merge-berkeley-into-develop…
dannywillems Aug 2, 2023
96ba0ae
Remove lookup tables converters
dannywillems Aug 2, 2023
6070f67
Remove runtime table converters
dannywillems Aug 2, 2023
1d75029
Remove caml_is_empty_array_caml_array and caml_create_rust_empty_vector
dannywillems Aug 2, 2023
198b623
Regenerate bindings with npm run bindings
dannywillems Aug 2, 2023
b84776e
Merge pull request #79 from o1-labs/dannywillems/add-runtime-table-cf…
dannywillems Aug 3, 2023
218c4b4
Merge branch 'develop' into dannywillems/merge-berkeley-into-develop-…
dannywillems Aug 3, 2023
15df3a7
Run npm run bindings
dannywillems Aug 3, 2023
52f14c7
Add lookup tables in worker-spec + comments
dannywillems Jul 27, 2023
627aa1c
Add comments related to changes that must appear in worker-spec
dannywillems Jul 27, 2023
e398193
Reintroduce converters for lookup tables and add it in stubs
dannywillems Aug 3, 2023
9468708
binding_js_test.ml: add empty lookup tables
dannywillems Jul 11, 2023
dce1393
index: add param lookup tables
dannywillems Jul 11, 2023
013c585
bindings.js: add bytecode version of the caml stubs
dannywillems Aug 3, 2023
1f2dc63
Artefacts: run npm run bindings
dannywillems Aug 3, 2023
147b235
Merge pull request #109 from o1-labs/dannywillems/merge-berkeley-into…
dannywillems Aug 3, 2023
b624144
Merge branch 'develop' into dannywillems/add-lookup-table-to-prover-i…
dannywillems Aug 3, 2023
bc1e0db
Add runtime tables to worker-spec and add comments
dannywillems Jul 27, 2023
7d31d51
plonk_proof.rs: pass runtime tables to create proof
dannywillems Jul 13, 2023
d1ba42d
kimchi/js/bindings.js: add runtime_tables to proof_create
dannywillems Jun 29, 2023
02831a1
bindings_js_test: add runtime tables
dannywillems Jun 29, 2023
edb7069
snarky_bindings: pass empty runtime tables atm
dannywillems Jul 13, 2023
601ac27
Reintroduce JS converters for runtime tables
dannywillems Aug 3, 2023
bc142bd
Artefacts: generate using npm run bindings
dannywillems Aug 14, 2023
22b9fbb
Merge pull request #97 from o1-labs/dannywillems/add-lookup-table-to-…
dannywillems Aug 14, 2023
bf96c9f
Merge pull request #85 from o1-labs/dannywillems/runtime-table-to-prover
dannywillems Aug 14, 2023
631750b
Add js/**/*.js in prettier check
dannywillems Aug 1, 2023
47fd484
Run the following command:
dannywillems Aug 1, 2023
ab08479
CI: run prettier check on all JS files in kimchi/js
dannywillems Aug 1, 2023
b24ff40
Merge pull request #107 from o1-labs/dannywillems/gh-lint-add-more-ch…
dannywillems Aug 14, 2023
37bf643
Replace joo_global_object by globalThis
dannywillems Aug 1, 2023
7ee04a6
Regenerate bindings with npm run bindings
dannywillems Aug 15, 2023
9d26a8b
Merge pull request #106 from o1-labs/dannywillems/snarkyjs-joo-global…
dannywillems Aug 17, 2023
442c808
Merge branch 'berkeley' into perf/loading-time-berkeley
mitschabaude Aug 21, 2023
af61721
prettier
mitschabaude Aug 21, 2023
3bfa0b1
Introduce different Wasm equivalent types and add lookup verif index
dannywillems Aug 16, 2023
c52387b
bindings.js: add to/of_rust conversions of new structures
dannywillems Aug 16, 2023
a048142
Update artefacts after run npm run bindings
dannywillems Aug 21, 2023
c5c204c
Merge pull request #114 from o1-labs/dannywillems/lookup-verifier-index
dannywillems Aug 21, 2023
eaa2d3d
Expose lookup commitments
dannywillems Aug 15, 2023
636361e
bindings.js: removing unused parameter
dannywillems Aug 16, 2023
ad41180
bindings.js: remove TODO
dannywillems Aug 17, 2023
94fc3e0
bindings.js: use caml_opt_to_rust/of_rust
dannywillems Aug 21, 2023
b15734d
Update bindings after artefacts generation
dannywillems Aug 21, 2023
4dd9c39
Merge pull request #110 from o1-labs/dannywillems/expose-lookup-commi…
dannywillems Aug 21, 2023
2088f72
update bindings
mitschabaude Aug 22, 2023
d77e99a
Merge branch 'perf/loading-time-berkeley' into perf/loading-time-develop
mitschabaude Aug 22, 2023
429f829
address feedback - add documentation in comments
mitschabaude Aug 23, 2023
12f1b3c
Remove runtime tables parameter
dannywillems Aug 24, 2023
7b0090a
Run npm run bindings to generate bindings artefacts
dannywillems Aug 24, 2023
f4b4372
Removing runtime table parameters in binding_js_test.ml
dannywillems Aug 24, 2023
327e5e2
Merge branch 'berkeley' into perf/loading-time-develop
mitschabaude Aug 25, 2023
2905826
update bindings
mitschabaude Aug 25, 2023
c55cd62
Merge pull request #124 from o1-labs/perf/loading-time-develop
mitschabaude Aug 28, 2023
f0a2fc7
Merge branch 'develop' into dannywillems/lookup-gate-runtime
dannywillems Aug 29, 2023
776bf54
Update bindings_js_test with new optional commitments
dannywillems Aug 25, 2023
f409a07
Merge pull request #130 from o1-labs/feature/custom-gates-develop
dannywillems Aug 30, 2023
e4b99c3
Merge branch 'develop' into dannywillems/lookup-gate-runtime
dannywillems Aug 30, 2023
6f9f965
wasm: update verifier index
rbonichon Aug 24, 2023
982a24d
wasm/js: add support for new commitments in bindings
rbonichon Aug 24, 2023
b7aa098
Update compiled bindings
rbonichon Aug 31, 2023
c27ee6a
Update bindings for additional public input evaluation
mrmr1993 Aug 31, 2023
6896e84
Fixup bindings test
mrmr1993 Sep 1, 2023
4287458
Merge commit '776bf54f82739c5fd7a30b1cc1fa1bd3c0f04833' into merge-ba…
mrmr1993 Sep 5, 2023
ce4fa37
Js bindings: remove trailing ,0
rbonichon Sep 5, 2023
9bfd74d
Rerun npm run bindings
dannywillems Sep 5, 2023
dd558c8
Merge pull request #135 from o1-labs/dannywillems/fixup-merge-back-to…
rbonichon Sep 6, 2023
afaab91
Merge pull request #132 from o1-labs/merge-back-to-develop-2023-09-05
dannywillems Sep 6, 2023
4b09c41
Merge branch 'develop' into dannywillems/lookup-gate-runtime
dannywillems Sep 6, 2023
9465fcd
Merge pull request #126 from o1-labs/dannywillems/lookup-gate-runtime
dannywillems Sep 6, 2023
53f6ff6
Merge branch 'develop' into feature/fix-chunked-commitments
mrmr1993 Sep 11, 2023
443b053
Merge remote-tracking branch 'origin/develop' into feature/custom-gates
rbonichon Sep 11, 2023
7eb4ecf
Update generated bindings
rbonichon Sep 11, 2023
8ed0c38
update bindings
mitschabaude Sep 12, 2023
415e02a
Merge pull request #128 from o1-labs/feature/custom-gates
rbonichon Sep 12, 2023
c0a30a0
Update bindings for public_input_evals
mrmr1993 Sep 13, 2023
3e2ab9b
Merge branch 'develop' into feature/fix-chunked-commitments
mrmr1993 Sep 13, 2023
d40dd6c
Update bindings for chunked zero-knowledge
mrmr1993 Sep 13, 2023
633b16c
Merge pull request #131 from o1-labs/feature/fix-chunked-commitments
mitschabaude Sep 15, 2023
4621e22
Merge pull request #147 from o1-labs/feature/chunked-zero-knowledge
mitschabaude Sep 15, 2023
36085eb
Merge commit 'd40dd6c6a5517bbebd3c77abd54c2f9813724d7f' into merge-ba…
mrmr1993 Sep 19, 2023
e8190b2
Update artefacts with npm run bindings
dannywillems Sep 21, 2023
bc797ba
bindings.js: run prettier
dannywillems Sep 21, 2023
3e5ee83
Add missing OpeningProof type argument
dannywillems Sep 21, 2023
a5a0ee4
DlogVerifierIndex: reorganize struct fields
dannywillems Sep 21, 2023
4bd37c2
Remove old struct field
dannywillems Sep 21, 2023
3b3481a
srs parameter is not an option anymore
dannywillems Sep 21, 2023
efbc702
Import SRS as ISRS
dannywillems Sep 21, 2023
f4120c8
Partially reversed d40dd6c6a5517bbebd3c77abd54c2f9813724d7f
dannywillems Sep 21, 2023
d4bff28
DlogVerifierIndex: update srs field
dannywillems Sep 21, 2023
88a1f3e
Run cargo fmt
dannywillems Sep 21, 2023
3a749b4
Update rust version to nightly release close to 1.72
rbonichon Sep 27, 2023
d9619c7
Cargo update
rbonichon Sep 28, 2023
7cd9227
Run prettifier
dannywillems Oct 3, 2023
a42c629
Updating artefacts
dannywillems Oct 3, 2023
64b0fb5
Bump up artefacts after updating to wasm-pack 0.12.1
dannywillems Oct 3, 2023
dcb3c0a
Strictly require wasm-bindgen 0.2.84
dannywillems Oct 3, 2023
41e558d
Run cargo generate-lockfile
dannywillems Oct 3, 2023
9020c24
Regenerate bindings artefacts
dannywillems Oct 3, 2023
5b75c43
Adding comment regarding the version of wasm-bindgen
dannywillems Oct 3, 2023
ef8d407
upgrade wasm-bindgen to 0.2.85
dannywillems Oct 4, 2023
2dafa52
Run cargo generate-lockfile
dannywillems Oct 4, 2023
aa83e9a
Generate bindings artefacts with 0.2.85 wasm-bindgen
dannywillems Oct 4, 2023
2e70e5e
Use __wbg_ptr instead of ptr
dannywillems Oct 4, 2023
3960df8
Regenerate bindings after stopping using ptr attr
dannywillems Oct 4, 2023
7f398ca
web-backend.js: use __wbg_ptr instead of ptr
dannywillems Oct 4, 2023
3854f1f
Merge commit '36085eb385451495bf2aa5641be71e9a2fcf880a' into dannywil…
mrmr1993 Oct 4, 2023
a41ad64
Fixup compilation for WASM
mrmr1993 Oct 4, 2023
91547b1
Merge pull request #153 from o1-labs/dannywillems/bump-up-bindings-20…
dannywillems Oct 5, 2023
f2aaa35
Merge branch 'develop' into rb/update-rust-version
dannywillems Oct 5, 2023
7f89e70
Merge pull request #158 from o1-labs/rb/update-rust-version
dannywillems Oct 6, 2023
75fa598
refactor(web-backend.js): rename 'init' to '__wbg_init'
MartinMinkov Oct 5, 2023
66c89de
change .ptr in web backend and revert unnecessary change
mitschabaude Oct 9, 2023
1214ed5
Merge branch 'develop' into feat/fix-wasm-bindgen-init
mitschabaude Oct 9, 2023
a9586ad
update bindings with all the right branches
mitschabaude Oct 9, 2023
e3ed383
Merge pull request #175 from o1-labs/feat/fix-wasm-bindgen-init
mitschabaude Oct 9, 2023
a753318
Merge pull request #168 from o1-labs/dannywillems/attempt-to-bump-up-…
mitschabaude Oct 9, 2023
dc36432
Merge branch 'main' into merge-main-develop
mitschabaude Oct 9, 2023
24afe4e
update verification evals
mitschabaude Sep 29, 2023
6199c6a
add runtime table types
mitschabaude Sep 29, 2023
93738b5
runtime tables to rust
mitschabaude Sep 29, 2023
48704ad
lookup tbls & runtime table cfgs to rust
mitschabaude Sep 29, 2023
6cbc658
fixup
mitschabaude Sep 30, 2023
a94ef3d
fixup
mitschabaude Sep 30, 2023
2541f7d
fix build script
mitschabaude Oct 9, 2023
f7255e3
updated wasm types
mitschabaude Oct 9, 2023
371f59f
fix __wbg_ptr
mitschabaude Oct 9, 2023
6287c02
update proof type
mitschabaude Oct 9, 2023
014c1f2
update bindings
mitschabaude Oct 9, 2023
d8de117
run prettier
mitschabaude Oct 9, 2023
b14af91
revert useless changes
mitschabaude Oct 10, 2023
fb683bf
remove TODO comments
mitschabaude Oct 10, 2023
6598170
custom lint yaml
mitschabaude Oct 10, 2023
256e160
Merge pull request #176 from o1-labs/merge-main-develop
mitschabaude Oct 11, 2023
046712c
update bindings
mitschabaude Oct 11, 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
14 changes: 5 additions & 9 deletions .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,8 @@ jobs:
- name: Checkout
uses: actions/checkout@v3

- name: Print prettier version
uses: creyD/prettier_action@v4.3
with:
prettier_options: -v

- name: Prettify code
uses: creyD/prettier_action@v4.3
with:
prettier_options: -c kimchi/js/bindings.js
- name: Run prettier
run: |
npm init -y
npm i prettier
npx prettier -c kimchi/js/**/*.js js/**/*.js
2 changes: 1 addition & 1 deletion MINA_COMMIT
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
The mina commit used to generate the backends for node and web is
43436cf9806bfcaddab5b1101cbb785ef4329ba8
ea4b28b5792d8bcfc5a5b37f30189645470fada4
Loading