@gearbox-protocol/sdk 3.0.0-vfour.348 → 3.0.0-vfour.349

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

@@ -0,0 +1,37 @@
+"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 PriceFeedAnswerMap_exports = {};
+__export(PriceFeedAnswerMap_exports, {
+  default: () => PriceFeedAnswerMap
+});
+module.exports = __toCommonJS(PriceFeedAnswerMap_exports);
+var import_utils = require("../../utils/index.js");
+class PriceFeedAnswerMap extends import_utils.AddressMap {
+  price(token) {
+    const answer = this.get(token);
+    if (!answer) {
+      throw new Error(`no answer found`);
+    }
+    const { success, price } = answer;
+    if (!success) {
+      throw new Error(`answer is not successful`);
+    }
+    return price;
+  }
+}

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

@@ -1,7 +1,9 @@
 "use strict";
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -15,6 +17,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var PriceOracleBaseContract_exports = {};
 __export(PriceOracleBaseContract_exports, {
@@ -29,6 +39,7 @@ var import_base = require("../../base/index.js");
 var import_constants = require("../../constants/index.js");
 var import_utils = require("../../utils/index.js");
 var import_pricefeeds = require("../pricefeeds/index.js");
+var import_PriceFeedAnswerMap = __toESM(require("./PriceFeedAnswerMap.js"));
 const ZERO_PRICE_FEED = (0, import_viem.stringToHex)("PRICE_FEED::ZERO", { size: 32 });
 class PriceOracleBaseContract extends import_base.BaseContract {
   /**
@@ -50,24 +61,16 @@ class PriceOracleBaseContract extends import_base.BaseContract {
     "reservePriceFeeds"
   );
   /**
-   * Mapping Token => Price in underlying
+   * Mapping Token => Price in USD
    */
-  mainPrices = new import_utils.AddressMap(void 0, "mainPrices");
+  mainPrices = new import_PriceFeedAnswerMap.default(void 0, "mainPrices");
   /**
-   * Same, but with details
+   * Mapping Token => Price in USD
    */
-  #mainPrices = new import_utils.AddressMap();
-  /**
-   * Mapping Token => Price in underlying
-   */
-  reservePrices = new import_utils.AddressMap(
+  reservePrices = new import_PriceFeedAnswerMap.default(
     void 0,
     "reservePrices"
   );
-  /**
-   * Same, but with debug details
-   */
-  #reservePrices = new import_utils.AddressMap();
   #priceFeedTree = [];
   constructor(sdk, args, data, underlying) {
     super(sdk, args);
@@ -141,6 +144,24 @@ class PriceOracleBaseContract extends import_base.BaseContract {
     );
     return result;
   }
+  /**
+   * Gets main price for given token
+   * Throws if token price feed is not found or answer is not successful
+   * @param token
+   * @returns
+   */
+  mainPrice(token) {
+    return this.mainPrices.price(token);
+  }
+  /**
+   * Gets reserve price for given token
+   * Throws if token price feed is not found or answer is not successful
+   * @param token
+   * @returns
+   */
+  reservePrice(token) {
+    return this.reservePrices.price(token);
+  }
   /**
    * Returns true if oracle's price feed tree contains given price feed
    * @param priceFeed
@@ -172,9 +193,9 @@ class PriceOracleBaseContract extends import_base.BaseContract {
     if (from === to) {
       return amount;
     }
-    const fromPrice = reserve ? this.reservePrices.mustGet(from) : this.mainPrices.mustGet(from);
+    const fromPrice = reserve ? this.reservePrice(from) : this.mainPrice(from);
     const fromScale = 10n ** BigInt(this.sdk.tokensMeta.decimals(from));
-    const toPrice = reserve ? this.reservePrices.mustGet(to) : this.mainPrices.mustGet(to);
+    const toPrice = reserve ? this.reservePrice(to) : this.mainPrice(to);
     const toScale = 10n ** BigInt(this.sdk.tokensMeta.decimals(to));
     return amount * fromPrice * toScale / (toPrice * fromScale);
   }
@@ -186,7 +207,7 @@ class PriceOracleBaseContract extends import_base.BaseContract {
    * @param reserve
    */
   convertToUSD(from, amount, reserve = false) {
-    const price = reserve ? this.reservePrices.mustGet(from) : this.mainPrices.mustGet(from);
+    const price = reserve ? this.reservePrice(from) : this.mainPrice(from);
     const scale = 10n ** BigInt(this.sdk.tokensMeta.decimals(from));
     return amount * price / scale;
   }
@@ -244,22 +265,16 @@ class PriceOracleBaseContract extends import_base.BaseContract {
       const priceFeedType = node?.baseParams.contractType;
       if (reserve) {
         this.reservePriceFeeds.upsert(token, ref);
-        if (price !== void 0) {
-          this.reservePrices.upsert(token, price);
-        }
+        this.reservePrices.upsert(token, node?.answer);
         if (!price && priceFeedType !== ZERO_PRICE_FEED) {
           this.#noAnswerWarn(priceFeed, node);
         }
-        this.#reservePrices.upsert(token, node?.answer);
       } else {
         this.mainPriceFeeds.upsert(token, ref);
-        if (price !== void 0) {
-          this.mainPrices.upsert(token, price);
-        }
+        this.mainPrices.upsert(token, node?.answer);
         if (!price && priceFeedType !== ZERO_PRICE_FEED) {
           this.#noAnswerWarn(priceFeed, node);
         }
-        this.#mainPrices.upsert(token, node?.answer);
       }
       this.#labelPriceFeed(priceFeed, reserve ? "Reserve" : "Main", token);
     });
@@ -309,13 +324,13 @@ class PriceOracleBaseContract extends import_base.BaseContract {
         this.reservePriceFeeds.entries().map(([token, v]) => [this.labelAddress(token), v.stateHuman(raw)])
       ),
       mainPrices: Object.fromEntries(
-        this.#mainPrices.entries().map(([token, answer]) => [
+        this.mainPrices.entries().map(([token, answer]) => [
           this.labelAddress(token),
           formatAnswer(answer, raw)
         ])
       ),
       reservePrices: Object.fromEntries(
-        this.#reservePrices.entries().map(([token, answer]) => [
+        this.reservePrices.entries().map(([token, answer]) => [
           this.labelAddress(token),
           formatAnswer(answer, raw)
         ])

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

@@ -120,6 +120,9 @@ class AddressMap {
   freeze() {
     this.#frozen = true;
   }
+  get name() {
+    return this.#name;
+  }
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

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

@@ -0,0 +1,17 @@
+import { AddressMap } from "../../utils/index.js";
+class PriceFeedAnswerMap extends AddressMap {
+  price(token) {
+    const answer = this.get(token);
+    if (!answer) {
+      throw new Error(`no answer found`);
+    }
+    const { success, price } = answer;
+    if (!success) {
+      throw new Error(`answer is not successful`);
+    }
+    return price;
+  }
+}
+export {
+  PriceFeedAnswerMap as default
+};

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

@@ -6,6 +6,7 @@ import { BaseContract } from "../../base/index.js";
 import { AP_PRICE_FEED_COMPRESSOR } from "../../constants/index.js";
 import { AddressMap, formatBN } from "../../utils/index.js";
 import { PriceFeedRef } from "../pricefeeds/index.js";
+import PriceFeedAnswerMap from "./PriceFeedAnswerMap.js";
 const ZERO_PRICE_FEED = stringToHex("PRICE_FEED::ZERO", { size: 32 });
 class PriceOracleBaseContract extends BaseContract {
   /**
@@ -27,24 +28,16 @@ class PriceOracleBaseContract extends BaseContract {
     "reservePriceFeeds"
   );
   /**
-   * Mapping Token => Price in underlying
+   * Mapping Token => Price in USD
    */
-  mainPrices = new AddressMap(void 0, "mainPrices");
+  mainPrices = new PriceFeedAnswerMap(void 0, "mainPrices");
   /**
-   * Same, but with details
+   * Mapping Token => Price in USD
    */
-  #mainPrices = new AddressMap();
-  /**
-   * Mapping Token => Price in underlying
-   */
-  reservePrices = new AddressMap(
+  reservePrices = new PriceFeedAnswerMap(
     void 0,
     "reservePrices"
   );
-  /**
-   * Same, but with debug details
-   */
-  #reservePrices = new AddressMap();
   #priceFeedTree = [];
   constructor(sdk, args, data, underlying) {
     super(sdk, args);
@@ -118,6 +111,24 @@ class PriceOracleBaseContract extends BaseContract {
     );
     return result;
   }
+  /**
+   * Gets main price for given token
+   * Throws if token price feed is not found or answer is not successful
+   * @param token
+   * @returns
+   */
+  mainPrice(token) {
+    return this.mainPrices.price(token);
+  }
+  /**
+   * Gets reserve price for given token
+   * Throws if token price feed is not found or answer is not successful
+   * @param token
+   * @returns
+   */
+  reservePrice(token) {
+    return this.reservePrices.price(token);
+  }
   /**
    * Returns true if oracle's price feed tree contains given price feed
    * @param priceFeed
@@ -149,9 +160,9 @@ class PriceOracleBaseContract extends BaseContract {
     if (from === to) {
       return amount;
     }
-    const fromPrice = reserve ? this.reservePrices.mustGet(from) : this.mainPrices.mustGet(from);
+    const fromPrice = reserve ? this.reservePrice(from) : this.mainPrice(from);
     const fromScale = 10n ** BigInt(this.sdk.tokensMeta.decimals(from));
-    const toPrice = reserve ? this.reservePrices.mustGet(to) : this.mainPrices.mustGet(to);
+    const toPrice = reserve ? this.reservePrice(to) : this.mainPrice(to);
     const toScale = 10n ** BigInt(this.sdk.tokensMeta.decimals(to));
     return amount * fromPrice * toScale / (toPrice * fromScale);
   }
@@ -163,7 +174,7 @@ class PriceOracleBaseContract extends BaseContract {
    * @param reserve
    */
   convertToUSD(from, amount, reserve = false) {
-    const price = reserve ? this.reservePrices.mustGet(from) : this.mainPrices.mustGet(from);
+    const price = reserve ? this.reservePrice(from) : this.mainPrice(from);
     const scale = 10n ** BigInt(this.sdk.tokensMeta.decimals(from));
     return amount * price / scale;
   }
@@ -221,22 +232,16 @@ class PriceOracleBaseContract extends BaseContract {
       const priceFeedType = node?.baseParams.contractType;
       if (reserve) {
         this.reservePriceFeeds.upsert(token, ref);
-        if (price !== void 0) {
-          this.reservePrices.upsert(token, price);
-        }
+        this.reservePrices.upsert(token, node?.answer);
         if (!price && priceFeedType !== ZERO_PRICE_FEED) {
           this.#noAnswerWarn(priceFeed, node);
         }
-        this.#reservePrices.upsert(token, node?.answer);
       } else {
         this.mainPriceFeeds.upsert(token, ref);
-        if (price !== void 0) {
-          this.mainPrices.upsert(token, price);
-        }
+        this.mainPrices.upsert(token, node?.answer);
         if (!price && priceFeedType !== ZERO_PRICE_FEED) {
           this.#noAnswerWarn(priceFeed, node);
         }
-        this.#mainPrices.upsert(token, node?.answer);
       }
       this.#labelPriceFeed(priceFeed, reserve ? "Reserve" : "Main", token);
     });
@@ -286,13 +291,13 @@ class PriceOracleBaseContract extends BaseContract {
         this.reservePriceFeeds.entries().map(([token, v]) => [this.labelAddress(token), v.stateHuman(raw)])
       ),
       mainPrices: Object.fromEntries(
-        this.#mainPrices.entries().map(([token, answer]) => [
+        this.mainPrices.entries().map(([token, answer]) => [
           this.labelAddress(token),
           formatAnswer(answer, raw)
         ])
       ),
       reservePrices: Object.fromEntries(
-        this.#reservePrices.entries().map(([token, answer]) => [
+        this.reservePrices.entries().map(([token, answer]) => [
           this.labelAddress(token),
           formatAnswer(answer, raw)
         ])

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

@@ -97,6 +97,9 @@ class AddressMap {
   freeze() {
     this.#frozen = true;
   }
+  get name() {
+    return this.#name;
+  }
 }
 export {
   AddressMap

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

@@ -0,0 +1,6 @@
+import type { Address } from "viem";
+import type { PriceFeedAnswer } from "../../base/index.js";
+import { AddressMap } from "../../utils/index.js";
+export default class PriceFeedAnswerMap extends AddressMap<PriceFeedAnswer> {
+    price(token: Address): bigint;
+}

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

@@ -7,6 +7,7 @@ import type { 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 { IPriceOracleContract, OnDemandPriceUpdate, PriceFeedsForTokensOptions } from "./types.js";
 export declare class PriceOracleBaseContract<abi extends Abi | readonly unknown[]> extends BaseContract<abi> implements IPriceOracleContract {
     #private;
@@ -23,13 +24,13 @@ export declare class PriceOracleBaseContract<abi extends Abi | readonly unknown[
      */
     readonly reservePriceFeeds: AddressMap<PriceFeedRef>;
     /**
-     * Mapping Token => Price in underlying
+     * Mapping Token => Price in USD
      */
-    readonly mainPrices: AddressMap<bigint>;
+    readonly mainPrices: PriceFeedAnswerMap;
     /**
-     * Mapping Token => Price in underlying
+     * Mapping Token => Price in USD
      */
-    readonly reservePrices: AddressMap<bigint>;
+    readonly reservePrices: PriceFeedAnswerMap;
     constructor(sdk: GearboxSDK, args: BaseContractOptions<abi>, data: PriceOracleData, underlying: Address);
     /**
      * Returns main and reserve price feeds for given tokens
@@ -50,6 +51,20 @@ export declare class PriceOracleBaseContract<abi extends Abi | readonly unknown[
      * @returns
      */
     onDemandPriceUpdates(updates?: UpdatePriceFeedsResult): OnDemandPriceUpdate[];
+    /**
+     * Gets main price for given token
+     * Throws if token price feed is not found or answer is not successful
+     * @param token
+     * @returns
+     */
+    mainPrice(token: Address): bigint;
+    /**
+     * Gets reserve price for given token
+     * Throws if token price feed is not found or answer is not successful
+     * @param token
+     * @returns
+     */
+    reservePrice(token: Address): bigint;
     /**
      * Returns true if oracle's price feed tree contains given price feed
      * @param priceFeed

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

@@ -39,4 +39,5 @@ export declare class AddressMap<T> {
     asRecord(): Record<Address, T>;
     get size(): number;
     freeze(): void;
+    protected get name(): string | undefined;
 }

package/package.json

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