@clonegod/ttd-bsc-common 1.0.23 → 1.0.25

package/dist/trade/abstract_dex_trade.d.ts

@@ -4,6 +4,7 @@ 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>;
@@ -23,5 +24,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): 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.js

@@ -27,9 +27,15 @@ 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}`);
         });
@@ -130,12 +136,13 @@ class AbstractEvmDexTrade extends dist_1.AbastrcatTrade {
     getWrappedNativeAddress() {
         return this.chainConfig.wrappedNativeCurrencyAddress;
     }
-    buildTipTransferTx(to, transfer_amount_gwei, gas_price_gwei, transfer_nonce) {
+    buildTipTransferTx(to, transfer_amount_gwei, gas_price_gwei, transfer_nonce, wallet) {
         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: this.wallet.address,
+                from: targetWallet.address,
                 to,
                 value: ethers_1.ethers.utils.parseUnits(real_transfer_amount_gwei, 'gwei'),
                 gasLimit: 21000,
@@ -143,7 +150,7 @@ class AbstractEvmDexTrade extends dist_1.AbastrcatTrade {
                 nonce: transfer_nonce,
                 chainId: this.chainConfig.chainId
             };
-            let signedTx = yield this.wallet.signTransaction(tx_data);
+            let signedTx = yield targetWallet.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/package.json

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