Merge pull request #31 from lidofinance/fix/remove-weth

fix: edge case

Author: itaven

modules/vaults/hooks/use-vault-data.ts

@@ -1,4 +1,3 @@
-import { type Address } from 'viem';
 import { usePublicClient } from 'wagmi';
 import invariant from 'tiny-invariant';
 import { useQuery } from '@tanstack/react-query';
@@ -10,9 +9,97 @@ import { getStakingVaultContract } from 'modules/vaults/contracts/staking-vault'
 import { getDashboardContract } from 'modules/vaults/contracts/dashboard';
 import { STRATEGY_LAZY } from 'consts/react-query-strategies';
 import { getHealthScore } from 'utils/get-health-score';
+import { DEFAULT_ADMIN_ROLE, NODE_OPERATOR_MANAGER_ROLE } from 'consts/roles';
+import { bigIntMax } from 'utils/bigint-math';
 
 import type { VaultInfo } from 'types';
-import { DEFAULT_ADMIN_ROLE, NODE_OPERATOR_MANAGER_ROLE } from 'consts/roles';
+import type { PublicClient, Address } from 'viem';
+import type { LidoSDKShares } from '@lidofinance/lido-ethereum-sdk/shares';
+
+type VaultDataArgs = {
+  publicClient: PublicClient;
+  vaultAddress: Address;
+  shares: LidoSDKShares;
+};
+
+const getVaultData = async ({
+  publicClient,
+  vaultAddress,
+  shares,
+}: VaultDataArgs): Promise<VaultInfo> => {
+  const vaultHubContract = getVaultHubContract(publicClient);
+  const vaultContract = getStakingVaultContract(vaultAddress, publicClient);
+
+  const [owner, inOutDelta, nodeOperator, locked] = await Promise.all([
+    vaultContract.read.owner(),
+    vaultContract.read.inOutDelta(),
+    vaultContract.read.nodeOperator(),
+    vaultContract.read.locked(),
+  ]);
+
+  const balance = await publicClient.getBalance({
+    address: vaultContract.address,
+  });
+
+  const vaultHubSocket = await vaultHubContract.read.vaultSocket([
+    vaultAddress,
+  ]);
+
+  const dashboardContract = getDashboardContract(owner, publicClient);
+
+  const [
+    valuation,
+    nodeOperatorUnclaimedFee,
+    withdrawableEther,
+    nodeOperatorFeeBP,
+    totalMintableShares,
+    defaultAdmins,
+    nodeOperatorManagers,
+    confirmExpiry,
+  ] = await Promise.all([
+    dashboardContract.read.totalValue(),
+    dashboardContract.read.nodeOperatorUnclaimedFee(),
+    dashboardContract.read.withdrawableEther(),
+    dashboardContract.read.nodeOperatorFeeBP(),
+    dashboardContract.read.totalMintingCapacity(),
+    dashboardContract.read.getRoleMembers([DEFAULT_ADMIN_ROLE]),
+    dashboardContract.read.getRoleMembers([NODE_OPERATOR_MANAGER_ROLE]),
+    dashboardContract.read.getConfirmExpiry(),
+  ]);
+
+  const [mintedEth, mintableEth, ethLimit] = await Promise.all([
+    shares.convertToSteth(vaultHubSocket.liabilityShares),
+    shares.convertToSteth(
+      bigIntMax(totalMintableShares - vaultHubSocket.liabilityShares, 0n),
+    ),
+    shares.convertToSteth(vaultHubSocket.shareLimit),
+  ]);
+
+  const healthScore = getHealthScore(valuation, vaultHubSocket);
+
+  return {
+    mintable: mintableEth,
+    minted: mintedEth,
+    nodeOperator,
+    ethLimit,
+    valuation,
+    inOutDelta,
+    locked,
+    apr: null,
+    healthScore,
+    address: vaultAddress,
+    totalMintableShares,
+    nodeOperatorUnclaimedFee,
+    withdrawableEther,
+    owner,
+    balance,
+    nodeOperatorFeeBP,
+    defaultAdmins,
+    nodeOperatorManagers,
+    confirmExpiry,
+    ...vaultHubSocket,
+  };
+};
 
 export const useSingleVaultData = (vaultAddress: Address | undefined) => {
   const { shares } = useLidoSDK();
@@ -25,78 +112,7 @@ export const useSingleVaultData = (vaultAddress: Address | undefined) => {
       invariant(publicClient, 'PublicClient is not defined');
       invariant(vaultAddress, 'vaultAddress is not defined');
 
-      const vaultHubContract = getVaultHubContract(publicClient);
-      const vaultContract = getStakingVaultContract(vaultAddress, publicClient);
-
-      const [owner, inOutDelta, nodeOperator, locked] = await Promise.all([
-        vaultContract.read.owner(),
-        vaultContract.read.inOutDelta(),
-        vaultContract.read.nodeOperator(),
-        vaultContract.read.locked(),
-      ]);
-
-      const balance = await publicClient.getBalance({
-        address: vaultContract.address,
-      });
-
-      const vaultHubSocket = await vaultHubContract.read.vaultSocket([
-        vaultAddress,
-      ]);
-
-      const dashboardContract = getDashboardContract(owner, publicClient);
-
-      const [
-        valuation,
-        nodeOperatorUnclaimedFee,
-        withdrawableEther,
-        nodeOperatorFeeBP,
-        totalMintableShares,
-        defaultAdmins,
-        nodeOperatorManagers,
-        confirmExpiry,
-      ] = await Promise.all([
-        dashboardContract.read.totalValue(),
-        dashboardContract.read.nodeOperatorUnclaimedFee(),
-        dashboardContract.read.withdrawableEther(),
-        dashboardContract.read.nodeOperatorFeeBP(),
-        dashboardContract.read.totalMintingCapacity(),
-        dashboardContract.read.getRoleMembers([DEFAULT_ADMIN_ROLE]),
-        dashboardContract.read.getRoleMembers([NODE_OPERATOR_MANAGER_ROLE]),
-        dashboardContract.read.getConfirmExpiry(),
-      ]);
-
-      const [mintedEth, mintableEth, ethLimit] = await Promise.all([
-        shares.convertToSteth(vaultHubSocket.liabilityShares),
-        shares.convertToSteth(
-          totalMintableShares - vaultHubSocket.liabilityShares,
-        ),
-        shares.convertToSteth(vaultHubSocket.shareLimit),
-      ]);
-
-      const healthScore = getHealthScore(valuation, vaultHubSocket);
-
-      return {
-        mintable: mintableEth,
-        minted: mintedEth,
-        nodeOperator,
-        ethLimit,
-        valuation,
-        inOutDelta,
-        locked,
-        apr: null,
-        healthScore,
-        address: vaultAddress,
-        totalMintableShares,
-        nodeOperatorUnclaimedFee,
-        withdrawableEther,
-        owner,
-        balance,
-        nodeOperatorFeeBP,
-        defaultAdmins,
-        nodeOperatorManagers,
-        confirmExpiry,
-        ...vaultHubSocket,
-      };
+      return getVaultData({ publicClient, shares, vaultAddress });
     },
     ...STRATEGY_LAZY,
   });
@@ -116,7 +132,6 @@ export const useVaultData = (
     queryFn: async (): Promise<VaultInfo[]> => {
       invariant(publicClient, 'PublicClient is not ready');
 
-      const vaultHubContract = getVaultHubContract(publicClient);
       const vaults: VaultInfo[] = [];
 
       if (vaultsAddressesList?.length && vaultsAddressesList.length === 0) {
@@ -125,80 +140,13 @@ export const useVaultData = (
 
       // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
       for (const vaultAddress of vaultsAddressesList!) {
-        const vaultContract = getStakingVaultContract(
-          vaultAddress,
-          publicClient,
+        vaults.push(
+          await getVaultData({
+            publicClient,
+            vaultAddress,
+            shares,
+          }),
         );
-
-        const [owner, inOutDelta, nodeOperator, locked] = await Promise.all([
-          vaultContract.read.owner(),
-          vaultContract.read.inOutDelta(),
-          vaultContract.read.nodeOperator(),
-          vaultContract.read.locked(),
-        ]);
-
-        const balance = await publicClient.getBalance({
-          address: vaultContract.address,
-        });
-
-        const vaultHubSocket = await vaultHubContract.read.vaultSocket([
-          vaultAddress,
-        ]);
-
-        const dashboardContract = getDashboardContract(owner, publicClient);
-
-        const [
-          valuation,
-          nodeOperatorUnclaimedFee,
-          withdrawableEther,
-          nodeOperatorFeeBP,
-          totalMintableShares,
-          confirmExpiry,
-          defaultAdmins,
-          nodeOperatorManagers,
-        ] = await Promise.all([
-          dashboardContract.read.totalValue(),
-          dashboardContract.read.nodeOperatorUnclaimedFee(),
-          dashboardContract.read.withdrawableEther(),
-          dashboardContract.read.nodeOperatorFeeBP(),
-          dashboardContract.read.totalMintingCapacity(),
-          dashboardContract.read.getConfirmExpiry(),
-          dashboardContract.read.getRoleMembers([DEFAULT_ADMIN_ROLE]),
-          dashboardContract.read.getRoleMembers([NODE_OPERATOR_MANAGER_ROLE]),
-        ]);
-
-        const [mintedEth, mintableEth, ethLimit] = await Promise.all([
-          shares.convertToSteth(vaultHubSocket.liabilityShares),
-          shares.convertToSteth(
-            totalMintableShares - vaultHubSocket.liabilityShares,
-          ),
-          shares.convertToSteth(vaultHubSocket.shareLimit),
-        ]);
-
-        const healthScore = getHealthScore(valuation, vaultHubSocket);
-
-        vaults.push({
-          mintable: mintableEth,
-          minted: mintedEth,
-          nodeOperator,
-          ethLimit,
-          valuation,
-          inOutDelta,
-          locked,
-          apr: null,
-          healthScore,
-          address: vaultAddress,
-          totalMintableShares,
-          nodeOperatorUnclaimedFee,
-          withdrawableEther,
-          owner,
-          balance,
-          nodeOperatorFeeBP,
-          confirmExpiry,
-          defaultAdmins,
-          nodeOperatorManagers,
-          ...vaultHubSocket,
-        });
       }
 
       return vaults;