Merge branch 'develop' into fix-flakiness-insufficient-replace-fee

Author: ghost-not-in-the-shell

src/lib/crypto/kimchi_bindings/stubs/pasta_bindings.ml

@@ -61,6 +61,8 @@ module Fp = struct
 
   external print : t -> unit = "caml_pasta_fp_print"
 
+  external print_rust : t -> unit = "caml_pasta_fp_print_rust"
+
   external copy : t -> t -> unit = "caml_pasta_fp_copy"
 
   external mut_add : t -> t -> unit = "caml_pasta_fp_mut_add"
@@ -128,6 +130,8 @@ module Fq = struct
 
   external print : t -> unit = "caml_pasta_fq_print"
 
+  external print_rust : t -> unit = "caml_pasta_fq_print_rust"
+
   external copy : t -> t -> unit = "caml_pasta_fq_copy"
 
   external mut_add : t -> t -> unit = "caml_pasta_fq_mut_add"

src/lib/crypto/kimchi_bindings/stubs/src/arkworks/pasta_fp.rs

@@ -207,6 +207,12 @@ pub fn caml_pasta_fp_print(x: ocaml::Pointer<CamlFp>) {
     );
 }
 
+#[ocaml_gen::func]
+#[ocaml::func]
+pub fn caml_pasta_fp_print_rust(x: ocaml::Pointer<CamlFp>) {
+    println!("{}", x.as_ref().0);
+}
+
 #[ocaml_gen::func]
 #[ocaml::func]
 pub fn caml_pasta_fp_copy(mut x: ocaml::Pointer<CamlFp>, y: ocaml::Pointer<CamlFp>) {

src/lib/crypto/kimchi_bindings/stubs/src/arkworks/pasta_fq.rs

@@ -208,6 +208,12 @@ pub fn caml_pasta_fq_print(x: ocaml::Pointer<CamlFq>) {
     );
 }
 
+#[ocaml_gen::func]
+#[ocaml::func]
+pub fn caml_pasta_fq_print_rust(x: ocaml::Pointer<CamlFq>) {
+    println!("{}", x.as_ref().0);
+}
+
 #[ocaml_gen::func]
 #[ocaml::func]
 pub fn caml_pasta_fq_copy(mut x: ocaml::Pointer<CamlFq>, y: ocaml::Pointer<CamlFq>) {

src/lib/crypto/kimchi_bindings/stubs/src/main.rs

@@ -177,6 +177,7 @@ fn generate_pasta_bindings(mut w: impl std::io::Write, env: &mut Env) {
         decl_func!(w, env, caml_pasta_fp_to_string => "to_string");
         decl_func!(w, env, caml_pasta_fp_of_string => "of_string");
         decl_func!(w, env, caml_pasta_fp_print => "print");
+        decl_func!(w, env, caml_pasta_fp_print_rust => "print_rust");
         decl_func!(w, env, caml_pasta_fp_copy => "copy");
         decl_func!(w, env, caml_pasta_fp_mut_add => "mut_add");
         decl_func!(w, env, caml_pasta_fp_mut_sub => "mut_sub");
@@ -213,6 +214,7 @@ fn generate_pasta_bindings(mut w: impl std::io::Write, env: &mut Env) {
         decl_func!(w, env, caml_pasta_fq_to_string => "to_string");
         decl_func!(w, env, caml_pasta_fq_of_string => "of_string");
         decl_func!(w, env, caml_pasta_fq_print => "print");
+        decl_func!(w, env, caml_pasta_fq_print_rust => "print_rust");
         decl_func!(w, env, caml_pasta_fq_copy => "copy");
         decl_func!(w, env, caml_pasta_fq_mut_add => "mut_add");
         decl_func!(w, env, caml_pasta_fq_mut_sub => "mut_sub");

src/lib/pickles/test/optional_custom_gates/pickles_test_optional_custom_gates.ml

@@ -281,6 +281,31 @@ let main_fixed_lookup_tables_multiple_tables_multiple_lookups () =
            ; w6 = exists Field.typ ~compute:(fun () -> v3)
            } ) )
 
+let main_runtime_table_cfg () =
+  let table_ids = Array.init 5 ~f:(fun i -> Int32.of_int_exn i) in
+  let size = 10 in
+  let first_column = Array.init size ~f:Field.Constant.of_int in
+  Array.iter table_ids ~f:(fun table_id ->
+      add_plonk_constraint (AddRuntimeTableCfg { id = table_id; first_column }) ) ;
+  let num_lookup = 20 in
+  let rec make_lookup i n =
+    if i = n then ()
+    else
+      let table_id = 3 in
+      add_plonk_constraint
+        (Lookup
+           { w0 = fresh_int table_id
+           ; w1 = fresh_int 1
+           ; w2 = fresh_int 1
+           ; w3 = fresh_int 2
+           ; w4 = fresh_int 2
+           ; w5 = fresh_int 3
+           ; w6 = fresh_int 3
+           } ) ;
+      make_lookup (i + 1) n
+  in
+  make_lookup 0 num_lookup
+
 let add_tests, get_tests =
   let tests = ref [] in
   ( (fun name testcases -> tests := (name, testcases) :: !tests)
@@ -306,6 +331,7 @@ let main_body ~(feature_flags : _ Plonk_types.Features.t) () =
   if feature_flags.range_check1 then main_range_check1 () ;
   if feature_flags.foreign_field_add then main_foreign_field_add () ;
   if feature_flags.foreign_field_mul then main_foreign_field_mul () ;
+  if feature_flags.runtime_tables then main_runtime_table_cfg () ;
   if feature_flags.lookup then (
     main_fixed_lookup_tables () ;
     main_fixed_lookup_tables_multiple_tables_multiple_lookups () )
@@ -390,6 +416,9 @@ let () =
       , Plonk_types.Features.{ none_bool with foreign_field_mul = true } )
     ; ( "Fixed lookup tables"
       , Plonk_types.Features.{ none_bool with lookup = true } )
+    ; ( "Runtime lookup tables"
+      , Plonk_types.Features.
+          { none_bool with lookup = true; runtime_tables = true } )
     ]
   in
   List.iter ~f:register_feature_test configurations ;

src/lib/pickles/wrap_verifier.ml

@@ -911,6 +911,33 @@ struct
             absorb sponge PC (Boolean.true_, x_hat) ) ;
         let w_comm = messages.w_comm in
         Vector.iter ~f:absorb_g w_comm ;
+        let runtime_comm =
+          match messages.lookup with
+          | Nothing
+          | Maybe (_, { runtime = Nothing; _ })
+          | Just { runtime = Nothing; _ } ->
+              Pickles_types.Opt.Nothing
+          | Maybe (b_lookup, { runtime = Maybe (b_runtime, runtime); _ }) ->
+              let b = Boolean.( &&& ) b_lookup b_runtime in
+              Pickles_types.Opt.Maybe (b, runtime)
+          | Maybe (b, { runtime = Just runtime; _ })
+          | Just { runtime = Maybe (b, runtime); _ } ->
+              Pickles_types.Opt.Maybe (b, runtime)
+          | Just { runtime = Just runtime; _ } ->
+              Pickles_types.Opt.Just runtime
+        in
+        let absorb_runtime_tables () =
+          match runtime_comm with
+          | Nothing ->
+              ()
+          | Maybe (b, runtime) ->
+              let z = Array.map runtime ~f:(fun z -> (b, z)) in
+              absorb sponge Without_degree_bound z
+          | Just runtime ->
+              let z = Array.map runtime ~f:(fun z -> (Boolean.true_, z)) in
+              absorb sponge Without_degree_bound z
+        in
+        absorb_runtime_tables () ;
         let joint_combiner =
           let compute_joint_combiner (l : _ Messages.Lookup.In_circuit.t) =
             let absorb_sorted_1 sponge =
@@ -1244,7 +1271,7 @@ struct
           let _len_4, len_4_add = Nat.N6.add Plonk_types.Lookup_sorted.n in
           let len_5, len_5_add =
             (* NB: Using explicit 11 because we can't get add on len_4 *)
-            Nat.N11.add Nat.N7.n
+            Nat.N11.add Nat.N8.n
           in
           let len_6, len_6_add = Nat.N45.add len_5 in
           let num_commitments_without_degree_bound = len_6 in
@@ -1294,6 +1321,7 @@ struct
                            [ Pickles_types.Opt.map messages.lookup ~f:(fun l ->
                                  l.aggreg )
                            ; lookup_table_comm
+                           ; runtime_comm
                            ; m.runtime_tables_selector
                            ; m.lookup_selector_xor
                            ; m.lookup_selector_lookup