@gearbox-protocol/sdk 14.12.0-next.7 → 14.12.0-next.9

package/dist/cjs/preview/preview/previewOpenCreditAccount.js

@@ -21,61 +21,92 @@ __export(previewOpenCreditAccount_exports, {
   previewOpenCreditAccount: () => previewOpenCreditAccount
 });
 module.exports = __toCommonJS(previewOpenCreditAccount_exports);
+var import_adapters = require("../../plugins/adapters/index.js");
 var import_sdk = require("../../sdk/index.js");
-var import_extractExpectedBalanceChanges = require("./extractExpectedBalanceChanges.js");
+var import_unwrapNativeCollateral = require("./unwrapNativeCollateral.js");
 function previewOpenCreditAccount(input, operation) {
-  const { sdk, to, calldata } = input;
+  const { sdk, value = 0n } = input;
   const market = sdk.marketRegister.findByCreditManager(
     operation.creditManager
   );
-  const collateralByToken = new import_sdk.AddressMap();
-  const balances = new import_sdk.AddressMap();
-  const addBalance = (token, amount) => {
-    balances.upsert(token, (balances.get(token) ?? 0n) + amount);
-  };
+  const collateralBalances = new import_sdk.AssetsMap();
+  const balances = new import_sdk.AssetsMap();
   let debt = 0n;
   const quotas = [];
+  let inBracket = false;
+  let storeSeen = false;
   for (const op of operation.multicall) {
     switch (op.operation) {
-      case "AddCollateral": {
-        const balance = collateralByToken.get(op.token)?.balance ?? 0n;
-        collateralByToken.upsert(op.token, {
-          token: op.token,
-          balance: balance + op.amount
-        });
-        addBalance(op.token, op.amount);
+      case "AddCollateral":
+        collateralBalances.inc(op.token, op.amount);
+        balances.inc(op.token, op.amount);
         break;
-      }
       case "WithdrawCollateral":
-        addBalance(op.token, -op.amount);
+        balances.dec(op.token, op.amount);
         break;
       case "IncreaseBorrowedAmount":
         debt += op.amount;
-        addBalance(op.token, op.amount);
+        balances.inc(op.token, op.amount);
         break;
       case "DecreaseBorrowedAmount":
         debt -= op.amount;
-        addBalance(op.token, -op.amount);
+        balances.dec(op.token, op.amount);
         break;
       case "UpdateQuota":
         quotas.push({ token: op.token, balance: op.change });
         break;
+      case "StoreExpectedBalances":
+        if (storeSeen) {
+          throw new Error(
+            "malformed multicall: duplicate storeExpectedBalances call"
+          );
+        }
+        storeSeen = true;
+        inBracket = true;
+        for (const { token, balance } of op.deltas) {
+          balances.inc(token, balance);
+        }
+        break;
+      case "CompareBalances":
+        if (!inBracket) {
+          throw new Error(
+            "malformed multicall: compareBalances without a preceding storeExpectedBalances"
+          );
+        }
+        inBracket = false;
+        break;
+      case "Execute":
+        if (inBracket) {
+          const adapter = sdk.getContract(op.adapter);
+          if (!(adapter instanceof import_adapters.AbstractAdapterContract)) {
+            throw new Error(
+              `call to ${op.adapter} between storeExpectedBalances and compareBalances is not an adapter call`
+            );
+          }
+          adapter.previewBalanceChanges(balances, op.calldata);
+        }
+        break;
     }
   }
-  const collateral = collateralByToken.values();
+  if (inBracket) {
+    throw new Error(
+      "malformed multicall: storeExpectedBalances without a matching compareBalances"
+    );
+  }
+  let collateral = collateralBalances.toAssets();
   const collateralValue = collateral.reduce(
     (acc, { token, balance }) => acc + market.priceOracle.convert(token, market.underlying, balance),
     0n
   );
-  const parsed = sdk.parseFunctionDataV2(to, calldata);
-  const innerCalls = parsed.rawArgs.calls ?? [];
-  const deltas = (0, import_extractExpectedBalanceChanges.extractExpectedBalanceChanges)(innerCalls) ?? [];
-  for (const { token, balance } of deltas) {
-    addBalance(token, balance);
-  }
+  collateral = (0, import_unwrapNativeCollateral.unwrapNativeCollateral)(
+    collateral,
+    value,
+    sdk.addressProvider.getAddress(import_sdk.AP_WETH_TOKEN, import_sdk.NO_VERSION)
+  );
   const assets = balances.entries().filter(([, balance]) => balance > 1n).map(([token, balance]) => ({ token, balance }));
   return {
     operation: operation.operation,
+    creditManager: operation.creditManager,
     target: inferTargetAsset(operation.multicall, balances),
     collateral,
     collateralValue,

package/dist/cjs/preview/preview/{extractExpectedBalanceChanges.js → unwrapNativeCollateral.js}

@@ -16,33 +16,30 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var extractExpectedBalanceChanges_exports = {};
-__export(extractExpectedBalanceChanges_exports, {
-  extractExpectedBalanceChanges: () => extractExpectedBalanceChanges
+var unwrapNativeCollateral_exports = {};
+__export(unwrapNativeCollateral_exports, {
+  unwrapNativeCollateral: () => unwrapNativeCollateral
 });
-module.exports = __toCommonJS(extractExpectedBalanceChanges_exports);
-function extractExpectedBalanceChanges(innerCalls) {
-  const calls = innerCalls.filter(
-    (call) => functionName(call) !== "onDemandPriceUpdates"
-  );
-  if (calls.length === 0) {
-    return void 0;
-  }
-  const first = calls[0];
-  const last = calls[calls.length - 1];
-  if (functionName(first) !== "storeExpectedBalances" || functionName(last) !== "compareBalances") {
-    return void 0;
+module.exports = __toCommonJS(unwrapNativeCollateral_exports);
+var import_sdk = require("../../sdk/index.js");
+var import_errors = require("./errors.js");
+function unwrapNativeCollateral(collateral, nativeAmount, wethToken) {
+  if (nativeAmount === 0n) {
+    return collateral;
   }
-  const balanceDeltas = first.rawArgs.balanceDeltas;
-  if (!balanceDeltas) {
-    return void 0;
+  const balances = new import_sdk.AssetsMap(collateral);
+  const wethBalance = balances.get(wethToken) ?? 0n;
+  if (wethBalance < nativeAmount) {
+    throw new import_errors.InvalidTransactionValueError(nativeAmount, wethBalance);
   }
-  return balanceDeltas.map(({ token, amount }) => ({ token, balance: amount }));
-}
-function functionName(call) {
-  return call.functionName.split("(")[0];
+  balances.upsert(
+    wethToken,
+    wethBalance === nativeAmount ? void 0 : wethBalance - nativeAmount
+  );
+  balances.inc(import_sdk.NATIVE_ADDRESS, nativeAmount);
+  return balances.toAssets();
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  extractExpectedBalanceChanges
+  unwrapNativeCollateral
 });

package/dist/cjs/sdk/accounts/CreditAccountsServiceV310.js

@@ -36,7 +36,6 @@ var import_base = require("../base/index.js");
 var import_chains = require("../chain/chains.js");
 var import_constants = require("../constants/index.js");
 var import_market = require("../market/index.js");
-var import_router = require("../router/index.js");
 var import_utils = require("../utils/index.js");
 var import_viem2 = require("../utils/viem/index.js");
 var import_multicall_utils = require("./multicall-utils.js");
@@ -1723,10 +1722,10 @@ class CreditAccountsServiceV310 extends import_base.SDKConstruct {
     return calls;
   }
   #prepareUpdateQuotas(creditFacade, { averageQuota, minQuota }) {
-    const minRecord = (0, import_router.assetsMap)(minQuota);
+    const minRecord = new import_utils.AssetsMap(minQuota);
     const calls = averageQuota.map((q) => {
-      const minAsset = minRecord.get(q.token);
-      const min = minAsset && minAsset?.balance > 0 ? minAsset.balance : 0n;
+      const minBalance = minRecord.get(q.token);
+      const min = minBalance && minBalance > 0n ? minBalance : 0n;
       return {
         target: creditFacade,
         callData: (0, import_viem.encodeFunctionData)({

package/dist/cjs/sdk/base/BaseContract.js

@@ -244,6 +244,7 @@ class BaseContract extends import_Construct.Construct {
       const functionName = (0, import_utils.getFunctionSignature)(this.abi, calldata);
       return this.wrapParseCallV2(
         functionName,
+        calldata,
         this.parseFunctionParamsV2(decoded, strict)
       );
     } catch (e) {
@@ -257,7 +258,7 @@ class BaseContract extends import_Construct.Construct {
       this.logger?.warn(e);
       const selector = calldata.slice(0, 10);
       const data = `0x${calldata.slice(10)}`;
-      return this.wrapParseCallV2(`unknown function ${selector}`, {
+      return this.wrapParseCallV2(`unknown function ${selector}`, calldata, {
         _data: data
       });
     }
@@ -270,7 +271,7 @@ class BaseContract extends import_Construct.Construct {
   parseFunctionParamsV2(params, _strict) {
     return (0, import_utils.functionArgsToRecord)(this.abi, params.functionName, params.args);
   }
-  wrapParseCallV2(functionName, rawArgs) {
+  wrapParseCallV2(functionName, calldata, rawArgs) {
     return {
       chainId: this.chainId,
       target: this.address,
@@ -278,6 +279,7 @@ class BaseContract extends import_Construct.Construct {
       label: this.labelAddress(this.address, true),
       version: this.version,
       functionName,
+      calldata,
       rawArgs
     };
   }

package/dist/cjs/sdk/base/ChainContractsRegister.js

@@ -184,6 +184,7 @@ class ChainContractsRegister {
       label: this.labelAddress(address, true),
       version: 0,
       functionName: `unknown function ${selector}`,
+      calldata,
       rawArgs: { _data: data }
     };
   }

package/dist/cjs/sdk/router/AbstractRouterContract.js

@@ -41,15 +41,15 @@ class AbstractRouterContract extends import_base.BaseContract {
       options.debtOnly
     );
     const { leftoverBalances, expectedBalances, tokensToClaim } = b;
-    const expected = new import_utils.AddressMap();
-    const leftover = new import_utils.AddressMap();
+    const expected = new import_utils.AssetsMap();
+    const leftover = new import_utils.AssetsMap();
     for (const token of cm.collateralTokens) {
-      const actual = expectedBalances.get(token)?.balance || 0n;
-      expected.upsert(token, { token, balance: actual > 10n ? actual : 0n });
-      leftover.upsert(token, {
+      const actual = expectedBalances.get(token) || 0n;
+      expected.upsert(token, actual > 10n ? actual : 0n);
+      leftover.upsert(
         token,
-        balance: (0, import_helpers.limitLeftover)(leftoverBalances.get(token)?.balance || 1n, token) ?? 1n
-      });
+        (0, import_helpers.limitLeftover)(leftoverBalances.get(token) || 1n, token) ?? 1n
+      );
     }
     return {
       expectedBalances: expected,
@@ -58,8 +58,8 @@ class AbstractRouterContract extends import_base.BaseContract {
     };
   }
   getDefaultExpectedAndLeftover(ca, keepAssets, debtOnly) {
-    const expectedBalances = new import_utils.AddressMap();
-    const leftoverBalances = new import_utils.AddressMap();
+    const expectedBalances = new import_utils.AssetsMap();
+    const leftoverBalances = new import_utils.AssetsMap();
     const keepAssetsSet = new import_utils.AddressSet(keepAssets);
     if (debtOnly) {
       const result = this.getLeftoversAfterBuyingDebt(ca, keepAssetsSet);
@@ -71,23 +71,23 @@ class AbstractRouterContract extends import_base.BaseContract {
     }
     for (const { token, balance, mask } of ca.tokens) {
       const isEnabled = (mask & ca.enabledTokensMask) !== 0n;
-      expectedBalances.upsert(token, { token, balance });
+      expectedBalances.upsert(token, balance);
       if (keepAssetsSet.has(token) || !isEnabled || (0, import_utils.isDust)({
         sdk: this.sdk,
         token,
         balance,
         creditManager: ca.creditManager
       })) {
-        leftoverBalances.upsert(token, {
+        leftoverBalances.upsert(
           token,
-          balance: (0, import_helpers.limitLeftover)(balance, token) ?? balance
-        });
+          (0, import_helpers.limitLeftover)(balance, token) ?? balance
+        );
       }
     }
     return {
       expectedBalances,
       leftoverBalances,
-      tokensToClaim: new import_utils.AddressMap()
+      tokensToClaim: new import_utils.AssetsMap()
     };
   }
   /**
@@ -100,16 +100,13 @@ class AbstractRouterContract extends import_base.BaseContract {
     const { priceOracle } = this.sdk.marketRegister.findByCreditManager(
       ca.creditManager
     );
-    const expectedBalances = new import_utils.AddressMap();
-    const leftoverBalances = new import_utils.AddressMap();
+    const expectedBalances = new import_utils.AssetsMap();
+    const leftoverBalances = new import_utils.AssetsMap();
     const usdBalances = [];
     for (const { token, balance, mask } of ca.tokens) {
       const isEnabled = (mask & ca.enabledTokensMask) !== 0n;
-      expectedBalances.upsert(token, { token, balance });
-      leftoverBalances.upsert(token, {
-        token,
-        balance: (0, import_helpers.limitLeftover)(balance, token) ?? balance
-      });
+      expectedBalances.upsert(token, balance);
+      leftoverBalances.upsert(token, (0, import_helpers.limitLeftover)(balance, token) ?? balance);
       if (isEnabled && !keepAssets.has(token)) {
         usdBalances.push({
           token,
@@ -139,15 +136,12 @@ class AbstractRouterContract extends import_base.BaseContract {
     if (tokenAmount === 0n) {
       return void 0;
     }
-    let leftoverBalance = leftoverBalances.get(highestToken.token)?.balance ?? 0n;
+    let leftoverBalance = leftoverBalances.get(highestToken.token) ?? 0n;
     leftoverBalance -= tokenAmount;
     if (leftoverBalance < 0n) {
       return void 0;
     }
-    leftoverBalances.upsert(highestToken.token, {
-      token: highestToken.token,
-      balance: leftoverBalance
-    });
+    leftoverBalances.upsert(highestToken.token, leftoverBalance);
     const tokenAmountStr = this.sdk.tokensMeta.formatBN(
       highestToken.token,
       tokenAmount,
@@ -160,7 +154,7 @@ class AbstractRouterContract extends import_base.BaseContract {
     return {
       expectedBalances,
       leftoverBalances,
-      tokensToClaim: new import_utils.AddressMap()
+      tokensToClaim: new import_utils.AssetsMap()
     };
   }
   safeConvertToUSD(priceOracle, token, balance) {

package/dist/cjs/sdk/router/RouterV310Contract.js

@@ -23,14 +23,13 @@ __export(RouterV310Contract_exports, {
 module.exports = __toCommonJS(RouterV310Contract_exports);
 var import_viem = require("viem");
 var import_gearboxRouter = require("../../abi/router/gearboxRouter.js");
-var import_AddressMap = require("../utils/AddressMap.js");
 var import_formatter = require("../utils/formatter.js");
 var import_utils = require("../utils/index.js");
 var import_AbstractRouterContract = require("./AbstractRouterContract.js");
 var import_helpers = require("./helpers.js");
 const abi = import_gearboxRouter.gearboxRouterAbi;
 class RouterV310Contract extends import_AbstractRouterContract.AbstractRouterContract {
-  #numSplits = new import_AddressMap.AddressMap();
+  #numSplits = new import_utils.AddressMap();
   #defaultNumSplits = 4n;
   constructor(sdk, address, version) {
     super(sdk, {
@@ -94,8 +93,8 @@ class RouterV310Contract extends import_AbstractRouterContract.AbstractRouterCon
       slippage
     } = props;
     const [expectedMap, leftoverMap] = [
-      (0, import_helpers.balancesMap)(expectedBalances),
-      (0, import_helpers.balancesMap)(leftoverBalances)
+      new import_utils.AssetsMap(expectedBalances),
+      new import_utils.AssetsMap(leftoverBalances)
     ];
     const getNumSplits = this.#numSplitsGetter(cm, expectedBalances);
     const tData = cm.collateralTokens.map(
@@ -180,22 +179,22 @@ class RouterV310Contract extends import_AbstractRouterContract.AbstractRouterCon
     } = props;
     const { expectedBalances, leftoverBalances, tokensToClaim } = this.getExpectedAndLeftover(ca, cm, {
       balances: balances ? {
-        expectedBalances: (0, import_helpers.assetsMap)(balances.expectedBalances),
-        leftoverBalances: (0, import_helpers.assetsMap)(balances.leftoverBalances),
-        tokensToClaim: (0, import_helpers.assetsMap)(balances.tokensToClaim || [])
+        expectedBalances: new import_utils.AssetsMap(balances.expectedBalances),
+        leftoverBalances: new import_utils.AssetsMap(balances.leftoverBalances),
+        tokensToClaim: new import_utils.AssetsMap(balances.tokensToClaim || [])
       } : void 0,
       keepAssets: balances ? void 0 : keepAssets,
       debtOnly
     });
-    const getNumSplits = this.#numSplitsGetter(cm, expectedBalances.values());
+    const getNumSplits = this.#numSplitsGetter(cm, expectedBalances.toAssets());
     const tData = [];
     for (const token of cm.collateralTokens) {
       tData.push({
         token,
-        balance: expectedBalances.get(token)?.balance || 0n,
-        leftoverBalance: (0, import_helpers.limitLeftover)(leftoverBalances.get(token)?.balance, token) ?? 0n,
+        balance: expectedBalances.get(token) || 0n,
+        leftoverBalance: (0, import_helpers.limitLeftover)(leftoverBalances.get(token), token) ?? 0n,
         numSplits: getNumSplits(token),
-        claimRewards: !!tokensToClaim.get(token)
+        claimRewards: tokensToClaim.has(token)
       });
     }
     this.logger?.debug(
@@ -278,7 +277,7 @@ class RouterV310Contract extends import_AbstractRouterContract.AbstractRouterCon
       })),
       "balances in usd"
     );
-    const map = new import_AddressMap.AddressMap(
+    const map = new import_utils.AddressMap(
       inUSD.map(({ token }, i) => [
         token,
         i === 0 ? this.#defaultNumSplits : 1n

package/dist/cjs/sdk/router/helpers.js

@@ -19,14 +19,10 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var helpers_exports = {};
 __export(helpers_exports, {
   assetsMap: () => assetsMap,
-  balancesMap: () => balancesMap,
   limitLeftover: () => limitLeftover
 });
 module.exports = __toCommonJS(helpers_exports);
 var import_utils = require("../utils/index.js");
-function balancesMap(assets) {
-  return new import_utils.AddressMap(assets.map(({ token, balance }) => [token, balance]));
-}
 function assetsMap(assets) {
   return new import_utils.AddressMap(assets.map((a) => [a.token, a]));
 }
@@ -42,6 +38,5 @@ function limitLeftover(balance, token) {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   assetsMap,
-  balancesMap,
   limitLeftover
 });

package/dist/cjs/sdk/utils/AddressMap.js

@@ -136,6 +136,12 @@ class AddressMap {
   keys() {
     return Array.from(this.#map.keys());
   }
+  /**
+   * Returns an unfrozen shallow copy of the map.
+   **/
+  clone() {
+    return new AddressMap(this.entries(), this.name);
+  }
   /**
    * Converts the map to a plain `Record<Address, T>` object.
    **/

package/dist/cjs/sdk/utils/AssetsMap.js

@@ -0,0 +1,61 @@
+"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 AssetsMap_exports = {};
+__export(AssetsMap_exports, {
+  AssetsMap: () => AssetsMap
+});
+module.exports = __toCommonJS(AssetsMap_exports);
+var import_AddressMap = require("./AddressMap.js");
+class AssetsMap extends import_AddressMap.AddressMap {
+  /**
+   * @param entries - Optional initial entries as `[address, balance]` tuples or {@link Asset} objects.
+   * @param name - Optional label used in error messages when a lookup fails.
+   */
+  constructor(entries, name) {
+    super(
+      entries?.map((e) => Array.isArray(e) ? e : [e.token, e.balance]),
+      name
+    );
+  }
+  /**
+   * Adds `amount` to the token balance, treating a missing key as `0n`.
+   */
+  inc(address, amount) {
+    this.upsert(address, (this.get(address) ?? 0n) + amount);
+  }
+  /**
+   * Subtracts `amount` from the token balance, treating a missing key as `0n`.
+   */
+  dec(address, amount) {
+    this.inc(address, -amount);
+  }
+  /**
+   * Converts the map to an array of {@link Asset} objects.
+   */
+  toAssets() {
+    return this.entries().map(([token, balance]) => ({ token, balance }));
+  }
+  clone() {
+    return new AssetsMap(this.entries(), this.name);
+  }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  AssetsMap
+});

package/dist/cjs/sdk/utils/index.js

@@ -17,6 +17,7 @@ var utils_exports = {};
 module.exports = __toCommonJS(utils_exports);
 __reExport(utils_exports, require("./AddressMap.js"), module.exports);
 __reExport(utils_exports, require("./AddressSet.js"), module.exports);
+__reExport(utils_exports, require("./AssetsMap.js"), module.exports);
 __reExport(utils_exports, require("./abi-decode.js"), module.exports);
 __reExport(utils_exports, require("./bytes32ToString.js"), module.exports);
 __reExport(utils_exports, require("./childLogger.js"), module.exports);
@@ -36,6 +37,7 @@ __reExport(utils_exports, require("./zod.js"), module.exports);
 0 && (module.exports = {
   ...require("./AddressMap.js"),
   ...require("./AddressSet.js"),
+  ...require("./AssetsMap.js"),
   ...require("./abi-decode.js"),
   ...require("./bytes32ToString.js"),
   ...require("./childLogger.js"),

package/dist/esm/dev/AccountOpener.js

@@ -12,6 +12,7 @@ import {
   ADDRESS_0X0,
   AddressMap,
   AddressSet,
+  AssetsMap,
   childLogger,
   MAX_UINT256,
   PERCENTAGE_FACTOR,
@@ -373,7 +374,7 @@ class AccountOpener extends SDKConstruct {
   }
   async #depositIntoPools(targets) {
     this.#logger?.debug("checking and topping up pools if necessary");
-    const minAvailableByPool = {};
+    const minAvailableByPool = new AssetsMap();
     for (let i = 0; i < targets.length; i++) {
       const t = targets[i];
       const leverage = this.#getLeverage(t);
@@ -381,14 +382,14 @@ class AccountOpener extends SDKConstruct {
       const minDebt = this.#minDebtMultiplier * cm.creditFacade.minDebt / PERCENTAGE_FACTOR;
       let amount = minDebt * (leverage - PERCENTAGE_FACTOR) / PERCENTAGE_FACTOR * this.#poolDepositMultiplier / PERCENTAGE_FACTOR;
       amount = amount > cm.creditFacade.maxDebt ? cm.creditFacade.maxDebt : amount;
-      minAvailableByPool[cm.pool] = (minAvailableByPool[cm.pool] ?? 0n) + amount;
+      minAvailableByPool.inc(cm.pool, amount);
       this.#logger?.debug(
         `target #${i + 1} (${this.labelAddress(t.target)}) needs ${this.sdk.tokensMeta.formatBN(cm.underlying, amount, { symbol: true })} in pool (leverage: ${Number(leverage / PERCENTAGE_FACTOR)}%)`
       );
     }
     const deposits = [];
-    const claims = new AddressMap();
-    for (const [p, minAvailable] of Object.entries(minAvailableByPool)) {
+    const claims = new AssetsMap();
+    for (const [p, minAvailable] of minAvailableByPool.entries()) {
       const market = this.sdk.marketRegister.findByPool(p);
       const pool = market.pool.pool;
       let diff = minAvailable - pool.availableLiquidity;
@@ -405,9 +406,7 @@ class AccountOpener extends SDKConstruct {
       );
       if (diff > 0n) {
         deposits.push([pool, diff]);
-        let claim = claims.get(pool.underlying) ?? 0n;
-        claim += diff * PERCENTAGE_FACTOR / 8950n;
-        claims.upsert(pool.underlying, claim);
+        claims.inc(pool.underlying, diff * PERCENTAGE_FACTOR / 8950n);
       }
     }
     const depositor = await this.#getDepositor();
@@ -564,18 +563,14 @@ class AccountOpener extends SDKConstruct {
   async #prepareBorrower(targets) {
     const borrower = await this.#getBorrower();
     const degenNFTS = {};
-    const claims = new AddressMap();
+    const claims = new AssetsMap();
     for (const target of targets) {
       const cm = this.sdk.marketRegister.findCreditManager(
         target.creditManager
       );
-      const market = this.sdk.marketRegister.findByCreditManager(
-        target.creditManager
-      );
       const { degenNFT } = cm.creditFacade;
       const minDebt = this.#minDebtMultiplier * cm.creditFacade.minDebt / PERCENTAGE_FACTOR;
-      const claim = claims.get(cm.underlying) ?? 0n;
-      claims.upsert(cm.underlying, claim + minDebt * 11n / 10n);
+      claims.inc(cm.underlying, minDebt * 11n / 10n);
       if (isAddress(degenNFT) && degenNFT !== ADDRESS_0X0) {
         degenNFTS[degenNFT] = (degenNFTS[degenNFT] ?? 0) + 1;
       }

package/dist/esm/history/classifyMulticallOperations.js

@@ -45,6 +45,7 @@ function classifyMulticallOperations(input) {
         label: call.label,
         adapterFunctionName: call.functionName,
         adapterArgs: call.rawArgs,
+        calldata: call.calldata,
         protocol,
         transfers: transfers2,
         legacy
@@ -80,6 +81,7 @@ function classifyMulticallOperations(input) {
       label: call.label,
       adapterFunctionName: call.functionName,
       adapterArgs: call.rawArgs,
+      calldata: call.calldata,
       // 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,

package/dist/esm/history/mapOperations.js

@@ -12,6 +12,13 @@ function mapInnerOperation(op, visitor, ctx) {
       return visitor.WithdrawCollateral(op, ctx);
     case "UpdateQuota":
       return visitor.UpdateQuota(op, ctx);
+    // The history classifier never emits other InnerOperation variants
+    // (e.g. StoreExpectedBalances/CompareBalances, which it drops), so this
+    // guards against silently returning undefined if that ever changes.
+    default:
+      throw new Error(
+        `unexpected inner operation: ${op.operation}`
+      );
   }
 }
 function mapOuterOperation(op, visitor) {