@clonegod/ttd-bsc-common 3.1.91 → 3.1.92

package/dist/appconfig/bsc_env_args.d.ts

@@ -3,6 +3,7 @@ export declare class BscEnvArgs extends EnvArgs {
     gas_price_gwei: number;
     gas_limit: number;
     tip_amount_gwei: number;
+    gas_max_limit: number;
     gas_max_price_gwei: number;
     gas_max_fee_per_gas_gwei: number;
     gas_max_priority_fee_gwei: number;

package/dist/appconfig/bsc_env_args.js

@@ -5,8 +5,9 @@ const ttd_core_1 = require("@clonegod/ttd-core");
 const constants_1 = require("../common/constants");
 (0, ttd_core_1.registerEnvVars)({
     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 上限' },
+    gas_limit: { env: 'GAS_LIMIT', type: 'number', default: 300000, desc: '交易 gas 默认值。运行时由 strategy.evm_gas_limit 覆盖（buildEvmGasArgs 三层合成）' },
     tip_amount_gwei: { env: 'TIP_AMOUNT_GWEI', type: 'number', default: 10000, desc: 'Builder tip(Gwei)' },
+    gas_max_limit: { env: 'GAS_MAX_LIMIT', type: 'number', default: 2000000, desc: '单 tx gas 上限。单池子 swap 套利场景，超过此值大概率是配置错误；取 2M 是给税币（如 MARS：dividend 钩子 + 税清算实测 46-90 万）留余量，仍远低于 BSC 140M block limit' },
     gas_max_price_gwei: { env: 'GAS_MAX_PRICE_GWEI', type: 'number', default: 10, desc: 'Legacy gasPrice 上限(Gwei)' },
     gas_max_fee_per_gas_gwei: { env: 'GAS_MAX_FEE_PER_GAS_GWEI', type: 'number', default: 10, desc: 'EIP-1559 maxFeePerGas 上限(Gwei)' },
     gas_max_priority_fee_gwei: { env: 'GAS_MAX_PRIORITY_FEE_GWEI', type: 'number', default: 3, desc: 'EIP-1559 maxPriorityFeePerGas 上限(Gwei)' },

package/dist/trade/abstract_dex_trade.d.ts

@@ -1,4 +1,4 @@
-import { AbastrcatTrade, AppConfig, TradeContext } from '@clonegod/ttd-core';
+import { AbastrcatTrade, AppConfig, TradeContext, EvmGasArgs } from '@clonegod/ttd-core';
 import { BscEnvArgs } from '../appconfig/bsc_env_args';
 import { ethers } from "ethers";
 import { EvmChainConfig } from "../types";
@@ -30,10 +30,13 @@ export declare abstract class AbstractDexTrade extends AbastrcatTrade {
     init(transactionSender?: ITransactionSender): Promise<void>;
     execute(context: TradeContext): Promise<string>;
     private scanCallerFiles;
+    protected computeEvmGasArgs(context: TradeContext): EvmGasArgs;
+    protected gasArgsToMainFields(args: EvmGasArgs): any;
     protected buildGasFields(context: TradeContext): {
         mainGasFields: any;
         tipGasPriceGwei: string;
     };
+    protected getGasLimit(context: TradeContext): number;
     protected getLegacyGasPriceGwei(context: TradeContext): string;
     protected getBuilderTipAmoutGwei(context: TradeContext): string;
     protected buildTipTransferTx(to: string, transfer_amount_gwei: string, gas_price_gwei: string, nonce: number, wallet: ethers.Wallet): Promise<string>;

package/dist/trade/abstract_dex_trade.js

@@ -162,14 +162,16 @@ class AbstractDexTrade extends ttd_core_1.AbastrcatTrade {
                 trace.mark('encode');
                 const deadline = Math.floor(Date.now() / 1000) + 60;
                 const vaultCalldata = this.vaultInterface.encodeFunctionData('delegatecallExecutorToTrade', [executorId, data, deadline]);
-                const { mainGasFields, tipGasPriceGwei } = this.buildGasFields(context);
+                const gasArgs = this.computeEvmGasArgs(context);
+                const mainGasFields = this.gasArgsToMainFields(gasArgs);
+                const tipGasPriceGwei = gasArgs.tipGasPriceGwei.toString();
                 const tipNonce = nonce + 1;
-                const transfer_amount_gwei = this.getBuilderTipAmoutGwei(context);
+                const transfer_amount_gwei = gasArgs.tipAmountGwei.toString();
                 context.ui_tip_amount = new decimal_js_1.default(transfer_amount_gwei).div(10 ** 9).toNumber();
                 const mainTx = {
                     to: this.tradeConfig.vaultAddress,
                     data: vaultCalldata,
-                    gasLimit: this.chainConfig.gasOptions.gasLimit,
+                    gasLimit: gasArgs.gasLimit,
                     ...mainGasFields,
                     nonce,
                     chainId: this.chainConfig.chainId,
@@ -258,44 +260,49 @@ class AbstractDexTrade extends ttd_core_1.AbastrcatTrade {
             .sort();
         return files.map(f => f.replace('.json', ''));
     }
-    buildGasFields(context) {
-        const strategy = context.trade_runtime.settings.strategy;
-        const opts = this.chainConfig.gasOptions;
-        const legacyGasPrice = this.getLegacyGasPriceGwei(context);
-        const tipGasPriceGwei = Math.min(Number(legacyGasPrice), opts.maxGasPriceGwei).toString();
-        if (strategy.evm_tx_type === 2) {
-            const maxFee = Math.min(strategy.evm_max_fee_per_gas_gwei || opts.maxFeePerGasGwei, opts.maxFeePerGasGwei);
-            const maxPriority = Math.min(strategy.evm_max_priority_fee_per_gas_gwei ?? 0, opts.maxPriorityFeePerGasGwei);
+    computeEvmGasArgs(context) {
+        const env = this.appConfig.env_args;
+        const defaults = {
+            gasLimit: env.gas_limit,
+            gasPriceGwei: env.gas_price_gwei,
+            tipAmountGwei: env.tip_amount_gwei,
+        };
+        const caps = {
+            gasLimit: env.gas_max_limit,
+            gasPriceGwei: env.gas_max_price_gwei,
+            maxFeePerGasGwei: env.gas_max_fee_per_gas_gwei,
+            maxPriorityFeePerGasGwei: env.gas_max_priority_fee_gwei,
+            tipAmountGwei: env.gas_max_tip_amount_gwei,
+        };
+        return (0, ttd_core_1.buildEvmGasArgs)(context.trade_runtime.settings.strategy, defaults, caps);
+    }
+    gasArgsToMainFields(args) {
+        if (args.txType === 2) {
             return {
-                mainGasFields: {
-                    type: 2,
-                    maxFeePerGas: ethers_compat_1.ethersCompat.parseUnits(maxFee.toString(), 'gwei'),
-                    maxPriorityFeePerGas: ethers_compat_1.ethersCompat.parseUnits(maxPriority.toString(), 'gwei'),
-                },
-                tipGasPriceGwei,
+                type: 2,
+                maxFeePerGas: ethers_compat_1.ethersCompat.parseUnits(args.maxFeePerGasGwei.toString(), 'gwei'),
+                maxPriorityFeePerGas: ethers_compat_1.ethersCompat.parseUnits(args.maxPriorityFeePerGasGwei.toString(), 'gwei'),
             };
         }
-        const realGasPrice = Math.min(Number(legacyGasPrice), opts.maxGasPriceGwei).toString();
         return {
-            mainGasFields: {
-                gasPrice: ethers_compat_1.ethersCompat.parseUnits(realGasPrice, 'gwei'),
-            },
-            tipGasPriceGwei,
+            gasPrice: ethers_compat_1.ethersCompat.parseUnits(args.gasPriceGwei.toString(), 'gwei'),
+        };
+    }
+    buildGasFields(context) {
+        const args = this.computeEvmGasArgs(context);
+        return {
+            mainGasFields: this.gasArgsToMainFields(args),
+            tipGasPriceGwei: args.tipGasPriceGwei.toString(),
         };
     }
+    getGasLimit(context) {
+        return this.computeEvmGasArgs(context).gasLimit;
+    }
     getLegacyGasPriceGwei(context) {
-        let { evm_gas_price_gwei } = context.trade_runtime.settings.strategy;
-        if (!evm_gas_price_gwei || evm_gas_price_gwei <= 0) {
-            evm_gas_price_gwei = this.chainConfig.gasOptions.defaultGasPriceGwei;
-        }
-        return evm_gas_price_gwei.toString();
+        return this.computeEvmGasArgs(context).tipGasPriceGwei.toString();
     }
     getBuilderTipAmoutGwei(context) {
-        let { evm_tip_amount_gwei } = context.trade_runtime.settings.strategy;
-        if (!evm_tip_amount_gwei || evm_tip_amount_gwei <= 0) {
-            evm_tip_amount_gwei = this.chainConfig.gasOptions.defaultTipAmountGwei;
-        }
-        return evm_tip_amount_gwei.toString();
+        return this.computeEvmGasArgs(context).tipAmountGwei.toString();
     }
     async buildTipTransferTx(to, transfer_amount_gwei, gas_price_gwei, nonce, wallet) {
         const real_transfer_amount_gwei = Math.min(Number(transfer_amount_gwei), this.chainConfig.gasOptions.maxTipAmountGwei).toString();

package/package.json

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