Merge branch 'berkeley' into rfc/hard-fork-data-migration

MinaProtocol · Oct 10, 2023 · cc23c2d · cc23c2d
2 parents df636c5 + 19de438
commit cc23c2d
Show file tree

Hide file tree

Showing 6 changed files with 77 additions and 5 deletions.
diff --git a/graphql_schema.json b/graphql_schema.json
@@ -12280,6 +12280,54 @@
               },
               "isDeprecated": false,
               "deprecationReason": null
+            },
+            {
+              "name": "snarkPoolDiffReceived",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": { "kind": "SCALAR", "name": "Int", "ofType": null }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "snarkPoolDiffBroadcasted",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": { "kind": "SCALAR", "name": "Int", "ofType": null }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "pendingSnarkWork",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": { "kind": "SCALAR", "name": "Int", "ofType": null }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "snarkPoolSize",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": { "kind": "SCALAR", "name": "Int", "ofType": null }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
             }
           ],
           "inputFields": null,

diff --git a/src/app/cli/src/cli_entrypoint/mina_cli_entrypoint.ml b/src/app/cli/src/cli_entrypoint/mina_cli_entrypoint.ml
@@ -539,7 +539,7 @@ let setup_daemon logger =
           ~transport:
             (Logger_file_system.dumb_logrotate ~directory:conf_dir
                ~log_filename:"mina-oversized-logs.log"
-               ~max_size:logrotate_max_size ~num_rotate:file_log_rotations ) ;
+               ~max_size:logrotate_max_size ~num_rotate:20 ) ;
         (* Consumer for `[%log internal]` logging used for internal tracing *)
         Itn_logger.set_message_postprocessor
           Internal_tracing.For_itn_logger.post_process_message ;

diff --git a/src/lib/daemon_rpcs/types.ml b/src/lib/daemon_rpcs/types.ml
@@ -191,6 +191,10 @@ module Status = struct
       ; transaction_pool_diff_broadcasted : int
       ; transactions_added_to_pool : int
       ; transaction_pool_size : int
+      ; snark_pool_diff_received : int
+      ; snark_pool_diff_broadcasted : int
+      ; pending_snark_work : int
+      ; snark_pool_size : int
       }
     [@@deriving to_yojson, bin_io_unversioned, fields]
   end
@@ -423,9 +427,19 @@ module Status = struct
         let transaction_pool_size =
           fmt_field "transaction_pool_size" string_of_int
         in
+        let snark_pool_diff_received =
+          fmt_field "snark_pool_diff_received" string_of_int
+        in
+        let snark_pool_diff_broadcasted =
+          fmt_field "snark_pool_diff_broadcasted" string_of_int
+        in
+        let pending_snark_work = fmt_field "pending_snark_work" string_of_int in
+        let snark_pool_size = fmt_field "snark_pool_size" string_of_int in
         Metrics.Fields.to_list ~block_production_delay
           ~transaction_pool_diff_received ~transaction_pool_diff_broadcasted
           ~transactions_added_to_pool ~transaction_pool_size
+          ~snark_pool_diff_received ~snark_pool_diff_broadcasted
+          ~pending_snark_work ~snark_pool_size
         |> List.concat
         |> List.map ~f:(fun (s, v) -> ("\t" ^ s, v))
         |> digest_entries ~title:""

diff --git a/src/lib/mina_commands/mina_commands.ml b/src/lib/mina_commands/mina_commands.ml
@@ -466,6 +466,13 @@ let get_status ~flag t =
       ; transactions_added_to_pool =
           Float.to_int
           @@ Counter.value Transaction_pool.transactions_added_to_pool
+      ; snark_pool_diff_received =
+          Float.to_int @@ Gauge.value Network.snark_pool_diff_received
+      ; snark_pool_diff_broadcasted =
+          Float.to_int @@ Gauge.value Network.snark_pool_diff_broadcasted
+      ; snark_pool_size = Float.to_int @@ Gauge.value Snark_work.snark_pool_size
+      ; pending_snark_work =
+          Float.to_int @@ Gauge.value Snark_work.pending_snark_work
       }
   in
   { Daemon_rpcs.Types.Status.num_accounts

diff --git a/src/lib/mina_graphql/types.ml b/src/lib/mina_graphql/types.ml
@@ -299,7 +299,10 @@ module DaemonStatus = struct
              ~block_production_delay:nn_int_list
              ~transaction_pool_diff_received:nn_int
              ~transaction_pool_diff_broadcasted:nn_int
-             ~transactions_added_to_pool:nn_int ~transaction_pool_size:nn_int )
+             ~transactions_added_to_pool:nn_int ~transaction_pool_size:nn_int
+             ~snark_pool_diff_received:nn_int
+             ~snark_pool_diff_broadcasted:nn_int ~pending_snark_work:nn_int
+             ~snark_pool_size:nn_int )
 
   let t : (_, Daemon_rpcs.Types.Status.t option) typ =
     obj "DaemonStatus" ~fields:(fun _ ->

diff --git a/src/lib/mina_ledger/sync_ledger.ml b/src/lib/mina_ledger/sync_ledger.ml
@@ -26,7 +26,7 @@ module Mask = Syncable_ledger.Make (struct
   module Hash = Hash
   module Root_hash = Root_hash
 
-  let account_subtree_height = 3
+  let account_subtree_height = 6
 end)
 
 module Any_ledger = Syncable_ledger.Make (struct
@@ -36,7 +36,7 @@ module Any_ledger = Syncable_ledger.Make (struct
   module Hash = Hash
   module Root_hash = Root_hash
 
-  let account_subtree_height = 3
+  let account_subtree_height = 6
 end)
 
 module Db = Syncable_ledger.Make (struct
@@ -46,7 +46,7 @@ module Db = Syncable_ledger.Make (struct
   module Hash = Hash
   module Root_hash = Root_hash
 
-  let account_subtree_height = 3
+  let account_subtree_height = 6
 end)
 
 module Answer = struct