@clonegod/ttd-bsc-common 1.0.90 → 3.0.1

package/dist/trade/index.js

@@ -14,8 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./send"), exports);
 __exportStar(require("./parse"), exports);
 __exportStar(require("./check"), exports);
+__exportStar(require("./caller_manager"), exports);
 __exportStar(require("./abstract_dex_trade"), exports);
-__exportStar(require("./abstract_dex_trade_plus"), exports);

package/dist/trade/parse/base_parser.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseTxParser = void 0;
-const dist_1 = require("@clonegod/ttd-core/dist");
+const ttd_core_1 = require("@clonegod/ttd-core");
 const ethers_1 = require("ethers");
 class BaseTxParser {
     constructor(config) {
@@ -66,7 +66,7 @@ class BaseTxParser {
             };
         }
         catch (error) {
-            (0, dist_1.log_error)('calculateGasFee error:', error);
+            (0, ttd_core_1.log_error)('calculateGasFee error:', error);
             return {
                 base_fee: 0,
                 priority_fee: 0,

package/dist/types/pool_state.d.ts

@@ -10,6 +10,33 @@ export interface OnchainPoolData {
     sqrtPriceX96: string;
     liquidity: string;
 }
+export interface AmmPoolState {
+    address: string;
+    token0: string;
+    token1: string;
+    fee: number;
+    reserve0: string;
+    reserve1: string;
+}
+export interface ClmmPoolState {
+    address: string;
+    token0: string;
+    token1: string;
+    fee: number;
+    tickSpacing: number;
+    tick: number;
+    sqrtPriceX96: string;
+    liquidity: string;
+}
+export interface InfinityPoolState extends ClmmPoolState {
+    hooks: string;
+    poolManager: string;
+    parameters: string;
+    currency0: string;
+    currency1: string;
+    lpFee?: number;
+    protocolFee?: number;
+}
 export interface OnchainPoolChangeEvent {
     provider_id?: string;
     pool_address: string;
@@ -26,5 +53,9 @@ export interface OnchainPoolChangeEvent {
         tick: number;
         sqrtPriceX96: BigInt | string;
         liquidity: BigInt | string;
+        tickLower?: number;
+        tickUpper?: number;
+        liquidityDelta?: string;
+        amount?: string;
     };
 }

package/dist/utils/gas_helper.js

@@ -11,18 +11,18 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EVMGasHelper = void 0;
 const ethers_1 = require("ethers");
-const dist_1 = require("@clonegod/ttd-core/dist");
+const ttd_core_1 = require("@clonegod/ttd-core");
 class EVMGasHelper {
     static wrapNativeToken(provider_1, wallet_1, wrappedTokenAddress_1, amount_1) {
         return __awaiter(this, arguments, void 0, function* (provider, wallet, wrappedTokenAddress, amount, minReserve = "0.1", tokenSymbol = "ETH") {
             const nativeBalance = yield provider.getBalance(wallet.address);
             const nativeBalanceEth = ethers_1.ethers.utils.formatEther(nativeBalance);
-            (0, dist_1.log_info)(`当前${tokenSymbol}余额: ${nativeBalanceEth} ${tokenSymbol}`);
+            (0, ttd_core_1.log_info)(`当前${tokenSymbol}余额: ${nativeBalanceEth} ${tokenSymbol}`);
             let wrapAmount;
             if (amount === "max") {
                 const minReserveBN = ethers_1.ethers.utils.parseEther(minReserve);
                 if (nativeBalance.lte(minReserveBN)) {
-                    (0, dist_1.log_info)(`${tokenSymbol}余额不足最小保留额 ${minReserve} ${tokenSymbol}，不执行转换`);
+                    (0, ttd_core_1.log_info)(`${tokenSymbol}余额不足最小保留额 ${minReserve} ${tokenSymbol}，不执行转换`);
                     return null;
                 }
                 wrapAmount = nativeBalance.sub(minReserveBN);
@@ -31,19 +31,19 @@ class EVMGasHelper {
                 wrapAmount = ethers_1.ethers.utils.parseEther(amount);
                 const minReserveBN = ethers_1.ethers.utils.parseEther(minReserve);
                 if (nativeBalance.sub(wrapAmount).lt(minReserveBN)) {
-                    (0, dist_1.log_info)(`转换后${tokenSymbol}余额将低于最小保留额 ${minReserve} ${tokenSymbol}，调整转换金额`);
+                    (0, ttd_core_1.log_info)(`转换后${tokenSymbol}余额将低于最小保留额 ${minReserve} ${tokenSymbol}，调整转换金额`);
                     wrapAmount = nativeBalance.sub(minReserveBN);
                 }
             }
             if (wrapAmount.lte(ethers_1.ethers.constants.Zero)) {
-                (0, dist_1.log_info)(`计算的转换金额为0或负数，不执行转换`);
+                (0, ttd_core_1.log_info)(`计算的转换金额为0或负数，不执行转换`);
                 return null;
             }
             const wrappedTokenContract = new ethers_1.ethers.Contract(wrappedTokenAddress, [
                 "function deposit() external payable",
                 "function withdraw(uint wad) external"
             ], wallet);
-            (0, dist_1.log_info)(`准备将 ${ethers_1.ethers.utils.formatEther(wrapAmount)} ${tokenSymbol} 转换为 W${tokenSymbol}`);
+            (0, ttd_core_1.log_info)(`准备将 ${ethers_1.ethers.utils.formatEther(wrapAmount)} ${tokenSymbol} 转换为 W${tokenSymbol}`);
             const gasPrice = yield provider.getGasPrice();
             const txOptions = {
                 value: wrapAmount,
@@ -52,13 +52,13 @@ class EVMGasHelper {
             };
             try {
                 const tx = yield wrappedTokenContract.deposit(txOptions);
-                (0, dist_1.log_info)(`${tokenSymbol}转换为W${tokenSymbol}交易已发送，txHash: ${tx.hash}`);
+                (0, ttd_core_1.log_info)(`${tokenSymbol}转换为W${tokenSymbol}交易已发送，txHash: ${tx.hash}`);
                 yield tx.wait();
-                (0, dist_1.log_info)(`${tokenSymbol}转换为W${tokenSymbol}交易已确认，txHash: ${tx.hash}`);
+                (0, ttd_core_1.log_info)(`${tokenSymbol}转换为W${tokenSymbol}交易已确认，txHash: ${tx.hash}`);
                 return tx.hash;
             }
             catch (error) {
-                (0, dist_1.log_error)(`${tokenSymbol}转换为W${tokenSymbol}失败: ${error.message}`, error);
+                (0, ttd_core_1.log_error)(`${tokenSymbol}转换为W${tokenSymbol}失败: ${error.message}`, error);
                 throw error;
             }
         });

package/dist/utils/index.d.ts

@@ -1,6 +1,7 @@
 import { ethers } from "ethers";
 import Decimal from "decimal.js";
 export * from './gas_helper';
+export * from './trade_direction';
 export declare const sleep: (ms: number) => Promise<void>;
 export declare const formatPrice: (price: number, precision?: number) => string;
 export declare const formatUnits: (value: ethers.BigNumber, decimals: number) => Decimal;

package/dist/utils/index.js

@@ -21,6 +21,7 @@ exports.formatNumberHighPrecision = exports.formatUnits = exports.formatPrice =
 const ethers_1 = require("ethers");
 const decimal_js_1 = __importDefault(require("decimal.js"));
 __exportStar(require("./gas_helper"), exports);
+__exportStar(require("./trade_direction"), exports);
 const sleep = (ms) => {
     return new Promise(resolve => setTimeout(resolve, ms));
 };

package/dist/utils/trade_direction.d.ts

@@ -0,0 +1,15 @@
+export interface TokenInfo {
+    symbol: string;
+    address: string;
+    decimals: number;
+    [key: string]: any;
+}
+export interface TradeDirectionResult {
+    isBuy: boolean;
+    inputToken: TokenInfo;
+    outputToken: TokenInfo;
+    baseToken: TokenInfo;
+    quoteToken: TokenInfo;
+}
+export declare function resolveTradeDirection(poolInfo: any, isBuy: boolean): TradeDirectionResult;
+export declare function calculateStandardPrice(inputAmount: number, outputAmount: number, isBuy: boolean): string;

package/dist/utils/trade_direction.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveTradeDirection = resolveTradeDirection;
+exports.calculateStandardPrice = calculateStandardPrice;
+function resolveTradeDirection(poolInfo, isBuy) {
+    const { tokenA, tokenB, quote_token } = poolInfo;
+    const quoteToken = [tokenA, tokenB].find((t) => t.symbol === quote_token);
+    const baseToken = [tokenA, tokenB].find((t) => t.symbol !== quote_token);
+    if (!quoteToken || !baseToken) {
+        throw new Error(`Cannot resolve tokens: tokenA=${tokenA === null || tokenA === void 0 ? void 0 : tokenA.symbol}, tokenB=${tokenB === null || tokenB === void 0 ? void 0 : tokenB.symbol}, quote_token=${quote_token}`);
+    }
+    const inputToken = isBuy ? quoteToken : baseToken;
+    const outputToken = isBuy ? baseToken : quoteToken;
+    return { isBuy, inputToken, outputToken, baseToken, quoteToken };
+}
+function calculateStandardPrice(inputAmount, outputAmount, isBuy) {
+    if (isBuy) {
+        return (inputAmount / outputAmount).toFixed(18);
+    }
+    else {
+        return (outputAmount / inputAmount).toFixed(18);
+    }
+}

package/dist/ws/event_filter.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EventFilter = void 0;
-const dist_1 = require("@clonegod/ttd-core/dist");
+const ttd_core_1 = require("@clonegod/ttd-core");
 class EventFilter {
     static initializeCleanup() {
         if (this.cleanupInitialized) {
@@ -21,7 +21,7 @@ class EventFilter {
         this.initializeCleanup();
         const key = `${poolAddress}-${blockNumber}-${eventType.toUpperCase()}`;
         if (this.poolEventMap.has(key)) {
-            (0, dist_1.log_warn)(`Event ${eventType} already occurred on pool: ${poolAddress}, block: ${blockNumber}`);
+            (0, ttd_core_1.log_warn)(`Event ${eventType} already occurred on pool: ${poolAddress}, block: ${blockNumber}`);
             return false;
         }
         this.poolEventMap.set(key, Date.now());

package/dist/yyws/yyws_client.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.subscribe_pool_price_from_yyws = subscribe_pool_price_from_yyws;
-const dist_1 = require("@clonegod/ttd-core/dist");
+const ttd_core_1 = require("@clonegod/ttd-core");
 const ws_client_1 = require("@clonegod/ttd-core/dist/ws/ws_client");
 function subscribe_pool_price_from_yyws(poolInfoList, callback) {
     const ws_url = process.env.SUBSCIBE_YY_WS_URL || 'ws://43.165.135.114:10100/ws';
@@ -70,7 +70,7 @@ function log_yyws_price_msg(poolInfo, priceData) {
             const { poolAddress, token0, token1, askToken0InToken1, bidToken0InToken1, askToken1InToken0, bidToken1InToken0 } = poolPrice;
             line += `${token0}/${token1} - ${poolAddress} - ${askToken0InToken1} - ${bidToken0InToken1} - ${askToken1InToken0} - ${bidToken1InToken0}\n`;
         }
-        (0, dist_1.appendLogWithPeriodicReset)("logs", `yyws-price-msg-${poolInfo.pool_address}.txt`, line, 10)
+        (0, ttd_core_1.appendLogWithPeriodicReset)("logs", `yyws-price-msg-${poolInfo.pool_address}.txt`, line, 10)
             .catch(err => console.error('log_yyws_price_msg error', err));
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clonegod/ttd-bsc-common",
-  "version": "1.0.90",
+  "version": "3.0.1",
   "description": "BSC common library",
   "license": "UNLICENSED",
   "main": "dist/index.js",
@@ -14,7 +14,8 @@
     "push": "npm run build && npm publish"
   },
   "dependencies": {
-    "@clonegod/ttd-core": "2.1.35",
+    "@clonegod/ttd-core": "3.0.1",
+    "@clonegod/ttd-bsc-send-tx": "1.0.0",
     "axios": "^1.12.0",
     "dotenv": "^16.4.7",
     "ethers": "^5.8.0"

package/dist/trade/abstract_dex_trade_plus.d.ts

@@ -1,44 +0,0 @@
-import { AbastrcatTrade, AppConfig, TradeContext } from "@clonegod/ttd-core/dist";
-import { ethers } from "ethers";
-import { DexConfig, EvmChainConfig } from "../types";
-import { SimpleRedisClient } from "../redis";
-export declare abstract class AbstractEvmDexTradePlus extends AbastrcatTrade {
-    protected appConfig: AppConfig;
-    protected group_wallets: ethers.Wallet[];
-    protected wallet: ethers.Wallet;
-    protected provider: ethers.providers.JsonRpcProvider;
-    protected walletMode: 'single' | 'multi';
-    protected approvedTokens: Map<string, Map<string, boolean>>;
-    protected pairContracts: Map<string, ethers.Contract>;
-    protected tokenContracts: Map<string, ethers.Contract>;
-    protected routerContract: ethers.Contract;
-    protected chainConfig: EvmChainConfig;
-    protected dexConfig: DexConfig;
-    protected redisClient: SimpleRedisClient;
-    protected chainNameLower: string;
-    constructor(appConfig: AppConfig);
-    protected abstract initConfigs(): void;
-    init(): Promise<void>;
-    protected getWalletMode(): 'single' | 'multi';
-    protected getSingleWallet(): ethers.Wallet;
-    protected getGroupWallets(): ethers.Wallet[];
-    protected getTokenContract(tokenAddress: string): ethers.Contract;
-    protected getTokenContractWithWallet(tokenAddress: string, wallet: ethers.Wallet): ethers.Contract;
-    protected getGasPriceGwei(context: TradeContext): string;
-    protected getBuilderTipAmoutGwei(context: TradeContext): string;
-    preApproveAllWallets(token_list?: string[]): Promise<void>;
-    private approveTokenIfNeeded;
-    protected checkTradeTokenApprove(context: TradeContext, wallet: ethers.Wallet, routerAddress?: string): Promise<void>;
-    protected checkTokenApprove(tokenAddress: string, tokenSymbol: string, tokenContract: ethers.Contract, spenderAddress: string, wallet: ethers.Wallet): Promise<boolean>;
-    protected isNonceRelatedError(error: any): boolean;
-    protected isNativeCurrency(symbol: string): boolean;
-    protected getWrappedNativeAddress(): string;
-    abstract execute(context: TradeContext, retryCount?: number): Promise<string>;
-    protected buildTipTransferTx(to: string, transfer_amount_gwei: string, gas_price_gwei: string, transfer_nonce: number, wallet: ethers.Wallet): Promise<string>;
-    protected chooseWallet(context: TradeContext): Promise<ethers.Wallet>;
-    protected getWalletNextNonce(walletAddress: string): Promise<any>;
-    protected determineInputOutputTokens(order_msg: any, pool_info: any): {
-        inputToken: any;
-        outputToken: any;
-    };
-}