@clonegod/ttd-bsc-common 3.1.62 → 3.1.64

package/dist/quote/price_feed_handler.js

@@ -11,45 +11,33 @@ function buildQuoteFromPriceFeed(poolInfo, data) {
         return null;
     }
     const normSymbol = (s) => {
-        const u = s.toUpperCase();
+        const u = (s || '').toUpperCase();
         return u === 'WBNB' ? 'BNB' : u;
     };
-    let askPrice;
-    let bidPrice;
-    let baseToken;
-    let quoteToken;
     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 ${quoteTokenSymbol} not found in pool ${poolInfo.pool_name} (tokenA=${tokenA.symbol}, tokenB=${tokenB.symbol})`);
+        (0, ttd_core_1.log_warn)(`[PriceFeed] quote_token "${quoteTokenSymbol}" 在池子配置里找不到 (tokenA=${tokenA.symbol}, tokenB=${tokenB.symbol}, pool=${poolInfo.pool_name})`);
         return null;
     }
+    let askPrice;
+    let bidPrice;
+    let baseToken;
+    let quoteToken;
     if (tokenAIsQuote) {
         quoteToken = tokenA;
         baseToken = tokenB;
+        askPrice = data.askToken1InToken0;
+        bidPrice = data.bidToken1InToken0;
     }
     else {
         quoteToken = tokenB;
         baseToken = tokenA;
-    }
-    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) === quoteSymbolNorm) {
         askPrice = data.askToken0InToken1;
         bidPrice = data.bidToken0InToken1;
     }
-    else {
-        (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) {
-        (0, ttd_core_1.log_warn)(`[PriceFeed] Missing price data for ${poolInfo.pool_name}`);
+        (0, ttd_core_1.log_warn)(`[PriceFeed] Missing price for pool=${poolInfo.pool_name}, direction=${tokenAIsQuote ? 'token1InToken0' : 'token0InToken1'}, feedSymbols=[${data.token0Symbol}/${data.token1Symbol}]`);
         return null;
     }
     const makeQuoteResult = (price, input, output) => ({

package/dist/quote/verify/index.d.ts

@@ -1,2 +1,2 @@
 export { QuotePriceVerify } from './quote_price_verify';
-export type { CheckSwapParams, CheckSyncParams } from './quote_price_verify';
+export type { CheckSwapParams } from './quote_price_verify';

package/dist/quote/verify/quote_price_verify.d.ts

@@ -16,29 +16,10 @@ export interface CheckSwapParams {
     };
     swapperDeltaConvention?: boolean;
 }
-export interface CheckSyncParams {
-    poolAddress: string;
-    poolName: string;
-    blockNumber: number;
-    reserve0: string;
-    reserve1: string;
-    token0Address: string;
-    token1Address: string;
-    token0Decimals: number;
-    token1Decimals: number;
-    poolInfo: {
-        tokenA: any;
-        tokenB: any;
-        quote_token: string;
-    };
-}
 export declare class QuotePriceVerify {
     private quoteCache;
-    private reserveCache;
     private get enabled();
-    seedReserves(poolAddress: string, reserve0: string, reserve1: string): void;
     cacheQuote(poolAddress: string, priceId: string, source: string, askPrice: number, bidPrice: number, blockNumber: number, quoteAmountUsd: number, token0PriceUsd?: number, token1PriceUsd?: number): void;
     checkSwap(params: CheckSwapParams): void;
-    checkSync(params: CheckSyncParams): void;
     private compareAndLog;
 }

package/dist/quote/verify/quote_price_verify.js

@@ -6,22 +6,10 @@ const ttd_core_1 = require("@clonegod/ttd-core");
 class QuotePriceVerify {
     constructor() {
         this.quoteCache = new Map();
-        this.reserveCache = new Map();
     }
     get enabled() {
         return process.env.VERIFY_QUOTE_PRICE === 'true';
     }
-    seedReserves(poolAddress, reserve0, reserve1) {
-        if (!this.enabled)
-            return;
-        try {
-            this.reserveCache.set(poolAddress, {
-                reserve0: BigInt(reserve0),
-                reserve1: BigInt(reserve1),
-            });
-        }
-        catch { }
-    }
     cacheQuote(poolAddress, priceId, source, askPrice, bidPrice, blockNumber, quoteAmountUsd, token0PriceUsd = 0, token1PriceUsd = 0) {
         if (!this.enabled)
             return;
@@ -41,7 +29,7 @@ class QuotePriceVerify {
         const cached = this.quoteCache.get(poolAddress);
         if (!cached)
             return;
-        if (blockNumber !== cached.referenceBlock + 1)
+        if (blockNumber <= cached.referenceBlock)
             return;
         if (cached.verifiedReferenceBlock === cached.referenceBlock)
             return;
@@ -72,48 +60,6 @@ class QuotePriceVerify {
         }
         this.compareAndLog(poolAddress, poolName, poolInfo, cached, inputTokenAddress, outputTokenAddress, inputAmountUi, outputAmountUi, cached.token0PriceUsd, cached.token1PriceUsd, token0Address, blockNumber, txHash);
     }
-    checkSync(params) {
-        if (!this.enabled)
-            return;
-        const { poolAddress, poolName, blockNumber, reserve0, reserve1, poolInfo } = params;
-        const { token0Address, token1Address, token0Decimals, token1Decimals } = params;
-        const cached = this.quoteCache.get(poolAddress);
-        if (!cached)
-            return;
-        if (blockNumber !== cached.referenceBlock + 1)
-            return;
-        if (cached.verifiedReferenceBlock === cached.referenceBlock)
-            return;
-        const newR0 = BigInt(reserve0);
-        const newR1 = BigInt(reserve1);
-        const oldReserves = this.reserveCache.get(poolAddress);
-        this.reserveCache.set(poolAddress, { reserve0: newR0, reserve1: newR1 });
-        if (!oldReserves)
-            return;
-        const delta0 = newR0 - oldReserves.reserve0;
-        const delta1 = newR1 - oldReserves.reserve1;
-        if ((delta0 > 0n && delta1 > 0n) || (delta0 < 0n && delta1 < 0n) || (delta0 === 0n && delta1 === 0n)) {
-            return;
-        }
-        cached.verifiedReferenceBlock = cached.referenceBlock;
-        let inputTokenAddress;
-        let outputTokenAddress;
-        let inputAmountUi;
-        let outputAmountUi;
-        if (delta0 > 0n && delta1 < 0n) {
-            inputTokenAddress = token0Address;
-            outputTokenAddress = token1Address;
-            inputAmountUi = Number(delta0) / Math.pow(10, token0Decimals);
-            outputAmountUi = Number(-delta1) / Math.pow(10, token1Decimals);
-        }
-        else {
-            inputTokenAddress = token1Address;
-            outputTokenAddress = token0Address;
-            inputAmountUi = Number(delta1) / Math.pow(10, token1Decimals);
-            outputAmountUi = Number(-delta0) / Math.pow(10, token0Decimals);
-        }
-        this.compareAndLog(poolAddress, poolName, poolInfo, cached, inputTokenAddress, outputTokenAddress, inputAmountUi, outputAmountUi, cached.token0PriceUsd, cached.token1PriceUsd, token0Address, blockNumber);
-    }
     compareAndLog(poolAddress, poolName, poolInfo, cached, inputTokenAddress, outputTokenAddress, inputAmountUi, outputAmountUi, token0PriceUsd, token1PriceUsd, token0Address, swapBlockNumber, txHash) {
         if (inputAmountUi <= 0 || outputAmountUi <= 0)
             return;

package/package.json

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