feat: migration continue wrong network hook added

Author: satanworker

package.json

@@ -31,7 +31,7 @@
     "test:ci": "jest --ci"
   },
   "dependencies": {
-    "@aave/contract-helpers": "1.9.0",
+    "@aave/contract-helpers": "1.9.1-d6df625bf33ae6be0ed1a122ca941e3015691c6a.0",
     "@aave/math-utils": "1.9.0",
     "@emotion/cache": "11.10.3",
     "@emotion/react": "11.10.4",

src/components/transactions/FlowCommons/ModalWrapper.tsx

@@ -8,6 +8,7 @@ import {
 } from 'src/hooks/app-data-provider/useAppDataProvider';
 import { useWalletBalances } from 'src/hooks/app-data-provider/useWalletBalances';
 import { AssetCapsProvider } from 'src/hooks/useAssetCaps';
+import { useIsWrongNetwork } from 'src/hooks/useIsWrongNetwork';
 import { useModalContext } from 'src/hooks/useModal';
 import { usePermissions } from 'src/hooks/usePermissions';
 import { useProtocolDataContext } from 'src/hooks/useProtocolDataContext';
@@ -46,17 +47,15 @@ export const ModalWrapper: React.FC<{
   requiredPermission,
   keepWrappedSymbol,
 }) => {
-  const { chainId: connectedChainId, watchModeOnlyAddress } = useWeb3Context();
+  const { watchModeOnlyAddress } = useWeb3Context();
   const { walletBalances } = useWalletBalances();
-  const {
-    currentChainId: marketChainId,
-    currentNetworkConfig,
-    currentMarketData,
-  } = useProtocolDataContext();
+  const { currentNetworkConfig, currentMarketData } = useProtocolDataContext();
   const { user, reserves } = useAppDataContext();
   const { txError, mainTxState } = useModalContext();
   const { permissions } = usePermissions();
 
+  const { isWrongNetwork, requiredChainId } = useIsWrongNetwork(_requiredChainId);
+
   if (txError && txError.blocking) {
     return <TxErrorView txError={txError} />;
   }
@@ -70,9 +69,6 @@ export const ModalWrapper: React.FC<{
     return <>{currentMarketData.permissionComponent}</>;
   }
 
-  const requiredChainId = _requiredChainId ? _requiredChainId : marketChainId;
-  const isWrongNetwork = connectedChainId !== requiredChainId;
-
   const poolReserve = reserves.find((reserve) => {
     if (underlyingAsset.toLowerCase() === API_ETH_MOCK_ADDRESS.toLowerCase())
       return reserve.isWrappedBaseAsset;

src/hooks/useIsWrongNetwork.tsx

@@ -0,0 +1,16 @@
+import { useWeb3Context } from 'src/libs/hooks/useWeb3Context';
+
+import { useProtocolDataContext } from './useProtocolDataContext';
+
+export function useIsWrongNetwork(_requiredChainId?: number) {
+  const { currentChainId } = useProtocolDataContext();
+  const { chainId: connectedChainId } = useWeb3Context();
+
+  const requiredChainId = _requiredChainId ? _requiredChainId : currentChainId;
+  const isWrongNetwork = connectedChainId !== requiredChainId;
+
+  return {
+    isWrongNetwork,
+    requiredChainId,
+  };
+}

src/hooks/useUserReserves.tsx

@@ -1,5 +1,5 @@
 import {
-  selectUserBorrowPositions,
+  selectNonEmptyUserBorrowPositions,
   selectUserNonEmtpySummaryAndIncentive,
 } from 'src/store/poolSelectors';
 import { useRootStore } from 'src/store/root';
@@ -13,7 +13,7 @@ export const useUserReserves = () => {
     selectUserNonEmtpySummaryAndIncentive(state, currentTimestamp)
   );
   const borrowPositions = useRootStore((state) =>
-    selectUserBorrowPositions(state, currentTimestamp)
+    selectNonEmptyUserBorrowPositions(state, currentTimestamp)
   );
 
   return { user, borrowPositions };

src/store/poolSelectors.ts

@@ -1,18 +1,22 @@
 import { formatReservesAndIncentives, formatUserSummaryAndIncentives } from '@aave/math-utils';
 import { EmodeCategory } from 'src/helpers/types';
 import { fetchIconSymbolAndName, STABLE_ASSETS } from 'src/ui-config/reservePatches';
-import { CustomMarket, MarketDataType, marketsData } from 'src/utils/marketsAndNetworksConfig';
-import { PoolReserve } from './poolSlice';
+import { CustomMarket, marketsData } from 'src/utils/marketsAndNetworksConfig';
 
+import { PoolReserve } from './poolSlice';
 import { RootStore } from './root';
 
 export const selectCurrentChainIdV2MarketKey = (state: RootStore): CustomMarket => {
-  // TODO: make it dynamic
+  if (state.currentChainId) {
+    // TODO: make it dynamic
+  }
   return 'fork_proto_polygon' as CustomMarket;
 };
 
 export const selectCurrentChainIdV3MarketKey = (state: RootStore): CustomMarket => {
-  // TODO: make it dynamic
+  if (state.currentChainId) {
+    // TODO: make it dynamic
+  }
   return 'fork_proto_polygon_v3' as CustomMarket;
 };
 
@@ -147,7 +151,7 @@ export const selectUserNonEmtpySummaryAndIncentive = (
   };
 };
 
-export const selectUserBorrowPositions = (state: RootStore, currentTimestamp: number) => {
+export const selectNonEmptyUserBorrowPositions = (state: RootStore, currentTimestamp: number) => {
   const user = selectUserSummaryAndIncentives(state, currentTimestamp);
   const borrowedPositions = user.userReservesData.filter(
     (reserve) => reserve.variableBorrows != '0' || reserve.stableBorrows != '0'

src/store/poolSlice.ts

@@ -35,7 +35,7 @@ import { SupplyActionProps } from 'src/components/transactions/Supply/SupplyActi
 import { SwapActionProps } from 'src/components/transactions/Swap/SwapActions';
 import { getRepayCallData, getSwapCallData } from 'src/hooks/useSwap';
 import { MarketDataType } from 'src/ui-config/marketsConfig';
-import { availableMarkets, marketsData, networkConfigs } from 'src/utils/marketsAndNetworksConfig';
+import { marketsData } from 'src/utils/marketsAndNetworksConfig';
 import { optimizedPath } from 'src/utils/utils';
 import { StateCreator } from 'zustand';
 

src/store/root.ts

@@ -1,6 +1,5 @@
 import { enableMapSet } from 'immer';
 import { CustomMarket } from 'src/ui-config/marketsConfig';
-import { marketsData } from 'src/utils/marketsAndNetworksConfig';
 import create from 'zustand';
 import { devtools } from 'zustand/middleware';
 

src/store/v3MigrationSelectors.ts

@@ -13,7 +13,6 @@ import {
   selectCurrentChainIdV2MarketData,
   selectCurrentChainIdV3MarketData,
   selectFormatBaseCurrencyData,
-  selectFormatUserEmodeCategoryId,
   selectUserNonEmtpySummaryAndIncentive,
   selectUserSummaryAndIncentives,
 } from './poolSelectors';
@@ -97,7 +96,6 @@ export const selectFormatUserSummaryForMigration = (
   reserves: ReserveDataHumanized[] = [],
   userReserves: UserReserveDataHumanized[] = [],
   baseCurrencyData: PoolBaseCurrencyHumanized,
-  userEmodeCategoryId: number,
   currentTimestamp: number
 ) => {
   const { marketReferenceCurrencyDecimals, marketReferenceCurrencyPriceInUsd } = baseCurrencyData;
@@ -135,13 +133,11 @@ export const selectV2UserSummaryAfterMigration = (store: RootStore, currentTimes
     }) || [];
 
   const baseCurrencyData = selectFormatBaseCurrencyData(poolReserve);
-  const userEmodeCategoryId = selectFormatUserEmodeCategoryId(poolReserve);
 
   return selectFormatUserSummaryForMigration(
     poolReserve?.reserves,
     userReserves,
     baseCurrencyData,
-    userEmodeCategoryId,
     currentTimestamp
   );
 };
@@ -170,7 +166,6 @@ export const selectV3UserSummaryAfterMigration = (store: RootStore, currentTimes
           userReserve.scaledATokenBalance,
           suppliedAsset.scaledATokenBalance
         );
-        //TODO: merge only if emode categories are the same?
         return {
           ...userReserve,
           scaledATokenBalance: combinedScaledATokenBalance,
@@ -188,27 +183,27 @@ export const selectV3UserSummaryAfterMigration = (store: RootStore, currentTimes
     }) || [];
 
   const baseCurrencyData = selectFormatBaseCurrencyData(poolReserveV3);
-  const userEmodeCategoryId = selectFormatUserEmodeCategoryId(poolReserveV3);
 
   return selectFormatUserSummaryForMigration(
     poolReserveV3?.reserves,
     userReserves,
     baseCurrencyData,
-    userEmodeCategoryId,
     currentTimestamp
   );
 };
 
 export const selectV3UserSummary = (store: RootStore, timestamp: number) => {
   const poolReserveV3 = selectCurrentChainIdV3MarketData(store);
   const baseCurrencyData = selectFormatBaseCurrencyData(poolReserveV3);
-  const userEmodeCategoryId = selectFormatUserEmodeCategoryId(poolReserveV3);
 
   return selectFormatUserSummaryForMigration(
     poolReserveV3?.reserves,
     poolReserveV3?.userReserves,
     baseCurrencyData,
-    userEmodeCategoryId,
     timestamp
   );
 };
+
+export const selectIsMigrationAvailable = (store: RootStore) => {
+  return Boolean(store.currentMarketData.addresses.V3_MIGRATOR);
+};

src/store/v3MigrationSlice.ts

@@ -2,27 +2,20 @@ import {
   ERC20_2612Service,
   ERC20Service,
   EthereumTransactionTypeExtended,
+  Pool,
   V3MigrationHelperService,
   valueToWei,
-  Pool,
-  InterestRate,
 } from '@aave/contract-helpers';
 import { V3MigrationHelperSignedPermit } from '@aave/contract-helpers/dist/esm/v3-migration-contract/v3MigrationTypes';
-import { valueToBigNumber } from '@aave/math-utils';
 import { SignatureLike } from '@ethersproject/bytes';
 import dayjs from 'dayjs';
-import { BigNumber, BigNumberish, constants } from 'ethers';
+import { BigNumberish } from 'ethers';
 import { produce } from 'immer';
 import { Approval } from 'src/helpers/useTransactionHandler';
-import { CustomMarket } from 'src/ui-config/marketsConfig';
 import { marketsData } from 'src/utils/marketsAndNetworksConfig';
 import { StateCreator } from 'zustand';
-import {
-  selectCurrentChainIdV2MarketData,
-  selectCurrentChainIdV2MarketKey,
-  selectCurrentChainIdV3MarketKey,
-} from './poolSelectors';
 
+import { selectCurrentChainIdV2MarketKey, selectCurrentChainIdV3MarketKey } from './poolSelectors';
 import { RootStore } from './root';
 import {
   selectedUserSupplyReservesForMigration,
@@ -197,8 +190,7 @@ export const createV3MigrationSlice: StateCreator<
       });
     },
     getMigratorAddress: () => {
-      // TODO: map migrator addresses for each chain after deployment
-      return '0x01ce9bbcc0418614a8bba983fe79cf77211996f2';
+      return get().currentMarketData.addresses.V3_MIGRATOR || '';
     },
     getMigrationServiceInstance: () => {
       const address = get().getMigratorAddress();
@@ -219,8 +211,11 @@ export const createV3MigrationSlice: StateCreator<
         WETH_GATEWAY: currentMarketV3Data.addresses.WETH_GATEWAY,
         L2_ENCODER: currentMarketV3Data.addresses.L2_ENCODER,
       });
+      const migrationServiceInstances = get().migrationServiceInstances;
       const newMigratorInstance = new V3MigrationHelperService(provider, migratorAddress, pool);
-      // TODO: don't forget to add maping here
+      set({
+        migrationServiceInstances: { ...migrationServiceInstances, [address]: newMigratorInstance },
+      });
       return newMigratorInstance;
     },
     migrateBorrow: async (signedPermits: V3MigrationHelperSignedPermit[] = []) => {

src/ui-config/marketsConfig.tsx

@@ -31,6 +31,7 @@ export type MarketDataType = {
     UI_POOL_DATA_PROVIDER: string;
     UI_INCENTIVE_DATA_PROVIDER?: string;
     COLLECTOR?: string;
+    V3_MIGRATOR?: string;
   };
   /**
    * https://www.hal.xyz/ has integrated aave for healtfactor warning notification
@@ -152,6 +153,7 @@ export const marketsData: {
       UI_POOL_DATA_PROVIDER: '0x0d24b23DBaB0dc1A6F58029bA94F94Ff0D5382c2',
       UI_INCENTIVE_DATA_PROVIDER: '0x645654D59A5226CBab969b1f5431aA47CBf64ab8',
       COLLECTOR: '0x7734280A4337F37Fbf4651073Db7c28C80B339e9',
+      V3_MIGRATOR: '0x01ce9bbcc0418614a8bba983fe79cf77211996f2',
     },
     halIntegration: {
       URL: 'https://app.hal.xyz/recipes/aave-track-your-health-factor',