fix(migration): fix arbitrum migration

Author: oumar-fall

packages/blue-sdk/src/addresses.ts

@@ -6,7 +6,6 @@ import {
 } from "@morpho-org/morpho-ts";
 import isPlainObject from "lodash.isplainobject";
 import mergeWith from "lodash.mergewith";
-import { zeroAddress } from "viem";
 import { ChainId } from "./chain.js";
 import { UnsupportedChainIdError } from "./errors.js";
 import type { Address } from "./types.js";
@@ -190,7 +189,8 @@ const _addressesRegistry = {
       bundler3: "0x1FA4431bC113D308beE1d46B0e98Cb805FB48C13",
       generalAdapter1: "0x9954aFB60BB5A222714c478ac86990F221788B88",
       paraswapAdapter: "0xAA5c30C1482c189cA0d56057D3ac4dD7Af1e4726",
-      aaveV3CoreMigrationAdapter: zeroAddress, //TODO
+      aaveV3CoreMigrationAdapter: "0x1923670d4F4eB7435d865E7477d28FEAFfA40C93",
+      compoundV3MigrationAdapter: "0x86Ca77a4a37A9CDBe9bBf4975F6d69531B96444b",
     },
     permit2: "0x000000000022D473030F116dDEE9F6B43aC78BA3",
     adaptiveCurveIrm: "0x66F30587FB8D4206918deb78ecA7d5eBbafD06DA",
@@ -287,6 +287,7 @@ const _addressesRegistry = {
       bundler3: "0x7DD85759182495AF7F6757DA75036d24A9B58bc3",
       generalAdapter1: "0xC11329d19C2275c9E759867e879ECFcEeD7e30A0",
       paraswapAdapter: "0xAa870Da2a9F611A3A53d0D2AEe5664B3700a59c9",
+      compoundV3MigrationAdapter: "0x617f8d7885CCE689115Af04576F7cB6F2534fA9a",
     },
     adaptiveCurveIrm: "0x9a6061d51743B31D2c3Be75D83781Fa423f53F0E",
     publicAllocator: "0xB0c9a107fA17c779B3378210A7a593e88938C7C9",

packages/migration-sdk-viem/src/config.ts

@@ -181,26 +181,26 @@ export const migrationAddressesRegistry = {
     [MigratableProtocol.aaveV2]: null,
     [MigratableProtocol.aaveV3Optimizer]: null,
   },
-  // [ChainId.ArbitrumMainnet]: {
-  //   [MigratableProtocol.aaveV3]: {
-  //     pool: {
-  //       address: "0x794a61358D6845594F94dc1DB02A252b5b4814aD",
-  //       abi: poolAbi,
-  //     },
-  //     protocolDataProvider: {
-  //       address: "0x14496b405D62c24F91f04Cda1c69Dc526D56fDE5",
-  //       abi: protocolDataProviderAbi_v3,
-  //     },
-  //     addressesProvider: {
-  //       address: "0xa97684ead0e402dC232d5A977953DF7ECBaB3CDb",
-  //       abi: addressesProviderAbi_v3,
-  //     },
-  //   },
-  //   [MigratableProtocol.compoundV3]: null,
-  //   [MigratableProtocol.compoundV2]: null,
-  //   [MigratableProtocol.aaveV2]: null,
-  //   [MigratableProtocol.aaveV3Optimizer]: null,
-  // },
+  [ChainId.ArbitrumMainnet]: {
+    [MigratableProtocol.aaveV3]: {
+      pool: {
+        address: "0x794a61358D6845594F94dc1DB02A252b5b4814aD",
+        abi: poolAbi,
+      },
+      protocolDataProvider: {
+        address: "0x14496b405D62c24F91f04Cda1c69Dc526D56fDE5",
+        abi: protocolDataProviderAbi_v3,
+      },
+      addressesProvider: {
+        address: "0xa97684ead0e402dC232d5A977953DF7ECBaB3CDb",
+        abi: addressesProviderAbi_v3,
+      },
+    },
+    [MigratableProtocol.compoundV3]: null,
+    [MigratableProtocol.compoundV2]: null,
+    [MigratableProtocol.aaveV2]: null,
+    [MigratableProtocol.aaveV3Optimizer]: null,
+  },
   [ChainId.PolygonMainnet]: {
     [MigratableProtocol.aaveV3]: {
       pool: {

packages/migration-sdk-viem/test/e2e/aaveV3/borrow.test.ts

@@ -51,14 +51,14 @@ const TEST_CONFIGS = [
     marketTo: markets[ChainId.BaseMainnet].eth_wstEth,
     maxLoanPrice: 1,
   },
-  // {
-  //   chainId: ChainId.ArbitrumMainnet,
-  //   aCollateralToken: "0x513c7E3a9c69cA3e22550eF58AC1C0088e918FFf",
-  //   variableDebtToken: "0x0c84331e39d6658Cd6e6b9ba04736cC4c4734351",
-  //   testFn: test[ChainId.ArbitrumMainnet] as TestAPI<ViemTestContext>,
-  //   marketTo: markets[ChainId.ArbitrumMainnet].eth_wstEth,
-  //   maxLoanPrice: 1,
-  // },
+  {
+    chainId: ChainId.ArbitrumMainnet,
+    aCollateralToken: "0x513c7E3a9c69cA3e22550eF58AC1C0088e918FFf",
+    variableDebtToken: "0x0c84331e39d6658Cd6e6b9ba04736cC4c4734351",
+    testFn: test[ChainId.ArbitrumMainnet] as TestAPI<ViemTestContext>,
+    marketTo: markets[ChainId.ArbitrumMainnet].eth_wstEth,
+    maxLoanPrice: 1,
+  },
   {
     chainId: ChainId.PolygonMainnet,
     aCollateralToken: "0xe50fA9b3c56FfB159cB0FCA61F5c9D750e8128c8",

packages/migration-sdk-viem/test/e2e/aaveV3/supply.test.ts

@@ -33,13 +33,13 @@ const TEST_CONFIGS = [
     mmWNative: "0xa0E430870c4604CcfC7B38Ca7845B1FF653D0ff1",
     wNativeMinPrice: 2000,
   },
-  // {
-  //   chainId: ChainId.ArbitrumMainnet,
-  //   aWNative: "0xe50fA9b3c56FfB159cB0FCA61F5c9D750e8128c8",
-  //   testFn: test[ChainId.ArbitrumMainnet] as TestAPI<ViemTestContext>,
-  //   mmWNative: "0x4dB0B0a83de352817d0C30a88a36667b75D48b6E",
-  //   wNativeMinPrice: 2000,
-  // },
+  {
+    chainId: ChainId.ArbitrumMainnet,
+    aWNative: "0xe50fA9b3c56FfB159cB0FCA61F5c9D750e8128c8",
+    testFn: test[ChainId.ArbitrumMainnet] as TestAPI<ViemTestContext>,
+    mmWNative: "0xBD14bEa2eCECeCD5F32149B0f84BE7f7F446B964",
+    wNativeMinPrice: 2000,
+  },
   {
     chainId: ChainId.PolygonMainnet,
     aWNative: "0x6d80113e533a2C0fe82EaBD35f1875DcEA89Ea97",
@@ -294,13 +294,17 @@ describe("Supply position on AAVE V3", () => {
 
         await migrationBundle.requirements.signatures[0]!.sign(client);
 
-        await sendTransaction(client, migrationBundle.tx());
+        await sendTransaction(client, {
+          ...migrationBundle.tx(),
+          gas: parseEther("0.000009"),
+        });
 
         const [
           bundlerPosition,
           wEthBundlerBalance,
           userPosition,
           userMMShares,
+          mmBundlerBalance,
         ] = await Promise.all([
           client.balanceOf({
             erc20: aWNative,
@@ -312,6 +316,10 @@ describe("Supply position on AAVE V3", () => {
           }),
           client.balanceOf({ erc20: aWNative }),
           client.balanceOf({ erc20: mmWNative }),
+          client.balanceOf({
+            erc20: mmWNative,
+            owner: aaveV3CoreMigrationAdapter,
+          }),
         ]);
 
         const userMMBalance = await client.readContract({
@@ -323,6 +331,7 @@ describe("Supply position on AAVE V3", () => {
 
         expect(bundlerPosition).toEqual(0n);
         expect(wEthBundlerBalance).toEqual(0n);
+        expect(mmBundlerBalance).toEqual(0n);
         expect(userPosition).toBeGreaterThan(positionAmount - migratedAmount); //interest have been accumulated
         expect(userMMBalance).toBeGreaterThanOrEqual(migratedAmount - 2n);
       });

packages/migration-sdk-viem/test/e2e/setup.ts

@@ -1,6 +1,6 @@
 import { ChainId } from "@morpho-org/blue-sdk";
 import { createViemTest } from "@morpho-org/test/vitest";
-import { base, mainnet, polygon } from "viem/chains";
+import { arbitrum, base, mainnet, polygon } from "viem/chains";
 
 export const test = {
   [ChainId.EthMainnet]: createViemTest(mainnet, {
@@ -11,10 +11,10 @@ export const test = {
     forkUrl: process.env.BASE_RPC_URL,
     forkBlockNumber: 26_539_234,
   }),
-  // [ChainId.ArbitrumMainnet]: createViemTest(arbitrum, {
-  //   forkUrl: process.env.ARBITRUM_RPC_URL,
-  //   forkBlockNumber: 358_585_968,
-  // }),
+  [ChainId.ArbitrumMainnet]: createViemTest(arbitrum, {
+    forkUrl: process.env.ARBITRUM_RPC_URL,
+    forkBlockNumber: 361_575_517,
+  }),
   [ChainId.PolygonMainnet]: createViemTest(polygon, {
     forkUrl: process.env.POLYGON_RPC_URL,
     forkBlockNumber: 74_069_107,