fix: improve optimistic reporting in case of loss policy revert

Author: doomsower

src/errors/index.ts

@@ -1,3 +1,3 @@
 export * from "./ErrorHandler.js";
-export * from "./isCreditAccountNotLiquidatableException.js";
+export * from "./isRevertedWith.js";
 export * from "./TransactionRevertedError.js";

src/errors/isCreditAccountNotLiquidatableException.ts

@@ -0,0 +1,42 @@
+import { BaseError, ContractFunctionRevertedError, type Hex } from "viem";
+
+// export function isCreditAccountNotLiquidatableException(e: Error): boolean {
+//   if (!(e instanceof BaseError)) {
+//     return false;
+//   }
+
+//   const err = e.walk(i => i instanceof ContractFunctionRevertedError);
+//   if (err instanceof ContractFunctionRevertedError) {
+//     // CreditAccountNotLiquidatableException()
+//     return err.raw === "0x234b893b";
+//   }
+//   return false;
+// }
+
+// export function isCreditAccountNotLiquidatableWithLossExceptionException(
+//   e: Error,
+// ): boolean {
+//   if (!(e instanceof BaseError)) {
+//     return false;
+//   }
+
+//   const err = e.walk(i => i instanceof ContractFunctionRevertedError);
+//   if (err instanceof ContractFunctionRevertedError) {
+//     // CreditAccountNotLiquidatableWithLossException()
+//     return err.raw === "0x6b8c2b8c";
+//   }
+//   return false;
+// }
+
+export function isRevertedWith(e: Error, revertCode: Hex): boolean {
+  if (!(e instanceof BaseError)) {
+    return false;
+  }
+
+  const err = e.walk(i => i instanceof ContractFunctionRevertedError);
+  if (err instanceof ContractFunctionRevertedError) {
+    // CreditAccountNotLiquidatableWithLossException()
+    return err.raw === revertCode;
+  }
+  return false;
+}

src/errors/isRevertedWith.ts

@@ -23,7 +23,7 @@ import type {
   LiqduiatorConfig,
 } from "../../config/index.js";
 import { DI } from "../../di.js";
-import { isCreditAccountNotLiquidatableException } from "../../errors/index.js";
+import { isRevertedWith } from "../../errors/index.js";
 import { type ILogger, Logger } from "../../log/index.js";
 import type Client from "../Client.js";
 import AccountHelper from "./AccountHelper.js";
@@ -215,14 +215,23 @@ export default class LiquidationStrategyFull
       >;
     } catch (e) {
       // in optimistic mode, it's possible to encounter accounts with underlying only and HF > 0
-      if (
-        this.config.optimistic &&
-        account.healthFactor > WAD &&
-        isCreditAccountNotLiquidatableException(e as Error)
-      ) {
-        throw new Error("warning: credit account is not liquidatable", {
-          cause: e,
-        });
+      if (this.config.optimistic) {
+        if (
+          account.healthFactor > WAD &&
+          isRevertedWith(e as Error, "0x234b893b") // CreditAccountNotLiquidatableException())
+        ) {
+          throw new Error("warning: credit account is not liquidatable", {
+            cause: e,
+          });
+        } else if (isRevertedWith(e as Error, "0x6b8c2b8c")) {
+          // CreditAccountNotLiquidatableWithLossException()
+          throw new Error(
+            "warning: credit account is not liquidatable with loss",
+            {
+              cause: e,
+            },
+          );
+        }
       }
       throw e;
     }