fix(ts): remove ts-ignore comments

morpho-org · Jan 3, 2025 · 91465d2 · 91465d2
1 parent bb68ca4
commit 91465d2
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 82 deletions.
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,

diff --git a/packages/blue-sdk-ethers/src/fetch/Token.ts b/packages/blue-sdk-ethers/src/fetch/Token.ts
@@ -80,7 +80,6 @@ export namespace Bytes32ERC20__factory {
   export const abi = _bytes32ERC20Abi;
 
   export function createInterface() {
-    // @ts-ignore incompatible commonjs type
     return new Interface(_bytes32ERC20Abi) as ERC20Interface;
   }
 
@@ -117,11 +116,7 @@ export namespace ERC20Metadata__factory {
     if (isBytes32ERC20Metadata(address, chainId))
       return Bytes32ERC20__factory.connect(address, runner);
 
-    const erc20 = ERC20__factory.connect(
-      address,
-      // @ts-ignore incompatible commonjs type
-      runner,
-    );
+    const erc20 = ERC20__factory.connect(address, runner);
 
     const name = erc20.name.bind(erc20);
     erc20.name = Object.assign(
@@ -201,11 +196,7 @@ export async function fetchToken(
   switch (address) {
     case wstEth: {
       if (stEth) {
-        const wstEthToken = WStEth__factory.connect(
-          wstEth!,
-          // @ts-ignore incompatible commonjs type
-          runner,
-        );
+        const wstEthToken = WStEth__factory.connect(wstEth!, runner);
         const stEthPerWstEth = await wstEthToken.stEthPerToken(overrides);
         return new ExchangeRateWrappedToken(token, stEth, stEthPerWstEth);
       }

diff --git a/packages/blue-sdk-ethers/src/fetch/User.ts b/packages/blue-sdk-ethers/src/fetch/User.ts
@@ -19,11 +19,7 @@ export async function fetchUser(
   );
 
   const { morpho, bundler } = getChainAddresses(chainId);
-  const blue = MorphoBlue__factory.connect(
-    morpho,
-    // @ts-ignore incompatible commonjs type
-    runner,
-  );
+  const blue = MorphoBlue__factory.connect(morpho, runner);
 
   const [isBundlerAuthorized, morphoNonce] = await Promise.all([
     blue.isAuthorized(address, bundler, overrides),

diff --git a/packages/blue-sdk-ethers/src/fetch/Vault.ts b/packages/blue-sdk-ethers/src/fetch/Vault.ts
@@ -40,11 +40,7 @@ export async function fetchVaultFromConfig(
   );
 
   const chainAddresses = getChainAddresses(chainId);
-  const mm = MetaMorpho__factory.connect(
-    address,
-    // @ts-ignore incompatible commonjs type
-    runner,
-  );
+  const mm = MetaMorpho__factory.connect(address, runner);
 
   const [
     curator,
@@ -94,7 +90,6 @@ export async function fetchVaultFromConfig(
   if (hasPublicAllocator) {
     const publicAllocator = PublicAllocator__factory.connect(
       chainAddresses.publicAllocator!,
-      // @ts-ignore incompatible commonjs type
       runner,
     );
 

diff --git a/packages/blue-sdk-ethers/src/fetch/VaultConfig.ts b/packages/blue-sdk-ethers/src/fetch/VaultConfig.ts
@@ -14,11 +14,7 @@ export async function fetchVaultConfig(
     options.chainId ?? (await runner.provider.getNetwork()).chainId,
   );
 
-  const mm = MetaMorpho__factory.connect(
-    address,
-    // @ts-ignore incompatible commonjs type
-    runner,
-  );
+  const mm = MetaMorpho__factory.connect(address, runner);
 
   const { overrides = {} } = options;
 

diff --git a/packages/blue-sdk-ethers/src/fetch/VaultMarketConfig.ts b/packages/blue-sdk-ethers/src/fetch/VaultMarketConfig.ts
@@ -21,11 +21,7 @@ export async function fetchVaultMarketConfig(
   );
   options.overrides ??= {};
 
-  const mm = MetaMorpho__factory.connect(
-    vault,
-    // @ts-ignore incompatible commonjs type
-    runner,
-  );
+  const mm = MetaMorpho__factory.connect(vault, runner);
 
   const [{ cap, removableAt, enabled }, pendingCap, publicAllocatorConfig] =
     await Promise.all([

diff --git a/packages/blue-sdk-ethers/src/fetch/VaultMarketPublicAllocatorConfig.ts b/packages/blue-sdk-ethers/src/fetch/VaultMarketPublicAllocatorConfig.ts
@@ -24,7 +24,6 @@ export async function fetchVaultMarketPublicAllocatorConfig(
 
   const [maxIn, maxOut] = await PublicAllocator__factory.connect(
     publicAllocator,
-    // @ts-ignore incompatible commonjs type
     runner,
   ).flowCaps(vault, marketId, overrides);
 

diff --git a/packages/blue-sdk-ethers/src/fetch/VaultUser.ts b/packages/blue-sdk-ethers/src/fetch/VaultUser.ts
@@ -36,16 +36,8 @@ export async function fetchVaultUserFromConfig(
   );
   options.overrides ??= {};
 
-  const mm = MetaMorpho__factory.connect(
-    config.address,
-    // @ts-ignore incompatible commonjs type
-    runner,
-  );
-  const erc20 = ERC20__factory.connect(
-    config.asset,
-    // @ts-ignore incompatible commonjs type
-    runner,
-  );
+  const mm = MetaMorpho__factory.connect(config.address, runner);
+  const erc20 = ERC20__factory.connect(config.asset, runner);
 
   const [allowance, isAllocator] = await Promise.all([
     erc20.allowance(user, config.address, options.overrides),