@d8x/perpetuals-sdk 2.6.3 → 2.6.5

package/src/perpetualDataHandler.ts

@@ -100,12 +100,14 @@ import {
  * common data and chain operations.
  */
 export default class PerpetualDataHandler {
+  PRICE_UPDATE_FEE_GWEI = 1;
   //map symbol of the form ETH-USD-MATIC into perpetual ID and other static info
   //this is initialized in the createProxyInstance function
   protected symbolToPerpStaticInfo: Map<string, PerpetualStaticInfo>; // maps symbol of the form BTC-USD-MATIC to static info
   protected perpetualIdToSymbol: Map<number, string>; // maps unique perpetual id to symbol of the form BTC-USD-MATIC
   protected poolStaticInfos: Array<PoolStaticInfo>;
   protected symbolList: Map<string, string>; //mapping 4-digit symbol <-> long format
+  protected indexSymbol: Map<string, string> = new Map(); //mapping perpetual symbol to index symbol (NFL_TOR_...-USD-PUSD => NFL0-USD:84532)
   protected settlementConfig: SettlementConfig;
   public requiredSymbols: string[] = []; // array of symbols in the current perpetual deployment
   // config
@@ -325,6 +327,7 @@ export default class PerpetualDataHandler {
       this.proxyContract,
       this.nestedPerpetualIDs,
       this.symbolList,
+      this.indexSymbol,
       overrides
     );
 
@@ -337,7 +340,8 @@ export default class PerpetualDataHandler {
       if (perp.state != "INVALID" && perp.state != "INITIALIZING") {
         // we only require price feeds to be available if the perpetual
         // is in normal state
-        requiredPairs.add(perp.S2Symbol);
+        requiredPairs.add(PerpetualDataHandler.getIndexSymbol(this.symbolList, perp));
+
         if (perp.S3Symbol != "") {
           requiredPairs.add(perp.S3Symbol);
         }
@@ -531,21 +535,12 @@ export default class PerpetualDataHandler {
    */
   public getIndexSymbols(symbol: string): [string, string] {
     // get index
-    console.log(symbol, this.symbolToPerpStaticInfo);
     let staticInfo = this.symbolToPerpStaticInfo.get(symbol);
     if (staticInfo == undefined) {
       throw new Error(`No static info for perpetual with symbol ${symbol}`);
     }
-    const quoteCcy = staticInfo.S2Symbol.split("-")[1];
     return this.isPredictionMarket(symbol)
-      ? [
-          PerpetualDataHandler._getBySingleValue(this.symbolList, staticInfo.S2Symbol) +
-            "-" +
-            quoteCcy +
-            ":" +
-            Number(this.chainId),
-          staticInfo.S3Symbol,
-        ]
+      ? [PerpetualDataHandler.getIndexSymbol(this.symbolList, staticInfo), staticInfo.S3Symbol]
       : [staticInfo.S2Symbol, staticInfo.S3Symbol];
   }
 
@@ -684,6 +679,7 @@ export default class PerpetualDataHandler {
     _proxyContract: IPerpetualManager,
     nestedPerpetualIDs: Array<Array<number>>,
     symbolList: Map<string, string>,
+    indexSymbol: Map<string, string>,
     overrides?: Overrides
   ): Promise<Array<PerpetualStaticInfo>> {
     // flatten perpetual ids into chunks
@@ -703,6 +699,7 @@ export default class PerpetualDataHandler {
         for (const s of shorts) {
           if (sList.has(s)) {
             symbolList.set(s, sList.get(s)!);
+            indexSymbol.set(sList.get(s)!, s + ":" + BigInt(overrides.chainId!));
           }
         }
       }
@@ -1521,7 +1518,7 @@ export default class PerpetualDataHandler {
     return undefined;
   }
 
-  private static _getBySingleValue(map: Map<string, string>, searchValue: string) {
+  protected static _getBySingleValue(map: Map<string, string>, searchValue: string) {
     for (let [key, value] of map.entries()) {
       if (searchValue.startsWith(value)) {
         return key;
@@ -2302,4 +2299,13 @@ export default class PerpetualDataHandler {
       return 1;
     }
   }
+
+  public static getIndexSymbol(_symbolList: Map<string, string>, info: PerpetualStaticInfo) {
+    return PerpetualDataHandler.isPredictionMarketStatic(info!)
+      ? PerpetualDataHandler._getBySingleValue(_symbolList, info.S2Symbol)! +
+          "-" +
+          info!.S2Symbol.split("-")[1] +
+          ":84532"
+      : info!.S2Symbol;
+  }
 }

package/src/priceFeeds.ts

@@ -220,7 +220,9 @@ export default class PriceFeeds {
    * @returns map of feed-price symbol to price/isMarketClosed
    */
   public async fetchPrices(symbols: string[]): Promise<Map<string, [number, boolean]>> {
+    console.log({ symbols });
     let feedPrices = await this.fetchAllFeedPrices();
+    console.log({ feedPrices });
     let [prices, mktClosed] = this.triangulatePricesFromFeedPrices(symbols, feedPrices);
     let symMap = new Map<string, [number, boolean]>();
     for (let k = 0; k < symbols.length; k++) {
@@ -239,6 +241,7 @@ export default class PriceFeeds {
       let p = feedPrices.get(key);
       symMap.set(key, p!);
     }
+    console.log({ symMap });
     return symMap;
   }
 
@@ -456,6 +459,7 @@ export default class PriceFeeds {
    * @returns map of feed-price symbol to price/isMarketClosed
    */
   public async fetchAllFeedPrices(): Promise<Map<string, [number, boolean]>> {
+    console.log({ symbols: this.dataHandler.requiredSymbols });
     return this.fetchFeedPrices(this.dataHandler.requiredSymbols);
   }
 
@@ -585,6 +589,7 @@ export default class PriceFeeds {
     let mktClosed = new Array<boolean>();
     for (let k = 0; k < symbols.length; k++) {
       let sym = symbols[k] as string;
+      console.log({ t: this.triangulations });
       let triangulation: [string[], boolean[]] | undefined = this.triangulations.get(sym);
       if (triangulation == undefined) {
         let feedPrice = feedPriceMap.get(sym);

package/src/version.ts

@@ -1 +1 @@
-export const D8X_SDK_VERSION = "2.6.3";
+export const D8X_SDK_VERSION = "2.6.5";