@clonegod/ttd-bsc-common 1.0.25 → 1.0.26

package/dist/trade/abstract_dex_trade.d.ts

@@ -4,7 +4,6 @@ import { DexConfig, EvmChainConfig } from "../types";
 export declare abstract class AbstractEvmDexTrade extends AbastrcatTrade {
     protected appConfig: AppConfig;
     protected wallet: ethers.Wallet;
-    protected group_wallets: ethers.Wallet[];
     protected provider: ethers.providers.JsonRpcProvider;
     protected approvedTokens: Map<string, boolean>;
     protected pairContracts: Map<string, ethers.Contract>;
@@ -24,5 +23,5 @@ export declare abstract class AbstractEvmDexTrade extends AbastrcatTrade {
     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 buildTipTransferTx(to: string, transfer_amount_gwei: string, gas_price_gwei: string, transfer_nonce: number): Promise<string>;
 }

package/dist/trade/abstract_dex_trade.js

@@ -27,15 +27,9 @@ class AbstractEvmDexTrade extends dist_1.AbastrcatTrade {
     }
     init() {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
             this.provider = new ethers_1.ethers.providers.JsonRpcProvider(this.chainConfig.rpcEndpoint);
             this.wallet = new ethers_1.ethers.Wallet(this.appConfig.trade_runtime.wallet.private_key, this.provider);
             (0, dist_1.log_info)(`钱包已初始化，地址: ${this.wallet.address}`);
-            if (process.env.WALLET_GROUP_IDS) {
-                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.wallet);
             (0, dist_1.log_info)(`${this.dexConfig.dexName} Router已初始化, 地址: ${this.dexConfig.routerAddress}`);
         });
@@ -136,13 +130,12 @@ class AbstractEvmDexTrade extends dist_1.AbastrcatTrade {
     getWrappedNativeAddress() {
         return this.chainConfig.wrappedNativeCurrencyAddress;
     }
-    buildTipTransferTx(to, transfer_amount_gwei, gas_price_gwei, transfer_nonce, wallet) {
+    buildTipTransferTx(to, transfer_amount_gwei, gas_price_gwei, transfer_nonce) {
         return __awaiter(this, void 0, void 0, function* () {
-            const targetWallet = wallet || this.wallet;
             let real_transfer_amount_gwei = Math.min(Number(transfer_amount_gwei), this.chainConfig.gasOptions.maxTipAmountGwei).toString();
             let real_gas_price_gwei = Math.min(Number(gas_price_gwei), this.chainConfig.gasOptions.maxGasPriceGwei).toString();
             let tx_data = {
-                from: targetWallet.address,
+                from: this.wallet.address,
                 to,
                 value: ethers_1.ethers.utils.parseUnits(real_transfer_amount_gwei, 'gwei'),
                 gasLimit: 21000,
@@ -150,7 +143,7 @@ class AbstractEvmDexTrade extends dist_1.AbastrcatTrade {
                 nonce: transfer_nonce,
                 chainId: this.chainConfig.chainId
             };
-            let signedTx = yield targetWallet.signTransaction(tx_data);
+            let signedTx = yield this.wallet.signTransaction(tx_data);
             (0, dist_1.log_info)(`构建转账交易: `, Object.assign(Object.assign({}, tx_data), { real_transfer_amount_gwei,
                 real_gas_price_gwei, txhash: ethers_1.ethers.utils.keccak256(signedTx) }));
             return signedTx;

package/dist/trade/abstract_dex_trade_plus.d.ts

@@ -0,0 +1,28 @@
+import { AbastrcatTrade, AppConfig, TradeContext } from "@clonegod/ttd-core/dist";
+import { ethers } from "ethers";
+import { DexConfig, EvmChainConfig } from "../types";
+export declare abstract class AbstractEvmDexTradePlus extends AbastrcatTrade {
+    protected appConfig: AppConfig;
+    protected group_wallets: ethers.Wallet[];
+    protected provider: ethers.providers.JsonRpcProvider;
+    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;
+    constructor(appConfig: AppConfig);
+    protected abstract initConfigs(): void;
+    init(): Promise<void>;
+    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;
+    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>;
+}

package/dist/trade/abstract_dex_trade_plus.js

@@ -0,0 +1,170 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+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");
+class AbstractEvmDexTradePlus extends dist_1.AbastrcatTrade {
+    constructor(appConfig) {
+        super();
+        this.appConfig = appConfig;
+        this.approvedTokens = new Map();
+        this.pairContracts = new Map();
+        this.tokenContracts = new Map();
+        this.approvedTokens = new Map();
+        this.pairContracts = new Map();
+        this.tokenContracts = new Map();
+        this.initConfigs();
+    }
+    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 环境变量来启用多钱包功能');
+            }
+            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}`);
+        });
+    }
+    getTokenContract(tokenAddress) {
+        if (!this.tokenContracts.has(tokenAddress)) {
+            const tokenContract = new ethers_1.ethers.Contract(tokenAddress, common_1.ERC20_ABI, this.provider);
+            this.tokenContracts.set(tokenAddress, tokenContract);
+        }
+        return this.tokenContracts.get(tokenAddress);
+    }
+    getTokenContractWithWallet(tokenAddress, wallet) {
+        const tokenContract = this.getTokenContract(tokenAddress);
+        return tokenContract.connect(wallet);
+    }
+    getGasPriceGwei(context) {
+        let { evm_gas_limit, evm_gas_price_gwei, evm_tip_amount_gwei } = context.trade_runtime.settings.strategy;
+        if (evm_gas_price_gwei === undefined || evm_gas_price_gwei === null || evm_gas_price_gwei <= 0) {
+            evm_gas_price_gwei = this.chainConfig.gasOptions.defaultGasPriceGwei;
+        }
+        (0, dist_1.log_info)(`getGasPriceGwei: ${evm_gas_price_gwei} Gwei`);
+        return evm_gas_price_gwei.toString();
+    }
+    getBuilderTipAmoutGwei(context) {
+        let { evm_gas_limit, evm_gas_price_gwei, evm_tip_amount_gwei } = context.trade_runtime.settings.strategy;
+        if (evm_tip_amount_gwei === undefined || evm_tip_amount_gwei === null || evm_tip_amount_gwei <= 0) {
+            evm_tip_amount_gwei = this.chainConfig.gasOptions.defaultTipAmountGwei;
+        }
+        (0, dist_1.log_info)(`getGasTipAmoutGwei: ${evm_tip_amount_gwei} Gwei`);
+        return evm_tip_amount_gwei.toString();
+    }
+    checkTradeTokenApprove(context, wallet, routerAddress) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { pool_info } = context;
+            const { tokenA, tokenB } = pool_info;
+            const router = routerAddress || this.dexConfig.routerAddress;
+            if (!this.approvedTokens.has(wallet.address)) {
+                this.approvedTokens.set(wallet.address, new Map());
+            }
+            yield Promise.all([tokenA, tokenB].map((_a) => __awaiter(this, [_a], void 0, function* ({ symbol, address }) {
+                const tokenContract = this.getTokenContractWithWallet(address, wallet);
+                yield this.checkTokenApprove(address, symbol, tokenContract, router, wallet);
+            })));
+        });
+    }
+    checkTokenApprove(tokenAddress, tokenSymbol, tokenContract, spenderAddress, wallet) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.approvedTokens.has(wallet.address)) {
+                this.approvedTokens.set(wallet.address, new Map());
+            }
+            if (this.approvedTokens.get(wallet.address).get(tokenAddress)) {
+                (0, dist_1.log_info)(`钱包 ${wallet.address} 的代币 ${tokenSymbol} 已授权，跳过授权检查`);
+                return true;
+            }
+            const allowance = yield tokenContract.allowance(wallet.address, spenderAddress);
+            const maxAllowance = ethers_1.ethers.constants.MaxUint256.div(2);
+            (0, dist_1.log_info)(`代币授权检查:`, {
+                walletAddress: wallet.address,
+                tokenSymbol,
+                currentAllowance: allowance.toString(),
+                maxAllowance: maxAllowance.toString(),
+                isSufficient: allowance.gte(maxAllowance)
+            });
+            if (allowance.lt(maxAllowance)) {
+                const maxApprovalAmount = ethers_1.ethers.utils.formatUnits(ethers_1.ethers.constants.MaxUint256, yield tokenContract.decimals());
+                const tokenSymbolDisplay = tokenSymbol || `${tokenAddress.substring(0, 6)}...`;
+                (0, dist_1.log_info)(`正在为钱包 ${wallet.address} 授权代币 ${tokenSymbolDisplay}`, {
+                    walletAddress: wallet.address,
+                    tokenAddress,
+                    tokenSymbol: tokenSymbolDisplay,
+                    currentAllowance: ethers_1.ethers.utils.formatUnits(allowance, yield tokenContract.decimals()),
+                    newAllowance: maxApprovalAmount
+                });
+                const tx = yield tokenContract.approve(spenderAddress, ethers_1.ethers.constants.MaxUint256, {
+                    gasLimit: this.chainConfig.gasOptions.gasLimit
+                });
+                yield tx.wait();
+                this.approvedTokens.get(wallet.address).set(tokenAddress, true);
+                (0, dist_1.log_info)(`钱包 ${wallet.address} 的代币 ${tokenSymbolDisplay} 授权完成，数量: ${maxApprovalAmount} ${tokenSymbolDisplay}, 交易哈希: ${tx.hash}`);
+                return true;
+            }
+            else {
+                this.approvedTokens.get(wallet.address).set(tokenAddress, true);
+                return true;
+            }
+        });
+    }
+    isNonceRelatedError(error) {
+        if (!error)
+            return false;
+        const errorMessage = error.message ? error.message.toLowerCase() : '';
+        const nonceErrorKeywords = [
+            'nonce',
+            'nonce too low',
+            'nonce too high',
+            'nonce has already been used',
+            'already known',
+            'replacement transaction underpriced',
+            'transaction with same nonce',
+            'transaction nonce is too low',
+            'invalid transaction nonce',
+            'insufficient funds',
+            'sign bundle to get failure details',
+        ];
+        return nonceErrorKeywords.some(keyword => errorMessage.includes(keyword));
+    }
+    isNativeCurrency(symbol) {
+        return symbol.toUpperCase() === this.chainConfig.nativeCurrency;
+    }
+    getWrappedNativeAddress() {
+        return this.chainConfig.wrappedNativeCurrencyAddress;
+    }
+    buildTipTransferTx(to, transfer_amount_gwei, gas_price_gwei, transfer_nonce, wallet) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let real_transfer_amount_gwei = Math.min(Number(transfer_amount_gwei), this.chainConfig.gasOptions.maxTipAmountGwei).toString();
+            let real_gas_price_gwei = Math.min(Number(gas_price_gwei), this.chainConfig.gasOptions.maxGasPriceGwei).toString();
+            let tx_data = {
+                from: wallet.address,
+                to,
+                value: ethers_1.ethers.utils.parseUnits(real_transfer_amount_gwei, 'gwei'),
+                gasLimit: 21000,
+                gasPrice: ethers_1.ethers.utils.parseUnits(real_gas_price_gwei, 'gwei'),
+                nonce: transfer_nonce,
+                chainId: this.chainConfig.chainId
+            };
+            let signedTx = yield wallet.signTransaction(tx_data);
+            (0, dist_1.log_info)(`构建转账交易: `, Object.assign(Object.assign({}, tx_data), { real_transfer_amount_gwei,
+                real_gas_price_gwei, txhash: ethers_1.ethers.utils.keccak256(signedTx) }));
+            return signedTx;
+        });
+    }
+}
+exports.AbstractEvmDexTradePlus = AbstractEvmDexTradePlus;

package/package.json

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