Merge branch 'compatible' into dkijania/remove_unused_oses

Author: dkijania

buildkite/src/Constants/ContainerImages.dhall

@@ -4,13 +4,13 @@
 -- NOTE: minaToolchainBookworm is also used for building Ubuntu Jammy packages in CI
 { toolchainBase = "codaprotocol/ci-toolchain-base:v3"
 , minaToolchainBookworm =
-    "gcr.io/o1labs-192920/mina-toolchain@sha256:15cf59fad0cc42bb3da010e1c994e027a77fa365e1db8eeffee0a7517e479e38"
+    "gcr.io/o1labs-192920/mina-toolchain@sha256:844efb68c890524938b3cac30b2f41a43cb0a24f1eed6d5a9b5912a72cf4ad71"
 , minaToolchainBullseye =
-    "gcr.io/o1labs-192920/mina-toolchain@sha256:224be4d785c8adbcf4961ba61a850eee6a46f1282bfd77314edbb08e242088e1"
+    "gcr.io/o1labs-192920/mina-toolchain@sha256:bbeaa957443357adf132951fe780600821d817c40cfbc6c71a04eba5e97df97f"
 , minaToolchainNoble =
-    "gcr.io/o1labs-192920/mina-toolchain@sha256:53605f649176a07cba5e8e924950c6f3af4c803b891c13c2f77ca014703ff669"
+    "gcr.io/o1labs-192920/mina-toolchain@sha256:9eb216d62a319ba9ef9670e7b753d76f24db8f86ad638992e5095839348b401a"
 , minaToolchain =
-    "gcr.io/o1labs-192920/mina-toolchain@sha256:224be4d785c8adbcf4961ba61a850eee6a46f1282bfd77314edbb08e242088e1"
+    "gcr.io/o1labs-192920/mina-toolchain@sha256:bbeaa957443357adf132951fe780600821d817c40cfbc6c71a04eba5e97df97f"
 , postgres = "postgres:12.4-alpine"
 , xrefcheck =
     "dkhamsing/awesome_bot@sha256:a8adaeb3b3bd5745304743e4d8a6d512127646e420544a6d22d9f58a07f35884"

opam.export

@@ -3,7 +3,15 @@ opam-version: "2.0"
 # - dockerfiles/1-build-deps
 # - opam.export
 # - scripts/update_opam_switch.sh
-compiler: ["ocaml-base-compiler.4.14.2"]
+compiler: [
+  "base-bigarray.base"
+  "base-threads.base"
+  "base-unix.base"
+  "ocaml.4.14.2"
+  "ocaml-base-compiler.4.14.2"
+  "ocaml-config.2"
+  "ocaml-options-vanilla.1"
+]
 roots: [
   "alcotest.1.1.0"
   "alcotest-async.1.1.0"
@@ -31,7 +39,7 @@ roots: [
   "ocamlgraph.1.8.8"
   "ocp-browser.1.3.3"
   "ocp-indent.1.7.0"
-  "odoc.2.1.0"
+  "odoc.2.1.1"
   "ppx_bitstring.4.1.0"
   "ppx_deriving.5.2.1"
   "ppx_deriving_yojson.3.6.1"
@@ -90,13 +98,14 @@ installed: [
   "conduit.4.0.0"
   "conduit-async.4.0.0"
   "conf-g++.1.0"
-  "conf-gmp.2"
+  "conf-gmp.5"
   "conf-libbz2.1"
   "conf-libffi.2.0.0"
+  "conf-libssl.4"
   "conf-m4.1"
-  "conf-perl.1"
-  "conf-pkg-config.1.1"
-  "conf-postgresql.1"
+  "conf-perl.2"
+  "conf-pkg-config.4"
+  "conf-postgresql.2"
   "conf-which.1"
   "conf-zlib.1"
   "core.v0.14.1"
@@ -106,7 +115,7 @@ installed: [
   "core_unix.v0.14.0"
   "cppo.1.6.7"
   "cppo_ocamlbuild.1.6.7"
-  "crunch.3.0.0"
+  "crunch.3.2.0"
   "csexp.1.5.1"
   "cstruct.6.0.1"
   "ctypes.0.17.1"
@@ -184,7 +193,7 @@ installed: [
   "ocp-index.1.3.3"
   "ocplib-endian.1.0"
   "octavius.1.2.2"
-  "odoc.2.1.0"
+  "odoc.2.1.1"
   "odoc-parser.1.0.0"
   "opam-core.2.1.2"
   "opam-file-format.2.1.4"

src/lib/exit_handlers/exit_handlers.ml

@@ -4,25 +4,8 @@ open Core_kernel
 open Async_kernel
 open Async_unix
 
-(* register a thunk to be called at exit; log registration and execution *)
-let register_handler ~logger ~description (f : unit -> unit) =
-  [%log info] "Registering exit handler: $description"
-    ~metadata:[ ("description", `String description) ] ;
-  let logging_thunk () =
-    [%log info] "Running exit handler: $description"
-      ~metadata:[ ("description", `String description) ] ;
-    (* if there's an exception, log it, allow other handlers to run *)
-    try f ()
-    with exn ->
-      [%log info] "When running exit handler: $description, got exception $exn"
-        ~metadata:
-          [ ("description", `String description)
-          ; ("exn", `String (Exn.to_string exn))
-          ]
-  in
-  Stdlib.at_exit logging_thunk
-
-(* register a Deferred.t thunk to be called at Async shutdown; log registration and execution *)
+(* register a Deferred.t thunk to be called at Async shutdown; log registration
+   and execution *)
 let register_async_shutdown_handler ~logger ~description
     (f : unit -> unit Deferred.t) =
   [%log debug] "Registering async shutdown handler: $description"

src/lib/network_pool/batcher.ml

@@ -425,9 +425,17 @@ module Snark_pool = struct
 
   type t = (proof_envelope, partial, unit) batcher [@@deriving sexp]
 
-  let verify (t : t) (p : proof_envelope) : bool Deferred.Or_error.t =
-    let open Deferred.Or_error.Let_syntax in
-    match%map verify t p with Ok () -> true | Error _ -> false
+  let verify (t : t) (p : proof_envelope) :
+      (unit, [> `Crash of Error.t | `Invalid of Verifier.invalid ]) result
+      Deferred.t =
+    let%map.Deferred verification_result = verify t p in
+    match verification_result with
+    | Ok (Ok ()) ->
+        Ok ()
+    | Ok (Error invalid) ->
+        Error (`Invalid invalid)
+    | Error e ->
+        Error (`Crash e)
 
   let create ~proof_cache_db ~logger verifier : t =
     create
@@ -474,13 +482,16 @@ module Snark_pool = struct
   end
 
   let verify' (t : t) ps =
-    let open Deferred.Or_error.Let_syntax in
+    let open Deferred.Let_syntax in
     let%map invalid =
-      Deferred.Or_error.List.filter_map ps ~f:(fun p ->
-          match%map verify t p with true -> None | false -> Some p )
+      Deferred.List.filter_map ps ~f:(fun p ->
+          match%map verify t p with
+          | Ok () ->
+              None
+          | Error e ->
+              Some (Work_key.of_proof_envelope p, e) )
     in
-    `Invalid
-      (Work_key.Set.of_list (List.map invalid ~f:Work_key.of_proof_envelope))
+    `Invalid (Work_key.Map.of_alist_exn invalid)
 
   let%test_module "With valid and invalid proofs" =
     ( module struct
@@ -539,9 +550,11 @@ module Snark_pool = struct
       let run_test proof_lists =
         let batcher = create ~proof_cache_db ~logger verifier in
         Deferred.List.iter proof_lists ~f:(fun (invalid_proofs, proof_list) ->
-            let%map r = verify' batcher proof_list in
-            let (`Invalid ps) = Or_error.ok_exn r in
-            assert (Work_key.Set.equal ps invalid_proofs) )
+            let%map (`Invalid pfs_and_reasons) = verify' batcher proof_list in
+            assert (
+              Work_key.Set.equal
+                (Work_key.Map.key_set pfs_and_reasons)
+                invalid_proofs ) )
 
       let gen ~(valid_count : [ `Any | `Count of int ])
           ~(invalid_count : [ `Any | `Count of int ]) =

src/lib/network_pool/batcher.mli

@@ -15,7 +15,11 @@ module Snark_pool : sig
     -> Verifier.t
     -> t
 
-  val verify : t -> proof_envelope -> bool Deferred.Or_error.t
+  val verify :
+       t
+    -> proof_envelope
+    -> (unit, [> `Crash of Error.t | `Invalid of Verifier.invalid ]) Result.t
+       Deferred.t
 end
 
 type ('initial, 'partially_validated, 'result) t

src/lib/network_pool/snark_pool.ml

@@ -446,14 +446,14 @@ struct
                 invalid "invalid key"
             | Some _ -> (
                 match%bind Batcher.Snark_pool.verify t.batcher proof_env with
-                | Ok true ->
+                | Ok () ->
                     Deferred.Result.return ()
-                | Ok false ->
+                | Error (`Invalid invalid) ->
+                    let invalid_err = Verifier.invalid_to_error invalid in
                     (* if this proof is in the set of invalid proofs*)
-                    let e = Error.of_string "Invalid proof" in
-                    let%bind () = log e in
-                    invalid "invalid proof"
-                | Error e ->
+                    let%map () = log invalid_err in
+                    Error (Invalid invalid_err)
+                | Error (`Crash e) ->
                     (* Verifier crashed or other errors at our end. Don't punish the peer*)
                     let%map () = log ~punish:false e in
                     Error (Failure e) )

src/lib/rocksdb/database.ml

@@ -1,4 +1,5 @@
 (* rocksdb.ml -- expose RocksDB operations for Mina *)
+open Core_kernel
 
 type t = { uuid : Uuid.Stable.V1.t; db : (Rocks.t[@sexp.opaque]) }
 [@@deriving sexp]

src/lib/rocksdb/database.mli

@@ -1,3 +1,5 @@
+open Core_kernel
+
 type uuid := Uuid.Stable.V1.t
 
 type key := Bigstring.t

src/lib/rocksdb/dune

@@ -2,7 +2,7 @@
  (name rocksdb)
  (public_name rocksdb)
  (library_flags -linkall)
- (flags -open Core_kernel)
+ (flags (:standard -warn-error +a))
  (libraries
   ;; opam libraries
   async

src/lib/rocksdb/intf.ml

@@ -1,3 +1,5 @@
+open Core_kernel
+
 module Key = struct
   module type S = sig
     type 'a t