@clonegod/ttd-bsc-common 1.0.36 → 1.0.38

package/dist/trade/abstract_dex_trade_plus.d.ts

@@ -1,19 +1,27 @@
 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;
@@ -27,4 +35,9 @@ export declare abstract class AbstractEvmDexTradePlus extends AbastrcatTrade {
     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 determineInputOutputTokens(order_msg: any, pool_info: any): {
+        inputToken: any;
+        outputToken: any;
+    };
 }

package/dist/trade/abstract_dex_trade_plus.js

@@ -8,15 +8,21 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AbstractEvmDexTradePlus = void 0;
 const dist_1 = require("@clonegod/ttd-core/dist");
 const ethers_1 = require("ethers");
 const common_1 = require("../common");
+const decimal_js_1 = __importDefault(require("decimal.js"));
+const redis_1 = require("../redis");
 class AbstractEvmDexTradePlus extends dist_1.AbastrcatTrade {
     constructor(appConfig) {
         super();
         this.appConfig = appConfig;
+        this.walletMode = 'multi';
         this.approvedTokens = new Map();
         this.pairContracts = new Map();
         this.tokenContracts = new Map();
@@ -24,21 +30,42 @@ class AbstractEvmDexTradePlus extends dist_1.AbastrcatTrade {
         this.pairContracts = new Map();
         this.tokenContracts = new Map();
         this.initConfigs();
+        this.chainNameLower = this.appConfig.env_args.chain_id.toLowerCase();
+        this.redisClient = new redis_1.SimpleRedisClient(`${this.chainNameLower}:tx`);
     }
     init() {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
             this.provider = new ethers_1.ethers.providers.JsonRpcProvider(this.chainConfig.rpcEndpoint);
-            if (!process.env.WALLET_GROUP_IDS) {
-                throw new Error('必须配置 WALLET_GROUP_IDS 环境变量来启用多钱包功能');
+            const walletGroupIds = process.env.WALLET_GROUP_IDS || '';
+            this.walletMode = walletGroupIds && walletGroupIds.trim().split(',').length > 0 ? 'multi' : 'single';
+            if (this.walletMode === 'multi') {
+                let wallet_infos = (0, dist_1.load_wallet_multi)(walletGroupIds.split(','), false);
+                this.group_wallets = wallet_infos.map(info => new ethers_1.ethers.Wallet(info.private_key, this.provider));
+                (0, dist_1.log_info)(`组钱包已初始化，数量: ${this.group_wallets.length}`, this.group_wallets.map(e => e.address));
+            }
+            else {
+                this.wallet = new ethers_1.ethers.Wallet(this.appConfig.trade_runtime.wallet.private_key, this.provider);
+                (0, dist_1.log_info)(`单钱包已初始化，walletAddress= ${this.wallet.address}`);
             }
-            let wallet_infos = (0, dist_1.load_wallet_multi)(((_a = process.env.WALLET_GROUP_IDS) === null || _a === void 0 ? void 0 : _a.split(',')) || [], false);
-            this.group_wallets = wallet_infos.map(info => new ethers_1.ethers.Wallet(info.private_key, this.provider));
-            (0, dist_1.log_info)(`组钱包已初始化，数量: ${this.group_wallets.length}`, this.group_wallets.map(e => e.address));
             this.routerContract = new ethers_1.ethers.Contract(this.dexConfig.routerAddress, this.dexConfig.routerAbi, this.provider);
-            (0, dist_1.log_info)(`${this.dexConfig.dexName} Router已初始化, 地址: ${this.dexConfig.routerAddress}, 钱包数量: ${this.group_wallets.length}`);
+            (0, dist_1.log_info)(`${this.dexConfig.dexName} Router已初始化, routerAddress= ${this.dexConfig.routerAddress}`);
         });
     }
+    getWalletMode() {
+        return this.walletMode;
+    }
+    getSingleWallet() {
+        if (this.walletMode !== 'single' || !this.wallet) {
+            throw new Error('Single wallet not available in multi-wallet mode or not initialized');
+        }
+        return this.wallet;
+    }
+    getGroupWallets() {
+        if (this.walletMode !== 'multi' || !this.group_wallets) {
+            throw new Error('Group wallets not available in single-wallet mode or not initialized');
+        }
+        return this.group_wallets;
+    }
     getTokenContract(tokenAddress) {
         if (!this.tokenContracts.has(tokenAddress)) {
             const tokenContract = new ethers_1.ethers.Contract(tokenAddress, common_1.ERC20_ABI, this.provider);
@@ -68,37 +95,70 @@ class AbstractEvmDexTradePlus extends dist_1.AbastrcatTrade {
     }
     preApproveAllWallets() {
         return __awaiter(this, arguments, void 0, function* (token_list = []) {
-            if (!this.group_wallets || this.group_wallets.length === 0) {
-                (0, dist_1.log_info)('No wallets available for pre-approval');
-                return;
-            }
-            if (!token_list || token_list.length === 0) {
-                token_list = Array.from(this.tokenContracts.keys());
-            }
-            (0, dist_1.log_info)(`Pre-approve: ${this.group_wallets.length} wallets, ${token_list.length} tokens`, token_list);
-            const tokenAddresses = new Set();
-            for (const token_address of token_list) {
-                tokenAddresses.add(token_address.toLowerCase());
-            }
-            const tokens = Array.from(tokenAddresses);
-            for (const wallet of this.group_wallets) {
+            if (this.walletMode === 'single') {
+                if (!this.wallet) {
+                    (0, dist_1.log_info)('Single wallet not available for pre-approval');
+                    return;
+                }
+                if (!token_list || token_list.length === 0) {
+                    token_list = Array.from(this.tokenContracts.keys());
+                }
+                (0, dist_1.log_info)(`Pre-approve: single wallet ${this.wallet.address}, ${token_list.length} tokens`, token_list);
+                const tokenAddresses = new Set();
+                for (const token_address of token_list) {
+                    tokenAddresses.add(token_address.toLowerCase());
+                }
+                const tokens = Array.from(tokenAddresses);
                 try {
-                    (0, dist_1.log_info)(`Pre-approve: wallet ${wallet.address}`);
+                    (0, dist_1.log_info)(`Pre-approve: wallet ${this.wallet.address}`);
                     for (const tokenAddress of tokens) {
                         try {
-                            yield this.approveTokenIfNeeded(wallet, tokenAddress);
+                            yield this.approveTokenIfNeeded(this.wallet, tokenAddress);
                         }
                         catch (error) {
-                            console.warn(`Failed to pre-approve token ${tokenAddress} for wallet ${wallet.address}:`, error);
+                            console.warn(`Failed to pre-approve token ${tokenAddress} for wallet ${this.wallet.address}:`, error);
                         }
                     }
-                    (0, dist_1.log_info)(`Pre-approve: wallet ${wallet.address} completed`);
+                    (0, dist_1.log_info)(`Pre-approve: wallet ${this.wallet.address} completed`);
                 }
                 catch (error) {
-                    console.warn(`Failed to pre-approve tokens for wallet ${wallet.address}:`, error);
+                    console.warn(`Failed to pre-approve tokens for wallet ${this.wallet.address}:`, error);
                 }
+                (0, dist_1.log_info)('Pre-approve: single wallet completed');
+            }
+            else {
+                if (!this.group_wallets || this.group_wallets.length === 0) {
+                    (0, dist_1.log_info)('No wallets available for pre-approval');
+                    return;
+                }
+                if (!token_list || token_list.length === 0) {
+                    token_list = Array.from(this.tokenContracts.keys());
+                }
+                (0, dist_1.log_info)(`Pre-approve: ${this.group_wallets.length} wallets, ${token_list.length} tokens`, token_list);
+                const tokenAddresses = new Set();
+                for (const token_address of token_list) {
+                    tokenAddresses.add(token_address.toLowerCase());
+                }
+                const tokens = Array.from(tokenAddresses);
+                for (const wallet of this.group_wallets) {
+                    try {
+                        (0, dist_1.log_info)(`Pre-approve: wallet ${wallet.address}`);
+                        for (const tokenAddress of tokens) {
+                            try {
+                                yield this.approveTokenIfNeeded(wallet, tokenAddress);
+                            }
+                            catch (error) {
+                                console.warn(`Failed to pre-approve token ${tokenAddress} for wallet ${wallet.address}:`, error);
+                            }
+                        }
+                        (0, dist_1.log_info)(`Pre-approve: wallet ${wallet.address} completed`);
+                    }
+                    catch (error) {
+                        console.warn(`Failed to pre-approve tokens for wallet ${wallet.address}:`, error);
+                    }
+                }
+                (0, dist_1.log_info)('Pre-approve: all wallets completed');
             }
-            (0, dist_1.log_info)('Pre-approve: all wallets completed');
         });
     }
     approveTokenIfNeeded(wallet, tokenAddress) {
@@ -223,5 +283,139 @@ class AbstractEvmDexTradePlus extends dist_1.AbastrcatTrade {
             return signedTx;
         });
     }
+    chooseWallet(context) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
+            if (this.getWalletMode() === 'single') {
+                return this.getSingleWallet();
+            }
+            const { inputToken } = this.determineInputOutputTokens(context.order_msg, context.pool_info);
+            console.log('inputToken', inputToken);
+            const requiredAmount = new decimal_js_1.default(context.order_msg.amount);
+            const wallet_assets = yield this.redisClient.hgetall(`${this.chainNameLower}:wallet:assets`);
+            if (!wallet_assets || Object.keys(wallet_assets).length === 0) {
+                throw new Error('没有找到钱包资产信息，请确保钱包监控服务正在运行');
+            }
+            const wallet_assets_map = {};
+            for (const [walletAddress, assetsJson] of Object.entries(wallet_assets)) {
+                try {
+                    wallet_assets_map[walletAddress] = JSON.parse(assetsJson);
+                }
+                catch (error) {
+                    console.warn(`解析钱包资产数据失败: ${walletAddress}`, error);
+                }
+            }
+            const availableWallets = [];
+            const allWallets = [];
+            for (const [walletAddress, assets] of Object.entries(wallet_assets_map)) {
+                try {
+                    const wallet = (_a = this.group_wallets) === null || _a === void 0 ? void 0 : _a.find(w => w.address.toLowerCase() === walletAddress.toLowerCase());
+                    if (!wallet) {
+                        continue;
+                    }
+                    const tokenAsset = (_b = assets.tokens) === null || _b === void 0 ? void 0 : _b.find((token) => token.tokenaddr.toLowerCase() === inputToken.address.toLowerCase());
+                    let tokenBalance = (tokenAsset === null || tokenAsset === void 0 ? void 0 : tokenAsset.balance) || '0';
+                    const balanceDecimal = new decimal_js_1.default(tokenBalance);
+                    if (balanceDecimal.gte(requiredAmount)) {
+                        availableWallets.push({
+                            wallet,
+                            balance: tokenBalance
+                        });
+                    }
+                    else {
+                        console.log(`钱包 ${walletAddress} 余额不足: ${tokenBalance} ${inputToken.symbol} < ${requiredAmount} ${inputToken.symbol}`);
+                    }
+                    allWallets.push({
+                        wallet,
+                        balance: tokenBalance
+                    });
+                }
+                catch (error) {
+                    console.warn(`处理钱包资产时出错: ${walletAddress}`, error);
+                }
+            }
+            if (availableWallets.length === 0) {
+                let error_msg = `all wallets are insufficient, required: ${requiredAmount} ${inputToken.symbol}`;
+                (0, dist_1.log_warn)(error_msg);
+                allWallets.forEach((walletInfo, index) => {
+                    const shortAddress = walletInfo.wallet.address.substring(0, 6) + '...' + walletInfo.wallet.address.substring(walletInfo.wallet.address.length - 4);
+                    console.log(`${index + 1}. ${shortAddress}: ${walletInfo.balance} ${inputToken.symbol}`);
+                });
+                throw new Error(error_msg);
+            }
+            console.log('availableWallets', availableWallets.map(w => w.wallet.address));
+            const wallet_last_used = yield this.redisClient.hgetall(`${this.chainNameLower}:wallet:last_used`);
+            for (const availableWallet of availableWallets) {
+                const lastUsedData = wallet_last_used === null || wallet_last_used === void 0 ? void 0 : wallet_last_used[availableWallet.wallet.address];
+                if (lastUsedData) {
+                    try {
+                        const lastUsedInfo = JSON.parse(lastUsedData);
+                        availableWallet.lastUsedAt = lastUsedInfo.lastUsedAt;
+                    }
+                    catch (error) {
+                        console.warn(`解析钱包最后使用时间失败: ${availableWallet.wallet.address}`, error);
+                    }
+                }
+                else {
+                    yield this.redisClient.hsetValue(`${this.chainNameLower}:wallet:last_used`, availableWallet.wallet.address, JSON.stringify({
+                        lastUsedAt: 0,
+                        lastUsedTime: new Date(0).toISOString()
+                    }), 24 * 60 * 60);
+                    availableWallet.lastUsedAt = 0;
+                }
+            }
+            let selectedWallet;
+            let selectionStrategy;
+            if (availableWallets.length === 1) {
+                selectedWallet = availableWallets[0].wallet;
+                selectionStrategy = 'OnlyOne';
+            }
+            else {
+                const hasUsageHistory = wallet_last_used && Object.keys(wallet_last_used).length > 0;
+                if (hasUsageHistory) {
+                    availableWallets.sort((a, b) => {
+                        const aTime = a.lastUsedAt || 0;
+                        const bTime = b.lastUsedAt || 0;
+                        return aTime - bTime;
+                    });
+                    selectedWallet = availableWallets[0].wallet;
+                    selectionStrategy = 'MaxLastUsed';
+                }
+                else {
+                    availableWallets.sort((a, b) => {
+                        const aBalance = new decimal_js_1.default(a.balance);
+                        const bBalance = new decimal_js_1.default(b.balance);
+                        return bBalance.cmp(aBalance);
+                    });
+                    selectedWallet = availableWallets[0].wallet;
+                    selectionStrategy = 'MaxBalance';
+                }
+            }
+            yield this.redisClient.hsetValue(`${this.chainNameLower}:wallet:last_used`, selectedWallet.address, JSON.stringify({
+                lastUsedAt: Date.now(),
+                lastUsedTime: new Date().toISOString()
+            }), 24 * 60 * 60);
+            const selectedWalletInfo = availableWallets.find(w => w.wallet.address === selectedWallet.address);
+            (0, dist_1.log_info)(`Choose wallet: ${selectionStrategy} -> ${selectedWallet.address}, balance: ${selectedWalletInfo === null || selectedWalletInfo === void 0 ? void 0 : selectedWalletInfo.balance} ${inputToken.symbol}, required: ${requiredAmount} ${inputToken.symbol}`);
+            return selectedWallet;
+        });
+    }
+    determineInputOutputTokens(order_msg, pool_info) {
+        const { aToB } = order_msg;
+        const { tokenA, tokenB, quote_token } = pool_info;
+        const quoteToken = [tokenA, tokenB].find(token => token.symbol === quote_token);
+        const nonQuoteToken = [tokenA, tokenB].find(token => token.symbol !== quote_token);
+        const inputToken = aToB ? nonQuoteToken : quoteToken;
+        const outputToken = aToB ? quoteToken : nonQuoteToken;
+        if (!inputToken || !outputToken) {
+            throw new Error(`无法确定输入/输出代币: ${JSON.stringify({
+                tokenA: tokenA.symbol,
+                tokenB: tokenB.symbol,
+                quote: quote_token,
+                aToB
+            })}`);
+        }
+        return { inputToken, outputToken };
+    }
 }
 exports.AbstractEvmDexTradePlus = AbstractEvmDexTradePlus;

package/dist/trade/send/bsc_rpc.d.ts

@@ -1,4 +1,4 @@
-export declare class BscRpc {
+export declare class BscMainnetRpc {
     private url;
     private headers;
     constructor(rpc_endpoint: string);

package/dist/trade/send/bsc_rpc.js

@@ -9,8 +9,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BscRpc = void 0;
-class BscRpc {
+exports.BscMainnetRpc = void 0;
+const dist_1 = require("@clonegod/ttd-core/dist");
+class BscMainnetRpc {
     constructor(rpc_endpoint) {
         this.url = rpc_endpoint || process.env.BSC_RPC_ENDPOINT || '';
         this.headers = new Headers();
@@ -18,26 +19,29 @@ class BscRpc {
     }
     eth_sendRawTransaction(signedTx) {
         return __awaiter(this, void 0, void 0, function* () {
-            console.log(`Sending transaction to ${this.url}`);
-            const raw = JSON.stringify({
-                jsonrpc: "2.0",
-                method: "eth_sendRawTransaction",
-                params: [signedTx],
-                id: 1
-            });
-            const requestOptions = {
-                method: 'POST',
-                headers: this.headers,
-                body: raw,
-                redirect: 'follow'
-            };
-            const response = yield fetch(this.url, requestOptions);
-            const result = yield response.json();
-            if (result.error) {
-                throw new Error(result.error.message);
-            }
-            return result.result;
+            setTimeout(() => __awaiter(this, void 0, void 0, function* () {
+                console.log(`Sending transaction to ${this.url}`);
+                const raw = JSON.stringify({
+                    jsonrpc: "2.0",
+                    method: "eth_sendRawTransaction",
+                    params: [signedTx],
+                    id: 1
+                });
+                const requestOptions = {
+                    method: 'POST',
+                    headers: this.headers,
+                    body: raw,
+                    redirect: 'follow'
+                };
+                const response = yield fetch(this.url, requestOptions);
+                const result = yield response.json();
+                if (result.error) {
+                    (0, dist_1.log_warn)(result.error.message);
+                }
+                return result.result;
+            }), 0);
+            return '';
         });
     }
 }
-exports.BscRpc = BscRpc;
+exports.BscMainnetRpc = BscMainnetRpc;

package/dist/trade/send/send_tx.js

@@ -17,7 +17,7 @@ const _48club_1 = require("./48club");
 const _1 = require(".");
 class TransactionSender {
     constructor(appConfig) {
-        this.rpc = new bsc_rpc_1.BscRpc(appConfig.env_args.rpc_endpoint);
+        this.rpc = new bsc_rpc_1.BscMainnetRpc(appConfig.env_args.rpc_endpoint);
         this.blockRazor = new blockrazor_1.BlockRazorTrade();
         this._48Club = new _48club_1._48ClubTrade();
     }

package/package.json

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