@gearbox-protocol/sdk 13.3.2 → 13.4.0-beta.1

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

@@ -37,10 +37,6 @@ class CreditAccountServiceV310 extends import_AbstractCreditAccountsService.Abst
     const cm = this.sdk.marketRegister.findCreditManager(
       targetContract.creditManager
     );
-    const priceUpdatesCalls = targetContract.type === "creditAccount" ? await this.getPriceUpdatesForFacade({
-      creditManager: targetContract.creditManager,
-      creditAccount: targetContract
-    }) : [];
     const permissions = defaultPermissions !== null ? defaultPermissions : await (0, import_viem.getContract)({
       address: botAddress,
       client: this.sdk.client,
@@ -64,7 +60,11 @@ class CreditAccountServiceV310 extends import_AbstractCreditAccountsService.Abst
         args: [botAddress, permissions]
       })
     };
-    const calls = [...priceUpdatesCalls, addBotCall];
+    const calls = targetContract.type === "creditAccount" ? await this.prependPriceUpdates(
+      targetContract.creditManager,
+      [addBotCall],
+      targetContract
+    ) : [addBotCall];
     const tx = targetContract.type === "creditAccount" ? cm.creditFacade.multicall(targetContract.creditAccount, calls) : void 0;
     return { tx, calls, creditFacade: cm.creditFacade };
   }
@@ -81,12 +81,7 @@ class CreditAccountServiceV310 extends import_AbstractCreditAccountsService.Abst
     const cm = this.sdk.marketRegister.findCreditManager(
       creditAccount.creditManager
     );
-    const priceUpdatesCalls = await this.getPriceUpdatesForFacade({
-      creditManager: creditAccount.creditManager,
-      creditAccount
-    });
-    const calls = [
-      ...priceUpdatesCalls,
+    const operationCalls = [
       ...assetsToWithdraw.map(
         (a) => this.prepareWithdrawToken(
           creditAccount.creditFacade,
@@ -100,6 +95,11 @@ class CreditAccountServiceV310 extends import_AbstractCreditAccountsService.Abst
         averageQuota
       })
     ];
+    const calls = await this.prependPriceUpdates(
+      creditAccount.creditManager,
+      operationCalls,
+      creditAccount
+    );
     const tx = cm.creditFacade.multicall(creditAccount.creditAccount, calls);
     return { tx, calls, creditFacade: cm.creditFacade };
   }
@@ -122,12 +122,7 @@ class CreditAccountServiceV310 extends import_AbstractCreditAccountsService.Abst
       tokensToClaim,
       creditAccount: ca
     });
-    const priceUpdates = await this.getPriceUpdatesForFacade({
-      creditManager: ca.creditManager,
-      creditAccount: ca
-    });
-    const calls = [
-      ...operation === "close" ? [] : priceUpdates,
+    const operationCalls = [
       ...this.prepareAddCollateral(ca.creditFacade, addCollateral, permits),
       ...this.prepareDisableQuotas(ca),
       ...this.prepareDecreaseDebt(ca),
@@ -136,6 +131,7 @@ class CreditAccountServiceV310 extends import_AbstractCreditAccountsService.Abst
         (t) => this.prepareWithdrawToken(ca.creditFacade, t.token, import_math.MAX_UINT256, to)
       )
     ];
+    const calls = operation === "close" ? operationCalls : await this.prependPriceUpdates(ca.creditManager, operationCalls, ca);
     const tx = operation === "close" ? cm.creditFacade.closeCreditAccount(ca.creditAccount, calls) : cm.creditFacade.multicall(ca.creditAccount, calls);
     return { tx, calls, creditFacade: cm.creditFacade };
   }
@@ -156,19 +152,19 @@ class CreditAccountServiceV310 extends import_AbstractCreditAccountsService.Abst
       tokensToClaim,
       creditAccount: ca
     });
-    const priceUpdates = await this.getPriceUpdatesForFacade({
-      creditManager: ca.creditManager,
-      creditAccount: ca
-    });
     const addCollateral = collateralAssets.filter((a) => a.balance > 0);
-    const calls = [
-      ...priceUpdates,
+    const operationCalls = [
       ...this.prepareAddCollateral(ca.creditFacade, addCollateral, permits),
       ...claimPath.calls,
       ...assetsToWithdraw.map(
         (t) => this.prepareWithdrawToken(ca.creditFacade, t.token, import_math.MAX_UINT256, to)
       )
     ];
+    const calls = await this.prependPriceUpdates(
+      ca.creditManager,
+      operationCalls,
+      ca
+    );
     const tx = cm.creditFacade.liquidateCreditAccount(
       ca.creditAccount,
       to,
@@ -198,16 +194,15 @@ class CreditAccountServiceV310 extends import_AbstractCreditAccountsService.Abst
       });
     }
     if (claimPath.calls.length === 0) throw new Error("No path to execute");
-    const priceUpdatesCalls = await this.getPriceUpdatesForFacade({
-      creditManager: ca.creditManager,
-      creditAccount: ca,
-      desiredQuotas: averageQuota
-    });
-    const calls = [
-      ...priceUpdatesCalls,
+    const operationCalls = [
       ...claimPath.calls,
       ...this.prepareUpdateQuotas(ca.creditFacade, { minQuota, averageQuota })
     ];
+    const calls = await this.prependPriceUpdates(
+      ca.creditManager,
+      operationCalls,
+      ca
+    );
     const tx = cm.creditFacade.multicall(ca.creditAccount, calls);
     return { tx, calls, creditFacade: cm.creditFacade };
   }

package/dist/cjs/sdk/accounts/multicall-utils.js

@@ -0,0 +1,91 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var multicall_utils_exports = {};
+__export(multicall_utils_exports, {
+  extractPriceUpdates: () => extractPriceUpdates,
+  extractQuotaTokens: () => extractQuotaTokens,
+  mergePriceUpdates: () => mergePriceUpdates
+});
+module.exports = __toCommonJS(multicall_utils_exports);
+var import_viem = require("viem");
+var import_generated = require("../../abi/310/generated.js");
+var import_AddressMap = require("../utils/AddressMap.js");
+var import_AddressSet = require("../utils/AddressSet.js");
+const ON_DEMAND_SELECTOR = (0, import_viem.toFunctionSelector)(
+  (0, import_viem.getAbiItem)({
+    abi: import_generated.iCreditFacadeMulticallV310Abi,
+    name: "onDemandPriceUpdates"
+  })
+);
+const UPDATE_QUOTA_SELECTOR = (0, import_viem.toFunctionSelector)(
+  (0, import_viem.getAbiItem)({
+    abi: import_generated.iCreditFacadeMulticallV310Abi,
+    name: "updateQuota"
+  })
+);
+function extractPriceUpdates(calls) {
+  const priceUpdates = [];
+  const remainingCalls = [];
+  for (const call of calls) {
+    if (isOnDemandPriceUpdateCall(call)) {
+      const decoded = (0, import_viem.decodeFunctionData)({
+        abi: import_generated.iCreditFacadeMulticallV310Abi,
+        data: call.callData
+      });
+      const updates = decoded.args[0];
+      priceUpdates.push(...updates);
+    } else {
+      remainingCalls.push(call);
+    }
+  }
+  return { priceUpdates, remainingCalls };
+}
+function extractQuotaTokens(calls) {
+  const tokens = new import_AddressSet.AddressSet();
+  for (const { callData } of calls) {
+    if (callData.slice(0, 10) !== UPDATE_QUOTA_SELECTOR) {
+      continue;
+    }
+    const decoded = (0, import_viem.decodeFunctionData)({
+      abi: import_generated.iCreditFacadeMulticallV310Abi,
+      data: callData
+    });
+    const [token, quotaChange] = decoded.args;
+    if (quotaChange > 0n) {
+      tokens.add(token);
+    }
+  }
+  return tokens;
+}
+function mergePriceUpdates(existing, generated) {
+  const seen = new import_AddressMap.AddressMap();
+  for (const u of [...generated, ...existing]) {
+    seen.upsert(u.priceFeed, u);
+  }
+  return seen.values();
+}
+function isOnDemandPriceUpdateCall(call) {
+  return call.callData.slice(0, 10) === ON_DEMAND_SELECTOR;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  extractPriceUpdates,
+  extractQuotaTokens,
+  mergePriceUpdates
+});

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

@@ -91,6 +91,12 @@ class CreditFacadeV310Contract extends import_CreditFacadeV310BaseContract.Credi
       args: [ca, calls]
     });
   }
+  botMulticall(ca, calls) {
+    return this.createRawTx({
+      functionName: "botMulticall",
+      args: [ca, calls]
+    });
+  }
   openCreditAccount(to, calls, referralCode) {
     return this.createRawTx({
       functionName: "openCreditAccount",

package/dist/esm/rewards/rewards/api.js

@@ -1,102 +1,12 @@
-import { getAddress, getContract } from "viem";
-import { iFarmingPoolAbi } from "../../abi/iFarmingPool.js";
+import { getAddress } from "viem";
 import { BigIntMath } from "../../common-utils/index.js";
 import { chains, toBigInt } from "../../sdk/index.js";
 import {
   MerkleXYZApi
 } from "./merkl-api.js";
-class GearboxRewardsApi {
+class RewardAmountAPI {
   constructor() {
   }
-  static async getLmRewardsV3({
-    pools,
-    tokensList,
-    provider,
-    account,
-    reportError
-  }) {
-    const poolByStakedDiesel = Object.values(pools).reduce((acc, p) => {
-      p.stakedDieselToken.forEach((t) => {
-        if (t) acc[t] = p.address;
-      });
-      p.stakedDieselToken_old.forEach((t) => {
-        if (t) acc[t] = p.address;
-      });
-      return acc;
-    }, {});
-    const stakedDieselTokens = Object.keys(poolByStakedDiesel);
-    const farmInfoCalls = stakedDieselTokens.map((address) => ({
-      address,
-      abi: iFarmingPoolAbi,
-      functionName: "farmInfo",
-      args: []
-    }));
-    const rewardTokenCalls = stakedDieselTokens.map((address) => ({
-      address,
-      abi: POOL_REWARDS_ABI,
-      functionName: "rewardsToken",
-      args: []
-    }));
-    const farmedCalls = stakedDieselTokens.map((address) => ({
-      address,
-      abi: iFarmingPoolAbi,
-      functionName: "farmed",
-      args: [account]
-    }));
-    const [response] = await Promise.allSettled([
-      provider.multicall({
-        allowFailure: false,
-        contracts: [...farmInfoCalls, ...rewardTokenCalls, ...farmedCalls],
-        batchSize: 0
-      })
-    ]);
-    const safeResponse = GearboxRewardsApi.extractFulfilled(response, reportError, "v3Rewards") || [];
-    const farmInfoCallsEnd = farmInfoCalls.length;
-    const farmInfo = safeResponse.slice(
-      0,
-      farmInfoCallsEnd
-    );
-    const rewardTokenCallsEnd = farmInfoCallsEnd + rewardTokenCalls.length;
-    const rewardTokens = safeResponse.slice(
-      farmInfoCallsEnd,
-      rewardTokenCallsEnd
-    );
-    const farmedCallsEnd = rewardTokenCallsEnd + farmedCalls.length;
-    const farmedList = safeResponse.slice(
-      rewardTokenCallsEnd,
-      farmedCallsEnd
-    );
-    const gearboxLmRewards = stakedDieselTokens.map(
-      (address, i) => {
-        const pool = poolByStakedDiesel[address];
-        const info = farmInfo[i];
-        const rewardToken = rewardTokens[i]?.toLowerCase();
-        const farmed = farmedList[i];
-        if (!pool || !info || !rewardToken) return void 0;
-        return {
-          pool,
-          poolToken: address,
-          rewardToken,
-          rewardTokenDecimals: tokensList[rewardToken]?.decimals || 18,
-          rewardTokenSymbol: tokensList[rewardToken]?.symbol || "unknown",
-          amount: farmed ?? 0n,
-          type: "stakedV3"
-        };
-      }
-    );
-    const { zero, nonZero } = gearboxLmRewards.reduce(
-      (acc, r) => {
-        if (r && r.amount > 0n) {
-          acc.nonZero.push(r);
-        } else if (r) {
-          acc.zero.push(r);
-        }
-        return acc;
-      },
-      { nonZero: [], zero: [] }
-    );
-    return [...nonZero, zero];
-  }
   static async getLmRewardsMerkle({
     pools,
     account,
@@ -113,7 +23,7 @@ class GearboxRewardsApi {
         })
       )
     ]);
-    const merkleXYZLm = GearboxRewardsApi.extractFulfilled(
+    const merkleXYZLm = RewardAmountAPI.extractFulfilled(
       merkleXYZLMResponse,
       reportError,
       "merkleXYZLm"
@@ -168,37 +78,7 @@ class GearboxRewardsApi {
       return void 0;
     }
   }
-  static async claimLmRewardsV3({
-    reward,
-    signer,
-    account
-  }) {
-    const pool = getContract({
-      address: reward.poolToken,
-      abi: iFarmingPoolAbi,
-      client: signer
-    });
-    return pool.write.claim({
-      account,
-      chain: signer.chain
-    });
-  }
 }
-const POOL_REWARDS_ABI = [
-  {
-    inputs: [],
-    name: "rewardsToken",
-    outputs: [
-      {
-        internalType: "contract IERC20",
-        name: "",
-        type: "address"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  }
-];
 export {
-  GearboxRewardsApi
+  RewardAmountAPI
 };

package/dist/esm/rewards/rewards/extra-apy.js

@@ -17,7 +17,7 @@ function getKeyForPoolPointsInfo(i) {
     i.condition
   ].join("-");
 }
-class GearboxRewardsExtraApy {
+class PoolPointsAPI {
   constructor() {
   }
   static async getTotalTokensOnProtocol({
@@ -27,9 +27,7 @@ class GearboxRewardsExtraApy {
   }) {
     const list = [...new Set(tokensToCheck)];
     const res = await Promise.allSettled(
-      list.map(
-        (t) => GearboxRewardsExtraApy.getTokenTotal(t, network, tokensList)
-      )
+      list.map((t) => PoolPointsAPI.getTokenTotal(t, network, tokensList))
     );
     return res.map((r, i) => [
       list[i],
@@ -59,7 +57,7 @@ class GearboxRewardsExtraApy {
         (acc2, pointsInfo2) => {
           const { address: tokenAddress } = tokensList[pointsInfo2.token] || {};
           const tokenBalance = totalTokenBalances[tokenAddress || ""];
-          const points = GearboxRewardsExtraApy.getPoolTokenPoints(
+          const points = PoolPointsAPI.getPoolTokenPoints(
             tokenBalance,
             p,
             tokensList,
@@ -96,6 +94,6 @@ class GearboxRewardsExtraApy {
   }
 }
 export {
-  GearboxRewardsExtraApy,
+  PoolPointsAPI,
   getKeyForPoolPointsInfo
 };

package/dist/esm/rewards/rewards/index.js

@@ -1,4 +1,2 @@
 export * from "./api.js";
-export * from "./apy.js";
 export * from "./extra-apy.js";
-export * from "./merkl-api.js";