@gearbox-protocol/sdk 12.4.0-next.1 → 12.4.0

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/plugins/accounts-counter/AccountsCounterPlugin.js

@@ -69,7 +69,8 @@ class AccountsCounterPlugin extends BasePlugin {
           }
         ]
       ),
-      allowFailure: false
+      allowFailure: false,
+      batchSize: 0
     });
     this.#accounts = new AddressMap();
     for (let i = 0; i < cms.length; i++) {

package/dist/esm/plugins/bots/BotsPlugin.js

@@ -62,7 +62,8 @@ class BotsPlugin extends BasePlugin {
         })
       ),
       allowFailure: true,
-      blockNumber: this.sdk.currentBlock
+      blockNumber: this.sdk.currentBlock,
+      batchSize: 0
     });
     const expectedBots = new AddressMap();
     for (let i = 0; i < configs.length; i++) {
@@ -90,7 +91,8 @@ class BotsPlugin extends BasePlugin {
         })
       ),
       allowFailure: true,
-      blockNumber: this.sdk.currentBlock
+      blockNumber: this.sdk.currentBlock,
+      batchSize: 0
     });
     for (let i = 0; i < botAddrs.length; i++) {
       const serialized = serializedBots[i];

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}`
+        this.sdk.logger?.warn(
+          `failed to load degen distributor for market configurator ${this.labelAddress(
+            cfg
+          )} and pool ${this.labelAddress(pool)}: ${r.error}`
         );
       }
     });

package/dist/esm/plugins/delayed-withdrawal/DelayedWithdrawalPlugin.js

@@ -25,7 +25,8 @@ class DelayedWithdrawalPlugin extends BasePlugin {
           args: [cm.creditManager.address]
         })
       ) : [],
-      allowFailure: true
+      allowFailure: true,
+      batchSize: 0
     });
     this.#withdrawableAssets = new AddressMap(void 0, MAP_LABEL);
     resp.forEach((r, index) => {

package/dist/esm/plugins/pools-history/Pools7DAgoPlugin.js

@@ -33,7 +33,8 @@ class Pools7DAgoPlugin extends BasePlugin {
           args: [m.pool.pool.address]
         })
       ),
-      blockNumber: BigIntMath.max(0n, targetBlock)
+      blockNumber: BigIntMath.max(0n, targetBlock),
+      batchSize: 0
     });
     this.#pools7DAgo = new AddressMap(void 0, MAP_LABEL);
     resp.forEach((r, index) => {

package/dist/esm/plugins/zappers/ZappersPlugin.js

@@ -34,7 +34,8 @@ class ZappersPlugin extends BasePlugin {
           args: [m.configurator.address, m.pool.pool.address]
         })
       ),
-      allowFailure: true
+      allowFailure: true,
+      batchSize: 0
     });
     this.#zappers = new AddressMap(void 0, "zappers");
     for (let i = 0; i < resp.length; i++) {

package/dist/esm/sdk/GearboxSDK.js

@@ -45,7 +45,7 @@ function createClient(opts, network) {
   } else {
     const rpcs = opts.rpcURLs.map(
       (url) => http(url, {
-        ...opts.httpClientOptions,
+        ...opts.httpTransportOptions,
         timeout: opts.timeout,
         retryCount: opts.retryCount
       })
@@ -61,11 +61,15 @@ function createClient(opts, network) {
 async function attachClient(options, network) {
   let { chainId, networkType } = network;
   const attachClient2 = createClient(options);
-  if (!networkType) {
+  if (networkType) {
+    if (!chainId) {
+      chainId = getChain(networkType).id;
+    }
+  } else {
     networkType = await detectNetwork(attachClient2);
-  }
-  if (!chainId) {
-    chainId = await attachClient2.getChainId();
+    if (!chainId) {
+      chainId = await attachClient2.getChainId();
+    }
   }
   return createClient(options, { networkType, chainId });
 }

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,72 @@ 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]
           };
-        });
-      }),
-      allowFailure: true
+        }) : [],
+        ...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,
+      batchSize: 0
     });
+    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 +290,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/base/TokensMeta.js

@@ -69,7 +69,8 @@ class TokensMeta extends AddressMap {
           functionName: "contractType"
         })
       ),
-      allowFailure: true
+      allowFailure: true,
+      batchSize: 0
     });
     for (let i = 0; i < resp.length; i++) {
       if (resp[i].status === "success") {

package/dist/esm/sdk/core/address-provider/createAddressProvider.js

@@ -1,13 +1,23 @@
 import { iVersionAbi } from "../../../abi/iVersion.js";
-import { isV300, isV310 } from "../../constants/index.js";
+import {
+  ADDRESS_PROVIDER_V310,
+  isV300,
+  isV310
+} from "../../constants/index.js";
+import { hexEq } from "../../utils/hex.js";
 import { AddressProviderV300Contract } from "./AddressProviderV300Contract.js";
 import { AddressProviderV310Contract } from "./AddressProviderV310Contract.js";
 async function createAddressProvider(sdk, address) {
-  const v = await sdk.client.readContract({
-    address,
-    abi: iVersionAbi,
-    functionName: "version"
-  });
+  let v;
+  if (hexEq(address, ADDRESS_PROVIDER_V310)) {
+    v = 310n;
+  } else {
+    v = await sdk.client.readContract({
+      address,
+      abi: iVersionAbi,
+      functionName: "version"
+    });
+  }
   return newAddressProvider(sdk, address, Number(v));
 }
 function hydrateAddressProvider(sdk, state) {

package/dist/esm/sdk/gauges/GaugeStakingService.js

@@ -57,7 +57,8 @@ class GaugeStakingService extends SDKConstruct {
           functionName: "getCurrentEpoch",
           args: []
         }
-      ]
+      ],
+      batchSize: 0
     });
     return {
       availableBalance,

package/dist/esm/sdk/index.js

@@ -10,6 +10,7 @@ export * from "./market/index.js";
 export * from "./options.js";
 export * from "./plugins/index.js";
 export * from "./poolMigration/index.js";
+export * from "./pools/index.js";
 export * from "./router/index.js";
 export * from "./sdk-gov-legacy/index.js";
 export * from "./sdk-legacy/index.js";

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

@@ -26,6 +26,21 @@ 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 })]
+        })
+      ),
+      batchSize: 0
+    });
+    return resp;
+  }
   async getPeripheryContract(contract) {
     const resp = await this.client.readContract({
       address: this.address,

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/market/oracle/PriceOracleBaseContract.js

@@ -113,6 +113,9 @@ class PriceOracleBaseContract extends BaseContract {
    * @param reserve use reserve price feed instead of main
    */
   convertToUSD(from, amount, reserve = false) {
+    if (amount === 0n) {
+      return 0n;
+    }
     const price = reserve ? this.reservePrice(from) : this.mainPrice(from);
     const scale = 10n ** BigInt(this.tokensMeta.decimals(from));
     return amount * price / scale;
@@ -124,6 +127,9 @@ class PriceOracleBaseContract extends BaseContract {
    * @param reserve use reserve price feed instead of main
    */
   convertFromUSD(to, amount, reserve = false) {
+    if (amount === 0n) {
+      return 0n;
+    }
     const price = reserve ? this.reservePrice(to) : this.mainPrice(to);
     const scale = 10n ** BigInt(this.tokensMeta.decimals(to));
     return amount * scale / price;

package/dist/esm/sdk/pools/AbstractPoolService.js

@@ -0,0 +1,113 @@
+import { ierc20ZapperDepositsAbi } from "../../abi/iERC20ZapperDeposits.js";
+import { iethZapperDepositsAbi } from "../../abi/iETHZapperDeposits.js";
+import { iZapperAbi } from "../../abi/iZapper.js";
+import { iPoolV300Abi } from "../../abi/v300.js";
+import { SDKConstruct } from "../base/index.js";
+class AbstractPoolService extends SDKConstruct {
+  #version;
+  constructor(sdk, version) {
+    super(sdk);
+    this.#version = version;
+    this.logger?.debug(`Created PoolService with version: ${this.#version}`);
+  }
+  addLiquidity({
+    collateral,
+    pool,
+    account,
+    zapper,
+    permit,
+    nativeTokenAddress,
+    referralCode = 0n,
+    migrate
+  }) {
+    if (zapper?.tokenIn === nativeTokenAddress) {
+      return [
+        {
+          target: zapper.zapper,
+          abi: iethZapperDepositsAbi,
+          functionName: "depositWithReferral",
+          args: [account, referralCode],
+          value: collateral.balance
+        }
+      ];
+    } else if (zapper) {
+      return permit ? [
+        {
+          target: zapper.zapper,
+          abi: ierc20ZapperDepositsAbi,
+          functionName: "depositWithReferralAndPermit",
+          args: [
+            collateral.balance,
+            account,
+            referralCode,
+            permit.deadline,
+            permit.v,
+            permit.r,
+            permit.s
+          ]
+        }
+      ] : [
+        {
+          target: zapper.zapper,
+          abi: ierc20ZapperDepositsAbi,
+          functionName: "depositWithReferral",
+          args: [collateral.balance, account, referralCode]
+        }
+      ];
+    } else {
+      if (migrate) throw Error("No zapper for migration");
+      return [
+        {
+          target: pool,
+          abi: iPoolV300Abi,
+          functionName: "depositWithReferral",
+          args: [collateral.balance, account, referralCode]
+        }
+      ];
+    }
+  }
+  removeLiquidity({
+    pool,
+    amount,
+    account,
+    zapper,
+    permit
+  }) {
+    if (zapper) {
+      return permit ? [
+        {
+          target: zapper.zapper,
+          abi: iZapperAbi,
+          functionName: "redeemWithPermit",
+          args: [
+            amount,
+            account,
+            permit.deadline,
+            permit.v,
+            permit.r,
+            permit.s
+          ]
+        }
+      ] : [
+        {
+          target: zapper.zapper,
+          abi: iZapperAbi,
+          functionName: "redeem",
+          args: [amount, account]
+        }
+      ];
+    } else {
+      return [
+        {
+          target: pool,
+          abi: iPoolV300Abi,
+          functionName: "redeem",
+          args: [amount, account, account]
+        }
+      ];
+    }
+  }
+}
+export {
+  AbstractPoolService
+};

package/dist/esm/sdk/pools/PoolServiceV300.js

@@ -0,0 +1,6 @@
+import { AbstractPoolService } from "./AbstractPoolService.js";
+class PoolServiceV300 extends AbstractPoolService {
+}
+export {
+  PoolServiceV300
+};

package/dist/esm/sdk/pools/PoolServiceV310.js

@@ -0,0 +1,6 @@
+import { AbstractPoolService } from "./AbstractPoolService.js";
+class PoolServiceV310 extends AbstractPoolService {
+}
+export {
+  PoolServiceV310
+};

package/dist/esm/sdk/pools/createPoolService.js

@@ -0,0 +1,15 @@
+import { isV300, isV310 } from "../constants/index.js";
+import { PoolServiceV300 } from "./PoolServiceV300.js";
+import { PoolServiceV310 } from "./PoolServiceV310.js";
+function createPoolService(sdk, version) {
+  if (isV300(version)) {
+    return new PoolServiceV300(sdk, version);
+  }
+  if (isV310(version)) {
+    return new PoolServiceV310(sdk, version);
+  }
+  throw new Error(`Unsupported Pool Service version ${version}`);
+}
+export {
+  createPoolService
+};

package/dist/esm/sdk/pools/index.js

@@ -0,0 +1,3 @@
+export * from "./AbstractPoolService.js";
+export * from "./createPoolService.js";
+export * from "./types.js";

package/dist/esm/sdk/sdk-legacy/core/endpoint.js

@@ -85,15 +85,9 @@ class GearboxBackendApi {
     return `${LEADERBOARD_APIS[chainId]}${url}`;
   };
   static getReferralUrl = () => REFERRAL_API;
-  static apyServerAllRewards = (chainId) => URLApi.getRelativeUrl("https://apy-server.fly.dev/api/rewards/tokens/all", {
-    params: { chain_id: chainId }
-  });
-  static apyServerGearAPY = (chainId) => URLApi.getRelativeUrl("https://apy-server.fly.dev/api/rewards/gear-apy", {
-    params: { chain_id: chainId }
-  });
-  static apyServerAllPoolRewards = (chainId) => URLApi.getRelativeUrl("https://apy-server.fly.dev/api/rewards/pools/all", {
-    params: { chain_id: chainId }
-  });
+  static apyAllRewards = () => URLApi.getRelativeUrl(
+    "https://state-cache.gearbox.foundation/apy-server/latest.json"
+  );
 }
 class URLApi {
   static getRelativeUrl = (url, options) => {

package/dist/esm/sdk/sdk-legacy/gearboxRewards/api.js

@@ -95,7 +95,8 @@ class GearboxRewardsApi {
     const [response] = await Promise.allSettled([
       provider.multicall({
         allowFailure: false,
-        contracts: [...farmInfoCalls, ...rewardTokenCalls, ...farmedCalls]
+        contracts: [...farmInfoCalls, ...rewardTokenCalls, ...farmedCalls],
+        batchSize: 0
       })
     ]);
     const safeResponse = GearboxRewardsApi.extractFulfilled(response, reportError, "v3Rewards") || [];

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