four-flap-meme-sdk 1.3.98 → 1.4.1

package/dist/dex/direct-router.d.ts

@@ -55,6 +55,7 @@ export interface DirectV2BuyParams {
     routerAddress: string;
     quoteToken?: string;
     quoteTokenDecimals?: number;
+    startNonces?: number[];
     config: DirectRouterSignConfig;
 }
 export interface DirectV2SellParams {
@@ -62,6 +63,7 @@ export interface DirectV2SellParams {
     privateKeys: string[];
     sellPercentages?: number[];
     sellAmounts?: string[];
+    startNonces?: number[];
     tokenAddress: string;
     tokenDecimals?: number;
     routerAddress: string;
@@ -77,6 +79,7 @@ export interface DirectV3BuyParams {
     fee: number;
     quoteToken?: string;
     quoteTokenDecimals?: number;
+    startNonces?: number[];
     config: DirectRouterSignConfig;
 }
 export interface DirectV3SellParams {
@@ -89,6 +92,7 @@ export interface DirectV3SellParams {
     routerAddress: string;
     fee: number;
     quoteToken?: string;
+    startNonces?: number[];
     config: DirectRouterSignConfig;
 }
 export interface DirectRouterResult {

package/dist/dex/direct-router.js

@@ -666,7 +666,7 @@ function isDYORSwap(chain, routerAddress) {
  * V2 批量买入（直接调用 Router）
  */
 export async function directV2BatchBuy(params) {
-    const { chain, privateKeys, buyAmounts, tokenAddress, routerAddress, quoteToken, quoteTokenDecimals = 18, config, } = params;
+    const { chain, privateKeys, buyAmounts, tokenAddress, routerAddress, quoteToken, quoteTokenDecimals = 18, startNonces, config, } = params;
     if (privateKeys.length !== buyAmounts.length) {
         throw new Error('privateKeys 和 buyAmounts 长度必须相同');
     }
@@ -676,11 +676,13 @@ export async function directV2BatchBuy(params) {
     const wrappedNative = getWrappedNative(chain);
     // 创建钱包
     const wallets = privateKeys.map(pk => new Wallet(pk, provider));
-    // 获取 nonce
-    const nonceManager = new NonceManager(provider);
-    const nonces = await nonceManager.getNextNoncesForWallets(wallets);
-    // 获取 gas price
-    const gasPrice = await getGasPrice(provider, config);
+    // ✅ 性能优化：如果前端已传入 nonces，则跳过 RPC 获取
+    const [nonces, gasPrice] = await Promise.all([
+        startNonces && startNonces.length === wallets.length
+            ? Promise.resolve(startNonces)
+            : new NonceManager(provider).getNextNoncesForWallets(wallets),
+        getGasPrice(provider, config)
+    ]);
     const gasLimit = getGasLimit(config, 250000);
     const txType = config.txType ?? 0;
     const deadline = getDeadline();
@@ -807,7 +809,7 @@ export async function directV2BatchBuy(params) {
  * V2 批量卖出（直接调用 Router）
  */
 export async function directV2BatchSell(params) {
-    const { chain, privateKeys, sellPercentages, sellAmounts, tokenAddress, tokenDecimals: inputDecimals, routerAddress, quoteToken, config, } = params;
+    const { chain, privateKeys, sellPercentages, sellAmounts, tokenAddress, tokenDecimals: inputDecimals, routerAddress, quoteToken, startNonces, config, } = params;
     const chainId = config.chainId || CHAIN_IDS[chain.toUpperCase()] || 56;
     const provider = new JsonRpcProvider(config.rpcUrl, { chainId, name: chain });
     const useNativeOutput = isNativeToken(quoteToken);
@@ -816,19 +818,27 @@ export async function directV2BatchSell(params) {
     const wallets = privateKeys.map(pk => new Wallet(pk, provider));
     // 获取代币合约
     const tokenContract = new Contract(tokenAddress, ERC20_ABI, provider);
-    // ✅ 自动获取代币精度（如果未提供）
-    let tokenDecimals = inputDecimals;
-    if (tokenDecimals === undefined) {
-        try {
-            tokenDecimals = Number(await tokenContract.decimals());
-        }
-        catch {
-            tokenDecimals = 18; // 默认 18
-        }
-    }
-    // 获取代币余额
-    const balances = await Promise.all(wallets.map(w => tokenContract.balanceOf(w.address)));
-    // 计算卖出数量
+    // ✅ 性能优化：并行获取所有独立的 RPC 数据
+    // ✅ 如果前端已传入 nonces，则跳过 RPC 获取
+    const [fetchedDecimals, balances, nonces, gasPrice] = await Promise.all([
+        // 1. 获取代币精度（如果未提供）
+        inputDecimals !== undefined
+            ? Promise.resolve(inputDecimals)
+            : tokenContract.decimals().then((d) => Number(d)).catch(() => 18),
+        // 2. 批量获取余额
+        Promise.all(wallets.map(w => tokenContract.balanceOf(w.address))),
+        // 3. 批量获取 nonce（如果前端已传入则跳过）
+        startNonces && startNonces.length === wallets.length
+            ? Promise.resolve(startNonces)
+            : new NonceManager(provider).getNextNoncesForWallets(wallets),
+        // 4. 获取 gas price
+        getGasPrice(provider, config)
+    ]);
+    const tokenDecimals = fetchedDecimals;
+    const gasLimit = getGasLimit(config, 300000);
+    const txType = config.txType ?? 0;
+    const deadline = getDeadline();
+    // 计算卖出数量（同步操作，无 RPC）
     const sellAmountsWei = [];
     for (let i = 0; i < wallets.length; i++) {
         if (sellAmounts && sellAmounts[i]) {
@@ -844,13 +854,6 @@ export async function directV2BatchSell(params) {
             sellAmountsWei.push(balances[i]); // 默认全部卖出
         }
     }
-    // 获取 nonce（每个钱包可能需要 2 个：授权 + 卖出）
-    const nonceManager = new NonceManager(provider);
-    const nonces = await nonceManager.getNextNoncesForWallets(wallets);
-    const gasPrice = await getGasPrice(provider, config);
-    const gasLimit = getGasLimit(config, 300000);
-    const txType = config.txType ?? 0;
-    const deadline = getDeadline();
     // 构建路径
     const outputToken = useNativeOutput ? wrappedNative : quoteToken;
     const path = [tokenAddress, outputToken];
@@ -861,7 +864,6 @@ export async function directV2BatchSell(params) {
     const routerIface = useSwapRouter02
         ? new ethers.Interface(SWAP_ROUTER02_V2_ABI)
         : new ethers.Interface(V2_ROUTER_ABI);
-    const approveIface = new ethers.Interface(ERC20_ABI);
     // ✅ 优化：构建卖出交易数据的辅助函数（同步）
     const buildSellTxData = (wallet, sellAmount) => {
         if (useDYORSwap) {
@@ -895,40 +897,14 @@ export async function directV2BatchSell(params) {
             return routerIface.encodeFunctionData('swapExactTokensForTokensSupportingFeeOnTransferTokens', [sellAmount, 0n, path, wallet.address, deadline]);
         }
     };
-    // ✅ 优化：并行检查所有授权
-    let allowances = [];
-    if (!config.skipApprovalCheck) {
-        allowances = await Promise.all(wallets.map(w => tokenContract.allowance(w.address, routerAddress)));
-    }
-    // ✅ 先获取报价，确定哪个钱包输出最大（用于支付贿赂和利润）
-    const router = new Contract(routerAddress, V2_ROUTER_ABI, provider);
-    const quotePromises = wallets.map(async (_, i) => {
-        if (sellAmountsWei[i] <= 0n)
-            return sellAmountsWei[i];
-        try {
-            const amounts = await router.getAmountsOut(sellAmountsWei[i], path);
-            return amounts[amounts.length - 1];
-        }
-        catch {
-            return sellAmountsWei[i];
-        }
-    });
-    const outputEstimates = await Promise.all(quotePromises);
-    const maxOutputIndex = findMaxFlowIndex(outputEstimates);
+    // ✅ 性能优化：直接用 sellAmountsWei 找最大输出钱包（跳过 N 次 getAmountsOut RPC 调用）
+    // 因为卖出金额越大，输出也越大（假设线性关系），无需额外报价
+    const maxOutputIndex = findMaxFlowIndex(sellAmountsWei);
     // ✅ 计算贿赂金额（仅 BSC 链）
     const bribeWei = getBribeAmount(config, chain);
     const hasBribe = bribeWei > 0n && wallets.length > 0;
-    // ✅ 优化：计算每个钱包的 nonce 偏移（授权 + 贿赂）
-    const currentNonceOffset = wallets.map((_, i) => {
-        let offset = 0;
-        // 贿赂交易偏移（只有 maxOutputIndex 钱包需要）
-        if (hasBribe && i === maxOutputIndex)
-            offset++;
-        // 授权交易偏移
-        if (!config.skipApprovalCheck && allowances[i] < sellAmountsWei[i])
-            offset++;
-        return offset;
-    });
+    // ✅ 计算 nonce 偏移（仅贿赂，已移除授权）
+    const nonceOffsets = wallets.map((_, i) => i === maxOutputIndex && hasBribe ? 1 : 0);
     // ✅ 贿赂交易放在首位（提高 BlockRazor 打包优先级）
     const bribeTxs = [];
     if (hasBribe) {
@@ -936,55 +912,23 @@ export async function directV2BatchSell(params) {
         gasPrice, chainId, txType);
         bribeTxs.push(bribeTx);
     }
-    // ✅ 优化：并行签名所有授权交易
-    const approvalTxPromises = wallets.map(async (wallet, i) => {
-        if (config.skipApprovalCheck || sellAmountsWei[i] <= 0n)
-            return null;
-        if (allowances[i] >= sellAmountsWei[i])
-            return null;
-        // 授权交易的 nonce = 原始 nonce + 贿赂偏移
-        const approvalNonce = nonces[i] + (hasBribe && i === maxOutputIndex ? 1 : 0);
-        return wallet.signTransaction({
-            to: tokenAddress,
-            data: approveIface.encodeFunctionData('approve', [routerAddress, ethers.MaxUint256]),
-            value: 0n,
-            nonce: approvalNonce,
-            gasLimit: 60000n,
-            gasPrice,
-            chainId,
-            type: txType,
-        });
-    });
-    const approvalTxResults = await Promise.all(approvalTxPromises);
-    // ✅ 优化：并行签名所有卖出交易
-    const sellTxPromises = wallets.map(async (wallet, i) => {
+    // ✅ 优化：并行签名所有卖出交易（已移除授权交易）
+    const swapTxs = await Promise.all(wallets.map(async (wallet, i) => {
         if (sellAmountsWei[i] <= 0n)
             return null;
         return wallet.signTransaction({
             to: routerAddress,
             data: buildSellTxData(wallet, sellAmountsWei[i]),
             value: 0n,
-            nonce: nonces[i] + currentNonceOffset[i],
+            nonce: nonces[i] + nonceOffsets[i],
             gasLimit,
             gasPrice,
             chainId,
             type: txType,
         });
-    });
-    const sellTxResults = await Promise.all(sellTxPromises);
-    // ✅ 按顺序组装签名交易：先授权，后卖出
-    const swapTxs = [];
-    for (let i = 0; i < wallets.length; i++) {
-        const approvalTx = approvalTxResults[i];
-        const sellTx = sellTxResults[i];
-        if (approvalTx)
-            swapTxs.push(approvalTx);
-        if (sellTx) {
-            swapTxs.push(sellTx);
-            currentNonceOffset[i]++; // 更新 offset 供利润交易使用
-        }
-    }
-    const totalOutputEstimate = outputEstimates.reduce((sum, o) => sum + o, 0n);
+    })).then(results => results.filter((tx) => tx !== null));
+    // ✅ 使用 sellAmountsWei 作为输出估计（因为已跳过 getAmountsOut 调用）
+    const totalOutputEstimate = sellAmountsWei.reduce((sum, o) => sum + o, 0n);
     let profitWei = calculateProfitAmount(totalOutputEstimate);
     // ✅ 修复：ERC20 输出时，将利润转换为原生代币
     if (!useNativeOutput && profitWei > 0n && quoteToken) {
@@ -999,11 +943,13 @@ export async function directV2BatchSell(params) {
     // ✅ 利润交易
     const profitTxs = [];
     if (profitWei > 0n && wallets.length > 0) {
+        // 利润交易 nonce = 原始 nonce + 贿赂偏移 + 1（卖出交易）
+        const profitNonce = nonces[maxOutputIndex] + nonceOffsets[maxOutputIndex] + 1;
         const profitTx = await buildProfitTransaction(wallets[maxOutputIndex], // ✅ 使用输出最大的钱包
-        profitWei, nonces[maxOutputIndex] + currentNonceOffset[maxOutputIndex], gasPrice, chainId, txType);
+        profitWei, profitNonce, gasPrice, chainId, txType);
         profitTxs.push(profitTx);
     }
-    // ✅ 组装最终交易列表：贿赂 → 授权+卖出 → 利润
+    // ✅ 组装最终交易列表：贿赂 → 卖出 → 利润
     const signedTxs = [...bribeTxs, ...swapTxs, ...profitTxs];
     return {
         signedTransactions: signedTxs,
@@ -1025,7 +971,7 @@ export async function directV2BatchSell(params) {
  * - SwapRouter (旧版 Uniswap V3): exactInputSingle 含 deadline，multicall 不含 deadline
  */
 export async function directV3BatchBuy(params) {
-    const { chain, privateKeys, buyAmounts, tokenAddress, routerAddress, fee, quoteToken, quoteTokenDecimals = 18, config, } = params;
+    const { chain, privateKeys, buyAmounts, tokenAddress, routerAddress, fee, quoteToken, quoteTokenDecimals = 18, startNonces, config, } = params;
     if (privateKeys.length !== buyAmounts.length) {
         throw new Error('privateKeys 和 buyAmounts 长度必须相同');
     }
@@ -1037,9 +983,13 @@ export async function directV3BatchBuy(params) {
     const useLegacyRouter = isLegacySwapRouter(chain, routerAddress);
     const routerAbi = useLegacyRouter ? V3_ROUTER_LEGACY_ABI : V3_ROUTER02_ABI;
     const wallets = privateKeys.map(pk => new Wallet(pk, provider));
-    const nonceManager = new NonceManager(provider);
-    const nonces = await nonceManager.getNextNoncesForWallets(wallets);
-    const gasPrice = await getGasPrice(provider, config);
+    // ✅ 性能优化：如果前端已传入 nonces，则跳过 RPC 获取
+    const [nonces, gasPrice] = await Promise.all([
+        startNonces && startNonces.length === wallets.length
+            ? Promise.resolve(startNonces)
+            : new NonceManager(provider).getNextNoncesForWallets(wallets),
+        getGasPrice(provider, config)
+    ]);
     const gasLimit = getGasLimit(config, 300000);
     const txType = config.txType ?? 0;
     const routerIface = new ethers.Interface(routerAbi);
@@ -1159,7 +1109,7 @@ export async function directV3BatchBuy(params) {
  * - SwapRouter (旧版 Uniswap V3): exactInputSingle 含 deadline，multicall 不含 deadline
  */
 export async function directV3BatchSell(params) {
-    const { chain, privateKeys, sellPercentages, sellAmounts, tokenAddress, tokenDecimals = 18, routerAddress, fee, quoteToken, config, } = params;
+    const { chain, privateKeys, sellPercentages, sellAmounts, tokenAddress, tokenDecimals = 18, routerAddress, fee, quoteToken, startNonces, config, } = params;
     const chainId = config.chainId || CHAIN_IDS[chain.toUpperCase()] || 56;
     const provider = new JsonRpcProvider(config.rpcUrl, { chainId, name: chain });
     const useNativeOutput = isNativeToken(quoteToken);
@@ -1169,9 +1119,21 @@ export async function directV3BatchSell(params) {
     const routerAbi = useLegacyRouter ? V3_ROUTER_LEGACY_ABI : V3_ROUTER02_ABI;
     const wallets = privateKeys.map(pk => new Wallet(pk, provider));
     const tokenContract = new Contract(tokenAddress, ERC20_ABI, provider);
-    // 获取余额
-    const balances = await Promise.all(wallets.map(w => tokenContract.balanceOf(w.address)));
-    // 计算卖出数量
+    // ✅ 性能优化：并行获取所有独立的 RPC 数据
+    // ✅ 如果前端已传入 nonces，则跳过 RPC 获取
+    const [balances, nonces, gasPrice] = await Promise.all([
+        // 1. 批量获取余额
+        Promise.all(wallets.map(w => tokenContract.balanceOf(w.address))),
+        // 2. 批量获取 nonce（如果前端已传入则跳过）
+        startNonces && startNonces.length === wallets.length
+            ? Promise.resolve(startNonces)
+            : new NonceManager(provider).getNextNoncesForWallets(wallets),
+        // 3. 获取 gas price
+        getGasPrice(provider, config)
+    ]);
+    const gasLimit = getGasLimit(config, 350000);
+    const txType = config.txType ?? 0;
+    // 计算卖出数量（同步操作，无 RPC）
     const sellAmountsWei = [];
     for (let i = 0; i < wallets.length; i++) {
         if (sellAmounts && sellAmounts[i]) {
@@ -1185,13 +1147,7 @@ export async function directV3BatchSell(params) {
             sellAmountsWei.push(balances[i]);
         }
     }
-    const nonceManager = new NonceManager(provider);
-    const nonces = await nonceManager.getNextNoncesForWallets(wallets);
-    const gasPrice = await getGasPrice(provider, config);
-    const gasLimit = getGasLimit(config, 350000);
-    const txType = config.txType ?? 0;
     const routerIface = new ethers.Interface(routerAbi);
-    const approveIface = new ethers.Interface(ERC20_ABI);
     const outputToken = useNativeOutput ? wrappedNative : quoteToken;
     const deadline = getDeadline();
     // ✅ 优化：构建卖出交易数据的辅助函数
@@ -1236,28 +1192,14 @@ export async function directV3BatchSell(params) {
             }
         }
     };
-    // ✅ 优化：并行检查所有授权
-    let allowances = [];
-    if (!config.skipApprovalCheck) {
-        allowances = await Promise.all(wallets.map(w => tokenContract.allowance(w.address, routerAddress)));
-    }
     // ✅ 先找出输出最大的钱包索引（用于支付贿赂和利润）
     // 对于 V3 卖出，使用卖出金额作为输出估计
     const maxOutputIndex = findMaxFlowIndex(sellAmountsWei);
     // ✅ 计算贿赂金额（仅 BSC 链）
     const bribeWei = getBribeAmount(config, chain);
     const hasBribe = bribeWei > 0n && wallets.length > 0;
-    // ✅ 优化：计算每个钱包的 nonce 偏移（贿赂 + 授权）
-    const currentNonceOffset = wallets.map((_, i) => {
-        let offset = 0;
-        // 贿赂交易偏移（只有 maxOutputIndex 钱包需要）
-        if (hasBribe && i === maxOutputIndex)
-            offset++;
-        // 授权交易偏移
-        if (!config.skipApprovalCheck && sellAmountsWei[i] > 0n && allowances[i] < sellAmountsWei[i])
-            offset++;
-        return offset;
-    });
+    // ✅ 计算 nonce 偏移（仅贿赂，已移除授权）
+    const nonceOffsets = wallets.map((_, i) => i === maxOutputIndex && hasBribe ? 1 : 0);
     // ✅ 贿赂交易放在首位（提高 BlockRazor 打包优先级）
     const bribeTxs = [];
     if (hasBribe) {
@@ -1265,60 +1207,23 @@ export async function directV3BatchSell(params) {
         gasPrice, chainId, txType);
         bribeTxs.push(bribeTx);
     }
-    // ✅ 优化：并行签名所有授权交易
-    const approvalTxPromises = wallets.map(async (wallet, i) => {
-        if (config.skipApprovalCheck || sellAmountsWei[i] <= 0n)
-            return null;
-        if (allowances[i] >= sellAmountsWei[i])
-            return null;
-        // 授权交易的 nonce = 原始 nonce + 贿赂偏移
-        const approvalNonce = nonces[i] + (hasBribe && i === maxOutputIndex ? 1 : 0);
-        return wallet.signTransaction({
-            to: tokenAddress,
-            data: approveIface.encodeFunctionData('approve', [routerAddress, ethers.MaxUint256]),
-            value: 0n,
-            nonce: approvalNonce,
-            gasLimit: 60000n,
-            gasPrice,
-            chainId,
-            type: txType,
-        });
-    });
-    const approvalTxResults = await Promise.all(approvalTxPromises);
-    // ✅ 优化：并行签名所有卖出交易
-    const sellTxPromises = wallets.map(async (wallet, i) => {
+    // ✅ 优化：并行签名所有卖出交易（已移除授权交易）
+    const swapTxs = await Promise.all(wallets.map(async (wallet, i) => {
         if (sellAmountsWei[i] <= 0n)
             return null;
         return wallet.signTransaction({
             to: routerAddress,
             data: buildV3SellTxData(wallet, sellAmountsWei[i]),
             value: 0n,
-            nonce: nonces[i] + currentNonceOffset[i],
+            nonce: nonces[i] + nonceOffsets[i],
             gasLimit,
             gasPrice,
             chainId,
             type: txType,
         });
-    });
-    const sellTxResults = await Promise.all(sellTxPromises);
-    // ✅ 按顺序组装签名交易：先授权，后卖出
-    const swapTxs = [];
-    const outputEstimates = [];
-    for (let i = 0; i < wallets.length; i++) {
-        const approvalTx = approvalTxResults[i];
-        const sellTx = sellTxResults[i];
-        if (approvalTx)
-            swapTxs.push(approvalTx);
-        if (sellTx) {
-            swapTxs.push(sellTx);
-            outputEstimates.push(sellAmountsWei[i]);
-            currentNonceOffset[i]++;
-        }
-        else {
-            outputEstimates.push(0n);
-        }
-    }
-    const totalOutputEstimate = outputEstimates.reduce((sum, o) => sum + o, 0n);
+    })).then(results => results.filter((tx) => tx !== null));
+    // ✅ 使用 sellAmountsWei 计算总输出
+    const totalOutputEstimate = sellAmountsWei.reduce((sum, o) => sum + o, 0n);
     let profitWei = calculateProfitAmount(totalOutputEstimate);
     // ✅ 修复：ERC20 输出时，将利润转换为原生代币
     if (!useNativeOutput && profitWei > 0n && quoteToken) {
@@ -1333,11 +1238,13 @@ export async function directV3BatchSell(params) {
     // ✅ 利润交易
     const profitTxs = [];
     if (profitWei > 0n && wallets.length > 0) {
+        // 利润交易 nonce = 原始 nonce + 贿赂偏移 + 1（卖出交易）
+        const profitNonce = nonces[maxOutputIndex] + nonceOffsets[maxOutputIndex] + 1;
         const profitTx = await buildProfitTransaction(wallets[maxOutputIndex], // ✅ 使用输出最大的钱包
-        profitWei, nonces[maxOutputIndex] + currentNonceOffset[maxOutputIndex], gasPrice, chainId, txType);
+        profitWei, profitNonce, gasPrice, chainId, txType);
         profitTxs.push(profitTx);
     }
-    // ✅ 组装最终交易列表：贿赂 → 授权+卖出 → 利润
+    // ✅ 组装最终交易列表：贿赂 → 卖出 → 利润
     const signedTxs = [...bribeTxs, ...swapTxs, ...profitTxs];
     return {
         signedTransactions: signedTxs,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "four-flap-meme-sdk",
-  "version": "1.3.98",
+  "version": "1.4.1",
   "description": "SDK for Flap bonding curve and four.meme TokenManager",
   "type": "module",
   "main": "dist/index.js",