Merge branch 'main' into feature/integ-1208-liquidate-all-positions-w…

…ith-bad-debt
morpho-org · Jan 6, 2025 · 38e8622 · 38e8622
2 parents 108ac15 + ea5e032
commit 38e8622
Show file tree

Hide file tree

Showing 56 changed files with 1,151 additions and 4,462 deletions.
diff --git a/package.json b/package.json
@@ -29,17 +29,18 @@
     "@biomejs/biome": "^1.9.4",
     "@commitlint/cli": "^19.6.0",
     "@commitlint/config-conventional": "^19.6.0",
+    "@conventional-changelog/git-client": "^1.0.1",
     "@vitest/coverage-v8": "^2.1.8",
     "conventional-changelog-conventionalcommits": "^8.0.0",
     "conventional-changelog-writer": "^8.0.0",
     "conventional-recommended-bump": "^10.0.0",
     "dotenv-cli": "^7.4.4",
-    "happy-dom": "^15.11.7",
+    "happy-dom": "^16.2.0",
     "husky": "^9.1.7",
-    "lint-staged": "^15.2.10",
+    "lint-staged": "^15.2.11",
     "semver": "^7.6.3",
     "typescript": "^5.7.2",
-    "viem": "^2.21.54",
+    "viem": "^2.22.2",
     "vitest": "^2.1.8"
   },
   "lint-staged": {

diff --git a/packages/blue-api-sdk/src/converter.ts b/packages/blue-api-sdk/src/converter.ts
@@ -7,6 +7,7 @@ import {
   MathLib,
   Position,
   Token,
+  Vault,
   VaultConfig,
   VaultMarketAllocation,
   VaultMarketConfig,
@@ -95,15 +96,7 @@ export interface PartialApiPublicAllocatorConfig
 }
 
 export interface PartialApiVaultAllocation
-  extends Pick<
-    ApiVaultAllocation,
-    | "supplyQueueIndex"
-    | "supplyShares"
-    | "supplyCap"
-    | "pendingSupplyCap"
-    | "pendingSupplyCapValidAt"
-    | "removableAt"
-  > {
+  extends Pick<ApiVaultAllocation, "supplyQueueIndex"> {
   market: PartialApiMarket & Pick<ApiMarket, "uniqueKey">;
 }
 
@@ -135,6 +128,25 @@ export interface PartialApiVault
   publicAllocatorConfig: Maybe<PartialApiPublicAllocatorConfig>;
 }
 
+export interface PartialApiAccrualVaultAllocation
+  extends PartialApiVaultAllocation,
+    Pick<
+      ApiVaultAllocation,
+      | "supplyShares"
+      | "supplyCap"
+      | "pendingSupplyCap"
+      | "pendingSupplyCapValidAt"
+      | "removableAt"
+    > {}
+
+export interface PartialApiAccrualVaultState extends PartialApiVaultState {
+  allocation: Maybe<PartialApiAccrualVaultAllocation[]>;
+}
+
+export interface PartialApiAccrualVault extends PartialApiVault {
+  state: Maybe<PartialApiAccrualVaultState>;
+}
+
 export interface ConverterOptions {
   parseAddress: (value: string) => Address;
   parseNumber: (value: number, decimals: number) => bigint;
@@ -180,6 +192,8 @@ export class BlueSdkConverter {
     });
   }
 
+  public getMarket(dto: PartialApiMarket & { state: null }): null;
+  public getMarket(dto: PartialApiMarket): Market;
   public getMarket(dto: PartialApiMarket) {
     if (dto.state == null) return null;
 
@@ -208,6 +222,12 @@ export class BlueSdkConverter {
     });
   }
 
+  public getAccrualPosition(
+    dto: PartialApiMarketAccrualPosition & { market: { state: null } },
+  ): null;
+  public getAccrualPosition(
+    dto: PartialApiMarketAccrualPosition,
+  ): AccrualPosition;
   public getAccrualPosition(dto: PartialApiMarketAccrualPosition) {
     const market = this.getMarket(dto.market);
     if (market == null) return null;
@@ -232,20 +252,44 @@ export class BlueSdkConverter {
     );
   }
 
+  public getVault(dto: PartialApiVault & { state: null }): null;
+  public getVault(dto: PartialApiVault): Vault;
+  public getVault({ state, publicAllocatorConfig, ...dto }: PartialApiVault) {
+    if (state == null) return null;
+
+    return new Vault({
+      ...state,
+      ...this.getVaultConfig(dto),
+      fee: this.options.parseNumber(state.fee ?? 0, 18),
+      pendingOwner: state.pendingOwner ?? ZERO_ADDRESS,
+      pendingTimelock: {
+        value: state.pendingTimelock ?? 0n,
+        validAt: state.pendingTimelockValidAt ?? 0n,
+      },
+      pendingGuardian: {
+        value: state.pendingGuardian ?? ZERO_ADDRESS,
+        validAt: state.pendingGuardianValidAt ?? 0n,
+      },
+      lastTotalAssets: state.totalAssets,
+      supplyQueue:
+        state.allocation
+          ?.filter((allocation) => isDefined(allocation.supplyQueueIndex))
+          .sort(
+            (allocationA, allocationB) =>
+              allocationA.supplyQueueIndex! - allocationB.supplyQueueIndex!,
+          )
+          .map((allocation) => allocation.market.uniqueKey) ?? [],
+      withdrawQueue:
+        state.allocation?.map(({ market }) => market.uniqueKey) ?? [],
+      publicAllocatorConfig: publicAllocatorConfig ?? undefined,
+    });
+  }
+
   public getVaultMarketAllocation(
     vault: Address,
-    dto: PartialApiVaultAllocation,
+    dto: PartialApiAccrualVaultAllocation,
     publicAllocatorConfig?: Maybe<PartialApiPublicAllocatorConfig>,
   ) {
-    const position = this.getAccrualPosition({
-      user: { address: vault },
-      market: dto.market,
-      supplyShares: dto.supplyShares,
-      borrowShares: 0n,
-      collateral: 0n,
-    });
-    if (!position) return;
-
     return new VaultMarketAllocation({
       config: this.getVaultMarketConfig(
         vault,
@@ -254,13 +298,19 @@ export class BlueSdkConverter {
           ({ market: { uniqueKey } }) => uniqueKey === dto.market.uniqueKey,
         ),
       ),
-      position,
+      position: this.getAccrualPosition({
+        user: { address: vault },
+        market: dto.market,
+        supplyShares: dto.supplyShares,
+        borrowShares: 0n,
+        collateral: 0n,
+      }),
     });
   }
 
   public getVaultMarketConfig(
     vault: Address,
-    dto: PartialApiVaultAllocation,
+    dto: PartialApiAccrualVaultAllocation,
     flowCaps?: Maybe<PartialApiPublicAllocatorFlowCaps>,
   ) {
     return new VaultMarketConfig({
@@ -291,38 +341,14 @@ export class BlueSdkConverter {
     });
   }
 
-  public getAccrualVault({
-    state,
-    publicAllocatorConfig,
-    ...dto
-  }: PartialApiVault) {
+  public getAccrualVault(dto: PartialApiAccrualVault & { state: null }): null;
+  public getAccrualVault(dto: PartialApiAccrualVault): AccrualVault;
+  public getAccrualVault(dto: PartialApiAccrualVault) {
+    const { state, publicAllocatorConfig } = dto;
     if (state == null) return null;
 
     return new AccrualVault(
-      {
-        ...state,
-        ...this.getVaultConfig(dto),
-        fee: this.options.parseNumber(state.fee, 18),
-        pendingOwner: state.pendingOwner ?? ZERO_ADDRESS,
-        pendingTimelock: {
-          value: state.pendingTimelock ?? 0n,
-          validAt: state.pendingTimelockValidAt ?? 0n,
-        },
-        pendingGuardian: {
-          value: state.pendingGuardian ?? ZERO_ADDRESS,
-          validAt: state.pendingGuardianValidAt ?? 0n,
-        },
-        lastTotalAssets: state.totalAssets,
-        supplyQueue:
-          state.allocation
-            ?.filter((allocation) => isDefined(allocation.supplyQueueIndex))
-            .sort(
-              (allocationA, allocationB) =>
-                allocationA.supplyQueueIndex! - allocationB.supplyQueueIndex!,
-            )
-            .map((allocation) => allocation.market.uniqueKey) ?? [],
-        publicAllocatorConfig: publicAllocatorConfig || undefined,
-      },
+      this.getVault(dto),
       state.allocation
         ?.map((allocation) =>
           this.getVaultMarketAllocation(

diff --git a/packages/blue-sdk-ethers/package.json b/packages/blue-sdk-ethers/package.json
@@ -27,7 +27,7 @@
     "ethers": "^6.13.4",
     "ethers-types": "^3.17.3",
     "typescript": "^5.7.2",
-    "viem": "^2.21.54",
+    "viem": "^2.22.2",
     "vitest": "^2.1.8"
   },
   "publishConfig": {

diff --git a/packages/blue-sdk-ethers/src/augment/Vault.ts b/packages/blue-sdk-ethers/src/augment/Vault.ts
@@ -1,11 +1,10 @@
 import { AccrualVault, Vault } from "@morpho-org/blue-sdk";
 
-import { fetchAccrualVault, fetchVault, fetchVaultFromConfig } from "../fetch";
+import { fetchAccrualVault, fetchVault } from "../fetch";
 
 declare module "@morpho-org/blue-sdk" {
   namespace Vault {
     let fetch: typeof fetchVault;
-    let fetchFromConfig: typeof fetchVaultFromConfig;
   }
 
   namespace AccrualVault {
@@ -14,7 +13,6 @@ declare module "@morpho-org/blue-sdk" {
 }
 
 Vault.fetch = fetchVault;
-Vault.fetchFromConfig = fetchVaultFromConfig;
 AccrualVault.fetch = fetchAccrualVault;
 
 export { Vault, AccrualVault };
diff --git a/packages/blue-sdk-ethers/src/fetch/Holding.ts b/packages/blue-sdk-ethers/src/fetch/Holding.ts
@@ -54,21 +54,9 @@ export async function fetchHolding(
       balance: await runner.provider.getBalance(user, overrides.blockTag),
     });
 
-  const erc20 = ERC20__factory.connect(
-    token,
-    // @ts-ignore incompatible commonjs type
-    runner,
-  );
-  const permit2 = Permit2__factory.connect(
-    chainAddresses.permit2,
-    // @ts-ignore incompatible commonjs type
-    runner,
-  );
-  const erc2612 = ERC2612__factory.connect(
-    token,
-    // @ts-ignore incompatible commonjs type
-    runner,
-  );
+  const erc20 = ERC20__factory.connect(token, runner);
+  const permit2 = Permit2__factory.connect(chainAddresses.permit2, runner);
+  const erc2612 = ERC2612__factory.connect(token, runner);
 
   const [
     balance,
@@ -107,15 +95,10 @@ export async function fetchHolding(
     permissionedBackedTokens[chainId].has(token)
       ? WrappedBackedToken__factory.connect(
           token,
-          // @ts-ignore incompatible commonjs type
           runner,
         ).whitelistControllerAggregator(overrides)
       : undefined,
-    PermissionedERC20Wrapper__factory.connect(
-      token,
-      // @ts-ignore incompatible commonjs type
-      runner,
-    )
+    PermissionedERC20Wrapper__factory.connect(token, runner)
       .hasPermission(user, overrides)
       .catch(() => !permissionedWrapperTokens[chainId].has(token)),
   ]);
@@ -134,7 +117,6 @@ export async function fetchHolding(
     holding.canTransfer =
       await BackedWhitelistControllerAggregatorV2__factory.connect(
         whitelistControllerAggregator,
-        // @ts-ignore incompatible commonjs type
         runner,
       )
         .isWhitelisted(user, overrides)

diff --git a/packages/blue-sdk-ethers/src/fetch/Market.ts b/packages/blue-sdk-ethers/src/fetch/Market.ts
@@ -52,24 +52,15 @@ export async function fetchMarketFromConfig(
     price,
     rateAtTarget,
   ] = await Promise.all([
-    MorphoBlue__factory.connect(
-      morpho,
-      // @ts-ignore incompatible commonjs type
-      runner,
-    ).market(params.id, overrides),
+    MorphoBlue__factory.connect(morpho, runner).market(params.id, overrides),
     params.oracle !== ZeroAddress
-      ? BlueOracle__factory.connect(
-          params.oracle,
-          // @ts-ignore incompatible commonjs type
-          runner,
-        )
+      ? BlueOracle__factory.connect(params.oracle, runner)
           .price(overrides)
           .catch(() => undefined)
       : undefined,
     params.irm === adaptiveCurveIrm
       ? await AdaptiveCurveIrm__factory.connect(
           params.irm,
-          // @ts-ignore incompatible commonjs type
           runner,
         ).rateAtTarget(params.id, overrides)
       : undefined,

diff --git a/packages/blue-sdk-ethers/src/fetch/MarketParams.ts b/packages/blue-sdk-ethers/src/fetch/MarketParams.ts
@@ -28,7 +28,6 @@ export async function fetchMarketParams(
 
     const marketParams = await MorphoBlue__factory.connect(
       morpho,
-      // @ts-ignore incompatible commonjs type
       runner,
     ).idToMarketParams(id, {
       // Always fetch at latest block because config is immutable.

diff --git a/packages/blue-sdk-ethers/src/fetch/Position.ts b/packages/blue-sdk-ethers/src/fetch/Position.ts
@@ -26,11 +26,11 @@ export async function fetchPosition(
   const { morpho } = getChainAddresses(chainId);
 
   const { supplyShares, borrowShares, collateral } =
-    await MorphoBlue__factory.connect(
-      morpho,
-      // @ts-ignore incompatible commonjs type
-      runner,
-    ).position(marketId, user, overrides);
+    await MorphoBlue__factory.connect(morpho, runner).position(
+      marketId,
+      user,
+      overrides,
+    );
 
   return new Position({
     user,