@gearbox-protocol/sdk 8.24.8 → 8.25.1-next.1

package/dist/cjs/plugins/zappers/extraZappers.js

@@ -64,6 +64,90 @@ const extraZappers = {
         decimals: 18
       },
       pool: "0xf00B548f1b69cB5EE559d891E03A196FB5101d4A"
+    },
+    {
+      baseParams: {
+        addr: "0x17897d188bb49fea7bfac56e29b07036e16b3537",
+        version: 310n,
+        contractType: "0x5a41505045523a3a5354414b45445f4552433436323600000000000000000000",
+        serializedParams: "0x0000000000000000000000009ef444a6d7f4a5adcd68fd5329aa5240c90e14d2000000000000000000000000da00000035fef4082f78def6a8903bee419fbf8e"
+      },
+      tokenIn: {
+        addr: "0x9ef444a6d7F4A5adcd68FD5329aA5240C90E14d2",
+        symbol: "farmdUSDCV3",
+        name: "Farming of Trade USDC v3",
+        decimals: 6
+      },
+      tokenOut: {
+        addr: "0xC155444481854c60e7a29f4150373f479988F32D",
+        symbol: "USDC",
+        name: "USDC",
+        decimals: 6
+      },
+      pool: "0xC155444481854c60e7a29f4150373f479988F32D"
+    },
+    {
+      baseParams: {
+        addr: "0x70383bac778f0285ddb5f35afbd631e5a4675c58",
+        version: 310n,
+        contractType: "0x5a41505045523a3a5354414b45445f4552433436323600000000000000000000",
+        serializedParams: "0x0000000000000000000000009ef444a6d7f4a5adcd68fd5329aa5240c90e14d2000000000000000000000000da00000035fef4082f78def6a8903bee419fbf8e"
+      },
+      tokenIn: {
+        addr: "0x9ef444a6d7F4A5adcd68FD5329aA5240C90E14d2",
+        symbol: "farmdUSDCV3",
+        name: "Farming of Trade USDC v3",
+        decimals: 6
+      },
+      tokenOut: {
+        addr: "0xF0795C47fA58d00f5F77F4D5c01F31eE891E21B4",
+        symbol: "rUSDC",
+        name: "Resolv USDC",
+        decimals: 6
+      },
+      pool: "0xF0795C47fA58d00f5F77F4D5c01F31eE891E21B4"
+    },
+    {
+      baseParams: {
+        addr: "0x2bC0231a1FC6a9b2E0C44AC1089F47a122a7a8c1",
+        version: 310n,
+        contractType: "0x5a41505045523a3a455243343632360000000000000000000000000000000000",
+        serializedParams: "0x000000000000000000000000da0002859b2d05f66a753d8241fcde8623f26f4f"
+      },
+      tokenIn: {
+        addr: "0xda0002859B2d05F66a753d8241fCDE8623f26F4f",
+        symbol: "dWETHV3",
+        name: "Trade WETH v3",
+        decimals: 18
+      },
+      tokenOut: {
+        addr: "0xf00B548f1b69cB5EE559d891E03A196FB5101d4A",
+        symbol: "dWETHV3-cp0x",
+        name: "Gearbox WETH v3",
+        decimals: 18
+      },
+      pool: "0xf00B548f1b69cB5EE559d891E03A196FB5101d4A"
+    },
+    {
+      baseParams: {
+        addr: "0x62af1fc6e54e66aba5322a3491b5ce1808a6fe89",
+        version: 310n,
+        contractType: "0x5a41505045523a3a455243343632360000000000000000000000000000000000",
+        serializedParams: "0x000000000000000000000000da00000035fef4082f78def6a8903bee419fbf8e"
+      },
+      tokenIn: {
+        addr: "0xda00000035fef4082F78dEF6A8903bee419FbF8E",
+        symbol: "dUSDCV3",
+        name: "Trade USDC v3",
+        decimals: 6
+      },
+      tokenOut: {
+        addr: "0xF0795C47fA58d00f5F77F4D5c01F31eE891E21B4",
+        symbol: "rUSDC",
+        name: "Resolv USDC",
+        decimals: 6
+      },
+      pool: "0xF0795C47fA58d00f5F77F4D5c01F31eE891E21B4"
     }
   ]
 };

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

@@ -836,11 +836,14 @@ class AbstractCreditAccountService extends import_base.SDKConstruct {
     );
   }
   /**
-   * Returns account price updates in a non-encoded format
+   * Returns price updates in format that is accepted by various credit facade methods (multicall, close/liquidate, etc...).
+   * - If there are desiredQuotas and creditAccount update quotaBalance > 0 || (balance > 10n && isEnabled). Is used when account has both: balances and quota buys.
+   * - If there is creditAccount update balance > 10n && isEnabled. Is used in credit account actions when quota is not being bought.
+   * - If there is desiredQuotas update quotaBalance > 0. Is used on credit account opening, when quota is bought for the first time.
    * @param acc
    * @returns
    */
-  async getOnDemandPriceUpdates(creditManager, creditAccount, desiredQuotas) {
+  async getPriceUpdatesForFacade(creditManager, creditAccount, desiredQuotas) {
     const market = this.sdk.marketRegister.findByCreditManager(creditManager);
     const cm = this.sdk.marketRegister.findCreditManager(creditManager);
     const update = await this.getUpdateForAccount(
@@ -852,24 +855,10 @@ class AbstractCreditAccountService extends import_base.SDKConstruct {
       { account: creditAccount?.creditAccount, manager: cm.name },
       `getting on demand price updates from ${update.txs.length} txs`
     );
-    return market.priceOracle.onDemandPriceUpdates(update);
-  }
-  /**
-   * Returns price updates in format that is accepted by various credit facade methods (multicall, close/liquidate, etc...).
-   * - If there are desiredQuotas and creditAccount update quotaBalance > 0 || (balance > 10n && isEnabled). Is used when account has both: balances and quota buys.
-   * - If there is creditAccount update balance > 10n && isEnabled. Is used in credit account actions when quota is not being bought.
-   * - If there is desiredQuotas update quotaBalance > 0. Is used on credit account opening, when quota is bought for the first time.
-   * @param acc
-   * @returns
-   */
-  async getPriceUpdatesForFacade(creditManager, creditAccount, desiredQuotas) {
-    const cm = this.sdk.marketRegister.findCreditManager(creditManager);
-    const updates = await this.getOnDemandPriceUpdates(
-      creditManager,
-      creditAccount,
-      desiredQuotas
+    return market.priceOracle.onDemandPriceUpdates(
+      cm.creditFacade.address,
+      update
     );
-    return cm.creditFacade.encodeOnDemandPriceUpdates(updates);
   }
   prepareDisableQuotas(ca) {
     const calls = [];

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

@@ -21,7 +21,6 @@ __export(CreditFacadeV300Contract_exports, {
   CreditFacadeV300Contract: () => CreditFacadeV300Contract
 });
 module.exports = __toCommonJS(CreditFacadeV300Contract_exports);
-var import_viem = require("viem");
 var import_iPausable = require("../../../abi/iPausable.js");
 var import_v300 = require("../../../abi/v300.js");
 var import_base = require("../../base/index.js");
@@ -82,16 +81,6 @@ class CreditFacadeV300Contract extends import_base.BaseContract {
         break;
     }
   }
-  encodeOnDemandPriceUpdates(updates) {
-    return updates.map((u) => ({
-      target: this.address,
-      callData: (0, import_viem.encodeFunctionData)({
-        abi: import_v300.iCreditFacadeV300MulticallAbi,
-        functionName: "onDemandPriceUpdate",
-        args: [u.token, u.reserve, u.data]
-      })
-    }));
-  }
   liquidateCreditAccount(ca, to, calls) {
     return this.createRawTx({
       functionName: "liquidateCreditAccount",

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

@@ -21,7 +21,6 @@ __export(CreditFacadeV310Contract_exports, {
   CreditFacadeV310Contract: () => CreditFacadeV310Contract
 });
 module.exports = __toCommonJS(CreditFacadeV310Contract_exports);
-var import_viem = require("viem");
 var import_iPausable = require("../../../abi/iPausable.js");
 var import_v310 = require("../../../abi/v310.js");
 var import_base = require("../../base/index.js");
@@ -82,23 +81,6 @@ class CreditFacadeV310Contract extends import_base.BaseContract {
         break;
     }
   }
-  encodeOnDemandPriceUpdates(updates) {
-    return [
-      {
-        target: this.address,
-        callData: (0, import_viem.encodeFunctionData)({
-          abi: import_v310.iCreditFacadeMulticallV310Abi,
-          functionName: "onDemandPriceUpdates",
-          args: [
-            updates.map((u) => ({
-              priceFeed: u.priceFeed,
-              data: u.data
-            }))
-          ]
-        })
-      }
-    ];
-  }
   liquidateCreditAccount(ca, to, calls) {
     return this.createRawTx({
       functionName: "liquidateCreditAccount",

package/dist/cjs/sdk/market/oracle/PriceOracleBaseContract.js

@@ -34,7 +34,6 @@ module.exports = __toCommonJS(PriceOracleBaseContract_exports);
 var import_date_fns = require("date-fns");
 var import_viem = require("viem");
 var import_compressors = require("../../../abi/compressors.js");
-var import_iUpdatablePriceFeed = require("../../../abi/iUpdatablePriceFeed.js");
 var import_base = require("../../base/index.js");
 var import_constants = require("../../constants/index.js");
 var import_utils = require("../../utils/index.js");
@@ -103,48 +102,6 @@ class PriceOracleBaseContract extends import_base.BaseContract {
     }
     return this.sdk.priceFeeds.generatePriceFeedsUpdateTxs(updatables);
   }
-  /**
-   * Converts previously obtained price updates into CreditFacade multicall entries
-   * @param creditFacade
-   * @param updates
-   * @returns
-   */
-  onDemandPriceUpdates(updates) {
-    const result = [];
-    if (!updates) {
-      this.logger?.debug("empty updates list");
-      return result;
-    }
-    const { txs } = updates;
-    for (const tx of txs) {
-      const { to: priceFeed, callData, description } = tx.raw;
-      const [token, reserve] = this.findTokenForPriceFeed(priceFeed);
-      if (!token) {
-        const mains = this.mainPriceFeeds.values().map((v) => v.address);
-        const reserves = this.reservePriceFeeds.values().map((v) => v.address);
-        this.logger?.debug(
-          { mainPriceFeeds: mains, reservePriceFeeds: reserves },
-          `skipping onDemandPriceUpdate ${description}): token not found for price feed ${priceFeed} in oracle ${this.address}`
-        );
-        continue;
-      }
-      const { args } = (0, import_viem.decodeFunctionData)({
-        abi: import_iUpdatablePriceFeed.iUpdatablePriceFeedAbi,
-        data: callData
-      });
-      const data = args[0];
-      result.push({
-        priceFeed,
-        token,
-        reserve,
-        data
-      });
-    }
-    this.logger?.debug(
-      `got ${result.length} onDemandPriceUpdates from ${txs.length} txs`
-    );
-    return result;
-  }
   /**
    * Gets main price for given token
    * Throws if token price feed is not found or answer is not successful

package/dist/cjs/sdk/market/oracle/PriceOracleV300Contract.js

@@ -21,7 +21,9 @@ __export(PriceOracleV300Contract_exports, {
   PriceOracleV300Contract: () => PriceOracleV300Contract
 });
 module.exports = __toCommonJS(PriceOracleV300Contract_exports);
+var import_viem = require("viem");
 var import_iPausable = require("../../../abi/iPausable.js");
+var import_iUpdatablePriceFeed = require("../../../abi/iUpdatablePriceFeed.js");
 var import_v300 = require("../../../abi/v300.js");
 var import_sdk_gov_legacy = require("../../sdk-gov-legacy/index.js");
 var import_PriceOracleBaseContract = require("./PriceOracleBaseContract.js");
@@ -50,6 +52,55 @@ class PriceOracleV300Contract extends import_PriceOracleBaseContract.PriceOracle
         break;
     }
   }
+  /**
+   * Converts previously obtained price updates into CreditFacade multicall entries
+   * @param creditFacade
+   * @param updates
+   * @returns
+   */
+  onDemandPriceUpdates(creditFacade, updates) {
+    const result = [];
+    if (!updates) {
+      this.logger?.debug("empty updates list");
+      return result;
+    }
+    const { txs } = updates;
+    for (const tx of txs) {
+      const { to: priceFeed, callData, description } = tx.raw;
+      const [token, reserve] = this.findTokenForPriceFeed(priceFeed);
+      if (!token) {
+        const mains = this.mainPriceFeeds.values().map((v) => v.address);
+        const reserves = this.reservePriceFeeds.values().map((v) => v.address);
+        this.logger?.debug(
+          { mainPriceFeeds: mains, reservePriceFeeds: reserves },
+          `skipping onDemandPriceUpdate ${description}): token not found for price feed ${priceFeed} in oracle ${this.address}`
+        );
+        continue;
+      }
+      const { args } = (0, import_viem.decodeFunctionData)({
+        abi: import_iUpdatablePriceFeed.iUpdatablePriceFeedAbi,
+        data: callData
+      });
+      const data = args[0];
+      if (!data) {
+        throw new Error(
+          `failed to decode update price args for ${description}`
+        );
+      }
+      result.push({
+        target: creditFacade,
+        callData: (0, import_viem.encodeFunctionData)({
+          abi: import_v300.iCreditFacadeV300MulticallAbi,
+          functionName: "onDemandPriceUpdate",
+          args: [token, reserve, data]
+        })
+      });
+    }
+    this.logger?.debug(
+      `got ${result.length} onDemandPriceUpdates from ${txs.length} txs`
+    );
+    return result;
+  }
   findTokenForPriceFeed(priceFeed) {
     const [token, reserve] = super.findTokenForPriceFeed(priceFeed);
     if (token) {

package/dist/cjs/sdk/market/oracle/PriceOracleV310Contract.js

@@ -21,6 +21,8 @@ __export(PriceOracleV310Contract_exports, {
   PriceOracleV310Contract: () => PriceOracleV310Contract
 });
 module.exports = __toCommonJS(PriceOracleV310Contract_exports);
+var import_viem = require("viem");
+var import_iUpdatablePriceFeed = require("../../../abi/iUpdatablePriceFeed.js");
 var import_v310 = require("../../../abi/v310.js");
 var import_PriceOracleBaseContract = require("./PriceOracleBaseContract.js");
 const abi = import_v310.iPriceOracleV310Abi;
@@ -36,6 +38,45 @@ class PriceOracleV310Contract extends import_PriceOracleBaseContract.PriceOracle
       data
     );
   }
+  /**
+   * Converts previously obtained price updates into CreditFacade multicall entry
+   * @param creditFacade
+   * @param updates
+   * @returns
+   */
+  onDemandPriceUpdates(creditFacade, updates) {
+    if (!updates) {
+      this.logger?.debug("empty updates list");
+      return [];
+    }
+    return [
+      {
+        target: creditFacade,
+        callData: (0, import_viem.encodeFunctionData)({
+          abi: import_v310.iCreditFacadeMulticallV310Abi,
+          functionName: "onDemandPriceUpdates",
+          args: [
+            updates.txs.map((u) => {
+              const { args } = (0, import_viem.decodeFunctionData)({
+                abi: import_iUpdatablePriceFeed.iUpdatablePriceFeedAbi,
+                data: u.raw.callData
+              });
+              const data = args[0];
+              if (!data) {
+                throw new Error(
+                  `failed to decode update price args for ${u.raw.description}`
+                );
+              }
+              return {
+                priceFeed: u.raw.to,
+                data
+              };
+            })
+          ]
+        })
+      }
+    ];
+  }
   processLog(log) {
     switch (log.eventName) {
       case "SetPriceFeed":

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

@@ -41,6 +41,90 @@ const extraZappers = {
         decimals: 18
       },
       pool: "0xf00B548f1b69cB5EE559d891E03A196FB5101d4A"
+    },
+    {
+      baseParams: {
+        addr: "0x17897d188bb49fea7bfac56e29b07036e16b3537",
+        version: 310n,
+        contractType: "0x5a41505045523a3a5354414b45445f4552433436323600000000000000000000",
+        serializedParams: "0x0000000000000000000000009ef444a6d7f4a5adcd68fd5329aa5240c90e14d2000000000000000000000000da00000035fef4082f78def6a8903bee419fbf8e"
+      },
+      tokenIn: {
+        addr: "0x9ef444a6d7F4A5adcd68FD5329aA5240C90E14d2",
+        symbol: "farmdUSDCV3",
+        name: "Farming of Trade USDC v3",
+        decimals: 6
+      },
+      tokenOut: {
+        addr: "0xC155444481854c60e7a29f4150373f479988F32D",
+        symbol: "USDC",
+        name: "USDC",
+        decimals: 6
+      },
+      pool: "0xC155444481854c60e7a29f4150373f479988F32D"
+    },
+    {
+      baseParams: {
+        addr: "0x70383bac778f0285ddb5f35afbd631e5a4675c58",
+        version: 310n,
+        contractType: "0x5a41505045523a3a5354414b45445f4552433436323600000000000000000000",
+        serializedParams: "0x0000000000000000000000009ef444a6d7f4a5adcd68fd5329aa5240c90e14d2000000000000000000000000da00000035fef4082f78def6a8903bee419fbf8e"
+      },
+      tokenIn: {
+        addr: "0x9ef444a6d7F4A5adcd68FD5329aA5240C90E14d2",
+        symbol: "farmdUSDCV3",
+        name: "Farming of Trade USDC v3",
+        decimals: 6
+      },
+      tokenOut: {
+        addr: "0xF0795C47fA58d00f5F77F4D5c01F31eE891E21B4",
+        symbol: "rUSDC",
+        name: "Resolv USDC",
+        decimals: 6
+      },
+      pool: "0xF0795C47fA58d00f5F77F4D5c01F31eE891E21B4"
+    },
+    {
+      baseParams: {
+        addr: "0x2bC0231a1FC6a9b2E0C44AC1089F47a122a7a8c1",
+        version: 310n,
+        contractType: "0x5a41505045523a3a455243343632360000000000000000000000000000000000",
+        serializedParams: "0x000000000000000000000000da0002859b2d05f66a753d8241fcde8623f26f4f"
+      },
+      tokenIn: {
+        addr: "0xda0002859B2d05F66a753d8241fCDE8623f26F4f",
+        symbol: "dWETHV3",
+        name: "Trade WETH v3",
+        decimals: 18
+      },
+      tokenOut: {
+        addr: "0xf00B548f1b69cB5EE559d891E03A196FB5101d4A",
+        symbol: "dWETHV3-cp0x",
+        name: "Gearbox WETH v3",
+        decimals: 18
+      },
+      pool: "0xf00B548f1b69cB5EE559d891E03A196FB5101d4A"
+    },
+    {
+      baseParams: {
+        addr: "0x62af1fc6e54e66aba5322a3491b5ce1808a6fe89",
+        version: 310n,
+        contractType: "0x5a41505045523a3a455243343632360000000000000000000000000000000000",
+        serializedParams: "0x000000000000000000000000da00000035fef4082f78def6a8903bee419fbf8e"
+      },
+      tokenIn: {
+        addr: "0xda00000035fef4082F78dEF6A8903bee419FbF8E",
+        symbol: "dUSDCV3",
+        name: "Trade USDC v3",
+        decimals: 6
+      },
+      tokenOut: {
+        addr: "0xF0795C47fA58d00f5F77F4D5c01F31eE891E21B4",
+        symbol: "rUSDC",
+        name: "Resolv USDC",
+        decimals: 6
+      },
+      pool: "0xF0795C47fA58d00f5F77F4D5c01F31eE891E21B4"
     }
   ]
 };

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

@@ -827,11 +827,14 @@ class AbstractCreditAccountService extends SDKConstruct {
     );
   }
   /**
-   * Returns account price updates in a non-encoded format
+   * Returns price updates in format that is accepted by various credit facade methods (multicall, close/liquidate, etc...).
+   * - If there are desiredQuotas and creditAccount update quotaBalance > 0 || (balance > 10n && isEnabled). Is used when account has both: balances and quota buys.
+   * - If there is creditAccount update balance > 10n && isEnabled. Is used in credit account actions when quota is not being bought.
+   * - If there is desiredQuotas update quotaBalance > 0. Is used on credit account opening, when quota is bought for the first time.
    * @param acc
    * @returns
    */
-  async getOnDemandPriceUpdates(creditManager, creditAccount, desiredQuotas) {
+  async getPriceUpdatesForFacade(creditManager, creditAccount, desiredQuotas) {
     const market = this.sdk.marketRegister.findByCreditManager(creditManager);
     const cm = this.sdk.marketRegister.findCreditManager(creditManager);
     const update = await this.getUpdateForAccount(
@@ -843,24 +846,10 @@ class AbstractCreditAccountService extends SDKConstruct {
       { account: creditAccount?.creditAccount, manager: cm.name },
       `getting on demand price updates from ${update.txs.length} txs`
     );
-    return market.priceOracle.onDemandPriceUpdates(update);
-  }
-  /**
-   * Returns price updates in format that is accepted by various credit facade methods (multicall, close/liquidate, etc...).
-   * - If there are desiredQuotas and creditAccount update quotaBalance > 0 || (balance > 10n && isEnabled). Is used when account has both: balances and quota buys.
-   * - If there is creditAccount update balance > 10n && isEnabled. Is used in credit account actions when quota is not being bought.
-   * - If there is desiredQuotas update quotaBalance > 0. Is used on credit account opening, when quota is bought for the first time.
-   * @param acc
-   * @returns
-   */
-  async getPriceUpdatesForFacade(creditManager, creditAccount, desiredQuotas) {
-    const cm = this.sdk.marketRegister.findCreditManager(creditManager);
-    const updates = await this.getOnDemandPriceUpdates(
-      creditManager,
-      creditAccount,
-      desiredQuotas
+    return market.priceOracle.onDemandPriceUpdates(
+      cm.creditFacade.address,
+      update
     );
-    return cm.creditFacade.encodeOnDemandPriceUpdates(updates);
   }
   prepareDisableQuotas(ca) {
     const calls = [];

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

@@ -1,4 +1,3 @@
-import { encodeFunctionData } from "viem";
 import { iPausableAbi } from "../../../abi/iPausable.js";
 import {
   iCreditFacadeV300Abi,
@@ -62,16 +61,6 @@ class CreditFacadeV300Contract extends BaseContract {
         break;
     }
   }
-  encodeOnDemandPriceUpdates(updates) {
-    return updates.map((u) => ({
-      target: this.address,
-      callData: encodeFunctionData({
-        abi: iCreditFacadeV300MulticallAbi,
-        functionName: "onDemandPriceUpdate",
-        args: [u.token, u.reserve, u.data]
-      })
-    }));
-  }
   liquidateCreditAccount(ca, to, calls) {
     return this.createRawTx({
       functionName: "liquidateCreditAccount",

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

@@ -1,4 +1,3 @@
-import { encodeFunctionData } from "viem";
 import { iPausableAbi } from "../../../abi/iPausable.js";
 import {
   iCreditFacadeMulticallV310Abi,
@@ -62,23 +61,6 @@ class CreditFacadeV310Contract extends BaseContract {
         break;
     }
   }
-  encodeOnDemandPriceUpdates(updates) {
-    return [
-      {
-        target: this.address,
-        callData: encodeFunctionData({
-          abi: iCreditFacadeMulticallV310Abi,
-          functionName: "onDemandPriceUpdates",
-          args: [
-            updates.map((u) => ({
-              priceFeed: u.priceFeed,
-              data: u.data
-            }))
-          ]
-        })
-      }
-    ];
-  }
   liquidateCreditAccount(ca, to, calls) {
     return this.createRawTx({
       functionName: "liquidateCreditAccount",

package/dist/esm/sdk/market/oracle/PriceOracleBaseContract.js

@@ -1,7 +1,6 @@
 import { format, formatDistanceToNow } from "date-fns";
-import { decodeFunctionData, stringToHex } from "viem";
+import { stringToHex } from "viem";
 import { iPriceFeedCompressorAbi } from "../../../abi/compressors.js";
-import { iUpdatablePriceFeedAbi } from "../../../abi/iUpdatablePriceFeed.js";
 import { BaseContract } from "../../base/index.js";
 import {
   AP_PRICE_FEED_COMPRESSOR,
@@ -74,48 +73,6 @@ class PriceOracleBaseContract extends BaseContract {
     }
     return this.sdk.priceFeeds.generatePriceFeedsUpdateTxs(updatables);
   }
-  /**
-   * Converts previously obtained price updates into CreditFacade multicall entries
-   * @param creditFacade
-   * @param updates
-   * @returns
-   */
-  onDemandPriceUpdates(updates) {
-    const result = [];
-    if (!updates) {
-      this.logger?.debug("empty updates list");
-      return result;
-    }
-    const { txs } = updates;
-    for (const tx of txs) {
-      const { to: priceFeed, callData, description } = tx.raw;
-      const [token, reserve] = this.findTokenForPriceFeed(priceFeed);
-      if (!token) {
-        const mains = this.mainPriceFeeds.values().map((v) => v.address);
-        const reserves = this.reservePriceFeeds.values().map((v) => v.address);
-        this.logger?.debug(
-          { mainPriceFeeds: mains, reservePriceFeeds: reserves },
-          `skipping onDemandPriceUpdate ${description}): token not found for price feed ${priceFeed} in oracle ${this.address}`
-        );
-        continue;
-      }
-      const { args } = decodeFunctionData({
-        abi: iUpdatablePriceFeedAbi,
-        data: callData
-      });
-      const data = args[0];
-      result.push({
-        priceFeed,
-        token,
-        reserve,
-        data
-      });
-    }
-    this.logger?.debug(
-      `got ${result.length} onDemandPriceUpdates from ${txs.length} txs`
-    );
-    return result;
-  }
   /**
    * Gets main price for given token
    * Throws if token price feed is not found or answer is not successful

package/dist/esm/sdk/market/oracle/PriceOracleV300Contract.js

@@ -1,5 +1,13 @@
+import {
+  decodeFunctionData,
+  encodeFunctionData
+} from "viem";
 import { iPausableAbi } from "../../../abi/iPausable.js";
-import { iPriceOracleV300Abi } from "../../../abi/v300.js";
+import { iUpdatablePriceFeedAbi } from "../../../abi/iUpdatablePriceFeed.js";
+import {
+  iCreditFacadeV300MulticallAbi,
+  iPriceOracleV300Abi
+} from "../../../abi/v300.js";
 import { tickerInfoTokensByNetwork } from "../../sdk-gov-legacy/index.js";
 import { PriceOracleBaseContract } from "./PriceOracleBaseContract.js";
 const abi = [...iPriceOracleV300Abi, ...iPausableAbi];
@@ -27,6 +35,55 @@ class PriceOracleV300Contract extends PriceOracleBaseContract {
         break;
     }
   }
+  /**
+   * Converts previously obtained price updates into CreditFacade multicall entries
+   * @param creditFacade
+   * @param updates
+   * @returns
+   */
+  onDemandPriceUpdates(creditFacade, updates) {
+    const result = [];
+    if (!updates) {
+      this.logger?.debug("empty updates list");
+      return result;
+    }
+    const { txs } = updates;
+    for (const tx of txs) {
+      const { to: priceFeed, callData, description } = tx.raw;
+      const [token, reserve] = this.findTokenForPriceFeed(priceFeed);
+      if (!token) {
+        const mains = this.mainPriceFeeds.values().map((v) => v.address);
+        const reserves = this.reservePriceFeeds.values().map((v) => v.address);
+        this.logger?.debug(
+          { mainPriceFeeds: mains, reservePriceFeeds: reserves },
+          `skipping onDemandPriceUpdate ${description}): token not found for price feed ${priceFeed} in oracle ${this.address}`
+        );
+        continue;
+      }
+      const { args } = decodeFunctionData({
+        abi: iUpdatablePriceFeedAbi,
+        data: callData
+      });
+      const data = args[0];
+      if (!data) {
+        throw new Error(
+          `failed to decode update price args for ${description}`
+        );
+      }
+      result.push({
+        target: creditFacade,
+        callData: encodeFunctionData({
+          abi: iCreditFacadeV300MulticallAbi,
+          functionName: "onDemandPriceUpdate",
+          args: [token, reserve, data]
+        })
+      });
+    }
+    this.logger?.debug(
+      `got ${result.length} onDemandPriceUpdates from ${txs.length} txs`
+    );
+    return result;
+  }
   findTokenForPriceFeed(priceFeed) {
     const [token, reserve] = super.findTokenForPriceFeed(priceFeed);
     if (token) {

package/dist/esm/sdk/market/oracle/PriceOracleV310Contract.js

@@ -1,4 +1,12 @@
-import { iPriceOracleV310Abi } from "../../../abi/v310.js";
+import {
+  decodeFunctionData,
+  encodeFunctionData
+} from "viem";
+import { iUpdatablePriceFeedAbi } from "../../../abi/iUpdatablePriceFeed.js";
+import {
+  iCreditFacadeMulticallV310Abi,
+  iPriceOracleV310Abi
+} from "../../../abi/v310.js";
 import { PriceOracleBaseContract } from "./PriceOracleBaseContract.js";
 const abi = iPriceOracleV310Abi;
 class PriceOracleV310Contract extends PriceOracleBaseContract {
@@ -13,6 +21,45 @@ class PriceOracleV310Contract extends PriceOracleBaseContract {
       data
     );
   }
+  /**
+   * Converts previously obtained price updates into CreditFacade multicall entry
+   * @param creditFacade
+   * @param updates
+   * @returns
+   */
+  onDemandPriceUpdates(creditFacade, updates) {
+    if (!updates) {
+      this.logger?.debug("empty updates list");
+      return [];
+    }
+    return [
+      {
+        target: creditFacade,
+        callData: encodeFunctionData({
+          abi: iCreditFacadeMulticallV310Abi,
+          functionName: "onDemandPriceUpdates",
+          args: [
+            updates.txs.map((u) => {
+              const { args } = decodeFunctionData({
+                abi: iUpdatablePriceFeedAbi,
+                data: u.raw.callData
+              });
+              const data = args[0];
+              if (!data) {
+                throw new Error(
+                  `failed to decode update price args for ${u.raw.description}`
+                );
+              }
+              return {
+                priceFeed: u.raw.to,
+                data
+              };
+            })
+          ]
+        })
+      }
+    ];
+  }
   processLog(log) {
     switch (log.eventName) {
       case "SetPriceFeed":

package/dist/types/sdk/accounts/AbstractCreditAccountsService.d.ts

@@ -2,7 +2,7 @@ import type { Address } from "viem";
 import type { CreditAccountData } from "../base/index.js";
 import { SDKConstruct } from "../base/index.js";
 import type { GearboxSDK } from "../GearboxSDK.js";
-import type { OnDemandPriceUpdate, UpdatePriceFeedsResult } from "../market/index.js";
+import type { UpdatePriceFeedsResult } from "../market/index.js";
 import { type Asset, type RouterCASlice } from "../router/index.js";
 import type { MultiCall } from "../types/index.js";
 import type { ClaimDelayedProps, FullyLiquidateProps, GetConnectedBotsResult, StartDelayedWithdrawalProps } from "./types";
@@ -179,12 +179,6 @@ export declare abstract class AbstractCreditAccountService extends SDKConstruct
      */
     getUpdateForAccounts(accounts: Array<RouterCASlice>): Promise<UpdatePriceFeedsResult>;
     protected getUpdateForAccount(creditManager: Address, creditAccount: RouterCASlice | undefined, desiredQuotas: Array<Asset> | undefined): Promise<UpdatePriceFeedsResult>;
-    /**
-     * Returns account price updates in a non-encoded format
-     * @param acc
-     * @returns
-     */
-    getOnDemandPriceUpdates(creditManager: Address, creditAccount: RouterCASlice | undefined, desiredQuotas: Array<Asset> | undefined): Promise<Array<OnDemandPriceUpdate>>;
     /**
      * Returns price updates in format that is accepted by various credit facade methods (multicall, close/liquidate, etc...).
      * - If there are desiredQuotas and creditAccount update quotaBalance > 0 || (balance > 10n && isEnabled). Is used when account has both: balances and quota buys.

package/dist/types/sdk/accounts/types.d.ts

@@ -3,7 +3,7 @@ import type { iCreditAccountCompressorAbi } from "../../abi/compressors.js";
 import type { BotType } from "../../plugins/bots/types.js";
 import type { ConnectedBotData, CreditAccountData } from "../base/index.js";
 import type { SDKConstruct } from "../base/SDKConstruct.js";
-import type { CreditSuite, OnDemandPriceUpdate, UpdatePriceFeedsResult } from "../market/index.js";
+import type { CreditSuite, UpdatePriceFeedsResult } from "../market/index.js";
 import type { Asset, RouterCASlice, RouterCloseResult } from "../router/index.js";
 import type { MultiCall, RawTx } from "../types/index.js";
 export type GetCreditAccountsArgs = ContractFunctionArgs<typeof iCreditAccountCompressorAbi, "pure" | "view", "getCreditAccounts">;
@@ -492,12 +492,6 @@ export interface ICreditAccountsService extends SDKConstruct {
      * @returns
      */
     getUpdateForAccounts(accounts: Array<RouterCASlice>): Promise<UpdatePriceFeedsResult>;
-    /**
-     * Returns account price updates in a non-encoded format
-     * @param acc
-     * @returns
-     */
-    getOnDemandPriceUpdates(creditManager: Address, creditAccount: RouterCASlice | undefined, desiredQuotas: Array<Asset> | undefined): Promise<Array<OnDemandPriceUpdate>>;
     /**
      * Withdraws a single collateral from credit account to wallet to and updates quotas;
      * technically can withdraw several tokens at once

package/dist/types/sdk/market/credit/CreditFacadeV300Contract.d.ts

@@ -3,7 +3,6 @@ import type { CreditFacadeState, CreditSuiteState } from "../../base/index.js";
 import { BaseContract } from "../../base/index.js";
 import type { GearboxSDK } from "../../GearboxSDK.js";
 import type { CreditFacadeStateHuman, MultiCall, RawTx } from "../../types/index.js";
-import type { OnDemandPriceUpdate } from "../oracle/index.js";
 declare const abi: readonly [{
     readonly type: "function";
     readonly name: "botList";
@@ -781,7 +780,6 @@ export declare class CreditFacadeV300Contract extends BaseContract<abi> {
     constructor(sdk: GearboxSDK, { creditFacade, creditManager }: CreditSuiteState);
     stateHuman(raw?: boolean): CreditFacadeStateHuman;
     processLog(log: Log<bigint, number, false, undefined, undefined, abi, ContractEventName<abi>>): void;
-    encodeOnDemandPriceUpdates(updates: OnDemandPriceUpdate[]): MultiCall[];
     liquidateCreditAccount(ca: Address, to: Address, calls: MultiCall[]): RawTx;
     closeCreditAccount(ca: Address, calls: MultiCall[]): RawTx;
     multicall(ca: Address, calls: MultiCall[]): RawTx;

package/dist/types/sdk/market/credit/CreditFacadeV310Contract.d.ts

@@ -3,7 +3,6 @@ import type { CreditFacadeState, CreditSuiteState } from "../../base/index.js";
 import { BaseContract } from "../../base/index.js";
 import type { GearboxSDK } from "../../GearboxSDK.js";
 import type { CreditFacadeStateHuman, MultiCall, RawTx } from "../../types/index.js";
-import type { OnDemandPriceUpdate } from "../oracle/index.js";
 declare const abi: readonly [{
     readonly type: "function";
     readonly inputs: readonly [];
@@ -854,7 +853,6 @@ export declare class CreditFacadeV310Contract extends BaseContract<abi> {
     constructor(sdk: GearboxSDK, { creditFacade, creditManager }: CreditSuiteState);
     stateHuman(raw?: boolean): CreditFacadeStateHuman;
     processLog(log: Log<bigint, number, false, undefined, undefined, abi, ContractEventName<abi>>): void;
-    encodeOnDemandPriceUpdates(updates: OnDemandPriceUpdate[]): MultiCall[];
     liquidateCreditAccount(ca: Address, to: Address, calls: MultiCall[]): RawTx;
     closeCreditAccount(ca: Address, calls: MultiCall[]): RawTx;
     multicall(ca: Address, calls: MultiCall[]): RawTx;

package/dist/types/sdk/market/oracle/PriceOracleBaseContract.d.ts

@@ -3,12 +3,12 @@ import type { BaseContractOptions } from "../../base/BaseContract.js";
 import type { PriceOracleData } from "../../base/index.js";
 import { BaseContract } from "../../base/index.js";
 import type { GearboxSDK } from "../../GearboxSDK.js";
-import type { PriceOracleStateHuman } from "../../types/index.js";
+import type { MultiCall, PriceOracleStateHuman } from "../../types/index.js";
 import { AddressMap } from "../../utils/index.js";
 import type { IPriceFeedContract, UpdatePriceFeedsResult } from "../pricefeeds/index.js";
 import { PriceFeedRef } from "../pricefeeds/index.js";
 import PriceFeedAnswerMap from "./PriceFeedAnswerMap.js";
-import type { DelegatedOracleMulticall, IPriceOracleContract, OnDemandPriceUpdate, PriceFeedsForTokensOptions } from "./types.js";
+import type { DelegatedOracleMulticall, IPriceOracleContract, PriceFeedsForTokensOptions } from "./types.js";
 export declare abstract class PriceOracleBaseContract<abi extends Abi | readonly unknown[]> extends BaseContract<abi> implements IPriceOracleContract {
     #private;
     /**
@@ -40,13 +40,7 @@ export declare abstract class PriceOracleBaseContract<abi extends Abi | readonly
      * @returns
      */
     updatePriceFeeds(): Promise<UpdatePriceFeedsResult>;
-    /**
-     * Converts previously obtained price updates into CreditFacade multicall entries
-     * @param creditFacade
-     * @param updates
-     * @returns
-     */
-    onDemandPriceUpdates(updates?: UpdatePriceFeedsResult): OnDemandPriceUpdate[];
+    abstract onDemandPriceUpdates(creditFacade: Address, updates?: UpdatePriceFeedsResult): MultiCall[];
     /**
      * Gets main price for given token
      * Throws if token price feed is not found or answer is not successful

package/dist/types/sdk/market/oracle/PriceOracleV300Contract.d.ts

@@ -1,6 +1,8 @@
-import type { Address, ContractEventName, Log } from "viem";
+import { type Address, type ContractEventName, type Log } from "viem";
 import type { PriceOracleData } from "../../base/index.js";
 import type { GearboxSDK } from "../../GearboxSDK.js";
+import type { MultiCall } from "../../types/index.js";
+import type { UpdatePriceFeedsResult } from "../pricefeeds/index.js";
 import { PriceOracleBaseContract } from "./PriceOracleBaseContract.js";
 declare const abi: ({
     readonly type: "function";
@@ -355,6 +357,13 @@ type abi = typeof abi;
 export declare class PriceOracleV300Contract extends PriceOracleBaseContract<abi> {
     constructor(sdk: GearboxSDK, data: PriceOracleData);
     processLog(log: Log<bigint, number, false, undefined, undefined, abi, ContractEventName<abi>>): void;
+    /**
+     * Converts previously obtained price updates into CreditFacade multicall entries
+     * @param creditFacade
+     * @param updates
+     * @returns
+     */
+    onDemandPriceUpdates(creditFacade: Address, updates?: UpdatePriceFeedsResult): MultiCall[];
     findTokenForPriceFeed(priceFeed: Address): [token: Address | undefined, reserve: boolean];
 }
 export {};

package/dist/types/sdk/market/oracle/PriceOracleV310Contract.d.ts

@@ -1,6 +1,8 @@
-import type { ContractEventName, Log } from "viem";
+import { type Address, type ContractEventName, type Log } from "viem";
 import type { PriceOracleData } from "../../base/index.js";
 import type { GearboxSDK } from "../../GearboxSDK.js";
+import type { MultiCall } from "../../types/index.js";
+import type { UpdatePriceFeedsResult } from "../pricefeeds/index.js";
 import { PriceOracleBaseContract } from "./PriceOracleBaseContract.js";
 declare const abi: readonly [{
     readonly type: "function";
@@ -340,6 +342,13 @@ declare const abi: readonly [{
 type abi = typeof abi;
 export declare class PriceOracleV310Contract extends PriceOracleBaseContract<abi> {
     constructor(sdk: GearboxSDK, data: PriceOracleData);
+    /**
+     * Converts previously obtained price updates into CreditFacade multicall entry
+     * @param creditFacade
+     * @param updates
+     * @returns
+     */
+    onDemandPriceUpdates(creditFacade: Address, updates?: UpdatePriceFeedsResult): MultiCall[];
     processLog(log: Log<bigint, number, false, undefined, undefined, abi, ContractEventName<abi>>): void;
 }
 export {};

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

@@ -1,7 +1,7 @@
-import type { Address, ContractFunctionParameters, ContractFunctionReturnType, Hex } from "viem";
+import type { Address, ContractFunctionParameters, ContractFunctionReturnType } from "viem";
 import type { iPriceFeedCompressorAbi } from "../../../abi/compressors.js";
 import type { IBaseContract } from "../../base/index.js";
-import type { PriceOracleStateHuman } from "../../types/index.js";
+import type { MultiCall, PriceOracleStateHuman } from "../../types/index.js";
 import type { AddressMap } from "../../utils/index.js";
 import type { IPriceFeedContract, PriceFeedRef, UpdatePriceFeedsResult } from "../pricefeeds/index.js";
 import type PriceFeedAnswerMap from "./PriceFeedAnswerMap.js";
@@ -9,16 +9,6 @@ export interface PriceFeedsForTokensOptions {
     main?: boolean;
     reserve?: boolean;
 }
-/**
- * Data to be passed to credit facade's multicall
- * Compatible with both v300 and v310 facades
- */
-export interface OnDemandPriceUpdate {
-    priceFeed: Address;
-    token: Address;
-    reserve: boolean;
-    data: Hex;
-}
 export interface IPriceOracleContract extends IBaseContract {
     mainPriceFeeds: AddressMap<PriceFeedRef>;
     mainPrices: PriceFeedAnswerMap;
@@ -82,7 +72,7 @@ export interface IPriceOracleContract extends IBaseContract {
      * @param updates
      * @returns
      */
-    onDemandPriceUpdates: (updates?: UpdatePriceFeedsResult) => OnDemandPriceUpdate[];
+    onDemandPriceUpdates: (creditFacade: Address, updates?: UpdatePriceFeedsResult) => MultiCall[];
     /**
      * Tries to convert amount of from one token to another, using latest known prices
      * @param from

package/package.json

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