@gearbox-protocol/sdk 14.12.0-next.2 → 14.12.0-next.20

package/dist/cjs/sdk/accounts/withdrawal-compressor/WithdrawalCompressorV313Contract.js

@@ -0,0 +1,40 @@
+"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 WithdrawalCompressorV313Contract_exports = {};
+__export(WithdrawalCompressorV313Contract_exports, {
+  WithdrawalCompressorV313Contract: () => WithdrawalCompressorV313Contract
+});
+module.exports = __toCommonJS(WithdrawalCompressorV313Contract_exports);
+var import_IWithdrawalCompressorV313 = require("../../../abi/IWithdrawalCompressorV313.js");
+var import_AbstractWithdrawalCompressorContract = require("./AbstractWithdrawalCompressorContract.js");
+const abi = import_IWithdrawalCompressorV313.iWithdrawalCompressorV313Abi;
+class WithdrawalCompressorV313Contract extends import_AbstractWithdrawalCompressorContract.AbstractWithdrawalCompressorContract {
+  constructor(sdk, address) {
+    super(sdk, {
+      addr: address,
+      name: "WithdrawalCompressorV313",
+      abi,
+      version: 313
+    });
+  }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  WithdrawalCompressorV313Contract
+});

package/dist/cjs/{preview/parse/extractExpectedBalanceChanges.js → sdk/accounts/withdrawal-compressor/addresses.js}

@@ -16,33 +16,37 @@ 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 addresses_exports = {};
+__export(addresses_exports, {
+  getWithdrawalCompressorAddress: () => getWithdrawalCompressorAddress
 });
-module.exports = __toCommonJS(extractExpectedBalanceChanges_exports);
-function extractExpectedBalanceChanges(innerCalls) {
-  const calls = innerCalls.filter(
-    (call) => functionName(call) !== "onDemandPriceUpdates"
-  );
-  if (calls.length === 0) {
-    return void 0;
+module.exports = __toCommonJS(addresses_exports);
+const WITHDRAWAL_COMPRESSORS = {
+  Mainnet: {
+    310: "0x36F3d0Bb73CBC2E94fE24dF0f26a689409cF9023",
+    313: "0x9605D59E40963ADce8a6895Aa3Fa497320Ef3F3b"
+  },
+  Monad: {
+    310: "0x36F3d0Bb73CBC2E94fE24dF0f26a689409cF9023"
   }
-  const first = calls[0];
-  const last = calls[calls.length - 1];
-  if (functionName(first) !== "storeExpectedBalances" || functionName(last) !== "compareBalances") {
+};
+function getWithdrawalCompressorAddress(network, version) {
+  const deployments = WITHDRAWAL_COMPRESSORS[network];
+  if (!deployments) {
     return void 0;
   }
-  const balanceDeltas = first.rawArgs.balanceDeltas;
-  if (!balanceDeltas) {
+  if (version !== void 0) {
+    const address2 = deployments[version];
+    return address2 ? { address: address2, version } : void 0;
+  }
+  const latest = Object.keys(deployments).map(Number).sort((a, b) => b - a)[0];
+  if (latest === void 0) {
     return void 0;
   }
-  return balanceDeltas.map(({ token, amount }) => ({ token, delta: amount }));
-}
-function functionName(call) {
-  return call.functionName.split("(")[0];
+  const address = deployments[latest];
+  return address ? { address, version: latest } : void 0;
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  extractExpectedBalanceChanges
+  getWithdrawalCompressorAddress
 });

package/dist/cjs/sdk/accounts/withdrawal-compressor/createWithdrawalCompressor.js

@@ -0,0 +1,53 @@
+"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 createWithdrawalCompressor_exports = {};
+__export(createWithdrawalCompressor_exports, {
+  createWithdrawalCompressor: () => createWithdrawalCompressor
+});
+module.exports = __toCommonJS(createWithdrawalCompressor_exports);
+var import_addresses = require("./addresses.js");
+var import_WithdrawalCompressorV310Contract = require("./WithdrawalCompressorV310Contract.js");
+var import_WithdrawalCompressorV311Contract = require("./WithdrawalCompressorV311Contract.js");
+var import_WithdrawalCompressorV313Contract = require("./WithdrawalCompressorV313Contract.js");
+function createWithdrawalCompressor(sdk, version) {
+  const location = (0, import_addresses.getWithdrawalCompressorAddress)(sdk.networkType, version);
+  if (!location) {
+    throw new Error(
+      `no withdrawal compressor${version ? ` v${version}` : ""} on ${sdk.networkType}`
+    );
+  }
+  const cached = sdk.getContract(
+    location.address
+  );
+  if (cached) {
+    return cached;
+  }
+  switch (location.version) {
+    case 310:
+      return new import_WithdrawalCompressorV310Contract.WithdrawalCompressorV310Contract(sdk, location.address);
+    case 311:
+      return new import_WithdrawalCompressorV311Contract.WithdrawalCompressorV311Contract(sdk, location.address);
+    case 313:
+      return new import_WithdrawalCompressorV313Contract.WithdrawalCompressorV313Contract(sdk, location.address);
+  }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  createWithdrawalCompressor
+});

package/dist/cjs/sdk/accounts/withdrawal-compressor/index.js

@@ -0,0 +1,36 @@
+"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 withdrawal_compressor_exports = {};
+module.exports = __toCommonJS(withdrawal_compressor_exports);
+__reExport(withdrawal_compressor_exports, require("./AbstractWithdrawalCompressorContract.js"), module.exports);
+__reExport(withdrawal_compressor_exports, require("./addresses.js"), module.exports);
+__reExport(withdrawal_compressor_exports, require("./createWithdrawalCompressor.js"), module.exports);
+__reExport(withdrawal_compressor_exports, require("./intent-codec.js"), module.exports);
+__reExport(withdrawal_compressor_exports, require("./types.js"), module.exports);
+__reExport(withdrawal_compressor_exports, require("./WithdrawalCompressorV310Contract.js"), module.exports);
+__reExport(withdrawal_compressor_exports, require("./WithdrawalCompressorV311Contract.js"), module.exports);
+__reExport(withdrawal_compressor_exports, require("./WithdrawalCompressorV313Contract.js"), module.exports);
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  ...require("./AbstractWithdrawalCompressorContract.js"),
+  ...require("./addresses.js"),
+  ...require("./createWithdrawalCompressor.js"),
+  ...require("./intent-codec.js"),
+  ...require("./types.js"),
+  ...require("./WithdrawalCompressorV310Contract.js"),
+  ...require("./WithdrawalCompressorV311Contract.js"),
+  ...require("./WithdrawalCompressorV313Contract.js")
+});

package/dist/cjs/sdk/accounts/withdrawal-compressor/intent-codec.js

@@ -0,0 +1,118 @@
+"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 intent_codec_exports = {};
+__export(intent_codec_exports, {
+  DELAYED_INTENT_TYPES: () => DELAYED_INTENT_TYPES,
+  DELAYED_INTENT_VERSION: () => DELAYED_INTENT_VERSION,
+  decodeDelayedIntent: () => decodeDelayedIntent,
+  encodeDelayedIntent: () => encodeDelayedIntent
+});
+module.exports = __toCommonJS(intent_codec_exports);
+var import_viem = require("viem");
+const DELAYED_INTENT_VERSION = 1;
+const DELAYED_INTENT_TYPES = {
+  INCREASE_LEVERAGE: 1,
+  DEPOSIT: 2,
+  DEPOSIT_AND_INCREASE_LEVERAGE: 3,
+  WITHDRAW_COLLATERAL: 4,
+  CLOSE_ACCOUNT: 5,
+  ADD_COLLATERAL: 6,
+  DECREASE_LEVERAGE: 7
+};
+const HEADER_PARAMS = [
+  { type: "uint8", name: "version" },
+  { type: "uint8", name: "intentType" }
+];
+const TO_PARAMS = [...HEADER_PARAMS, { type: "address", name: "to" }];
+const WITHDRAW_COLLATERAL_PARAMS = [
+  ...TO_PARAMS,
+  { type: "address", name: "withdrawToken" },
+  { type: "uint256", name: "withdrawAmount" }
+];
+function encodeDelayedIntent(intent) {
+  const version = DELAYED_INTENT_VERSION;
+  const intentType = DELAYED_INTENT_TYPES[intent.type];
+  switch (intent.type) {
+    case "INCREASE_LEVERAGE":
+    case "CLOSE_ACCOUNT":
+      return (0, import_viem.encodeAbiParameters)(TO_PARAMS, [version, intentType, intent.to]);
+    case "WITHDRAW_COLLATERAL":
+      return (0, import_viem.encodeAbiParameters)(WITHDRAW_COLLATERAL_PARAMS, [
+        version,
+        intentType,
+        intent.to,
+        intent.withdrawToken,
+        intent.withdrawAmount
+      ]);
+    case "DEPOSIT":
+    case "DEPOSIT_AND_INCREASE_LEVERAGE":
+    case "ADD_COLLATERAL":
+    case "DECREASE_LEVERAGE":
+      return (0, import_viem.encodeAbiParameters)(HEADER_PARAMS, [version, intentType]);
+    default: {
+      const t = intent;
+      throw new Error(`unknown delayed intent: ${JSON.stringify(t)}`);
+    }
+  }
+}
+function decodeDelayedIntent(data) {
+  const [version, intentType] = (0, import_viem.decodeAbiParameters)(HEADER_PARAMS, data);
+  if (version !== DELAYED_INTENT_VERSION) {
+    throw new Error(`unsupported delayed intent version: ${version}`);
+  }
+  switch (intentType) {
+    case DELAYED_INTENT_TYPES.INCREASE_LEVERAGE: {
+      const [, , to] = (0, import_viem.decodeAbiParameters)(TO_PARAMS, data);
+      return { type: "INCREASE_LEVERAGE", to };
+    }
+    case DELAYED_INTENT_TYPES.DEPOSIT:
+      return { type: "DEPOSIT" };
+    case DELAYED_INTENT_TYPES.DEPOSIT_AND_INCREASE_LEVERAGE:
+      return { type: "DEPOSIT_AND_INCREASE_LEVERAGE" };
+    case DELAYED_INTENT_TYPES.WITHDRAW_COLLATERAL: {
+      const [, , to, withdrawToken, withdrawAmount] = (0, import_viem.decodeAbiParameters)(
+        WITHDRAW_COLLATERAL_PARAMS,
+        data
+      );
+      return {
+        type: "WITHDRAW_COLLATERAL",
+        to,
+        withdrawToken,
+        withdrawAmount
+      };
+    }
+    case DELAYED_INTENT_TYPES.CLOSE_ACCOUNT: {
+      const [, , to] = (0, import_viem.decodeAbiParameters)(TO_PARAMS, data);
+      return { type: "CLOSE_ACCOUNT", to };
+    }
+    case DELAYED_INTENT_TYPES.ADD_COLLATERAL:
+      return { type: "ADD_COLLATERAL" };
+    case DELAYED_INTENT_TYPES.DECREASE_LEVERAGE:
+      return { type: "DECREASE_LEVERAGE" };
+    default:
+      throw new Error(`unknown delayed intent type: ${intentType}`);
+  }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  DELAYED_INTENT_TYPES,
+  DELAYED_INTENT_VERSION,
+  decodeDelayedIntent,
+  encodeDelayedIntent
+});

package/dist/cjs/sdk/accounts/withdrawal-compressor/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/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/market/rwa/securitize/SecuritizeRWAFactory.js

@@ -70,6 +70,30 @@ class SecuritizeRWAFactory extends import_base.BaseContract {
       operators: [...t.operators]
     }));
   }
+  parseFunctionParamsV2(params, strict) {
+    switch (params.functionName) {
+      case "openCreditAccount": {
+        const [creditManager, calls, tokensToRegister, signaturesToCache] = params.args;
+        return {
+          creditManager,
+          calls: this.register.parseMultiCallV2([...calls], strict),
+          tokensToRegister,
+          signaturesToCache
+        };
+      }
+      case "multicall": {
+        const [creditAccount, calls, tokensToRegister, signaturesToCache] = params.args;
+        return {
+          creditAccount,
+          calls: this.register.parseMultiCallV2([...calls], strict),
+          tokensToRegister,
+          signaturesToCache
+        };
+      }
+      default:
+        return super.parseFunctionParamsV2(params, strict);
+    }
+  }
   /**
    * {@inheritDoc IRWAFactory.decodeInvestorData}
    */
@@ -125,6 +149,12 @@ class SecuritizeRWAFactory extends import_base.BaseContract {
       })
     };
   }
+  /**
+   * {@inheritDoc IRWAFactory.getTokens}
+   */
+  getTokens() {
+    return this.dsTokens.map((t) => t.address);
+  }
   /**
    * {@inheritDoc IRWAFactory.getInvestor}
    */
@@ -159,8 +189,8 @@ class SecuritizeRWAFactory extends import_base.BaseContract {
   /**
    * {@inheritDoc IRWAFactory.multicall}
    */
-  multicall(creditAccount, calls, options) {
-    const { tokensToRegister = [], signaturesToCache = [] } = options ?? {};
+  multicall(creditAccount, calls, args) {
+    const { tokensToRegister = [], signaturesToCache = [] } = args ?? {};
     return this.createRawTx({
       functionName: "multicall",
       args: [creditAccount, calls, tokensToRegister, signaturesToCache]
@@ -190,11 +220,33 @@ class SecuritizeRWAFactory extends import_base.BaseContract {
       requiredSignatures
     };
   }
+  /**
+   * {@inheritDoc IRWAFactory.getMissingRequirements}
+   *
+   * A required signature is omitted when `providedArgs.signaturesToCache`
+   * already carries a signature for the same token: the transaction caches it
+   * on-chain as part of the operation.
+   */
+  getMissingRequirements(requirements, providedArgs) {
+    const providedTokens = new import_utils.AddressSet(
+      (providedArgs?.signaturesToCache ?? []).map((s) => s.token)
+    );
+    const requiredSignatures = requirements.requiredSignatures.filter(
+      (message) => !providedTokens.has(message.message.token)
+    );
+    if (requiredSignatures.length === 0) {
+      return void 0;
+    }
+    return {
+      type: import_constants.RWA_FACTORY_SECURITIZE,
+      requiredSignatures
+    };
+  }
   /**
    * {@inheritDoc IRWAFactory.openCreditAccount}
    */
-  openCreditAccount(creditManager, calls, options) {
-    const { tokensToRegister = [], signaturesToCache = [] } = options ?? {};
+  openCreditAccount(creditManager, calls, args) {
+    const { tokensToRegister = [], signaturesToCache = [] } = args ?? {};
     return this.createRawTx({
       functionName: "openCreditAccount",
       args: [creditManager, calls, tokensToRegister, signaturesToCache]

package/dist/cjs/sdk/market/rwa/types.js

@@ -24,8 +24,11 @@ __export(types_exports, {
 module.exports = __toCommonJS(types_exports);
 var import_securitize = require("./securitize/index.js");
 const RWA_FACTORY_TYPES = [import_securitize.RWA_FACTORY_SECURITIZE];
-function isRWAFactory(factory, type) {
-  return factory.contractType === type;
+function isRWAFactory(contract, type) {
+  if (type) {
+    return contract.contractType === type;
+  }
+  return contract.contractType.startsWith("RWA_FACTORY::");
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

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

@@ -55,7 +55,6 @@ class ZapperContract extends import_base.BaseContract {
     const { rawArgs } = parsed;
     const pool = this.pool;
     const zapper = this.address;
-    const token = this.tokenIn.addr;
     const underlying = this.sdk.marketRegister.findByPool(pool).underlying;
     const receiver = rawArgs.receiver;
     if (parsed.functionName.startsWith("deposit")) {
@@ -65,7 +64,6 @@ class ZapperContract extends import_base.BaseContract {
         zapper,
         receiver,
         assets: rawArgs.tokenInAmount ?? value ?? 0n,
-        token,
         underlying,
         referralCode: rawArgs.referralCode
       };
@@ -77,7 +75,6 @@ class ZapperContract extends import_base.BaseContract {
         zapper,
         receiver,
         shares: rawArgs.tokenOutAmount,
-        token,
         underlying
       };
     }

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) {