@gearbox-protocol/sdk 13.0.0-next.14 → 13.0.0-next.16

package/dist/cjs/dev/AccountOpener.js

@@ -475,6 +475,10 @@ class AccountOpener extends import_sdk.SDKConstruct {
         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}`);
       }
@@ -486,8 +490,8 @@ class AccountOpener extends import_sdk.SDKConstruct {
       );
       this.logger?.debug(
         {
-          underlying,
-          tokenOut,
+          underlying: this.labelAddress(underlying),
+          tokenOut: this.labelAddress(tokenOut),
           ...metadata
         },
         "pool deposit metadata"

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/cjs/sdk/base/TokensMeta.js

@@ -129,7 +129,7 @@ class TokensMeta extends import_utils.AddressMap {
       batchSize: 0
     });
     for (let i = 0; i < tokensToLoad.length; i++) {
-      this.#overrideTokenMeta(tokensToLoad[i], resp[i], resp[i + 1]);
+      this.#overrideTokenMeta(tokensToLoad[i], resp[2 * i], resp[2 * i + 1]);
       this.#tokenDataLoaded.add(tokensToLoad[i]);
     }
   }

package/dist/esm/dev/AccountOpener.js

@@ -467,6 +467,10 @@ class AccountOpener extends SDKConstruct {
         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}`);
       }
@@ -478,8 +482,8 @@ class AccountOpener extends SDKConstruct {
       );
       this.logger?.debug(
         {
-          underlying,
-          tokenOut,
+          underlying: this.labelAddress(underlying),
+          tokenOut: this.labelAddress(tokenOut),
           ...metadata
         },
         "pool deposit metadata"

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/esm/sdk/base/TokensMeta.js

@@ -112,7 +112,7 @@ class TokensMeta extends AddressMap {
       batchSize: 0
     });
     for (let i = 0; i < tokensToLoad.length; i++) {
-      this.#overrideTokenMeta(tokensToLoad[i], resp[i], resp[i + 1]);
+      this.#overrideTokenMeta(tokensToLoad[i], resp[2 * i], resp[2 * i + 1]);
       this.#tokenDataLoaded.add(tokensToLoad[i]);
     }
   }

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.14",
+  "version": "13.0.0-next.16",
   "description": "Gearbox SDK",
   "license": "MIT",
   "main": "./dist/cjs/sdk/index.js",