From 7c5f88faa6fa11a59126aa0c1bcf607d6bd34930 Mon Sep 17 00:00:00 2001 From: Gregor Date: Tue, 21 Nov 2023 15:47:54 +0100 Subject: [PATCH 1/4] Revert "Use correct smaller domain size when ffmul and another range check lookup is used" This reverts commit f60f1f4ec709f4f1f1f57ddb3ce75844f5d9f88c. --- src/lib/crypto/proof-systems | 2 +- src/lib/pickles/fix_domains.ml | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/lib/crypto/proof-systems b/src/lib/crypto/proof-systems index b3690493bc5..dab2bde4329 160000 --- a/src/lib/crypto/proof-systems +++ b/src/lib/crypto/proof-systems @@ -1 +1 @@ -Subproject commit b3690493bc50476bb81a25af183bda52a278144f +Subproject commit dab2bde432991496baf14b214b1f982be82201a4 diff --git a/src/lib/pickles/fix_domains.ml b/src/lib/pickles/fix_domains.ml index 32348ea46e9..7f79905ce0c 100644 --- a/src/lib/pickles/fix_domains.ml +++ b/src/lib/pickles/fix_domains.ml @@ -42,11 +42,14 @@ let domains (type field gates) ?feature_flags feature_flags in let combined_lookup_table_length = - let range_check_table_used = - range_check0 || range_check1 || foreign_field_mul || rot + let range_check_table_used = range_check0 || range_check1 || rot in + let range_check_table_used_again = + (* FIXME: This is a hack around a bug in proof-systems. *) + foreign_field_mul in let xor_table_used = xor in (if range_check_table_used then Int.pow 2 12 else 0) + + (if range_check_table_used_again then Int.pow 2 12 else 0) + (if xor_table_used then Int.pow 2 8 else 0) + ( if lookup then ( Kimchi_backend_common.Plonk_constraint_system From 1e49baad686b03665d403de866104b8fb49765d0 Mon Sep 17 00:00:00 2001 From: Gregor Date: Tue, 21 Nov 2023 16:13:45 +0100 Subject: [PATCH 2/4] submodules --- src/lib/crypto/proof-systems | 2 +- src/lib/snarkyjs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/crypto/proof-systems b/src/lib/crypto/proof-systems index dab2bde4329..ea3f1c9e28f 160000 --- a/src/lib/crypto/proof-systems +++ b/src/lib/crypto/proof-systems @@ -1 +1 @@ -Subproject commit dab2bde432991496baf14b214b1f982be82201a4 +Subproject commit ea3f1c9e28f1ea3a066684149c7f924634143125 diff --git a/src/lib/snarkyjs b/src/lib/snarkyjs index 29144ff3e5c..ccb55c77f80 160000 --- a/src/lib/snarkyjs +++ b/src/lib/snarkyjs @@ -1 +1 @@ -Subproject commit 29144ff3e5cd9ac8f5137da7083706ca2d0e209e +Subproject commit ccb55c77f80ed8c2fb8563ef699cc48884e10b74 From d91c77dbe6c6e9213426ce6027b1e4d1cd4cad06 Mon Sep 17 00:00:00 2001 From: Gregor Date: Tue, 21 Nov 2023 18:56:34 +0100 Subject: [PATCH 3/4] o1js --- src/lib/snarkyjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/snarkyjs b/src/lib/snarkyjs index ccb55c77f80..005ae5dbce0 160000 --- a/src/lib/snarkyjs +++ b/src/lib/snarkyjs @@ -1 +1 @@ -Subproject commit ccb55c77f80ed8c2fb8563ef699cc48884e10b74 +Subproject commit 005ae5dbce07f3e2dcae337386b26986439c83db From 92ff5251a9be596ef0ec06d34067290cdaf2bda9 Mon Sep 17 00:00:00 2001 From: Gregor Date: Tue, 21 Nov 2023 19:25:41 +0100 Subject: [PATCH 4/4] o1js --- src/lib/snarkyjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/snarkyjs b/src/lib/snarkyjs index 005ae5dbce0..2fefe982a5e 160000 --- a/src/lib/snarkyjs +++ b/src/lib/snarkyjs @@ -1 +1 @@ -Subproject commit 005ae5dbce07f3e2dcae337386b26986439c83db +Subproject commit 2fefe982a5e22f537b278eaca550d5032cdad607