@clonegod/ttd-bsc-common 3.1.5 → 3.1.11

package/dist/config/bsc_env_args.d.ts

@@ -1,12 +1,15 @@
 import { EnvArgs } from '@clonegod/ttd-core';
 export declare class BscEnvArgs extends EnvArgs {
-    large_trade_threshold_usd: number;
     gas_price_gwei: number;
     gas_limit: number;
     tip_amount_gwei: number;
     tx_status_check_interval_mills: number;
     tx_cancel_timeout_ms: number;
     tx_cancel_gas_boost_factor: number;
+    send_tx_blockrazor_bundle: boolean;
+    send_tx_48club_bundle: boolean;
+    send_tx_48club_bundle_ws: boolean;
+    send_tx_blox_bundle_ws: boolean;
     constructor();
     print(moduleName?: string): void;
 }

package/dist/config/bsc_env_args.js

@@ -3,34 +3,52 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BscEnvArgs = void 0;
 const ttd_core_1 = require("@clonegod/ttd-core");
 const BSC_KEYS = [
-    'large_trade_threshold_usd',
     'gas_price_gwei',
     'gas_limit',
     'tip_amount_gwei',
     'tx_status_check_interval_mills',
     'tx_cancel_timeout_ms',
     'tx_cancel_gas_boost_factor',
+    'send_tx_blockrazor_bundle',
+    'send_tx_48club_bundle',
+    'send_tx_48club_bundle_ws',
+    'send_tx_blox_bundle_ws',
 ];
 (0, ttd_core_1.registerEnvVars)({
-    large_trade_threshold_usd: { env: 'LARGE_TRADE_THRESHOLD_USD', type: 'number', default: 500, desc: '大额交易识别阈值(USD)' },
     gas_price_gwei: { env: 'GAS_PRICE_GWEI', type: 'number', default: 1, desc: '交易 gas 价格(Gwei)' },
     gas_limit: { env: 'GAS_LIMIT', type: 'number', default: 300000, desc: '交易 gas 上限' },
     tip_amount_gwei: { env: 'EOA_TIP_AMOUNT_GWEI', type: 'number', default: 10000, desc: 'Builder tip(Gwei)' },
     tx_status_check_interval_mills: { env: 'TX_STATUS_CHECK_INTERVAL_MILLS', type: 'number', default: 3000, desc: '交易状态检查间隔(ms)' },
     tx_cancel_timeout_ms: { env: 'TX_CANCEL_TIMEOUT_MS', type: 'number', default: 15000, desc: '交易取消超时(ms)' },
     tx_cancel_gas_boost_factor: { env: 'TX_CANCEL_GAS_PRICE_BOOST_FACTOR', type: 'number', default: 1.5, desc: '取消交易 gas 提升倍数' },
+    send_tx_blockrazor_bundle: { env: 'SEND_TX_BLOCKRAZOR_BUNDLE', type: 'boolean', default: false, desc: 'BlockRazor Bundle 开关' },
+    send_tx_48club_bundle: { env: 'SEND_TX_48CLUB_BUNDLE', type: 'boolean', default: false, desc: '48Club Bundle HTTP 开关' },
+    send_tx_48club_bundle_ws: { env: 'SEND_TX_48CLUB_BUNDLE_WS', type: 'boolean', default: false, desc: '48Club Bundle WS 开关' },
+    send_tx_blox_bundle_ws: { env: 'SEND_TX_BLOX_BUNDLE_WS', type: 'boolean', default: false, desc: 'BloxRoute Bundle WS 开关' },
+    stream_quote_ws_host: { env: 'STREAM_QUOTE_WS_HOST', type: 'string', default: '127.0.0.1', desc: 'stream-quote WS 地址' },
+    min_quote_interval_ms: { env: 'MIN_QUOTE_INTERVAL_MS', type: 'number', default: 10000, desc: '最小询价间隔(ms)' },
+    skip_price_feed_yynode: { env: 'SKIP_PRICE_FEED_YYNODE', type: 'boolean', default: false, desc: '跳过 YYNode PriceFeed' },
+    push_price_feed: { env: 'PUSH_PRICE_FEED', type: 'boolean', default: false, desc: 'PriceFeed 推送开关' },
+    need_block_time_info: { env: 'NEED_BLOCK_TIME_INFO', type: 'boolean', default: false, desc: '区块时间信息开关' },
+    tick_cache_neighboring_words: { env: 'TICK_CACHE_NEIGHBORING_WORDS', type: 'number', default: 2, desc: 'tick 预加载 words 数' },
+    tick_cache_ttl: { env: 'TICK_CACHE_TTL', type: 'number', default: 30000, desc: 'tick 缓存 TTL(ms)' },
+    tick_cache_min_update_interval: { env: 'TICK_CACHE_MIN_UPDATE_INTERVAL', type: 'number', default: 3000, desc: 'tick 最小刷新间隔(ms)' },
+    tick_cache_force_full_refresh: { env: 'TICK_CACHE_FORCE_FULL_REFRESH_INTERVAL', type: 'number', default: 60000, desc: 'tick 全量刷新间隔(ms)' },
 });
 class BscEnvArgs extends ttd_core_1.EnvArgs {
     constructor() {
         super();
         const cfg = (0, ttd_core_1.loadEnvConfig)(BSC_KEYS);
-        this.large_trade_threshold_usd = cfg.large_trade_threshold_usd;
         this.gas_price_gwei = cfg.gas_price_gwei;
         this.gas_limit = cfg.gas_limit;
         this.tip_amount_gwei = cfg.tip_amount_gwei;
         this.tx_status_check_interval_mills = cfg.tx_status_check_interval_mills;
         this.tx_cancel_timeout_ms = cfg.tx_cancel_timeout_ms;
         this.tx_cancel_gas_boost_factor = cfg.tx_cancel_gas_boost_factor;
+        this.send_tx_blockrazor_bundle = cfg.send_tx_blockrazor_bundle;
+        this.send_tx_48club_bundle = cfg.send_tx_48club_bundle;
+        this.send_tx_48club_bundle_ws = cfg.send_tx_48club_bundle_ws;
+        this.send_tx_blox_bundle_ws = cfg.send_tx_blox_bundle_ws;
     }
     print(moduleName) {
         super.print(moduleName);

package/dist/index.d.ts

@@ -4,6 +4,5 @@ export * from './quote';
 export * from './trade';
 export * from './types';
 export * from './utils';
-export * from './redis';
 export * from './ws';
 export * from './send-tx';

package/dist/index.js

@@ -20,6 +20,5 @@ __exportStar(require("./quote"), exports);
 __exportStar(require("./trade"), exports);
 __exportStar(require("./types"), exports);
 __exportStar(require("./utils"), exports);
-__exportStar(require("./redis"), exports);
 __exportStar(require("./ws"), exports);
 __exportStar(require("./send-tx"), exports);

package/dist/trade/abstract_dex_trade.d.ts

@@ -3,7 +3,7 @@ import { ethers } from "ethers";
 import { EvmChainConfig } from "../types";
 import { CallerManager } from "./caller_manager";
 import { ITransactionSender } from "../send-tx";
-import { SimpleRedisClient } from "../redis";
+import { RedisClient } from "@clonegod/ttd-core";
 export interface TradeConfig {
     vaultAddress: string;
     executorIds: Record<string, string>;
@@ -19,7 +19,7 @@ export declare abstract class AbstractDexTrade extends AbastrcatTrade {
     protected provider: any;
     protected transactionSender: ITransactionSender;
     protected chainConfig: EvmChainConfig;
-    protected redisClient: SimpleRedisClient;
+    protected redisClient: RedisClient;
     protected tradeConfig: TradeConfig;
     protected vaultInterface: any;
     protected chainNameLower: string;

package/dist/trade/abstract_dex_trade.js

@@ -45,7 +45,7 @@ const path = __importStar(require("path"));
 const caller_manager_1 = require("./caller_manager");
 const send_tx_1 = require("../send-tx");
 const base_tx_result_checker_1 = require("./check/base_tx_result_checker");
-const redis_1 = require("../redis");
+const ttd_core_2 = require("@clonegod/ttd-core");
 const trade_direction_1 = require("../utils/trade_direction");
 const ethers_compat_1 = require("../utils/ethers_compat");
 const fast_signer_1 = require("../utils/fast_signer");
@@ -79,7 +79,7 @@ class AbstractDexTrade extends ttd_core_1.AbastrcatTrade {
         this.appConfig = appConfig;
         this.initConfigs();
         this.chainNameLower = this.appConfig.env_args.chain_id.toLowerCase();
-        this.redisClient = new redis_1.SimpleRedisClient(`${this.chainNameLower}:tx`);
+        this.redisClient = new ttd_core_2.RedisClient(`${this.chainNameLower}:tx`);
         this.vaultInterface = new ethers_compat_1.ethersCompat.Interface(VAULT_ABI);
     }
     async init(transactionSender) {
@@ -156,11 +156,14 @@ class AbstractDexTrade extends ttd_core_1.AbastrcatTrade {
                     chainId: this.chainConfig.chainId,
                     value: 0,
                 };
-                const builderAddresses = [
-                    send_tx_1.BSC_EOA_ADDRESS.BLOCKRAZOR,
-                    send_tx_1.BSC_EOA_ADDRESS._48CLUB,
-                    send_tx_1.BSC_EOA_ADDRESS.BLXR,
-                ];
+                const env = this.appConfig.env_args;
+                const builderAddresses = [];
+                if (env.send_tx_blockrazor_bundle)
+                    builderAddresses.push(send_tx_1.BSC_EOA_ADDRESS.BLOCKRAZOR);
+                if (env.send_tx_48club_bundle || env.send_tx_48club_bundle_ws)
+                    builderAddresses.push(send_tx_1.BSC_EOA_ADDRESS._48CLUB);
+                if (env.send_tx_blox_bundle_ws)
+                    builderAddresses.push(send_tx_1.BSC_EOA_ADDRESS.BLXR);
                 const [rawMainTx, ...rawTips] = await Promise.all([
                     caller.signTransaction(mainTx),
                     ...builderAddresses.map(addr => this.buildTipTransferTx(addr, transfer_amount_gwei, realGasPriceGwei, tipNonce, caller)),

package/dist/trade/caller_manager.js

@@ -4,7 +4,7 @@ exports.CallerManager = void 0;
 const dist_1 = require("@clonegod/ttd-core/dist");
 const logger = (0, dist_1.createLogger)(__filename);
 const ethers_1 = require("ethers");
-const redis_1 = require("../redis");
+const ttd_core_1 = require("@clonegod/ttd-core");
 const CALLER_NONCE_KEY = 'caller:nonce';
 const CALLER_LAST_USED_KEY = 'caller:last_used';
 const VAULT_CALLERS_KEY = 'vault:callers';
@@ -12,13 +12,13 @@ class CallerManager {
     constructor(config) {
         this.callers = [];
         this.config = config;
-        this.redis = new redis_1.SimpleRedisClient(`${config.chainName}:caller`);
+        this.redis = new ttd_core_1.RedisClient(`${config.chainName}:caller`);
     }
     async init() {
         const walletInfos = (0, dist_1.load_wallet_multi)(this.config.callerGroupIds, false);
         const allWallets = walletInfos.map(info => new ethers_1.ethers.Wallet(info.private_key, this.config.provider));
         const vaultCallersKey = `${this.config.chainName}:${VAULT_CALLERS_KEY}`;
-        const rawJson = await this.redis.hgetvalue(vaultCallersKey, this.config.groupId);
+        const rawJson = await this.redis.hget(vaultCallersKey, this.config.groupId);
         let allowedAddresses = [];
         if (rawJson) {
             try {
@@ -96,13 +96,13 @@ class CallerManager {
                 }
             }
             callerAddr = addresses[selectedIdx];
-            await this.redis.hsetValue(lastUsedKey, callerAddr, String(Date.now()), 24 * 60 * 60);
+            await this.redis.hset(lastUsedKey, callerAddr, String(Date.now()), 24 * 60 * 60);
         }
         finally {
             this.redis.releaseLock(lockKey, lockValue).catch(() => { });
         }
         const nonceKey = this.getNonceRedisKey();
-        const nonceStr = await this.redis.hgetvalue(nonceKey, callerAddr);
+        const nonceStr = await this.redis.hget(nonceKey, callerAddr);
         if (nonceStr === null || nonceStr === undefined) {
             throw new Error(`Caller ${callerAddr} nonce not found in Redis, stream-trade may not be running`);
         }
@@ -140,7 +140,7 @@ class CallerManager {
     }
     async getNonce(address) {
         const nonceKey = this.getNonceRedisKey();
-        const val = await this.redis.hgetvalue(nonceKey, address.toLowerCase());
+        const val = await this.redis.hget(nonceKey, address.toLowerCase());
         if (val !== null && val !== undefined) {
             return parseInt(val, 10);
         }
@@ -148,7 +148,7 @@ class CallerManager {
     }
     async setNonce(address, nonce) {
         const nonceKey = this.getNonceRedisKey();
-        await this.redis.hsetValue(nonceKey, address.toLowerCase(), String(nonce), 24 * 60 * 60);
+        await this.redis.hset(nonceKey, address.toLowerCase(), String(nonce), 24 * 60 * 60);
     }
 }
 exports.CallerManager = CallerManager;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clonegod/ttd-bsc-common",
-  "version": "3.1.5",
+  "version": "3.1.11",
   "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.6",
+    "@clonegod/ttd-core": "^3.1.11",
     "axios": "^1.12.0",
     "dotenv": "^16.4.7",
     "ethers": "^5.8.0",