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
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
1eed287
wasm: clippy-suggested fixes
rbonichon May 2, 2023
5bb793e
Update bindings.js with missing functions
rbonichon May 8, 2023
228728e
move Group.add to JS
Trivo25 Jun 6, 2023
a81b701
remove ocaml-equals
Trivo25 Jun 6, 2023
855fa18
reuse gates instead of importing new ones
Trivo25 Jun 8, 2023
9b2e9f7
bindings
Trivo25 Jun 11, 2023
728e095
Merge branch 'main' into refactor/group-add
Trivo25 Jun 11, 2023
c7cc23b
bindings
Trivo25 Jun 11, 2023
485cc8c
Merge branch 'main' into refactor/group-add
Trivo25 Jun 14, 2023
a5f6a1f
undo bindings change
Trivo25 Jun 14, 2023
adaddf6
build bindings
Trivo25 Jun 14, 2023
505bf1a
separate type checking from build script
mitschabaude Jun 16, 2023
b26979e
Merge pull request #35 from o1-labs/refactor/group-add
Trivo25 Jun 20, 2023
47d9b3b
add in_prover_block and move some stuff to Snarky.run
mitschabaude Jun 21, 2023
fe3b5e6
update bindings
mitschabaude Jun 22, 2023
f61e056
Merge pull request #52 from o1-labs/feature/better-readvar-error
mitschabaude Jun 22, 2023
db653f7
fixup
mitschabaude Jun 20, 2023
4a1dbc2
move bindings location and add guarding d.ts
mitschabaude Jun 20, 2023
e32513d
Merge branch 'main' into feature/revive-snarkyjs-ci
mitschabaude Jun 22, 2023
5837695
Merge pull request #48 from o1-labs/feature/revive-snarkyjs-ci
mitschabaude Jun 22, 2023
e31c79a
Merge branch 'main' into rb/wasm-clippify
mitschabaude Jun 26, 2023
10c750b
Merge branch 'rb/wasm-clippify' into rb/js-bindings-missing-functions
mitschabaude Jun 26, 2023
40fe626
fix invalid code in bindings.js
mitschabaude Jun 26, 2023
caaa090
update bindings
mitschabaude Jun 26, 2023
86679fd
fix js linting
mitschabaude Jun 26, 2023
14d97c3
Merge pull request #13 from o1-labs/rb/wasm-clippify
mitschabaude Jun 26, 2023
1c1b2e8
Merge pull request #14 from o1-labs/rb/js-bindings-missing-functions
mitschabaude Jun 26, 2023
6b069e4
Merge pull request #56 from o1-labs/fix/bindings-js
mitschabaude Jun 26, 2023
51a3d3d
don't use window
mitschabaude Jun 27, 2023
f1bba7d
Merge pull request #57 from o1-labs/fix/unsupported-window
mitschabaude Jun 27, 2023
9f74213
split out pickles bindings and clean up imports
mitschabaude Jun 27, 2023
31bf5aa
split out local ledger
mitschabaude Jun 27, 2023
a391eb1
cleanup
mitschabaude Jun 27, 2023
6999410
split out testing stuff
mitschabaude Jun 27, 2023
bb7d195
clean up imports
mitschabaude Jun 27, 2023
81f7643
simplify consistency_test structure
mitschabaude Jun 27, 2023
a206acf
remove unchecked hash impls
mitschabaude Jun 27, 2023
f982447
revive unchecked hash to group in consistency test
mitschabaude Jun 27, 2023
69f9f5c
update bindings
mitschabaude Jun 27, 2023
706229a
add last lines
mitschabaude Jun 27, 2023
1500f29
split out snarky bindings
mitschabaude Jun 28, 2023
2e44806
remove one layer of module nesting
mitschabaude Jun 28, 2023
102172f
newline
mitschabaude Jun 28, 2023
f52126e
Merge pull request #58 from o1-labs/feature/split-ocaml-bindings
mitschabaude Jun 28, 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
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
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
f42d671fc1591fbdeb833d754518b9709c7215f4
b6271a95af7309c456328059da77e0fd29f1a0bc
16 changes: 8 additions & 8 deletions compiled/node_bindings/plonk_wasm.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -7624,6 +7624,14 @@ module.exports.__wbindgen_is_object = function(arg0) {
return ret;
};

module.exports.__wbg_randomFillSync_6894564c2c334c42 = function() { return handleError(function (arg0, arg1, arg2) {
getObject(arg0).randomFillSync(getArrayU8FromWasm0(arg1, arg2));
}, arguments) };

module.exports.__wbg_getRandomValues_805f1c3d65988a5a = function() { return handleError(function (arg0, arg1) {
getObject(arg0).getRandomValues(getObject(arg1));
}, arguments) };

module.exports.__wbg_crypto_e1d53a1d73fb10b8 = function(arg0) {
const ret = getObject(arg0).crypto;
return addHeapObject(ret);
Expand Down Expand Up @@ -7664,14 +7672,6 @@ module.exports.__wbindgen_is_function = function(arg0) {
return ret;
};

module.exports.__wbg_getRandomValues_805f1c3d65988a5a = function() { return handleError(function (arg0, arg1) {
getObject(arg0).getRandomValues(getObject(arg1));
}, arguments) };

module.exports.__wbg_randomFillSync_6894564c2c334c42 = function() { return handleError(function (arg0, arg1, arg2) {
getObject(arg0).randomFillSync(getArrayU8FromWasm0(arg1, arg2));
}, arguments) };

module.exports.__wbg_get_27fe3dac1c4d0224 = function(arg0, arg1) {
const ret = getObject(arg0)[arg1 >>> 0];
return addHeapObject(ret);
Expand Down
Binary file modified compiled/node_bindings/plonk_wasm_bg.wasm
Binary file not shown.
8 changes: 4 additions & 4 deletions compiled/node_bindings/plonk_wasm_bg.wasm.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@ export function __wbg_get_wasmgvesta_y(a: number, b: number): void;
export function __wbg_set_wasmgvesta_y(a: number, b: number, c: number): void;
export function caml_pallas_affine_one(): number;
export function caml_vesta_affine_one(): number;
export function __wbg_wasmgvesta_free(a: number): void;
export function __wbg_get_wasmgvesta_infinity(a: number): number;
export function __wbg_set_wasmgvesta_infinity(a: number, b: number): void;
export function caml_pallas_one(): number;
export function caml_pallas_add(a: number, b: number): number;
export function caml_pallas_sub(a: number, b: number): number;
Expand Down Expand Up @@ -46,6 +43,9 @@ export function caml_vesta_of_affine_coordinates(a: number, b: number, c: number
export function caml_pasta_fp_poseidon_block_cipher(a: number, b: number, c: number): void;
export function caml_pasta_fq_poseidon_block_cipher(a: number, b: number, c: number): void;
export function caml_vesta_affine_deep_copy(a: number): number;
export function __wbg_wasmgvesta_free(a: number): void;
export function __wbg_get_wasmgvesta_infinity(a: number): number;
export function __wbg_set_wasmgvesta_infinity(a: number, b: number): void;
export function __wbg_wasmgatewires_free(a: number): void;
export function __wbg_get_wasmgatewires_0(a: number): number;
export function __wbg_set_wasmgatewires_0(a: number, b: number): void;
Expand Down Expand Up @@ -406,6 +406,7 @@ export function __wbg_wasmfqrandomoracles_free(a: number): void;
export function wasmfqopeningproof_sg(a: number): number;
export function wasmfqproverproof_set_prev_challenges_scalars(a: number, b: number): void;
export function __wbg_get_wasmfqoracles_o(a: number): number;
export function fq_oracles_dummy(): number;
export function __wbg_wasmfqoracles_free(a: number): void;
export function wasmfqplonkverificationevals_set_generic_comm(a: number, b: number): void;
export function wasmfqprovercommitments_set_z_comm(a: number, b: number): void;
Expand All @@ -424,7 +425,6 @@ export function wasmfqplonkverificationevals_generic_comm(a: number): number;
export function wasmfqprovercommitments_z_comm(a: number): number;
export function wasmfqopeningproof_set_sg(a: number, b: number): void;
export function __wbg_set_wasmfqoracles_o(a: number, b: number): void;
export function fq_oracles_dummy(): number;
export function __wbg_wasmfqopeningproof_free(a: number): void;
export function wasmfqplonkverificationevals_set_psm_comm(a: number, b: number): void;
export function wasmfqprovercommitments_set_t_comm(a: number, b: number): void;
Expand Down
Loading