@gearbox-protocol/sdk 3.0.0-vfour.375 → 3.0.0-vfour.377

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/cjs/sdk/chain/chains.js

@@ -61,9 +61,7 @@ const chains = {
       ...import_chains.mainnet,
       network: "Mainnet",
       defaultMarketConfigurators: {
-        "0x354fe9f450F60b8547f88BE042E4A45b46128a06": "Chaos Labs"
-      },
-      testMarketConfigurators: {
+        "0x354fe9f450F60b8547f88BE042E4A45b46128a06": "Chaos Labs",
         "0x4d427D418342d8CE89a7634c3a402851978B680A": "K3"
       },
       isPublic: true,

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/esm/sdk/chain/chains.js

@@ -42,9 +42,7 @@ const chains = {
       ...mainnet,
       network: "Mainnet",
       defaultMarketConfigurators: {
-        "0x354fe9f450F60b8547f88BE042E4A45b46128a06": "Chaos Labs"
-      },
-      testMarketConfigurators: {
+        "0x354fe9f450F60b8547f88BE042E4A45b46128a06": "Chaos Labs",
         "0x4d427D418342d8CE89a7634c3a402851978B680A": "K3"
       },
       isPublic: true,

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.375",
+  "version": "3.0.0-vfour.377",
   "description": "Gearbox SDK",
   "license": "MIT",
   "main": "./dist/cjs/sdk/index.js",