npm - @gearbox-protocol/sdk - Versions diffs - 12.3.1 → 12.3.2 - Mend

@gearbox-protocol/sdk 12.3.1 → 12.3.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/dist/cjs/sdk/accounts/AbstractCreditAccountsService.js +69 -37
package/dist/esm/sdk/accounts/AbstractCreditAccountsService.js +69 -37
package/package.json +1 -1

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

@@ -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/esm/sdk/accounts/AbstractCreditAccountsService.js CHANGED Viewed

@@ -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/package.json CHANGED Viewed

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