four-flap-meme-sdk 1.3.39 → 1.3.41

package/dist/contracts/tm-bundle-merkle/pancake-proxy.js

@@ -303,17 +303,25 @@ export async function fourPancakeProxyBatchBuyMerkle(params) {
     const actualAmountsWei = remainingAmounts; // 扣除利润后用于购买的金额
     const finalGasLimit = getGasLimit(config);
     const nonceManager = new NonceManager(provider);
-    // ✅ 优化：并行获取 gasPrice、tokenDecimals 和 nonces（JSON-RPC 批量请求）
-    const [gasPrice, tokenDecimals, nonces] = await Promise.all([
+    // ✅ 优化：并行获取 gasPrice 和 tokenDecimals
+    const [gasPrice, tokenDecimals] = await Promise.all([
         getOptimizedGasPrice(provider, getGasPriceConfig(config)),
-        getTokenDecimals(tokenAddress, provider),
-        nonceManager.getNextNoncesForWallets(buyers) // ✅ 批量获取 nonce
+        getTokenDecimals(tokenAddress, provider)
     ]);
-    // ✅ 如果需要利润转账，预先获取 nonce
-    let profitNonce;
-    if (extractProfit && totalProfit > 0n) {
-        profitNonce = await nonceManager.getNextNonce(buyers[0]);
-    }
+    // ✅ 修复：先计算需要的 nonce 数量，再统一获取
+    // buyers[0] 可能需要 2 个 nonce（买入 + 利润转账）
+    const needProfitTx = extractProfit && totalProfit > 0n;
+    const buyer0NeedCount = needProfitTx ? 2 : 1;
+    // 获取 buyers[0] 的连续 nonces
+    const buyer0Nonces = await nonceManager.getNextNonceBatch(buyers[0], buyer0NeedCount);
+    // 获取其他 buyers 的 nonces（如果有）
+    let otherNonces = [];
+    if (buyers.length > 1) {
+        otherNonces = await nonceManager.getNextNoncesForWallets(buyers.slice(1));
+    }
+    // 组装最终的 nonces 数组
+    const nonces = [buyer0Nonces[0], ...otherNonces];
+    const profitNonce = needProfitTx ? buyer0Nonces[1] : undefined;
     // 计算 minOutputAmounts
     let minOuts;
     if (params.minOutputAmounts && params.minOutputAmounts.length === buyers.length) {
@@ -401,12 +409,11 @@ export async function fourPancakeProxyBatchSellMerkle(params) {
     const finalGasLimit = getGasLimit(config);
     const nonceManager = new NonceManager(provider);
     const extractProfit = shouldExtractProfit(config);
-    // ✅ 优化：并行获取 gasPrice、tokenDecimals、allowances 和 nonces（JSON-RPC 批量请求）
-    const [gasPrice, tokenDecimals, allowances, nonces] = await Promise.all([
+    // ✅ 优化：并行获取 gasPrice、tokenDecimals 和 allowances
+    const [gasPrice, tokenDecimals, allowances] = await Promise.all([
         getOptimizedGasPrice(provider, getGasPriceConfig(config)),
         getTokenDecimals(tokenAddress, provider),
-        batchCheckAllowances(provider, tokenAddress, sellers.map(w => w.address), pancakeProxyAddress),
-        nonceManager.getNextNoncesForWallets(sellers) // ✅ 批量获取 nonce
+        batchCheckAllowances(provider, tokenAddress, sellers.map(w => w.address), pancakeProxyAddress)
     ]);
     const amountsWei = sellAmounts.map(a => ethers.parseUnits(a, tokenDecimals));
     // 找出需要授权的钱包索引
@@ -464,7 +471,7 @@ export async function fourPancakeProxyBatchSellMerkle(params) {
         // ✅ minOuts = 0，不设置滑点限制（大额交易更稳定）
         minOuts = quotedOutputs.map(() => 0n);
     }
-    // ✅ 计算利润并找出收益最多的钱包（提前计算，预先获取 nonce）
+    // ✅ 计算利润并找出收益最多的钱包
     let totalProfit = 0n;
     let maxRevenueIndex = 0;
     let maxRevenue = 0n;
@@ -480,10 +487,35 @@ export async function fourPancakeProxyBatchSellMerkle(params) {
             }
         }
     }
-    // ✅ 如果需要利润转账，预先获取 nonce
+    // ✅ 修复：先计算需要的 nonce 数量，再统一获取
+    const needProfitTx = extractProfit && totalProfit > 0n && maxRevenue > 0n;
+    // 分配 nonces：收益最多的钱包可能需要 2 个 nonce（卖出 + 利润转账）
+    let nonces;
     let profitNonce;
-    if (extractProfit && totalProfit > 0n && maxRevenue > 0n) {
-        profitNonce = await nonceManager.getNextNonce(sellers[maxRevenueIndex]);
+    if (needProfitTx) {
+        // 收益最多的钱包需要 2 个连续 nonce
+        const maxRevenueNonces = await nonceManager.getNextNonceBatch(sellers[maxRevenueIndex], 2);
+        // 其他钱包各需要 1 个 nonce
+        const otherSellers = sellers.filter((_, i) => i !== maxRevenueIndex);
+        const otherNonces = otherSellers.length > 0
+            ? await nonceManager.getNextNoncesForWallets(otherSellers)
+            : [];
+        // 组装最终的 nonces 数组（保持原顺序）
+        nonces = [];
+        let otherIdx = 0;
+        for (let i = 0; i < sellers.length; i++) {
+            if (i === maxRevenueIndex) {
+                nonces.push(maxRevenueNonces[0]); // 卖出交易用第一个 nonce
+            }
+            else {
+                nonces.push(otherNonces[otherIdx++]);
+            }
+        }
+        profitNonce = maxRevenueNonces[1]; // 利润交易用第二个 nonce
+    }
+    else {
+        // 不需要利润交易，所有钱包各 1 个 nonce
+        nonces = await nonceManager.getNextNoncesForWallets(sellers);
     }
     // 卖出不需要发送 BNB，只需要 flatFee
     const needBNB = false;

package/dist/dex/direct-router.js

@@ -79,6 +79,19 @@ const V2_ROUTER_ABI = [
     // 报价
     'function getAmountsOut(uint amountIn, address[] calldata path) external view returns (uint[] memory amounts)',
 ];
+/**
+ * SwapRouter02 的 V2 方法 ABI (PotatoSwap, PancakeSwap V3 Router)
+ * SwapRouter02 同时支持 V2 和 V3，V2 方法通过 multicall 调用
+ */
+const SWAP_ROUTER02_V2_ABI = [
+    // V2 交换方法 (SwapRouter02 内置)
+    'function swapExactTokensForTokens(uint256 amountIn, uint256 amountOutMin, address[] calldata path, address to) external payable returns (uint256 amountOut)',
+    // Multicall
+    'function multicall(uint256 deadline, bytes[] calldata data) external payable returns (bytes[] memory results)',
+    // 辅助方法
+    'function refundETH() external payable',
+    'function unwrapWETH9(uint256 amountMinimum, address recipient) external payable',
+];
 /**
  * V3 SwapRouter02 ABI (PancakeSwap V3, 新版 Uniswap)
  * - exactInputSingle: 不含 deadline（deadline 通过 multicall 传递）
@@ -228,6 +241,23 @@ async function buildProfitTransaction(wallet, profitAmountWei, nonce, gasPrice,
 // ============================================================================
 // V2 直接交易
 // ============================================================================
+/**
+ * 判断是否是 SwapRouter02 (PotatoSwap, PancakeSwap V3 等)
+ * SwapRouter02 的 V2 方法签名不同，需要特殊处理
+ */
+function isSwapRouter02(chain, routerAddress) {
+    const chainUpper = chain.toUpperCase();
+    const addrLower = routerAddress.toLowerCase();
+    // XLayer PotatoSwap SwapRouter02
+    if (chainUpper === 'XLAYER' && addrLower === DIRECT_ROUTERS.XLAYER.POTATOSWAP_V2.toLowerCase()) {
+        return true;
+    }
+    // BSC PancakeSwap V3 SwapRouter02
+    if (chainUpper === 'BSC' && addrLower === DIRECT_ROUTERS.BSC.PANCAKESWAP_V3.toLowerCase()) {
+        return true;
+    }
+    return false;
+}
 /**
  * V2 批量买入（直接调用 Router）
  */
@@ -254,8 +284,12 @@ export async function directV2BatchBuy(params) {
     // 构建路径
     const inputToken = useNative ? wrappedNative : quoteToken;
     const path = [inputToken, tokenAddress];
-    // 创建 Router 合约
-    const routerIface = new ethers.Interface(V2_ROUTER_ABI);
+    // ✅ 判断是否是 SwapRouter02
+    const useSwapRouter02 = isSwapRouter02(chain, routerAddress);
+    // 创建 Router 合约接口
+    const routerIface = useSwapRouter02
+        ? new ethers.Interface(SWAP_ROUTER02_V2_ABI)
+        : new ethers.Interface(V2_ROUTER_ABI);
     const signedTxs = [];
     let totalFlowWei = 0n;
     for (let i = 0; i < wallets.length; i++) {
@@ -264,9 +298,24 @@ export async function directV2BatchBuy(params) {
         totalFlowWei += amountWei;
         let txData;
         let txValue;
-        if (useNative) {
-            // 原生币 → Token
-            // minOut = 0 (由于 MEV bundle 保护，可以设为 0；或根据滑点计算)
+        if (useSwapRouter02) {
+            // ✅ SwapRouter02 V2 方法：使用 multicall 包装
+            // SwapRouter02.swapExactTokensForTokens 不含 deadline，需要通过 multicall 传递
+            const swapData = routerIface.encodeFunctionData('swapExactTokensForTokens', [
+                amountWei,
+                0n, // amountOutMin
+                path,
+                wallet.address,
+            ]);
+            // 使用 multicall 包装，传递 deadline
+            txData = routerIface.encodeFunctionData('multicall', [
+                deadline,
+                [swapData],
+            ]);
+            txValue = useNative ? amountWei : 0n;
+        }
+        else if (useNative) {
+            // 传统 V2 Router: 原生币 → Token
             txData = routerIface.encodeFunctionData('swapExactETHForTokensSupportingFeeOnTransferTokens', [
                 0n, // amountOutMin
                 path,
@@ -276,7 +325,7 @@ export async function directV2BatchBuy(params) {
             txValue = amountWei;
         }
         else {
-            // ERC20 → Token (需要先授权)
+            // 传统 V2 Router: ERC20 → Token (需要先授权)
             txData = routerIface.encodeFunctionData('swapExactTokensForTokensSupportingFeeOnTransferTokens', [
                 amountWei,
                 0n, // amountOutMin
@@ -353,7 +402,11 @@ export async function directV2BatchSell(params) {
     // 构建路径
     const outputToken = useNativeOutput ? wrappedNative : quoteToken;
     const path = [tokenAddress, outputToken];
-    const routerIface = new ethers.Interface(V2_ROUTER_ABI);
+    // ✅ 判断是否是 SwapRouter02
+    const useSwapRouter02 = isSwapRouter02(chain, routerAddress);
+    const routerIface = useSwapRouter02
+        ? new ethers.Interface(SWAP_ROUTER02_V2_ABI)
+        : new ethers.Interface(V2_ROUTER_ABI);
     const approveIface = new ethers.Interface(ERC20_ABI);
     const signedTxs = [];
     let totalOutputEstimate = 0n;
@@ -385,7 +438,20 @@ export async function directV2BatchSell(params) {
         }
         // 卖出交易
         let txData;
-        if (useNativeOutput) {
+        if (useSwapRouter02) {
+            // ✅ SwapRouter02 V2 方法：使用 multicall 包装
+            const swapData = routerIface.encodeFunctionData('swapExactTokensForTokens', [
+                sellAmount,
+                0n, // amountOutMin
+                path,
+                wallet.address,
+            ]);
+            txData = routerIface.encodeFunctionData('multicall', [
+                deadline,
+                [swapData],
+            ]);
+        }
+        else if (useNativeOutput) {
             txData = routerIface.encodeFunctionData('swapExactTokensForETHSupportingFeeOnTransferTokens', [
                 sellAmount,
                 0n,

package/dist/flap/portal-bundle-merkle/pancake-proxy.js

@@ -354,8 +354,8 @@ export async function pancakeProxyBatchSellMerkle(params) {
     const finalGasLimit = getGasLimit(config);
     const extractProfit = shouldExtractProfit(config);
     const nonceManager = new NonceManager(provider);
-    // ✅ 优化：第一批并行 - gasPrice、tokenDecimals、allowances、nonces（JSON-RPC 批量请求）
-    const [gasPrice, tokenDecimals, , nonces] = await Promise.all([
+    // ✅ 优化：第一批并行 - gasPrice、tokenDecimals、allowances
+    const [gasPrice, tokenDecimals] = await Promise.all([
         getOptimizedGasPrice(provider, getGasPriceConfig(config)),
         getTokenDecimals(tokenAddress, provider),
         ensureAllowances({
@@ -363,8 +363,7 @@ export async function pancakeProxyBatchSellMerkle(params) {
             tokenAddress,
             owners: sellers.map(w => w.address),
             spender: ADDRESSES.BSC.PancakeProxy
-        }),
-        nonceManager.getNextNoncesForWallets(sellers) // ✅ 批量获取 nonce
+        })
     ]);
     const amountsWei = sellAmounts.map(amount => ethers.parseUnits(amount, tokenDecimals));
     // ✅ 优化：第二批并行 - resolveSellOutputs 和 buildSellTransactions
@@ -376,6 +375,52 @@ export async function pancakeProxyBatchSellMerkle(params) {
         routeType,
         amountsWei
     });
+    // ✅ 修复：先计算利润和 maxRevenueIndex，再统一分配 nonces
+    let totalProfit = 0n;
+    let maxRevenueIndex = -1;
+    let maxRevenue = 0n;
+    if (extractProfit && quotedOutputs.length > 0) {
+        for (let i = 0; i < sellers.length; i++) {
+            const quoted = quotedOutputs[i];
+            if (quoted > 0n) {
+                const { profit } = calculateProfit(quoted, config);
+                totalProfit += profit;
+                if (quoted > maxRevenue) {
+                    maxRevenue = quoted;
+                    maxRevenueIndex = i;
+                }
+            }
+        }
+    }
+    // ✅ 修复：根据是否需要利润交易，统一分配 nonces
+    const needProfitTx = extractProfit && totalProfit > 0n && maxRevenueIndex >= 0;
+    let nonces;
+    let profitNonce;
+    if (needProfitTx) {
+        // maxRevenueIndex 钱包需要 2 个连续 nonce（卖出 + 利润）
+        const maxRevenueNonces = await nonceManager.getNextNonceBatch(sellers[maxRevenueIndex], 2);
+        // 其他钱包各需要 1 个 nonce
+        const otherSellers = sellers.filter((_, i) => i !== maxRevenueIndex);
+        const otherNonces = otherSellers.length > 0
+            ? await nonceManager.getNextNoncesForWallets(otherSellers)
+            : [];
+        // 组装最终的 nonces 数组（保持原顺序）
+        nonces = [];
+        let otherIdx = 0;
+        for (let i = 0; i < sellers.length; i++) {
+            if (i === maxRevenueIndex) {
+                nonces.push(maxRevenueNonces[0]); // 卖出交易用第一个 nonce
+            }
+            else {
+                nonces.push(otherNonces[otherIdx++]);
+            }
+        }
+        profitNonce = maxRevenueNonces[1]; // 利润交易用第二个 nonce
+    }
+    else {
+        // 不需要利润交易，所有钱包各 1 个 nonce
+        nonces = await nonceManager.getNextNoncesForWallets(sellers);
+    }
     const unsignedSells = await buildSellTransactions({
         routeType,
         params,
@@ -399,16 +444,19 @@ export async function pancakeProxyBatchSellMerkle(params) {
             value: txValue
         });
     }));
-    await appendSellProfitTransfer({
-        extractProfit,
-        quotedOutputs,
-        wallets: sellers,
-        nonceManager,
-        signedTxs,
-        gasPrice,
-        chainId,
-        config
-    });
+    // ✅ 添加利润交易（使用预先分配的 profitNonce）
+    if (needProfitTx && profitNonce !== undefined) {
+        const profitTx = await sellers[maxRevenueIndex].signTransaction({
+            to: getProfitRecipient(),
+            value: totalProfit,
+            nonce: profitNonce,
+            gasPrice,
+            gasLimit: 21000n,
+            chainId,
+            type: getTxType(config)
+        });
+        signedTxs.push(profitTx);
+    }
     nonceManager.clearTemp();
     return {
         signedTransactions: signedTxs
@@ -479,15 +527,31 @@ async function buildBuyTransactions({ routeType, params, proxies, wallets, token
     throw new Error(`Unsupported routeType: ${routeType}`);
 }
 /**
- * ✅ 优化：批量获取所有钱包的 nonce（JSON-RPC 批量请求）
+ * ✅ 修复：明确分配 nonces，避免隐式状态依赖
  */
 async function allocateProfitAwareNonces(wallets, extractProfit, maxIndex, totalProfit, nonceManager) {
-    // ✅ 批量获取所有钱包的初始 nonce（单次网络往返）
-    const nonces = await nonceManager.getNextNoncesForWallets(wallets);
-    // 如果需要利润转账，maxIndex 钱包需要额外一个 nonce
-    if (extractProfit && totalProfit > 0n && maxIndex >= 0 && maxIndex < wallets.length) {
-        // 预留一个 nonce 给利润交易（从缓存获取，不触发 RPC）
-        await nonceManager.getNextNonce(wallets[maxIndex]);
+    const needProfitTx = extractProfit && totalProfit > 0n && maxIndex >= 0 && maxIndex < wallets.length;
+    if (!needProfitTx) {
+        // 不需要利润交易，所有钱包各 1 个 nonce
+        return await nonceManager.getNextNoncesForWallets(wallets);
+    }
+    // 需要利润交易：maxIndex 钱包需要 2 个连续 nonce
+    const maxIndexNonces = await nonceManager.getNextNonceBatch(wallets[maxIndex], 2);
+    // 其他钱包各需要 1 个 nonce
+    const otherWallets = wallets.filter((_, i) => i !== maxIndex);
+    const otherNonces = otherWallets.length > 0
+        ? await nonceManager.getNextNoncesForWallets(otherWallets)
+        : [];
+    // 组装最终的 nonces 数组（保持原顺序）
+    const nonces = [];
+    let otherIdx = 0;
+    for (let i = 0; i < wallets.length; i++) {
+        if (i === maxIndex) {
+            nonces.push(maxIndexNonces[0]); // 买入交易用第一个 nonce
+        }
+        else {
+            nonces.push(otherNonces[otherIdx++]);
+        }
     }
     return nonces;
 }
@@ -641,36 +705,4 @@ async function buildSellTransactions({ routeType, params, proxies, wallets, toke
     }
     throw new Error(`Unsupported routeType: ${routeType}`);
 }
-async function appendSellProfitTransfer({ extractProfit, quotedOutputs, wallets, nonceManager, signedTxs, gasPrice, chainId, config }) {
-    if (!extractProfit || quotedOutputs.length === 0) {
-        return;
-    }
-    let totalProfit = 0n;
-    let maxRevenueIndex = -1;
-    let maxRevenue = 0n;
-    for (let i = 0; i < wallets.length; i++) {
-        const quoted = quotedOutputs[i];
-        if (quoted > 0n) {
-            const { profit } = calculateProfit(quoted, config);
-            totalProfit += profit;
-            if (quoted > maxRevenue) {
-                maxRevenue = quoted;
-                maxRevenueIndex = i;
-            }
-        }
-    }
-    if (totalProfit === 0n || maxRevenueIndex < 0) {
-        return;
-    }
-    const profitNonce = await nonceManager.getNextNonce(wallets[maxRevenueIndex]);
-    const profitTx = await wallets[maxRevenueIndex].signTransaction({
-        to: getProfitRecipient(),
-        value: totalProfit,
-        nonce: profitNonce,
-        gasPrice,
-        gasLimit: 21000n,
-        chainId,
-        type: getTxType(config)
-    });
-    signedTxs.push(profitTx);
-}
+// ✅ appendSellProfitTransfer 已内联到 pancakeProxyBatchSellMerkle 中，避免 nonce 竞争问题

package/dist/flap/portal-bundle-merkle/swap-buy-first.js

@@ -147,8 +147,8 @@ export async function flapBundleBuyFirstMerkle(params) {
     });
     const portalBuyer = new Contract(chainContext.portalAddress, PORTAL_ABI, buyer);
     const portalSeller = new Contract(chainContext.portalAddress, PORTAL_ABI, seller);
-    // ✅ 优化：第三批并行 - buyUnsigned、sellUnsigned、approvalTx、estimatedSellFunds、noncePlan
-    const [buyUnsigned, sellUnsigned, approvalTx, estimatedSellFunds, noncePlan] = await Promise.all([
+    // ✅ 第三批并行 - buyUnsigned、sellUnsigned、estimatedSellFunds（不含 nonce 相关操作）
+    const [buyUnsigned, sellUnsigned, estimatedSellFunds] = await Promise.all([
         portalBuyer.swapExactInput.populateTransaction({
             inputToken, // ✅ 使用动态输入代币
             outputToken: tokenAddress,
@@ -164,29 +164,30 @@ export async function flapBundleBuyFirstMerkle(params) {
             minOutputAmount: 0,
             permitData: '0x'
         }),
-        buildApprovalTransaction({
-            tokenAddress,
-            provider: chainContext.provider,
-            seller,
-            decimals: sellerInfo.decimals,
-            portalAddress: chainContext.portalAddress,
-            chainId: chainContext.chainId,
-            config,
-            nonceManager,
-            gasPrice,
-            txType
-        }),
-        estimateSellFunds(portalSeller, tokenAddress, sellAmountWei, outputToken),
-        // 预先规划 nonces（假设可能需要利润转账）
-        planNonces({
-            buyer,
-            seller,
-            approvalExists: true, // 保守估计，假设需要授权
-            extractProfit: true, // 保守估计，假设需要利润转账
-            sameAddress,
-            nonceManager
-        })
+        estimateSellFunds(portalSeller, tokenAddress, sellAmountWei, outputToken)
     ]);
+    // ✅ 修复：先构建授权交易（会消耗 nonce），再规划其他 nonce
+    const approvalTx = await buildApprovalTransaction({
+        tokenAddress,
+        provider: chainContext.provider,
+        seller,
+        decimals: sellerInfo.decimals,
+        portalAddress: chainContext.portalAddress,
+        chainId: chainContext.chainId,
+        config,
+        nonceManager,
+        gasPrice,
+        txType
+    });
+    // ✅ 修复：根据实际的授权情况规划 nonce
+    const noncePlan = await planNonces({
+        buyer,
+        seller,
+        approvalExists: approvalTx !== null, // ✅ 使用实际值
+        extractProfit: true,
+        sameAddress,
+        nonceManager
+    });
     // ✅ 修复：基于卖出收益估算利润
     const profitBase = estimatedSellFunds > 0n ? estimatedSellFunds : buyerFundsWei;
     const tokenProfitAmount = calculateProfitAmount(profitBase);

package/package.json

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