Skip to content

Commit 698b18b

Browse files
committed
fix tbd
1 parent 459c862 commit 698b18b

File tree

6 files changed

+59
-21
lines changed

6 files changed

+59
-21
lines changed

src/lib/crypto/kimchi_bindings/js/bindings/verifier-index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ var caml_opt_to_rust = function (caml_optional_value, to_rust) {
2424
// Provides: caml_pasta_fp_plonk_verifier_index_create
2525
// Requires: plonk_wasm, tsRustConversion
2626
var caml_pasta_fp_plonk_verifier_index_create = function (x) {
27-
console.log("caml_pasta_fp_plonk_verifier_index_create")
27+
console.log("caml_pasta_fp_plonk_verifier_index_create", x)
2828
var vk = plonk_wasm.caml_pasta_fp_plonk_verifier_index_create(x);
2929
return tsRustConversion.fp.verifierIndexFromRust(vk);
3030
};

src/lib/crypto/kimchi_bindings/js/dune

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@
2121
native/native-overrides/prover-index.js
2222
native/native-overrides/srs.js
2323
native/native-overrides/util.js
24-
native/native-overrides/proof.js))
24+
native/native-overrides/proof.js
25+
native/native-overrides/verifier-index.js))
2526
(instrumentation
2627
(backend bisect_ppx))
2728
(preprocess

src/lib/crypto/kimchi_bindings/js/native/native-overrides/prover-index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ var caml_pasta_fp_plonk_index_write = function (append, t, path) {
198198
};
199199

200200
// Provides: caml_pasta_fq_plonk_index_create
201-
// Requires: plonk_wasm, free_on_finalize, tsRustConversion
201+
// Requires: plonk_wasm, free_on_finalize, tsRustConversionNative
202202
var caml_pasta_fq_plonk_index_create = function (
203203
gates,
204204
public_inputs,

src/lib/crypto/kimchi_bindings/js/native/native-overrides/srs.js

Lines changed: 35 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
/* global plonk_wasm, caml_jsstring_of_string,
2-
tsBindings, tsRustConversion
2+
tsBindings, tsRustConversionNative
33
*/
44

55
// Provides: tsSrs
66
// Requires: tsBindings, plonk_wasm
7-
var tsSrs = tsBindings.srs(plonk_wasm);
7+
var tsSrs = tsBindings.srsNative(plonk_wasm);
88

99
// srs
1010

1111
// Provides: caml_fp_srs_create
1212
// Requires: tsSrs
13-
var caml_fp_srs_create = tsSrs.fp.create;
13+
var caml_fp_srs_create = function (log_size) {
14+
console.log("native caml_fp_srs_create");
15+
return tsSrs.fp.create(log_size);
16+
}
1417

1518
// Provides: caml_fp_srs_write
1619
// Requires: plonk_wasm, caml_jsstring_of_string
@@ -43,17 +46,25 @@ var caml_fp_srs_read = function (offset, path) {
4346

4447
// Provides: caml_fp_srs_lagrange_commitments_whole_domain
4548
// Requires: tsSrs
46-
var caml_fp_srs_lagrange_commitments_whole_domain =
47-
tsSrs.fp.lagrangeCommitmentsWholeDomain;
49+
var caml_fp_srs_lagrange_commitments_whole_domain = function (srs, domain_size) {
50+
console.log("native caml_fp_srs_lagrange_commitments_whole_domain");
51+
return tsSrs.fp.lagrangeCommitmentsWholeDomain(srs, domain_size);
52+
}
4853

4954
// Provides: caml_fq_srs_lagrange_commitments_whole_domain
5055
// Requires: tsSrs
5156
var caml_fq_srs_lagrange_commitments_whole_domain =
52-
tsSrs.fq.lagrangeCommitmentsWholeDomain;
57+
function (srs, domain_size) {
58+
console.log("native caml_fq_srs_lagrange_commitments_whole_domain");
59+
return tsSrs.fq.lagrangeCommitmentsWholeDomain(srs, domain_size);
60+
}
5361

5462
// Provides: caml_fp_srs_lagrange_commitment
5563
// Requires: tsSrs
56-
var caml_fp_srs_lagrange_commitment = tsSrs.fp.lagrangeCommitment;
64+
var caml_fp_srs_lagrange_commitment = function (srs, i) {
65+
console.log("native caml_fp_srs_lagrange_commitment");
66+
return tsSrs.fp.lagrangeCommitment(srs, i);
67+
}
5768

5869
// Provides: caml_fp_srs_commit_evaluations
5970
// Requires: plonk_wasm, tsRustConversionNative
@@ -114,11 +125,17 @@ var caml_fp_srs_h = function (t) {
114125

115126
// Provides: caml_fp_srs_add_lagrange_basis
116127
// Requires: tsSrs
117-
var caml_fp_srs_add_lagrange_basis = tsSrs.fp.addLagrangeBasis;
128+
var caml_fp_srs_add_lagrange_basis = function (srs, domain_size) {
129+
console.log("native caml_fp_srs_add_lagrange_basis");
130+
return tsSrs.fp.addLagrangeBasis(srs, domain_size);
131+
};
118132

119133
// Provides: caml_fq_srs_create
120134
// Requires: tsSrs
121-
var caml_fq_srs_create = tsSrs.fq.create;
135+
var caml_fq_srs_create = function (log_size) {
136+
console.log("native caml_fq_srs_create");
137+
return tsSrs.fq.create(log_size);
138+
}
122139

123140
// Provides: caml_fq_srs_write
124141
// Requires: plonk_wasm, caml_jsstring_of_string
@@ -151,7 +168,10 @@ var caml_fq_srs_read = function (offset, path) {
151168

152169
// Provides: caml_fq_srs_lagrange_commitment
153170
// Requires: tsSrs
154-
var caml_fq_srs_lagrange_commitment = tsSrs.fq.lagrangeCommitment;
171+
var caml_fq_srs_lagrange_commitment = function (srs, i) {
172+
console.log("native caml_fq_srs_lagrange_commitment");
173+
return tsSrs.fq.lagrangeCommitment(srs, i);
174+
}
155175

156176
// Provides: caml_fq_srs_commit_evaluations
157177
// Requires: plonk_wasm, tsRustConversionNative
@@ -181,7 +201,7 @@ var caml_fq_srs_b_poly_commitment = function (srs, chals) {
181201
};
182202

183203
// Provides: caml_fq_srs_batch_accumulator_check
184-
// Requires: plonk_wasm, tsRustConversion
204+
// Requires: plonk_wasm, tsRustConversionNative
185205
var caml_fq_srs_batch_accumulator_check = function (srs, comms, chals) {
186206
console.log("native caml_fq_srs_batch_accumulator_check");
187207
var rust_comms = tsRustConversionNative.fq.pointsToRust(comms);
@@ -216,4 +236,7 @@ var caml_fq_srs_h = function (t) {
216236

217237
// Provides: caml_fq_srs_add_lagrange_basis
218238
// Requires: tsSrs
219-
var caml_fq_srs_add_lagrange_basis = tsSrs.fq.addLagrangeBasis;
239+
var caml_fq_srs_add_lagrange_basis = function (srs, domain_size) {
240+
console.log("native caml_fq_srs_add_lagrange_basis");
241+
return tsSrs.fq.addLagrangeBasis(srs, domain_size);
242+
};

src/lib/crypto/kimchi_bindings/js/native/native-overrides/verifier-index.js

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,20 @@
44
// Provides: caml_pasta_fq_plonk_verifier_index_shifts
55
// Requires: plonk_wasm, tsRustConversionNative
66
var caml_pasta_fq_plonk_verifier_index_shifts = function (log2_size) {
7-
return tsRustConversionNative.fq.shiftsFromRust(
8-
plonk_wasm.caml_pasta_fq_plonk_verifier_index_shifts(log2_size)
9-
);
7+
console.log("log2_size", log2_size);
8+
try {
9+
var shifts = plonk_wasm.caml_pasta_fq_plonk_verifier_index_shifts(log2_size);
10+
console.log("shifts", shifts);
11+
console.log("shiftsFromRust", tsRustConversionNative.fq.shiftsFromRust(
12+
shifts
13+
))
14+
return tsRustConversionNative.fq.shiftsFromRust(
15+
shifts
16+
);
17+
} catch (e) {
18+
console.error("Error calling caml_pasta_fq_plonk_verifier_index_shifts:", e);
19+
throw e;
20+
}
1021
};
1122

1223
// Provides: caml_pasta_fp_plonk_verifier_index_shifts

src/lib/crypto/kimchi_bindings/js/node_js/node_backend.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ var plonk_wasm = (function() {
6161
"WasmFpSrs",
6262
"caml_fp_srs_create",
6363
"caml_fp_srs_create_parallel",
64-
"caml_fq_srs_get",
65-
"caml_fq_srs_set",
64+
"caml_fp_srs_get",
65+
"caml_fp_srs_set",
6666
"caml_fp_srs_write",
6767
"caml_fp_srs_read",
6868
"caml_fp_srs_add_lagrange_basis",
@@ -93,7 +93,10 @@ var plonk_wasm = (function() {
9393
];
9494

9595
overrides.forEach(function (override) {
96-
wasm[override] = native[override]
96+
wasm[override] = function(x1, x2, x3, x4, x5, x6, x7, x8, x9, x10) {
97+
console.log("calling native override:", override);
98+
return native[override](x1, x2, x3, x4, x5, x6, x7, x8, x9, x10);
99+
}
97100
})
98101
wasm.native = true;
99102
} catch (e) {

0 commit comments

Comments
 (0)