Merge branch 'berkeley' into alert/catchup-and-bootstrap-got-stuck

Author: ghost-not-in-the-shell

src/lib/mina_lib/mina_lib.ml

@@ -462,6 +462,13 @@ let create_sync_status_observer ~logger ~is_seed ~demo_mode ~net
   let open Mina_incremental.Status in
   let restart_delay = Time.Span.of_min 5. in
   let offline_shutdown_delay = Time.Span.of_min 25. in
+  let after_genesis =
+    let genesis_timestamp =
+      Genesis_constants.(
+        genesis_timestamp_of_string genesis_state_timestamp_string)
+    in
+    fun () -> Time.(( >= ) (now ())) genesis_timestamp
+  in
   let incremental_status =
     map4 online_status_incr transition_frontier_and_catchup_signal_incr
       first_connection_incr first_message_incr
@@ -471,29 +478,31 @@ let create_sync_status_observer ~logger ~is_seed ~demo_mode ~net
         else
           match online_status with
           | `Offline ->
-              ( match !next_helper_restart with
-              | None ->
-                  next_helper_restart :=
-                    Some
-                      (Async.Clock.Event.run_after restart_delay
-                         (fun () ->
-                           [%log info]
-                             "Offline for too long; restarting libp2p_helper" ;
-                           Mina_networking.restart_helper net ;
-                           next_helper_restart := None ;
-                           match !offline_shutdown with
-                           | None ->
-                               offline_shutdown :=
-                                 Some
-                                   (Async.Clock.Event.run_after
-                                      offline_shutdown_delay
-                                      (fun () -> raise Offline_shutdown)
-                                      () )
-                           | Some _ ->
-                               () )
-                         () )
-              | Some _ ->
-                  () ) ;
+              (* nothing to do if offline before genesis *)
+              ( if after_genesis () then
+                match !next_helper_restart with
+                | None ->
+                    next_helper_restart :=
+                      Some
+                        (Async.Clock.Event.run_after restart_delay
+                           (fun () ->
+                             [%log info]
+                               "Offline for too long; restarting libp2p_helper" ;
+                             Mina_networking.restart_helper net ;
+                             next_helper_restart := None ;
+                             match !offline_shutdown with
+                             | None ->
+                                 offline_shutdown :=
+                                   Some
+                                     (Async.Clock.Event.run_after
+                                        offline_shutdown_delay
+                                        (fun () -> raise Offline_shutdown)
+                                        () )
+                             | Some _ ->
+                                 () )
+                           () )
+                | Some _ ->
+                    () ) ;
               let is_empty = function `Empty -> true | _ -> false in
               if is_empty first_connection then (
                 [%str_log info] Connecting ;
@@ -572,10 +581,12 @@ let create_sync_status_observer ~logger ~is_seed ~demo_mode ~net
       | Some _ ->
           ()
       | None ->
-          bootstrap_timeout :=
-            Some
-              (Timeout.create () bootstrap_timeout_duration
-                 ~f:log_bootstrap_error_and_restart )
+          (* don't check bootstrap timeout before genesis *)
+          if after_genesis () then
+            bootstrap_timeout :=
+              Some
+                (Timeout.create () bootstrap_timeout_duration
+                   ~f:log_bootstrap_error_and_restart )
     in
     let stop_bootstrap_timeout () =
       match !bootstrap_timeout with
@@ -585,7 +596,7 @@ let create_sync_status_observer ~logger ~is_seed ~demo_mode ~net
       | None ->
           ()
     in
-    let handle_status_change sync_status =
+    let handle_status_change (sync_status : Sync_status.t) =
       ( match sync_status with
       | `Offline ->
           start_offline_timeout ()

src/lib/sync_status/sync_status.ml

@@ -1,13 +1,14 @@
 open Core_kernel
 
-(** Sync_status represent states interacting with peers in the coda protocol.
+(** Sync_status represent states interacting with peers in the Mina protocol.
     When the protocol is starting, the node should be in the CONNECT state
     trying to connect to a peer. Once it connects to a peer, the node should be
     in the LISTENING state waiting for peers to send a message to them. When
     the node receives a constant flow of messages, its state should be SYNCED.
     However, when the node is bootstrapping, its state is BOOTSTRAPPING. If it
-    hasn’t received messages for some time
-    (Mina_compile_config.inactivity_secs), then it is OFFLINE. *)
+    hasn’t received messages for some time (see [Mina_lib.offline_time]), then
+    it is OFFLINE.
+*)
 let to_string = function
   | `Connecting ->
       "Connecting"

src/lib/transaction_snark/test/fee_payer/dune

@@ -12,6 +12,8 @@
    yojson
    sexplib0
    integers
+   ppx_deriving_yojson.runtime
+   result
    ;; local libraries
    mina_base.import
    pickles
@@ -35,7 +37,7 @@
    transaction_snark_tests
    )
   (library_flags -linkall)
-  (inline_tests (flags -verbose -show-counts))
+  (inline_tests (flags -verbose -show-counts) (deps proof_cache.json))
   (preprocess
     (pps ppx_snarky ppx_version ppx_jane))
   (instrumentation (backend bisect_ppx)))

src/lib/transaction_snark/test/fee_payer/fee_payer.ml

@@ -9,6 +9,12 @@ open Mina_transaction
 
 let%test_module "Fee payer tests" =
   ( module struct
+    let proof_cache =
+      Result.ok_or_failwith @@ Pickles.Proof_cache.of_yojson
+      @@ Yojson.Safe.from_file "proof_cache.json"
+
+    let () = Transaction_snark.For_tests.set_proof_cache proof_cache
+
     let `VK vk, `Prover zkapp_prover = Lazy.force U.trivial_zkapp
 
     let memo = Signed_command_memo.create_from_string_exn "Fee payer tests"
@@ -316,4 +322,11 @@ let%test_module "Fee payer tests" =
                     List.is_empty
                       (Zkapp_command.account_updates_list zkapp_command) ) ;
                   U.check_zkapp_command_with_merges_exn ledger [ zkapp_command ] ) ) )
+
+    let () =
+      match Sys.getenv "PROOF_CACHE_OUT" with
+      | Some path ->
+          Yojson.Safe.to_file path @@ Pickles.Proof_cache.to_yojson proof_cache
+      | None ->
+          ()
   end )