@gearbox-protocol/sdk 14.12.0-next.1 → 14.12.0-next.10

package/dist/cjs/sdk/market/zapper/IERC20ZapperContract.js

@@ -22,27 +22,11 @@ __export(IERC20ZapperContract_exports, {
 });
 module.exports = __toCommonJS(IERC20ZapperContract_exports);
 var import_iERC20Zapper = require("../../../abi/iERC20Zapper.js");
-var import_base = require("../../base/index.js");
+var import_ZapperContract = require("./ZapperContract.js");
 const abi = import_iERC20Zapper.ierc20ZapperAbi;
-class IERC20ZapperContract extends import_base.BaseContract {
-  pool;
-  type;
-  baseParams;
-  tokenIn;
-  tokenOut;
+class IERC20ZapperContract extends import_ZapperContract.ZapperContract {
   constructor(sdk, data) {
-    super(sdk, {
-      addr: data.baseParams.addr,
-      abi,
-      name: `ERC20Zapper(${sdk.labelAddress(data.baseParams.addr)})`,
-      version: data.baseParams.version,
-      contractType: data.baseParams.contractType
-    });
-    this.pool = data.pool;
-    this.type = data.type;
-    this.baseParams = data.baseParams;
-    this.tokenIn = data.tokenIn;
-    this.tokenOut = data.tokenOut;
+    super(sdk, data, abi, "ERC20Zapper");
   }
   /**
    * Deposits ERC20 tokens into the pool via this zapper.
@@ -72,25 +56,6 @@ class IERC20ZapperContract extends import_base.BaseContract {
       args: [tokenInAmount, receiver, referralCode, deadline, v, r, s]
     });
   }
-  /**
-   * Redeems pool shares (diesel tokens) for the underlying asset via this zapper.
-   */
-  redeem(tokenInAmount, receiver) {
-    return this.createRawTx({
-      functionName: "redeem",
-      args: [tokenInAmount, receiver]
-    });
-  }
-  /**
-   * Redeems pool shares via this zapper with an EIP-2612 permit signature,
-   * skipping a separate approve transaction.
-   */
-  redeemWithPermit(tokenInAmount, receiver, deadline, v, r, s) {
-    return this.createRawTx({
-      functionName: "redeemWithPermit",
-      args: [tokenInAmount, receiver, deadline, v, r, s]
-    });
-  }
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/cjs/sdk/market/zapper/IETHZapperContract.js

@@ -22,27 +22,11 @@ __export(IETHZapperContract_exports, {
 });
 module.exports = __toCommonJS(IETHZapperContract_exports);
 var import_iETHZapper = require("../../../abi/iETHZapper.js");
-var import_base = require("../../base/index.js");
+var import_ZapperContract = require("./ZapperContract.js");
 const abi = import_iETHZapper.iethZapperAbi;
-class IETHZapperContract extends import_base.BaseContract {
-  pool;
-  type;
-  baseParams;
-  tokenIn;
-  tokenOut;
+class IETHZapperContract extends import_ZapperContract.ZapperContract {
   constructor(sdk, data) {
-    super(sdk, {
-      addr: data.baseParams.addr,
-      abi,
-      name: `ETHZapper(${sdk.labelAddress(data.baseParams.addr)})`,
-      version: data.baseParams.version,
-      contractType: data.baseParams.contractType
-    });
-    this.pool = data.pool;
-    this.type = data.type;
-    this.baseParams = data.baseParams;
-    this.tokenIn = data.tokenIn;
-    this.tokenOut = data.tokenOut;
+    super(sdk, data, abi, "ETHZapper");
   }
   /**
    * Deposits native ETH into the pool via this zapper.
@@ -63,25 +47,6 @@ class IETHZapperContract extends import_base.BaseContract {
       args: [receiver, referralCode]
     });
   }
-  /**
-   * Redeems pool shares (diesel tokens) for the underlying asset via this zapper.
-   */
-  redeem(tokenInAmount, receiver) {
-    return this.createRawTx({
-      functionName: "redeem",
-      args: [tokenInAmount, receiver]
-    });
-  }
-  /**
-   * Redeems pool shares via this zapper with an EIP-2612 permit signature,
-   * skipping a separate approve transaction.
-   */
-  redeemWithPermit(tokenInAmount, receiver, deadline, v, r, s) {
-    return this.createRawTx({
-      functionName: "redeemWithPermit",
-      args: [tokenInAmount, receiver, deadline, v, r, s]
-    });
-  }
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/cjs/sdk/market/zapper/ZapperContract.js

@@ -0,0 +1,106 @@
+"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 ZapperContract_exports = {};
+__export(ZapperContract_exports, {
+  ZapperContract: () => ZapperContract
+});
+module.exports = __toCommonJS(ZapperContract_exports);
+var import_iZapper = require("../../../abi/iZapper.js");
+var import_base = require("../../base/index.js");
+var import_errors = require("./errors.js");
+class ZapperContract extends import_base.BaseContract {
+  sdk;
+  pool;
+  type;
+  baseParams;
+  tokenIn;
+  tokenOut;
+  constructor(sdk, data, abi = import_iZapper.iZapperAbi, namePrefix = "Zapper") {
+    super(sdk, {
+      addr: data.baseParams.addr,
+      abi,
+      name: `${namePrefix}(${sdk.labelAddress(data.baseParams.addr)})`,
+      version: data.baseParams.version,
+      contractType: data.baseParams.contractType
+    });
+    this.sdk = sdk;
+    this.pool = data.pool;
+    this.type = data.type;
+    this.baseParams = data.baseParams;
+    this.tokenIn = data.tokenIn;
+    this.tokenOut = data.tokenOut;
+  }
+  /**
+   * Decodes zapper calldata into {@link ParsedZapperOperation}.
+   * Throws {@link UnsupportedZapperFunctionError} for unknown selectors.
+   */
+  parseOperation(calldata, value) {
+    const parsed = this.parseFunctionDataV2(calldata);
+    const { rawArgs } = parsed;
+    const pool = this.pool;
+    const zapper = this.address;
+    const underlying = this.sdk.marketRegister.findByPool(pool).underlying;
+    const receiver = rawArgs.receiver;
+    if (parsed.functionName.startsWith("deposit")) {
+      return {
+        operation: "Deposit",
+        pool,
+        zapper,
+        receiver,
+        assets: rawArgs.tokenInAmount ?? value ?? 0n,
+        underlying,
+        referralCode: rawArgs.referralCode
+      };
+    }
+    if (parsed.functionName.startsWith("redeem")) {
+      return {
+        operation: "Redeem",
+        pool,
+        zapper,
+        receiver,
+        shares: rawArgs.tokenOutAmount,
+        underlying
+      };
+    }
+    throw new import_errors.UnsupportedZapperFunctionError(zapper, parsed.functionName);
+  }
+  /**
+   * Redeems pool shares (diesel tokens) for the underlying asset via this zapper.
+   */
+  redeem(tokenInAmount, receiver) {
+    return this.createRawTx({
+      functionName: "redeem",
+      args: [tokenInAmount, receiver]
+    });
+  }
+  /**
+   * Redeems pool shares via this zapper with an EIP-2612 permit signature,
+   * skipping a separate approve transaction.
+   */
+  redeemWithPermit(tokenInAmount, receiver, deadline, v, r, s) {
+    return this.createRawTx({
+      functionName: "redeemWithPermit",
+      args: [tokenInAmount, receiver, deadline, v, r, s]
+    });
+  }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  ZapperContract
+});

package/dist/cjs/sdk/market/zapper/createZapper.js

@@ -21,23 +21,31 @@ __export(createZapper_exports, {
   createZapper: () => createZapper
 });
 module.exports = __toCommonJS(createZapper_exports);
+var import_utils = require("../../utils/index.js");
 var import_IERC20ZapperContract = require("./IERC20ZapperContract.js");
 var import_IETHZapperContract = require("./IETHZapperContract.js");
-var import_Zapper = require("./Zapper.js");
+var import_ZapperContract = require("./ZapperContract.js");
 function createZapper(sdk, data) {
+  const existing = sdk.getContract(data.baseParams.addr);
+  if (existing) {
+    return existing;
+  }
   if (data.type === "base") {
-    const contractType = import_Zapper.Zapper.contractType(data.baseParams);
+    const contractType = (0, import_utils.bytes32ToString)(data.baseParams.contractType);
     switch (contractType) {
       case "ZAPPER::ERC4626_UNDERLYING":
         return new import_IERC20ZapperContract.IERC20ZapperContract(sdk, data);
       case "ZAPPER::WETH_DEPOSIT":
         return new import_IETHZapperContract.IETHZapperContract(sdk, data);
       default:
+        if (sdk.strictContractTypes) {
+          throw new Error(`Unknown zapper contract type: ${contractType}`);
+        }
         sdk.logger?.warn(`Unknown zapper contract type: ${contractType}`);
-        return new import_Zapper.Zapper(data);
+        return new import_ZapperContract.ZapperContract(sdk, data);
     }
   }
-  return new import_Zapper.Zapper(data);
+  return new import_ZapperContract.ZapperContract(sdk, data);
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/cjs/{preview/simulate/holders.js → sdk/market/zapper/errors.js}

@@ -16,30 +16,22 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var holders_exports = {};
-__export(holders_exports, {
-  watchedHolders: () => watchedHolders
+var errors_exports = {};
+__export(errors_exports, {
+  UnsupportedZapperFunctionError: () => UnsupportedZapperFunctionError
 });
-module.exports = __toCommonJS(holders_exports);
-var import_sdk = require("../../sdk/index.js");
-function sourceHolder(operation, wallet) {
-  switch (operation.operation) {
-    case "Deposit":
-    case "Mint":
-      return wallet;
-    case "Withdraw":
-    case "Redeem":
-      return operation.owner;
+module.exports = __toCommonJS(errors_exports);
+class UnsupportedZapperFunctionError extends Error {
+  zapper;
+  functionName;
+  constructor(zapper, functionName) {
+    super(`unsupported zapper function "${functionName}" on ${zapper}`);
+    this.name = "UnsupportedZapperFunctionError";
+    this.zapper = zapper;
+    this.functionName = functionName;
   }
 }
-function watchedHolders(operation, wallet) {
-  const holders = new import_sdk.AddressSet([
-    sourceHolder(operation, wallet),
-    operation.receiver
-  ]);
-  return holders.asArray();
-}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  watchedHolders
+  UnsupportedZapperFunctionError
 });

package/dist/cjs/sdk/market/zapper/index.js

@@ -16,13 +16,17 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var zapper_exports = {};
 module.exports = __toCommonJS(zapper_exports);
 __reExport(zapper_exports, require("./createZapper.js"), module.exports);
+__reExport(zapper_exports, require("./errors.js"), module.exports);
 __reExport(zapper_exports, require("./IERC20ZapperContract.js"), module.exports);
 __reExport(zapper_exports, require("./IETHZapperContract.js"), module.exports);
-__reExport(zapper_exports, require("./Zapper.js"), module.exports);
+__reExport(zapper_exports, require("./types.js"), module.exports);
+__reExport(zapper_exports, require("./ZapperContract.js"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ...require("./createZapper.js"),
+  ...require("./errors.js"),
   ...require("./IERC20ZapperContract.js"),
   ...require("./IETHZapperContract.js"),
-  ...require("./Zapper.js")
+  ...require("./types.js"),
+  ...require("./ZapperContract.js")
 });

package/dist/cjs/sdk/market/zapper/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/cjs/sdk/options.js

@@ -18,19 +18,25 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var options_exports = {};
 __export(options_exports, {
-  AttachOptionsSchema: () => AttachOptionsSchema,
-  OnchainSDKOptionsSchema: () => OnchainSDKOptionsSchema
+  attachOptionsSchema: () => attachOptionsSchema,
+  onchainSDKOptionsSchema: () => onchainSDKOptionsSchema
 });
 module.exports = __toCommonJS(options_exports);
 var import_v4 = require("zod/v4");
 var import_updates = require("./market/pricefeeds/updates/index.js");
 var import_utils = require("./utils/index.js");
-const OnchainSDKOptionsSchema = import_v4.z.object({
-  /** When `true`, throw on unrecognised contract types. */
+const onchainSDKOptionsSchema = import_v4.z.object({
+  /**
+   * When `true`, throw on unrecognised contract types.
+   **/
   strictContractTypes: import_v4.z.boolean().optional(),
-  /** Plugins that extend SDK functionality. */
+  /**
+   * Plugins that extend SDK functionality.
+   **/
   plugins: import_v4.z.record(import_v4.z.string(), import_v4.z.any()).optional(),
-  /** Custom logger implementation. */
+  /**
+   * Custom logger implementation.
+   **/
   logger: import_v4.z.any(),
   /**
    * Explicit gas limit for read-only `eth_call` requests.
@@ -39,10 +45,14 @@ const OnchainSDKOptionsSchema = import_v4.z.object({
    **/
   gasLimit: import_v4.z.bigint().nonnegative().nullable().optional()
 });
-const AttachOptionsSchema = import_v4.z.object({
-  /** Override address of the Gearbox AddressProvider contract. */
+const attachOptionsSchema = import_v4.z.object({
+  /**
+   * Override address of the Gearbox AddressProvider contract.
+   **/
   addressProvider: (0, import_utils.ZodAddress)().optional(),
-  /** Addresses of market configurator contracts to load. */
+  /**
+   * Addresses of market configurator contracts to load.
+   **/
   marketConfigurators: import_v4.z.array((0, import_utils.ZodAddress)()).optional(),
   /**
    * Addresses of RWA factory contracts to load.
@@ -50,19 +60,33 @@ const AttachOptionsSchema = import_v4.z.object({
    * (from {@link GearboxChain.rwaFactories})
    **/
   rwaFactories: import_v4.z.array((0, import_utils.ZodAddress)()).optional(),
-  /** Pin SDK to a specific block number during attach. */
+  /**
+   * Pin SDK to a specific block number during attach.
+   **/
   blockNumber: import_v4.z.union([import_v4.z.bigint().nonnegative(), import_v4.z.number().int().nonnegative()]).optional(),
-  /** Skip fetching updatable price feeds on attach and sync. */
+  /**
+   * Skip fetching updatable price feeds on attach and sync.
+   **/
   ignoreUpdateablePrices: import_v4.z.boolean().optional(),
-  /** Pool addresses whose markets should be skipped. */
+  /**
+   * Pool addresses whose markets should be skipped.
+   **/
   ignoreMarkets: import_v4.z.array((0, import_utils.ZodAddress)()).optional(),
-  /** Options for Redstone price-feed updates. */
+  /**
+   * Options for Redstone price-feed updates.
+   **/
   redstone: import_updates.RedstoneOptions.optional(),
-  /** Options for Pyth price-feed updates. */
-  pyth: import_updates.PythOptions.optional()
+  /**
+   * Options for Pyth price-feed updates.
+   **/
+  pyth: import_updates.PythOptions.optional(),
+  /**
+   * When `true`, automatically load zappers during attach.
+   **/
+  loadZappers: import_v4.z.boolean().optional()
 });
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  AttachOptionsSchema,
-  OnchainSDKOptionsSchema
+  attachOptionsSchema,
+  onchainSDKOptionsSchema
 });

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.
    **/