Merge pull request #16569 from MinaProtocol/georgeee/no-staged-ledger-hash-in-rpc-no-debug-log

Do not compute hash for logging in RPC

Author: georgeee

src/lib/mina_intf/transition_frontier_components_intf.ml

@@ -226,7 +226,8 @@ module type Sync_handler_intf = sig
     -> Mina_ledger.Sync_ledger.Answer.t Or_error.t Deferred.t
 
   val get_staged_ledger_aux_and_pending_coinbases_at_hash :
-       frontier:transition_frontier
+       logger:Logger.t
+    -> frontier:transition_frontier
     -> State_hash.t
     -> ( Staged_ledger.Scan_state.t
        * Ledger_hash.t

src/lib/mina_networking/rpcs.ml

@@ -293,35 +293,19 @@ module Get_staged_ledger_aux_and_pending_coinbases_at_hash = struct
     let hash = Envelope.Incoming.data request in
     let result =
       let%bind.Option frontier = get_transition_frontier () in
-      Sync_handler.get_staged_ledger_aux_and_pending_coinbases_at_hash ~frontier
-        hash
+      Sync_handler.get_staged_ledger_aux_and_pending_coinbases_at_hash ~logger
+        ~frontier hash
     in
-    let%map () =
-      match result with
-      | Some
-          (scan_state, expected_merkle_root, pending_coinbases, _protocol_states)
-        ->
-          let staged_ledger_hash =
-            Staged_ledger_hash.of_aux_ledger_and_coinbase_hash
-              (Staged_ledger.Scan_state.hash scan_state)
-              expected_merkle_root pending_coinbases
-          in
-          [%log debug]
-            ~metadata:
-              [ ( "staged_ledger_hash"
-                , Staged_ledger_hash.to_yojson staged_ledger_hash )
-              ]
-            "sending scan state and pending coinbase" ;
-          Deferred.unit
-      | None ->
-          Trust_system.(
-            record_envelope_sender trust_system logger
-              (Envelope.Incoming.sender request)
-              Actions.
-                ( Requested_unknown_item
-                , Some (receipt_trust_action_message hash) ))
-    in
-    result
+    match result with
+    | None ->
+        Trust_system.(
+          record_envelope_sender trust_system logger
+            (Envelope.Incoming.sender request)
+            Actions.
+              (Requested_unknown_item, Some (receipt_trust_action_message hash)))
+        >>| const None
+    | _ ->
+        return result
 
   let rate_limit_budget = (4, `Per Time.Span.minute)
 

src/lib/sync_handler/sync_handler.ml

@@ -114,7 +114,8 @@ module Make (Inputs : Inputs_intf) :
         in
         Sync_ledger.Any_ledger.Responder.answer_query responder query
 
-  let get_staged_ledger_aux_and_pending_coinbases_at_hash ~frontier state_hash =
+  let get_staged_ledger_aux_and_pending_coinbases_at_hash ~logger ~frontier
+      state_hash =
     let open Option.Let_syntax in
     let protocol_states scan_state =
       Staged_ledger.Scan_state.required_state_hashes scan_state
@@ -138,14 +139,18 @@ module Make (Inputs : Inputs_intf) :
         Transition_frontier.Breadcrumb.staged_ledger breadcrumb
       in
       let scan_state = Staged_ledger.scan_state staged_ledger in
-      let merkle_root =
-        Breadcrumb.staged_ledger_hash breadcrumb
-        |> Staged_ledger_hash.ledger_hash
-      in
+      let staged_ledger_hash = Breadcrumb.staged_ledger_hash breadcrumb in
+      let merkle_root = Staged_ledger_hash.ledger_hash staged_ledger_hash in
       let%map scan_state_protocol_states = protocol_states scan_state in
       let pending_coinbase =
         Staged_ledger.pending_coinbase_collection staged_ledger
       in
+      [%log debug]
+        ~metadata:
+          [ ( "staged_ledger_hash"
+            , Staged_ledger_hash.to_yojson staged_ledger_hash )
+          ]
+        "sending scan state and pending coinbase" ;
       (scan_state, merkle_root, pending_coinbase, scan_state_protocol_states)
     with
     | Some res ->