@clonegod/ttd-bsc-common 3.0.13 → 3.0.15

package/dist/index.d.ts

@@ -6,4 +6,3 @@ export * from './types';
 export * from './utils';
 export * from './redis';
 export * from './ws';
-export * from './yyws';

package/dist/index.js

@@ -22,4 +22,3 @@ __exportStar(require("./types"), exports);
 __exportStar(require("./utils"), exports);
 __exportStar(require("./redis"), exports);
 __exportStar(require("./ws"), exports);
-__exportStar(require("./yyws"), exports);

package/dist/quote/price_feed_handler.js

@@ -2,32 +2,26 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildQuoteFromPriceFeed = buildQuoteFromPriceFeed;
 const ttd_core_1 = require("@clonegod/ttd-core");
-const constants_1 = require("../common/constants");
-function isSameToken(addr1, addr2) {
-    const a = addr1.toLowerCase();
-    const b = addr2.toLowerCase();
-    if (a === b)
-        return true;
-    const bnbAddrs = [constants_1.WBNB_ADDRESS.toLowerCase(), constants_1.NATIVE_BNB_ADDRESS.toLowerCase()];
-    return bnbAddrs.includes(a) && bnbAddrs.includes(b);
-}
 function buildQuoteFromPriceFeed(poolInfo, data) {
-    var _a;
-    const quoteTokenAddr = ((_a = poolInfo.quote_token) === null || _a === void 0 ? void 0 : _a.toLowerCase()) || '';
+    const quoteTokenSymbol = (poolInfo.quote_token || '').toUpperCase();
     const tokenA = poolInfo.tokenA;
     const tokenB = poolInfo.tokenB;
     if (!tokenA || !tokenB) {
         (0, ttd_core_1.log_warn)(`[PriceFeed] poolInfo missing tokenA/tokenB: ${poolInfo.pool_address}`);
         return null;
     }
+    const normSymbol = (s) => {
+        const u = s.toUpperCase();
+        return u === 'WBNB' ? 'BNB' : u;
+    };
     let askPrice;
     let bidPrice;
     let baseToken;
     let quoteToken;
-    const tokenAIsQuote = isSameToken(tokenA.address, quoteTokenAddr);
-    const tokenBIsQuote = isSameToken(tokenB.address, quoteTokenAddr);
+    const tokenAIsQuote = normSymbol(tokenA.symbol) === normSymbol(quoteTokenSymbol);
+    const tokenBIsQuote = normSymbol(tokenB.symbol) === normSymbol(quoteTokenSymbol);
     if (!tokenAIsQuote && !tokenBIsQuote) {
-        (0, ttd_core_1.log_warn)(`[PriceFeed] quote_token ${quoteTokenAddr} not found in pool ${poolInfo.pool_name}`);
+        (0, ttd_core_1.log_warn)(`[PriceFeed] quote_token ${quoteTokenSymbol} not found in pool ${poolInfo.pool_name} (tokenA=${tokenA.symbol}, tokenB=${tokenB.symbol})`);
         return null;
     }
     if (tokenAIsQuote) {
@@ -38,21 +32,20 @@ function buildQuoteFromPriceFeed(poolInfo, data) {
         quoteToken = tokenB;
         baseToken = tokenA;
     }
-    const feedToken0 = (data.token0Symbol || '').toUpperCase();
-    const feedToken1 = (data.token1Symbol || '').toUpperCase();
-    const baseSymbol = baseToken.symbol.toUpperCase();
-    const quoteSymbol = quoteToken.symbol.toUpperCase();
-    const normSymbol = (s) => (s === 'WBNB' ? 'BNB' : s);
-    if (normSymbol(feedToken0) === normSymbol(quoteSymbol)) {
+    const feedToken0 = normSymbol(data.token0Symbol || '');
+    const feedToken1 = normSymbol(data.token1Symbol || '');
+    const baseSymbolNorm = normSymbol(baseToken.symbol);
+    const quoteSymbolNorm = normSymbol(quoteToken.symbol);
+    if (normSymbol(feedToken0) === quoteSymbolNorm) {
         askPrice = data.askToken1InToken0;
         bidPrice = data.bidToken1InToken0;
     }
-    else if (normSymbol(feedToken1) === normSymbol(quoteSymbol)) {
+    else if (normSymbol(feedToken1) === quoteSymbolNorm) {
         askPrice = data.askToken0InToken1;
         bidPrice = data.bidToken0InToken1;
     }
     else {
-        (0, ttd_core_1.log_warn)(`[PriceFeed] Cannot match quote_token symbol: quote=${quoteSymbol}, feed=[${feedToken0}/${feedToken1}], pool=${poolInfo.pool_name}`);
+        (0, ttd_core_1.log_warn)(`[PriceFeed] Cannot match quote_token symbol: quote=${quoteSymbolNorm}, feed=[${feedToken0}/${feedToken1}], pool=${poolInfo.pool_name}`);
         return null;
     }
     if (!askPrice || !bidPrice) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clonegod/ttd-bsc-common",
-  "version": "3.0.13",
+  "version": "3.0.15",
   "description": "BSC common library",
   "license": "UNLICENSED",
   "main": "dist/index.js",