feature: select current market v2 and v3 dynamic selectors added

Author: satanworker

pages/v3-migration.page.tsx

@@ -1,5 +1,6 @@
 import { Trans } from '@lingui/macro';
 import { Box, Divider } from '@mui/material';
+import { useEffect } from 'react';
 import { ConnectWalletPaper } from 'src/components/ConnectWalletPaper';
 import { ContentContainer } from 'src/components/ContentContainer';
 import { MigrateV3Modal } from 'src/components/transactions/MigrateV3/MigrateV3Modal';
@@ -20,6 +21,7 @@ export default function V3Migration() {
   const { loading } = useAppDataContext();
   const { currentAccount, loading: web3Loading } = useWeb3Context();
   const { isPermissionsLoading } = usePermissions();
+  const setCurrentMarketForMigration = useRootStore((state) => state.setCurrentMarketForMigration);
 
   const { user, borrowPositions } = useUserReserves();
 
@@ -30,7 +32,12 @@ export default function V3Migration() {
     selectedMigrationBorrowAssets: selectedBorrowAssets,
   } = useRootStore();
 
-  // start refreshing v3 market at the same time
+  useEffect(() => {
+    if (setCurrentMarketForMigration) {
+      setCurrentMarketForMigration();
+    }
+  }, [setCurrentMarketForMigration]);
+
   usePoolDataV3Subscription();
 
   return (

src/store/poolSelectors.ts

@@ -1,17 +1,34 @@
 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 { RootStore } from './root';
 
+export const selectCurrentChainIdV2MarketKey = (state: RootStore): CustomMarket => {
+  // TODO: make it dynamic
+  return 'fork_proto_polygon' as CustomMarket;
+};
+
+export const selectCurrentChainIdV3MarketKey = (state: RootStore): CustomMarket => {
+  // TODO: make it dynamic
+  return 'fork_proto_polygon_v3' as CustomMarket;
+};
+
+export const selectCurrentChainIdV2MarketData = (state: RootStore) => {
+  const v2MarketKey = selectCurrentChainIdV2MarketKey(state);
+  const marketData = marketsData[v2MarketKey];
+  return state.data
+    .get(state.currentChainId)
+    ?.get(marketData.addresses.LENDING_POOL_ADDRESS_PROVIDER);
+};
+
 export const selectCurrentUserLendingPoolData = (state: RootStore) => {
   return state.data
     .get(state.currentChainId)
     ?.get(state.currentMarketData.addresses.LENDING_POOL_ADDRESS_PROVIDER);
 };
 
-export const selectLendingPoolDataV2 = (state: RootStore) => {};
-
 export const selectCurrentUserEmodeCategoryId = (state: RootStore): number => {
   return selectCurrentUserLendingPoolData(state)?.userEmodeCategoryId || 0;
 };

src/store/poolSlice.ts

@@ -39,7 +39,10 @@ import { availableMarkets, marketsData, networkConfigs } from 'src/utils/markets
 import { optimizedPath } from 'src/utils/utils';
 import { StateCreator } from 'zustand';
 
-import { selectFormattedReserves } from './poolSelectors';
+import {
+  selectCurrentChainIdV3MarketKey,
+  selectFormattedReserves,
+} from './poolSelectors';
 import { RootStore } from './root';
 
 // TODO: add chain/provider/account mapping
@@ -199,7 +202,8 @@ export const createPoolSlice: StateCreator<
     },
     refreshPoolV3Data: async () => {
       // how to determine which v2 markets to pool? for now always fetch polygon fork
-      const v3MarketData = marketsData['fork_proto_polygon_v3'];
+      const marketKey = selectCurrentChainIdV3MarketKey(get());
+      const v3MarketData = marketsData[marketKey];
       get().refreshPoolData(v3MarketData);
     },
     mint: async (args) => {

src/store/v3MigrationSlice.ts

@@ -14,7 +14,14 @@ import dayjs from 'dayjs';
 import { BigNumber, BigNumberish, constants } 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 { RootStore } from './root';
 import {
@@ -51,8 +58,7 @@ export type V3MigrationSlice = {
   migrateBorrow: (
     signedPermits?: V3MigrationHelperSignedPermit[]
   ) => Promise<EthereumTransactionTypeExtended[]>;
-  _testMigration: () => void;
-  // migrateSelectedPositions: () => void;
+  setCurrentMarketForMigration: () => void;
 };
 
 export const createV3MigrationSlice: StateCreator<
@@ -142,13 +148,11 @@ export const createV3MigrationSlice: StateCreator<
       const timestamp = dayjs().unix();
       const approvalPermitsForMigrationAssets = await Promise.all(
         selectUserSupplyIncreasedReservesForMigrationPermits(get(), timestamp).map(
-          async ({ reserve, increasedAmount, underlyingBalance }): Promise<Approval> => {
-            console.log(underlyingBalance, 'underlyingBalance');
+          async ({ reserve, increasedAmount }): Promise<Approval> => {
             const { getTokenData } = new ERC20Service(get().jsonRpcProvider());
             const { decimals } = await getTokenData(reserve.aTokenAddress);
             const convertedAmount = valueToWei(increasedAmount, decimals);
             return {
-              // TODO: should we allow spending of exact ammount of the reserver?
               amount: convertedAmount,
               underlyingAsset: reserve.aTokenAddress,
               permitType: 'MIGRATOR',
@@ -160,7 +164,6 @@ export const createV3MigrationSlice: StateCreator<
       return approvalPermitsForMigrationAssets;
     },
     migrateWithoutPermits: () => {
-      console.log('should be called before gas');
       const timestamp = dayjs().unix();
       set({ timestamp });
       const borrowedPositions = selectUserBorrowReservesForMigration(get(), timestamp);
@@ -206,28 +209,21 @@ export const createV3MigrationSlice: StateCreator<
       }
       const provider = get().jsonRpcProvider();
       const migratorAddress = get().getMigratorAddress();
-      const currentMarketData = get().currentMarketData;
+
       // TODO: make it dynamic when network switch will be there
+      const v3MarketKey = selectCurrentChainIdV3MarketKey(get());
+      const currentMarketV3Data = marketsData[v3MarketKey];
       const pool = new Pool(provider, {
-        POOL: '0x794a61358D6845594F94dc1DB02A252b5b4814aD',
-        REPAY_WITH_COLLATERAL_ADAPTER: currentMarketData.addresses.REPAY_WITH_COLLATERAL_ADAPTER,
-        SWAP_COLLATERAL_ADAPTER: currentMarketData.addresses.SWAP_COLLATERAL_ADAPTER,
-        WETH_GATEWAY: currentMarketData.addresses.WETH_GATEWAY,
-        L2_ENCODER: currentMarketData.addresses.L2_ENCODER,
+        POOL: currentMarketV3Data.addresses.LENDING_POOL,
+        REPAY_WITH_COLLATERAL_ADAPTER: currentMarketV3Data.addresses.REPAY_WITH_COLLATERAL_ADAPTER,
+        SWAP_COLLATERAL_ADAPTER: currentMarketV3Data.addresses.SWAP_COLLATERAL_ADAPTER,
+        WETH_GATEWAY: currentMarketV3Data.addresses.WETH_GATEWAY,
+        L2_ENCODER: currentMarketV3Data.addresses.L2_ENCODER,
       });
       const newMigratorInstance = new V3MigrationHelperService(provider, migratorAddress, pool);
       // TODO: don't forget to add maping here
       return newMigratorInstance;
     },
-    _testMigration: async () => {
-      const currentTimestamp = dayjs().unix();
-      const selectedReservers = selectedUserSupplyReservesForMigration(get(), currentTimestamp);
-      const mappedAddresses = await Promise.all(
-        selectedReservers.map((reserve) =>
-          get().getMigrationServiceInstance().testDeployment(reserve.underlyingAsset)
-        )
-      );
-    },
     migrateBorrow: async (signedPermits: V3MigrationHelperSignedPermit[] = []) => {
       const currentTimestamp = dayjs().unix();
       const user = get().account;
@@ -249,5 +245,10 @@ export const createV3MigrationSlice: StateCreator<
         signedPermits,
       });
     },
+    setCurrentMarketForMigration: () => {
+      const newMarketData = selectCurrentChainIdV2MarketKey(get());
+      // TOOD: fallback to mainnet if newMarketData do not support v2 and v3
+      get().setCurrentMarket(newMarketData);
+    },
   };
 };