Merge remote-tracking branch 'origin/beta'

Author: doomsower

biome.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://biomejs.dev/schemas/2.3.4/schema.json",
+  "$schema": "https://biomejs.dev/schemas/2.3.5/schema.json",
   "extends": ["@gearbox-protocol/biome-config"],
   "vcs": {
     "enabled": true,

package.json

@@ -17,21 +17,22 @@
   },
   "dependencies": {
     "node-pty": "^1.0.0",
+    "oblivious-set": "^2.0.0",
     "pino-pretty": "^13.1.2"
   },
   "devDependencies": {
-    "@aws-sdk/client-s3": "^3.926.0",
-    "@biomejs/biome": "^2.3.4",
+    "@aws-sdk/client-s3": "^3.930.0",
+    "@biomejs/biome": "^2.3.5",
     "@commander-js/extra-typings": "^14.0.0",
     "@commitlint/cli": "^20.1.0",
     "@commitlint/config-conventional": "^20.0.0",
-    "@gearbox-protocol/biome-config": "^1.0.10",
-    "@gearbox-protocol/cli-utils": "^5.58.2",
+    "@gearbox-protocol/biome-config": "^1.0.11",
+    "@gearbox-protocol/cli-utils": "^5.59.2",
     "@gearbox-protocol/liquidator-contracts": "^1.36.0-experimental.41",
     "@gearbox-protocol/liquidator-v2-contracts": "^2.4.0",
-    "@gearbox-protocol/sdk": "10.7.1",
+    "@gearbox-protocol/sdk": "11.1.1",
     "@gearbox-protocol/types": "^1.14.8",
-    "@types/node": "^24.10.0",
+    "@types/node": "^24.10.1",
     "@uniswap/sdk-core": "^7.9.0",
     "@uniswap/v3-sdk": "^3.26.0",
     "@vlad-yakovlev/telegram-md": "^2.1.0",
@@ -40,15 +41,15 @@
     "axios-retry": "^4.5.0",
     "date-fns": "^4.1.0",
     "di-at-home": "^0.0.7",
-    "esbuild": "^0.25.12",
+    "esbuild": "^0.27.0",
     "husky": "^9.1.7",
     "lint-staged": "^16.2.6",
     "nanoid": "^5.1.6",
     "node-pty": "^1.0.0",
     "pino": "^10.1.0",
     "tsx": "4.20.6",
     "typescript": "^5.9.3",
-    "viem": "^2.38.6",
+    "viem": "^2.39.0",
     "vitest": "^4.0.8",
     "zod": "^4.1.12"
   },

src/config/common.ts

@@ -414,6 +414,18 @@ export const CommonSchema = z.object({
         "Telegram channel where bot will post non-critical notifications",
       env: "TELEGRAM_NOTIFICATIONS_CHANNEL",
     }),
+  /**
+   * Notification cooldown in minutes
+   */
+  notificationCooldown: z.coerce
+    .number()
+    .nonnegative()
+    .default(4 * 60)
+    .register(zommandRegistry, {
+      flags: "--notification-cooldown <cooldown>",
+      description: "Notification cooldown in minutes",
+      env: "NOTIFICATION_COOLDOWN",
+    }),
 });
 
 export type CommonSchema = z.infer<typeof CommonSchema>;

src/config/full-liquidator.ts

@@ -1,4 +1,4 @@
-import { zommandRegistry } from "@gearbox-protocol/cli-utils";
+import { boolLike, zommandRegistry } from "@gearbox-protocol/cli-utils";
 import { z } from "zod/v4";
 import { CommonSchema } from "./common.js";
 
@@ -12,6 +12,18 @@ export const FullLiquidatorSchema = z.object({
     description: "Liquidator mode (full/partial/batch/deleverage)",
     env: "LIQUIDATION_MODE",
   }),
+  /**
+   * Whether we should apply loss policy on full liquidation of accounts with bad debt
+   */
+  lossPolicy: z
+    .enum(["only", "never", "fallback"])
+    .default("never")
+    .register(zommandRegistry, {
+      flags: "--loss-policy <when>",
+      description:
+        "Whether we should apply loss policy on full liquidation of accounts with bad debt",
+      env: "LOSS_POLICY",
+    }),
 });
 
 export type FullLiquidatorSchema = z.infer<typeof FullLiquidatorSchema>;

src/log/index.ts

@@ -5,14 +5,26 @@ import pino from "pino";
 import { DI } from "../di.js";
 
 @DI.Factory(DI.Logger)
-class LoggerFactory implements IFactory<ILogger, [string]> {
+export class LoggerFactory implements IFactory<ILogger, [string]> {
   #logger: ILogger;
+  static #logContext: Record<string, any> = {};
+
+  public static setLogContext(context: Record<string, any>): void {
+    LoggerFactory.#logContext = context;
+  }
+
+  public static clearLogContext(): void {
+    LoggerFactory.#logContext = {};
+  }
 
   constructor() {
     const executionId = process.env.EXECUTION_ID?.split(":").pop();
     this.#logger = pino({
       level: process.env.LOG_LEVEL ?? "debug",
       base: { executionId },
+      mixin: () => ({
+        ...LoggerFactory.#logContext,
+      }),
       formatters: {
         bindings: () => ({}),
         level: label => {

src/services/Client.ts

@@ -1,6 +1,6 @@
 import { nextTick } from "node:process";
 
-import { chains, PERCENTAGE_FACTOR } from "@gearbox-protocol/sdk";
+import { chains, formatBN, PERCENTAGE_FACTOR } from "@gearbox-protocol/sdk";
 import type {
   AnvilClient,
   AnvilNodeInfo,
@@ -14,6 +14,7 @@ import type {
   ContractFunctionArgs,
   ContractFunctionName,
   EncodeFunctionDataParameters,
+  FeeValuesEIP1559,
   PrivateKeyAccount,
   PublicClient,
   SimulateContractParameters,
@@ -68,6 +69,8 @@ export default class Client {
 
   #balance?: { value: bigint; status: StatusCode };
 
+  #gasFees: { maxFeePerGas?: bigint; maxPriorityFeePerGas?: bigint } = {};
+
   public async launch(): Promise<void> {
     const { chainId, network, optimistic, privateKey, pollingInterval } =
       this.config;
@@ -110,23 +113,27 @@ export default class Client {
       this.logger.debug("running on real rpc");
     }
     await this.#checkBalance();
+    if (this.config.optimistic) {
+      this.#gasFees = await this.pub.estimateFeesPerGas();
+      this.logger.debug(this.#gasFees, "optimistic gas fees");
+    }
   }
 
   public async liquidate(
     request: SimulateContractReturnType["request"],
-    logger: ILogger,
   ): Promise<TransactionReceipt> {
     if (this.config.dryRun && !this.config.optimistic) {
       throw new Error("dry run mode");
     }
-    logger.debug("sending liquidation tx");
+    this.logger.debug("sending liquidation tx");
     const { abi, address, args, dataSuffix, functionName, ...rest } = request;
     const data = encodeFunctionData({
       abi,
       args,
       functionName,
     } as EncodeFunctionDataParameters);
     const req = await this.wallet.prepareTransactionRequest({
+      ...(this.#gasFees as any),
       ...rest,
       to: request.address,
       data,
@@ -135,25 +142,39 @@ export default class Client {
     if (maxPriorityFeePerGas && maxFeePerGas) {
       req.maxPriorityFeePerGas = 10n * maxPriorityFeePerGas;
       req.maxFeePerGas = 2n * maxFeePerGas + req.maxPriorityFeePerGas;
-      logger.debug(
-        {
-          maxFeePerGas: req.maxFeePerGas,
-          maxPriorityFeePerGas: req.maxPriorityFeePerGas,
-        },
-        `increase gas fees`,
-      );
     }
     if (gas) {
       req.gas = (gas * (GAS_X + PERCENTAGE_FACTOR)) / PERCENTAGE_FACTOR;
     }
+    const txCost = req.gas * req.maxFeePerGas + (req.value ?? 0n);
+    this.logger.debug(
+      {
+        maxFeePerGas: req.maxFeePerGas,
+        maxPriorityFeePerGas: req.maxPriorityFeePerGas,
+        gas: req.gas,
+        txCost,
+      },
+      `increase gas fees`,
+    );
+
+    if (this.#balance && txCost > this.#balance.value) {
+      this.logger.warn(
+        {
+          txCost,
+          balance: this.#balance.value,
+        },
+        `transaction cost ${formatBN(txCost, 18)} exceeds balance (${formatBN(this.#balance.value, 18)} ETH)`,
+      );
+    }
+
     const serializedTransaction = await this.wallet.signTransaction(req);
     const hash = await this.wallet.sendRawTransaction({
       serializedTransaction,
     });
     const { data: _data, to, value, account, ...params } = req;
-    logger.debug({ hash, ...params }, "sent transaction");
+    this.logger.debug({ hash, ...params }, "sent transaction");
     const receipt = await this.#waitForTransactionReceipt(hash);
-    logger.debug({ hash, status: receipt.status }, "received receipt");
+    this.logger.debug({ hash, status: receipt.status }, "received receipt");
     if (!this.config.optimistic) {
       nextTick(() => {
         this.#checkBalance().catch(() => {});

src/services/Scanner.ts

@@ -74,7 +74,11 @@ export class Scanner {
       ? MAX_UINT256 // to discover account with underlying only, whose HF are not affected by zero-let script
       : this.config.hfThreshold;
     this.#minHealthFactor = this.config.optimistic ? 0n : 1n;
-    if (this.config.optimistic && this.config.liquidationMode === "partial") {
+    if (
+      (this.config.optimistic && this.config.liquidationMode === "partial") ||
+      (this.config.liquidationMode === "full" &&
+        this.config.lossPolicy === "only")
+    ) {
       this.#maxHealthFactor = MAX_UINT256;
     }
     if (this.config.liquidationMode === "deleverage") {

src/services/liquidate/AbstractLiquidator.ts

@@ -3,9 +3,8 @@ import type {
   GearboxSDK,
   ICreditAccountsService,
   MultiCall,
-  VersionRange,
 } from "@gearbox-protocol/sdk";
-import { filterDustUSD, isVersionRange } from "@gearbox-protocol/sdk";
+import { filterDustUSD } from "@gearbox-protocol/sdk";
 import { ierc20MetadataAbi } from "@gearbox-protocol/types/abi";
 import type { OptimisticResult } from "@gearbox-protocol/types/optimist";
 import type { Address, TransactionReceipt } from "viem";
@@ -19,10 +18,13 @@ import type Client from "../Client.js";
 import { type INotifier, StartedMessage } from "../notifier/index.js";
 import type { IOptimisticOutputWriter } from "../output/index.js";
 import type { ISwapper } from "../swap/index.js";
+import AccountHelper from "./AccountHelper.js";
 import type { OptimisticResults } from "./OptimisiticResults.js";
-import type { StrategyPreview } from "./types.js";
+import type { LiquidationPreview } from "./types.js";
 
-export default abstract class AbstractLiquidator<TConfig extends CommonSchema> {
+export default abstract class AbstractLiquidator<
+  TConfig extends CommonSchema,
+> extends AccountHelper {
   @Logger("Liquidator")
   logger!: ILogger;
 
@@ -81,7 +83,7 @@ export default abstract class AbstractLiquidator<TConfig extends CommonSchema> {
 
   protected updateAfterPreview(
     result: OptimisticResult<bigint>,
-    preview: StrategyPreview,
+    preview: LiquidationPreview,
   ): OptimisticResult<bigint> {
     return {
       ...result,
@@ -137,16 +139,6 @@ export default abstract class AbstractLiquidator<TConfig extends CommonSchema> {
     return { eth, underlying };
   }
 
-  protected caLogger(ca: CreditAccountData): ILogger {
-    const cm = this.sdk.marketRegister.findCreditManager(ca.creditManager);
-    return this.logger.child({
-      account: ca.creditAccount,
-      borrower: ca.owner,
-      manager: cm.name,
-      hf: ca.healthFactor,
-    });
-  }
-
   protected get sdk(): GearboxSDK {
     return this.creditAccountService.sdk;
   }
@@ -157,14 +149,4 @@ export default abstract class AbstractLiquidator<TConfig extends CommonSchema> {
     }
     return this.#errorHandler;
   }
-
-  protected checkAccountVersion(
-    ca: CreditAccountData,
-    v: VersionRange,
-  ): boolean {
-    return isVersionRange(
-      this.sdk.contracts.mustGet(ca.creditFacade).version,
-      v,
-    );
-  }
 }

src/services/liquidate/AccountHelper.ts

@@ -0,0 +1,39 @@
+import {
+  type CreditAccountData,
+  type GearboxSDK,
+  isVersionRange,
+  PERCENTAGE_FACTOR,
+  type VersionRange,
+} from "@gearbox-protocol/sdk";
+import type { ILogger } from "../../log/index.js";
+
+export default abstract class AccountHelper {
+  protected abstract sdk: GearboxSDK;
+  public abstract logger: ILogger;
+
+  protected checkAccountVersion(
+    ca: CreditAccountData,
+    v: VersionRange,
+  ): boolean {
+    return isVersionRange(
+      this.sdk.contracts.mustGet(ca.creditFacade).version,
+      v,
+    );
+  }
+
+  /**
+   * Whether account's total value (minus liquidator's premium) is below its outstanding debt
+   * @see https://github.com/Gearbox-protocol/core-v3/blob/5144d61af7d117f86d3fa9b4e2aa05535e2e5433/contracts/credit/CreditFacadeV3.sol#L986-L990
+   * @param ca
+   * @returns
+   */
+  protected hasBadDebt(ca: CreditAccountData): boolean {
+    const { creditManager } = this.sdk.marketRegister.findCreditManager(
+      ca.creditManager,
+    );
+    return (
+      ca.totalValue * BigInt(creditManager.liquidationDiscount) <
+      (ca.debt + ca.accruedInterest) * PERCENTAGE_FACTOR
+    );
+  }
+}

src/services/liquidate/BatchLiquidator.ts

@@ -224,7 +224,7 @@ export default class BatchLiquidator
       functionName: "liquidateBatch",
       args: [liquidateBatchInput, this.client.address],
     });
-    const receipt = await this.client.liquidate(request as any, this.logger); // TODO: types
+    const receipt = await this.client.liquidate(request as any); // TODO: types
     this.logger.debug(
       { tx: receipt.transactionHash, gasUsed: receipt.gasUsed },
       "liquidated batch",