@gearbox-protocol/sdk 14.11.0-next.4 → 14.11.0-next.5

package/dist/esm/preview/parse/classifyInnerOperations.js

@@ -1,56 +1,25 @@
-import { zeroAddress } from "viem";
-import {
-  AbstractAdapterContract
-} from "../../plugins/adapters/index.js";
+import { AbstractAdapterContract } from "../../plugins/adapters/index.js";
 function classifyInnerOperations(calls, props) {
   const { sdk, underlying } = props;
   const result = [];
   for (const call of calls) {
     const contract = sdk.getContract(call.target);
-    if (contract instanceof AbstractAdapterContract) {
+    if (contract instanceof AbstractAdapterContract || contract === void 0) {
       result.push({
         operation: "Execute",
         adapter: call.target,
-        protocol: contract.targetContract,
         adapterType: call.contractType,
         version: call.version,
         label: call.label,
         adapterFunctionName: call.functionName,
-        adapterArgs: call.rawArgs,
-        // TODO: mirror the adapter call into the protocol fields for now. The
-        // real protocol-level call (adapter -> target contract) only exists in
-        // the execution call trace, which is not available from raw calldata.
-        // Recovering the actual protocol function/args requires a call trace.
-        protocolFunctionName: call.functionName,
-        protocolArgs: call.rawArgs,
-        transfers: [],
-        legacy: mockLegacyOperation()
+        adapterArgs: call.rawArgs
       });
       continue;
     }
-    if (contract !== void 0) {
-      const op = classifyFacadeInnerCall(call, underlying);
-      if (op) result.push(op);
-      continue;
+    const op = classifyFacadeInnerCall(call, underlying);
+    if (op) {
+      result.push(op);
     }
-    result.push({
-      operation: "Execute",
-      adapter: call.target,
-      protocol: call.target,
-      adapterType: call.contractType,
-      version: call.version,
-      label: call.label,
-      adapterFunctionName: call.functionName,
-      adapterArgs: call.rawArgs,
-      // TODO: mirror the adapter call into the protocol fields for now. The
-      // real protocol-level call (adapter -> target contract) only exists in
-      // the execution call trace, which is not available from raw calldata.
-      // Recovering the actual protocol function/args requires a call trace.
-      protocolFunctionName: call.functionName,
-      protocolArgs: call.rawArgs,
-      transfers: [],
-      legacy: mockLegacyOperation()
-    });
   }
   return result;
 }
@@ -94,15 +63,6 @@ function classifyFacadeInnerCall(call, underlying) {
       return null;
   }
 }
-function mockLegacyOperation() {
-  return {
-    operation: "Swap",
-    from: zeroAddress,
-    fromAmount: "0",
-    to: zeroAddress,
-    toAmount: "0"
-  };
-}
 export {
   classifyInnerOperations
 };

package/dist/esm/preview/parse/parseFacadeOperationCalldata.js

@@ -1,8 +1,4 @@
-import {
-  isAddressEqual,
-  zeroAddress,
-  zeroHash
-} from "viem";
+import { isAddressEqual, zeroAddress } from "viem";
 import { classifyInnerOperations } from "./classifyInnerOperations.js";
 function parseFacadeOperationCalldata(props) {
   const { sdk, facade, calldata } = props;
@@ -17,10 +13,7 @@ function parseFacadeOperationCalldata(props) {
   }
   const metadata = {
     creditManager: suite.creditManager.address,
-    creditFacade: facade.address,
-    blockNumber: Number(sdk.currentBlock),
-    txHash: zeroHash,
-    timestamp: 0
+    creditFacade: facade.address
   };
   const innerCalls = rawArgs.calls ?? [];
   const multicall = classifyInnerOperations(innerCalls, {

package/dist/esm/preview/parse/types.js

@@ -1,3 +1,6 @@
+export * from "./types-adapters.js";
+export * from "./types-facades.js";
+export * from "./types-pools.js";
 function isPoolOperation(tx) {
   return tx.operation === "Deposit" || tx.operation === "Redeem";
 }

package/dist/esm/{history → preview/trace}/errors.js

@@ -22,28 +22,6 @@ class WithdrawCollateralAlignmentError extends Error {
     this.name = "WithdrawCollateralAlignmentError";
   }
 }
-class ProtocolCallNotFoundError extends Error {
-  targetContract;
-  executeIndex;
-  constructor(targetContract, executeIndex) {
-    super(
-      `protocol call to ${targetContract} not found in trace for Execute #${executeIndex}`
-    );
-    this.name = "ProtocolCallNotFoundError";
-    this.targetContract = targetContract;
-    this.executeIndex = executeIndex;
-  }
-}
-class AdapterTraceAlignmentError extends Error {
-  constructor(expected, actual) {
-    super(`found ${actual} adapter traces for ${expected} execute events`);
-    this.expected = expected;
-    this.actual = actual;
-    this.name = "AdapterTracesAlignmentError";
-  }
-  expected;
-  actual;
-}
 class UnexpectedFacadeEventOrderError extends Error {
   constructor(e) {
     super(
@@ -63,8 +41,6 @@ class UnknownFacadeCallError extends Error {
   }
 }
 export {
-  AdapterTraceAlignmentError,
-  ProtocolCallNotFoundError,
   TransferAlignmentError,
   UnexpectedFacadeEventOrderError,
   UnknownAdapterError,

package/dist/esm/preview/trace/extractAdapterCallTraces.js

@@ -0,0 +1,40 @@
+import {
+  decodeAbiParameters,
+  isAddressEqual,
+  toFunctionSelector
+} from "viem";
+import {
+  resolveProtocolCall
+} from "../../common-utils/utils/trace.js";
+const WITHDRAW_PHANTOM_TOKEN_SELECTOR = toFunctionSelector(
+  "withdrawPhantomToken(address,uint256)"
+);
+const GET_PHANTOM_TOKEN_INFO_SELECTOR = toFunctionSelector(
+  "getPhantomTokenInfo()"
+);
+function isSynthesizedPhantomWithdrawal(siblings, index) {
+  const node = siblings[index];
+  if (node.type !== "CALL" || node.input.slice(0, 10).toLowerCase() !== WITHDRAW_PHANTOM_TOKEN_SELECTOR) {
+    return false;
+  }
+  const [token] = decodeAbiParameters(
+    [{ type: "address" }, { type: "uint256" }],
+    `0x${node.input.slice(10)}`
+  );
+  for (let i = 0; i < index; i++) {
+    const sib = siblings[i];
+    if (sib.type === "STATICCALL" && sib.input.slice(0, 10).toLowerCase() === GET_PHANTOM_TOKEN_INFO_SELECTOR && isAddressEqual(sib.to, token)) {
+      return true;
+    }
+  }
+  return false;
+}
+function extractAdapterCallTraces(facadeTrace) {
+  const subtraces = facadeTrace.calls ?? [];
+  return subtraces.filter(
+    (sub, index) => resolveProtocolCall(sub) !== void 0 && !isSynthesizedPhantomWithdrawal(subtraces, index)
+  );
+}
+export {
+  extractAdapterCallTraces
+};

package/dist/esm/{history → preview/trace}/extractTransfers.js

@@ -3,14 +3,14 @@ import {
   isAddressEqual,
   parseEventLogs
 } from "viem";
-import { iCreditFacadeV310Abi } from "../abi/310/generated.js";
-import { ierc20Abi } from "../abi/iERC20.js";
-import { AddressMap } from "../sdk/index.js";
+import { iCreditFacadeV310Abi } from "../../abi/310/generated.js";
+import { ierc20Abi } from "../../abi/iERC20.js";
+import { AddressMap } from "../../sdk/index.js";
 import { UnexpectedFacadeEventOrderError } from "./errors.js";
 function extractTransfers(logs, creditAccount, pool, creditFacade) {
   const ranges = buildOperationRanges(logs, creditFacade, creditAccount);
   let currentEntries = [];
-  const executeResults = [];
+  const executeTransfers = [];
   const directTransfers = [];
   const phantomTokens = new AddressMap();
   const withdrawCollateralEvents = [];
@@ -19,20 +19,17 @@ function extractTransfers(logs, creditAccount, pool, creditFacade) {
     const facadeEvent = tryDecodeFacadeEvent(log, creditFacade);
     if (facadeEvent) {
       if (isExecute(facadeEvent, creditAccount)) {
-        executeResults.push({
-          transfers: currentEntries,
-          targetContract: facadeEvent.args.targetContract
-        });
+        executeTransfers.push(currentEntries);
       } else if (isLiquidation(facadeEvent, creditAccount)) {
         liquidationRemainingFunds = facadeEvent.args.remainingFunds;
       } else if (isWithdrawPhantomToken(facadeEvent, creditAccount)) {
-        const phantomExec = executeResults.pop();
-        if (!phantomExec) {
+        const phantomTransfers = executeTransfers.pop();
+        if (!phantomTransfers) {
           throw new Error(
             `WithdrawPhantomToken without preceding Execute at logIndex ${facadeEvent.logIndex}`
           );
         }
-        const rawDeposit = phantomExec.transfers.find(
+        const rawDeposit = phantomTransfers.find(
           (t) => isAddressEqual(t.to, creditAccount)
         );
         if (!rawDeposit) {
@@ -67,11 +64,11 @@ function extractTransfers(logs, creditAccount, pool, creditFacade) {
       currentEntries.push({ token, amount: value, from, to });
     }
     if (isAddressEqual(to, creditAccount) && !isInRange(log.logIndex, ranges)) {
-      directTransfers.push({ token, from, amount: value });
+      directTransfers.push({ token, amount: value, from, to });
     }
   }
   return {
-    executeResults,
+    executeTransfers,
     directTransfers,
     liquidationRemainingFunds,
     phantomTokens,

package/dist/esm/{history → preview/trace}/findFacadeCalls.js

@@ -2,9 +2,11 @@ import {
   decodeFunctionResult,
   isAddressEqual
 } from "viem";
-import { iCreditFacadeV310Abi } from "../abi/310/generated.js";
+import { iCreditFacadeV310Abi } from "../../abi/310/generated.js";
+import {
+  collectTraces
+} from "../../common-utils/utils/trace.js";
 import { UnknownFacadeCallError } from "./errors.js";
-import { collectTraces } from "./trace-utils.js";
 const FACADE_CALL_TYPES = {
   multicall: "MultiCall",
   botMulticall: "BotMulticall",

package/dist/esm/preview/trace/index.js

@@ -0,0 +1,5 @@
+export * from "./errors.js";
+export * from "./extractAdapterCallTraces.js";
+export * from "./extractTransfers.js";
+export * from "./findFacadeCalls.js";
+export * from "./types.js";

package/dist/types/common-utils/utils/index.d.ts

@@ -5,4 +5,5 @@ export * from "./constants.js";
 export * from "./creditAccount/index.js";
 export * from "./price-math.js";
 export * from "./strategies/index.js";
+export * from "./trace.js";
 export * from "./validation/index.js";

package/dist/types/common-utils/utils/trace.d.ts

@@ -0,0 +1,73 @@
+import { type Address, type Hex } from "viem";
+/**
+ * A single frame from Ethereum's `debug_traceTransaction` callTracer output.
+ * Recursive: each frame may contain nested sub-calls.
+ */
+export interface CallTrace {
+    from: Address;
+    to: Address;
+    input: Hex;
+    output: Hex;
+    value: Hex;
+    /** "CALL", "DELEGATECALL", "STATICCALL", "CREATE", etc. */
+    type: string;
+    /** Present when the call reverted (e.g. "execution reverted"). */
+    error?: string;
+    /** ABI-encoded revert data, if available. */
+    revertReason?: Hex;
+    calls?: CallTrace[];
+}
+/**
+ * Selector of `CreditManagerV3.execute(bytes)` (`0x09c5eabe`).
+ *
+ * This is the authoritative marker of an adapter performing an external
+ * protocol call: the adapter calls the credit manager's `execute(bytes)`, which
+ * forwards the calldata to the credit account, which in turn CALLs the target
+ * (protocol) contract. Adapter approvals use a different selector
+ * (`execute(address,bytes)` on the credit account), so matching on this
+ * selector isolates the real protocol call.
+ */
+export declare const EXECUTE_BYTES_SELECTOR: "0x09c5eabe";
+/**
+ * Finds the shallowest non-reverted `CreditManager.execute(bytes)` call in a
+ * trace subtree (breadth-first), or `undefined` if none exists.
+ *
+ * "Shallowest" matters for account migration: a migrate adapter nests the
+ * entire target `openCreditAccount` multicall - including that account's own
+ * `execute(bytes)` calls - inside its subtree. The shallowest match is the
+ * adapter's own protocol call, not a nested one.
+ */
+export declare function findExecuteBytes(node: CallTrace): CallTrace | undefined;
+/**
+ * Finds the first non-reverted CALL in a subtree whose `input` exactly matches
+ * `input` (case-insensitive). Used to locate the leaf CALL to the target
+ * contract: `execute(bytes)` forwards the calldata unchanged through the credit
+ * account proxy DELEGATECALL down to the final CALL to the protocol contract.
+ */
+export declare function findCallWithInput(node: CallTrace, input: Hex): CallTrace | undefined;
+/**
+ * Resolves the external protocol call performed by an adapter-level call trace.
+ *
+ * Locates the shallowest `CreditManager.execute(bytes)`, decodes the forwarded
+ * calldata, then finds the leaf CALL whose input matches that calldata to
+ * recover the target (protocol) contract address. Returns `undefined` when the
+ * subtree does not actually reach an external protocol CALL (e.g. the
+ * facade-internal `depositPhantomToken` / `withdrawPhantomToken` accounting
+ * calls, which forward calldata but make no external CALL).
+ *
+ * @param node - direct child node of the upper-level facade call trace
+ */
+export declare function resolveProtocolCall(node: CallTrace): {
+    contract: Address;
+    calldata: Hex;
+} | undefined;
+/**
+ * Finds the first non-reverted CALL to `target` anywhere in a trace subtree.
+ */
+export declare function findCallTo(node: CallTrace, target: Address): CallTrace | undefined;
+/**
+ * DFS walk of the call trace tree, collecting non-reverted CALL entries
+ * to the given address.
+ * Does not recurse into children of matched nodes
+ */
+export declare function collectTraces(node: CallTrace, target: Address): CallTrace[];

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

@@ -1,11 +1,16 @@
 import type { Address } from "viem";
+import type { TokenTransfer } from "../preview/parse/index.js";
+import { type FacadeParsedCall, type WithdrawCollateralEventInfo } from "../preview/trace/index.js";
 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";
+import type { HistoryFacadeMetadata, OuterFacadeOperation } from "./types.js";
 export interface AssembleOperationsInput {
     facadeCalls: FacadeParsedCall[];
-    executeResults: ExecuteResult[];
+    /**
+     * ERC-20 transfers grouped per facade `Execute` event, one inner array per
+     * Execute event across the whole transaction, in emission order. Sliced per
+     * facade call and consumed one inner array per adapter/unknown inner call.
+     */
+    executeTransfers: TokenTransfer[][];
     register: ChainContractsRegister;
     underlying: Address;
     liquidationRemainingFunds?: bigint;
@@ -17,8 +22,8 @@ export interface AssembleOperationsInput {
  * Combines parsed facade calls with per-Execute transfer data into
  * fully classified {@link OuterFacadeOperation} entries.
  *
- * The flat `executeResults` array (one entry per Execute event across
+ * The flat `executeTransfers` array (one inner array per Execute event across
  * the entire transaction) is sliced per facade call based on how many
  * adapter/unknown inner calls each one contains.
  */
-export declare function assembleOperations(input: AssembleOperationsInput): Omit<OuterFacadeOperation, keyof FacadeOperationMetadata>[];
+export declare function assembleOperations(input: AssembleOperationsInput): Omit<OuterFacadeOperation, keyof HistoryFacadeMetadata>[];

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

@@ -1,12 +1,23 @@
-import { type Address, type Hex } from "viem";
+import { type Address } from "viem";
+import type { CallTrace } from "../common-utils/utils/trace.js";
+import type { TokenTransfer } from "../preview/parse/index.js";
+import { type WithdrawCollateralEventInfo } from "../preview/trace/index.js";
 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";
+import type { InnerOperation } from "./types.js";
 export interface ClassifyMulticallOperationsInput {
     innerCalls: ParsedCallV2[];
-    executeResults: ExecuteResult[];
-    protocolCalldatas: Hex[];
+    /**
+     * ERC-20 transfers grouped per facade `Execute` event for this facade call,
+     * one inner array per Execute event, in order. One inner array is consumed
+     * per adapter/unknown inner call.
+     */
+    executeTransfers: TokenTransfer[][];
+    /**
+     * Adapter-level call traces (one per Execute event, in order) used to recover
+     * the protocol-level call for adapter inner calls. See
+     * `extractAdapterCallTraces`.
+     */
+    adapterTraces: CallTrace[];
     register: ChainContractsRegister;
     creditAccount: Address;
     underlying: Address;
@@ -17,9 +28,10 @@ export interface ClassifyMulticallOperationsInput {
 /**
  * Classifies each multicall inner call into a {@link InnerOperation}:
  *
- * - **Adapter calls** (target registered as an adapter): delegates to
- *   `adapter.parseAdapterOperation()` and consumes the next entry from
- *   `executeTransfers` (one Execute event per adapter call).
+ * - **Adapter calls** (target registered as an adapter): decodes the
+ *   protocol-level call via `adapter.parseProtocolCall()`, classifies the
+ *   legacy operation via `adapter.classifyLegacyOperation()`, and consumes the
+ *   next entry from `executeTransfers` (one Execute event per adapter call).
  *
  * - **Facade self-calls** (`increaseDebt`, `updateQuota`, etc.): mapped
  *   directly from `functionName` / `rawArgs`. No transfer consumed.

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

@@ -1,4 +1,3 @@
-export * from "./inner-operations.js";
 export * from "./mapOperations.js";
 export { parseCreditAccountTransaction } from "./parseCreditAccountTransaction.js";
 export * from "./populateContractsRegister.js";

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

@@ -1,18 +1,16 @@
-import type { AdapterOperation } from "../plugins/adapters/index.js";
-import type { AddCollateralOp, DecreaseDebtOp, IncreaseDebtOp, UpdateQuotaOp, WithdrawCollateralOp } from "./inner-operations.js";
-import type { CloseCreditAccountOperation, CreditAccountOperation, DirectTokenTransferOperation, FacadeOperationMetadata, LiquidateCreditAccountOperation, MulticallOperation, OpenCreditAccountOperation, PartialLiquidationOperation } from "./types.js";
+import type { AdapterOperation, AddCollateralOp, CloseCreditAccountOperation, CreditAccountOperation, DecreaseDebtOp, DirectTokenTransferOperation, HistoryFacadeMetadata, IncreaseDebtOp, LiquidateCreditAccountOperation, MulticallOperation, OpenCreditAccountOperation, PartialLiquidationOperation, UpdateQuotaOp, WithdrawCollateralOp } from "./types.js";
 /**
  * Visitor that maps each operation node in a {@link CreditAccountOperation}
  * tree to a new representation.
  *
  */
 export interface OperationVisitor<TInner, TOuter> {
-    Execute(op: AdapterOperation, ctx: FacadeOperationMetadata): TInner;
-    IncreaseBorrowedAmount(op: IncreaseDebtOp, ctx: FacadeOperationMetadata): TInner;
-    DecreaseBorrowedAmount(op: DecreaseDebtOp, ctx: FacadeOperationMetadata): TInner;
-    AddCollateral(op: AddCollateralOp, ctx: FacadeOperationMetadata): TInner;
-    WithdrawCollateral(op: WithdrawCollateralOp, ctx: FacadeOperationMetadata): TInner;
-    UpdateQuota(op: UpdateQuotaOp, ctx: FacadeOperationMetadata): TInner;
+    Execute(op: AdapterOperation, ctx: HistoryFacadeMetadata): TInner;
+    IncreaseBorrowedAmount(op: IncreaseDebtOp, ctx: HistoryFacadeMetadata): TInner;
+    DecreaseBorrowedAmount(op: DecreaseDebtOp, ctx: HistoryFacadeMetadata): TInner;
+    AddCollateral(op: AddCollateralOp, ctx: HistoryFacadeMetadata): TInner;
+    WithdrawCollateral(op: WithdrawCollateralOp, ctx: HistoryFacadeMetadata): TInner;
+    UpdateQuota(op: UpdateQuotaOp, ctx: HistoryFacadeMetadata): TInner;
     DirectTokenTransfer(op: DirectTokenTransferOperation): TOuter;
     MultiCall(op: MulticallOperation, multicall: TInner[]): TOuter;
     OpenCreditAccount(op: OpenCreditAccountOperation, multicall: TInner[]): TOuter;

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

@@ -1,71 +1,28 @@
-import type { Address, Hex } from "viem";
-import type { InnerOperation } from "./inner-operations.js";
+import type { LegacyAdapterOperation } from "../plugins/adapters/index.js";
+import type { AdapterOperation as BaseAdapterOperation, CloseCreditAccountOperation as BaseCloseCreditAccountOperation, DirectTokenTransferOperation as BaseDirectTokenTransferOperation, InnerOperation as BaseInnerOperation, LiquidateCreditAccountOperation as BaseLiquidateCreditAccountOperation, MulticallOperation as BaseMulticallOperation, OpenCreditAccountOperation as BaseOpenCreditAccountOperation, PartialLiquidationOperation as BasePartialLiquidationOperation, FacadeOperationMetadata, OperationMetadata, TraceAdapterExt } from "../preview/parse/index.js";
+export type { AddCollateralOp, DecreaseDebtOp, FacadeOperationMetadata, IncreaseDebtOp, InnerFacadeOperation, OperationMetadata, UpdateQuotaOp, WithdrawCollateralOp, } from "../preview/parse/index.js";
 /**
- * An ERC-20 Transfer to the credit account that was not part of any
- * facade operation (multicall, liquidation, etc.).
+ * History-specific adapter-operation extension: trace-derived data
+ * ({@link TraceAdapterExt}) plus the backward-compatible `legacy` classification
+ * used by charts_server serialization. The `legacy` field lives only in
+ * `history`; the base `preview` operations carry no `legacy`.
  */
-export interface DirectTransferInfo {
-    token: Address;
-    from: Address;
-    amount: bigint;
-}
-export interface OperationMetadata {
-    txHash: Hex;
-    blockNumber: number;
-    timestamp: number;
-}
-export interface FacadeOperationMetadata extends OperationMetadata {
-    creditManager: Address;
-    creditFacade: Address;
-}
-export interface MulticallOperation extends FacadeOperationMetadata {
-    operation: "MultiCall" | "BotMulticall";
-    creditAccount: Address;
-    multicall: InnerOperation[];
-}
-export interface OpenCreditAccountOperation extends FacadeOperationMetadata {
-    operation: "OpenCreditAccount";
-    creditAccount: Address;
-    onBehalfOf: Address;
-    referralCode: bigint;
-    multicall: InnerOperation[];
-}
-export interface CloseCreditAccountOperation extends FacadeOperationMetadata {
-    operation: "CloseCreditAccount";
-    creditAccount: Address;
-    multicall: InnerOperation[];
-}
-export interface LiquidateCreditAccountOperation extends FacadeOperationMetadata {
-    operation: "LiquidateCreditAccount";
-    creditAccount: Address;
-    to: Address;
-    token: Address;
-    remainingFunds: bigint;
-    multicall: InnerOperation[];
-}
-export interface PartialLiquidationOperation extends FacadeOperationMetadata {
-    operation: "PartiallyLiquidateCreditAccount";
-    creditAccount: Address;
-    token: Address;
-    repaidAmount: bigint;
-    minSeizedAmount: bigint;
-    to: Address;
-}
-export interface DirectTokenTransferOperation extends OperationMetadata {
-    operation: "DirectTokenTransfer";
-    protocol: Address;
-    token: Address;
-    from: Address;
-    creditAccount: Address;
-    amount: bigint;
-}
+export type HistoryAdapterExt = TraceAdapterExt & {
+    legacy: LegacyAdapterOperation;
+};
 /**
- * Discriminated union of all facade-level operation types.
- * One per facade entry-point call within a transaction.
+ * Facade context available in `history` mode: the base facade metadata
+ * (`creditManager`/`creditFacade`) plus the transaction-level
+ * {@link OperationMetadata} that is only known once the transaction is mined.
  */
+export type HistoryFacadeMetadata = FacadeOperationMetadata & OperationMetadata;
+export type AdapterOperation = BaseAdapterOperation<HistoryAdapterExt>;
+export type InnerOperation = BaseInnerOperation<HistoryAdapterExt>;
+export type MulticallOperation = BaseMulticallOperation<HistoryAdapterExt> & OperationMetadata;
+export type OpenCreditAccountOperation = BaseOpenCreditAccountOperation<HistoryAdapterExt> & OperationMetadata;
+export type CloseCreditAccountOperation = BaseCloseCreditAccountOperation<HistoryAdapterExt> & OperationMetadata;
+export type LiquidateCreditAccountOperation = BaseLiquidateCreditAccountOperation<HistoryAdapterExt> & OperationMetadata;
+export type PartialLiquidationOperation = BasePartialLiquidationOperation & OperationMetadata;
+export type DirectTokenTransferOperation = BaseDirectTokenTransferOperation & OperationMetadata;
 export type OuterFacadeOperation = MulticallOperation | OpenCreditAccountOperation | CloseCreditAccountOperation | LiquidateCreditAccountOperation | PartialLiquidationOperation;
-/**
- * Discriminated union of all credit account operation types
- * (facade operations + direct token transfers).
- */
 export type CreditAccountOperation = OuterFacadeOperation | DirectTokenTransferOperation;

package/dist/types/plugins/adapters/contracts/AbstractAdapter.d.ts

@@ -1,8 +1,9 @@
-import { type Abi, type Address, type Hex, type PartialBy } from "viem";
+import { type Abi, type Address } from "viem";
+import { type CallTrace } from "../../../common-utils/utils/trace.js";
 import type { ConstructOptions, ParsedCallV2, RelaxedBaseParams } from "../../../sdk/index.js";
 import { BaseContract } from "../../../sdk/index.js";
 import type { LegacyAdapterOperation, Transfers } from "../legacyAdapterOperations.js";
-import type { AdapterContractStateHuman, AdapterContractType, AdapterOperation, TokenTransfer } from "../types.js";
+import type { AdapterContractStateHuman, AdapterContractType, AdapterProtocolOperation } from "../types.js";
 export interface ConcreteAdapterContractOptions {
     baseParams: RelaxedBaseParams;
 }
@@ -22,23 +23,19 @@ export declare class AbstractAdapterContract<const abi extends Abi | readonly un
     get adapterType(): AdapterContractType;
     stateHuman(raw?: boolean): AdapterContractStateHuman;
     /**
-     * Builds an {@link AdapterOperation} from a parsed call and ordered transfer entries.
+     * Decodes the protocol-level call (target contract + function name + args)
+     * performed by this adapter, recovered from its adapter-level call trace.
      *
-     * Returns `PartialBy<AdapterOperation, "targetContract">` because the adapter
-     * may not have `targetContract` (adapters created without SDK do not have serializedParams)
+     * Both the `targetContract` and the protocol calldata are taken from the
+     * execution trace.
      *
-     * @param protocolCalldata Raw calldata of the actual CALL to targetContract, extracted from trace
-     * @param strict When true, throws if protocol ABI is missing or decode fails
-     */
-    parseAdapterOperation(parsed: ParsedCallV2, transfers: TokenTransfer[], creditAccount: Address, protocolCalldata: Hex, strict?: boolean): PartialBy<AdapterOperation, "protocol">;
-    /**
-     * Decodes protocol-level function name and args from the raw calldata
-     * sent to targetContract.
+     * Returns `undefined` (in non-strict mode) when no external protocol call can
+     * be recovered, in strict mode throws instead.
+     *
+     * @param trace Adapter-level call trace (a direct child of the facade trace)
+     * @param strict When true, throws instead of returning `undefined`
      */
-    protected parseProtocolCall(calldata: Hex, strict?: boolean): {
-        protocolFunctionName: string;
-        protocolArgs: Record<string, unknown>;
-    };
+    parseProtocolCall(trace: CallTrace, strict?: boolean): AdapterProtocolOperation | undefined;
     /**
      * Classifies an adapter call into a {@link LegacyAdapterOperation} using the
      * parsed call and credit-account transfer deltas.
@@ -50,6 +47,8 @@ export declare class AbstractAdapterContract<const abi extends Abi | readonly un
      * Override in protocol-specific subclasses for richer classification.
      *
      * @see https://github.com/Gearbox-protocol/charts_server/blob/master/core/account_operation.go#L238-L264
+     *
+     * @deprecated Eventually will be gone, exists to produce output that legacy UI can display
      */
-    protected classifyLegacyOperation(_parsed: ParsedCallV2, transfers: Transfers): LegacyAdapterOperation;
+    classifyLegacyOperation(_parsed: ParsedCallV2, transfers: Transfers): LegacyAdapterOperation;
 }

package/dist/types/plugins/adapters/contracts/AccountMigratorAdapterContract.d.ts

@@ -1,5 +1,7 @@
+import type { CallTrace } from "../../../common-utils/utils/trace.js";
 import type { ConstructOptions, ParsedCallV2 } from "../../../sdk/index.js";
 import type { LegacyAdapterOperation, Transfers } from "../legacyAdapterOperations.js";
+import type { AdapterProtocolOperation } from "../types.js";
 import type { ConcreteAdapterContractOptions } from "./AbstractAdapter.js";
 import { AbstractAdapterContract } from "./AbstractAdapter.js";
 declare const abi: readonly [{
@@ -467,6 +469,13 @@ type protocolAbi = typeof protocolAbi;
 export declare class AccountMigratorAdapterContract extends AbstractAdapterContract<abi, protocolAbi> {
     constructor(options: ConstructOptions, args: ConcreteAdapterContractOptions);
     /** Legacy adapter not present in integrations-v3. */
-    protected classifyLegacyOperation(_parsed: ParsedCallV2, _transfers: Transfers): LegacyAdapterOperation;
+    classifyLegacyOperation(_parsed: ParsedCallV2, _transfers: Transfers): LegacyAdapterOperation;
+    /**
+     * The account-migrator adapter's `execute` targets the migrator bot, not an
+     * external protocol, so there is no protocol-level call to recover. Returning
+     * `undefined` keeps the `protocol` field aligned with its external-protocol
+     * semantics (see {@link TraceAdapterExt}).
+     */
+    parseProtocolCall(_trace: CallTrace, _strict?: boolean): AdapterProtocolOperation | undefined;
 }
 export {};

package/dist/types/plugins/adapters/contracts/ConvexV1BaseRewardPoolAdapterContract.d.ts

@@ -689,6 +689,6 @@ export declare class ConvexV1BaseRewardPoolAdapterContract extends AbstractAdapt
      * @see https://github.com/Gearbox-protocol/charts_server/blob/master/core/operation_type.go#L200-L262
      * @see https://github.com/Gearbox-protocol/charts_server/blob/master/core/operation_type_v3.go#L76-L83
      */
-    protected classifyLegacyOperation(parsed: ParsedCallV2, transfers: Transfers): LegacyAdapterOperation;
+    classifyLegacyOperation(parsed: ParsedCallV2, transfers: Transfers): LegacyAdapterOperation;
 }
 export {};