Skip to content

Commit 56a71de

Browse files
jherrera-jumpmmcgee-jump
jherrera-jump
authored and
mmcgee-jump
committed
gui: tidy cus chart
1 parent cb84153 commit 56a71de

File tree

11 files changed

+434
-291
lines changed

11 files changed

+434
-291
lines changed

‎agave

‎book/api/websocket.md

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1195,6 +1195,49 @@ new validator identity.
11951195
},
11961196
// ... many more ...
11971197
],
1198+
}
1199+
}
1200+
```
1201+
1202+
#### `slot.query_transactions`
1203+
| frequency | type | example |
1204+
|-------------|----------------|---------|
1205+
| *Request* | `SlotTransactionsResponse` | below |
1206+
1207+
| param | type | description |
1208+
|-------|----------|-------------|
1209+
| slot | `number` | The slot to query for information about |
1210+
1211+
::: details Example
1212+
1213+
```json
1214+
{
1215+
"topic": "slot",
1216+
"key": "query_transactions",
1217+
"id": 32,
1218+
"params": {
1219+
"slot": 289245044
1220+
}
1221+
}
1222+
```
1223+
1224+
```json
1225+
{
1226+
"topic": "slot",
1227+
"key": "query_transactions",
1228+
"id": 32,
1229+
"value": {
1230+
"publish": {
1231+
"slot": 289245044,
1232+
"mine": true,
1233+
"skipped": false,
1234+
"level": "rooted",
1235+
"transactions": 6821,
1236+
"vote_transactions": 6746,
1237+
"failed_transactions": 3703,
1238+
"max_compute_units": 48000000,
1239+
"compute_units": 0
1240+
},
11981241
"transactions": {
11991242
"start_timestamp_nanos": "1739657041688346791",
12001243
"target_end_timestamp_nanos": "1739657042088346880",
@@ -1222,6 +1265,11 @@ new validator identity.
12221265
| waterfall | `TxnWaterfall\|null` | If the slot is not `mine`, will be `null`. Otherwise, a waterfall showing reasons transactions were acquired since the end of the prior leader slot |
12231266
| tile_primary_metric | `TilePrimaryMetric\|null` | If the slot is not `mine`, will be `null`. Otherwise, max value of per-tile-type primary metrics since the end of the prior leader slot |
12241267
| tile_timers | `TsTileTimers[]\|null` | If the slot is not `mine`, will be `null`. Otherwise, an array of `TsTileTimers` samples from the slot, sorted earliest to latest. We store this information for the most recently completed 4096 leader slots. This will be `null` for leader slots before that |
1268+
1269+
**`SlotTransactionsResponse`**
1270+
| Field | Type | Description |
1271+
|---------------------|---------------------------|-------------|
1272+
| publish | `SlotPublish` | General information about the slot. Contains several nullable fields in case a future slot is queried and he information is not known yet |
12251273
| transactions | `Transactions\|null` | If the slot is not `mine`, will be `null`. Otherwise, metrics for the transactions in this slot. Arrays have a seperate entry for each scheduled transaction that was packed in this slot, and are ordered in the same order the transactions appear in the block. Note that not all scheduled transactions will land in the produced block (e.g. failed bundles are ignored), but these arrays nonetheless include metrics for excluded transactions |
12261274

12271275
**`TxnWaterfall`**

‎src/disco/gui/dist/assets/index-DEoU3Mlp.js renamed to ‎src/disco/gui/dist/assets/index-BbgkVCh_.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/disco/gui/dist/assets/index-CeMmwSX_.css renamed to ‎src/disco/gui/dist/assets/index-CULNhLeN.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/disco/gui/dist/assets/index-CXR6J9xZ.js

Lines changed: 0 additions & 251 deletions
This file was deleted.

‎src/disco/gui/dist/assets/index-npgCjNH6.js

Lines changed: 251 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/disco/gui/dist/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
/>
2323
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
2424
<title>Firedancer</title>
25-
<script type="module" crossorigin src="/assets/index-CXR6J9xZ.js"></script>
26-
<link rel="stylesheet" crossorigin href="/assets/index-CeMmwSX_.css">
25+
<script type="module" crossorigin src="/assets/index-npgCjNH6.js"></script>
26+
<link rel="stylesheet" crossorigin href="/assets/index-CULNhLeN.css">
2727
</head>
2828
<body>
2929
<div id="root"></div>

‎src/disco/gui/fd_gui.c

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -851,6 +851,27 @@ fd_gui_request_slot( fd_gui_t * gui,
851851
return 0;
852852
}
853853

854+
int
855+
fd_gui_request_slot_transactions( fd_gui_t * gui,
856+
ulong ws_conn_id,
857+
ulong request_id,
858+
cJSON const * params ) {
859+
const cJSON * slot_param = cJSON_GetObjectItemCaseSensitive( params, "slot" );
860+
if( FD_UNLIKELY( !cJSON_IsNumber( slot_param ) ) ) return FD_HTTP_SERVER_CONNECTION_CLOSE_BAD_REQUEST;
861+
862+
ulong _slot = slot_param->valueulong;
863+
fd_gui_slot_t const * slot = gui->slots[ _slot % FD_GUI_SLOTS_CNT ];
864+
if( FD_UNLIKELY( slot->slot!=_slot || slot->slot==ULONG_MAX ) ) {
865+
fd_gui_printf_null_query_response( gui, "slot", "query", request_id );
866+
FD_TEST( !fd_http_server_ws_send( gui->http, ws_conn_id ) );
867+
return 0;
868+
}
869+
870+
fd_gui_printf_slot_transactions_request( gui, _slot, request_id );
871+
FD_TEST( !fd_http_server_ws_send( gui->http, ws_conn_id ) );
872+
return 0;
873+
}
874+
854875
int
855876
fd_gui_request_slot_detailed( fd_gui_t * gui,
856877
ulong ws_conn_id,
@@ -924,6 +945,16 @@ fd_gui_ws_message( fd_gui_t * gui,
924945
int result = fd_gui_request_slot_detailed( gui, ws_conn_id, id, params );
925946
cJSON_Delete( json );
926947
return result;
948+
} else if( FD_LIKELY( !strcmp( topic->valuestring, "slot" ) && !strcmp( key->valuestring, "query_transactions" ) ) ) {
949+
const cJSON * params = cJSON_GetObjectItemCaseSensitive( json, "params" );
950+
if( FD_UNLIKELY( !cJSON_IsObject( params ) ) ) {
951+
cJSON_Delete( json );
952+
return FD_HTTP_SERVER_CONNECTION_CLOSE_BAD_REQUEST;
953+
}
954+
955+
int result = fd_gui_request_slot_transactions( gui, ws_conn_id, id, params );
956+
cJSON_Delete( json );
957+
return result;
927958
} else if( FD_LIKELY( !strcmp( topic->valuestring, "summary" ) && !strcmp( key->valuestring, "ping" ) ) ) {
928959
fd_gui_printf_summary_ping( gui, id );
929960
FD_TEST( !fd_http_server_ws_send( gui->http, ws_conn_id ) );

‎src/disco/gui/fd_gui_printf.c

Lines changed: 86 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1132,9 +1132,9 @@ fd_gui_printf_slot_request( fd_gui_t * gui,
11321132
}
11331133

11341134
void
1135-
fd_gui_printf_slot_request_detailed( fd_gui_t * gui,
1136-
ulong _slot,
1137-
ulong id ) {
1135+
fd_gui_printf_slot_transactions_request( fd_gui_t * gui,
1136+
ulong _slot,
1137+
ulong id ) {
11381138
fd_gui_slot_t * slot = gui->slots[ _slot % FD_GUI_SLOTS_CNT ];
11391139

11401140
char const * level;
@@ -1186,30 +1186,6 @@ fd_gui_printf_slot_request_detailed( fd_gui_t * gui,
11861186
else jsonp_ulong( gui, "tips", slot->tips );
11871187
jsonp_close_object( gui );
11881188

1189-
if( FD_LIKELY( slot->leader_state==FD_GUI_SLOT_LEADER_ENDED ) ) {
1190-
fd_gui_printf_waterfall( gui, slot->waterfall_begin, slot->waterfall_end );
1191-
1192-
if( FD_LIKELY( gui->summary.tile_timers_leader_history_slot[ slot->tile_timers_history_idx ]==_slot ) ) {
1193-
jsonp_open_array( gui, "tile_timers" );
1194-
fd_gui_tile_timers_t const * prev_timer = gui->summary.tile_timers_leader_history[ slot->tile_timers_history_idx ][ 0 ];
1195-
for( ulong i=1UL; i<gui->summary.tile_timers_leader_history_slot_sample_cnt[ slot->tile_timers_history_idx ]; i++ ) {
1196-
fd_gui_tile_timers_t const * cur_timer = gui->summary.tile_timers_leader_history[ slot->tile_timers_history_idx ][ i ];
1197-
fd_gui_printf_ts_tile_timers( gui, prev_timer, cur_timer );
1198-
prev_timer = cur_timer;
1199-
}
1200-
jsonp_close_array( gui );
1201-
} else {
1202-
/* Our tile timers were overwritten. */
1203-
jsonp_null( gui, "tile_timers" );
1204-
}
1205-
1206-
fd_gui_printf_tile_stats( gui, slot->tile_stats_begin, slot->tile_stats_end );
1207-
} else {
1208-
jsonp_null( gui, "waterfall" );
1209-
jsonp_null( gui, "tile_timers" );
1210-
jsonp_null( gui, "tile_primary_metric" );
1211-
}
1212-
12131189
int overwritten = (gui->pack_txn_idx - slot->txs.start_offset)>FD_GUI_TXN_HISTORY_SZ;
12141190
int processed_all_microblocks = slot->slot!=ULONG_MAX &&
12151191
slot->txs.microblocks_upper_bound!=USHORT_MAX &&
@@ -1298,4 +1274,87 @@ fd_gui_printf_slot_request_detailed( fd_gui_t * gui,
12981274
jsonp_close_envelope( gui );
12991275
}
13001276

1277+
void
1278+
fd_gui_printf_slot_request_detailed( fd_gui_t * gui,
1279+
ulong _slot,
1280+
ulong id ) {
1281+
fd_gui_slot_t * slot = gui->slots[ _slot % FD_GUI_SLOTS_CNT ];
1282+
1283+
char const * level;
1284+
switch( slot->level ) {
1285+
case FD_GUI_SLOT_LEVEL_INCOMPLETE: level = "incomplete"; break;
1286+
case FD_GUI_SLOT_LEVEL_COMPLETED: level = "completed"; break;
1287+
case FD_GUI_SLOT_LEVEL_OPTIMISTICALLY_CONFIRMED: level = "optimistically_confirmed"; break;
1288+
case FD_GUI_SLOT_LEVEL_ROOTED: level = "rooted"; break;
1289+
case FD_GUI_SLOT_LEVEL_FINALIZED: level = "finalized"; break;
1290+
default: level = "unknown"; break;
1291+
}
1292+
1293+
fd_gui_slot_t * parent_slot = gui->slots[ slot->parent_slot % FD_GUI_SLOTS_CNT ];
1294+
if( FD_UNLIKELY( parent_slot->slot!=slot->parent_slot ) ) parent_slot = NULL;
1295+
1296+
long duration_nanos = LONG_MAX;
1297+
if( FD_LIKELY( slot->completed_time!=LONG_MAX && parent_slot && parent_slot->completed_time!=LONG_MAX ) ) {
1298+
duration_nanos = slot->completed_time - parent_slot->completed_time;
1299+
}
1300+
1301+
jsonp_open_envelope( gui, "slot", "query" );
1302+
jsonp_ulong( gui, "id", id );
1303+
jsonp_open_object( gui, "value" );
1304+
1305+
jsonp_open_object( gui, "publish" );
1306+
jsonp_ulong( gui, "slot", _slot );
1307+
jsonp_bool( gui, "mine", slot->mine );
1308+
jsonp_bool( gui, "skipped", slot->skipped );
1309+
jsonp_string( gui, "level", level );
1310+
if( FD_UNLIKELY( duration_nanos==LONG_MAX ) ) jsonp_null( gui, "duration_nanos" );
1311+
else jsonp_long( gui, "duration_nanos", duration_nanos );
1312+
if( FD_UNLIKELY( slot->completed_time==LONG_MAX ) ) jsonp_null( gui, "completed_time_nanos" );
1313+
else jsonp_long( gui, "completed_time_nanos", slot->completed_time );
1314+
if( FD_UNLIKELY( slot->total_txn_cnt==UINT_MAX ) ) jsonp_null( gui, "transactions" );
1315+
else jsonp_ulong( gui, "transactions", slot->total_txn_cnt );
1316+
if( FD_UNLIKELY( slot->vote_txn_cnt==UINT_MAX ) ) jsonp_null( gui, "vote_transactions" );
1317+
else jsonp_ulong( gui, "vote_transactions", slot->vote_txn_cnt );
1318+
if( FD_UNLIKELY( slot->failed_txn_cnt==UINT_MAX ) ) jsonp_null( gui, "failed_transactions" );
1319+
else jsonp_ulong( gui, "failed_transactions", slot->failed_txn_cnt );
1320+
if( FD_UNLIKELY( slot->txs.max_compute_units==UINT_MAX ) ) jsonp_null( gui, "max_compute_units" );
1321+
else jsonp_ulong( gui, "max_compute_units", slot->txs.max_compute_units );
1322+
if( FD_UNLIKELY( slot->compute_units==UINT_MAX ) ) jsonp_null( gui, "compute_units" );
1323+
else jsonp_ulong( gui, "compute_units", slot->compute_units );
1324+
if( FD_UNLIKELY( slot->transaction_fee==ULONG_MAX ) ) jsonp_null( gui, "transaction_fee" );
1325+
else jsonp_ulong( gui, "transaction_fee", slot->transaction_fee );
1326+
if( FD_UNLIKELY( slot->priority_fee==ULONG_MAX ) ) jsonp_null( gui, "priority_fee" );
1327+
else jsonp_ulong( gui, "priority_fee", slot->priority_fee );
1328+
if( FD_UNLIKELY( slot->tips==ULONG_MAX ) ) jsonp_null( gui, "tips" );
1329+
else jsonp_ulong( gui, "tips", slot->tips );
1330+
jsonp_close_object( gui );
1331+
1332+
if( FD_LIKELY( slot->leader_state==FD_GUI_SLOT_LEADER_ENDED ) ) {
1333+
fd_gui_printf_waterfall( gui, slot->waterfall_begin, slot->waterfall_end );
1334+
1335+
if( FD_LIKELY( gui->summary.tile_timers_leader_history_slot[ slot->tile_timers_history_idx ]==_slot ) ) {
1336+
jsonp_open_array( gui, "tile_timers" );
1337+
fd_gui_tile_timers_t const * prev_timer = gui->summary.tile_timers_leader_history[ slot->tile_timers_history_idx ][ 0 ];
1338+
for( ulong i=1UL; i<gui->summary.tile_timers_leader_history_slot_sample_cnt[ slot->tile_timers_history_idx ]; i++ ) {
1339+
fd_gui_tile_timers_t const * cur_timer = gui->summary.tile_timers_leader_history[ slot->tile_timers_history_idx ][ i ];
1340+
fd_gui_printf_ts_tile_timers( gui, prev_timer, cur_timer );
1341+
prev_timer = cur_timer;
1342+
}
1343+
jsonp_close_array( gui );
1344+
} else {
1345+
/* Our tile timers were overwritten. */
1346+
jsonp_null( gui, "tile_timers" );
1347+
}
1348+
1349+
fd_gui_printf_tile_stats( gui, slot->tile_stats_begin, slot->tile_stats_end );
1350+
} else {
1351+
jsonp_null( gui, "waterfall" );
1352+
jsonp_null( gui, "tile_timers" );
1353+
jsonp_null( gui, "tile_primary_metric" );
1354+
}
1355+
1356+
jsonp_close_object( gui );
1357+
jsonp_close_envelope( gui );
1358+
}
1359+
13011360
#endif /* HEADER_fd_src_disco_gui_fd_gui_printf_h */

‎src/disco/gui/fd_gui_printf.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,11 @@ fd_gui_printf_slot_request_detailed( fd_gui_t * gui,
8787
ulong slot,
8888
ulong id );
8989

90+
void
91+
fd_gui_printf_slot_transactions_request( fd_gui_t * gui,
92+
ulong _slot,
93+
ulong id );
94+
9095
void
9196
fd_gui_printf_live_tile_timers( fd_gui_t * gui );
9297

0 commit comments

Comments
 (0)