Skip to content

gui: send txn counts, boot timestamp #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions src/api/atoms.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
EstimatedTps,
EstimatedSlotDuration,
IdentityBalance,
UptimeNanos,
StartupTimeNanos,
LiveTxnWaterfall,
StartupProgress,
LiveTilePrimaryMetric,
Expand All @@ -23,7 +23,6 @@ import {
BlockEngineUpdate,
VoteBalance,
} from "./types";
import { DateTime } from "luxon";
import { rafAtom } from "../atomUtils";

export const versionAtom = atom<Version | undefined>(undefined);
Expand All @@ -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
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So it now sends a constant start time vs a moving uptime?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yea, this would be for the timestamp we put on the tooltip when we hover over the green flag.

>(undefined);

export const tilesAtom = atom<Tile[] | undefined>(undefined);
Expand Down
13 changes: 7 additions & 6 deletions src/api/entities.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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_nonvote_transaction_cnt: z.number().nullable(),
failed_nonvote_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(),
Expand Down Expand Up @@ -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"),
Expand Down
4 changes: 2 additions & 2 deletions src/api/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import {
txnWaterfallInSchema,
txnWaterfallOutSchema,
txnWaterfallSchema,
uptimeNanosSchema,
startupTimeNanosSchema,
versionSchema,
voteDistanceSchema,
voteStateSchema,
Expand All @@ -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>;

Expand Down
22 changes: 15 additions & 7 deletions src/api/useSetAtomWsData.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {
tilesAtom,
tileTimerAtom,
tpsHistoryAtom,
uptimeAtom,
startupTimeAtom,
versionAtom,
voteDistanceAtom,
voteStateAtom,
Expand Down Expand Up @@ -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);
Expand All @@ -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(
Expand Down Expand Up @@ -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": {
Expand Down
24 changes: 12 additions & 12 deletions src/features/Header/IdentityKey.tsx
Original file line number Diff line number Diff line change
@@ -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";
Expand Down Expand Up @@ -56,7 +56,7 @@ export default function IdentityKey() {
)}
{isNarrowScreen && (
<>
<Uptime />
<StartupTime />
<Commission />
<IdentityBalance />
</>
Expand Down Expand Up @@ -98,7 +98,7 @@ function DropdownMenu() {
</Flex>
<StakeValue />
<StakePct />
<Uptime />
<StartupTime />
<Commission />
<IdentityBalance />
<VotePubkey />
Expand Down Expand Up @@ -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;
Expand Down
16 changes: 10 additions & 6 deletions src/features/LeaderSchedule/Slots/SlotCardGrid.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -204,10 +204,14 @@ 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 nonVoteTxnsSuccess = fixValue(
publish.success_nonvote_transaction_cnt ?? 0,
);
const voteTxnsFailure = fixValue(publish.failed_vote_transaction_cnt ?? 0);
const nonVoteTxnsFailure = fixValue(
publish.failed_nonvote_transaction_cnt ?? 0,
);
const totalFees = formatNumberLamports(
(publish.transaction_fee ?? 0n) + (publish.priority_fee ?? 0n),
3,
Expand Down Expand Up @@ -250,8 +254,8 @@ function getRowValues(publish: SlotPublish): RowValues {
: 0;

return {
voteTxns: voteTxns.toLocaleString(),
nonVoteTxns: nonVoteTxns.toLocaleString(),
voteTxns: (voteTxnsSuccess + voteTxnsFailure).toLocaleString(),
nonVoteTxns: (nonVoteTxnsSuccess + nonVoteTxnsFailure).toLocaleString(),
totalFees,
transactionFeeFull,
priorityFeeFull,
Expand Down
35 changes: 28 additions & 7 deletions src/features/Overview/SlotPerformance/SankeyControls.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 successfulNonvoteTxns = fixValue(
query.response.publish.success_nonvote_transaction_cnt ?? 0,
);
const failedVoteTxns = fixValue(
query.response.publish.failed_vote_transaction_cnt ?? 0,
);
const failedNonvoteTxns = fixValue(
query.response.publish.failed_nonvote_transaction_cnt ?? 0,
);

const transactionFee3Decimals = query.response.publish.transaction_fee
? formatNumber(
Expand Down Expand Up @@ -106,8 +115,10 @@ function SlotStats() {

return {
computeUnits,
voteTxns,
nonVoteTxns,
successfulVoteTxns,
successfulNonvoteTxns,
failedVoteTxns,
failedNonvoteTxns,
transactionFeeFull,
transactionFee3Decimals,
priorityFeeFull,
Expand Down Expand Up @@ -153,9 +164,19 @@ function SlotStats() {
<RowSeparator my="0" />
</div>
<Text>Vote Transactions</Text>
<Text align="right">{values?.voteTxns?.toLocaleString() ?? "-"}</Text>
<Text align="right">
{(values
? values.failedVoteTxns + values.successfulVoteTxns
: undefined
)?.toLocaleString() ?? "-"}
</Text>
<Text>Non-vote Transactions</Text>
<Text align="right">{values?.nonVoteTxns?.toLocaleString() ?? "-"}</Text>
<Text align="right">
{(values
? values.failedNonvoteTxns + values.successfulNonvoteTxns
: undefined
)?.toLocaleString() ?? "-"}
</Text>
<div style={{ gridColumn: "span 2" }}>
<RowSeparator my="0" />
</div>
Expand Down
21 changes: 17 additions & 4 deletions src/features/Overview/SlotPerformance/SlotSankey/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,8 @@ function getLinks(
waterfall: TxnWaterfall,
displayType: DisplayType,
durationNanos?: number | null,
totalTransactions?: number | null,
failedTransactions?: number | null,
totalTransactions?: number,
failedTransactions?: number,
) {
const totalIncoming = sum(Object.values(waterfall.in));
const getValue = getGetValue({ displayType, durationNanos, totalIncoming });
Expand Down Expand Up @@ -355,12 +355,25 @@ function SlotSankey({ slot }: { slot?: number }) {

if (!waterfall) return;

const successfulTransactions =
query.response?.publish?.success_nonvote_transaction_cnt != null &&
query.response.publish.success_vote_transaction_cnt != null
? query.response.publish.success_nonvote_transaction_cnt +
query.response.publish.success_vote_transaction_cnt
: waterfall.out.block_success;
const failedTransactions =
query.response?.publish.failed_nonvote_transaction_cnt != null &&
query.response.publish.failed_vote_transaction_cnt != null
? query.response.publish.failed_nonvote_transaction_cnt +
query.response.publish.failed_vote_transaction_cnt
: waterfall.out.block_fail;

const links = getLinks(
waterfall,
displayType,
query.response?.publish.duration_nanos,
query.response?.publish.transactions,
query.response?.publish.failed_transactions,
successfulTransactions + failedTransactions,
failedTransactions,
);

const linkNodes = links.flatMap((l) => [l.source, l.target]);
Expand Down