Merge pull request #57 from lidofinance/feature/post-testnet

Post testnet fixes

Author: Jeday

config/network/const.ts

@@ -1,7 +1,6 @@
 import type { Address } from 'viem';
 
-// For future overrides of APIs in devnets
-export const API_NAMES = {};
+const API_LIST = ['vaultApi'] as const;
 
 const CONTRACT_LIST = [
   'lido',
@@ -24,11 +23,16 @@ export const CONTRACTS = Object.fromEntries(
   CONTRACT_LIST.map((contract) => [contract, contract]),
 ) as { [key in (typeof CONTRACT_LIST)[number]]: key };
 
+export const APIS = Object.fromEntries(API_LIST.map((api) => [api, api])) as {
+  [key in (typeof API_LIST)[number]]: key;
+};
+
 export type CONTRACT_NAMES = (typeof CONTRACT_LIST)[number];
+export type API_NAMES = (typeof API_LIST)[number];
 
 export type NetworkConfig = {
   api: {
-    [K in keyof typeof API_NAMES]?: string;
+    [K in keyof typeof APIS]?: string;
   };
   contracts: {
     [K in keyof typeof CONTRACTS]?: Address;

config/network/index.ts

@@ -5,7 +5,7 @@ import type { Address } from 'viem';
 import { CHAINS } from '@lidofinance/lido-ethereum-sdk/common';
 
 import { getPreConfig } from 'config/get-preconfig';
-import type { CONTRACT_NAMES, NetworkConfig } from './const';
+import type { API_NAMES, CONTRACT_NAMES, NetworkConfig } from './const';
 
 // Main deployments
 import mainnetSet from 'networks/mainnet.json' assert { type: 'json' };
@@ -71,3 +71,12 @@ export const getContractAddress = (
 
   return networkConfig?.contracts?.[contractName];
 };
+
+export const getApiURL = (
+  chain: CHAINS,
+  apiName: API_NAMES,
+): string | undefined => {
+  const networkConfig = getNetworkConfig(chain);
+
+  return networkConfig?.api?.[apiName];
+};

features/adjustment/adjustment-tabs.tsx

@@ -1,5 +1,5 @@
 import { useAdjustment } from 'features/adjustment/contexts/adjustment-provider';
-import { useVaultInfo } from 'features/overview/contexts';
+import { useVaultInfo } from 'modules/vaults';
 
 import { Switch } from 'shared/components/switch';
 import { ManifestConfigPageEnum } from 'config/external-config';

features/adjustment/mint/form/submit-button/submit-button.tsx

@@ -1,19 +1,52 @@
-import { PermissionedSubmitButton } from 'modules/vaults/components';
-import { useFormContext } from 'react-hook-form';
+import { OracleReportButton } from 'features/report';
+import { useVaultInfo, type VAULT_OWNER_ROLES } from 'modules/vaults';
+import { MultiplePermissionedSubmitButton } from 'modules/vaults/components';
+import { useMemo } from 'react';
+import { useFormContext, useWatch } from 'react-hook-form';
+
+const NON_INCREASE_LOCK_ROLES = ['minter'] as VAULT_OWNER_ROLES[];
+const INCREASE_LOCK_ROLES = ['minter', 'locker'] as VAULT_OWNER_ROLES[];
 
 export const SubmitButton = () => {
   const {
     formState: { isSubmitting, isValid },
   } = useFormContext();
+
+  const { activeVault } = useVaultInfo();
+
+  const [amount, token] = useWatch<{
+    amount?: bigint;
+    token: 'stETH' | 'wstETH';
+  }>({
+    name: ['amount', 'token'],
+  });
+
+  // TODO: move this check to upper context
+  const roles: VAULT_OWNER_ROLES[] = useMemo(() => {
+    if (!activeVault || !amount) return NON_INCREASE_LOCK_ROLES;
+    const isSteth = token === 'stETH';
+    const locked = isSteth ? activeVault.locked : activeVault.lockedShares;
+    const newMinted =
+      (amount as bigint) +
+      (isSteth ? activeVault.liabilityStETH : activeVault.liabilityShares);
+
+    if (newMinted > locked) {
+      return INCREASE_LOCK_ROLES;
+    }
+    return NON_INCREASE_LOCK_ROLES;
+  }, [activeVault, amount, token]);
+
   const disabled = isSubmitting && !isValid;
 
   return (
-    <PermissionedSubmitButton
-      dashboardRole="minter"
-      type="submit"
-      disabled={disabled}
-    >
-      Mint
-    </PermissionedSubmitButton>
+    <OracleReportButton action="minting">
+      <MultiplePermissionedSubmitButton
+        dashboardRoles={roles}
+        type="submit"
+        disabled={disabled}
+      >
+        Mint
+      </MultiplePermissionedSubmitButton>
+    </OracleReportButton>
   );
 };

features/adjustment/mint/hooks/use-mint.ts

@@ -10,13 +10,13 @@ import { Address, encodeFunctionData } from 'viem';
 
 import { dashboardAbi } from 'abi/dashboard-abi';
 import { useDappStatus } from 'modules/web3/hooks/use-dapp-status';
-import { useVaultInfo } from 'features/overview/contexts';
+import { useVaultInfo } from 'modules/vaults';
 import {
   SubmitPayload,
   SubmitStepEnum,
 } from 'shared/components/submit-modal/types';
 import invariant from 'tiny-invariant';
-import { useVaultPermissions } from 'modules/vaults/hooks/use-vault-permissions';
+import { useVaultPermission } from 'modules/vaults/hooks/use-vault-permissions';
 import { fallbackedAddress } from 'utils/fallbacked-address';
 
 export const useMint = (onMutate = () => {}) => {
@@ -76,7 +76,7 @@ export const useEstimateMint = ({
   token,
   amount,
 }: EstimateGasMintProps) => {
-  const { hasPermission } = useVaultPermissions('minter');
+  const { hasPermission } = useVaultPermission('minter');
   const { address } = useAccount();
   const payload = [
     fallbackedAddress(recipient || address),

features/adjustment/mint/mint-form-context/mint-form-provider.tsx

@@ -11,7 +11,7 @@ import { FormProvider, useForm } from 'react-hook-form';
 import invariant from 'tiny-invariant';
 
 import { useFormControllerRetry } from 'shared/hook-form/form-controller/use-form-controller-retry-delegate';
-import { useVaultInfo } from 'features/overview/contexts';
+import { useVaultInfo } from 'modules/vaults';
 import { useMint } from 'features/adjustment/mint/hooks';
 
 import {
@@ -31,6 +31,7 @@ import { Address } from 'viem';
 type MintDataContextValue = {
   mintableStETH: bigint;
   mintableWstETH: bigint;
+  lockedEther: bigint;
 };
 
 const MintDataContext = createContext<MintDataContextValue | null>(null);
@@ -66,8 +67,13 @@ export const MintFormProvider: FC<{ children: ReactNode }> = ({ children }) => {
   const mintData = useMemo(() => {
     const mintableStETH = activeVault?.mintableStETH ?? 0n;
     const mintableWstETH = activeVault?.mintableShares ?? 0n;
+    const lockedEther = activeVault?.locked ?? 0n;
 
-    return { mintableStETH, mintableWstETH };
+    return {
+      mintableStETH,
+      mintableWstETH,
+      lockedEther,
+    };
   }, [activeVault]);
 
   const { retryEvent, retryFire } = useFormControllerRetry();

features/adjustment/repay/form/balance/balance.tsx

@@ -3,7 +3,7 @@ import { Loader } from '@lidofinance/lido-ui';
 import { formatBalance } from 'utils';
 import { useFormContext } from 'react-hook-form';
 import { useRepayFormData } from 'features/adjustment/repay/repay-form-context';
-import { useVaultInfo } from 'features/overview/contexts';
+import { useVaultInfo } from 'modules/vaults';
 import { bigIntMin } from 'utils/bigint-math';
 
 export const Balance = () => {

features/adjustment/repay/form/feature-tx-info/feature-tx-info.tsx

@@ -5,7 +5,7 @@ import { useEstimateGasBurn } from '../../hooks';
 import { AllowanceDataTableRow } from 'shared/components/allowance-data-table-row';
 import { useAllowance } from 'modules/web3';
 import { useTokenAddress } from 'shared/hooks/use-token-address';
-import { useVaultInfo } from 'features/overview/contexts';
+import { useVaultInfo } from 'modules/vaults';
 
 export const FeatureTxInfo = () => {
   const { watch } = useFormContext();

features/adjustment/repay/hooks/use-burn.ts

@@ -11,13 +11,13 @@ import { encodeFunctionData, maxUint256 } from 'viem';
 
 import { dashboardAbi } from 'abi/dashboard-abi';
 import { useDappStatus } from 'modules/web3/hooks/use-dapp-status';
-import { useVaultInfo } from 'features/overview/contexts';
+import { useVaultInfo } from 'modules/vaults';
 import {
   SubmitPayload,
   SubmitStepEnum,
 } from 'shared/components/submit-modal/types';
 import invariant from 'tiny-invariant';
-import { useVaultPermissions } from 'modules/vaults/hooks/use-vault-permissions';
+import { useVaultPermission } from 'modules/vaults/hooks/use-vault-permissions';
 import { useLidoSDK } from 'modules/web3';
 
 type BurnArgs = {
@@ -55,24 +55,25 @@ export const useBurn = (onMutate = () => {}) => {
         to: activeVault.owner,
       });
       const needsAllowance = allowance < amount;
-
-      setModalState({ step: SubmitStepEnum.confirming });
-
       if (needsAllowance) {
-        const receipt = await tokenContract.approve({
+        setModalState({ step: SubmitStepEnum.confirming });
+
+        const result = await tokenContract.approve({
           amount: maxUint256,
           to: activeVault.owner,
+          callback: async (props) => {
+            if (props.stage === 'receipt') {
+              setModalState({ step: SubmitStepEnum.submitting });
+            }
+          },
         });
 
-        setModalState({ step: SubmitStepEnum.submitting, tx: receipt.hash });
-
-        await publicClient.waitForTransactionReceipt({
-          hash: receipt.hash,
-        });
+        if (result.receipt?.status === 'reverted') {
+          throw new Error('Transaction was reverted');
+        }
       }
 
       setModalState({ step: SubmitStepEnum.confirming });
-
       const tx = await writeContractAsync({
         abi: dashboardAbi,
         address: activeVault.owner,
@@ -109,7 +110,7 @@ export const useEstimateGasBurn = ({
   amount,
   allowance,
 }: EstimateGasBurnProps) => {
-  const { hasPermission } = useVaultPermissions('repayer');
+  const { hasPermission } = useVaultPermission('repayer');
   const { address } = useAccount();
   const payload = [amount ?? 1n] as const;
   const functionName = token === 'stETH' ? 'burnStETH' : 'burnWstETH';

features/claim/claim-form/claim-form-context/claim-form-provider.tsx

@@ -13,7 +13,7 @@ import { FormProvider, useForm } from 'react-hook-form';
 
 import { useFormControllerRetry } from 'shared/hook-form/form-controller/use-form-controller-retry-delegate';
 import { useClaim } from 'features/claim/claim-form/hooks';
-import { useVaultInfo } from 'features/overview/contexts';
+import { useVaultInfo } from 'modules/vaults';
 
 import {
   FormController,