@gearbox-protocol/sdk 13.0.0-next.13 → 13.0.0-next.15

package/dist/cjs/dev/AccountOpener.js

@@ -52,6 +52,7 @@ class AccountOpener extends import_sdk.SDKConstruct {
   #minDebtMultiplier;
   #allowMint;
   #leverageDelta;
+  #poolService;
   constructor(service, options_ = {}) {
     super(service.sdk);
     const {
@@ -77,6 +78,7 @@ class AccountOpener extends import_sdk.SDKConstruct {
     this.#poolDepositMultiplier = BigInt(poolDepositMultiplier);
     this.#minDebtMultiplier = BigInt(minDebtMultiplier);
     this.#leverageDelta = BigInt(leverageDelta);
+    this.#poolService = new import_sdk.PoolService(service.sdk);
     this.#logger?.info(
       {
         borrower: (0, import_accounts.privateKeyToAccount)(this.borrowerKey).address,
@@ -114,6 +116,10 @@ class AccountOpener extends import_sdk.SDKConstruct {
       },
       "opening credit accounts"
     );
+    await Promise.all([
+      this.sdk.tokensMeta.loadTokenData(),
+      this.sdk.marketRegister.loadZappers()
+    ]);
     let deposits = [];
     if (depositIntoPools) {
       try {
@@ -465,9 +471,34 @@ class AccountOpener extends import_sdk.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: underlying,
+        address: metadata.approveTarget,
         abi: import_iERC20.ierc20Abi,
         functionName: "approve",
         args: [address, allowance],
@@ -484,12 +515,21 @@ class AccountOpener extends import_sdk.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,
-        abi: import_v300.iPoolV300Abi,
-        functionName: "deposit",
-        args: [amount, depositor.address],
+        address: depositCall.target,
+        abi: depositCall.abi,
+        functionName: depositCall.functionName,
+        args: depositCall.args,
         chain: this.#anvil.chain
       });
       receipt = await this.#anvil.waitForTransactionReceipt({ hash: txHash });

package/dist/cjs/sdk/accounts/AbstractCreditAccountsService.js

@@ -817,7 +817,7 @@ class AbstractCreditAccountService extends import_base.SDKConstruct {
     collateral,
     permits,
     debt,
-    withdrawDebt,
+    withdrawToken,
     referralCode,
     to,
     calls: openPathCalls,
@@ -826,6 +826,12 @@ class AbstractCreditAccountService extends import_base.SDKConstruct {
   }) {
     const cmSuite = this.sdk.marketRegister.findCreditManager(creditManager);
     const cm = cmSuite.creditManager;
+    let tokenToWithdraw;
+    if (withdrawToken === true) {
+      tokenToWithdraw = cm.underlying;
+    } else if (typeof withdrawToken === "string") {
+      tokenToWithdraw = withdrawToken;
+    }
     const priceUpdatesCalls = await this.getPriceUpdatesForFacade({
       creditManager: cm.address,
       desiredQuotas: averageQuota
@@ -835,7 +841,15 @@ class AbstractCreditAccountService extends import_base.SDKConstruct {
       this.#prepareIncreaseDebt(cm.creditFacade, debt),
       ...this.prepareAddCollateral(cm.creditFacade, collateral, permits),
       ...openPathCalls,
-      ...withdrawDebt ? [this.prepareWithdrawToken(cm.creditFacade, cm.underlying, debt, to)] : [],
+      // путь из underlying в withdrawal token
+      ...tokenToWithdraw ? [
+        this.prepareWithdrawToken(
+          cm.creditFacade,
+          tokenToWithdraw,
+          import_constants.MAX_UINT256,
+          to
+        )
+      ] : [],
       ...this.prepareUpdateQuotas(cm.creditFacade, {
         minQuota,
         averageQuota

package/dist/esm/dev/AccountOpener.js

@@ -7,7 +7,7 @@ import {
 } from "viem";
 import { generatePrivateKey, privateKeyToAccount } from "viem/accounts";
 import { ierc20Abi } from "../abi/iERC20.js";
-import { iCreditFacadeV300Abi, iPoolV300Abi } from "../abi/v300.js";
+import { iCreditFacadeV300Abi } from "../abi/v300.js";
 import {
   ADDRESS_0X0,
   AddressMap,
@@ -15,6 +15,7 @@ import {
   childLogger,
   MAX_UINT256,
   PERCENTAGE_FACTOR,
+  PoolService,
   SDKConstruct,
   sendRawTx
 } from "../sdk/index.js";
@@ -43,6 +44,7 @@ class AccountOpener extends SDKConstruct {
   #minDebtMultiplier;
   #allowMint;
   #leverageDelta;
+  #poolService;
   constructor(service, options_ = {}) {
     super(service.sdk);
     const {
@@ -68,6 +70,7 @@ 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,
@@ -105,6 +108,10 @@ class AccountOpener extends SDKConstruct {
       },
       "opening credit accounts"
     );
+    await Promise.all([
+      this.sdk.tokensMeta.loadTokenData(),
+      this.sdk.marketRegister.loadZappers()
+    ]);
     let deposits = [];
     if (depositIntoPools) {
       try {
@@ -456,9 +463,34 @@ 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: underlying,
+        address: metadata.approveTarget,
         abi: ierc20Abi,
         functionName: "approve",
         args: [address, allowance],
@@ -475,12 +507,21 @@ 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,
-        abi: iPoolV300Abi,
-        functionName: "deposit",
-        args: [amount, depositor.address],
+        address: depositCall.target,
+        abi: depositCall.abi,
+        functionName: depositCall.functionName,
+        args: depositCall.args,
         chain: this.#anvil.chain
       });
       receipt = await this.#anvil.waitForTransactionReceipt({ hash: txHash });

package/dist/esm/sdk/accounts/AbstractCreditAccountsService.js

@@ -809,7 +809,7 @@ class AbstractCreditAccountService extends SDKConstruct {
     collateral,
     permits,
     debt,
-    withdrawDebt,
+    withdrawToken,
     referralCode,
     to,
     calls: openPathCalls,
@@ -818,6 +818,12 @@ class AbstractCreditAccountService extends SDKConstruct {
   }) {
     const cmSuite = this.sdk.marketRegister.findCreditManager(creditManager);
     const cm = cmSuite.creditManager;
+    let tokenToWithdraw;
+    if (withdrawToken === true) {
+      tokenToWithdraw = cm.underlying;
+    } else if (typeof withdrawToken === "string") {
+      tokenToWithdraw = withdrawToken;
+    }
     const priceUpdatesCalls = await this.getPriceUpdatesForFacade({
       creditManager: cm.address,
       desiredQuotas: averageQuota
@@ -827,7 +833,15 @@ class AbstractCreditAccountService extends SDKConstruct {
       this.#prepareIncreaseDebt(cm.creditFacade, debt),
       ...this.prepareAddCollateral(cm.creditFacade, collateral, permits),
       ...openPathCalls,
-      ...withdrawDebt ? [this.prepareWithdrawToken(cm.creditFacade, cm.underlying, debt, to)] : [],
+      // путь из underlying в withdrawal token
+      ...tokenToWithdraw ? [
+        this.prepareWithdrawToken(
+          cm.creditFacade,
+          tokenToWithdraw,
+          MAX_UINT256,
+          to
+        )
+      ] : [],
       ...this.prepareUpdateQuotas(cm.creditFacade, {
         minQuota,
         averageQuota

package/dist/types/sdk/accounts/AbstractCreditAccountsService.d.ts

@@ -173,7 +173,7 @@ export declare abstract class AbstractCreditAccountService extends SDKConstruct
      * @param {Array<Asset>} minQuota - minimum quota for tokens after open  {@link Asset}
      * @returns All necessary data to execute the transaction (call, credit facade)
      */
-    openCA({ ethAmount, creditManager, collateral, permits, debt, withdrawDebt, referralCode, to, calls: openPathCalls, minQuota, averageQuota, }: OpenCAProps): Promise<CreditAccountOperationResult>;
+    openCA({ ethAmount, creditManager, collateral, permits, debt, withdrawToken, referralCode, to, calls: openPathCalls, minQuota, averageQuota, }: OpenCAProps): Promise<CreditAccountOperationResult>;
     /**
      * Returns borrow rate with 4 digits precision (10000 = 100%)
      * @param ca

package/dist/types/sdk/accounts/types.d.ts

@@ -275,8 +275,9 @@ export interface OpenCAProps extends PrepareUpdateQuotasProps {
     /**
      * Flag to withdraw debt to wallet after opening credit account;
      * used for borrowing functionality
+     * If true, will withdraw underlying token, otherwise will withdraw specified token
      */
-    withdrawDebt?: boolean;
+    withdrawToken?: boolean | Address;
     /**
      * Permits of collateral tokens (in any permittable token is present) {@link PermitResult}
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gearbox-protocol/sdk",
-  "version": "13.0.0-next.13",
+  "version": "13.0.0-next.15",
   "description": "Gearbox SDK",
   "license": "MIT",
   "main": "./dist/cjs/sdk/index.js",