four-flap-meme-sdk 1.9.41 → 1.9.42

package/dist/dex/direct-router.js

@@ -535,16 +535,19 @@ export async function directV2BatchBuy(params) {
     const flowAmounts = buyAmounts.map(amount => ethers.parseUnits(amount, quoteTokenDecimals));
     const totalFlowWei = flowAmounts.reduce((sum, amt) => sum + amt, 0n);
     const baseProfitWei = calculateProfitAmount(totalFlowWei);
-    // ✅ 方案 B：并行获取 nonces、gasPrice 和 ERC20 报价
-    const [nonces, gasPrice, nativeProfitWei] = await Promise.all([
+    // ✅ 方案 B：并行获取 nonces、gasPrice、ERC20 报价 以及（非原生代币时）授权额度
+    const quoteTokenContract = (!useNative && quoteToken) ? new Contract(quoteToken, ERC20_ABI, provider) : null;
+    const [nonces, gasPrice, nativeProfitWei, buyAllowances] = await Promise.all([
         startNonces && startNonces.length === wallets.length
             ? Promise.resolve(startNonces)
             : new NonceManager(provider).getNextNoncesForWallets(wallets),
         getGasPrice(provider, config),
-        // ERC20 报价提前并行获取（V2 买入用 V2 报价）
         (!useNative && baseProfitWei > 0n && quoteToken)
             ? getTokenToNativeQuote(provider, quoteToken, baseProfitWei, chain, 'v2')
-            : Promise.resolve(baseProfitWei)
+            : Promise.resolve(baseProfitWei),
+        quoteTokenContract
+            ? Promise.all(wallets.map(w => quoteTokenContract.allowance(w.address, routerAddress).catch(() => 0n)))
+            : Promise.resolve(wallets.map(() => ethers.MaxUint256)),
     ]);
     // 确定最终利润金额（ENI 链额外补偿利润转账的 gas 成本）
     let profitWei = nativeProfitWei > 0n ? nativeProfitWei : 0n;
@@ -554,6 +557,29 @@ export async function directV2BatchBuy(params) {
     const gasLimit = getGasLimit(config, 250000);
     const txType = config.txType ?? 0;
     const deadline = getDeadline();
+    // ✅ 自动授权：ERC20 报价代币买入时，检查钱包对 Router 的授权额度，不足则插入 approve
+    const buyApproveTxs = [];
+    if (!useNative && quoteTokenContract) {
+        for (let i = 0; i < wallets.length; i++) {
+            if (flowAmounts[i] <= 0n)
+                continue;
+            if (buyAllowances[i] < flowAmounts[i]) {
+                console.log(`🔓 [V2 Buy] 钱包 ${i} 报价代币授权不足 (${buyAllowances[i]} < ${flowAmounts[i]}), 自动 approve`);
+                const approveData = quoteTokenContract.interface.encodeFunctionData('approve', [routerAddress, ethers.MaxUint256]);
+                const approveTx = await wallets[i].signTransaction({
+                    to: quoteToken,
+                    data: approveData,
+                    value: 0n,
+                    nonce: nonces[i],
+                    gasLimit: 60000n,
+                    ...buildGasFields(txType, gasPrice),
+                    chainId,
+                });
+                buyApproveTxs.push({ walletIndex: i, tx: approveTx });
+                nonces[i]++;
+            }
+        }
+    }
     // 构建路径
     const inputToken = useNative ? wrappedNative : quoteToken;
     const path = [inputToken, tokenAddress];
@@ -613,10 +639,11 @@ export async function directV2BatchBuy(params) {
     });
     // ✅ 并行执行所有签名
     const signedResults = await Promise.all(signPromises);
-    // 按类型分组并按顺序组装：贿赂 → 交易
+    // 按类型分组并按顺序组装：approve → 贿赂 → 交易
+    const approveSignedTxs = buyApproveTxs.sort((a, b) => a.walletIndex - b.walletIndex).map(a => a.tx);
     const bribeTxs = signedResults.filter(r => r.type === 'bribe').map(r => r.tx);
     const swapTxs = signedResults.filter(r => r.type === 'swap').sort((a, b) => a.index - b.index).map(r => r.tx);
-    const signedTxs = [...bribeTxs, ...swapTxs];
+    const signedTxs = [...approveSignedTxs, ...bribeTxs, ...swapTxs];
     // ✅ 检查是否使用分布式利润模式
     const profitMode = config.profitMode || 'single';
     const skipProfit = config.skipProfit === true;
@@ -704,20 +731,26 @@ export async function directV2BatchSell(params) {
     const gasLimit = getGasLimit(config, 300000);
     const txType = config.txType ?? 0;
     const deadline = getDeadline();
-    // 计算卖出数量（同步操作，无 RPC）
+    // 计算卖出数量（同步操作，无 RPC），并安全兜底不超过链上实际余额
     const sellAmountsWei = [];
     for (let i = 0; i < wallets.length; i++) {
+        let amount;
         if (sellAmounts && sellAmounts[i]) {
             const truncatedAmount = truncateDecimals(sellAmounts[i], tokenDecimals);
-            sellAmountsWei.push(ethers.parseUnits(truncatedAmount, tokenDecimals));
+            amount = ethers.parseUnits(truncatedAmount, tokenDecimals);
         }
         else if (sellPercentages && sellPercentages[i]) {
             const pct = Math.min(100, Math.max(0, sellPercentages[i]));
-            sellAmountsWei.push((balances[i] * BigInt(pct)) / 100n);
+            amount = (balances[i] * BigInt(pct)) / 100n;
         }
         else {
-            sellAmountsWei.push(balances[i]);
+            amount = balances[i];
+        }
+        if (amount > balances[i]) {
+            console.log(`⚠️ [V2 Sell] 钱包 ${i} 卖出量(${amount}) > 链上余额(${balances[i]})，已自动调整为实际余额`);
+            amount = balances[i];
         }
+        sellAmountsWei.push(amount);
     }
     const totalSellAmount = sellAmountsWei.reduce((sum, o) => sum + o, 0n);
     // ✅ 自动授权：检查每个钱包对 Router 的授权额度，不足则插入 approve 交易

package/package.json

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