Skip to content
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

fix rpc nodes count after limiting peers msg #14

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix rpc nodes count after limiting peers msg #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions src/api/entities.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,6 +413,10 @@ export const peerRemoveSchema = z.object({
identity_pubkey: z.string(),
});

const rpcCountUpdateSchema = z.object({
rpc_count: z.number(),
});

const peersUpdateSchema = z.object({
add: z.array(peerUpdateSchema).optional(),
update: z.array(peerUpdateSchema).optional(),
Expand All @@ -424,6 +428,10 @@ export const peersSchema = z.discriminatedUnion("key", [
key: z.literal("update"),
value: peersUpdateSchema,
}),
peersTopicSchema.extend({
key: z.literal("rpc"),
value: rpcCountUpdateSchema,
}),
]);

const tsTileTimersSchema = z.object({
Expand Down
19 changes: 15 additions & 4 deletions src/api/useSetAtomWsData.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ import {
deleteSlotStatusBoundsAtom,
deleteSlotResponseBoundsAtom,
skipRateAtom,
rpcCountAtom,
} from "../atoms";
import {
EstimatedSlotDuration,
Expand Down Expand Up @@ -128,6 +129,7 @@ export function useSetAtomWsData() {
const addPeers = useSetAtom(addPeersAtom);
const updatePeers = useSetAtom(updatePeersAtom);
const removePeers = useSetAtom(removePeersAtom);
const setRpcCount = useSetAtom(rpcCountAtom)

const setBlockEngine = useSetAtom(blockEngineAtom);

Expand Down Expand Up @@ -247,10 +249,19 @@ export function useSetAtomWsData() {
break;
}
} else if (topic === "peers") {
const { value } = peersSchema.parse(msg);
addPeers(value.add);
updatePeers(value.update);
removePeers(value.remove);
const { key, value } = peersSchema.parse(msg);
switch (key) {
case "update": {
addPeers(value.add);
updatePeers(value.update);
removePeers(value.remove);
break;
}
case "rpc": {
setRpcCount(value.rpc_count);
break;
}
}
} else if (topic === "slot") {
const { key, value } = slotSchema.parse(msg);
switch (key) {
Expand Down
15 changes: 11 additions & 4 deletions src/atoms.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,14 +366,21 @@ export const removePeersAtom = atom(null, (get, set, peers?: PeerRemove[]) => {
}, removePeerDelay);
});

const _rpcCountAtom = atom<number>(0);

export const rpcCountAtom = atom(
(get) => get(_rpcCountAtom),
(get, set, count: number) => {
set(_rpcCountAtom, count);
}
);

export const peerStatsAtom = atom((get) => {
const peers = get(peersAtom);
const rpcCount = get(rpcCountAtom);
if (!peers) return;

const activePeers = Object.values(peers).filter((p) => !p.removed);
const rpc = activePeers.filter(
(p) => p.vote.every((v) => !v.activated_stake) && !!p.gossip,
);
const validators = activePeers.filter((p) =>
p.vote.some((v) => v.activated_stake),
);
Expand All @@ -395,7 +402,7 @@ export const peerStatsAtom = atom((get) => {
);

return {
rpcCount: rpc.length,
rpcCount: rpcCount,
validatorCount: validators.length,
activeStake,
delinquentStake,
Expand Down