fix: uin256 for health factor

Gearbox-protocol · Aug 22, 2024 · 01a7bd6 · 01a7bd6
1 parent cef2bfb
commit 01a7bd6
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 10 deletions.
diff --git a/src/config/schema.ts b/src/config/schema.ts
@@ -1,4 +1,4 @@
-import type { NetworkType } from "@gearbox-protocol/sdk-gov";
+import { MAX_INT, type NetworkType } from "@gearbox-protocol/sdk-gov";
 import { Address } from "abitype/zod";
 import { type Hex, isHex } from "viem";
 import { z } from "zod";
@@ -46,7 +46,7 @@ export const ConfigSchema = z.object({
    * Filter out all accounts with HF >= threshold during scan stage
    * 65535 is constant for zero-debt account
    */
-  hfThreshold: z.coerce.number().min(0).max(65536).int().default(65536),
+  hfThreshold: z.coerce.bigint().min(0n).max(MAX_INT).default(MAX_INT),
   optimistic: booleanLike.pipe(z.boolean().optional()),
   deployPartialLiquidatorContracts: booleanLike.pipe(z.boolean().optional()),
   partialLiquidatorAddress: Address.optional(),

diff --git a/src/data/CreditAccountData.ts b/src/data/CreditAccountData.ts
@@ -71,7 +71,7 @@ export class CreditAccountData {
   readonly cmName: string;
 
   readonly enabledTokenMask: bigint;
-  readonly healthFactor: number;
+  readonly healthFactor: bigint;
   isDeleting: boolean;
 
   readonly borrowedAmount: bigint;
@@ -104,7 +104,7 @@ export class CreditAccountData {
     this.version = Number(payload.cfVersion);
     this.cmName = payload.cmName;
 
-    this.healthFactor = Number(payload.healthFactor || 0n);
+    this.healthFactor = BigInt(payload.healthFactor || 0n);
     this.enabledTokenMask = BigInt(payload.enabledTokensMask);
     this.isDeleting = false;
 

diff --git a/src/services/liquidate/AbstractLiquidator.ts b/src/services/liquidate/AbstractLiquidator.ts
@@ -88,7 +88,7 @@ export default abstract class AbstractLiquidator {
       borrower: acc.borrower,
       account: acc.addr,
       balancesBefore: acc.filterDust(),
-      hfBefore: acc.healthFactor,
+      hfBefore: Number(acc.healthFactor),
       balancesAfter: {},
       hfAfter: 0,
       gasUsed: 0,
@@ -125,7 +125,7 @@ export default abstract class AbstractLiquidator {
   ): Promise<OptimisticResult> {
     const ca = await this.updateCreditAccountData(acc);
     result.balancesAfter = ca.filterDust();
-    result.hfAfter = ca.healthFactor;
+    result.hfAfter = Number(ca.healthFactor);
 
     const balanceAfter = await this.getExecutorBalance(ca.underlyingToken);
     result.gasUsed = Number(receipt.gasUsed);

diff --git a/src/services/liquidate/BatchLiquidator.ts b/src/services/liquidate/BatchLiquidator.ts
@@ -237,7 +237,7 @@ export default class BatchLiquidator
         }),
         balancesBefore: a.filterDust(),
         balancesAfter: {},
-        hfBefore: a.healthFactor,
+        hfBefore: Number(a.healthFactor),
         hfAfter: 0,
         creditManager: a.creditManager,
         borrower: a.borrower,

diff --git a/src/services/notifier/messages.ts b/src/services/notifier/messages.ts
@@ -96,7 +96,7 @@ export class LowBalanceMessage extends BaseMessage implements INotifierMessage {
 
 export class StartedMessage extends BaseMessage implements INotifierMessage {
   #name: string;
-  #hfThreshold: number;
+  #hfThreshold: bigint;
   #restakingWA: boolean;
 
   constructor() {

diff --git a/src/services/scanner/Scanner.ts b/src/services/scanner/Scanner.ts
@@ -133,7 +133,7 @@ export class Scanner {
         atBlock,
       );
     }
-    accounts = accounts.sort((a, b) => a.healthFactor - b.healthFactor);
+    accounts = accounts.sort((a, b) => Number(a.healthFactor - b.healthFactor));
     if (this.config.restakingWorkaround) {
       const before = accounts.length;
       accounts = this.#filterRestakingAccounts(accounts);
@@ -205,8 +205,10 @@ export class Scanner {
 
     accounts = accounts.filter(ca => {
       const ok = ca.healthFactor < this.config.hfThreshold;
+      // Currently in data compressor helathFactor is set to type(uint16).max for zero-debt accounts
+      // TODO: this will be changed to type(uint256).max in 3.1
       // 65535 is zero-debt account, no need to warn about it
-      if (!ok && ca.healthFactor !== 65535) {
+      if (!ok && ca.healthFactor !== 65535n) {
         this.log.warn(
           `health factor of ${ca.name} ${ca.healthFactor} > ${this.config.hfThreshold} threshold, skipping`,
         );