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

package/dist/cjs/preview/prerequisites/prepareAction.js

@@ -0,0 +1,48 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var prepareAction_exports = {};
+__export(prepareAction_exports, {
+  isActionablePrerequisite: () => isActionablePrerequisite,
+  preparePrerequisiteAction: () => preparePrerequisiteAction
+});
+module.exports = __toCommonJS(prepareAction_exports);
+var import_viem = require("viem");
+function preparePrerequisiteAction(result) {
+  if (result.kind === "allowance" && result.satisfied === false) {
+    const { token, spender, required } = result.detail;
+    return {
+      kind: "allowance",
+      to: token,
+      data: (0, import_viem.encodeFunctionData)({
+        abi: import_viem.erc20Abi,
+        functionName: "approve",
+        args: [spender, required]
+      })
+    };
+  }
+  return null;
+}
+function isActionablePrerequisite(result) {
+  return preparePrerequisiteAction(result) !== null;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  isActionablePrerequisite,
+  preparePrerequisiteAction
+});

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

@@ -18,8 +18,6 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var errors_exports = {};
 __export(errors_exports, {
-  AdapterTraceAlignmentError: () => AdapterTraceAlignmentError,
-  ProtocolCallNotFoundError: () => ProtocolCallNotFoundError,
   TransferAlignmentError: () => TransferAlignmentError,
   UnexpectedFacadeEventOrderError: () => UnexpectedFacadeEventOrderError,
   UnknownAdapterError: () => UnknownAdapterError,
@@ -51,28 +49,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(
@@ -93,8 +69,6 @@ class UnknownFacadeCallError extends Error {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  AdapterTraceAlignmentError,
-  ProtocolCallNotFoundError,
   TransferAlignmentError,
   UnexpectedFacadeEventOrderError,
   UnknownAdapterError,

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

@@ -0,0 +1,58 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var extractAdapterCallTraces_exports = {};
+__export(extractAdapterCallTraces_exports, {
+  extractAdapterCallTraces: () => extractAdapterCallTraces
+});
+module.exports = __toCommonJS(extractAdapterCallTraces_exports);
+var import_viem = require("viem");
+var import_trace = require("../../common-utils/utils/trace.js");
+const WITHDRAW_PHANTOM_TOKEN_SELECTOR = (0, import_viem.toFunctionSelector)(
+  "withdrawPhantomToken(address,uint256)"
+);
+const GET_PHANTOM_TOKEN_INFO_SELECTOR = (0, import_viem.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] = (0, import_viem.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 && (0, import_viem.isAddressEqual)(sib.to, token)) {
+      return true;
+    }
+  }
+  return false;
+}
+function extractAdapterCallTraces(facadeTrace) {
+  const subtraces = facadeTrace.calls ?? [];
+  return subtraces.filter(
+    (sub, index) => (0, import_trace.resolveProtocolCall)(sub) !== void 0 && !isSynthesizedPhantomWithdrawal(subtraces, index)
+  );
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  extractAdapterCallTraces
+});

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

@@ -22,14 +22,14 @@ __export(extractTransfers_exports, {
 });
 module.exports = __toCommonJS(extractTransfers_exports);
 var import_viem = require("viem");
-var import_generated = require("../abi/310/generated.js");
-var import_iERC20 = require("../abi/iERC20.js");
-var import_sdk = require("../sdk/index.js");
+var import_generated = require("../../abi/310/generated.js");
+var import_iERC20 = require("../../abi/iERC20.js");
+var import_sdk = require("../../sdk/index.js");
 var import_errors = require("./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 import_sdk.AddressMap();
   const withdrawCollateralEvents = [];
@@ -38,20 +38,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) => (0, import_viem.isAddressEqual)(t.to, creditAccount)
         );
         if (!rawDeposit) {
@@ -86,11 +83,11 @@ function extractTransfers(logs, creditAccount, pool, creditFacade) {
       currentEntries.push({ token, amount: value, from, to });
     }
     if ((0, import_viem.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/cjs/{history → preview/trace}/findFacadeCalls.js

@@ -22,9 +22,9 @@ __export(findFacadeCalls_exports, {
 });
 module.exports = __toCommonJS(findFacadeCalls_exports);
 var import_viem = require("viem");
-var import_generated = require("../abi/310/generated.js");
+var import_generated = require("../../abi/310/generated.js");
+var import_trace = require("../../common-utils/utils/trace.js");
 var import_errors = require("./errors.js");
-var import_trace_utils = require("./trace-utils.js");
 const FACADE_CALL_TYPES = {
   multicall: "MultiCall",
   botMulticall: "BotMulticall",
@@ -48,7 +48,7 @@ function extractCreditAccount(operation, rawArgs, traceOutput) {
   return ca;
 }
 function findFacadeCalls(trace, creditFacade, creditAccount, register, strict) {
-  const facadeTraces = (0, import_trace_utils.collectTraces)(trace, creditFacade);
+  const facadeTraces = (0, import_trace.collectTraces)(trace, creditFacade);
   const results = [];
   for (const trace2 of facadeTraces) {
     const parsed = register.parseFunctionDataV2(

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

@@ -0,0 +1,30 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var trace_exports = {};
+module.exports = __toCommonJS(trace_exports);
+__reExport(trace_exports, require("./errors.js"), module.exports);
+__reExport(trace_exports, require("./extractAdapterCallTraces.js"), module.exports);
+__reExport(trace_exports, require("./extractTransfers.js"), module.exports);
+__reExport(trace_exports, require("./findFacadeCalls.js"), module.exports);
+__reExport(trace_exports, require("./types.js"), module.exports);
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  ...require("./errors.js"),
+  ...require("./extractAdapterCallTraces.js"),
+  ...require("./extractTransfers.js"),
+  ...require("./findFacadeCalls.js"),
+  ...require("./types.js")
+});

package/dist/cjs/preview/trace/types.js

@@ -0,0 +1,16 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var types_exports = {};
+module.exports = __toCommonJS(types_exports);

package/dist/esm/common-utils/utils/index.js

@@ -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/esm/common-utils/utils/trace.js

@@ -0,0 +1,93 @@
+import {
+  decodeAbiParameters,
+  getAddress,
+  isAddressEqual
+} from "viem";
+const EXECUTE_BYTES_SELECTOR = "0x09c5eabe";
+function findExecuteBytes(node) {
+  const queue = [node];
+  while (queue.length > 0) {
+    const current = queue.shift();
+    if (current.error) {
+      continue;
+    }
+    if (current.input.slice(0, 10).toLowerCase() === EXECUTE_BYTES_SELECTOR) {
+      return current;
+    }
+    if (current.calls) {
+      queue.push(...current.calls);
+    }
+  }
+  return void 0;
+}
+function findCallWithInput(node, input) {
+  if (node.error) {
+    return void 0;
+  }
+  if (node.type === "CALL" && node.input.toLowerCase() === input.toLowerCase()) {
+    return node;
+  }
+  if (node.calls) {
+    for (const child of node.calls) {
+      const found = findCallWithInput(child, input);
+      if (found) {
+        return found;
+      }
+    }
+  }
+  return void 0;
+}
+function resolveProtocolCall(node) {
+  const executeNode = findExecuteBytes(node);
+  if (!executeNode) {
+    return void 0;
+  }
+  const [calldata] = decodeAbiParameters(
+    [{ type: "bytes" }],
+    `0x${executeNode.input.slice(10)}`
+  );
+  const targetCall = findCallWithInput(executeNode, calldata);
+  if (!targetCall) {
+    return void 0;
+  }
+  return { contract: getAddress(targetCall.to), calldata };
+}
+function findCallTo(node, target) {
+  if (node.error) {
+    return void 0;
+  }
+  if (node.type === "CALL" && isAddressEqual(node.to, target)) {
+    return node;
+  }
+  if (node.calls) {
+    for (const child of node.calls) {
+      const found = findCallTo(child, target);
+      if (found) {
+        return found;
+      }
+    }
+  }
+  return void 0;
+}
+function collectTraces(node, target) {
+  const results = [];
+  if (node.error) {
+    return results;
+  }
+  if (node.type === "CALL" && isAddressEqual(node.to, target)) {
+    results.push(node);
+  } else if (node.calls) {
+    for (const child of node.calls) {
+      results.push(...collectTraces(child, target));
+    }
+  }
+  return results;
+}
+export {
+  EXECUTE_BYTES_SELECTOR,
+  collectTraces,
+  findCallTo,
+  findCallWithInput,
+  findExecuteBytes,
+  resolveProtocolCall
+};

package/dist/esm/history/assembleOperations.js

@@ -1,10 +1,12 @@
 import { AbstractAdapterContract } from "../plugins/adapters/index.js";
+import {
+  extractAdapterCallTraces
+} from "../preview/trace/index.js";
 import { classifyMulticallOperations } from "./classifyMulticallOperations.js";
-import { extractProtocolCalls } from "./extractProtocolCalls.js";
 function assembleOperations(input) {
   const {
     facadeCalls,
-    executeResults,
+    executeTransfers,
     register,
     underlying,
     liquidationRemainingFunds,
@@ -19,7 +21,7 @@ function assembleOperations(input) {
       return assemblePartialLiquidation(fc);
     }
     const count = countAdapterCalls(fc.innerCalls, register);
-    const sliced = executeResults.slice(executeOffset, executeOffset + count);
+    const sliced = executeTransfers.slice(executeOffset, executeOffset + count);
     executeOffset += count;
     const withdrawCount = countWithdrawCollateralCalls(fc.innerCalls);
     const slicedWithdrawEvents = withdrawCollateralEvents.slice(
@@ -27,11 +29,11 @@ function assembleOperations(input) {
       withdrawOffset + withdrawCount
     );
     withdrawOffset += withdrawCount;
-    const protocolCalldatas = extractProtocolCalls(fc.trace, sliced);
+    const adapterTraces = extractAdapterCallTraces(fc.trace);
     const multicall = classifyMulticallOperations({
       innerCalls: fc.innerCalls,
-      executeResults: sliced,
-      protocolCalldatas,
+      executeTransfers: sliced,
+      adapterTraces,
       register,
       creditAccount: fc.creditAccount,
       underlying,

package/dist/esm/history/classifyMulticallOperations.js

@@ -8,12 +8,12 @@ import {
   TransferAlignmentError,
   UnknownAdapterError,
   WithdrawCollateralAlignmentError
-} from "./errors.js";
+} from "../preview/trace/index.js";
 function classifyMulticallOperations(input) {
   const {
     innerCalls,
-    executeResults,
-    protocolCalldatas,
+    executeTransfers,
+    adapterTraces,
     register,
     creditAccount,
     underlying,
@@ -28,20 +28,27 @@ function classifyMulticallOperations(input) {
     const contract = register.getContract(call.target);
     if (contract instanceof AbstractAdapterContract) {
       const idx = transferIdx++;
-      const executeResult = executeResults[idx];
-      if (!executeResult) {
-        throw new TransferAlignmentError(executeResults.length, transferIdx);
+      const transfers2 = executeTransfers[idx];
+      if (!transfers2) {
+        throw new TransferAlignmentError(executeTransfers.length, transferIdx);
       }
-      const { transfers: transfers2, targetContract: targetContract2 } = executeResult;
-      const protocolCalldata = protocolCalldatas[idx];
-      const partial = contract.parseAdapterOperation(
+      const protocol = contract.parseProtocolCall(adapterTraces[idx], strict);
+      const legacy = contract.classifyLegacyOperation(
         call,
-        transfers2,
-        creditAccount,
-        protocolCalldata,
-        strict
+        toNetTransfers(transfers2, creditAccount)
       );
-      if (partial) result.push({ ...partial, protocol: targetContract2 });
+      result.push({
+        operation: "Execute",
+        adapter: call.target,
+        adapterType: call.contractType,
+        version: call.version,
+        label: call.label,
+        adapterFunctionName: call.functionName,
+        adapterArgs: call.rawArgs,
+        protocol,
+        transfers: transfers2,
+        legacy
+      });
       continue;
     }
     if (contract !== void 0) {
@@ -60,23 +67,22 @@ function classifyMulticallOperations(input) {
       throw new UnknownAdapterError(call.target);
     }
     const unknownIdx = transferIdx++;
-    const unknownResult = executeResults[unknownIdx];
-    if (!unknownResult) {
-      throw new TransferAlignmentError(executeResults.length, transferIdx);
+    const transfers = executeTransfers[unknownIdx];
+    if (!transfers) {
+      throw new TransferAlignmentError(executeTransfers.length, transferIdx);
     }
-    const { transfers, targetContract } = unknownResult;
     const netTransfers = toNetTransfers(transfers, creditAccount);
     result.push({
       operation: "Execute",
       adapter: call.target,
-      protocol: targetContract,
       adapterType: call.contractType,
       version: call.version,
       label: call.label,
       adapterFunctionName: call.functionName,
       adapterArgs: call.rawArgs,
-      protocolFunctionName: call.functionName,
-      protocolArgs: call.rawArgs,
+      // Unknown adapter (non-strict): we have no ABI to decode the protocol
+      // call, so `protocol` is left absent rather than filled with placeholders.
+      protocol: void 0,
       transfers,
       legacy: {
         operation: "Swap",
@@ -84,8 +90,8 @@ function classifyMulticallOperations(input) {
       }
     });
   }
-  if (transferIdx !== executeResults.length) {
-    throw new TransferAlignmentError(executeResults.length, transferIdx);
+  if (transferIdx !== executeTransfers.length) {
+    throw new TransferAlignmentError(executeTransfers.length, transferIdx);
   }
   if (withdrawCollateralEvents && withdrawCollateralEvents.length > 0 && withdrawIdx !== withdrawCollateralEvents.length) {
     throw new WithdrawCollateralAlignmentError(

package/dist/esm/history/index.js

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

package/dist/esm/history/parseCreditAccountTransaction.js

@@ -1,6 +1,5 @@
+import { extractTransfers, findFacadeCalls } from "../preview/trace/index.js";
 import { assembleOperations } from "./assembleOperations.js";
-import { extractTransfers } from "./extractTransfers.js";
-import { findFacadeCalls } from "./findFacadeCalls.js";
 function parseCreditAccountTransaction(input) {
   const {
     trace,
@@ -25,7 +24,7 @@ function parseCreditAccountTransaction(input) {
     strict
   );
   const {
-    executeResults,
+    executeTransfers,
     directTransfers,
     liquidationRemainingFunds,
     phantomTokens,
@@ -40,7 +39,7 @@ function parseCreditAccountTransaction(input) {
   };
   const facadeOps = assembleOperations({
     facadeCalls,
-    executeResults,
+    executeTransfers,
     register,
     underlying,
     liquidationRemainingFunds,

package/dist/esm/history/toLegacyOperation.js

@@ -24,7 +24,11 @@ function createLegacyVisitor(params) {
         blockNum: ctx.blockNumber,
         timestamp: ctx.timestamp,
         sessionId: params.sessionId,
-        protocol: op.protocol
+        // `protocol` may be absent (migrator adapter, unknown adapter in
+        // non-strict mode, or undecodable calldata). The deprecated charts
+        // output still needs an address, so fall back to the on-chain adapter
+        // address, which is the closest meaningful value.
+        protocol: op.protocol?.contract ?? op.adapter
       };
     },
     IncreaseBorrowedAmount(op, ctx) {