@gearbox-protocol/sdk 3.0.0-vfour.376 → 3.0.0-vfour.378

package/dist/cjs/dev/AccountOpener.js

@@ -104,7 +104,7 @@ class AccountOpener extends import_sdk.SDKConstruct {
     return results;
   }
   async #openAccount(input, index, total) {
-    const { creditManager, collateral } = input;
+    const { creditManager, target: collateral } = input;
     const cm = this.sdk.marketRegister.findCreditManager(creditManager);
     const symbol = this.sdk.tokensMeta.symbol(collateral);
     const logger = this.#logger?.child?.({
@@ -167,16 +167,16 @@ class AccountOpener extends import_sdk.SDKConstruct {
   async prepareOpen(input) {
     const {
       creditManager,
-      collateral,
+      target,
       leverage = DEFAULT_LEVERAGE,
       slippage = 50
     } = input;
     const borrower = await this.#getBorrower();
     const cm = this.sdk.marketRegister.findCreditManager(creditManager);
-    const symbol = this.sdk.tokensMeta.symbol(collateral);
+    const symbol = this.sdk.tokensMeta.symbol(target);
     const logger = this.#logger?.child?.({
       creditManager: cm.name,
-      collateral: symbol
+      target: symbol
     });
     const { minDebt, underlying } = cm.creditFacade;
     const expectedBalances = [];
@@ -198,19 +198,19 @@ class AccountOpener extends import_sdk.SDKConstruct {
       expectedBalances,
       leftoverBalances,
       slippage,
-      target: collateral
+      target
     });
     logger?.debug(strategy, "found open strategy");
     const debt = minDebt * BigInt(leverage - 1);
     const averageQuota = this.#getCollateralQuota(
       cm,
-      collateral,
+      target,
       strategy.amount,
       debt
     );
     const minQuota = this.#getCollateralQuota(
       cm,
-      collateral,
+      target,
       strategy.minAmount,
       debt
     );

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

@@ -716,6 +716,8 @@ class CreditAccountsService extends import_base.SDKConstruct {
   }
   /**
    * Returns raw txs that are needed to update all price feeds so that all credit accounts (possibly from different markets) compute
+   *
+   * This can be used by batch liquidator
    * @param accounts
    * @returns
    */
@@ -744,19 +746,11 @@ class CreditAccountsService extends import_base.SDKConstruct {
     return this.sdk.priceFeeds.generatePriceFeedsUpdateTxs(priceFeeds);
   }
   async getUpdateForAccount(creditManager, creditAccount, desiredQuotas) {
-    const tokensByPool = /* @__PURE__ */ new Map();
-    const oracleByPool = /* @__PURE__ */ new Map();
     const quotaRecord = desiredQuotas ? (0, import_router.assetsMap)(desiredQuotas) : desiredQuotas;
     const caBalancesRecord = creditAccount ? (0, import_router.assetsMap)(creditAccount.tokens) : creditAccount;
     const market = this.sdk.marketRegister.findByCreditManager(creditManager);
     const cm = this.sdk.marketRegister.findCreditManager(creditManager).creditManager;
-    const pool = market.pool.pool.address;
-    oracleByPool.set(pool, market.priceOracle);
-    const insertToken = (p, t) => {
-      const tokens = tokensByPool.get(p) ?? /* @__PURE__ */ new Set();
-      tokens.add(t);
-      tokensByPool.set(pool, tokens);
-    };
+    const tokens = /* @__PURE__ */ new Set([(0, import_viem.getAddress)(cm.underlying)]);
     for (const t of cm.collateralTokens) {
       if (creditAccount && caBalancesRecord && quotaRecord) {
         const balanceAsset = caBalancesRecord.get(t);
@@ -765,28 +759,30 @@ class CreditAccountsService extends import_base.SDKConstruct {
         const isEnabled = (mask & creditAccount.enabledTokensMask) !== 0n;
         const quotaAsset = quotaRecord.get(t);
         const quotaBalance = quotaAsset?.balance || 0n;
-        if (balance > 10n && isEnabled || quotaBalance > 0)
-          insertToken(pool, t);
+        if (balance > 10n && isEnabled || quotaBalance > 0) {
+          tokens.add((0, import_viem.getAddress)(t));
+        }
       } else if (creditAccount && caBalancesRecord) {
         const balanceAsset = caBalancesRecord.get(t);
         const balance = balanceAsset?.balance || 0n;
         const mask = balanceAsset?.mask || 0n;
         const isEnabled = (mask & creditAccount.enabledTokensMask) !== 0n;
-        if (balance > 10n && isEnabled) insertToken(pool, t);
+        if (balance > 10n && isEnabled) {
+          tokens.add((0, import_viem.getAddress)(t));
+        }
       } else if (quotaRecord) {
         const quotaAsset = quotaRecord.get(t);
         const quotaBalance = quotaAsset?.balance || 0n;
-        if (quotaBalance > 0) insertToken(pool, t);
+        if (quotaBalance > 0) {
+          tokens.add((0, import_viem.getAddress)(t));
+        }
       }
     }
-    const priceFeeds = [];
-    for (const [pool2, oracle] of oracleByPool.entries()) {
-      const tokens = Array.from(tokensByPool.get(pool2) ?? []);
-      priceFeeds.push(...oracle.priceFeedsForTokens(tokens));
-    }
+    const priceFeeds = market.priceOracle.priceFeedsForTokens(Array.from(tokens));
+    const tStr = Array.from(tokens).map((t) => this.labelAddress(t)).join(", ");
     this.#logger?.debug(
       { account: creditAccount?.creditAccount, manager: cm.name },
-      `generating price feed updates for ${priceFeeds.length} price feeds`
+      `generating price feed updates for ${tStr} from ${priceFeeds.length} price feeds`
     );
     return this.sdk.priceFeeds.generatePriceFeedsUpdateTxs(
       priceFeeds,

package/dist/esm/dev/AccountOpener.js

@@ -90,7 +90,7 @@ class AccountOpener extends SDKConstruct {
     return results;
   }
   async #openAccount(input, index, total) {
-    const { creditManager, collateral } = input;
+    const { creditManager, target: collateral } = input;
     const cm = this.sdk.marketRegister.findCreditManager(creditManager);
     const symbol = this.sdk.tokensMeta.symbol(collateral);
     const logger = this.#logger?.child?.({
@@ -153,16 +153,16 @@ class AccountOpener extends SDKConstruct {
   async prepareOpen(input) {
     const {
       creditManager,
-      collateral,
+      target,
       leverage = DEFAULT_LEVERAGE,
       slippage = 50
     } = input;
     const borrower = await this.#getBorrower();
     const cm = this.sdk.marketRegister.findCreditManager(creditManager);
-    const symbol = this.sdk.tokensMeta.symbol(collateral);
+    const symbol = this.sdk.tokensMeta.symbol(target);
     const logger = this.#logger?.child?.({
       creditManager: cm.name,
-      collateral: symbol
+      target: symbol
     });
     const { minDebt, underlying } = cm.creditFacade;
     const expectedBalances = [];
@@ -184,19 +184,19 @@ class AccountOpener extends SDKConstruct {
       expectedBalances,
       leftoverBalances,
       slippage,
-      target: collateral
+      target
     });
     logger?.debug(strategy, "found open strategy");
     const debt = minDebt * BigInt(leverage - 1);
     const averageQuota = this.#getCollateralQuota(
       cm,
-      collateral,
+      target,
       strategy.amount,
       debt
     );
     const minQuota = this.#getCollateralQuota(
       cm,
-      collateral,
+      target,
       strategy.minAmount,
       debt
     );

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

@@ -1,4 +1,4 @@
-import { encodeFunctionData } from "viem";
+import { encodeFunctionData, getAddress } from "viem";
 import {
   iCreditAccountCompressorAbi,
   iPeripheryCompressorAbi,
@@ -720,6 +720,8 @@ class CreditAccountsService extends SDKConstruct {
   }
   /**
    * Returns raw txs that are needed to update all price feeds so that all credit accounts (possibly from different markets) compute
+   *
+   * This can be used by batch liquidator
    * @param accounts
    * @returns
    */
@@ -748,19 +750,11 @@ class CreditAccountsService extends SDKConstruct {
     return this.sdk.priceFeeds.generatePriceFeedsUpdateTxs(priceFeeds);
   }
   async getUpdateForAccount(creditManager, creditAccount, desiredQuotas) {
-    const tokensByPool = /* @__PURE__ */ new Map();
-    const oracleByPool = /* @__PURE__ */ new Map();
     const quotaRecord = desiredQuotas ? assetsMap(desiredQuotas) : desiredQuotas;
     const caBalancesRecord = creditAccount ? assetsMap(creditAccount.tokens) : creditAccount;
     const market = this.sdk.marketRegister.findByCreditManager(creditManager);
     const cm = this.sdk.marketRegister.findCreditManager(creditManager).creditManager;
-    const pool = market.pool.pool.address;
-    oracleByPool.set(pool, market.priceOracle);
-    const insertToken = (p, t) => {
-      const tokens = tokensByPool.get(p) ?? /* @__PURE__ */ new Set();
-      tokens.add(t);
-      tokensByPool.set(pool, tokens);
-    };
+    const tokens = /* @__PURE__ */ new Set([getAddress(cm.underlying)]);
     for (const t of cm.collateralTokens) {
       if (creditAccount && caBalancesRecord && quotaRecord) {
         const balanceAsset = caBalancesRecord.get(t);
@@ -769,28 +763,30 @@ class CreditAccountsService extends SDKConstruct {
         const isEnabled = (mask & creditAccount.enabledTokensMask) !== 0n;
         const quotaAsset = quotaRecord.get(t);
         const quotaBalance = quotaAsset?.balance || 0n;
-        if (balance > 10n && isEnabled || quotaBalance > 0)
-          insertToken(pool, t);
+        if (balance > 10n && isEnabled || quotaBalance > 0) {
+          tokens.add(getAddress(t));
+        }
       } else if (creditAccount && caBalancesRecord) {
         const balanceAsset = caBalancesRecord.get(t);
         const balance = balanceAsset?.balance || 0n;
         const mask = balanceAsset?.mask || 0n;
         const isEnabled = (mask & creditAccount.enabledTokensMask) !== 0n;
-        if (balance > 10n && isEnabled) insertToken(pool, t);
+        if (balance > 10n && isEnabled) {
+          tokens.add(getAddress(t));
+        }
       } else if (quotaRecord) {
         const quotaAsset = quotaRecord.get(t);
         const quotaBalance = quotaAsset?.balance || 0n;
-        if (quotaBalance > 0) insertToken(pool, t);
+        if (quotaBalance > 0) {
+          tokens.add(getAddress(t));
+        }
       }
     }
-    const priceFeeds = [];
-    for (const [pool2, oracle] of oracleByPool.entries()) {
-      const tokens = Array.from(tokensByPool.get(pool2) ?? []);
-      priceFeeds.push(...oracle.priceFeedsForTokens(tokens));
-    }
+    const priceFeeds = market.priceOracle.priceFeedsForTokens(Array.from(tokens));
+    const tStr = Array.from(tokens).map((t) => this.labelAddress(t)).join(", ");
     this.#logger?.debug(
       { account: creditAccount?.creditAccount, manager: cm.name },
-      `generating price feed updates for ${priceFeeds.length} price feeds`
+      `generating price feed updates for ${tStr} from ${priceFeeds.length} price feeds`
     );
     return this.sdk.priceFeeds.generatePriceFeedsUpdateTxs(
       priceFeeds,

package/dist/types/dev/AccountOpener.d.ts

@@ -8,7 +8,18 @@ export interface AccountOpenerOptions {
 }
 export interface TargetAccount {
     creditManager: Address;
-    collateral: Address;
+    /**
+     * Everything will be swapped into this token in the end
+     */
+    target: Address;
+    /**
+     * This token will be provided as collateral, defaults to underlying token
+     * Expected to be found on borrower's address before opening the account
+     * Can be claimed from faucet
+     *
+     * TODO: not implemented
+     */
+    collateral?: Address;
     leverage?: number;
     slippage?: number;
 }

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

@@ -224,6 +224,8 @@ export declare class CreditAccountsService extends SDKConstruct {
     openCA({ ethAmount, creditManager, collateral, permits, debt, withdrawDebt, referralCode, to, calls: openPathCalls, minQuota, averageQuota, }: OpenCAProps): Promise<CreditAccountOperationResult>;
     /**
      * Returns raw txs that are needed to update all price feeds so that all credit accounts (possibly from different markets) compute
+     *
+     * This can be used by batch liquidator
      * @param accounts
      * @returns
      */

package/package.json

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