fix: update multicall spy

Author: doomsower

package.json

@@ -29,7 +29,7 @@
     "@gearbox-protocol/cli-utils": "^5.45.16",
     "@gearbox-protocol/liquidator-contracts": "^1.36.0-experimental.41",
     "@gearbox-protocol/liquidator-v2-contracts": "^2.4.0",
-    "@gearbox-protocol/sdk": "8.28.1",
+    "@gearbox-protocol/sdk": "8.28.4",
     "@gearbox-protocol/types": "^1.14.8",
     "@types/node": "^24.3.1",
     "@uniswap/sdk-core": "^7.7.2",

src/MulticallSpy.ts

@@ -1,18 +1,10 @@
 import { join } from "node:path";
 import { PutObjectCommand, S3Client } from "@aws-sdk/client-s3";
-import type {
-  EIP1193Parameters,
-  HttpTransportConfig,
-  PublicRpcSchema,
-} from "viem";
+import { type EthCallRequest, EthCallSpy } from "@gearbox-protocol/sdk/dev";
 import type { Config } from "./config/index.js";
 import { DI } from "./di.js";
 import { type ILogger, Logger } from "./log/index.js";
 
-type DetectedCall = EIP1193Parameters<PublicRpcSchema> & {
-  headers?: Record<string, string>;
-};
-
 /**
  * This is temporary solution to diagnose bug where compressor occasionally returns many accounts with HF = 0
  */
@@ -24,50 +16,25 @@ export default class MulticallSpy {
   @DI.Inject(DI.Config)
   config!: Config;
 
+  public readonly spy: EthCallSpy;
   #client = new S3Client({});
-  #detectedCalls: DetectedCall[] = [];
-  #detectedBlock = 0n;
-
-  public multicallRequestSpy: Required<HttpTransportConfig>["onFetchRequest"] =
-    async request => {
-      if (!this.config.debugScanner || this.config.optimistic) {
-        return;
-      }
-      const data = (await request.json()) as EIP1193Parameters<PublicRpcSchema>;
-      const blockNumber = isGetCreditAccountsMulticall(data);
-      if (blockNumber) {
-        this.#storeCall(blockNumber, data);
-        this.log.debug(
-          `stored getCreditAccounts multicall at block ${blockNumber}, total calls: ${this.#detectedCalls.length}`,
-        );
-      }
-    };
 
-  public multicallResponseSpy: Required<HttpTransportConfig>["onFetchResponse"] =
-    async response => {
-      if (!this.config.debugScanner || this.config.optimistic) {
-        return;
-      }
-      const copy = response.clone();
-      const resp = await copy.json();
-      const id = (resp as any).id as number;
-      const call = this.#detectedCalls.find(c => "id" in c && c.id === id);
-      if (call) {
-        call.headers = Object.fromEntries(response.headers.entries());
-      }
-    };
+  constructor() {
+    this.spy = new EthCallSpy(
+      isGetCreditAccountsMulticall,
+      this.log,
+      this.config.debugScanner && !this.config.optimistic,
+    );
+  }
 
   public async dumpCalls(): Promise<void> {
-    if (!this.config.debugScanner || this.config.optimistic) {
-      return;
-    }
     if (!this.config.outS3Bucket) {
       this.log.error("outS3Bucket is not set");
       return;
     }
     const key = join(
       this.config.outS3Prefix,
-      `getCreditAccounts_${this.#detectedBlock}.json`,
+      `getCreditAccounts_${this.spy.detectedBlock}.json`,
     );
     const s3Url = `s3://${this.config.outS3Bucket}/${key}`;
     try {
@@ -77,42 +44,27 @@ export default class MulticallSpy {
           Bucket: this.config.outS3Bucket,
           Key: key,
           ContentType: "application/json",
-          Body: JSON.stringify(this.#detectedCalls),
+          Body: JSON.stringify(this.spy.detectedCalls),
         }),
       );
       this.log.debug(`uploaded to ${s3Url}`);
     } catch (e) {
       this.log.error(e, `failed to upload to ${s3Url}`);
     }
   }
-
-  #storeCall(
-    blockNumber: bigint,
-    data: EIP1193Parameters<PublicRpcSchema>,
-  ): void {
-    if (blockNumber !== this.#detectedBlock) {
-      this.#detectedBlock = blockNumber;
-      this.#detectedCalls = [];
-    }
-    this.#detectedCalls.push(data);
-  }
 }
 
 /**
  * Detects multicalls to CreditAccounts.getCreditAccounts
  * @param data
  * @returns block number if it's a getCreditAccounts multicall, undefined otherwise
  */
-function isGetCreditAccountsMulticall(
-  data: EIP1193Parameters<PublicRpcSchema>,
-): bigint | undefined {
+function isGetCreditAccountsMulticall(data: EthCallRequest): boolean {
   try {
     if (
       data.method === "eth_call" &&
       // detect eth_call to multicall3: 0xca11bde05977b3631167028862be2a173976ca11
       data.params[0].to === "0xca11bde05977b3631167028862be2a173976ca11" &&
-      typeof data.params[1] === "string" &&
-      data.params[1]?.startsWith("0x") && // non-latest block
       // that contain CA compressor: "0x4115708Fc8fe6bB392De2e0C21c2C81dA2222394"
       data.params[0].data?.includes(
         "4115708fc8fe6bb392de2e0c21c2c81da2222394",
@@ -125,7 +77,8 @@ function isGetCreditAccountsMulticall(
       (data.params[0].data?.includes("f43bdb34") ||
         data.params[0].data?.includes("8b59b911"))
     ) {
-      return BigInt(data.params[1]);
+      return true;
     }
   } catch {}
+  return false;
 }

src/attachSDK.ts

@@ -62,12 +62,8 @@ export default async function attachSDK(): Promise<ICreditAccountsService> {
 
   const transport = createTransport(config, {
     timeout: 600_000,
-    onFetchRequest: config.debugScanner
-      ? (r, o) => multicallSpy.multicallRequestSpy(r, o)
-      : undefined,
-    onFetchResponse: config.debugScanner
-      ? r => multicallSpy.multicallResponseSpy(r)
-      : undefined,
+    onFetchRequest: multicallSpy.spy.onFetchRequest,
+    onFetchResponse: multicallSpy.spy.onFetchResponse,
   });
 
   const sdk = await GearboxSDK.attach({

src/services/Scanner.ts

@@ -401,12 +401,8 @@ class ScannerDiagnoster {
         this.#drpc = new WorkaroundCAS(this.caService.sdk, {
           rpcURL,
           rpcOptions: {
-            onFetchRequest: this.config.debugScanner
-              ? (r, o) => this.multicallSpy.multicallRequestSpy(r, o)
-              : undefined,
-            onFetchResponse: this.config.debugScanner
-              ? r => this.multicallSpy.multicallResponseSpy(r)
-              : undefined,
+            onFetchRequest: this.multicallSpy.spy.onFetchRequest,
+            onFetchResponse: this.multicallSpy.spy.onFetchResponse,
           },
         });
       }
@@ -421,12 +417,8 @@ class ScannerDiagnoster {
         this.#alchemy = new WorkaroundCAS(this.caService.sdk, {
           rpcURL,
           rpcOptions: {
-            onFetchRequest: this.config.debugScanner
-              ? (r, o) => this.multicallSpy.multicallRequestSpy(r, o)
-              : undefined,
-            onFetchResponse: this.config.debugScanner
-              ? r => this.multicallSpy.multicallResponseSpy(r)
-              : undefined,
+            onFetchRequest: this.multicallSpy.spy.onFetchRequest,
+            onFetchResponse: this.multicallSpy.spy.onFetchResponse,
           },
         });
       }

yarn.lock

@@ -1770,7 +1770,7 @@ __metadata:
     "@gearbox-protocol/cli-utils": "npm:^5.45.16"
     "@gearbox-protocol/liquidator-contracts": "npm:^1.36.0-experimental.41"
     "@gearbox-protocol/liquidator-v2-contracts": "npm:^2.4.0"
-    "@gearbox-protocol/sdk": "npm:8.28.1"
+    "@gearbox-protocol/sdk": "npm:8.28.4"
     "@gearbox-protocol/types": "npm:^1.14.8"
     "@types/node": "npm:^24.3.1"
     "@uniswap/sdk-core": "npm:^7.7.2"
@@ -1796,9 +1796,9 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@gearbox-protocol/sdk@npm:8.28.1":
-  version: 8.28.1
-  resolution: "@gearbox-protocol/sdk@npm:8.28.1"
+"@gearbox-protocol/sdk@npm:8.28.4":
+  version: 8.28.4
+  resolution: "@gearbox-protocol/sdk@npm:8.28.4"
   dependencies:
     "@redstone-finance/evm-connector": "npm:^0.7.5"
     "@redstone-finance/protocol": "npm:^0.7.5"
@@ -1812,7 +1812,7 @@ __metadata:
     zod: "npm:^4.1.1"
   peerDependencies:
     axios: ^1.0.0
-  checksum: 10c0/d82d6861757e9a9dd5cc112b7f607fda40ae48793a7b390da72701aed8f198101e93416311f2a8eda8de0f860f2fc15409c60685c7a7c43a3712eb46205dd774
+  checksum: 10c0/f25d12497ef4a2787c4d6a0a9a0090477323887e67f085610db776cd136f70a331c453c6e5195f17f4deab09faa899ef71b6e4d1321fd23758917bfcc5ef88b3
   languageName: node
   linkType: hard
 
@@ -4166,9 +4166,9 @@ __metadata:
   linkType: hard
 
 "get-east-asian-width@npm:^1.0.0, get-east-asian-width@npm:^1.3.1":
-  version: 1.3.1
-  resolution: "get-east-asian-width@npm:1.3.1"
-  checksum: 10c0/cfe2eba0ae066d9a8b9f2e524922c6ec00ed91427758d701850839315febbbc56b26b06b43c8a9c1373ae769cc188c04c6a6fcaf3c9273e712a1cc8cd438a1f8
+  version: 1.4.0
+  resolution: "get-east-asian-width@npm:1.4.0"
+  checksum: 10c0/4e481d418e5a32061c36fbb90d1b225a254cc5b2df5f0b25da215dcd335a3c111f0c2023ffda43140727a9cafb62dac41d022da82c08f31083ee89f714ee3b83
   languageName: node
   linkType: hard