@gearbox-protocol/sdk 12.3.0 → 12.3.2

package/dist/cjs/permissionless/bindings/governance/governor.js

@@ -25,7 +25,6 @@ var import_viem = require("viem");
 var import_utils = require("viem/utils");
 var import_governor = require("../../../abi/governance/governor.js");
 var import_sdk = require("../../../sdk/index.js");
-var import_utils2 = require("../../utils/index.js");
 var import_market_configurator = require("../market-configurator.js");
 var import_treasury_splitter = require("../treasury-splitter.js");
 var import_batches_chain = require("./batches-chain.js");
@@ -177,7 +176,7 @@ class GovernorContract extends import_sdk.BaseContract {
       case "startBatch": {
         const [eta] = args;
         return {
-          eta: (0, import_utils2.formatTimestamp)(Number(eta))
+          eta: (0, import_sdk.formatTimestamp)(Number(eta))
         };
       }
       case "queueTransaction": {
@@ -190,7 +189,7 @@ class GovernorContract extends import_sdk.BaseContract {
           data: (0, import_sdk.json_stringify)(
             this.#decodeFunctionData(target, calldata)?.args ?? calldata
           ),
-          eta: (0, import_utils2.formatTimestamp)(Number(eta))
+          eta: (0, import_sdk.formatTimestamp)(Number(eta))
         };
       }
       case "executeBatch": {
@@ -207,7 +206,7 @@ class GovernorContract extends import_sdk.BaseContract {
                 data: (0, import_sdk.json_stringify)(
                   this.#decodeFunctionData(target, calldata)?.args ?? calldata
                 ),
-                eta: (0, import_utils2.formatTimestamp)(Number(eta))
+                eta: (0, import_sdk.formatTimestamp)(Number(eta))
               };
             })
           )

package/dist/cjs/permissionless/utils/format.js

@@ -22,7 +22,6 @@ __export(format_exports, {
   deepJsonParse: () => deepJsonParse,
   formatBytecodeSize: () => formatBytecodeSize,
   formatBytecodeVersion: () => formatBytecodeVersion,
-  formatTimestamp: () => formatTimestamp,
   shortenHash: () => shortenHash,
   significantTrunc: () => significantTrunc
 });
@@ -38,12 +37,6 @@ function formatBytecodeVersion(version) {
   const patch = version % 10;
   return `v${major}.${minor}.${patch}`;
 }
-function formatTimestamp(timestamp) {
-  return new Date(timestamp * 1e3).toLocaleString("en-GB", {
-    dateStyle: "short",
-    timeStyle: "short"
-  });
-}
 function shortenHash(hash, chars = 4) {
   if (!hash) return "";
   const start = hash.slice(0, chars + 2);
@@ -91,7 +84,6 @@ function deepJsonParse(value) {
   deepJsonParse,
   formatBytecodeSize,
   formatBytecodeVersion,
-  formatTimestamp,
   shortenHash,
   significantTrunc
 });

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/credit/CreditFacadeV300Contract.js

@@ -50,7 +50,7 @@ class CreditFacadeV300Contract extends import_base.BaseContract {
       expirable: this.expirable,
       isDegenMode: this.degenNFT !== import_constants.ADDRESS_0X0,
       degenNFT: this.labelAddress(this.degenNFT),
-      expirationDate: this.expirationDate,
+      expirationDate: (0, import_utils.formatTimestamp)(this.expirationDate),
       maxDebtPerBlockMultiplier: this.maxDebtPerBlockMultiplier,
       botList: this.labelAddress(this.botList),
       minDebt: (0, import_utils.formatBNvalue)(this.minDebt, decimals),

package/dist/cjs/sdk/market/credit/CreditFacadeV310Contract.js

@@ -50,7 +50,7 @@ class CreditFacadeV310Contract extends import_base.BaseContract {
       expirable: this.expirable,
       isDegenMode: this.degenNFT !== import_constants.ADDRESS_0X0,
       degenNFT: this.labelAddress(this.degenNFT),
-      expirationDate: this.expirationDate,
+      expirationDate: (0, import_utils.formatTimestamp)(this.expirationDate),
       maxDebtPerBlockMultiplier: this.maxDebtPerBlockMultiplier,
       botList: this.labelAddress(this.botList),
       minDebt: (0, import_utils.formatBNvalue)(this.minDebt, decimals),

package/dist/cjs/sdk/utils/formatter.js

@@ -23,6 +23,7 @@ __export(formatter_exports, {
   formatBNvalue: () => formatBNvalue,
   formatDuration: () => formatDuration,
   formatNumberToString_: () => formatNumberToString_,
+  formatTimestamp: () => formatTimestamp,
   numberWithCommas: () => numberWithCommas,
   percentFmt: () => percentFmt,
   toBigInt: () => toBigInt
@@ -121,6 +122,12 @@ function formatDuration(seconds, raw = true) {
 function formatNumberToString_(value) {
   return value.toLocaleString("en-US", { minimumIntegerDigits: 1, useGrouping: true }).replaceAll(",", "_");
 }
+function formatTimestamp(timestamp) {
+  return new Date(timestamp * 1e3).toLocaleString("en-GB", {
+    dateStyle: "short",
+    timeStyle: "short"
+  });
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   fmtBinaryMask,
@@ -128,6 +135,7 @@ function formatNumberToString_(value) {
   formatBNvalue,
   formatDuration,
   formatNumberToString_,
+  formatTimestamp,
   numberWithCommas,
   percentFmt,
   toBigInt

package/dist/esm/permissionless/bindings/governance/governor.js

@@ -6,8 +6,11 @@ import {
 } from "viem";
 import { formatAbiItem } from "viem/utils";
 import { governorAbi } from "../../../abi/governance/governor.js";
-import { BaseContract, json_stringify } from "../../../sdk/index.js";
-import { formatTimestamp } from "../../utils/index.js";
+import {
+  BaseContract,
+  formatTimestamp,
+  json_stringify
+} from "../../../sdk/index.js";
 import { MarketConfiguratorContract } from "../market-configurator.js";
 import { TreasurySplitterContract } from "../treasury-splitter.js";
 import { BatchesChainContract } from "./batches-chain.js";

package/dist/esm/permissionless/utils/format.js

@@ -9,12 +9,6 @@ function formatBytecodeVersion(version) {
   const patch = version % 10;
   return `v${major}.${minor}.${patch}`;
 }
-function formatTimestamp(timestamp) {
-  return new Date(timestamp * 1e3).toLocaleString("en-GB", {
-    dateStyle: "short",
-    timeStyle: "short"
-  });
-}
 function shortenHash(hash, chars = 4) {
   if (!hash) return "";
   const start = hash.slice(0, chars + 2);
@@ -61,7 +55,6 @@ export {
   deepJsonParse,
   formatBytecodeSize,
   formatBytecodeVersion,
-  formatTimestamp,
   shortenHash,
   significantTrunc
 };

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/credit/CreditFacadeV300Contract.js

@@ -5,7 +5,11 @@ import {
 } from "../../../abi/v300.js";
 import { BaseContract } from "../../base/index.js";
 import { ADDRESS_0X0 } from "../../constants/index.js";
-import { fmtBinaryMask, formatBNvalue } from "../../utils/index.js";
+import {
+  fmtBinaryMask,
+  formatBNvalue,
+  formatTimestamp
+} from "../../utils/index.js";
 const abi = [
   ...iCreditFacadeV300Abi,
   ...iCreditFacadeV300MulticallAbi,
@@ -30,7 +34,7 @@ class CreditFacadeV300Contract extends BaseContract {
       expirable: this.expirable,
       isDegenMode: this.degenNFT !== ADDRESS_0X0,
       degenNFT: this.labelAddress(this.degenNFT),
-      expirationDate: this.expirationDate,
+      expirationDate: formatTimestamp(this.expirationDate),
       maxDebtPerBlockMultiplier: this.maxDebtPerBlockMultiplier,
       botList: this.labelAddress(this.botList),
       minDebt: formatBNvalue(this.minDebt, decimals),

package/dist/esm/sdk/market/credit/CreditFacadeV310Contract.js

@@ -5,7 +5,11 @@ import {
 import { iPausableAbi } from "../../../abi/iPausable.js";
 import { BaseContract } from "../../base/index.js";
 import { ADDRESS_0X0 } from "../../constants/index.js";
-import { fmtBinaryMask, formatBNvalue } from "../../utils/index.js";
+import {
+  fmtBinaryMask,
+  formatBNvalue,
+  formatTimestamp
+} from "../../utils/index.js";
 const abi = [
   ...iCreditFacadeV310Abi,
   ...iCreditFacadeMulticallV310Abi,
@@ -30,7 +34,7 @@ class CreditFacadeV310Contract extends BaseContract {
       expirable: this.expirable,
       isDegenMode: this.degenNFT !== ADDRESS_0X0,
       degenNFT: this.labelAddress(this.degenNFT),
-      expirationDate: this.expirationDate,
+      expirationDate: formatTimestamp(this.expirationDate),
       maxDebtPerBlockMultiplier: this.maxDebtPerBlockMultiplier,
       botList: this.labelAddress(this.botList),
       minDebt: formatBNvalue(this.minDebt, decimals),

package/dist/esm/sdk/utils/formatter.js

@@ -91,12 +91,19 @@ function formatDuration(seconds, raw = true) {
 function formatNumberToString_(value) {
   return value.toLocaleString("en-US", { minimumIntegerDigits: 1, useGrouping: true }).replaceAll(",", "_");
 }
+function formatTimestamp(timestamp) {
+  return new Date(timestamp * 1e3).toLocaleString("en-GB", {
+    dateStyle: "short",
+    timeStyle: "short"
+  });
+}
 export {
   fmtBinaryMask,
   formatBN,
   formatBNvalue,
   formatDuration,
   formatNumberToString_,
+  formatTimestamp,
   numberWithCommas,
   percentFmt,
   toBigInt

package/dist/types/permissionless/utils/format.d.ts

@@ -1,6 +1,5 @@
 export declare function formatBytecodeSize(size: number): string;
 export declare function formatBytecodeVersion(version: number): string;
-export declare function formatTimestamp(timestamp: number): string;
 export declare function shortenHash(hash: string, chars?: number): string;
 export declare function convertPercent(percent: number): number;
 export declare function significantTrunc(x: number): string;

package/dist/types/sdk/types/state-human.d.ts

@@ -72,7 +72,7 @@ export interface CreditFacadeStateHuman extends BaseContractStateHuman {
     expirable: boolean;
     isDegenMode: boolean;
     degenNFT: string;
-    expirationDate: number;
+    expirationDate: string;
     maxDebtPerBlockMultiplier: number;
     botList: string;
     minDebt: string;

package/dist/types/sdk/utils/formatter.d.ts

@@ -9,3 +9,4 @@ export declare function fmtBinaryMask(mask: bigint): string;
 export declare function numberWithCommas(x: number | bigint): string;
 export declare function formatDuration(seconds: number, raw?: boolean): string;
 export declare function formatNumberToString_(value: bigint | number): string;
+export declare function formatTimestamp(timestamp: number): string;

package/package.json

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