Merge branch 'develop' into sai/issue-11704

MinaProtocol · May 1, 2024 · 051ab46 · 051ab46
2 parents c8afef4 + 7666466
commit 051ab46
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 8 deletions.
diff --git a/src/lib/node_error_service/node_error_service.ml b/src/lib/node_error_service/node_error_service.ml
@@ -22,7 +22,6 @@ type node_error_report =
   ; peer_id : string
   ; ip_address : string
   ; public_key : Public_key.Compressed.t option
-  ; git_branch : string
   ; commit_hash : string
   ; chain_id : string
   ; contact_info : string option
@@ -117,7 +116,6 @@ let with_deps ~logger ~f =
 
 let generate_report ~node_state ~contact_info error =
   let commit_hash = Mina_version.commit_id in
-  let git_branch = Mina_version.branch in
   let timestamp = Rfc3339_time.get_rfc3339_time () in
   let id = Uuid_unix.create () |> Uuid.to_string in
   let ({ peer_id
@@ -138,7 +136,6 @@ let generate_report ~node_state ~contact_info error =
     ; peer_id
     ; ip_address
     ; public_key
-    ; git_branch
     ; commit_hash
     ; chain_id
     ; contact_info

diff --git a/src/lib/node_status_service/node_status_service.ml b/src/lib/node_status_service/node_status_service.ml
@@ -71,7 +71,6 @@ type node_status_data =
   ; libp2p_output_bandwidth : float
   ; libp2p_cpu_usage : float
   ; commit_hash : string
-  ; git_branch : string
   ; chain_id : string
   ; peer_id : string
   ; ip_address : string
@@ -91,7 +90,6 @@ module Simplified = struct
   type t =
     { max_observed_block_height : int
     ; commit_hash : string
-    ; git_branch : string
     ; chain_id : string
     ; peer_id : string
     ; peer_count : int
@@ -259,7 +257,6 @@ let start ~logger ~node_status_url ~transition_frontier ~sync_status ~chain_id
             ; libp2p_output_bandwidth
             ; libp2p_cpu_usage
             ; commit_hash = Mina_version.commit_id
-            ; git_branch = Mina_version.branch
             ; chain_id
             ; peer_id =
                 (Node_addrs_and_ports.to_peer_exn addrs_and_ports).peer_id
@@ -433,7 +430,6 @@ let start_simplified ~logger ~node_status_url ~chain_id ~network
        { Simplified.max_observed_block_height =
            !Mina_metrics.Transition_frontier.max_blocklength_observed
        ; commit_hash = Mina_version.commit_id
-       ; git_branch = Mina_version.branch
        ; chain_id
        ; peer_id = (Node_addrs_and_ports.to_peer_exn addrs_and_ports).peer_id
        ; peer_count = List.length peers

diff --git a/src/lib/pickles/wrap_main.ml b/src/lib/pickles/wrap_main.ml
@@ -264,7 +264,7 @@ let wrap_main
                   let ty =
                     Plonk_types.All_evals.typ
                       (module Impl)
-                      ~num_chunks:1 feature_flags
+                      ~num_chunks:1 Plonk_types.Features.Full.none
                   in
                   Vector.typ ty Max_proofs_verified.n
                 in