Merge branch 'main' into HEAD

o1-labs · Mar 7, 2024 · 10fc60a · 10fc60a
2 parents 87f3e9d + 76697e7
commit 10fc60a
Show file tree

Hide file tree

Showing 5 changed files with 85 additions and 85 deletions.
diff --git a/MINA_COMMIT b/MINA_COMMIT
@@ -1,2 +1,2 @@
 The mina commit used to generate the backends for node and web is
-52d3ac4ef265eac623916ca26ecebbe60aebd0bf
+af9dc4bec077fab04e0cb679e48535b8bc902e09
diff --git a/compiled/node_bindings/o1js_node.bc.cjs b/compiled/node_bindings/o1js_node.bc.cjs
@@ -11419,8 +11419,8 @@
        caml_string_of_jsbytes("generator")],
      commit_id=
       caml_string_of_jsbytes
-       ("[DIRTY]52d3ac4ef265eac623916ca26ecebbe60aebd0bf"),
-     commit_date=caml_string_of_jsbytes("2024-03-05T16:45:39+01:00"),
+       ("[DIRTY]af9dc4bec077fab04e0cb679e48535b8bc902e09"),
+     commit_date=caml_string_of_jsbytes("2024-03-06T09:12:57+01:00"),
      marlin_commit_id=
       caml_string_of_jsbytes("ea3f1c9e28f1ea3a066684149c7f924634143125"),
      pos$31=
@@ -432523,86 +432523,86 @@
                                       function main(param)
                                        {var
                                          public_input=param[1],
-                                         _gCa_=
+                                         _gCa_=include$143[41],
+                                         x=
+                                          caml_call3
+                                           (exists$8,
+                                            0,
+                                            [0,function(param){return caml_call1(include$143[1][16],3)}],
+                                            _gCa_),
+                                         g=
+                                          caml_call3
+                                           (exists$8,
+                                            0,
+                                            [0,function(param){return one$9}],
+                                            inner_curve_typ);
+                                        caml_call1
+                                         (to_field_checked
+                                           (_gwf_,
+                                            [0,
+                                             dump,
+                                             R1CS_constraint_system,
+                                             Bigint,
+                                             Constraint,
+                                             Typ$0,
+                                             Boolean$1,
+                                             include$143,
+                                             As_prover,
+                                             Proof_inputs,
+                                             include$144,
+                                             Bitstring_checked,
+                                             Handle$0,
+                                             unhandled$1,
+                                             Handler$0,
+                                             assert,
+                                             assert_all,
+                                             assert_r1cs,
+                                             assert_square,
+                                             as_prover$0,
+                                             next_auxiliary,
+                                             request_witness,
+                                             perform,
+                                             request,
+                                             exists$8,
+                                             exists_handle,
+                                             handle,
+                                             handle_as_prover,
+                                             if$0,
+                                             with_label,
+                                             make_checked,
+                                             constraint_system,
+                                             generate_witness,
+                                             constraint_system_manual,
+                                             generate_witness_manual,
+                                             as_prover_manual,
+                                             generate_public_input,
+                                             generate_witness_conv,
+                                             run_unchecked,
+                                             run_and_check,
+                                             run_and_check_exn,
+                                             Run_and_check_deferred,
+                                             check_exn,
+                                             check$4,
+                                             constraint_count,
+                                             set_constraint_logger,
+                                             clear_constraint_logger,
+                                             in_prover,
+                                             in_checked_computation,
+                                             constant$2,
+                                             run_checked,
+                                             Number$0,
+                                             Enumerable]),
+                                          [0,x]);
+                                        caml_call3(Ops[8],g,[0,x],5);
+                                        caml_call3(_edi_[5],_gwg_,g,[0,x]);
+                                        var
+                                         _gCb_=
                                           deferred_of_promise(caml_call1(rule.main,public_input));
                                         return caml_call2
                                                 (map$49,
-                                                 _gCa_,
+                                                 _gCb_,
                                                  function(js_result)
                                                   {var
-                                                    _gCb_=include$143[41],
-                                                    x=
-                                                     caml_call3
-                                                      (exists$8,
-                                                       0,
-                                                       [0,function(param){return caml_call1(include$143[1][16],3)}],
-                                                       _gCb_),
-                                                    g=
-                                                     caml_call3
-                                                      (exists$8,
-                                                       0,
-                                                       [0,function(param){return one$9}],
-                                                       inner_curve_typ);
-                                                   caml_call1
-                                                    (to_field_checked
-                                                      (_gwf_,
-                                                       [0,
-                                                        dump,
-                                                        R1CS_constraint_system,
-                                                        Bigint,
-                                                        Constraint,
-                                                        Typ$0,
-                                                        Boolean$1,
-                                                        include$143,
-                                                        As_prover,
-                                                        Proof_inputs,
-                                                        include$144,
-                                                        Bitstring_checked,
-                                                        Handle$0,
-                                                        unhandled$1,
-                                                        Handler$0,
-                                                        assert,
-                                                        assert_all,
-                                                        assert_r1cs,
-                                                        assert_square,
-                                                        as_prover$0,
-                                                        next_auxiliary,
-                                                        request_witness,
-                                                        perform,
-                                                        request,
-                                                        exists$8,
-                                                        exists_handle,
-                                                        handle,
-                                                        handle_as_prover,
-                                                        if$0,
-                                                        with_label,
-                                                        make_checked,
-                                                        constraint_system,
-                                                        generate_witness,
-                                                        constraint_system_manual,
-                                                        generate_witness_manual,
-                                                        as_prover_manual,
-                                                        generate_public_input,
-                                                        generate_witness_conv,
-                                                        run_unchecked,
-                                                        run_and_check,
-                                                        run_and_check_exn,
-                                                        Run_and_check_deferred,
-                                                        check_exn,
-                                                        check$4,
-                                                        constraint_count,
-                                                        set_constraint_logger,
-                                                        clear_constraint_logger,
-                                                        in_prover,
-                                                        in_checked_computation,
-                                                        constant$2,
-                                                        run_checked,
-                                                        Number$0,
-                                                        Enumerable]),
-                                                     [0,x]);
-                                                   caml_call3(Ops[8],g,[0,x],5);
-                                                   caml_call3(_edi_[5],_gwg_,g,[0,x]);
-                                                   var
                                                     public_output=js_result.publicOutput,
                                                     should_verifys_js=js_result.shouldVerify,
                                                     previous_proofs_should_verify=

diff --git a/compiled/node_bindings/o1js_node.bc.map b/compiled/node_bindings/o1js_node.bc.map
diff --git a/compiled/web_bindings/o1js_web.bc.js b/compiled/web_bindings/o1js_web.bc.js
diff --git a/ocaml/lib/pickles_bindings.ml b/ocaml/lib/pickles_bindings.ml
@@ -248,9 +248,6 @@ module Choices = struct
       (* this is called after `picklesRuleFromFunction()` and finishes the circuit *)
       let finish_circuit prevs self js_result :
           _ Pickles.Inductive_rule.main_return =
-        (* add dummy constraints *)
-        dummy_constraints () ;
-
         (* convert js rule output to pickles rule output *)
         let public_output = js_result##.publicOutput in
         let previous_proofs_should_verify =
@@ -294,6 +291,9 @@ module Choices = struct
         let prevs = prevs ~self in
 
         let main ({ public_input } : _ Pickles.Inductive_rule.main_input) =
+          (* add dummy constraints *)
+          dummy_constraints () ;
+          (* circuit from js *)
           rule##.main public_input
           |> Promise_js_helpers.of_js
           |> Promise.map ~f:(finish_circuit prevs self)