fix: add check for contract id list before showing dereg status

session-foundation · Jan 24, 2025 · 3c77db6 · 3c77db6
1 parent bc21332
commit 3c77db6
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/apps/staking/components/StakedNodeCard.tsx b/apps/staking/components/StakedNodeCard.tsx
@@ -39,6 +39,7 @@ import {
 } from '@/components/StakedNode/state';
 import { CopyToClipboardButton } from '@session/ui/components/CopyToClipboardButton';
 import { NodeExitButtonDialog } from '@/components/StakedNode/NodeExitButtonDialog';
+import { useStakes } from '@/hooks/useStakes';
 
 /**
  * Checks if a given stake is ready to exit the smart contract.
@@ -68,16 +69,13 @@ export const useIsReadyToExitByDeregistrationUnlock = (
   deregistrationHeight?: number | null,
   blockHeight?: number
 ) => {
-  const { chainId } = useWallet();
   return !!(
     state === STAKE_STATE.DEREGISTERED &&
     eventState !== STAKE_EVENT_STATE.EXITED &&
     eventState !== STAKE_EVENT_STATE.LIQUIDATED &&
     deregistrationHeight &&
     blockHeight &&
-    deregistrationHeight +
-      msInBlocks(SESSION_NODE_TIME(chainId).DEREGISTRATION_LOCKED_STAKE_SECONDS * 1000) <=
-      blockHeight
+    deregistrationHeight <= blockHeight
   );
 };
 
@@ -319,6 +317,7 @@ type NodeSummaryProps = {
   liquidationTime: string | null;
   showAllTimers?: boolean;
   isOperator?: boolean;
+  isInContractIdList?: boolean;
 };
 
 const NodeSummary = ({
@@ -333,6 +332,7 @@ const NodeSummary = ({
   deregistrationUnlockTime,
   liquidationDate,
   liquidationTime,
+  isInContractIdList,
 }: NodeSummaryProps) => {
   const eventState = parseStakeEventState(node);
   const isExited =
@@ -356,7 +356,7 @@ const NodeSummary = ({
     return (
       <>
         {contributors}
-        {!isExited ? (
+        {!isExited && isInContractIdList ? (
           isReadyToUnlockByDeregistration ? (
             <ReadyForExitNotification
               timeString={liquidationTime}
@@ -379,7 +379,7 @@ const NodeSummary = ({
     return (
       <>
         {contributors}
-        {isExited ? null : isReadyToExitByUnlock(
+        {isExited || !isInContractIdList ? null : isReadyToExitByUnlock(
             state,
             eventState,
             node.requested_unlock_height,
@@ -484,6 +484,9 @@ const StakedNodeCard = forwardRef<
 
   const address = targetWalletAddress ?? connectedAddress;
 
+  const { currentContractIds } = useStakes(address);
+  const isInContractIdList = currentContractIds?.has(stake.contract_id);
+
   const {
     operator_fee: fee,
     operator_address: operatorAddress,
@@ -542,6 +545,7 @@ const StakedNodeCard = forwardRef<
           node={stake}
           state={state}
           blockHeight={blockHeight}
+          isInContractIdList={isInContractIdList}
           deregistrationDate={deregistrationDate}
           deregistrationTime={deregistrationTime}
           deregistrationUnlockDate={deregistrationUnlockDate}

diff --git a/apps/staking/hooks/useStakes.tsx b/apps/staking/hooks/useStakes.tsx
@@ -146,12 +146,13 @@ export function useStakes(overrideAddress?: Address) {
     contracts,
     hiddenContractsWithStakes,
     addedBlsKeys,
+    currentContractIds,
     runningStakesBlsKeys,
     blockHeight,
     networkTime,
     network,
   ] = useMemo(() => {
-    if (!address || !data) return [[], [], [], null, null, null];
+    if (!address || !data) return [[], [], [], null, null, null, null];
     const stakesArr = 'stakes' in data && Array.isArray(data.stakes) ? data.stakes : [];
     const contractsArr = 'contracts' in data && Array.isArray(data.contracts) ? data.contracts : [];
 
@@ -169,6 +170,7 @@ export function useStakes(overrideAddress?: Address) {
         : {};
 
     const addedBlsKeysSet = new Set(Object.keys(blsKeysObject));
+    const currentContractIdsSet = new Set(Object.values(blsKeysObject));
     const runningStakesBlsKeysSet = new Set(
       stakesArr
         .filter((stake) => parseStakeEventState(stake) === STAKE_EVENT_STATE.ACTIVE)
@@ -228,6 +230,7 @@ export function useStakes(overrideAddress?: Address) {
       filteredContracts,
       hiddenContracts,
       addedBlsKeysSet,
+      currentContractIdsSet,
       runningStakesBlsKeysSet,
       blockHeight,
       networkTime,
@@ -240,6 +243,7 @@ export function useStakes(overrideAddress?: Address) {
     contracts,
     hiddenContractsWithStakes,
     addedBlsKeys,
+    currentContractIds,
     runningStakesBlsKeys,
     network,
     blockHeight,

diff --git a/packages/staking-api-js/client.ts b/packages/staking-api-js/client.ts
@@ -153,7 +153,7 @@ export interface GetStakesResponse {
   network: NetworkInfo;
   contracts: Array<ContributorContractInfo>;
   stakes: Array<Stake>;
-  added_bls_keys: Record<number, string>;
+  added_bls_keys: Record<string, number>;
 }
 
 /** /store */