feat: migrate no borrow with permits continue

Author: satanworker

pages/v3-migration.page.tsx

@@ -47,7 +47,7 @@ export default function V3Migration() {
           onClick={() => toggleSelectedSupplyPosition(reserve.underlyingAsset)}
           style={{ color: selectedSupplyAssets[reserve.underlyingAsset] ? 'red' : 'black' }}
         >
-          {reserve.underlyingAsset}:<b>{reserve.underlyingBalanceUSD}</b>
+          {reserve.underlyingAsset}:<b>{reserve.scaledATokenBalance}</b>
         </button>
       ))}
       <div>borrow</div>

src/components/transactions/MigrateV3/MigrateV3Actions.tsx

@@ -14,8 +14,8 @@ export const MigrateV3Actions = () => {
     tryPermit: true,
   });
 
-  const handleApproval = () => {
-    const approvePermitsForSelectedAssets = getApprovePermitsForSelectedAssets();
+  const handleApproval = async () => {
+    const approvePermitsForSelectedAssets = await getApprovePermitsForSelectedAssets();
     approval(approvePermitsForSelectedAssets);
   };
 

src/helpers/useTransactionHandler.tsx

@@ -234,6 +234,7 @@ export const useTransactionHandler = ({
     if (approvalTxes && usePermit && handleGetPermitTxns) {
       if (!signatures.length || !signatureDeadline) throw new Error('signature needed');
       try {
+        console.log(signatures, 'signatures');
         setMainTxState({ ...mainTxState, loading: true });
         const txns = await handleGetPermitTxns(signatures, signatureDeadline);
         const params = await txns[0].tx();
@@ -259,6 +260,7 @@ export const useTransactionHandler = ({
           action: TxAction.MAIN_ACTION,
         });
       } catch (error) {
+        console.log(error, 'error')
         const parsedError = getErrorTextFromError(error, TxAction.GAS_ESTIMATION, false);
         setTxError(parsedError);
         setMainTxState({

src/store/protocolDataSlice.ts

@@ -38,6 +38,7 @@ export const createProtocolDataSlice: StateCreator<
     setCurrentMarket: (market, omitQueryParameterUpdate) => {
       if (!availableMarkets.includes(market as CustomMarket)) return;
       const nextMarketData = marketsData[market];
+      console.log(marketsData['fork_proto_polygon_v3'], marketsData);
       localStorage.setItem('selectedMarket', market);
       if (!omitQueryParameterUpdate) {
         setQueryParameter('marketName', market);

src/store/v3MigrationSelectors.ts

@@ -13,6 +13,3 @@ export const selectCurrentMarketV2Reserves = (store: RootStore, timestamp: numbe
   const currentChainId = store.currentChainId;
   return store.data.get(currentChainId);
 };
-// export const selectUserApprovalsReservesForMigration = (store: RootStore, timestamp: number) => {
-
-// };

src/store/v3MigrationSlice.ts

@@ -21,21 +21,22 @@ export type V3MigrationSlice = {
   selectedMigrationBorrowAssets: Record<string, boolean>;
   migrationServiceInstances: Record<string, V3MigrationHelperService>;
   timestamp: number;
+  approvalPermitsForMigrationAssets: Array<Approval>;
   // ACTIONS
   generatePermitPayloadForMigrationAsset: (
     approval: Approval & {
       deadline: string;
     }
   ) => Promise<string>;
-  getApprovePermitsForSelectedAssets: () => Approval[];
+  getApprovePermitsForSelectedAssets: () => Promise<Approval[]>;
   toggleMigrationSelectedSupplyAsset: (assetName: string) => void;
   toggleMigrationSelectedBorrowAsset: (assetName: string) => void;
   getMigratorAddress: () => string;
   getMigrationServiceInstance: () => V3MigrationHelperService;
   migrateWithPermits: (
     signature: SignatureLike[],
     deadline: BigNumberish
-  ) => EthereumTransactionTypeExtended[];
+  ) => Promise<EthereumTransactionTypeExtended[]>;
   migrateWithoutPermits: () => Promise<EthereumTransactionTypeExtended[]>;
   _testMigration: () => void;
   // migrateSelectedPositions: () => void;
@@ -52,12 +53,14 @@ export const createV3MigrationSlice: StateCreator<
     selectedMigrationBorrowAssets: {},
     migrationServiceInstances: {},
     timestamp: 0,
+    approvalPermitsForMigrationAssets: [],
     generatePermitPayloadForMigrationAsset: async ({ amount, underlyingAsset, deadline }) => {
       const user = get().account;
       const { getTokenData } = new ERC20Service(get().jsonRpcProvider());
-      const { name, decimals } = await getTokenData(underlyingAsset);
-      const convertedAmount = valueToWei(amount, decimals);
+
+      const { name } = await getTokenData(underlyingAsset);
       const chainId = get().currentChainId;
+      console.log(name, 'name');
 
       const erc20_2612Service = new ERC20_2612Service(get().jsonRpcProvider());
 
@@ -68,12 +71,6 @@ export const createV3MigrationSlice: StateCreator<
 
       const typeData = {
         types: {
-          EIP712Domain: [
-            { name: 'name', type: 'string' },
-            { name: 'version', type: 'string' },
-            { name: 'chainId', type: 'uint256' },
-            { name: 'verifyingContract', type: 'address' },
-          ],
           Permit: [
             { name: 'owner', type: 'address' },
             { name: 'spender', type: 'address' },
@@ -92,7 +89,7 @@ export const createV3MigrationSlice: StateCreator<
         message: {
           owner: user,
           spender: get().getMigratorAddress(),
-          value: convertedAmount,
+          value: amount,
           nonce,
           deadline,
         },
@@ -121,19 +118,26 @@ export const createV3MigrationSlice: StateCreator<
         })
       );
     },
-    getApprovePermitsForSelectedAssets: () => {
+    getApprovePermitsForSelectedAssets: async () => {
       const timestamp = dayjs().unix();
-      set({ timestamp });
-      return selectedUserReservesForMigration(get(), timestamp).map(
-        ({ reserve, underlyingBalance }): Approval => {
-          return {
-            // TODO: should we allow spending of exact ammount of the reserver?
-            amount: underlyingBalance,
-            underlyingAsset: reserve.aTokenAddress,
-            permitType: 'MIGRATOR',
-          };
-        }
+      const approvalPermitsForMigrationAssets = await Promise.all(
+        selectedUserReservesForMigration(get(), timestamp).map(
+          async ({ reserve, underlyingBalance }): Promise<Approval> => {
+            const { getTokenData } = new ERC20Service(get().jsonRpcProvider());
+            const { name, decimals } = await getTokenData(reserve.aTokenAddress);
+            const amount = (Number(underlyingBalance) + 100).toString();
+            const convertedAmount = valueToWei(amount, decimals);
+            return {
+              // TODO: should we allow spending of exact ammount of the reserver?
+              amount: convertedAmount,
+              underlyingAsset: reserve.aTokenAddress,
+              permitType: 'MIGRATOR',
+            };
+          }
+        )
       );
+      set({ approvalPermitsForMigrationAssets });
+      return approvalPermitsForMigrationAssets;
     },
     migrateWithoutPermits: () => {
       const timestamp = dayjs().unix();
@@ -142,12 +146,14 @@ export const createV3MigrationSlice: StateCreator<
         aToken: string;
         deadline: number;
         amount: string;
+        underlyingAsset: string;
       }[] = selectedUserReservesForMigration(get(), timestamp).map(
-        ({ reserve, underlyingBalance }) => {
+        ({ underlyingAsset, underlyingBalance, reserve }) => {
           const deadline = Math.floor(Date.now() / 1000 + 3600);
           return {
-            amount: underlyingBalance,
+            amount: constants.MaxUint256.toString(),
             aToken: reserve.aTokenAddress,
+            underlyingAsset: underlyingAsset,
             // TODO: fow how long to approve?
             deadline,
           };
@@ -156,20 +162,26 @@ export const createV3MigrationSlice: StateCreator<
       const user = get().account;
       return get().getMigrationServiceInstance().migrateNoBorrow({ assets, user });
     },
-    migrateWithPermits: (signatures: SignatureLike[], deadline: BigNumberish) => {
-      const selectedReservers = selectedUserReservesForMigration(get(), get().timestamp);
-      const permits = selectedReservers.map(({ reserve }, index) => ({
-        aToken: reserve.aTokenAddress,
-        value: constants.MaxUint256.toString(),
-        deadline,
-        signedPermit: signatures[index],
-      }));
+    migrateWithPermits: async (signatures: SignatureLike[], deadline: BigNumberish) => {
+      const permits = await Promise.all(
+        get().approvalPermitsForMigrationAssets.map(async ({ amount, underlyingAsset }, index) => {
+          return {
+            signedPermit: signatures[index],
+            deadline,
+            aToken: underlyingAsset,
+            value: amount,
+          };
+        })
+      );
       // branch out into flashloan or migrate no borrow
       // move that to separate instance and save cache the Migrator instance
-      console.log(permits, 'permits');
       const migratorHelperInstance = get().getMigrationServiceInstance();
       const user = get().account;
-      const assets = permits.map((permit) => permit.aToken);
+      const assets = selectedUserReservesForMigration(get(), get().timestamp).map(
+        (reserve) => reserve.underlyingAsset
+      );
+      await get()._testMigration();
+      console.log(assets);
       return migratorHelperInstance.migrateNoBorrowWithPermits({
         user,
         assets,
@@ -194,8 +206,15 @@ export const createV3MigrationSlice: StateCreator<
       return newMigratorInstance;
     },
     _testMigration: async () => {
-      const someAddress = await get().getMigrationServiceInstance().testDeployment();
-      console.log(someAddress, 'someAddress');
+      const currentTimestamp = dayjs().unix();
+      const selectedReservers = selectedUserReservesForMigration(get(), currentTimestamp);
+      const mappedAddresses = await Promise.all(
+        selectedReservers.map((reserve) =>
+          get().getMigrationServiceInstance().testDeployment(reserve.underlyingAsset)
+        )
+      );
+
+      console.log(mappedAddresses);
     },
   };
 };