@gearbox-protocol/sdk 14.5.6 → 14.5.7

package/dist/cjs/history/assembleOperations.js

@@ -32,16 +32,24 @@ function assembleOperations(input) {
     underlying,
     liquidationRemainingFunds,
     phantomTokens,
+    withdrawCollateralEvents = [],
     strict
   } = input;
-  let offset = 0;
+  let executeOffset = 0;
+  let withdrawOffset = 0;
   return facadeCalls.map((fc) => {
     if (fc.operation === "PartiallyLiquidateCreditAccount") {
       return assemblePartialLiquidation(fc);
     }
     const count = countAdapterCalls(fc.innerCalls, register);
-    const sliced = executeResults.slice(offset, offset + count);
-    offset += count;
+    const sliced = executeResults.slice(executeOffset, executeOffset + count);
+    executeOffset += count;
+    const withdrawCount = countWithdrawCollateralCalls(fc.innerCalls);
+    const slicedWithdrawEvents = withdrawCollateralEvents.slice(
+      withdrawOffset,
+      withdrawOffset + withdrawCount
+    );
+    withdrawOffset += withdrawCount;
     const protocolCalldatas = (0, import_extractProtocolCalls.extractProtocolCalls)(fc.trace, sliced);
     const multicall = (0, import_classifyMulticallOperations.classifyMulticallOperations)({
       innerCalls: fc.innerCalls,
@@ -51,7 +59,8 @@ function assembleOperations(input) {
       creditAccount: fc.creditAccount,
       underlying,
       strict,
-      phantomTokens
+      phantomTokens,
+      withdrawCollateralEvents: slicedWithdrawEvents
     });
     switch (fc.operation) {
       case "OpenCreditAccount":
@@ -86,6 +95,11 @@ function countAdapterCalls(innerCalls, register) {
     return !contract || contract instanceof import_adapters.AbstractAdapterContract;
   }).length;
 }
+function countWithdrawCollateralCalls(innerCalls) {
+  return innerCalls.filter(
+    (call) => call.functionName.startsWith("withdrawCollateral")
+  ).length;
+}
 function assemblePartialLiquidation(fc) {
   const { rawArgs } = fc.parsed;
   return {

package/dist/cjs/history/classifyMulticallOperations.js

@@ -33,9 +33,11 @@ function classifyMulticallOperations(input) {
     creditAccount,
     underlying,
     strict,
-    phantomTokens
+    phantomTokens,
+    withdrawCollateralEvents
   } = input;
   let transferIdx = 0;
+  let withdrawIdx = 0;
   const result = [];
   for (const call of innerCalls) {
     const contract = register.getContract(call.target);
@@ -58,7 +60,14 @@ function classifyMulticallOperations(input) {
       continue;
     }
     if (contract !== void 0) {
-      const op = classifyFacadeInnerCall(call, underlying, phantomTokens);
+      const isWithdraw = call.functionName.startsWith("withdrawCollateral");
+      const withdrawEvent = isWithdraw ? withdrawCollateralEvents?.[withdrawIdx++] : void 0;
+      const op = classifyFacadeInnerCall(
+        call,
+        underlying,
+        phantomTokens,
+        withdrawEvent
+      );
       if (op) result.push(op);
       continue;
     }
@@ -93,9 +102,15 @@ function classifyMulticallOperations(input) {
   if (transferIdx !== executeResults.length) {
     throw new import_errors.TransferAlignmentError(executeResults.length, transferIdx);
   }
+  if (withdrawCollateralEvents && withdrawCollateralEvents.length > 0 && withdrawIdx !== withdrawCollateralEvents.length) {
+    throw new import_errors.WithdrawCollateralAlignmentError(
+      withdrawCollateralEvents.length,
+      withdrawIdx
+    );
+  }
   return result;
 }
-function classifyFacadeInnerCall(call, underlying, phantomTokens) {
+function classifyFacadeInnerCall(call, underlying, phantomTokens, withdrawEvent) {
   const { functionName: sig, rawArgs } = call;
   const functionName = sig.split("(")[0];
   switch (functionName) {
@@ -124,10 +139,11 @@ function classifyFacadeInnerCall(call, underlying, phantomTokens) {
         calldataToken,
         phantomTokens
       );
+      const amount = withdrawEvent ? withdrawEvent.amount : rawArgs.amount;
       return {
         operation: "WithdrawCollateral",
         token: depositedToken ?? calldataToken,
-        amount: rawArgs.amount,
+        amount,
         to: rawArgs.to,
         ...depositedToken ? { phantomToken: calldataToken } : {}
       };

package/dist/cjs/history/errors.js

@@ -23,7 +23,8 @@ __export(errors_exports, {
   TransferAlignmentError: () => TransferAlignmentError,
   UnexpectedFacadeEventOrderError: () => UnexpectedFacadeEventOrderError,
   UnknownAdapterError: () => UnknownAdapterError,
-  UnknownFacadeCallError: () => UnknownFacadeCallError
+  UnknownFacadeCallError: () => UnknownFacadeCallError,
+  WithdrawCollateralAlignmentError: () => WithdrawCollateralAlignmentError
 });
 module.exports = __toCommonJS(errors_exports);
 class UnknownAdapterError extends Error {
@@ -42,6 +43,14 @@ class TransferAlignmentError extends Error {
     this.name = "TransferAlignmentError";
   }
 }
+class WithdrawCollateralAlignmentError extends Error {
+  constructor(expected, actual) {
+    super(
+      `withdrawCollateral event alignment mismatch: expected ${expected} events, consumed ${actual}`
+    );
+    this.name = "WithdrawCollateralAlignmentError";
+  }
+}
 class ProtocolCallNotFoundError extends Error {
   targetContract;
   executeIndex;
@@ -89,5 +98,6 @@ class UnknownFacadeCallError extends Error {
   TransferAlignmentError,
   UnexpectedFacadeEventOrderError,
   UnknownAdapterError,
-  UnknownFacadeCallError
+  UnknownFacadeCallError,
+  WithdrawCollateralAlignmentError
 });

package/dist/cjs/history/extractTransfers.js

@@ -32,6 +32,7 @@ function extractTransfers(logs, creditAccount, pool, creditFacade) {
   const executeResults = [];
   const directTransfers = [];
   const phantomTokens = new import_sdk.AddressMap();
+  const withdrawCollateralEvents = [];
   let liquidationRemainingFunds;
   for (const log of logs) {
     const facadeEvent = tryDecodeFacadeEvent(log, creditFacade);
@@ -62,6 +63,12 @@ function extractTransfers(logs, creditAccount, pool, creditFacade) {
           facadeEvent.args.token,
           (0, import_viem.getAddress)(rawDeposit.token)
         );
+      } else if (isWithdrawCollateral(facadeEvent, creditAccount)) {
+        withdrawCollateralEvents.push({
+          token: (0, import_viem.getAddress)(facadeEvent.args.token),
+          amount: facadeEvent.args.amount,
+          to: (0, import_viem.getAddress)(facadeEvent.args.to)
+        });
       }
       currentEntries = [];
       continue;
@@ -86,7 +93,8 @@ function extractTransfers(logs, creditAccount, pool, creditFacade) {
     executeResults,
     directTransfers,
     liquidationRemainingFunds,
-    phantomTokens
+    phantomTokens,
+    withdrawCollateralEvents
   };
 }
 function buildOperationRanges(logs, facadeAddress, creditAccount) {
@@ -162,6 +170,9 @@ function isLiquidation(e, creditAccount) {
 function isWithdrawPhantomToken(e, creditAccount) {
   return e.eventName === "WithdrawPhantomToken" && (0, import_viem.isAddressEqual)(e.args.creditAccount, creditAccount);
 }
+function isWithdrawCollateral(e, creditAccount) {
+  return e.eventName === "WithdrawCollateral" && (0, import_viem.isAddressEqual)(e.args.creditAccount, creditAccount);
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   extractTransfers

package/dist/cjs/history/parseCreditAccountTransaction.js

@@ -51,7 +51,8 @@ function parseCreditAccountTransaction(input) {
     executeResults,
     directTransfers,
     liquidationRemainingFunds,
-    phantomTokens
+    phantomTokens,
+    withdrawCollateralEvents
   } = (0, import_extractTransfers.extractTransfers)(logs, creditAccount, pool, creditFacade);
   const meta = {
     creditManager,
@@ -67,6 +68,7 @@ function parseCreditAccountTransaction(input) {
     underlying,
     liquidationRemainingFunds,
     phantomTokens,
+    withdrawCollateralEvents,
     strict
   }).map((o) => ({ ...o, ...meta }));
   const directOps = directTransfers.map((dt) => ({

package/dist/esm/history/assembleOperations.js

@@ -9,16 +9,24 @@ function assembleOperations(input) {
     underlying,
     liquidationRemainingFunds,
     phantomTokens,
+    withdrawCollateralEvents = [],
     strict
   } = input;
-  let offset = 0;
+  let executeOffset = 0;
+  let withdrawOffset = 0;
   return facadeCalls.map((fc) => {
     if (fc.operation === "PartiallyLiquidateCreditAccount") {
       return assemblePartialLiquidation(fc);
     }
     const count = countAdapterCalls(fc.innerCalls, register);
-    const sliced = executeResults.slice(offset, offset + count);
-    offset += count;
+    const sliced = executeResults.slice(executeOffset, executeOffset + count);
+    executeOffset += count;
+    const withdrawCount = countWithdrawCollateralCalls(fc.innerCalls);
+    const slicedWithdrawEvents = withdrawCollateralEvents.slice(
+      withdrawOffset,
+      withdrawOffset + withdrawCount
+    );
+    withdrawOffset += withdrawCount;
     const protocolCalldatas = extractProtocolCalls(fc.trace, sliced);
     const multicall = classifyMulticallOperations({
       innerCalls: fc.innerCalls,
@@ -28,7 +36,8 @@ function assembleOperations(input) {
       creditAccount: fc.creditAccount,
       underlying,
       strict,
-      phantomTokens
+      phantomTokens,
+      withdrawCollateralEvents: slicedWithdrawEvents
     });
     switch (fc.operation) {
       case "OpenCreditAccount":
@@ -63,6 +72,11 @@ function countAdapterCalls(innerCalls, register) {
     return !contract || contract instanceof AbstractAdapterContract;
   }).length;
 }
+function countWithdrawCollateralCalls(innerCalls) {
+  return innerCalls.filter(
+    (call) => call.functionName.startsWith("withdrawCollateral")
+  ).length;
+}
 function assemblePartialLiquidation(fc) {
   const { rawArgs } = fc.parsed;
   return {

package/dist/esm/history/classifyMulticallOperations.js

@@ -4,7 +4,11 @@ import {
   swapFromTransfers,
   toNetTransfers
 } from "../plugins/adapters/index.js";
-import { TransferAlignmentError, UnknownAdapterError } from "./errors.js";
+import {
+  TransferAlignmentError,
+  UnknownAdapterError,
+  WithdrawCollateralAlignmentError
+} from "./errors.js";
 function classifyMulticallOperations(input) {
   const {
     innerCalls,
@@ -14,9 +18,11 @@ function classifyMulticallOperations(input) {
     creditAccount,
     underlying,
     strict,
-    phantomTokens
+    phantomTokens,
+    withdrawCollateralEvents
   } = input;
   let transferIdx = 0;
+  let withdrawIdx = 0;
   const result = [];
   for (const call of innerCalls) {
     const contract = register.getContract(call.target);
@@ -39,7 +45,14 @@ function classifyMulticallOperations(input) {
       continue;
     }
     if (contract !== void 0) {
-      const op = classifyFacadeInnerCall(call, underlying, phantomTokens);
+      const isWithdraw = call.functionName.startsWith("withdrawCollateral");
+      const withdrawEvent = isWithdraw ? withdrawCollateralEvents?.[withdrawIdx++] : void 0;
+      const op = classifyFacadeInnerCall(
+        call,
+        underlying,
+        phantomTokens,
+        withdrawEvent
+      );
       if (op) result.push(op);
       continue;
     }
@@ -74,9 +87,15 @@ function classifyMulticallOperations(input) {
   if (transferIdx !== executeResults.length) {
     throw new TransferAlignmentError(executeResults.length, transferIdx);
   }
+  if (withdrawCollateralEvents && withdrawCollateralEvents.length > 0 && withdrawIdx !== withdrawCollateralEvents.length) {
+    throw new WithdrawCollateralAlignmentError(
+      withdrawCollateralEvents.length,
+      withdrawIdx
+    );
+  }
   return result;
 }
-function classifyFacadeInnerCall(call, underlying, phantomTokens) {
+function classifyFacadeInnerCall(call, underlying, phantomTokens, withdrawEvent) {
   const { functionName: sig, rawArgs } = call;
   const functionName = sig.split("(")[0];
   switch (functionName) {
@@ -105,10 +124,11 @@ function classifyFacadeInnerCall(call, underlying, phantomTokens) {
         calldataToken,
         phantomTokens
       );
+      const amount = withdrawEvent ? withdrawEvent.amount : rawArgs.amount;
       return {
         operation: "WithdrawCollateral",
         token: depositedToken ?? calldataToken,
-        amount: rawArgs.amount,
+        amount,
         to: rawArgs.to,
         ...depositedToken ? { phantomToken: calldataToken } : {}
       };

package/dist/esm/history/errors.js

@@ -14,6 +14,14 @@ class TransferAlignmentError extends Error {
     this.name = "TransferAlignmentError";
   }
 }
+class WithdrawCollateralAlignmentError extends Error {
+  constructor(expected, actual) {
+    super(
+      `withdrawCollateral event alignment mismatch: expected ${expected} events, consumed ${actual}`
+    );
+    this.name = "WithdrawCollateralAlignmentError";
+  }
+}
 class ProtocolCallNotFoundError extends Error {
   targetContract;
   executeIndex;
@@ -60,5 +68,6 @@ export {
   TransferAlignmentError,
   UnexpectedFacadeEventOrderError,
   UnknownAdapterError,
-  UnknownFacadeCallError
+  UnknownFacadeCallError,
+  WithdrawCollateralAlignmentError
 };

package/dist/esm/history/extractTransfers.js

@@ -13,6 +13,7 @@ function extractTransfers(logs, creditAccount, pool, creditFacade) {
   const executeResults = [];
   const directTransfers = [];
   const phantomTokens = new AddressMap();
+  const withdrawCollateralEvents = [];
   let liquidationRemainingFunds;
   for (const log of logs) {
     const facadeEvent = tryDecodeFacadeEvent(log, creditFacade);
@@ -43,6 +44,12 @@ function extractTransfers(logs, creditAccount, pool, creditFacade) {
           facadeEvent.args.token,
           getAddress(rawDeposit.token)
         );
+      } else if (isWithdrawCollateral(facadeEvent, creditAccount)) {
+        withdrawCollateralEvents.push({
+          token: getAddress(facadeEvent.args.token),
+          amount: facadeEvent.args.amount,
+          to: getAddress(facadeEvent.args.to)
+        });
       }
       currentEntries = [];
       continue;
@@ -67,7 +74,8 @@ function extractTransfers(logs, creditAccount, pool, creditFacade) {
     executeResults,
     directTransfers,
     liquidationRemainingFunds,
-    phantomTokens
+    phantomTokens,
+    withdrawCollateralEvents
   };
 }
 function buildOperationRanges(logs, facadeAddress, creditAccount) {
@@ -143,6 +151,9 @@ function isLiquidation(e, creditAccount) {
 function isWithdrawPhantomToken(e, creditAccount) {
   return e.eventName === "WithdrawPhantomToken" && isAddressEqual(e.args.creditAccount, creditAccount);
 }
+function isWithdrawCollateral(e, creditAccount) {
+  return e.eventName === "WithdrawCollateral" && isAddressEqual(e.args.creditAccount, creditAccount);
+}
 export {
   extractTransfers
 };

package/dist/esm/history/parseCreditAccountTransaction.js

@@ -28,7 +28,8 @@ function parseCreditAccountTransaction(input) {
     executeResults,
     directTransfers,
     liquidationRemainingFunds,
-    phantomTokens
+    phantomTokens,
+    withdrawCollateralEvents
   } = extractTransfers(logs, creditAccount, pool, creditFacade);
   const meta = {
     creditManager,
@@ -44,6 +45,7 @@ function parseCreditAccountTransaction(input) {
     underlying,
     liquidationRemainingFunds,
     phantomTokens,
+    withdrawCollateralEvents,
     strict
   }).map((o) => ({ ...o, ...meta }));
   const directOps = directTransfers.map((dt) => ({

package/dist/types/history/assembleOperations.d.ts

@@ -1,5 +1,6 @@
 import type { Address } from "viem";
 import type { AddressMap, ChainContractsRegister } from "../sdk/index.js";
+import type { WithdrawCollateralEventInfo } from "./extractTransfers.js";
 import type { ExecuteResult, FacadeParsedCall } from "./internal-types.js";
 import type { FacadeOperationMetadata, OuterFacadeOperation } from "./types.js";
 export interface AssembleOperationsInput {
@@ -9,6 +10,7 @@ export interface AssembleOperationsInput {
     underlying: Address;
     liquidationRemainingFunds?: bigint;
     phantomTokens?: AddressMap<Address>;
+    withdrawCollateralEvents?: WithdrawCollateralEventInfo[];
     strict?: boolean;
 }
 /**

package/dist/types/history/classifyMulticallOperations.d.ts

@@ -1,5 +1,6 @@
 import { type Address, type Hex } from "viem";
 import type { AddressMap, ChainContractsRegister, ParsedCallV2 } from "../sdk/index.js";
+import type { WithdrawCollateralEventInfo } from "./extractTransfers.js";
 import type { InnerOperation } from "./inner-operations.js";
 import type { ExecuteResult } from "./internal-types.js";
 export interface ClassifyMulticallOperationsInput {
@@ -11,6 +12,7 @@ export interface ClassifyMulticallOperationsInput {
     underlying: Address;
     strict?: boolean;
     phantomTokens?: AddressMap<Address>;
+    withdrawCollateralEvents?: WithdrawCollateralEventInfo[];
 }
 /**
  * Classifies each multicall inner call into a {@link InnerOperation}:

package/dist/types/history/errors.d.ts

@@ -6,6 +6,9 @@ export declare class UnknownAdapterError extends Error {
 export declare class TransferAlignmentError extends Error {
     constructor(expected: number, actual: number);
 }
+export declare class WithdrawCollateralAlignmentError extends Error {
+    constructor(expected: number, actual: number);
+}
 export declare class ProtocolCallNotFoundError extends Error {
     readonly targetContract: Address;
     readonly executeIndex: number;

package/dist/types/history/extractTransfers.d.ts

@@ -3,6 +3,19 @@ import { AddressMap } from "../sdk/index.js";
 import type { ExecuteResult } from "./internal-types.js";
 import type { DirectTransferInfo } from "./types.js";
 type RawLog = Log<bigint | number, number, false>;
+/**
+ * Effective `withdrawCollateral` outcome decoded from the facade's
+ * `WithdrawCollateral` event.
+ */
+export interface WithdrawCollateralEventInfo {
+    /**
+     * For regular withdrawals: the calldata token.
+     * For phantom withdrawals: the deposited (resolved) token.
+     */
+    token: Address;
+    amount: bigint;
+    to: Address;
+}
 /**
  * Extracts per-adapter-call token balance changes and detects direct
  * incoming transfers to the credit account.
@@ -17,6 +30,12 @@ export interface ExtractTransfersResult {
     liquidationRemainingFunds?: bigint;
     /** Maps phantom token address to its deposited (underlying) token address. */
     phantomTokens: AddressMap<Address>;
+    /**
+     * One entry per facade `WithdrawCollateral` event targeting `creditAccount`,
+     * in transaction order. Used to recover the effective amount when the
+     * calldata uses the `type(uint256).max` "withdraw all" sentinel.
+     */
+    withdrawCollateralEvents: WithdrawCollateralEventInfo[];
 }
 export declare function extractTransfers(logs: RawLog[], creditAccount: Address, pool: Address, creditFacade: Address): ExtractTransfersResult;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gearbox-protocol/sdk",
-  "version": "14.5.6",
+  "version": "14.5.7",
   "description": "Gearbox SDK",
   "license": "MIT",
   "main": "./dist/cjs/sdk/index.js",