Fix status error (#29)

* fix collatorSet get method

* Optimize the useCollatorByAddress hook by adding the inset parameter and adjusting the query logic; dynamically control the display of the Stake button in StakeManagementModal based on the collator's status.

* remove koi chain

* support unstakeRINGFromInactiveCollator and unstakeDepositsFromInactiveCollator

* fix ts error

* fix abi

* fix types error

.env

@@ -2,7 +2,6 @@ VITE_PROJECT_ID = 2719448e2ce94fdd269a3c8587123bcc
 VITE_DEPLOYMENT_MODE = testnet
 VITE_APP_NAME = "Collator Staking - RingDAO"
 VITE_APP_DESCRIPTION = "Elevate your earnings and effortlessly manage your staking positions with the RingDAO collator staking page."
-VITE_KOI_GRAPHQL_API_URL = "https://thegraph-g2.darwinia.network/training/subgraphs/name/dip7index-koi-kv"
 VITE_CRAB_GRAPHQL_API_URL = "https://thegraph.darwinia.network/dip7/subgraphs/name/dip7index-crab"
 VITE_DARWINIA_GRAPHQL_API_URL = "https://thegraph.darwinia.network/dip7/subgraphs/name/dip7index-darwinia"
 

src/components/collator/_hooks/collator.ts

@@ -83,7 +83,7 @@ export const useCreateCollator = ({
 
   const { writeContractAsync, ...rest } = useWriteContract();
 
-  const oldKey = genKey({ address: address as `0x${string}`, votes: votes ?? 0n });
+  const oldKey = genKey({ address: address as `0x${string}`, votes: (votes as bigint) ?? 0n });
 
   const createCollator = useCallback(
     async ({ commission }: CreateAndCollatorProps) => {

src/components/collator/_hooks/commissionLocks.ts

@@ -16,7 +16,7 @@ export const useCommissionLocks = () => {
   });
 
   const isLockPeriod = useMemo(() => {
-    const locked = result?.data ?? 0n;
+    const locked = (result?.data as bigint) ?? 0n;
     const now = BigInt(Math.floor(Date.now() / 1000));
 
     return locked > now;

src/components/collator/_hooks/set-session-key.ts

@@ -7,8 +7,7 @@ const getData = (sessionKey: string, chainId: ChainId) => {
     case ChainId.DARWINIA:
     case ChainId.CRAB:
       return `0x0d00${sessionKey}00`;
-    case ChainId.KOI:
-      return `0x0a00${sessionKey}00`;
+
     default:
       return '';
   }

src/components/collator/_hooks/update-commission.ts

@@ -32,7 +32,7 @@ const useUpdateCommission = ({
     }
   });
 
-  const newKey = genKey({ address: collatorAddress, votes: votes ?? 0n });
+  const newKey = genKey({ address: collatorAddress, votes: (votes as bigint) ?? 0n });
 
   const { writeContractAsync, isPending } = useWriteContract();
 

src/config/abi/hub.ts

@@ -295,6 +295,25 @@ export const abi = [
     stateMutability: 'view',
     type: 'function'
   },
+  {
+    inputs: [
+      {
+        internalType: 'address',
+        name: 'c',
+        type: 'address'
+      }
+    ],
+    name: '_isInactiveCollator',
+    outputs: [
+      {
+        internalType: 'bool',
+        name: '',
+        type: 'bool'
+      }
+    ],
+    stateMutability: 'view',
+    type: 'function'
+  },
   {
     inputs: [
       {
@@ -813,6 +832,24 @@ export const abi = [
     stateMutability: 'nonpayable',
     type: 'function'
   },
+  {
+    inputs: [
+      {
+        internalType: 'address',
+        name: 'collator',
+        type: 'address'
+      },
+      {
+        internalType: 'uint256[]',
+        name: 'depositIds',
+        type: 'uint256[]'
+      }
+    ],
+    name: 'unstakeDepositsFromInactiveCollator',
+    outputs: [],
+    stateMutability: 'nonpayable',
+    type: 'function'
+  },
   {
     inputs: [
       {
@@ -841,6 +878,24 @@ export const abi = [
     stateMutability: 'nonpayable',
     type: 'function'
   },
+  {
+    inputs: [
+      {
+        internalType: 'address',
+        name: 'collator',
+        type: 'address'
+      },
+      {
+        internalType: 'uint256',
+        name: 'assets',
+        type: 'uint256'
+      }
+    ],
+    name: 'unstakeRINGFromInactiveCollator',
+    outputs: [],
+    stateMutability: 'nonpayable',
+    type: 'function'
+  },
   {
     inputs: [
       {

src/config/chains/index.ts

@@ -1,22 +1,18 @@
 import { ChainId } from '@/types/chains';
 import { nativeTokenIcon as crabNativeTokenIcon } from './crab';
 import { nativeTokenIcon as darwiniaNativeTokenIcon } from './darwinia';
-import { nativeTokenIcon as koiNativeTokenIcon } from './koi';
 
 export { chain as crab, nativeTokenIcon as crabNativeTokenIcon } from './crab';
 export { chain as darwinia, nativeTokenIcon as darwiniaNativeTokenIcon } from './darwinia';
-export { chain as koi, nativeTokenIcon as koiNativeTokenIcon } from './koi';
 
 export const KTON_TOKEN_MAP = new Map<ChainId, string>([
   [ChainId.CRAB, 'CKTON'],
-  [ChainId.DARWINIA, 'KTON'],
-  [ChainId.KOI, 'PKTON']
+  [ChainId.DARWINIA, 'KTON']
 ]);
 
 export const NATIVE_TOKEN_ICON_MAP = new Map<ChainId, string>([
   [ChainId.CRAB, crabNativeTokenIcon],
-  [ChainId.DARWINIA, darwiniaNativeTokenIcon],
-  [ChainId.KOI, koiNativeTokenIcon]
+  [ChainId.DARWINIA, darwiniaNativeTokenIcon]
 ]);
 
 export const KTON_TOKEN_INFO_MAP = new Map<
@@ -40,15 +36,6 @@ export const KTON_TOKEN_INFO_MAP = new Map<
       address: '0x0000000000000000000000000000000000000402',
       governanceName: 'KtonDAO'
     }
-  ],
-  [
-    ChainId.KOI,
-    {
-      symbol: 'PKTON',
-      decimals: 18,
-      address: '0x0000000000000000000000000000000000000402',
-      governanceName: 'PktonDAO'
-    }
   ]
 ]);
 
@@ -72,13 +59,6 @@ export const RING_DAO_GOVERNANCE_MAP = new Map<
       url: "'http://vote.ringdao.com'",
       name: 'RingDAO governance'
     }
-  ],
-  [
-    ChainId.KOI,
-    {
-      url: "'http://koi-vote.ringdao.com'",
-      name: 'RingDAO test version governance'
-    }
   ]
 ]);
 
@@ -105,13 +85,5 @@ export const GRING_TOKEN_ADDRESS_MAP = new Map<
       symbol: 'gRING',
       decimals: 18
     }
-  ],
-  [
-    ChainId.KOI,
-    {
-      address: '0xdafa555e2785DC8834F4Ea9D1ED88B6049142999',
-      symbol: 'gKRING',
-      decimals: 18
-    }
   ]
 ]);

src/hooks/useService.ts

@@ -146,14 +146,15 @@ export const fetchCollatorSetNewPrev = async ({
 type CollatorByAddressParams = {
   address: `0x${string}`;
   enabled?: boolean;
+  inset?: number;
 };
-export function useCollatorByAddress({ address, enabled = true }: CollatorByAddressParams) {
+export function useCollatorByAddress({ address, enabled = true, inset }: CollatorByAddressParams) {
   const { currentChainId, isEnabled } = useWalletStatus();
 
   const params: CollatorSetQueryParams = {
     where: {
       ...(address ? { address: toLowerCase(address) } : {}),
-      inset: 1
+      ...(inset !== undefined ? { inset } : {})
     },
     orderBy: 'key',
     orderDirection: 'desc',

src/hooks/useStakingAccountWithStatus.ts

@@ -41,7 +41,9 @@ function useStakingAccountWithStatus() {
 
     return data.map((account) => {
       const collatorAddress = account.collator.toLowerCase().trim();
-      const collatorSet = collatorSetByAccounts?.[collatorAddress];
+      const collatorSet = collatorSetByAccounts?.find(
+        (c) => c.address?.toLowerCase() === collatorAddress
+      );
 
       let status: CollatorStatus | undefined = undefined;
       if (isLoadingActiveCollators || isRefetchingActiveCollators) {

src/service/client.ts

@@ -1,14 +1,11 @@
 import { ChainId } from '@/types/chains';
 import { GraphQLClient } from 'graphql-request';
 
-export const koiClient = new GraphQLClient(import.meta.env.VITE_KOI_GRAPHQL_API_URL);
 export const crabClient = new GraphQLClient(import.meta.env.VITE_CRAB_GRAPHQL_API_URL);
 export const darwiniaClient = new GraphQLClient(import.meta.env.VITE_DARWINIA_GRAPHQL_API_URL);
 
 export function getClient(chainId: ChainId) {
   switch (chainId) {
-    case ChainId.KOI:
-      return koiClient;
     case ChainId.CRAB:
       return crabClient;
     case ChainId.DARWINIA:

src/types/chains.ts

@@ -3,12 +3,10 @@
  */
 export enum ChainId {
   CRAB = 44,
-  DARWINIA = 46,
-  KOI = 701
+  DARWINIA = 46
 }
 
 export const ktonToken = {
   [ChainId.CRAB]: 'CKTON',
-  [ChainId.DARWINIA]: 'KTON',
-  [ChainId.KOI]: 'PKTON'
+  [ChainId.DARWINIA]: 'KTON'
 };

src/utils/chain.ts

@@ -1,23 +1,11 @@
-import { darwinia, crab, koi } from "@/config/chains";
-import { DEPLOYMENT_MODE } from "@/types/deploy";
-import { ChainId } from "@/types/chains";
+import { darwinia, crab } from '@/config/chains';
+import { ChainId } from '@/types/chains';
 
-import type { Chain } from "@rainbow-me/rainbowkit";
-
-const chainDeployMode: DEPLOYMENT_MODE =
-  import.meta.env.VITE_DEPLOYMENT_MODE === "mainnet"
-    ? DEPLOYMENT_MODE.MAINNET
-    : DEPLOYMENT_MODE.TESTNET;
-
-const defaultChainForMode: Record<DEPLOYMENT_MODE, ChainId> = {
-  [DEPLOYMENT_MODE.MAINNET]: ChainId.DARWINIA,
-  [DEPLOYMENT_MODE.TESTNET]: ChainId.KOI,
-};
+import type { Chain } from '@rainbow-me/rainbowkit';
 
 const chainConfigMap: Record<ChainId, Chain> = {
   [ChainId.DARWINIA]: darwinia,
-  [ChainId.CRAB]: crab,
-  [ChainId.KOI]: koi,
+  [ChainId.CRAB]: crab
 };
 
 // Helper function to filter chains based on deployment mode
@@ -32,7 +20,7 @@ function filterChainsByDeploymentMode(chains: Record<ChainId, Chain>): Chain[] {
 export function getChains(): [Chain, ...Chain[]] {
   const filteredChains: Chain[] = filterChainsByDeploymentMode(chainConfigMap);
   if (filteredChains.length === 0) {
-    throw new Error("No suitable chain configurations are available.");
+    throw new Error('No suitable chain configurations are available.');
   }
   return filteredChains as [Chain, ...Chain[]];
 }
@@ -47,14 +35,12 @@ export function getDefaultChain(): Chain {
   const filteredChains = filterChainsByDeploymentMode(chainConfigMap);
   if (filteredChains.length === 0) {
     throw new Error(
-      "No suitable chain configurations are available for the current deployment mode."
+      'No suitable chain configurations are available for the current deployment mode.'
     );
   }
 
-  const defaultChainId = defaultChainForMode[chainDeployMode];
-  const defaultChain = filteredChains.find(
-    (chain) => chain.id === defaultChainId
-  );
+  const defaultChainId = ChainId.DARWINIA;
+  const defaultChain = filteredChains.find((chain) => chain.id === defaultChainId);
 
   return defaultChain || filteredChains[0];
 }