@gearbox-protocol/sdk 4.1.6 → 4.1.8

package/dist/cjs/dev/AccountOpener.js

@@ -173,22 +173,32 @@ class AccountOpener extends import_sdk.SDKConstruct {
       target: symbol
     });
     const leverage = this.#getLeverage(input);
-    logger?.debug(`using leverage ${leverage}`);
     const { minDebt, underlying } = cm.creditFacade;
+    const expectedUnderlyingBalance = minDebt * leverage / import_sdk.PERCENTAGE_FACTOR;
     const expectedBalances = [];
     const leftoverBalances = [];
     for (const t of cm.creditManager.collateralTokens) {
       const token = t;
       expectedBalances.push({
         token,
-        balance: token === underlying ? BigInt(leverage) * minDebt / import_sdk.PERCENTAGE_FACTOR : 1n
+        balance: token === underlying ? expectedUnderlyingBalance : 1n
       });
       leftoverBalances.push({
         token,
         balance: 1n
       });
     }
-    logger?.debug("looking for open strategy");
+    logger?.debug(
+      {
+        minDebt: this.sdk.tokensMeta.formatBN(underlying, minDebt),
+        leverage: leverage.toString(),
+        expectedUnderlyingBalance: this.sdk.tokensMeta.formatBN(
+          underlying,
+          expectedUnderlyingBalance
+        )
+      },
+      "looking for open strategy"
+    );
     const strategy = await this.sdk.routerFor(cm).findOpenStrategyPath({
       creditManager: cm.creditManager,
       expectedBalances,
@@ -502,7 +512,7 @@ class AccountOpener extends import_sdk.SDKConstruct {
     });
     return acc;
   }
-  #getCollateralQuota(cm, collateral, amount, debt, logger) {
+  #getCollateralQuota(cm, collateral, collateralAmount, debt, logger) {
     const {
       underlying,
       creditManager: { liquidationThresholds }
@@ -522,6 +532,10 @@ class AccountOpener extends import_sdk.SDKConstruct {
         `quota exceeded for asset ${this.labelAddress(collateral)} in ${cm.name}`
       );
     }
+    const oracle = this.sdk.marketRegister.findByCreditManager(
+      cm.creditManager.address
+    ).priceOracle;
+    const amount = oracle.convert(collateral, underlying, collateralAmount);
     const desiredQuota = this.#calcQuota(amount, debt, collateralLT);
     logger?.debug(
       {
@@ -530,6 +544,10 @@ class AccountOpener extends import_sdk.SDKConstruct {
           underlying,
           availableQuota
         ),
+        collateralAmount: this.sdk.tokensMeta.formatBN(
+          collateral,
+          collateralAmount
+        ),
         amount: this.sdk.tokensMeta.formatBN(underlying, amount),
         debt: this.sdk.tokensMeta.formatBN(underlying, debt),
         lt: Number(collateralLT)

package/dist/esm/dev/AccountOpener.js

@@ -159,22 +159,32 @@ class AccountOpener extends SDKConstruct {
       target: symbol
     });
     const leverage = this.#getLeverage(input);
-    logger?.debug(`using leverage ${leverage}`);
     const { minDebt, underlying } = cm.creditFacade;
+    const expectedUnderlyingBalance = minDebt * leverage / PERCENTAGE_FACTOR;
     const expectedBalances = [];
     const leftoverBalances = [];
     for (const t of cm.creditManager.collateralTokens) {
       const token = t;
       expectedBalances.push({
         token,
-        balance: token === underlying ? BigInt(leverage) * minDebt / PERCENTAGE_FACTOR : 1n
+        balance: token === underlying ? expectedUnderlyingBalance : 1n
       });
       leftoverBalances.push({
         token,
         balance: 1n
       });
     }
-    logger?.debug("looking for open strategy");
+    logger?.debug(
+      {
+        minDebt: this.sdk.tokensMeta.formatBN(underlying, minDebt),
+        leverage: leverage.toString(),
+        expectedUnderlyingBalance: this.sdk.tokensMeta.formatBN(
+          underlying,
+          expectedUnderlyingBalance
+        )
+      },
+      "looking for open strategy"
+    );
     const strategy = await this.sdk.routerFor(cm).findOpenStrategyPath({
       creditManager: cm.creditManager,
       expectedBalances,
@@ -488,7 +498,7 @@ class AccountOpener extends SDKConstruct {
     });
     return acc;
   }
-  #getCollateralQuota(cm, collateral, amount, debt, logger) {
+  #getCollateralQuota(cm, collateral, collateralAmount, debt, logger) {
     const {
       underlying,
       creditManager: { liquidationThresholds }
@@ -508,6 +518,10 @@ class AccountOpener extends SDKConstruct {
         `quota exceeded for asset ${this.labelAddress(collateral)} in ${cm.name}`
       );
     }
+    const oracle = this.sdk.marketRegister.findByCreditManager(
+      cm.creditManager.address
+    ).priceOracle;
+    const amount = oracle.convert(collateral, underlying, collateralAmount);
     const desiredQuota = this.#calcQuota(amount, debt, collateralLT);
     logger?.debug(
       {
@@ -516,6 +530,10 @@ class AccountOpener extends SDKConstruct {
           underlying,
           availableQuota
         ),
+        collateralAmount: this.sdk.tokensMeta.formatBN(
+          collateral,
+          collateralAmount
+        ),
         amount: this.sdk.tokensMeta.formatBN(underlying, amount),
         debt: this.sdk.tokensMeta.formatBN(underlying, debt),
         lt: Number(collateralLT)

package/package.json

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