fix: fixed large payload issue

ssvlabs · Jan 16, 2025 · e3e1705 · e3e1705
1 parent 9e1a7bd
commit e3e1705
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 11 deletions.
diff --git a/src/app/routes/dashboard/clusters/cluster/bulk.tsx b/src/app/routes/dashboard/clusters/cluster/bulk.tsx
@@ -30,22 +30,21 @@ export const Bulk: FC<{ type: "remove" | "exit" }> = ({ type }) => {
   const { clusterHash } = useClusterPageParams();
   const { _selectedPublicKeys: selectedPublicKeys } = useBulkActionContext();
   const params = useParams();
-  const externalValidators = params.publicKeys
-    ? atob(params.publicKeys).split(",")
-    : undefined;
+  const externalValidators = params.publicKeys?.split(",");
   const { infiniteQuery, validators, total } = useInfiniteClusterValidators(
     clusterHash,
     100,
+    externalValidators,
   );
+
   const validatorsToUse = externalValidators
     ? validators.filter((validator: Validator) =>
-        externalValidators?.includes(
-          validator.public_key.startsWith("0x")
-            ? validator.public_key
-            : `0x${validator.public_key}`,
+        externalValidators.some((truncatedPublicKey: string) =>
+          validator.public_key.includes(truncatedPublicKey),
         ),
       )
     : validators;
+
   const totalValidators = externalValidators
     ? externalValidators.length
     : total;

diff --git a/src/app/routes/reshare-dkg/remove-validators-section.tsx b/src/app/routes/reshare-dkg/remove-validators-section.tsx
@@ -54,9 +54,9 @@ const RemoveValidatorsSection = ({
       {isEnabled && (
         <div className="flex flex-col gap-4">
           <a
-            href={`${window.location.origin}/clusters/${clusterHash}/remove/${btoa(
-              validators.map(({ publicKey }) => publicKey).join(","),
-            )}`}
+            href={`${window.location.origin}/clusters/${clusterHash}/remove/${validators
+              .map(({ publicKey }) => publicKey.slice(2, 22))
+              .join(",")}`}
             className={"w-full"}
             target="_blank"
           >

diff --git a/src/hooks/cluster/use-cluster-page-params.ts b/src/hooks/cluster/use-cluster-page-params.ts
@@ -1,5 +1,5 @@
 import { useParams } from "react-router";
 
 export const useClusterPageParams = () => {
-  return useParams<{ clusterHash: string }>();
+  return useParams<{ clusterHash: string; publicKeys?: string }>();
 };
diff --git a/src/hooks/cluster/use-infinite-cluster-validators.ts b/src/hooks/cluster/use-infinite-cluster-validators.ts
@@ -5,10 +5,13 @@ import { filterOutRemovedValidators } from "@/lib/utils/cluster";
 import { getNextPageParam } from "@/lib/utils/infinite-query";
 import { useInfiniteQuery } from "@tanstack/react-query";
 import { useChainId } from "wagmi";
+import { useBulkActionContext } from "@/guard/bulk-action-guard.tsx";
+import type { Validator } from "@/types/api.ts";
 
 export const useInfiniteClusterValidators = (
   clusterHash?: string,
   perPage = 10,
+  externalValidators?: string[],
 ) => {
   const params = useClusterPageParams();
   const hash = clusterHash || params.clusterHash;
@@ -38,6 +41,22 @@ export const useInfiniteClusterValidators = (
     removedOptimisticValidators.data || [],
   );
 
+  if (
+    activeValidators.length &&
+    externalValidators &&
+    !useBulkActionContext.state._selectedPublicKeys.length
+  ) {
+    const validatorsToUse = activeValidators.filter((validator: Validator) =>
+      externalValidators.some((truncatedPublicKey: string) =>
+        validator.public_key.includes(truncatedPublicKey),
+      ),
+    );
+
+    useBulkActionContext.state._selectedPublicKeys = validatorsToUse.map(
+      ({ public_key }) => public_key,
+    );
+  }
+
   const total = Math.max(
     (infiniteQuery.data?.pages[0]?.pagination.total || 0) -
       (removedOptimisticValidators.data?.length || 0),