fix: dump more info to s3

Author: doomsower

package.json

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

src/MulticallSpy.ts

@@ -80,6 +80,7 @@ export default class MulticallSpy {
           Body: JSON.stringify(this.#detectedCalls),
         }),
       );
+      this.log.debug(`uploaded to ${s3Url}`);
     } catch (e) {
       this.log.error(e, `failed to upload to ${s3Url}`);
     }

src/services/Scanner.ts

@@ -19,7 +19,7 @@ import {
   iCreditManagerV3Abi,
   iPartialLiquidationBotV3Abi,
 } from "@gearbox-protocol/types/abi";
-import type { Address, Block, PublicClient } from "viem";
+import type { Address, Block, HttpTransportConfig, PublicClient } from "viem";
 import { createPublicClient, getContract, http } from "viem";
 import type { Config } from "../config/index.js";
 import { DI } from "../di.js";
@@ -53,9 +53,6 @@ export class Scanner {
   @DI.Inject(DI.CreditAccountService)
   caService!: ICreditAccountsService;
 
-  @DI.Inject(DI.MulticallSpy)
-  multicallSpy!: MulticallSpy;
-
   #processing: bigint | null = null;
   #restakingCMAddr?: Address;
   #restakingMinHF?: bigint;
@@ -387,6 +384,9 @@ class ScannerDiagnoster {
   @DI.Inject(DI.Notifier)
   notifier!: INotifier;
 
+  @DI.Inject(DI.MulticallSpy)
+  multicallSpy!: MulticallSpy;
+
   #drpc?: WorkaroundCAS;
   #alchemy?: WorkaroundCAS;
 
@@ -398,7 +398,17 @@ class ScannerDiagnoster {
         "http",
       );
       if (rpcURL) {
-        this.#drpc = new WorkaroundCAS(this.caService.sdk, { rpcURL });
+        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,
+          },
+        });
       }
     }
     if (this.config.alchemyKeys?.length) {
@@ -408,7 +418,17 @@ class ScannerDiagnoster {
         "http",
       );
       if (rpcURL) {
-        this.#alchemy = new WorkaroundCAS(this.caService.sdk, { rpcURL });
+        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,
+          },
+        });
       }
     }
     if (!!this.#drpc && !!this.#alchemy) {
@@ -460,6 +480,7 @@ class ScannerDiagnoster {
         plain: `Found ${numZeroHF} zero HF accounts in block ${blockNumber}, second pass ${dprcZeroHF} drpc, ${alchemyZeroHF} alchemy`,
         markdown: `Found ${numZeroHF} zero HF accounts in block ${blockNumber}, second pass ${dprcZeroHF} drpc, ${alchemyZeroHF} alchemy`,
       });
+      await this.multicallSpy.dumpCalls();
       return alchemyZeroHF < dprcZeroHF ? alchemyAccs : drpcAccs;
     } catch (e) {
       this.log.error(e);
@@ -470,6 +491,7 @@ class ScannerDiagnoster {
 
 interface WorkaroundCASOptions extends CreditAccountServiceOptions {
   rpcURL: string;
+  rpcOptions?: HttpTransportConfig;
 }
 
 class WorkaroundCAS extends AbstractCreditAccountService {
@@ -478,7 +500,10 @@ class WorkaroundCAS extends AbstractCreditAccountService {
   constructor(sdk: GearboxSDK, opts: WorkaroundCASOptions) {
     super(sdk, opts);
     this.#client = createPublicClient({
-      transport: http(opts.rpcURL, { timeout: 600_000 }),
+      transport: http(opts.rpcURL, {
+        timeout: 600_000,
+        ...opts.rpcOptions,
+      }),
       chain: sdk.provider.chain,
     });
   }

yarn.lock

@@ -1770,7 +1770,7 @@ __metadata:
     "@gearbox-protocol/cli-utils": "npm:^5.45.15"
     "@gearbox-protocol/liquidator-contracts": "npm:^1.36.0-experimental.41"
     "@gearbox-protocol/liquidator-v2-contracts": "npm:^2.4.0"
-    "@gearbox-protocol/sdk": "npm:8.27.9"
+    "@gearbox-protocol/sdk": "npm:8.27.10"
     "@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.27.9":
-  version: 8.27.9
-  resolution: "@gearbox-protocol/sdk@npm:8.27.9"
+"@gearbox-protocol/sdk@npm:8.27.10":
+  version: 8.27.10
+  resolution: "@gearbox-protocol/sdk@npm:8.27.10"
   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/5294febc9ac431aed4cfbb8ab4dc30590809d21cc7ad73a47b5e852b9096806c7b086c6421269218b08fa443c26d03230934aa37b86cc03fc5d29627315a066b
+  checksum: 10c0/9f35dcd84c52e476b841a33cc02bf65d481b8ef0b904485b4d08a42d00d7bd6a8d58729066f3dfb8af587ba6b0b16b23226fff4f6258e794aa38f538a5385559
   languageName: node
   linkType: hard