gui: send txn counts, boot timestamp

Author: jherrera-jump

src/api/atoms.ts

@@ -11,7 +11,7 @@ import {
   EstimatedTps,
   EstimatedSlotDuration,
   IdentityBalance,
-  UptimeNanos,
+  StartupTimeNanos,
   LiveTxnWaterfall,
   StartupProgress,
   LiveTilePrimaryMetric,
@@ -23,7 +23,6 @@ import {
   BlockEngineUpdate,
   VoteBalance,
 } from "./types";
-import { DateTime } from "luxon";
 import { rafAtom } from "../atomUtils";
 
 export const versionAtom = atom<Version | undefined>(undefined);
@@ -34,8 +33,8 @@ export const commitHashAtom = atom<CommitHash | undefined>(undefined);
 
 export const identityKeyAtom = atom<IdentityKey | undefined>(undefined);
 
-export const uptimeAtom = atom<
-  { uptimeNanos: UptimeNanos; ts: DateTime } | undefined
+export const startupTimeAtom = atom<
+  { startupTimeNanos: StartupTimeNanos } | undefined
 >(undefined);
 
 export const tilesAtom = atom<Tile[] | undefined>(undefined);

src/api/entities.ts

@@ -44,7 +44,7 @@ export const commitHashSchema = z.string();
 
 export const identityKeySchema = z.string();
 
-export const uptimeNanosSchema = z.coerce.bigint();
+export const startupTimeNanosSchema = z.coerce.bigint();
 
 export const tileTypeSchema = z.enum([
   "sock",
@@ -247,9 +247,10 @@ export const slotPublishSchema = z.object({
   mine: z.boolean(),
   skipped: z.boolean(),
   level: slotLevelSchema,
-  transactions: z.number().nullable(),
-  vote_transactions: z.number().nullable(),
-  failed_transactions: z.number().nullable(),
+  success_user_transaction_cnt: z.number().nullable(),
+  failed_user_transaction_cnt: z.number().nullable(),
+  success_vote_transaction_cnt: z.number().nullable(),
+  failed_vote_transaction_cnt: z.number().nullable(),
   priority_fee: z.coerce.bigint().nullable(),
   transaction_fee: z.coerce.bigint().nullable(),
   tips: z.coerce.bigint().nullable(),
@@ -302,8 +303,8 @@ export const summarySchema = z.discriminatedUnion("key", [
     value: identityKeySchema,
   }),
   summaryTopicSchema.extend({
-    key: z.literal("uptime_nanos"),
-    value: uptimeNanosSchema,
+    key: z.literal("startup_time_nanos"),
+    value: startupTimeNanosSchema,
   }),
   summaryTopicSchema.extend({
     key: z.literal("tiles"),

src/api/types.ts

@@ -32,7 +32,7 @@ import {
   txnWaterfallInSchema,
   txnWaterfallOutSchema,
   txnWaterfallSchema,
-  uptimeNanosSchema,
+  startupTimeNanosSchema,
   versionSchema,
   voteDistanceSchema,
   voteStateSchema,
@@ -48,7 +48,7 @@ export type CommitHash = z.infer<typeof commitHashSchema>;
 
 export type IdentityKey = z.infer<typeof identityKeySchema>;
 
-export type UptimeNanos = z.infer<typeof uptimeNanosSchema>;
+export type StartupTimeNanos = z.infer<typeof startupTimeNanosSchema>;
 
 export type Tile = z.infer<typeof tileSchema>;
 

src/api/useSetAtomWsData.ts

@@ -14,7 +14,7 @@ import {
   tilesAtom,
   tileTimerAtom,
   tpsHistoryAtom,
-  uptimeAtom,
+  startupTimeAtom,
   versionAtom,
   voteDistanceAtom,
   voteStateAtom,
@@ -58,8 +58,7 @@ import {
   waterfallDebounceMs,
 } from "./consts";
 import { rateLiveWaterfallAtom } from "../features/Overview/SlotPerformance/atoms";
-
-const minuteNanos = 1_000_000 * 60 * 1_000;
+import { slowDateTimeNow } from "../utils";
 
 export function useSetAtomWsData() {
   const setVersion = useSetAtom(versionAtom);
@@ -72,9 +71,18 @@ export function useSetAtomWsData() {
   const setIdentityBalance = useSetAtom(identityBalanceAtom);
   const setVoteBalance = useSetAtom(voteBalanceAtom);
 
-  const [uptime, setUptime] = useAtom(uptimeAtom);
+  const [startupTime, setStartupTime] = useAtom(startupTimeAtom);
+
+  const uptimeDuration =
+    startupTime !== undefined
+      ? slowDateTimeNow.diff(
+          DateTime.fromMillis(
+            Math.floor(Number(startupTime.startupTimeNanos) / 1_000_000),
+          ),
+        )
+      : undefined;
   const uptimeMins =
-    uptime !== undefined ? Number(uptime.uptimeNanos) / minuteNanos : undefined;
+    uptimeDuration !== undefined ? uptimeDuration.get("minutes") : undefined;
 
   const setEstimatedSlotDuration = useSetAtom(estimatedSlotDurationAtom);
   const setDbEstimatedSlotDuration = useThrottledCallback(
@@ -180,8 +188,8 @@ export function useSetAtomWsData() {
             setVoteBalance(value);
             break;
           }
-          case "uptime_nanos": {
-            setUptime({ uptimeNanos: value, ts: DateTime.now() });
+          case "startup_time_nanos": {
+            setStartupTime({ startupTimeNanos: value });
             break;
           }
           case "tiles": {

src/features/Header/IdentityKey.tsx

@@ -1,15 +1,15 @@
 import { useAtomValue } from "jotai";
 import {
   identityBalanceAtom,
-  uptimeAtom,
+  startupTimeAtom,
   voteBalanceAtom,
 } from "../../api/atoms";
 import { Text, Flex, Tooltip } from "@radix-ui/themes";
 import styles from "./identityKey.module.css";
 import PeerIcon from "../../components/PeerIcon";
 import { myStakePctAtom, myStakeAmountAtom } from "../../atoms";
 import { PropsWithChildren, useEffect } from "react";
-import { Duration } from "luxon";
+import { DateTime } from "luxon";
 import { getFmtStake, getTimeTillText, slowDateTimeNow } from "../../utils";
 import { formatNumber } from "../../numUtils";
 import { useInterval, useMedia, useUpdate } from "react-use";
@@ -56,7 +56,7 @@ export default function IdentityKey() {
         )}
         {isNarrowScreen && (
           <>
-            <Uptime />
+            <StartupTime />
             <Commission />
             <IdentityBalance />
           </>
@@ -98,7 +98,7 @@ function DropdownMenu() {
       </Flex>
       <StakeValue />
       <StakePct />
-      <Uptime />
+      <StartupTime />
       <Commission />
       <IdentityBalance />
       <VotePubkey />
@@ -206,18 +206,18 @@ function Commission() {
   );
 }
 
-function Uptime() {
-  const uptime = useAtomValue(uptimeAtom);
+function StartupTime() {
+  const startupTime = useAtomValue(startupTimeAtom);
 
   const getValue = () => {
-    if (!uptime) return "-";
-
-    const uptimeDuration = Duration.fromMillis(
-      Number(uptime.uptimeNanos) / 1_000_000,
+    if (!startupTime) return "-";
+    const uptimeDuration = slowDateTimeNow.diff(
+      DateTime.fromMillis(
+        Math.floor(Number(startupTime.startupTimeNanos) / 1_000_000),
+      ),
     );
-    const diffDuration = slowDateTimeNow.diff(uptime.ts);
 
-    const text = getTimeTillText(uptimeDuration.plus(diffDuration).rescale(), {
+    const text = getTimeTillText(uptimeDuration.rescale(), {
       showSeconds: false,
     });
     return text;

src/features/LeaderSchedule/Slots/SlotCardGrid.tsx

@@ -187,7 +187,7 @@ function SlotText({
 
 interface RowValues {
   voteTxns: string;
-  nonVoteTxns: string;
+  userTxns: string;
   totalFees: string;
   transactionFeeFull: string;
   priorityFeeFull: string;
@@ -205,9 +205,10 @@ interface SlotCardRowProps {
 
 function getRowValues(publish: SlotPublish): RowValues {
   // TODO: fix backend
-  const voteTxns = fixValue(publish.vote_transactions ?? 0);
-  const totalTxns = fixValue(publish.transactions ?? 0);
-  const nonVoteTxns = totalTxns - voteTxns;
+  const voteTxnsSuccess = fixValue(publish.success_vote_transaction_cnt ?? 0);
+  const userTxnsSuccess = fixValue(publish.success_user_transaction_cnt ?? 0);
+  const voteTxnsFailure = fixValue(publish.failed_vote_transaction_cnt ?? 0);
+  const userTxnsFailure = fixValue(publish.failed_user_transaction_cnt ?? 0);
   const totalFees = formatNumberLamports(
     (publish.transaction_fee ?? 0n) + (publish.priority_fee ?? 0n),
     3,
@@ -250,8 +251,8 @@ function getRowValues(publish: SlotPublish): RowValues {
       : 0;
 
   return {
-    voteTxns: voteTxns.toLocaleString(),
-    nonVoteTxns: nonVoteTxns.toLocaleString(),
+    voteTxns: (voteTxnsSuccess + voteTxnsFailure).toLocaleString(),
+    userTxns: (userTxnsSuccess + userTxnsFailure).toLocaleString(),
     totalFees,
     transactionFeeFull,
     priorityFeeFull,
@@ -324,7 +325,7 @@ function SlotCardRow({ slot, active }: SlotCardRowProps) {
         className={`${styles.rowText} ${active ? styles.active : ""}`}
         align="right"
       >
-        {getText(values?.nonVoteTxns)}
+        {getText(values?.userTxns)}
       </Text>
       <Tooltip
         content={

src/features/Overview/SlotPerformance/SankeyControls.tsx

@@ -58,9 +58,18 @@ function SlotStats() {
   const values = useMemo(() => {
     if (!query.response?.publish) return;
 
-    const voteTxns = fixValue(query.response.publish.vote_transactions ?? 0);
-    const totalTxns = fixValue(query.response.publish.transactions ?? 0);
-    const nonVoteTxns = totalTxns - voteTxns;
+    const successfulVoteTxns = fixValue(
+      query.response.publish.success_vote_transaction_cnt ?? 0,
+    );
+    const successfulUserTxns = fixValue(
+      query.response.publish.success_user_transaction_cnt ?? 0,
+    );
+    const failedVoteTxns = fixValue(
+      query.response.publish.failed_vote_transaction_cnt ?? 0,
+    );
+    const failedUserTxns = fixValue(
+      query.response.publish.failed_user_transaction_cnt ?? 0,
+    );
 
     const transactionFee3Decimals = query.response.publish.transaction_fee
       ? formatNumber(
@@ -106,8 +115,10 @@ function SlotStats() {
 
     return {
       computeUnits,
-      voteTxns,
-      nonVoteTxns,
+      successfulVoteTxns,
+      successfulUserTxns,
+      failedVoteTxns,
+      failedUserTxns,
       transactionFeeFull,
       transactionFee3Decimals,
       priorityFeeFull,
@@ -152,10 +163,22 @@ function SlotStats() {
       <div style={{ gridColumn: "span 2" }}>
         <RowSeparator my="0" />
       </div>
-      <Text>Vote Transactions</Text>
-      <Text align="right">{values?.voteTxns?.toLocaleString() ?? "-"}</Text>
-      <Text>Non-vote Transactions</Text>
-      <Text align="right">{values?.nonVoteTxns?.toLocaleString() ?? "-"}</Text>
+      <Text>Successful Vote Transactions</Text>
+      <Text align="right">
+        {values?.successfulVoteTxns?.toLocaleString() ?? "-"}
+      </Text>
+      <Text>Failed Vote Transactions</Text>
+      <Text align="right">
+        {values?.failedVoteTxns.toLocaleString() ?? "-"}
+      </Text>
+      <Text>Successful User Transactions</Text>
+      <Text align="right">
+        {values?.successfulUserTxns?.toLocaleString() ?? "-"}
+      </Text>
+      <Text>Failed User Transactions</Text>
+      <Text align="right">
+        {values?.failedUserTxns?.toLocaleString() ?? "-"}
+      </Text>
       <div style={{ gridColumn: "span 2" }}>
         <RowSeparator my="0" />
       </div>

src/features/Overview/SlotPerformance/SlotSankey/index.tsx

@@ -359,8 +359,16 @@ function SlotSankey({ slot }: { slot?: number }) {
       waterfall,
       displayType,
       query.response?.publish.duration_nanos,
-      query.response?.publish.transactions,
-      query.response?.publish.failed_transactions,
+      query.response?.publish.success_user_transaction_cnt &&
+        query.response?.publish.success_vote_transaction_cnt
+        ? query.response?.publish.success_user_transaction_cnt +
+            query.response?.publish.success_vote_transaction_cnt
+        : undefined,
+      query.response?.publish.failed_user_transaction_cnt &&
+        query.response?.publish.failed_vote_transaction_cnt
+        ? query.response?.publish.failed_user_transaction_cnt +
+            query.response?.publish.failed_vote_transaction_cnt
+        : undefined,
     );
 
     const linkNodes = links.flatMap((l) => [l.source, l.target]);