feat: liquidate expired accounts

Author: doomsower

package.json

@@ -24,13 +24,13 @@
     "@aws-sdk/client-s3": "^3.943.0",
     "@biomejs/biome": "^2.3.8",
     "@commander-js/extra-typings": "^14.0.0",
-    "@commitlint/cli": "^20.1.0",
-    "@commitlint/config-conventional": "^20.0.0",
+    "@commitlint/cli": "^20.2.0",
+    "@commitlint/config-conventional": "^20.2.0",
     "@gearbox-protocol/biome-config": "^1.0.14",
     "@gearbox-protocol/cli-utils": "^5.61.1",
     "@gearbox-protocol/liquidator-contracts": "^1.36.0-experimental.67",
     "@gearbox-protocol/liquidator-v2-contracts": "^2.4.0",
-    "@gearbox-protocol/sdk": "11.8.9",
+    "@gearbox-protocol/sdk": "11.9.0",
     "@gearbox-protocol/types": "^1.14.8",
     "@types/node": "^24.10.1",
     "@uniswap/sdk-core": "^7.9.0",

src/services/Scanner.ts

@@ -169,6 +169,9 @@ export class Scanner {
           !this.config.updateReservePrices,
       };
       accounts = await this.#getAllCreditAccounts(queue, blockNumber);
+      if (accounts.length === 0) {
+        accounts = await this.#getExpiredCreditAccounts(blockNumber);
+      }
     }
     if (this.config.restakingWorkaround) {
       const before = accounts.length;
@@ -261,6 +264,64 @@ export class Scanner {
     return accounts;
   }
 
+  async #getExpiredCreditAccounts(
+    blockNumber?: bigint,
+  ): Promise<CreditAccountData[]> {
+    const timestamp = this.caService.sdk.timestamp;
+    const expiredCMs = new AddressSet();
+
+    for (const m of this.caService.sdk.marketRegister.markets) {
+      // nothing borrowed === no accounts
+      if (m.pool.pool.totalBorrowed === 0n) {
+        continue;
+      }
+      for (const cm of m.creditManagers) {
+        const borrowed =
+          m.pool.pool.creditManagerDebtParams.get(cm.creditManager.address)
+            ?.borrowed ?? 0n;
+        const expired =
+          cm.creditFacade.expirable &&
+          cm.creditFacade.expirationDate < timestamp;
+
+        if (expired && borrowed > 0n) {
+          expiredCMs.add(cm.creditManager.address);
+        }
+      }
+    }
+
+    if (expiredCMs.size === 0) {
+      return [];
+    }
+    this.log.info(`found ${expiredCMs.size} expired credit managers`);
+
+    let result: CreditAccountData[] = [];
+    if (this.config.optimistic) {
+      result = await this.caService.getCreditAccounts(
+        {
+          ignoreReservePrices: true,
+          minHealthFactor: 0n,
+          maxHealthFactor: MAX_UINT256,
+        },
+        blockNumber,
+      );
+      result = result.filter(ca => expiredCMs.has(ca.creditManager));
+    } else {
+      // we can take first expired credit manager, and continue with next one on next block
+      result = await this.caService.getCreditAccounts(
+        {
+          creditManager: expiredCMs.asArray()[0],
+          ignoreReservePrices: true,
+          minHealthFactor: 0n,
+          maxHealthFactor: MAX_UINT256,
+        },
+        blockNumber,
+      );
+    }
+
+    this.log.debug(`found ${result.length} expired credit accounts`);
+    return result;
+  }
+
   async #setupRestakingWorkaround(): Promise<void> {
     this.#restakingCMAddr = RESTAKING_CMS[this.config.network];
 

src/services/liquidate/LiquidationStrategyFull.ts

@@ -168,6 +168,11 @@ export default class LiquidationStrategyFull
     try {
       const isV310 = this.checkAccountVersion(ca, VERSION_RANGE_310);
       const ignoreReservePrices = !this.config.updateReservePrices && isV310;
+      const cm = this.sdk.marketRegister.findCreditManager(ca.creditManager);
+      // TODO: try to liquidate with debt only, then normally as a fallback
+      const expired =
+        cm.creditFacade.expirable &&
+        cm.creditFacade.expirationDate < this.sdk.timestamp;
       const { tx, routerCloseResult, calls } =
         await this.creditAccountService.fullyLiquidate({
           account: ca,
@@ -176,6 +181,7 @@ export default class LiquidationStrategyFull
           keepAssets: this.config.keepAssets,
           ignoreReservePrices,
           applyLossPolicy: this.#applyLossPolicy,
+          debtOnly: expired,
         });
       return { ...routerCloseResult, calls, rawTx: tx };
     } catch (e) {