@gearbox-protocol/sdk 13.7.0-kyc.3 → 14.0.0-next.10

package/dist/cjs/sdk/options.js

@@ -18,65 +18,20 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var options_exports = {};
 __export(options_exports, {
-  SDKOptions: () => SDKOptions
+  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 SDKOptions = import_v4.z.object({
-  /**
-   * Override address of the Gearbox AddressProvider contract.
-   * If not set, uses default universal address provider address {@link ADDRESS_PROVIDER_V310}
-   **/
-  addressProvider: (0, import_utils.ZodAddress)().optional(),
-  /**
-   * Addresses of market configurator contracts to load.
-   * If not set, all default market configurators for the chain are loaded
-   * (from {@link GearboxChain.defaultMarketConfigurators})
-   **/
-  marketConfigurators: import_v4.z.array((0, import_utils.ZodAddress)()).optional(),
-  /**
-   * Addresses of KYC factory contracts to load.
-   * If not set, all default KYC factories for the chain are loaded
-   * (from {@link GearboxChain.kycFactories})
-   **/
-  kycFactories: import_v4.z.array((0, import_utils.ZodAddress)()).optional(),
-  /**
-   * Pin SDK to a specific block number during attach.
-   * When set, all on-chain reads use this block instead of `latest`.
-   **/
-  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.
-   * Speeds up initialisation when prices are not needed.
-   **/
-  ignoreUpdateablePrices: import_v4.z.boolean().optional(),
-  /**
-   * Pool addresses whose markets should be skipped during attach/hydrate/sync.
-   **/
-  ignoreMarkets: import_v4.z.array((0, import_utils.ZodAddress)()).optional(),
-  /**
-   * When `true`, throw on unrecognised contract types instead of falling
-   * back to a generic contract wrapper.
-   **/
+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(),
-  /**
-   * Options for Redstone price-feed updates.
-   **/
-  redstone: import_updates.RedstoneOptions.optional(),
-  /**
-   * Options for Pyth price-feed updates.
-   **/
-  pyth: import_updates.PythOptions.optional(),
   /**
    * Explicit gas limit for read-only `eth_call` requests.
    * `null` disables the gas limit entirely; `undefined` uses the SDK default.
@@ -84,7 +39,24 @@ const SDKOptions = 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. */
+  addressProvider: (0, import_utils.ZodAddress)().optional(),
+  /** Addresses of market configurator contracts to load. */
+  marketConfigurators: import_v4.z.array((0, import_utils.ZodAddress)()).optional(),
+  /** 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. */
+  ignoreUpdateablePrices: import_v4.z.boolean().optional(),
+  /** Pool addresses whose markets should be skipped. */
+  ignoreMarkets: import_v4.z.array((0, import_utils.ZodAddress)()).optional(),
+  /** Options for Redstone price-feed updates. */
+  redstone: import_updates.RedstoneOptions.optional(),
+  /** Options for Pyth price-feed updates. */
+  pyth: import_updates.PythOptions.optional()
+});
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  SDKOptions
+  AttachOptionsSchema,
+  OnchainSDKOptionsSchema
 });

package/dist/cjs/sdk/plugins/BasePlugin.js

@@ -21,6 +21,7 @@ __export(BasePlugin_exports, {
   BasePlugin: () => BasePlugin
 });
 module.exports = __toCommonJS(BasePlugin_exports);
+var import_core = require("../core/index.js");
 class BasePlugin {
   #sdk;
   logger;
@@ -43,19 +44,25 @@ class BasePlugin {
    **/
   get sdk() {
     if (!this.#sdk) {
-      throw new Error("SDK is not attached");
+      throw new import_core.SdkNotAttachedError();
     }
     return this.#sdk;
   }
+  /**
+   * @internal
+   * Set the SDK instance. Called by the SDK constructor.
+   * @param sdk - The SDK instance.
+   * @throws Error if the SDK is already attached.
+   */
   set sdk(sdk) {
     if (this.#sdk) {
-      throw new Error("SDK is already attached");
+      throw new import_core.SdkAlreadyAttachedError();
     }
     this.#sdk = sdk;
     this.logger = sdk.logger?.child?.({ name: this.constructor.name }) ?? sdk.logger;
   }
   /**
-   * {@inheritDoc IGearboxSDKPlugin.attach}
+   * {@inheritDoc IOnchainSDKPlugin.attach}
    **/
   async attach() {
     if (this.loadOnAttach) {
@@ -63,7 +70,7 @@ class BasePlugin {
     }
   }
   /**
-   * {@inheritDoc IGearboxSDKPlugin.syncState}
+   * {@inheritDoc IOnchainSDKPlugin.syncState}
    **/
   async syncState() {
     await this.load(false);

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

@@ -22,7 +22,6 @@ __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");
@@ -31,73 +30,28 @@ var import_constants = require("../constants/index.js");
 var import_utils = require("../utils/index.js");
 class PoolService extends import_base.SDKConstruct {
   /**
-   * {@inheritDoc IPoolsService.getDepositTokensIn}
+   * @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}
+   * @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}
+   * @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.addr,
-            permissible: false,
-            type: "kyc-on-demand"
-          };
-      }
-    }
     return this.#depositMetadata("classic", pool, tokenIn, tokenOut, true);
   }
   /**
-   * {@inheritDoc IPoolsService.addLiquidity}
+   * @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_utils.hexEq)(zapper.tokenIn.addr, import_constants.NATIVE_ADDRESS)) {
       return {
@@ -137,51 +91,22 @@ class PoolService extends import_base.SDKConstruct {
     }
   }
   /**
-   * {@inheritDoc IPoolsService.getWithdrawalTokensIn}
+   * @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}
+   * @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}
+   * @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,
@@ -210,30 +135,9 @@ class PoolService extends import_base.SDKConstruct {
     };
   }
   /**
-   * {@inheritDoc IPoolsService.getWithdrawalMetadata}
+   * @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);
   }
   /**
@@ -393,6 +297,8 @@ class PoolService extends import_base.SDKConstruct {
       zapper,
       // Approval target is zapper when routed, otherwise the pool contract.
       approveTarget: zapper?.baseParams.addr ?? pool.pool.address,
+      // TODO: instead of permissible, return permitType depending on tokenIn
+      // "none" | "eip2612" | "dai_like";
       permissible: !!zapper && !(0, import_utils.hexEq)(tokenIn, import_constants.NATIVE_ADDRESS),
       type
     };
@@ -420,6 +326,8 @@ class PoolService extends import_base.SDKConstruct {
       zapper,
       // Approval target exists only for zapper-based withdrawals.
       approveTarget: zapper?.baseParams.addr,
+      // TODO: instead of permissible, return permitType depending on tokenIn
+      // "none" | "eip2612" | "dai_like";
       permissible: !!zapper,
       type
     };

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

@@ -1,9 +1,7 @@
 "use strict";
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -17,14 +15,6 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var formatter_exports = {};
 __export(formatter_exports, {
@@ -47,7 +37,6 @@ __export(formatter_exports, {
 });
 module.exports = __toCommonJS(formatter_exports);
 var import_date_fns = require("date-fns");
-var import_decimal = __toESM(require("decimal.js-light"));
 var import_constants = require("../constants/index.js");
 const toBigInt = (v) => {
   const value = typeof v === "object" && v.type === "BigNumber" ? v.hex : v.toString();
@@ -151,17 +140,22 @@ function formatTimestamp(timestamp, raw = true) {
 function rayToNumber(num) {
   return Number(toBigInt(num) / 10n ** 21n) / 1e6;
 }
-function toSignificant(num, decimals, precision = 6) {
-  if (num === 1n) return "0";
-  const divider = new import_decimal.default(10).toPower(decimals);
-  const number = new import_decimal.default(num.toString()).div(divider);
-  return number.toSignificantDigits(precision, 4).toString();
-}
 function toBN(num, decimals) {
   if (num === "") return 0n;
-  const multiplier = new import_decimal.default(10).toPower(decimals);
-  const number = new import_decimal.default(num).mul(multiplier);
-  return BigInt(number.toFixed(0));
+  const negative = num.startsWith("-");
+  const abs = negative ? num.slice(1) : num;
+  const [intPart = "0", fracPart = ""] = abs.split(".");
+  let frac = fracPart;
+  let roundUp = false;
+  if (frac.length > decimals) {
+    roundUp = frac.charCodeAt(decimals) >= 53;
+    frac = frac.slice(0, decimals);
+  } else {
+    frac = frac.padEnd(decimals, "0");
+  }
+  let result = BigInt(intPart + frac);
+  if (roundUp) result += 1n;
+  return negative ? -result : result;
 }
 function shortAddress(address) {
   return address === void 0 ? "" : `${address.slice(0, 6)}...${address.slice(address.length - 4)}`;
@@ -175,6 +169,91 @@ function formatPercentage(healthFactor, decimals = 2) {
 function formatLeverage(leverage, decimals = 2) {
   return (leverage / Number(import_constants.LEVERAGE_DECIMALS)).toFixed(decimals);
 }
+function formatDecimalJsLikeToString(digits, base10exp) {
+  const len = digits.length;
+  const isExp = base10exp <= -7 || base10exp >= 21;
+  if (isExp) {
+    let coeff = digits;
+    if (len > 1) {
+      coeff = `${digits[0]}.${digits.slice(1)}`;
+    }
+    const exp = base10exp;
+    const expStr = exp < 0 ? `e${exp}` : `e+${exp}`;
+    return `${coeff}${expStr}`;
+  }
+  if (base10exp < 0) {
+    return `0.${"0".repeat(-base10exp - 1)}${digits}`;
+  }
+  if (base10exp >= len) {
+    return `${digits}${"0".repeat(base10exp + 1 - len)}`;
+  }
+  const k = base10exp + 1;
+  if (k === len) return digits;
+  return `${digits.slice(0, k)}.${digits.slice(k)}`;
+}
+function roundToSignificantDigitsHalfUp(digits, base10exp, precision) {
+  if (precision < 1) {
+    throw new Error(`Invalid precision: ${precision}`);
+  }
+  if (digits === "0") return { digits: "0", base10exp: 0 };
+  let norm = digits;
+  while (norm.length > 1 && norm.endsWith("0")) {
+    norm = norm.slice(0, -1);
+  }
+  digits = norm;
+  if (digits.length <= precision) {
+    return { digits, base10exp };
+  }
+  const cut = digits.slice(0, precision).split("");
+  const next = digits.charCodeAt(precision) - 48;
+  if (next >= 5) {
+    let i = cut.length - 1;
+    while (i >= 0) {
+      const cur = cut[i];
+      if (cur === void 0) {
+        throw new Error("roundToSignificantDigitsHalfUp: invalid state");
+      }
+      const d = cur.charCodeAt(0) - 48;
+      if (d !== 9) {
+        cut[i] = String.fromCharCode(48 + d + 1);
+        break;
+      }
+      cut[i] = "0";
+      i -= 1;
+    }
+    if (i < 0) {
+      cut.unshift("1");
+      base10exp += 1;
+    }
+  }
+  let rounded = cut.join("");
+  let tz = 0;
+  for (let i = rounded.length - 1; i >= 0 && rounded[i] === "0"; i -= 1) {
+    tz += 1;
+  }
+  if (tz > 0) {
+    rounded = rounded.slice(0, -tz);
+  }
+  if (rounded === "") {
+    return { digits: "0", base10exp: 0 };
+  }
+  return { digits: rounded, base10exp };
+}
+function toSignificant(num, decimals, precision = 6) {
+  if (num === 1n) return "0";
+  if (num === 0n) return "0";
+  const negative = num < 0n;
+  const abs = negative ? -num : num;
+  const rawDigits = abs.toString();
+  const base10exp = rawDigits.length - decimals - 1;
+  const rounded = roundToSignificantDigitsHalfUp(
+    rawDigits,
+    base10exp,
+    precision
+  );
+  const body = formatDecimalJsLikeToString(rounded.digits, rounded.base10exp);
+  return negative ? `-${body}` : body;
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   fmtBinaryMask,

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

@@ -16,19 +16,19 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var viem_exports = {};
 module.exports = __toCommonJS(viem_exports);
 __reExport(viem_exports, require("./cast.js"), module.exports);
-__reExport(viem_exports, require("./executeDelegatedMulticalls.js"), module.exports);
 __reExport(viem_exports, require("./getLogsPaginated.js"), module.exports);
 __reExport(viem_exports, require("./getLogsSafe.js"), module.exports);
 __reExport(viem_exports, require("./sendRawTx.js"), module.exports);
 __reExport(viem_exports, require("./simulateMulticall.js"), module.exports);
 __reExport(viem_exports, require("./simulateWithPriceUpdates.js"), module.exports);
+__reExport(viem_exports, require("./watchBlocksAsync.js"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ...require("./cast.js"),
-  ...require("./executeDelegatedMulticalls.js"),
   ...require("./getLogsPaginated.js"),
   ...require("./getLogsSafe.js"),
   ...require("./sendRawTx.js"),
   ...require("./simulateMulticall.js"),
-  ...require("./simulateWithPriceUpdates.js")
+  ...require("./simulateWithPriceUpdates.js"),
+  ...require("./watchBlocksAsync.js")
 });

package/dist/cjs/sdk/utils/viem/watchBlocksAsync.js

@@ -0,0 +1,76 @@
+"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 watchBlocksAsync_exports = {};
+__export(watchBlocksAsync_exports, {
+  watchBlocksAsync: () => watchBlocksAsync
+});
+module.exports = __toCommonJS(watchBlocksAsync_exports);
+var import_actions = require("viem/actions");
+var import_utils = require("viem/utils");
+function watchBlocksAsync(client, parameters) {
+  const {
+    onBlock,
+    onError,
+    onDrop,
+    pollingInterval = client.pollingInterval
+  } = parameters;
+  let active = true;
+  let busy = false;
+  let prevBlock;
+  const poll = async () => {
+    if (!active) return;
+    let block;
+    try {
+      block = await (0, import_utils.getAction)(
+        client,
+        import_actions.getBlock,
+        "getBlock"
+      )({});
+    } catch (err) {
+      onError?.(err);
+      return;
+    }
+    if (!active) return;
+    if (block.number !== null && prevBlock?.number != null && block.number <= prevBlock.number) {
+      return;
+    }
+    if (busy) {
+      onDrop?.(block);
+      return;
+    }
+    busy = true;
+    try {
+      await onBlock(block, prevBlock);
+      prevBlock = block;
+    } catch (err) {
+      onError?.(err);
+    } finally {
+      busy = false;
+    }
+  };
+  const timer = setInterval(poll, pollingInterval);
+  return () => {
+    active = false;
+    clearInterval(timer);
+  };
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  watchBlocksAsync
+});

package/dist/esm/dev/AccountOpener.js

@@ -6,7 +6,7 @@ import {
   parseEventLogs
 } from "viem";
 import { generatePrivateKey, privateKeyToAccount } from "viem/accounts";
-import { iCreditFacadeV310Abi } from "../abi/310/generated.js";
+import { iCreditFacadeV310Abi, iPoolV310Abi } from "../abi/310/generated.js";
 import { ierc20Abi } from "../abi/iERC20.js";
 import {
   ADDRESS_0X0,
@@ -15,7 +15,6 @@ import {
   childLogger,
   MAX_UINT256,
   PERCENTAGE_FACTOR,
-  PoolService,
   SDKConstruct,
   sendRawTx
 } from "../sdk/index.js";
@@ -44,7 +43,6 @@ class AccountOpener extends SDKConstruct {
   #minDebtMultiplier;
   #allowMint;
   #leverageDelta;
-  #poolService;
   constructor(service, options_ = {}) {
     super(service.sdk);
     const {
@@ -70,7 +68,6 @@ class AccountOpener extends SDKConstruct {
     this.#poolDepositMultiplier = BigInt(poolDepositMultiplier);
     this.#minDebtMultiplier = BigInt(minDebtMultiplier);
     this.#leverageDelta = BigInt(leverageDelta);
-    this.#poolService = new PoolService(service.sdk);
     this.#logger?.info(
       {
         borrower: privateKeyToAccount(this.borrowerKey).address,
@@ -108,10 +105,6 @@ class AccountOpener extends SDKConstruct {
       },
       "opening credit accounts"
     );
-    await Promise.all([
-      this.sdk.tokensMeta.loadTokenData(),
-      this.sdk.marketRegister.loadZappers()
-    ]);
     let deposits = [];
     if (depositIntoPools) {
       try {
@@ -463,34 +456,9 @@ class AccountOpener extends SDKConstruct {
       this.#logger?.debug(
         `depositor balance in underlying: ${this.sdk.tokensMeta.formatBN(pool.underlying, allowance, { symbol: true })}`
       );
-      const tokensOut = this.#poolService.getDepositTokensOut(
-        address,
-        underlying
-      );
-      this.#logger?.debug(
-        { tokensOut: tokensOut.map((t) => this.labelAddress(t)) },
-        "deposit tokens out"
-      );
-      if (tokensOut.length === 0) {
-        throw new Error(`no tokens out found for pool ${poolName}`);
-      }
-      const tokenOut = tokensOut[0];
-      const metadata = this.#poolService.getDepositMetadata(
-        address,
-        underlying,
-        tokenOut
-      );
-      this.logger?.debug(
-        {
-          underlying: this.labelAddress(underlying),
-          tokenOut: this.labelAddress(tokenOut),
-          ...metadata
-        },
-        "pool deposit metadata"
-      );
       txHash = await this.#anvil.writeContract({
         account: depositor,
-        address: metadata.approveTarget,
+        address: underlying,
         abi: ierc20Abi,
         functionName: "approve",
         args: [address, allowance],
@@ -507,21 +475,12 @@ class AccountOpener extends SDKConstruct {
       this.#logger?.debug(
         `depositor approved underlying for pool ${poolName}: ${txHash}`
       );
-      const depositCall = this.#poolService.addLiquidity({
-        collateral: { token: underlying, balance: amount },
-        pool: address,
-        wallet: depositor.address,
-        meta: metadata
-      });
-      if (!depositCall) {
-        throw new Error(`no deposit call could be created for ${poolName}`);
-      }
       txHash = await this.#anvil.writeContract({
         account: depositor,
-        address: depositCall.target,
-        abi: depositCall.abi,
-        functionName: depositCall.functionName,
-        args: depositCall.args,
+        address,
+        abi: iPoolV310Abi,
+        functionName: "deposit",
+        args: [amount, depositor.address],
         chain: this.#anvil.chain
       });
       receipt = await this.#anvil.waitForTransactionReceipt({ hash: txHash });