chore: add leader slots set

Author: asuzuki-jumptrading

src/atoms.ts

@@ -364,6 +364,16 @@ export const leaderSlotsAtom = atom((get) => {
   return getLeaderSlots(epoch, pubkey);
 });
 
+/**
+ * Set of your leader slots, in ascending order
+ */
+export const ascendingLeaderSlotsSetAtom = atom((get) => {
+  const leaderSlots = get(leaderSlotsAtom);
+  if (!leaderSlots) return;
+
+  return new Set(leaderSlots);
+});
+
 /** In order array of your leader slots (only first slot in group of 4) */
 export const nextEpochLeaderSlotsAtom = atom((get) => {
   const epoch = get(nextEpochAtom);

src/features/Navigation/SlotsList.tsx

@@ -1,5 +1,6 @@
 import { useAtomValue } from "jotai";
 import {
+  ascendingLeaderSlotsSetAtom,
   currentSlotAtom,
   epochAtom,
   isCurrentlyLeaderAtom,
@@ -74,12 +75,18 @@ const MAllSlotsList = memo(function AllSlotsList({
 }: SlotsListProps) {
   const epoch = useAtomValue(epochAtom);
   const currentSlot = useAtomValue(currentSlotAtom);
-  const leaderSlots = useAtomValue(leaderSlotsAtom);
+  const ascendingLeaderSlotsSet = useAtomValue(ascendingLeaderSlotsSetAtom);
   const nextLeaderSlot = useAtomValue(nextLeaderSlotAtom);
 
   const slotsListProps = useMemo(
-    () => getAllSlotsListProps(epoch, currentSlot, leaderSlots, nextLeaderSlot),
-    [epoch, currentSlot, leaderSlots, nextLeaderSlot],
+    () =>
+      getAllSlotsListProps(
+        epoch,
+        currentSlot,
+        ascendingLeaderSlotsSet,
+        nextLeaderSlot,
+      ),
+    [epoch, currentSlot, ascendingLeaderSlotsSet, nextLeaderSlot],
   );
 
   if (!slotsListProps) return null;

src/features/Navigation/__tests__/utils.test.ts

@@ -41,14 +41,25 @@ describe("navigation utils", () => {
     });
 
     it("handles undefined epoch", () => {
-      const result = getAllSlotsListProps(undefined, undefined, undefined, undefined);
+      const result = getAllSlotsListProps(
+        undefined,
+        undefined,
+        undefined,
+        undefined,
+      );
       expect(result).toBeUndefined();
     });
   });
 
   describe("getMySlotsListProps", () => {
     it("gets correct values and gives the index for the closest smaller my slot leader", () => {
-      const result = getMySlotsListProps([4, 12, 20, 40, 44, 48], undefined, undefined, false, undefined);
+      const result = getMySlotsListProps(
+        [4, 12, 20, 40, 44, 48],
+        undefined,
+        undefined,
+        false,
+        undefined,
+      );
 
       expect(result).not.toBeUndefined();
       const { itemsCount, getSlotAtIndex, getIndexForSlot } = result!;

src/features/Navigation/allSlotsUtils.ts

@@ -17,7 +17,7 @@ import { getHeightSum, type Counts } from "./utils";
 export function getAllSlotsOffsetHelpers(
   epoch: Epoch,
   currentSlot: number,
-  leaderSlots: number[],
+  ascendingLeaderSlotsSet: Set<number>,
   nextLeaderSlot: number | undefined,
   getSlotAtIndex: (index: number) => number | undefined,
 ): OffsetHelpers {
@@ -30,7 +30,7 @@ export function getAllSlotsOffsetHelpers(
     lastLeaderSlot,
     currentLeaderSlot,
     nextLeaderSlot,
-    leaderSlots,
+    ascendingLeaderSlotsSet,
   );
   const totalHeight = getHeightSum(counts);
 
@@ -44,7 +44,7 @@ export function getAllSlotsOffsetHelpers(
       lastLeaderSlot,
       currentLeaderSlot,
       nextLeaderSlot,
-      leaderSlots,
+      ascendingLeaderSlotsSet,
     );
     return getHeightSum(counts);
   };
@@ -58,7 +58,7 @@ export function getAllSlotsOffsetHelpers(
 
   const getSlotHeight = (anySlot: number) => {
     const slot = getSlotGroupLeader(anySlot);
-    const isYours = leaderSlots.includes(slot);
+    const isYours = ascendingLeaderSlotsSet.has(slot);
     if (slot < currentLeaderSlot)
       return isYours ? YOUR_PAST_HEIGHT : OTHER_PAST_HEIGHT;
     if (slot === currentLeaderSlot)
@@ -92,7 +92,7 @@ export function getAllSlotsOffsetHelpers(
 export function getAllSlotsListProps(
   epoch: Epoch | undefined,
   currentSlot: number | undefined,
-  leaderSlots: number[] | undefined,
+  ascendingLeaderSlotsSet: Set<number> | undefined,
   nextLeaderSlot: number | undefined,
 ): SlotsIndexProps | undefined {
   if (!epoch) return;
@@ -111,11 +111,11 @@ export function getAllSlotsListProps(
   };
 
   const offsetHelpers =
-    currentSlot != null && leaderSlots != null
+    currentSlot != null && ascendingLeaderSlotsSet != null
       ? getAllSlotsOffsetHelpers(
           epoch,
           currentSlot,
-          leaderSlots,
+          ascendingLeaderSlotsSet,
           nextLeaderSlot,
           getSlotAtIndex,
         )
@@ -134,13 +134,13 @@ function getTypeCounts(
   maxLeaderSlot: number,
   currentLeaderSlot: number,
   yourNextLeaderSlot: number | undefined,
-  leaderSlots: number[],
+  ascendingLeaderSlotsSet: Set<number>,
 ): Counts {
   let yourPastCount = 0;
   let yourCurrentCount = 0;
   let yourNextFutureCount = 0;
   let yourNonNextFutureCount = 0;
-  for (const slot of leaderSlots) {
+  for (const slot of ascendingLeaderSlotsSet) {
     if (slot < minLeaderSlot) continue;
     if (slot > maxLeaderSlot) break;
 

src/features/Navigation/mySlotsUtils.ts

@@ -26,6 +26,7 @@ export function getMySlotsOffsetHelpers(
     mySlots.length - 1,
     isCurrentlyLeader,
     nextLeaderSlotIndex,
+    mySlots.length,
   );
   const totalHeight = getHeightSum(counts);
 
@@ -41,6 +42,7 @@ export function getMySlotsOffsetHelpers(
       leaderEndIdx,
       isCurrentlyLeader,
       nextLeaderSlotIndex,
+      mySlots.length,
     );
 
     return getHeightSum(countsAbove);
@@ -141,6 +143,7 @@ function getTypeCountsForLeaderIndices(
   endLeadersIdx: number,
   isCurrentlyLeader: boolean,
   nextLeaderSlotIndex: number | undefined,
+  totalLeadersCount: number,
 ): Counts {
   const totalCount = endLeadersIdx - startLeadersIdx + 1;
   const futureCount =
@@ -156,6 +159,7 @@ function getTypeCountsForLeaderIndices(
     endLeadersIdx,
     nextLeaderSlotIndex,
     isCurrentlyLeader,
+    totalLeadersCount,
   )
     ? 1
     : 0;
@@ -180,10 +184,14 @@ function isCurrentLeaderAndInRange(
   endIdx: number,
   nextLeaderSlotIndex: number | undefined,
   isCurrentlyLeader: boolean,
+  totalLeadersCount: number,
 ) {
-  if (!isCurrentlyLeader || nextLeaderSlotIndex == null) return false;
+  if (!isCurrentlyLeader) return false;
 
-  const currentIndex = nextLeaderSlotIndex - 1;
+  const currentIndex =
+    nextLeaderSlotIndex != null
+      ? nextLeaderSlotIndex - 1
+      : totalLeadersCount - 1;
   if (currentIndex < 0) return false;
 
   return currentIndex >= startIdx && currentIndex <= endIdx;