Skip to content

chore: fixes, style changes #173

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Dec 2, 2025
Merged

chore: fixes, style changes #173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
47cdd97
chore: make shreds dots bigger
asuzuki-jumptrading Dec 2, 2025
8a252c6
fix: kB for bytes
asuzuki-jumptrading Dec 2, 2025
54b420c
fix: zero accounts rate
asuzuki-jumptrading Dec 2, 2025
ee63267
chore: update gossip startup layout
asuzuki-jumptrading Dec 2, 2025
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
26 changes: 14 additions & 12 deletions src/features/Overview/ShredsProgression/shredsProgressionPlugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,9 @@ import { slotsPerLeader } from "../../../consts";
const store = getDefaultStore();
export const shredsXScaleKey = "shredsXScaleKey";

type Coordinates = [x: number, y: number, width?: number];
type EventsByFillStyle = {
[fillStyle: string]: Array<[x: number, y: number, width: number]>;
[fillStyle: string]: Array<Coordinates>;
};
export type Position = [xPos: number, cssWidth: number | undefined];
export type LabelPositions = {
Expand Down Expand Up @@ -125,6 +126,8 @@ export function shredsProgressionPlugin(
const rowPxHeight = clamp(canvasHeight / maxShreds, 1, 10);
const gapPxHeight = 1;

const dotSize = Math.max(rowPxHeight, 3);

// n rows, n-1 gaps
const rowsCount = Math.trunc(
(canvasHeight + gapPxHeight) / (rowPxHeight + gapPxHeight),
Expand All @@ -135,7 +138,7 @@ export function shredsProgressionPlugin(
const eventsByFillStyle: EventsByFillStyle = {};
const addEventPosition = (
fillStyle: string,
position: [x: number, y: number, width: number],
position: Coordinates,
) => {
eventsByFillStyle[fillStyle] ??= [];
eventsByFillStyle[fillStyle].push(position);
Expand Down Expand Up @@ -168,7 +171,6 @@ export function shredsProgressionPlugin(
tsXValueOffset,
y: (rowPxHeight + gapPxHeight) * rowIdx + u.bbox.top,
getYOffset,
dotWidth: rowPxHeight,
scaleX: u.scales[shredsXScaleKey],
getXPos,
});
Expand All @@ -179,7 +181,12 @@ export function shredsProgressionPlugin(
u.ctx.beginPath();
u.ctx.fillStyle = fillStyle;
for (const [x, y, width] of eventsByFillStyle[fillStyle]) {
u.ctx.rect(x, y, width, rowPxHeight);
if (width == null) {
// dot
u.ctx.rect(x, y, dotSize, dotSize);
} else {
u.ctx.rect(x, y, width, rowPxHeight);
}
}
u.ctx.fill();
}
Expand Down Expand Up @@ -256,10 +263,7 @@ const getDrawInfo = (
};

interface AddEventsForRowArgs {
addEventPosition: (
fillStyle: string,
position: [x: number, y: number, width: number],
) => void;
addEventPosition: (fillStyle: string, position: Coordinates) => void;
u: uPlot;
firstShredIdx: number;
lastShredIdx: number;
Expand All @@ -272,7 +276,6 @@ interface AddEventsForRowArgs {
getYOffset?: (
eventType: Exclude<ShredEvent, ShredEvent.slot_complete>,
) => number;
dotWidth: number;
scaleX: uPlot.Scale;
getXPos: (xVal: number) => number;
}
Expand All @@ -292,7 +295,6 @@ function addEventsForRow({
isSlotSkipped,
y,
getYOffset,
dotWidth,
scaleX,
getXPos,
}: AddEventsForRowArgs) {
Expand All @@ -316,7 +318,7 @@ function addEventsForRow({

const eventPositions = new Map<
Exclude<ShredEvent, ShredEvent.slot_complete>,
[x: number, y: number, width: number]
Coordinates
>();

// draw events from highest to lowest priority
Expand All @@ -335,7 +337,7 @@ function addEventsForRow({
eventPositions.set(
eventType,
drawOnlyDots || isSlotSkipped
? [startXPos, y + yOffset, dotWidth]
? [startXPos, y + yOffset]
: [startXPos, y + yOffset, endXPos - startXPos],
);
endXPos = startXPos;
Expand Down
1 change: 1 addition & 0 deletions src/features/StartupProgress/Firedancer/Gossip/gossip.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
.card {
flex-grow: 1;
flex-shrink: 0;
display: flex;
flex-direction: column;
gap: 10px;
Expand Down
86 changes: 39 additions & 47 deletions src/features/StartupProgress/Firedancer/Gossip/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,55 +46,47 @@ export default function Gossip() {
remainingSeconds={remainingSeconds}
/>

<Flex gapX="162px" mt="52px">
<Flex direction="column" gap="20px" flexGrow="1" flexBasis="1">
<Flex justify="between" gap="20px" align="stretch">
<GossipCard
title="Staked Peers"
value={health.connected_staked_peers.toLocaleString(undefined, {
maximumFractionDigits: 0,
})}
/>
<GossipCard
title="Unstaked Peers"
value={health.connected_unstaked_peers.toLocaleString(undefined, {
maximumFractionDigits: 0,
})}
/>
<GossipCard
title="Connected Stake"
value={formattedConnectedStake}
/>
</Flex>

<Flex direction="column" gap="10px">
<Text className={styles.barTitle}>Ingress</Text>
<Text className={styles.barValue}>
{ingressThroughput
? `${ingressThroughput.value} ${ingressThroughput.unit}/s`
: "-- Mbit/s"}
</Text>
<Bars
value={ingress.total_throughput ?? 0}
max={MAX_THROUGHPUT_BYTES}
/>
</Flex>
<Flex mt="52px" direction="column" gap="20px" flexGrow="1" flexBasis="1">
<Flex justify="between" gap="20px" align="stretch" wrap="wrap">
<GossipCard
title="Staked Peers"
value={health.connected_staked_peers.toLocaleString(undefined, {
maximumFractionDigits: 0,
})}
/>
<GossipCard
title="Unstaked Peers"
value={health.connected_unstaked_peers.toLocaleString(undefined, {
maximumFractionDigits: 0,
})}
/>
<GossipCard title="Connected Stake" value={formattedConnectedStake} />
</Flex>

<Flex direction="column" gap="10px">
<Text className={styles.barTitle}>Egress</Text>
<Text className={styles.barValue}>
{egressThroughput
? `${egressThroughput.value} ${egressThroughput.unit}/s`
: "-- Mbit/s"}
</Text>
<Bars
value={egress.total_throughput ?? 0}
max={MAX_THROUGHPUT_BYTES}
/>
</Flex>
<Flex direction="column" gap="10px">
<Text className={styles.barTitle}>Ingress</Text>
<Text className={styles.barValue}>
{ingressThroughput
? `${ingressThroughput.value} ${ingressThroughput.unit}ps`
: "-- Mbps"}
</Text>
<Bars
value={ingress.total_throughput ?? 0}
max={MAX_THROUGHPUT_BYTES}
/>
</Flex>
<Flex flexGrow="1" flexBasis="1" justify="center">
<Text>Stake Discovered</Text>

<Flex direction="column" gap="10px">
<Text className={styles.barTitle}>Egress</Text>
<Text className={styles.barValue}>
{egressThroughput
? `${egressThroughput.value} ${egressThroughput.unit}ps`
: "-- Mbps"}
</Text>
<Bars
value={egress.total_throughput ?? 0}
max={MAX_THROUGHPUT_BYTES}
/>
</Flex>
</Flex>
</>
Expand Down
4 changes: 3 additions & 1 deletion src/features/StartupProgress/Firedancer/Snapshot/SnapshotBarsCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,11 @@ export function AccountsRate({ cumulativeAccounts }: AccountsRateProps) {
}, [phase, reset]);

const value = useMemo(() => {
// Possible to have no rate due to only having a single point
if (cumulativeAccounts != null && accountsPerSecond == null) return "0";
if (accountsPerSecond == null) return;
return compactSingleDecimalFormatter.format(accountsPerSecond);
}, [accountsPerSecond]);
}, [accountsPerSecond, cumulativeAccounts]);

return (
<div className={styles.accountsRate}>
Expand Down
2 changes: 1 addition & 1 deletion src/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ export function formatBytes(
if (bytes === 0 && noDecimalForZero) return { value: "0", unit: "B" };
if (bytes < 1_000) return { value: bytes.toFixed(precision), unit: "B" };
if (bytes < 1_000_000)
return { value: (bytes / 1_000).toFixed(precision), unit: "KB" };
return { value: (bytes / 1_000).toFixed(precision), unit: "kB" };
if (bytes < 1_000_000_000) {
return { value: (bytes / 1_000_000).toFixed(precision), unit: "MB" };
}
Expand Down