@gearbox-protocol/sdk 13.5.0-next.1 → 13.5.0-next.2

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

@@ -22,12 +22,9 @@ __export(TokensMeta_exports, {
 });
 module.exports = __toCommonJS(TokensMeta_exports);
 var import_viem = require("viem");
-var import_iSecuritizeDegenNFT = require("../../abi/310/iSecuritizeDegenNFT.js");
-var import_iSecuritizeKYCFactory = require("../../abi/310/iSecuritizeKYCFactory.js");
 var import_iStateSerializer = require("../../abi/iStateSerializer.js");
 var import_iVersion = require("../../abi/iVersion.js");
 var import_utils = require("../utils/index.js");
-var import_token_types = require("./token-types.js");
 class TokensMeta extends import_utils.AddressMap {
   #client;
   #tokenDataLoaded = new import_utils.AddressSet();
@@ -84,32 +81,6 @@ class TokensMeta extends import_utils.AddressMap {
     }
     return !!t.contractType?.startsWith("PHANTOM_TOKEN::");
   }
-  /**
-   * Returns true if the token is a KYC underlying token, throws if the token data is not loaded
-   * @param t
-   * @returns
-   */
-  isKYCUnderlying(t) {
-    if (!this.#tokenDataLoaded.has(t.addr)) {
-      throw new Error(
-        `extended token data not loaded for ${t.symbol} (${t.addr})`
-      );
-    }
-    return !!t.contractType?.startsWith("KYC_UNDERLYING::");
-  }
-  /**
-   * Returns true if the token is a DSToken, throws if the token data is not loaded
-   * @param t
-   * @returns
-   */
-  isDSToken(t) {
-    if (!this.#tokenDataLoaded.has(t.addr)) {
-      throw new Error(
-        `extended token data not loaded for ${t.symbol} (${t.addr})`
-      );
-    }
-    return !!t.isDSToken;
-  }
   /**
    * Returns a map of all phantom tokens
    * Throws if token data is not loaded
@@ -123,28 +94,6 @@ class TokensMeta extends import_utils.AddressMap {
     }
     return result;
   }
-  /**
-   * Returns a map of all KYC underlying tokens
-   * Throws if token data is not loaded
-   */
-  get kycUnderlyings() {
-    const result = new import_utils.AddressMap();
-    for (const [token, meta] of this.entries()) {
-      if (this.isKYCUnderlying(meta)) {
-        result.upsert(token, meta);
-      }
-    }
-    return result;
-  }
-  get dsTokens() {
-    const result = new import_utils.AddressMap();
-    for (const [token, meta] of this.entries()) {
-      if (this.isDSToken(meta)) {
-        result.upsert(token, meta);
-      }
-    }
-    return result;
-  }
   formatBN(arg0, arg1, arg2) {
     const token = typeof arg0 === "object" ? arg0.token : arg0;
     const amount = typeof arg0 === "object" ? arg0.balance : arg1;
@@ -174,7 +123,8 @@ class TokensMeta extends import_utils.AddressMap {
     return meta;
   }
   /**
-   * Loads token information about phantom tokens, KYC underlying tokens and DSTokens
+   * Loads token information about phantom tokens
+   * Other special tokens may be loaded here in the future
    *
    * @param tokens - tokens to load data for, defaults to all tokens
    */
@@ -203,116 +153,22 @@ class TokensMeta extends import_utils.AddressMap {
       batchSize: 0
     });
     this.#logger?.debug(`loaded ${resp.length} contract types`);
-    const kycFactories = new import_utils.AddressSet();
     for (let i = 0; i < tokensToLoad.length; i++) {
-      const meta = this.#overrideTokenMeta(
-        tokensToLoad[i],
-        resp[2 * i],
-        resp[2 * i + 1]
-      );
+      this.#overrideTokenMeta(tokensToLoad[i], resp[2 * i], resp[2 * i + 1]);
       this.#tokenDataLoaded.add(tokensToLoad[i]);
-      if (this.isKYCUnderlying(meta)) {
-        kycFactories.add(meta.kycFactory);
-      }
     }
-    this.#logger?.debug(`found ${kycFactories.size} KYC factories`);
-    await this.#loadDSTokens(kycFactories);
   }
-  #overrideTokenMeta(token, contractTypeResp, serializeResp) {
+  #overrideTokenMeta(token, contractTypeResp, _serializeResp) {
     const meta = this.mustGet(token);
     if (contractTypeResp.status === "success") {
       const contractType = (0, import_utils.bytes32ToString)(contractTypeResp.result);
-      if (contractType.startsWith("KYC_UNDERLYING::")) {
-        if (serializeResp.status === "success") {
-          this.#overrideKYCUnderlying(meta, contractType, serializeResp.result);
-        } else {
-          throw new Error(
-            `token ${meta.symbol} (${token}) is ${contractType} but serialize failed: ${serializeResp.error}`
-          );
-        }
-      } else {
-        this.upsert(token, {
-          ...meta,
-          contractType
-        });
-      }
-      this.#logger?.debug(`token ${meta.symbol} is ${contractType}`);
-    }
-    return this.mustGet(token);
-  }
-  #overrideKYCUnderlying(meta, contractType, serialized) {
-    if (contractType === import_token_types.KYC_UNDERLYING_DEFAULT) {
-      const decoded = (0, import_viem.decodeAbiParameters)(
-        [
-          { type: "address", name: "kycFactory" },
-          { type: "address", name: "asset" }
-        ],
-        serialized
-      );
-      this.upsert(meta.addr, {
-        ...meta,
-        contractType,
-        kycFactory: decoded[0],
-        asset: decoded[1]
-      });
-    } else if (contractType === import_token_types.KYC_UNDERLYING_ON_DEMAND) {
-      const decoded = (0, import_viem.decodeAbiParameters)(
-        [
-          { type: "address", name: "kycFactory" },
-          { type: "address", name: "asset" },
-          { type: "address", name: "pool" },
-          { type: "address", name: "liquidityProvider" }
-        ],
-        serialized
-      );
-      this.upsert(meta.addr, {
-        ...meta,
-        contractType,
-        kycFactory: decoded[0],
-        asset: decoded[1],
-        pool: decoded[2],
-        liquidityProvider: decoded[3]
-      });
-    }
-  }
-  async #loadDSTokens(kycFactories) {
-    const degenNFTs = await this.#client.multicall({
-      contracts: kycFactories.map((address) => {
-        return {
-          address,
-          abi: import_iSecuritizeKYCFactory.iSecuritizeKYCFactoryAbi,
-          functionName: "getDegenNFT"
-        };
-      }),
-      allowFailure: false,
-      batchSize: 0
-    });
-    const resp = await this.#client.multicall({
-      contracts: degenNFTs.map((address) => {
-        return {
-          address,
-          abi: import_iSecuritizeDegenNFT.iSecuritizeDegenNFTAbi,
-          functionName: "getDSTokens"
-        };
-      }),
-      allowFailure: false,
-      batchSize: 0
-    });
-    const dsToken = new import_utils.AddressSet(resp.flat());
-    const tokensToLoad = dsToken.difference(new Set(this.keys()));
-    this.#logger?.debug(
-      `found ${dsToken.size} DSTokens in KYC factories, need to load ${tokensToLoad.size} basic metadata`
-    );
-    await this.#loadWithoutCompressor(tokensToLoad);
-    for (const token of dsToken) {
-      const meta = this.mustGet(token);
       this.upsert(token, {
         ...meta,
-        isDSToken: true
+        contractType
       });
-      this.#tokenDataLoaded.add(token);
-      this.#logger?.debug(`token ${meta.symbol} (${token}) is a DSToken`);
+      this.#logger?.debug(`token ${meta.symbol} is ${contractType}`);
     }
+    return this.mustGet(token);
   }
   async #loadWithoutCompressor(tokens_) {
     if (tokens_.size === 0) {

package/dist/cjs/sdk/base/token-types.js

@@ -18,8 +18,6 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var token_types_exports = {};
 __export(token_types_exports, {
-  KYC_UNDERLYING_DEFAULT: () => KYC_UNDERLYING_DEFAULT,
-  KYC_UNDERLYING_ON_DEMAND: () => KYC_UNDERLYING_ON_DEMAND,
   PHANTOM_TOKEN_CONTRACT_TYPES: () => PHANTOM_TOKEN_CONTRACT_TYPES
 });
 module.exports = __toCommonJS(token_types_exports);
@@ -32,11 +30,7 @@ const PHANTOM_TOKEN_CONTRACT_TYPES = [
   "PHANTOM_TOKEN::STAKING_REWARDS",
   "PHANTOM_TOKEN::UPSHIFT_WITHDRAW"
 ];
-const KYC_UNDERLYING_DEFAULT = "KYC_UNDERLYING::DEFAULT";
-const KYC_UNDERLYING_ON_DEMAND = "KYC_UNDERLYING::ON_DEMAND";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  KYC_UNDERLYING_DEFAULT,
-  KYC_UNDERLYING_ON_DEMAND,
   PHANTOM_TOKEN_CONTRACT_TYPES
 });

package/dist/cjs/sdk/chain/chains.js

@@ -79,8 +79,7 @@ const chains = {
         "0x601067eba24bb5b558a184fc082525637e96a42d": "Gami Labs"
       },
       testMarketConfigurators: {
-        "0x99df7330bf42d596af2e9d9836d4fc2077c574aa": "M11 Credit",
-        "0xE0527dE5908B3fc2e054B7eEE0DeF6c9965AbF24": "Securitize"
+        "0x99df7330bf42d596af2e9d9836d4fc2077c574aa": "M11 Credit"
       },
       isPublic: true,
       wellKnownToken: {

package/dist/cjs/sdk/constants/addresses.js

@@ -20,15 +20,18 @@ var addresses_exports = {};
 __export(addresses_exports, {
   ADDRESS_0X0: () => ADDRESS_0X0,
   MULTICALL_ADDRESS: () => MULTICALL_ADDRESS,
+  NATIVE_ADDRESS: () => NATIVE_ADDRESS,
   NOT_DEPLOYED: () => NOT_DEPLOYED
 });
 module.exports = __toCommonJS(addresses_exports);
 const MULTICALL_ADDRESS = "0xcA11bde05977b3631167028862bE2a173976CA11";
 const ADDRESS_0X0 = "0x0000000000000000000000000000000000000000";
 const NOT_DEPLOYED = "0xNOT DEPLOYED";
+const NATIVE_ADDRESS = "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ADDRESS_0X0,
   MULTICALL_ADDRESS,
+  NATIVE_ADDRESS,
   NOT_DEPLOYED
 });

package/dist/cjs/sdk/market/MarketRegister.js

@@ -29,9 +29,6 @@ var import_MarketConfiguratorContract = require("./MarketConfiguratorContract.js
 var import_MarketSuite = require("./MarketSuite.js");
 var import_ZapperRegister = require("./ZapperRegister.js");
 class MarketRegister extends import_ZapperRegister.ZapperRegister {
-  /**
-   * Mapping pool.address -> MarketSuite
-   */
   #markets = new import_utils.AddressMap(void 0, "markets");
   #marketFilter;
   #marketConfigurators = new import_utils.AddressMap(

package/dist/cjs/sdk/market/MarketSuite.js

@@ -65,9 +65,6 @@ class MarketSuite extends import_base.SDKConstruct {
   get underlying() {
     return this.pool.underlying;
   }
-  async getKYCFactory() {
-    return this.pool.getKYCFactory();
-  }
   get dirty() {
     return this.configurator.dirty || this.pool.dirty || this.priceOracle.dirty || this.creditManagers.some((cm) => cm.dirty);
   }

package/dist/cjs/sdk/market/ZapperRegister.js

@@ -73,9 +73,6 @@ class ZapperRegister extends import_base.SDKConstruct {
         );
       }
     }
-    for (const z of KYC_ZAPPERS[this.networkType] ?? []) {
-      this.#addZapper({ ...z, type: "kyc" });
-    }
     for (const z of MIGRATION_ZAPPERS[this.networkType] ?? []) {
       this.#addZapper({ ...z, type: "migration" });
     }
@@ -233,7 +230,6 @@ const MIGRATION_ZAPPERS = {
     }
   ]
 };
-const KYC_ZAPPERS = {};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ZapperRegister

package/dist/cjs/sdk/market/pool/PoolSuite.js

@@ -88,9 +88,6 @@ class PoolSuite extends import_base.SDKConstruct {
   get underlying() {
     return this.pool.underlying;
   }
-  async getKYCFactory() {
-    return this.pool.getKYCFactory();
-  }
   get dirty() {
     return this.pool.dirty || this.rateKeeper.dirty || this.pqk.dirty || this.interestRateModel.dirty;
   }

package/dist/cjs/sdk/market/pool/PoolV310Contract.js

@@ -25,20 +25,16 @@ var import_generated = require("../../../abi/310/generated.js");
 var import_iPausable = require("../../../abi/iPausable.js");
 var import_base = require("../../base/index.js");
 var import_utils = require("../../utils/index.js");
-var import_SecuritizeKYCFactory = require("./SecuritizeKYCFactory.js");
 const abi = [...import_generated.iPoolV310Abi, ...import_iPausable.iPausableAbi];
 class PoolV310Contract extends import_base.BaseContract {
   creditManagerDebtParams;
-  #sdk;
-  #kycFactory;
-  constructor(sdk, data) {
+  constructor(options, data) {
     const { baseParams, creditManagerDebtParams, ...rest } = data;
-    super(sdk, {
+    super(options, {
       ...data.baseParams,
       name: `PoolV3(${data.name})`,
       abi
     });
-    this.#sdk = sdk;
     Object.assign(this, rest);
     this.creditManagerDebtParams = new import_utils.AddressMap(
       creditManagerDebtParams.map((p) => [p.creditManager, p])
@@ -50,17 +46,6 @@ class PoolV310Contract extends import_base.BaseContract {
       symbol: data.symbol
     });
   }
-  async getKYCFactory() {
-    if (this.#kycFactory) {
-      return this.#kycFactory;
-    }
-    await this.#sdk.tokensMeta.loadTokenData(this.underlying);
-    const u = this.#sdk.tokensMeta.mustGet(this.underlying);
-    if (this.#sdk.tokensMeta.isKYCUnderlying(u)) {
-      this.#kycFactory = new import_SecuritizeKYCFactory.SecuritizeKYCFactory(this.#sdk, u.kycFactory);
-    }
-    return this.#kycFactory;
-  }
   stateHuman(raw = true) {
     return {
       ...super.stateHuman(raw),

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

@@ -18,15 +18,11 @@ module.exports = __toCommonJS(pool_exports);
 __reExport(pool_exports, require("./GaugeContract.js"), module.exports);
 __reExport(pool_exports, require("./LinearInterestRateModelContract.js"), module.exports);
 __reExport(pool_exports, require("./PoolSuite.js"), module.exports);
-__reExport(pool_exports, require("./PoolV310Contract.js"), module.exports);
-__reExport(pool_exports, require("./SecuritizeKYCFactory.js"), module.exports);
 __reExport(pool_exports, require("./types.js"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ...require("./GaugeContract.js"),
   ...require("./LinearInterestRateModelContract.js"),
   ...require("./PoolSuite.js"),
-  ...require("./PoolV310Contract.js"),
-  ...require("./SecuritizeKYCFactory.js"),
   ...require("./types.js")
 });

package/dist/cjs/sdk/pools/PoolService.js

@@ -22,82 +22,39 @@ __export(PoolService_exports, {
 });
 module.exports = __toCommonJS(PoolService_exports);
 var import_generated = require("../../abi/310/generated.js");
-var import_iERC20 = require("../../abi/iERC20.js");
 var import_iERC20ZapperDeposits = require("../../abi/iERC20ZapperDeposits.js");
 var import_iETHZapperDeposits = require("../../abi/iETHZapperDeposits.js");
 var import_iZapper = require("../../abi/iZapper.js");
 var import_base = require("../base/index.js");
-var import__ = require("../index.js");
+var import_constants = require("../constants/index.js");
 var import_utils = require("../utils/index.js");
-const NATIVE_ADDRESS = "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE";
-const POOL_TOKENS_TO_MIGRATE = new import_utils.AddressMap([
-  // v2 diesels
-  ["0x6CFaF95457d7688022FC53e7AbE052ef8DFBbdBA", "dDAI"],
-  ["0xc411dB5f5Eb3f7d552F9B8454B2D74097ccdE6E3", "dUSDC"],
-  ["0xe753260F1955e8678DCeA8887759e07aa57E8c54", "dWBTC"],
-  ["0xF21fc650C1B34eb0FDE786D52d23dA99Db3D6278", "dWETH"],
-  ["0x2158034dB06f06dcB9A786D2F1F8c38781bA779d", "dwstETH"],
-  ["0x8A1112AFef7F4FC7c066a77AABBc01b3Fff31D47", "dFRAX"]
-]);
+var import_constants2 = require("./constants.js");
 class PoolService extends import_base.SDKConstruct {
+  /**
+   * @inheritdoc IPoolsService.getDepositTokensIn
+   */
   getDepositTokensIn(pool) {
-    const underlying = this.#describeUnderlying(pool);
-    if (this.sdk.tokensMeta.isKYCUnderlying(underlying)) {
-      switch (underlying.contractType) {
-        case import_base.KYC_UNDERLYING_DEFAULT:
-          return this.#depositTokensIn(pool, false);
-        case import_base.KYC_UNDERLYING_ON_DEMAND:
-          return [underlying.asset];
-      }
-    }
     return this.#depositTokensIn(pool, true);
   }
+  /**
+   * @inheritdoc IPoolsService.getDepositTokensOut
+   */
   getDepositTokensOut(pool, tokenIn) {
-    const underlying = this.#describeUnderlying(pool);
-    if (this.sdk.tokensMeta.isKYCUnderlying(underlying)) {
-      switch (underlying.contractType) {
-        case import_base.KYC_UNDERLYING_DEFAULT:
-          return this.#depositTokensOut(pool, tokenIn, false);
-        case import_base.KYC_UNDERLYING_ON_DEMAND:
-          return [];
-      }
-    }
     return this.#depositTokensOut(pool, tokenIn, true);
   }
+  /**
+   * @inheritdoc IPoolsService.getDepositMetadata
+   */
   getDepositMetadata(pool, tokenIn, tokenOut) {
-    const underlying = this.#describeUnderlying(pool);
-    if (this.sdk.tokensMeta.isKYCUnderlying(underlying)) {
-      switch (underlying.contractType) {
-        case import_base.KYC_UNDERLYING_DEFAULT: {
-          return this.#depositMetadata(
-            "kyc-default",
-            pool,
-            tokenIn,
-            tokenOut,
-            false
-          );
-        }
-        case import_base.KYC_UNDERLYING_ON_DEMAND:
-          return {
-            zapper: void 0,
-            approveTarget: underlying.liquidityProvider,
-            permissible: false,
-            type: "kyc-on-demand"
-          };
-      }
-    }
     return this.#depositMetadata("classic", pool, tokenIn, tokenOut, true);
   }
+  /**
+   * @inheritdoc IPoolsService.addLiquidity
+   */
   addLiquidity(props) {
     const { collateral, meta, permit, referralCode, pool, wallet } = props;
-    const underlying = this.#describeUnderlying(pool);
-    if (this.sdk.tokensMeta.isKYCUnderlying(underlying)) {
-      if (underlying.contractType === import_base.KYC_UNDERLYING_ON_DEMAND) {
-        return void 0;
-      }
-    }
     const { zapper } = meta;
-    if (zapper && (0, import__.hexEq)(zapper.tokenIn.addr, NATIVE_ADDRESS)) {
+    if (zapper && (0, import_utils.hexEq)(zapper.tokenIn.addr, import_constants.NATIVE_ADDRESS)) {
       return {
         target: zapper.baseParams.addr,
         abi: import_iETHZapperDeposits.iethZapperDepositsAbi,
@@ -134,43 +91,23 @@ class PoolService extends import_base.SDKConstruct {
       };
     }
   }
+  /**
+   * @inheritdoc IPoolsService.getWithdrawalTokensIn
+   */
   getWithdrawalTokensIn(pool) {
-    const underlying = this.#describeUnderlying(pool);
-    if (this.sdk.tokensMeta.isKYCUnderlying(underlying)) {
-      switch (underlying.contractType) {
-        case import_base.KYC_UNDERLYING_DEFAULT:
-          return this.#withdrawalTokensIn(pool, false);
-        case import_base.KYC_UNDERLYING_ON_DEMAND:
-          return [];
-      }
-    }
     return this.#withdrawalTokensIn(pool, true);
   }
+  /**
+   * @inheritdoc IPoolsService.getWithdrawalTokensOut
+   */
   getWithdrawalTokensOut(pool, tokenIn) {
-    const underlying = this.#describeUnderlying(pool);
-    if (this.sdk.tokensMeta.isKYCUnderlying(underlying)) {
-      switch (underlying.contractType) {
-        case import_base.KYC_UNDERLYING_DEFAULT:
-          return this.#withdrawalTokensOut(pool, tokenIn, false);
-        case import_base.KYC_UNDERLYING_ON_DEMAND:
-          return [underlying.asset];
-      }
-    }
     return this.#withdrawalTokensOut(pool, tokenIn, true);
   }
+  /**
+   * @inheritdoc IPoolsService.removeLiquidity
+   */
   removeLiquidity(props) {
     const { pool, amount, meta, wallet, permit } = props;
-    const underlying = this.#describeUnderlying(pool);
-    if (this.sdk.tokensMeta.isKYCUnderlying(underlying)) {
-      if (underlying.contractType === import_base.KYC_UNDERLYING_ON_DEMAND) {
-        return {
-          abi: import_iERC20.ierc20Abi,
-          functionName: "approve",
-          args: [underlying.liquidityProvider, 0n],
-          target: underlying.asset
-        };
-      }
-    }
     if (meta.zapper) {
       return permit ? {
         target: meta.zapper.baseParams.addr,
@@ -198,49 +135,32 @@ class PoolService extends import_base.SDKConstruct {
       args: [amount, wallet, wallet]
     };
   }
+  /**
+   * @inheritdoc IPoolsService.getWithdrawalMetadata
+   */
   getWithdrawalMetadata(pool, tokenIn, tokenOut) {
-    const underlying = this.#describeUnderlying(pool);
-    if (this.sdk.tokensMeta.isKYCUnderlying(underlying)) {
-      switch (underlying.contractType) {
-        case import_base.KYC_UNDERLYING_DEFAULT: {
-          return this.#withdrawalMetadata(
-            "kyc-default",
-            pool,
-            tokenIn,
-            tokenOut,
-            false
-          );
-        }
-        case import_base.KYC_UNDERLYING_ON_DEMAND:
-          return {
-            zapper: void 0,
-            approveTarget: void 0,
-            permissible: false,
-            type: "kyc-on-demand"
-          };
-      }
-    }
     return this.#withdrawalMetadata("classic", pool, tokenIn, tokenOut, true);
   }
   /**
+   * TODO: do we still need this after v3.0 deprecation?
    * Filter out v2 diesel tokens (can come from migration v2 -> v3 zappers)
    * Also omits "migration" zappers (v3 -> v3.1) since they are treated in a different way
    */
   #getDepositZappers(poolAddr) {
     const zappers = this.sdk.marketRegister.poolZappers(poolAddr);
     return zappers.filter(
-      (z) => z.type !== "migration" && !POOL_TOKENS_TO_MIGRATE.has(z.tokenIn.addr)
+      (z) => z.type !== "migration" && !import_constants2.POOL_TOKENS_TO_MIGRATE.has(z.tokenIn.addr)
     );
   }
   #depositTokensIn(poolAddr, allowDirectDeposit) {
     const { pool } = this.sdk.marketRegister.findByPool(poolAddr);
-    const result = new import__.AddressSet();
+    const result = new import_utils.AddressSet();
     if (allowDirectDeposit) {
       result.add(pool.underlying);
     }
     const zappers = this.#getDepositZappers(poolAddr);
     for (const z of zappers) {
-      if ((0, import__.hexEq)(z.tokenOut.addr, poolAddr)) {
+      if ((0, import_utils.hexEq)(z.tokenOut.addr, poolAddr)) {
         result.add(z.tokenIn.addr);
       }
     }
@@ -253,7 +173,7 @@ class PoolService extends import_base.SDKConstruct {
   }
   #withdrawalTokensIn(poolAddr, allowDirectDeposit) {
     const { pool } = this.sdk.marketRegister.findByPool(poolAddr);
-    const result = new import__.AddressSet();
+    const result = new import_utils.AddressSet();
     if (allowDirectDeposit && pool) {
       result.add(poolAddr);
     }
@@ -269,15 +189,15 @@ class PoolService extends import_base.SDKConstruct {
     return result.asArray();
   }
   #depositTokensOut(poolAddr, tokenIn, allowDirectDeposit) {
-    const result = new import__.AddressSet();
+    const result = new import_utils.AddressSet();
     const { pool } = this.sdk.marketRegister.findByPool(poolAddr);
     const zappers = this.#getDepositZappers(poolAddr);
     for (const z of zappers) {
-      if ((0, import__.hexEq)(z.tokenIn.addr, tokenIn)) {
+      if ((0, import_utils.hexEq)(z.tokenIn.addr, tokenIn)) {
         result.add(z.tokenOut.addr);
       }
     }
-    if (allowDirectDeposit && (0, import__.hexEq)(tokenIn, pool.underlying)) {
+    if (allowDirectDeposit && (0, import_utils.hexEq)(tokenIn, pool.underlying)) {
       result.add(poolAddr);
     }
     if (result.size === 0) {
@@ -291,15 +211,15 @@ class PoolService extends import_base.SDKConstruct {
     return r;
   }
   #withdrawalTokensOut(poolAddr, tokenIn, allowDirectDeposit) {
-    const result = new import__.AddressSet();
+    const result = new import_utils.AddressSet();
     const { pool } = this.sdk.marketRegister.findByPool(poolAddr);
     const zappers = this.#getDepositZappers(poolAddr);
     for (const z of zappers) {
-      if ((0, import__.hexEq)(z.tokenOut.addr, tokenIn)) {
+      if ((0, import_utils.hexEq)(z.tokenOut.addr, tokenIn)) {
         result.add(z.tokenIn.addr);
       }
     }
-    if (allowDirectDeposit && (0, import__.hexEq)(tokenIn, poolAddr)) {
+    if (allowDirectDeposit && (0, import_utils.hexEq)(tokenIn, poolAddr)) {
       result.add(pool.underlying);
     }
     if (result.size === 0) {
@@ -313,12 +233,13 @@ class PoolService extends import_base.SDKConstruct {
     return r;
   }
   /**
+   * TODO: do we still need this after v3.0 deprecation?
    * Filter out v2 diesel tokens (can come from migration v2 -> v3 zappers)
    * Also omits "migration" zappers (v3 -> v3.1) since they are treated in a different way
    */
   #getDepositZapper(poolAddr, tokenIn, tokenOut) {
     const zappers = this.sdk.marketRegister.getZapper(poolAddr, tokenIn, tokenOut)?.filter(
-      (z) => z.type !== "migration" && !POOL_TOKENS_TO_MIGRATE.has(z.tokenIn.addr)
+      (z) => z.type !== "migration" && !import_constants2.POOL_TOKENS_TO_MIGRATE.has(z.tokenIn.addr)
     );
     if (zappers && zappers.length > 1) {
       throw new Error(
@@ -350,9 +271,9 @@ class PoolService extends import_base.SDKConstruct {
       zapper,
       // zapper or pool itself
       approveTarget: zapper?.baseParams.addr ?? pool.pool.address,
-      // TODO: instead of permissible, return permitType зависимости от tokenIn
+      // TODO: instead of permissible, return permitType depending on tokenIn
       // "none" | "eip2612" | "dai_like";
-      permissible: !!zapper && !(0, import__.hexEq)(tokenIn, NATIVE_ADDRESS),
+      permissible: !!zapper && !(0, import_utils.hexEq)(tokenIn, import_constants.NATIVE_ADDRESS),
       type
     };
   }
@@ -374,7 +295,7 @@ class PoolService extends import_base.SDKConstruct {
       zapper,
       // zapper or pool itself
       approveTarget: zapper?.baseParams.addr,
-      // TODO: instead of permissible, return permitType зависимости от tokenIn
+      // TODO: instead of permissible, return permitType depending on tokenIn
       // "none" | "eip2612" | "dai_like";
       permissible: !!zapper,
       type