@gearbox-protocol/sdk 12.3.1 → 12.3.3

package/dist/cjs/plugins/degen-distributors/DegenDistributorsPlugin.js

@@ -22,6 +22,7 @@ __export(DegenDistributorsPlugin_exports, {
 });
 module.exports = __toCommonJS(DegenDistributorsPlugin_exports);
 var import_sdk = require("../../sdk/index.js");
+var import_MarketConfiguratorContract = require("../../sdk/market/MarketConfiguratorContract.js");
 const MAP_LABEL = "degenDistributors";
 class DegenDistributorsPlugin extends import_sdk.BasePlugin {
   #distributors;
@@ -39,12 +40,15 @@ class DegenDistributorsPlugin extends import_sdk.BasePlugin {
     this.sdk.logger?.debug(
       `loading degen distributors for ${this.sdk.networkType}`
     );
-    const distributors = await Promise.allSettled(
-      configurators.map((cfg) => cfg.getPeripheryContract("DEGEN_DISTRIBUTOR"))
+    const distributors = await import_MarketConfiguratorContract.MarketConfiguratorContract.getPeripheryContractBatch(
+      Object.values(configurators),
+      this.sdk.client,
+      "DEGEN_DISTRIBUTOR"
     );
     const distributorByConfigurator = configurators.reduce((acc, cfg, index) => {
       const cfgLC = cfg.address.toLowerCase();
-      acc[cfgLC] = distributors[index];
+      const distributor = distributors[index];
+      acc[cfgLC] = distributor;
       return acc;
     }, {});
     this.#distributors = new import_sdk.AddressMap(void 0, MAP_LABEL);
@@ -53,11 +57,13 @@ class DegenDistributorsPlugin extends import_sdk.BasePlugin {
       const cfg = m.configurator.address;
       const cfgLC = cfg.toLowerCase();
       const r = distributorByConfigurator?.[cfgLC];
-      if (r.status === "fulfilled") {
-        this.#distributors?.upsert(pool, r.value);
+      if (r.status === "success" && r.result.length > 0) {
+        this.#distributors?.upsert(pool, r.result[0]);
       } else {
         this.sdk.logger?.error(
-          `failed to load degen distributor for market configurator ${this.labelAddress(cfg)} and pool ${this.labelAddress(pool)}: ${r.reason}`
+          `failed to load degen distributor for market configurator ${this.labelAddress(
+            cfg
+          )} and pool ${this.labelAddress(pool)}: ${r.error}`
         );
       }
     });

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

@@ -212,9 +212,9 @@ class AbstractCreditAccountService extends import_base.SDKConstruct {
    * @returns call result of getConnectedBots for each credit account
    */
   async getConnectedBots(accountsToCheck, legacyMigrationBot, additionalBots) {
-    const [resp, migration, additional] = await Promise.all([
-      this.client.multicall({
-        contracts: accountsToCheck.map((o) => {
+    const allResp = await this.client.multicall({
+      contracts: [
+        ...accountsToCheck.map((o) => {
           const pool = this.sdk.marketRegister.findByCreditManager(
             o.creditManager
           );
@@ -225,32 +225,71 @@ class AbstractCreditAccountService extends import_base.SDKConstruct {
             args: [pool.configurator.address, o.creditAccount]
           };
         }),
-        allowFailure: true
-      }),
-      this.getActiveMigrationBots(accountsToCheck, legacyMigrationBot),
-      this.getActiveBots(accountsToCheck, additionalBots)
-    ]);
-    return {
-      legacy: resp,
-      additionalBots: additional,
-      legacyMigration: migration
-    };
-  }
-  async getActiveBots(accountsToCheck, bots) {
-    const result = await this.client.multicall({
-      contracts: accountsToCheck.flatMap((ca) => {
-        const cm = this.sdk.marketRegister.findCreditManager(ca.creditManager);
-        return bots.map((bot) => {
+        ...legacyMigrationBot ? accountsToCheck.map((ca) => {
+          const cm = this.sdk.marketRegister.findCreditManager(
+            ca.creditManager
+          );
           return {
             abi: (0, import_constants.isV300)(cm.creditFacade.version) ? import_v300.iBotListV300Abi : import_generated.iBotListV310Abi,
             address: cm.creditFacade.botList,
             functionName: "getBotStatus",
-            args: (0, import_constants.isV300)(cm.creditFacade.version) ? [bot, ca.creditManager, ca.creditAccount] : [bot, ca.creditAccount]
+            args: (0, import_constants.isV300)(cm.creditFacade.version) ? [legacyMigrationBot, ca.creditManager, ca.creditAccount] : [legacyMigrationBot, ca.creditAccount]
           };
-        });
-      }),
+        }) : [],
+        ...accountsToCheck.flatMap((ca) => {
+          const cm = this.sdk.marketRegister.findCreditManager(
+            ca.creditManager
+          );
+          return additionalBots.map((bot) => {
+            return {
+              abi: (0, import_constants.isV300)(cm.creditFacade.version) ? import_v300.iBotListV300Abi : import_generated.iBotListV310Abi,
+              address: cm.creditFacade.botList,
+              functionName: "getBotStatus",
+              args: (0, import_constants.isV300)(cm.creditFacade.version) ? [bot, ca.creditManager, ca.creditAccount] : [bot, ca.creditAccount]
+            };
+          });
+        })
+      ],
       allowFailure: true
     });
+    const legacyStart = 0;
+    const legacyEnd = accountsToCheck.length;
+    const legacy = allResp.slice(
+      legacyStart,
+      legacyEnd
+    );
+    const migrationStart = legacyEnd;
+    const migrationEnd = legacyMigrationBot ? migrationStart + accountsToCheck.length : migrationStart;
+    const migrationResp = allResp.slice(
+      migrationStart,
+      migrationEnd
+    );
+    const additionalStart = migrationEnd;
+    const additionalResp = allResp.slice(
+      additionalStart
+    );
+    return {
+      legacy,
+      additionalBots: this.getActiveBots(
+        accountsToCheck,
+        additionalBots,
+        additionalResp
+      ),
+      legacyMigration: this.getActiveMigrationBots(
+        accountsToCheck,
+        legacyMigrationBot,
+        migrationResp
+      )
+    };
+  }
+  getActiveBots(accountsToCheck, bots, result) {
+    if (result.length !== bots.length * accountsToCheck.length) {
+      console.error(
+        "result length mismatch",
+        result.length,
+        bots.length * accountsToCheck.length
+      );
+    }
     const botsByCAIndex = accountsToCheck.reduce((acc, _, index) => {
       const r = result.slice(index * bots.length, (index + 1) * bots.length);
       acc.push({
@@ -260,22 +299,15 @@ class AbstractCreditAccountService extends import_base.SDKConstruct {
     }, []);
     return botsByCAIndex;
   }
-  async getActiveMigrationBots(accountsToCheck, bot) {
+  getActiveMigrationBots(accountsToCheck, bot, result) {
     if (bot) {
-      const result = await this.client.multicall({
-        contracts: accountsToCheck.map((ca) => {
-          const cm = this.sdk.marketRegister.findCreditManager(
-            ca.creditManager
-          );
-          return {
-            abi: (0, import_constants.isV300)(cm.creditFacade.version) ? import_v300.iBotListV300Abi : import_generated.iBotListV310Abi,
-            address: cm.creditFacade.botList,
-            functionName: "getBotStatus",
-            args: (0, import_constants.isV300)(cm.creditFacade.version) ? [bot, ca.creditManager, ca.creditAccount] : [bot, ca.creditAccount]
-          };
-        }),
-        allowFailure: true
-      });
+      if (result.length !== accountsToCheck.length) {
+        console.error(
+          "result length mismatch for migration bots",
+          result.length,
+          accountsToCheck.length
+        );
+      }
       return { result, botAddress: bot };
     }
     return void 0;

package/dist/cjs/sdk/market/MarketConfiguratorContract.js

@@ -47,6 +47,20 @@ class MarketConfiguratorContract extends import_base.BaseContract {
       `Market configurator ${this.#curatorName}`
     );
   }
+  static async getPeripheryContractBatch(configurators, client, contract) {
+    const resp = await client.multicall({
+      allowFailure: true,
+      contracts: configurators.map(
+        (cfg) => ({
+          address: cfg.address,
+          abi: cfg.abi,
+          functionName: "getPeripheryContracts",
+          args: [(0, import_viem.stringToHex)(contract, { size: 32 })]
+        })
+      )
+    });
+    return resp;
+  }
   async getPeripheryContract(contract) {
     const resp = await this.client.readContract({
       address: this.address,

package/dist/esm/plugins/degen-distributors/DegenDistributorsPlugin.js

@@ -1,4 +1,5 @@
 import { AddressMap, BasePlugin } from "../../sdk/index.js";
+import { MarketConfiguratorContract } from "../../sdk/market/MarketConfiguratorContract.js";
 const MAP_LABEL = "degenDistributors";
 class DegenDistributorsPlugin extends BasePlugin {
   #distributors;
@@ -16,12 +17,15 @@ class DegenDistributorsPlugin extends BasePlugin {
     this.sdk.logger?.debug(
       `loading degen distributors for ${this.sdk.networkType}`
     );
-    const distributors = await Promise.allSettled(
-      configurators.map((cfg) => cfg.getPeripheryContract("DEGEN_DISTRIBUTOR"))
+    const distributors = await MarketConfiguratorContract.getPeripheryContractBatch(
+      Object.values(configurators),
+      this.sdk.client,
+      "DEGEN_DISTRIBUTOR"
     );
     const distributorByConfigurator = configurators.reduce((acc, cfg, index) => {
       const cfgLC = cfg.address.toLowerCase();
-      acc[cfgLC] = distributors[index];
+      const distributor = distributors[index];
+      acc[cfgLC] = distributor;
       return acc;
     }, {});
     this.#distributors = new AddressMap(void 0, MAP_LABEL);
@@ -30,11 +34,13 @@ class DegenDistributorsPlugin extends BasePlugin {
       const cfg = m.configurator.address;
       const cfgLC = cfg.toLowerCase();
       const r = distributorByConfigurator?.[cfgLC];
-      if (r.status === "fulfilled") {
-        this.#distributors?.upsert(pool, r.value);
+      if (r.status === "success" && r.result.length > 0) {
+        this.#distributors?.upsert(pool, r.result[0]);
       } else {
         this.sdk.logger?.error(
-          `failed to load degen distributor for market configurator ${this.labelAddress(cfg)} and pool ${this.labelAddress(pool)}: ${r.reason}`
+          `failed to load degen distributor for market configurator ${this.labelAddress(
+            cfg
+          )} and pool ${this.labelAddress(pool)}: ${r.error}`
         );
       }
     });

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

@@ -202,9 +202,9 @@ class AbstractCreditAccountService extends SDKConstruct {
    * @returns call result of getConnectedBots for each credit account
    */
   async getConnectedBots(accountsToCheck, legacyMigrationBot, additionalBots) {
-    const [resp, migration, additional] = await Promise.all([
-      this.client.multicall({
-        contracts: accountsToCheck.map((o) => {
+    const allResp = await this.client.multicall({
+      contracts: [
+        ...accountsToCheck.map((o) => {
           const pool = this.sdk.marketRegister.findByCreditManager(
             o.creditManager
           );
@@ -215,32 +215,71 @@ class AbstractCreditAccountService extends SDKConstruct {
             args: [pool.configurator.address, o.creditAccount]
           };
         }),
-        allowFailure: true
-      }),
-      this.getActiveMigrationBots(accountsToCheck, legacyMigrationBot),
-      this.getActiveBots(accountsToCheck, additionalBots)
-    ]);
-    return {
-      legacy: resp,
-      additionalBots: additional,
-      legacyMigration: migration
-    };
-  }
-  async getActiveBots(accountsToCheck, bots) {
-    const result = await this.client.multicall({
-      contracts: accountsToCheck.flatMap((ca) => {
-        const cm = this.sdk.marketRegister.findCreditManager(ca.creditManager);
-        return bots.map((bot) => {
+        ...legacyMigrationBot ? accountsToCheck.map((ca) => {
+          const cm = this.sdk.marketRegister.findCreditManager(
+            ca.creditManager
+          );
           return {
             abi: isV300(cm.creditFacade.version) ? iBotListV300Abi : iBotListV310Abi,
             address: cm.creditFacade.botList,
             functionName: "getBotStatus",
-            args: isV300(cm.creditFacade.version) ? [bot, ca.creditManager, ca.creditAccount] : [bot, ca.creditAccount]
+            args: isV300(cm.creditFacade.version) ? [legacyMigrationBot, ca.creditManager, ca.creditAccount] : [legacyMigrationBot, ca.creditAccount]
           };
-        });
-      }),
+        }) : [],
+        ...accountsToCheck.flatMap((ca) => {
+          const cm = this.sdk.marketRegister.findCreditManager(
+            ca.creditManager
+          );
+          return additionalBots.map((bot) => {
+            return {
+              abi: isV300(cm.creditFacade.version) ? iBotListV300Abi : iBotListV310Abi,
+              address: cm.creditFacade.botList,
+              functionName: "getBotStatus",
+              args: isV300(cm.creditFacade.version) ? [bot, ca.creditManager, ca.creditAccount] : [bot, ca.creditAccount]
+            };
+          });
+        })
+      ],
       allowFailure: true
     });
+    const legacyStart = 0;
+    const legacyEnd = accountsToCheck.length;
+    const legacy = allResp.slice(
+      legacyStart,
+      legacyEnd
+    );
+    const migrationStart = legacyEnd;
+    const migrationEnd = legacyMigrationBot ? migrationStart + accountsToCheck.length : migrationStart;
+    const migrationResp = allResp.slice(
+      migrationStart,
+      migrationEnd
+    );
+    const additionalStart = migrationEnd;
+    const additionalResp = allResp.slice(
+      additionalStart
+    );
+    return {
+      legacy,
+      additionalBots: this.getActiveBots(
+        accountsToCheck,
+        additionalBots,
+        additionalResp
+      ),
+      legacyMigration: this.getActiveMigrationBots(
+        accountsToCheck,
+        legacyMigrationBot,
+        migrationResp
+      )
+    };
+  }
+  getActiveBots(accountsToCheck, bots, result) {
+    if (result.length !== bots.length * accountsToCheck.length) {
+      console.error(
+        "result length mismatch",
+        result.length,
+        bots.length * accountsToCheck.length
+      );
+    }
     const botsByCAIndex = accountsToCheck.reduce((acc, _, index) => {
       const r = result.slice(index * bots.length, (index + 1) * bots.length);
       acc.push({
@@ -250,22 +289,15 @@ class AbstractCreditAccountService extends SDKConstruct {
     }, []);
     return botsByCAIndex;
   }
-  async getActiveMigrationBots(accountsToCheck, bot) {
+  getActiveMigrationBots(accountsToCheck, bot, result) {
     if (bot) {
-      const result = await this.client.multicall({
-        contracts: accountsToCheck.map((ca) => {
-          const cm = this.sdk.marketRegister.findCreditManager(
-            ca.creditManager
-          );
-          return {
-            abi: isV300(cm.creditFacade.version) ? iBotListV300Abi : iBotListV310Abi,
-            address: cm.creditFacade.botList,
-            functionName: "getBotStatus",
-            args: isV300(cm.creditFacade.version) ? [bot, ca.creditManager, ca.creditAccount] : [bot, ca.creditAccount]
-          };
-        }),
-        allowFailure: true
-      });
+      if (result.length !== accountsToCheck.length) {
+        console.error(
+          "result length mismatch for migration bots",
+          result.length,
+          accountsToCheck.length
+        );
+      }
       return { result, botAddress: bot };
     }
     return void 0;

package/dist/esm/sdk/market/MarketConfiguratorContract.js

@@ -26,6 +26,20 @@ class MarketConfiguratorContract extends BaseContract {
       `Market configurator ${this.#curatorName}`
     );
   }
+  static async getPeripheryContractBatch(configurators, client, contract) {
+    const resp = await client.multicall({
+      allowFailure: true,
+      contracts: configurators.map(
+        (cfg) => ({
+          address: cfg.address,
+          abi: cfg.abi,
+          functionName: "getPeripheryContracts",
+          args: [stringToHex(contract, { size: 32 })]
+        })
+      )
+    });
+    return resp;
+  }
   async getPeripheryContract(contract) {
     const resp = await this.client.readContract({
       address: this.address,

package/dist/types/sdk/market/MarketConfiguratorContract.d.ts

@@ -1531,6 +1531,15 @@ export declare class MarketConfiguratorContract extends BaseContract<abi> {
     #private;
     constructor(options: ConstructOptions, address: Address);
     loadCuratorName(): Promise<void>;
+    static getPeripheryContractBatch(configurators: MarketConfiguratorContract[], client: MarketConfiguratorContract["client"], contract: PeripheryContract): Promise<({
+        error: Error;
+        result?: undefined;
+        status: "failure";
+    } | {
+        error?: undefined;
+        result: readonly `0x${string}`[];
+        status: "success";
+    })[]>;
     getPeripheryContract(contract: PeripheryContract): Promise<Address>;
     processLog(log: Log<bigint, number, false, undefined, undefined, abi, ContractEventName<abi>>): void;
 }

package/package.json

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