@gearbox-protocol/sdk 3.0.0-vfour.341 → 3.0.0-vfour.342

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

@@ -21,6 +21,7 @@ __export(PriceOracleBaseContract_exports, {
   PriceOracleBaseContract: () => PriceOracleBaseContract
 });
 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");
@@ -52,6 +53,10 @@ class PriceOracleBaseContract extends import_base.BaseContract {
    * Mapping Token => Price in underlying
    */
   mainPrices = new import_utils.AddressMap(void 0, "mainPrices");
+  /**
+   * Same, but with details
+   */
+  #mainPrices = new import_utils.AddressMap();
   /**
    * Mapping Token => Price in underlying
    */
@@ -59,6 +64,10 @@ class PriceOracleBaseContract extends import_base.BaseContract {
     void 0,
     "reservePrices"
   );
+  /**
+   * Same, but with debug details
+   */
+  #reservePrices = new import_utils.AddressMap();
   #priceFeedTree = [];
   constructor(sdk, args, data, underlying) {
     super(sdk, args);
@@ -244,6 +253,7 @@ class PriceOracleBaseContract extends import_base.BaseContract {
             `answer not found for reserve price feed ${this.labelAddress(priceFeed)}`
           );
         }
+        this.#reservePrices.upsert(token, node?.answer);
       } else {
         this.mainPriceFeeds.upsert(token, ref);
         if (price !== void 0) {
@@ -255,6 +265,7 @@ class PriceOracleBaseContract extends import_base.BaseContract {
             `answer not found for main price feed ${this.labelAddress(priceFeed)}`
           );
         }
+        this.#mainPrices.upsert(token, node?.answer);
       }
       this.#labelPriceFeed(priceFeed, reserve ? "Reserve" : "Main", token);
     });
@@ -304,15 +315,15 @@ 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, price]) => [
+        this.#mainPrices.entries().map(([token, answer]) => [
           this.labelAddress(token),
-          (0, import_utils.formatBN)(price, 8)
+          formatAnswer(answer, raw)
         ])
       ),
       reservePrices: Object.fromEntries(
-        this.reservePrices.entries().map(([token, price]) => [
+        this.#reservePrices.entries().map(([token, answer]) => [
           this.labelAddress(token),
-          (0, import_utils.formatBN)(price, 8)
+          formatAnswer(answer, raw)
         ])
       )
     };
@@ -321,6 +332,18 @@ class PriceOracleBaseContract extends import_base.BaseContract {
     return this.#priceFeedTree;
   }
 }
+function formatAnswer({ price, success, updatedAt }, raw = true) {
+  if (!success) {
+    return "failed";
+  }
+  let priceS = (0, import_utils.formatBN)(price, 8);
+  let updated = (0, import_date_fns.format)(new Date(Number(updatedAt) * 1e3), "PPppp");
+  if (raw) {
+    priceS = `${priceS} (${price.toString(10)})`;
+    updated = `${updated} (${updatedAt.toString(10)})`;
+  }
+  return `${priceS} at ${updated}`;
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   PriceOracleBaseContract

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

@@ -37,7 +37,7 @@ class AddressMap {
     this.#name = name;
   }
   /**
-   * Adds or updates value
+   * Adds or updates value, undefined removes value
    * @param address
    * @param value
    */
@@ -46,7 +46,11 @@ class AddressMap {
       throw new Error(`AddressMap ${this.#name} is frozen`);
     }
     const key = (0, import_viem.getAddress)(address);
-    this.#map.set(key, value);
+    if (value === void 0) {
+      this.#map.delete(key);
+    } else {
+      this.#map.set(key, value);
+    }
   }
   /**
    * Adds value, throws if this address is already used

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

@@ -1,3 +1,4 @@
+import { format } from "date-fns";
 import { decodeFunctionData, stringToHex } from "viem";
 import { iPriceFeedCompressorAbi } from "../../../abi/compressors.js";
 import { iUpdatablePriceFeedAbi } from "../../../abi/iUpdatablePriceFeed.js";
@@ -29,6 +30,10 @@ class PriceOracleBaseContract extends BaseContract {
    * Mapping Token => Price in underlying
    */
   mainPrices = new AddressMap(void 0, "mainPrices");
+  /**
+   * Same, but with details
+   */
+  #mainPrices = new AddressMap();
   /**
    * Mapping Token => Price in underlying
    */
@@ -36,6 +41,10 @@ class PriceOracleBaseContract extends BaseContract {
     void 0,
     "reservePrices"
   );
+  /**
+   * Same, but with debug details
+   */
+  #reservePrices = new AddressMap();
   #priceFeedTree = [];
   constructor(sdk, args, data, underlying) {
     super(sdk, args);
@@ -221,6 +230,7 @@ class PriceOracleBaseContract extends BaseContract {
             `answer not found for reserve price feed ${this.labelAddress(priceFeed)}`
           );
         }
+        this.#reservePrices.upsert(token, node?.answer);
       } else {
         this.mainPriceFeeds.upsert(token, ref);
         if (price !== void 0) {
@@ -232,6 +242,7 @@ class PriceOracleBaseContract extends BaseContract {
             `answer not found for main price feed ${this.labelAddress(priceFeed)}`
           );
         }
+        this.#mainPrices.upsert(token, node?.answer);
       }
       this.#labelPriceFeed(priceFeed, reserve ? "Reserve" : "Main", token);
     });
@@ -281,15 +292,15 @@ class PriceOracleBaseContract extends BaseContract {
         this.reservePriceFeeds.entries().map(([token, v]) => [this.labelAddress(token), v.stateHuman(raw)])
       ),
       mainPrices: Object.fromEntries(
-        this.mainPrices.entries().map(([token, price]) => [
+        this.#mainPrices.entries().map(([token, answer]) => [
           this.labelAddress(token),
-          formatBN(price, 8)
+          formatAnswer(answer, raw)
         ])
       ),
       reservePrices: Object.fromEntries(
-        this.reservePrices.entries().map(([token, price]) => [
+        this.#reservePrices.entries().map(([token, answer]) => [
           this.labelAddress(token),
-          formatBN(price, 8)
+          formatAnswer(answer, raw)
         ])
       )
     };
@@ -298,6 +309,18 @@ class PriceOracleBaseContract extends BaseContract {
     return this.#priceFeedTree;
   }
 }
+function formatAnswer({ price, success, updatedAt }, raw = true) {
+  if (!success) {
+    return "failed";
+  }
+  let priceS = formatBN(price, 8);
+  let updated = format(new Date(Number(updatedAt) * 1e3), "PPppp");
+  if (raw) {
+    priceS = `${priceS} (${price.toString(10)})`;
+    updated = `${updated} (${updatedAt.toString(10)})`;
+  }
+  return `${priceS} at ${updated}`;
+}
 export {
   PriceOracleBaseContract
 };

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

@@ -14,7 +14,7 @@ class AddressMap {
     this.#name = name;
   }
   /**
-   * Adds or updates value
+   * Adds or updates value, undefined removes value
    * @param address
    * @param value
    */
@@ -23,7 +23,11 @@ class AddressMap {
       throw new Error(`AddressMap ${this.#name} is frozen`);
     }
     const key = getAddress(address);
-    this.#map.set(key, value);
+    if (value === void 0) {
+      this.#map.delete(key);
+    } else {
+      this.#map.set(key, value);
+    }
   }
   /**
    * Adds value, throws if this address is already used

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

@@ -30,6 +30,7 @@ export type RateKeeperData = MarketData["rateKeeper"];
 export type PriceOracleData = MarketData["priceOracleData"];
 export type PriceFeedMapEntry = Unarray<PriceOracleData["priceFeedMapping"]>;
 export type PriceFeedTreeNode = Unarray<PriceOracleData["priceFeedStructure"]>;
+export type PriceFeedAnswer = PriceFeedTreeNode["answer"];
 export type CreditManagerDebtParams = Unarray<PoolData["creditManagerDebtParams"]>;
 export declare enum VotingContractStatus {
     NOT_ALLOWED = 0,

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

@@ -3,11 +3,11 @@ export declare class AddressMap<T> {
     #private;
     constructor(entries?: Array<[string, T]>, name?: string);
     /**
-     * Adds or updates value
+     * Adds or updates value, undefined removes value
      * @param address
      * @param value
      */
-    upsert(address: string, value: T): void;
+    upsert(address: string, value: T | undefined): void;
     /**
      * Adds value, throws if this address is already used
      * @param address

package/package.json

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