@gearbox-protocol/sdk 14.12.0-next.3 → 14.12.0-next.31

package/dist/esm/sdk/accounts/withdrawal-compressor/AbstractWithdrawalCompressorContract.js

@@ -0,0 +1,200 @@
+import { isAddressEqual } from "viem";
+import { BaseContract } from "../../base/index.js";
+import { decodeDelayedIntent, encodeDelayedIntent } from "./intent-codec.js";
+const iCreditAccountAbi = [
+  {
+    type: "function",
+    name: "creditManager",
+    inputs: [],
+    outputs: [{ name: "", type: "address", internalType: "address" }],
+    stateMutability: "view"
+  }
+];
+class AbstractWithdrawalCompressorContract extends BaseContract {
+  #sdk;
+  constructor(sdk, args) {
+    super(sdk, args);
+    this.#sdk = sdk;
+  }
+  /**
+   * The contract is instantiated with the actual versioned ABI,
+   * this cast is type-level only (see {@link CommonAbi}).
+   **/
+  get common() {
+    return this.contract;
+  }
+  /**
+   * {@inheritDoc IWithdrawalCompressorContract.getWithdrawableAssets}
+   **/
+  async getWithdrawableAssets(creditManager) {
+    const resp = await this.common.read.getWithdrawableAssets([creditManager]);
+    return resp.map((a) => toWithdrawableAsset(a, creditManager));
+  }
+  /**
+   * {@inheritDoc IWithdrawalCompressorContract.getWithdrawableAssetsBatch}
+   **/
+  async getWithdrawableAssetsBatch(creditManagers) {
+    const cms = creditManagers ?? this.#sdk.marketRegister.creditManagers.map(
+      (cm) => cm.creditManager.address
+    );
+    const resp = await this.client.multicall({
+      contracts: cms.map(
+        (cm) => ({
+          address: this.address,
+          abi: this.abi,
+          functionName: "getWithdrawableAssets",
+          args: [cm]
+        })
+      ),
+      allowFailure: true,
+      batchSize: 0
+    });
+    return resp.flatMap((r, i) => {
+      if (r.status !== "success") {
+        this.logger?.warn(
+          `failed to get withdrawable assets of credit manager ${cms[i]}: ${r.error}`
+        );
+        return [];
+      }
+      return r.result.map((a) => toWithdrawableAsset(a, cms[i]));
+    });
+  }
+  /**
+   * {@inheritDoc IWithdrawalCompressorContract.getWithdrawalPhantomToken}
+   **/
+  async getWithdrawalPhantomToken(creditManager, token) {
+    const assets = await this.getWithdrawableAssets(creditManager);
+    const asset = assets.find((a) => isAddressEqual(a.token, token));
+    if (!asset) {
+      throw new Error(
+        `token ${token} is not withdrawable from credit manager ${creditManager}`
+      );
+    }
+    return asset.withdrawalPhantomToken;
+  }
+  /**
+   * {@inheritDoc IWithdrawalCompressorContract.getCurrentWithdrawals}
+   **/
+  async getCurrentWithdrawals(creditAccount) {
+    const [[claimable, pending], creditManager] = await this.client.multicall({
+      contracts: [
+        {
+          address: this.address,
+          abi: this.abi,
+          functionName: "getCurrentWithdrawals",
+          args: [creditAccount]
+        },
+        {
+          address: creditAccount,
+          abi: iCreditAccountAbi,
+          functionName: "creditManager"
+        }
+      ],
+      allowFailure: false,
+      batchSize: 0
+    });
+    return {
+      claimable: claimable.map(
+        (w) => toClaimableWithdrawal(w, creditManager, this.version >= 313)
+      ),
+      pending: pending.map((w) => toPendingWithdrawal(w, creditManager, this.version >= 313)).sort((a, b) => a.claimableAt < b.claimableAt ? -1 : 1)
+    };
+  }
+  /**
+   * {@inheritDoc IWithdrawalCompressorContract.getWithdrawalRequestResult}
+   **/
+  async getWithdrawalRequestResult(creditAccount, token, amount, intent) {
+    const resp = intent ? await this.#getWithdrawalRequestResultWithIntent(
+      creditAccount,
+      token,
+      amount,
+      intent
+    ) : await this.common.read.getWithdrawalRequestResult([
+      creditAccount,
+      token,
+      amount
+    ]);
+    return {
+      token: resp.token,
+      amountIn: resp.amountIn,
+      outputs: [...resp.outputs],
+      requestCalls: [...resp.requestCalls],
+      claimableAt: resp.claimableAt
+    };
+  }
+  /**
+   * Previews a delayed withdrawal request with an intent attached as
+   * `extraData`. Only supported on v313+ compressors; on older versions,
+   * throws if `sdk.strictContractTypes` is `true`, otherwise logs a warning
+   * and previews the request without the intent.
+   *
+   * The contract overload accepting `extraData` also requires the withdrawal
+   * phantom token, which is resolved here the same way the 3-arg overload
+   * does it internally: via `getWithdrawableAssets` of the account's credit
+   * manager.
+   **/
+  async #getWithdrawalRequestResultWithIntent(creditAccount, token, amount, intent) {
+    if (this.version < 313) {
+      const message = `withdrawal intents are not supported by ${this.name} v${this.version}`;
+      if (this.#sdk.strictContractTypes) {
+        throw new Error(message);
+      }
+      this.logger?.warn(`${message}, requesting withdrawal without intent`);
+      return this.common.read.getWithdrawalRequestResult([
+        creditAccount,
+        token,
+        amount
+      ]);
+    }
+    const extraData = encodeDelayedIntent(intent);
+    const creditManager = await this.client.readContract({
+      address: creditAccount,
+      abi: iCreditAccountAbi,
+      functionName: "creditManager"
+    });
+    const withdrawalPhantomToken = await this.getWithdrawalPhantomToken(
+      creditManager,
+      token
+    );
+    return this.common.read.getWithdrawalRequestResult([
+      creditAccount,
+      token,
+      withdrawalPhantomToken,
+      amount,
+      extraData
+    ]);
+  }
+}
+function toWithdrawableAsset(a, creditManager) {
+  return { creditManager, ...a };
+}
+function toClaimableWithdrawal(w, creditManager, decodeIntent) {
+  let intent;
+  if (decodeIntent && w.extraData && w.extraData !== "0x") {
+    intent = { ...decodeDelayedIntent(w.extraData), creditManager };
+  }
+  return {
+    token: w.token,
+    withdrawalPhantomToken: w.withdrawalPhantomToken,
+    withdrawalTokenSpent: w.withdrawalTokenSpent,
+    outputs: [...w.outputs],
+    claimCalls: [...w.claimCalls],
+    intent
+  };
+}
+function toPendingWithdrawal(w, creditManager, decodeIntent) {
+  let intent;
+  if (decodeIntent && w.extraData && w.extraData !== "0x") {
+    intent = { ...decodeDelayedIntent(w.extraData), creditManager };
+  }
+  return {
+    token: w.token,
+    withdrawalPhantomToken: w.withdrawalPhantomToken,
+    expectedOutputs: [...w.expectedOutputs],
+    claimableAt: w.claimableAt,
+    intent
+  };
+}
+export {
+  AbstractWithdrawalCompressorContract
+};

package/dist/esm/sdk/accounts/withdrawal-compressor/WithdrawalCompressorV310Contract.js

@@ -0,0 +1,16 @@
+import { iWithdrawalCompressorV310Abi } from "../../../abi/IWithdrawalCompressorV310.js";
+import { AbstractWithdrawalCompressorContract } from "./AbstractWithdrawalCompressorContract.js";
+const abi = iWithdrawalCompressorV310Abi;
+class WithdrawalCompressorV310Contract extends AbstractWithdrawalCompressorContract {
+  constructor(sdk, address) {
+    super(sdk, {
+      addr: address,
+      name: "WithdrawalCompressorV310",
+      abi,
+      version: 310
+    });
+  }
+}
+export {
+  WithdrawalCompressorV310Contract
+};

package/dist/esm/sdk/accounts/withdrawal-compressor/WithdrawalCompressorV311Contract.js

@@ -0,0 +1,16 @@
+import { iWithdrawalCompressorV311Abi } from "../../../abi/IWithdrawalCompressorV311.js";
+import { AbstractWithdrawalCompressorContract } from "./AbstractWithdrawalCompressorContract.js";
+const abi = iWithdrawalCompressorV311Abi;
+class WithdrawalCompressorV311Contract extends AbstractWithdrawalCompressorContract {
+  constructor(sdk, address) {
+    super(sdk, {
+      addr: address,
+      name: "WithdrawalCompressorV311",
+      abi,
+      version: 311
+    });
+  }
+}
+export {
+  WithdrawalCompressorV311Contract
+};

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

@@ -0,0 +1,16 @@
+import { iWithdrawalCompressorV313Abi } from "../../../abi/IWithdrawalCompressorV313.js";
+import { AbstractWithdrawalCompressorContract } from "./AbstractWithdrawalCompressorContract.js";
+const abi = iWithdrawalCompressorV313Abi;
+class WithdrawalCompressorV313Contract extends AbstractWithdrawalCompressorContract {
+  constructor(sdk, address) {
+    super(sdk, {
+      addr: address,
+      name: "WithdrawalCompressorV313",
+      abi,
+      version: 313
+    });
+  }
+}
+export {
+  WithdrawalCompressorV313Contract
+};

package/dist/esm/sdk/accounts/withdrawal-compressor/addresses.js

@@ -0,0 +1,16 @@
+const WITHDRAWAL_COMPRESSORS = {
+  Mainnet: {
+    address: "0x83e5AaC6590Cf9c6Dd323851a0D66fEc2Bc4F5A3",
+    version: 313
+  },
+  Monad: {
+    address: "0x36F3d0Bb73CBC2E94fE24dF0f26a689409cF9023",
+    version: 310
+  }
+};
+function getWithdrawalCompressorAddress(network) {
+  return WITHDRAWAL_COMPRESSORS[network];
+}
+export {
+  getWithdrawalCompressorAddress
+};

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

@@ -0,0 +1,27 @@
+import { getWithdrawalCompressorAddress } from "./addresses.js";
+import { WithdrawalCompressorV310Contract } from "./WithdrawalCompressorV310Contract.js";
+import { WithdrawalCompressorV311Contract } from "./WithdrawalCompressorV311Contract.js";
+import { WithdrawalCompressorV313Contract } from "./WithdrawalCompressorV313Contract.js";
+function createWithdrawalCompressor(sdk) {
+  const location = getWithdrawalCompressorAddress(sdk.networkType);
+  if (!location) {
+    throw new Error(`no withdrawal compressor on ${sdk.networkType}`);
+  }
+  const cached = sdk.getContract(
+    location.address
+  );
+  if (cached) {
+    return cached;
+  }
+  switch (location.version) {
+    case 310:
+      return new WithdrawalCompressorV310Contract(sdk, location.address);
+    case 311:
+      return new WithdrawalCompressorV311Contract(sdk, location.address);
+    case 313:
+      return new WithdrawalCompressorV313Contract(sdk, location.address);
+  }
+}
+export {
+  createWithdrawalCompressor
+};

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

@@ -0,0 +1,8 @@
+export * from "./AbstractWithdrawalCompressorContract.js";
+export * from "./addresses.js";
+export * from "./createWithdrawalCompressor.js";
+export * from "./intent-codec.js";
+export * from "./types.js";
+export * from "./WithdrawalCompressorV310Contract.js";
+export * from "./WithdrawalCompressorV311Contract.js";
+export * from "./WithdrawalCompressorV313Contract.js";

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

@@ -0,0 +1,91 @@
+import { decodeAbiParameters, encodeAbiParameters } from "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 encodeAbiParameters(TO_PARAMS, [version, intentType, intent.to]);
+    case "WITHDRAW_COLLATERAL":
+      return 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 encodeAbiParameters(HEADER_PARAMS, [version, intentType]);
+    default: {
+      const t = intent;
+      throw new Error(`unknown delayed intent: ${JSON.stringify(t)}`);
+    }
+  }
+}
+function decodeDelayedIntent(data) {
+  const [version, intentType] = 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] = 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] = decodeAbiParameters(
+        WITHDRAW_COLLATERAL_PARAMS,
+        data
+      );
+      return {
+        type: "WITHDRAW_COLLATERAL",
+        to,
+        withdrawToken,
+        withdrawAmount
+      };
+    }
+    case DELAYED_INTENT_TYPES.CLOSE_ACCOUNT: {
+      const [, , to] = 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}`);
+  }
+}
+export {
+  DELAYED_INTENT_TYPES,
+  DELAYED_INTENT_VERSION,
+  decodeDelayedIntent,
+  encodeDelayedIntent
+};

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

@@ -234,6 +234,7 @@ class BaseContract extends Construct {
       const functionName = getFunctionSignature(this.abi, calldata);
       return this.wrapParseCallV2(
         functionName,
+        calldata,
         this.parseFunctionParamsV2(decoded, strict)
       );
     } catch (e) {
@@ -247,7 +248,7 @@ class BaseContract extends 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
       });
     }
@@ -260,7 +261,7 @@ class BaseContract extends Construct {
   parseFunctionParamsV2(params, _strict) {
     return functionArgsToRecord(this.abi, params.functionName, params.args);
   }
-  wrapParseCallV2(functionName, rawArgs) {
+  wrapParseCallV2(functionName, calldata, rawArgs) {
     return {
       chainId: this.chainId,
       target: this.address,
@@ -268,6 +269,7 @@ class BaseContract extends Construct {
       label: this.labelAddress(this.address, true),
       version: this.version,
       functionName,
+      calldata,
       rawArgs
     };
   }

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

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

package/dist/esm/sdk/market/rwa/securitize/SecuritizeRWAFactory.js

@@ -54,17 +54,21 @@ class SecuritizeRWAFactory extends BaseContract {
   parseFunctionParamsV2(params, strict) {
     switch (params.functionName) {
       case "openCreditAccount": {
-        const [creditManager, calls] = params.args;
+        const [creditManager, calls, tokensToRegister, signaturesToCache] = params.args;
         return {
           creditManager,
-          calls: this.register.parseMultiCallV2([...calls], strict)
+          calls: this.register.parseMultiCallV2([...calls], strict),
+          tokensToRegister,
+          signaturesToCache
         };
       }
       case "multicall": {
-        const [creditAccount, calls] = params.args;
+        const [creditAccount, calls, tokensToRegister, signaturesToCache] = params.args;
         return {
           creditAccount,
-          calls: this.register.parseMultiCallV2([...calls], strict)
+          calls: this.register.parseMultiCallV2([...calls], strict),
+          tokensToRegister,
+          signaturesToCache
         };
       }
       default:
@@ -126,6 +130,12 @@ class SecuritizeRWAFactory extends BaseContract {
       })
     };
   }
+  /**
+   * {@inheritDoc IRWAFactory.getTokens}
+   */
+  getTokens() {
+    return this.dsTokens.map((t) => t.address);
+  }
   /**
    * {@inheritDoc IRWAFactory.getInvestor}
    */
@@ -160,8 +170,8 @@ class SecuritizeRWAFactory extends 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]
@@ -191,11 +201,33 @@ class SecuritizeRWAFactory extends 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 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: 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/esm/sdk/market/rwa/types.js

@@ -1,7 +1,10 @@
 import { RWA_FACTORY_SECURITIZE } from "./securitize/index.js";
 const RWA_FACTORY_TYPES = [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::");
 }
 export {
   RWA_FACTORY_TYPES,

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

@@ -32,7 +32,6 @@ class ZapperContract extends 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")) {
@@ -42,7 +41,6 @@ class ZapperContract extends BaseContract {
         zapper,
         receiver,
         assets: rawArgs.tokenInAmount ?? value ?? 0n,
-        token,
         underlying,
         referralCode: rawArgs.referralCode
       };
@@ -54,7 +52,6 @@ class ZapperContract extends BaseContract {
         zapper,
         receiver,
         shares: rawArgs.tokenOutAmount,
-        token,
         underlying
       };
     }

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

@@ -1,6 +1,8 @@
-import { BaseContract } from "../base/index.js";
+import {
+  BaseContract
+} from "../base/index.js";
 import { PERCENTAGE_FACTOR } from "../constants/math.js";
-import { AddressMap, AddressSet, formatBN, isDust } from "../utils/index.js";
+import { AddressSet, AssetsMap, formatBN, isDust } from "../utils/index.js";
 import { limitLeftover } from "./helpers.js";
 class AbstractRouterContract extends BaseContract {
   /**
@@ -18,15 +20,15 @@ class AbstractRouterContract extends BaseContract {
       options.debtOnly
     );
     const { leftoverBalances, expectedBalances, tokensToClaim } = b;
-    const expected = new AddressMap();
-    const leftover = new AddressMap();
+    const expected = new AssetsMap();
+    const leftover = new 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: limitLeftover(leftoverBalances.get(token)?.balance || 1n, token) ?? 1n
-      });
+        limitLeftover(leftoverBalances.get(token) || 1n, token) ?? 1n
+      );
     }
     return {
       expectedBalances: expected,
@@ -35,8 +37,8 @@ class AbstractRouterContract extends BaseContract {
     };
   }
   getDefaultExpectedAndLeftover(ca, keepAssets, debtOnly) {
-    const expectedBalances = new AddressMap();
-    const leftoverBalances = new AddressMap();
+    const expectedBalances = new AssetsMap();
+    const leftoverBalances = new AssetsMap();
     const keepAssetsSet = new AddressSet(keepAssets);
     if (debtOnly) {
       const result = this.getLeftoversAfterBuyingDebt(ca, keepAssetsSet);
@@ -48,23 +50,23 @@ class AbstractRouterContract extends 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 || isDust({
         sdk: this.sdk,
         token,
         balance,
         creditManager: ca.creditManager
       })) {
-        leftoverBalances.upsert(token, {
+        leftoverBalances.upsert(
           token,
-          balance: limitLeftover(balance, token) ?? balance
-        });
+          limitLeftover(balance, token) ?? balance
+        );
       }
     }
     return {
       expectedBalances,
       leftoverBalances,
-      tokensToClaim: new AddressMap()
+      tokensToClaim: new AssetsMap()
     };
   }
   /**
@@ -77,16 +79,13 @@ class AbstractRouterContract extends BaseContract {
     const { priceOracle } = this.sdk.marketRegister.findByCreditManager(
       ca.creditManager
     );
-    const expectedBalances = new AddressMap();
-    const leftoverBalances = new AddressMap();
+    const expectedBalances = new AssetsMap();
+    const leftoverBalances = new 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: limitLeftover(balance, token) ?? balance
-      });
+      expectedBalances.upsert(token, balance);
+      leftoverBalances.upsert(token, limitLeftover(balance, token) ?? balance);
       if (isEnabled && !keepAssets.has(token)) {
         usdBalances.push({
           token,
@@ -116,15 +115,12 @@ class AbstractRouterContract extends 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,
@@ -137,7 +133,7 @@ class AbstractRouterContract extends BaseContract {
     return {
       expectedBalances,
       leftoverBalances,
-      tokensToClaim: new AddressMap()
+      tokensToClaim: new AssetsMap()
     };
   }
   safeConvertToUSD(priceOracle, token, balance) {