@clonegod/ttd-bsc-common 3.1.67 → 3.1.69

package/dist/quote/index.d.ts

@@ -6,4 +6,3 @@ export * from './verify';
 export * from './price_feed_handler';
 export * from './quote_amount';
 export * from './preload_token_prices';
-export * from './hook_fee_monitor';

package/dist/quote/index.js

@@ -22,4 +22,3 @@ __exportStar(require("./verify"), exports);
 __exportStar(require("./price_feed_handler"), exports);
 __exportStar(require("./quote_amount"), exports);
 __exportStar(require("./preload_token_prices"), exports);
-__exportStar(require("./hook_fee_monitor"), exports);

package/dist/quote/pricing/fee_helpers.d.ts

@@ -0,0 +1,13 @@
+import { AmmPoolState, ClmmPoolState, InfinityPoolState } from '../../types/pool_state';
+export declare const V4_DYNAMIC_FEE_FLAG = 8388608;
+export declare function calculateSwapFeePpm(protocolFeePpm: number, lpFeePpm: number): number;
+export declare function decodeV4ProtocolFee(encodedProtocolFee: number, zeroForOne: boolean): number;
+export declare function v2EffectiveFeeBps(state: AmmPoolState): number;
+export declare function v3EffectiveFeeBps(state: ClmmPoolState): number;
+export declare function v4EffectiveFeeBps(state: InfinityPoolState): number;
+export declare function v4EffectiveFeePpm(state: InfinityPoolState): number;
+export declare function v4DirectionalFeePpm(state: InfinityPoolState, zeroForOne: boolean): number;
+export declare function buildInfinityPoolSdkFee(state: InfinityPoolState): {
+    fee: number;
+    protocolFee: number;
+};

package/dist/quote/pricing/fee_helpers.js

@@ -0,0 +1,68 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.V4_DYNAMIC_FEE_FLAG = void 0;
+exports.calculateSwapFeePpm = calculateSwapFeePpm;
+exports.decodeV4ProtocolFee = decodeV4ProtocolFee;
+exports.v2EffectiveFeeBps = v2EffectiveFeeBps;
+exports.v3EffectiveFeeBps = v3EffectiveFeeBps;
+exports.v4EffectiveFeeBps = v4EffectiveFeeBps;
+exports.v4EffectiveFeePpm = v4EffectiveFeePpm;
+exports.v4DirectionalFeePpm = v4DirectionalFeePpm;
+exports.buildInfinityPoolSdkFee = buildInfinityPoolSdkFee;
+exports.V4_DYNAMIC_FEE_FLAG = 0x800000;
+function calculateSwapFeePpm(protocolFeePpm, lpFeePpm) {
+    return protocolFeePpm + lpFeePpm - Math.floor(protocolFeePpm * lpFeePpm / 1000000);
+}
+function decodeV4ProtocolFee(encodedProtocolFee, zeroForOne) {
+    if (zeroForOne)
+        return encodedProtocolFee & 0xFFF;
+    return (encodedProtocolFee >> 12) & 0xFFF;
+}
+function v2EffectiveFeeBps(state) {
+    return state.protocolFeeBps;
+}
+function v3EffectiveFeeBps(state) {
+    return state.poolFee / 100;
+}
+function v4EffectiveFeeBps(state) {
+    return v4EffectiveFeePpm(state) / 100;
+}
+function v4EffectiveFeePpm(state) {
+    if (state.lastSwapFee != null) {
+        return state.lastSwapFee;
+    }
+    if (state.poolKeyFee !== exports.V4_DYNAMIC_FEE_FLAG) {
+        return state.poolKeyFee;
+    }
+    const lp = state.slot0LpFee ?? 0;
+    const proto = state.slot0ProtocolFee ?? 0;
+    const proto0to1 = proto & 0xFFF;
+    const proto1to0 = (proto >> 12) & 0xFFF;
+    const fee0to1 = calculateSwapFeePpm(proto0to1, lp);
+    const fee1to0 = calculateSwapFeePpm(proto1to0, lp);
+    return Math.max(fee0to1, fee1to0);
+}
+function v4DirectionalFeePpm(state, zeroForOne) {
+    if (state.lastSwapFee != null) {
+        return state.lastSwapFee;
+    }
+    if (state.poolKeyFee !== exports.V4_DYNAMIC_FEE_FLAG) {
+        return state.poolKeyFee;
+    }
+    const lp = state.slot0LpFee ?? 0;
+    const proto = state.slot0ProtocolFee ?? 0;
+    const directionalProto = decodeV4ProtocolFee(proto, zeroForOne);
+    return calculateSwapFeePpm(directionalProto, lp);
+}
+function buildInfinityPoolSdkFee(state) {
+    if (state.lastSwapFee != null) {
+        return { fee: state.lastSwapFee, protocolFee: 0 };
+    }
+    if (state.poolKeyFee !== exports.V4_DYNAMIC_FEE_FLAG) {
+        return { fee: state.poolKeyFee, protocolFee: 0 };
+    }
+    return {
+        fee: state.slot0LpFee ?? 0,
+        protocolFee: state.slot0ProtocolFee ?? 0,
+    };
+}

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

@@ -1,3 +1,4 @@
 export * from './pool';
 export * from './sdk_token_factory';
 export * from './pool_state_initializer';
+export * from './fee_helpers';

package/dist/quote/pricing/index.js

@@ -17,3 +17,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./pool"), exports);
 __exportStar(require("./sdk_token_factory"), exports);
 __exportStar(require("./pool_state_initializer"), exports);
+__exportStar(require("./fee_helpers"), exports);

package/dist/quote/pricing/pool_state_initializer.js

@@ -55,17 +55,17 @@ class PoolStateInitializer {
                 poolContract.token0(),
                 poolContract.token1(),
             ]);
-            const feeRateBps = AMM_FEE_MAP[dexId] || AMM_FEE_MAP[dexId.replace('-', '_')] || 30;
+            const protocolFeeBps = AMM_FEE_MAP[dexId] || AMM_FEE_MAP[dexId.replace('-', '_')] || 30;
             const state = {
                 address: poolAddress,
                 token0: token0.toLowerCase(),
                 token1: token1.toLowerCase(),
-                feeRateBps,
+                protocolFeeBps,
                 reserve0: reserves[0].toString(),
                 reserve1: reserves[1].toString(),
             };
             (0, ttd_core_1.log_info)(`[PoolStateInitializer] AMM pool initialized: ${poolAddress}`, {
-                token0: state.token0, token1: state.token1, feeRateBps: state.feeRateBps,
+                token0: state.token0, token1: state.token1, protocolFeeBps: state.protocolFeeBps,
             });
             return state;
         }
@@ -87,13 +87,11 @@ class PoolStateInitializer {
                 poolContract.liquidity(),
             ]);
             const [sqrtPriceX96, tick] = slot0;
-            const feeRatePpm = Number(fee);
             const state = {
                 address: poolAddress,
                 token0: token0.toLowerCase(),
                 token1: token1.toLowerCase(),
-                feeRateBps: feeRatePpm / 100,
-                feeRatePpm,
+                poolFee: Number(fee),
                 tickSpacing: Number(tickSpacing),
                 tick: Number(tick),
                 sqrtPriceX96: sqrtPriceX96.toString(),
@@ -101,7 +99,7 @@ class PoolStateInitializer {
             };
             (0, ttd_core_1.log_info)(`[PoolStateInitializer] CLMM pool initialized: ${poolAddress}`, {
                 token0: state.token0, token1: state.token1,
-                feeRateBps: state.feeRateBps, feeRatePpm: state.feeRatePpm,
+                poolFee: state.poolFee,
                 tickSpacing: state.tickSpacing, tick: state.tick,
             });
             return state;
@@ -126,25 +124,24 @@ class PoolStateInitializer {
                 address: poolKey,
                 token0: currency0.toLowerCase ? currency0.toLowerCase() : currency0,
                 token1: currency1.toLowerCase ? currency1.toLowerCase() : currency1,
-                feeRateBps: (Number(lpFee) + Number(protocolFee)) / 100,
-                feeRatePpm: Number(fee),
+                currency0,
+                currency1,
+                hooks,
+                poolManager,
+                parameters,
                 tickSpacing,
+                poolKeyFee: Number(fee),
                 tick: Number(tick),
                 sqrtPriceX96: sqrtPriceX96.toString(),
                 liquidity: liquidity.toString(),
-                hooks,
-                poolManager,
-                parameters,
-                currency0,
-                currency1,
-                lpFee: Number(lpFee),
-                protocolFee: Number(protocolFee),
+                slot0LpFee: Number(lpFee),
+                slot0ProtocolFee: Number(protocolFee),
             };
             (0, ttd_core_1.log_info)(`[PoolStateInitializer] Infinity pool initialized: ${poolKey}`, {
                 currency0: state.currency0, currency1: state.currency1,
-                feeRateBps: state.feeRateBps, feeRatePpm: state.feeRatePpm,
+                poolKeyFee: state.poolKeyFee,
+                slot0LpFee: state.slot0LpFee, slot0ProtocolFee: state.slot0ProtocolFee,
                 tickSpacing: state.tickSpacing, tick: state.tick,
-                lpFee: state.lpFee, protocolFee: state.protocolFee,
             });
             return state;
         }

package/dist/trade/abstract_dex_trade.js

@@ -199,8 +199,9 @@ class AbstractDexTrade extends ttd_core_1.AbastrcatTrade {
                 trace.set('gasType', mainGasFields.type === 2 ? 'EIP1559' : 'Legacy');
                 trace.set('tip', transfer_amount_gwei);
                 const only_bundle = order_msg.is_dex_maker;
-                await this.transactionSender.sendTransaction(signedMainTx, tipTxMap, order_trace_id, pair, only_bundle, trace);
                 trace.mark('sent');
+                await this.transactionSender.sendTransaction(signedMainTx, tipTxMap, order_trace_id, pair, only_bundle, trace);
+                trace.mark('send_complete');
                 trace.flush();
                 context._execution_marks = trace.getAbsoluteMarks();
                 context._execution_start_time = trace.getStartTime();

package/dist/types/pool_state.d.ts

@@ -14,7 +14,7 @@ export interface AmmPoolState {
     address: string;
     token0: string;
     token1: string;
-    feeRateBps: number;
+    protocolFeeBps: number;
     reserve0: string;
     reserve1: string;
 }
@@ -22,47 +22,132 @@ export interface ClmmPoolState {
     address: string;
     token0: string;
     token1: string;
-    feeRateBps: number;
-    feeRatePpm: number;
+    poolFee: number;
     tickSpacing: number;
     tick: number;
     sqrtPriceX96: string;
     liquidity: string;
 }
-export interface InfinityPoolState extends ClmmPoolState {
+export interface InfinityPoolState {
+    address: string;
+    token0: string;
+    token1: string;
+    currency0: string;
+    currency1: string;
     hooks: string;
     poolManager: string;
     parameters: string;
-    currency0: string;
-    currency1: string;
-    lpFee?: number;
-    protocolFee?: number;
+    tickSpacing: number;
+    poolKeyFee: number;
+    tick: number;
+    sqrtPriceX96: string;
+    liquidity: string;
+    slot0LpFee?: number;
+    slot0ProtocolFee?: number;
+    lastSwapFee?: number;
+    lastSwapProtocolFee?: number;
 }
 export interface OnchainPoolChangeEvent {
     provider_id?: string;
     pool_address: string;
     type: string;
     event_time: number;
-    data: {
-        blockNumber: number;
-        transactionIndex: number;
-        transactionHash: string;
-        amount0: string;
-        amount1: string;
-        reserve0: BigInt | string;
-        reserve1: BigInt | string;
-        tick: number;
-        sqrtPriceX96: BigInt | string;
-        liquidity: BigInt | string;
-        tickLower?: number;
-        tickUpper?: number;
-        liquidityDelta?: string;
-        amount?: string;
-        token0Symbol?: string;
-        token1Symbol?: string;
-        askToken0InToken1?: string;
-        bidToken0InToken1?: string;
-        askToken1InToken0?: string;
-        bidToken1InToken0?: string;
-    };
+    data: OnchainEventDataMerged;
+}
+export interface OnchainEventDataMerged {
+    blockNumber: number;
+    transactionIndex: number;
+    transactionHash: string;
+    reserve0?: string;
+    reserve1?: string;
+    amount0?: string;
+    amount1?: string;
+    sqrtPriceX96?: string;
+    liquidity?: string;
+    tick?: number;
+    protocolFeesToken0?: string;
+    protocolFeesToken1?: string;
+    fee?: string;
+    protocolFee?: string;
+    tickLower?: number;
+    tickUpper?: number;
+    amount?: string;
+    liquidityDelta?: string;
+    token0Symbol?: string;
+    token1Symbol?: string;
+    askToken0InToken1?: string;
+    bidToken0InToken1?: string;
+    askToken1InToken0?: string;
+    bidToken1InToken0?: string;
+}
+export interface V2SwapEventData {
+    blockNumber: number;
+    transactionIndex: number;
+    transactionHash: string;
+    reserve0: string;
+    reserve1: string;
+    amount0?: string;
+    amount1?: string;
+}
+export interface V2LiquidityEventData {
+    blockNumber: number;
+    transactionIndex: number;
+    transactionHash: string;
+    amount0: string;
+    amount1: string;
+}
+export interface V3SwapEventData {
+    blockNumber: number;
+    transactionIndex: number;
+    transactionHash: string;
+    amount0: string;
+    amount1: string;
+    sqrtPriceX96: string;
+    liquidity: string;
+    tick: number;
+    protocolFeesToken0: string;
+    protocolFeesToken1: string;
+}
+export interface V3LiquidityEventData {
+    blockNumber: number;
+    transactionIndex: number;
+    transactionHash: string;
+    tickLower: number;
+    tickUpper: number;
+    amount: string;
+    amount0: string;
+    amount1: string;
+}
+export interface V4SwapEventData {
+    blockNumber: number;
+    transactionIndex: number;
+    transactionHash: string;
+    amount0: string;
+    amount1: string;
+    sqrtPriceX96: string;
+    liquidity: string;
+    tick: number;
+    fee: string;
+    protocolFee: string;
+}
+export interface V4LiquidityEventData {
+    blockNumber: number;
+    transactionIndex: number;
+    transactionHash: string;
+    tickLower: number;
+    tickUpper: number;
+    amount: string;
+    amount0: string;
+    amount1: string;
+}
+export interface PriceFeedEventData {
+    blockNumber: number;
+    transactionIndex: number;
+    transactionHash: string;
+    token0Symbol: string;
+    token1Symbol: string;
+    askToken0InToken1: string;
+    bidToken0InToken1: string;
+    askToken1InToken0: string;
+    bidToken1InToken0: string;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clonegod/ttd-bsc-common",
-  "version": "3.1.67",
+  "version": "3.1.69",
   "description": "BSC common library",
   "license": "UNLICENSED",
   "main": "dist/index.js",
@@ -14,7 +14,7 @@
     "push": "npm run build && npm publish"
   },
   "dependencies": {
-    "@clonegod/ttd-core": "3.1.57",
+    "@clonegod/ttd-core": "3.1.60",
     "axios": "1.15.0",
     "dotenv": "^16.4.7",
     "ethers": "^5.8.0",