gui: add reset_slot, storage_slot

Author: jherrera-jump

book/api/websocket.md

@@ -748,6 +748,28 @@ producing) their slot. For example, if the last completed slot was
 `1001` and it has been 800 milliseconds since that slot, the estimated
 slot is likely to be `1003`.
 
+#### `summary.reset_slot`
+| frequency       | type     | example     |
+|-----------------|----------|-------------|
+| *Once* + *Live* | `number` | `275138349` |
+
+The slot corresponding to the head of the fork we've most recently
+chosen to vote for.  A fork choice is triggered by the completion of a
+replay slot, so the publish interval for this message is approximately
+one slot duration.
+
+#### `summary.storage_slot`
+| frequency       | type     | example     |
+|-----------------|----------|-------------|
+| *Once* + *Live* | `number` | `275138349` |
+
+The oldest active rooted slot across all banks in the bank pool.
+Active here means that the bank has a positive reference count, which
+means there is some consumer which is still using it. This slot is less
+than or equal to the current consensus root and is always on the
+canonical consensus fork. Banks for slots before this slot or slots on a
+non-canonical fork will have a reference count of zero.
+
 #### `summary.estimated_slot_duration_nanos`
 | frequency       | type     | example     |
 |-----------------|----------|-------------|

src/disco/gui/fd_gui.c

@@ -206,6 +206,8 @@ fd_gui_new( void *                shmem,
   gui->summary.slot_caught_up                = ULONG_MAX;
   gui->summary.slot_repair                   = ULONG_MAX;
   gui->summary.slot_turbine                  = ULONG_MAX;
+  gui->summary.slot_reset                    = ULONG_MAX;
+  gui->summary.slot_storage                  = ULONG_MAX;
 
   for( ulong i=0UL; i < (FD_GUI_REPAIR_SLOT_HISTORY_SZ+1UL); i++ )  gui->summary.slots_max_repair[ i ].slot  = ULONG_MAX;
   for( ulong i=0UL; i < (FD_GUI_TURBINE_SLOT_HISTORY_SZ+1UL); i++ ) gui->summary.slots_max_turbine[ i ].slot = ULONG_MAX;
@@ -2679,15 +2681,27 @@ fd_gui_handle_tower_update( fd_gui_t *                   gui,
   slot->reset_slot = tower->reset_slot;
 
   try_publish_vote_status( gui, tower->replay_slot );
+
+  if( FD_LIKELY( gui->summary.slot_reset!=tower->reset_slot ) ) {
+    gui->summary.slot_reset = tower->reset_slot;
+    fd_gui_printf_reset_slot( gui );
+    fd_http_server_ws_broadcast( gui->http );
+  }
 }
 
 void
 fd_gui_handle_replay_update( fd_gui_t *                gui,
                              fd_gui_slot_completed_t * slot_completed,
                              fd_hash_t const *         block_hash,
                              ulong                     vote_slot,
+                             ulong                     storage_slot,
                              long                      now ) {
   (void)now;
+  if( FD_LIKELY( gui->summary.slot_storage!=storage_slot ) ) {
+    gui->summary.slot_storage = storage_slot;
+    fd_gui_printf_storage_slot( gui );
+    fd_http_server_ws_broadcast( gui->http );
+  }
 
   if( FD_UNLIKELY( gui->summary.boot_progress.catching_up_first_replay_slot==ULONG_MAX ) ) {
     gui->summary.boot_progress.catching_up_first_replay_slot = slot_completed->slot;

src/disco/gui/fd_gui.h

@@ -630,6 +630,8 @@ struct fd_gui {
     ulong slot_caught_up;
     ulong slot_repair;
     ulong slot_turbine;
+    ulong slot_reset;
+    ulong slot_storage;
 
     fd_gui_ephemeral_slot_t slots_max_turbine[ FD_GUI_TURBINE_SLOT_HISTORY_SZ+1UL ];
     fd_gui_ephemeral_slot_t slots_max_repair [ FD_GUI_REPAIR_SLOT_HISTORY_SZ +1UL ];
@@ -872,6 +874,7 @@ fd_gui_handle_replay_update( fd_gui_t *                gui,
                              fd_gui_slot_completed_t * slot_completed,
                              fd_hash_t const *         block_hash,
                              ulong                     vote_slot,
+                             ulong                     storage_slot,
                              long                      now );
 
 void

src/disco/gui/fd_gui_printf.c

@@ -259,6 +259,22 @@ fd_gui_printf_turbine_slot( fd_gui_t * gui ) {
   jsonp_close_envelope( gui->http );
 }
 
+void
+fd_gui_printf_reset_slot( fd_gui_t * gui ) {
+  jsonp_open_envelope( gui->http, "summary", "reset_slot" );
+    if( FD_LIKELY( gui->summary.slot_reset!=ULONG_MAX  ) ) jsonp_ulong( gui->http, "value", gui->summary.slot_reset );
+    else                                                   jsonp_null ( gui->http, "value" );
+  jsonp_close_envelope( gui->http );
+}
+
+void
+fd_gui_printf_storage_slot( fd_gui_t * gui ) {
+  jsonp_open_envelope( gui->http, "summary", "storage_slot" );
+    if( FD_LIKELY( gui->summary.slot_storage!=ULONG_MAX  ) ) jsonp_ulong( gui->http, "value", gui->summary.slot_storage );
+    else                                                     jsonp_null ( gui->http, "value" );
+  jsonp_close_envelope( gui->http );
+}
+
 void
 fd_gui_printf_slot_caught_up( fd_gui_t * gui ) {
   jsonp_open_envelope( gui->http, "summary", "slot_caught_up" );

src/disco/gui/fd_gui_printf.h

@@ -37,6 +37,8 @@ void fd_gui_printf_estimated_tps( fd_gui_t * gui );
 void fd_gui_printf_shred_updates( fd_gui_t * gui );
 void fd_gui_printf_catch_up_history( fd_gui_t * gui );
 void fd_gui_peers_printf_vote_slot( fd_gui_peers_ctx_t * peers );
+void fd_gui_printf_reset_slot( fd_gui_t * gui );
+void fd_gui_printf_storage_slot( fd_gui_t * gui );
 
 void
 fd_gui_printf_null_query_response( fd_http_server_t * http,

src/disco/gui/fd_gui_tile.c

@@ -425,7 +425,7 @@ after_frag( fd_gui_ctx_t *      ctx,
         fd_gui_peers_handle_vote_update( ctx->peers, ctx->peers->votes, vote_count, fd_clock_now( ctx->clock ), ctx->gui->summary.identity_key, ctx->gui->ipinfo.country_code );
 
         /* update slot data */
-        fd_gui_handle_replay_update( ctx->gui, &slot_completed, &replay->block_hash, ctx->peers->slot_voted, fd_clock_now( ctx->clock ) );
+        fd_gui_handle_replay_update( ctx->gui, &slot_completed, &replay->block_hash, ctx->peers->slot_voted, replay->storage_slot, fd_clock_now( ctx->clock ) );
 
       } else if( FD_UNLIKELY( sig==REPLAY_SIG_BECAME_LEADER ) ) {
         fd_became_leader_t * became_leader = (fd_became_leader_t *)src;

src/discof/replay/fd_replay_tile.c

@@ -680,6 +680,7 @@ publish_slot_completed( fd_replay_tile_t *  ctx,
   fd_replay_slot_completed_t * slot_info = fd_chunk_to_laddr( ctx->replay_out->mem, ctx->replay_out->chunk );
   slot_info->slot                  = slot;
   slot_info->root_slot             = ctx->consensus_root_slot;
+  slot_info->storage_slot          = ctx->published_root_slot;
   slot_info->epoch                 = epoch;
   slot_info->slot_in_epoch         = slot_idx;
   slot_info->block_height          = fd_bank_block_height_get( bank );

src/discof/replay/fd_replay_tile.h

@@ -13,6 +13,7 @@
 struct fd_replay_slot_completed {
   ulong slot;
   ulong root_slot;
+  ulong storage_slot;
   ulong epoch;
   ulong slot_in_epoch;
   ulong block_height;