four-flap-meme-sdk 1.7.48 → 1.7.49

package/dist/eip7702/xlayer/volume.js

@@ -94,11 +94,12 @@ export async function washVolume(params) {
     // 并行获取数据
     // ========================================
     const allAddresses = allWallets.map(w => w.address);
-    // ✅ 对 FLAP 模式，使用【总金额报价 + 按比例分配】（与 AA 模式一致）
+    // ✅ 对所有模式，使用【总金额报价 + 按比例分配】
     // 因为所有钱包在同一笔交易中执行，会累积影响价格
+    // 这确保了「买多少就卖多少」，避免清空钱包预存代币
     let estimatedTokenAmounts = [];
+    const totalBuyWei = buyAmountWei * BigInt(wallets.length);
     if (poolType === 'FLAP') {
-        const totalBuyWei = buyAmountWei * BigInt(wallets.length);
         console.log(`[washVolume] FLAP 总金额报价: ${wallets.length} 个钱包, 每个 ${buyAmountWei} wei, 总计 ${totalBuyWei} wei`);
         try {
             const portalContract = new Contract(FLAP_PORTAL_ADDRESS, FLAP_PORTAL_ABI, provider);
@@ -141,7 +142,41 @@ export async function washVolume(params) {
             console.log(`[washVolume] FLAP 代币分配:`, estimatedTokenAmounts.map(a => a.toString()));
         }
         catch (e) {
-            console.warn(`[washVolume] 报价失败:`, e);
+            console.warn(`[washVolume] FLAP 报价失败:`, e);
+        }
+    }
+    else if (poolType === 'V2' || poolType === 'V3') {
+        // ✅ V2/V3 外盘模式：通过报价获取预估代币数量，确保买卖对等
+        console.log(`[washVolume] ${poolType} 总金额报价: ${wallets.length} 个钱包, 每个 ${buyAmountWei} wei, 总计 ${totalBuyWei} wei`);
+        try {
+            const { quoteV2, quoteV3 } = await import('../../utils/quote-helpers.js');
+            let totalTokenAmount = 0n;
+            if (poolType === 'V3') {
+                const result = await quoteV3(provider, WOKB_ADDRESS, tokenAddress, totalBuyWei, 'XLAYER', fee);
+                totalTokenAmount = result.amountOut;
+                console.log(`[washVolume] V3 报价成功: ${totalBuyWei} wei OKB -> ${totalTokenAmount} wei 代币 (fee: ${fee})`);
+            }
+            else {
+                const result = await quoteV2(provider, WOKB_ADDRESS, tokenAddress, totalBuyWei, 'XLAYER');
+                totalTokenAmount = result.amountOut;
+                console.log(`[washVolume] V2 报价成功: ${totalBuyWei} wei OKB -> ${totalTokenAmount} wei 代币`);
+            }
+            // 均分到每个钱包
+            if (totalBuyWei > 0n && totalTokenAmount > 0n) {
+                const sharePerWallet = totalTokenAmount / BigInt(wallets.length);
+                let allocated = 0n;
+                estimatedTokenAmounts = wallets.map((_, i) => {
+                    if (i === wallets.length - 1) {
+                        return totalTokenAmount - allocated;
+                    }
+                    allocated += sharePerWallet;
+                    return sharePerWallet;
+                });
+                console.log(`[washVolume] ${poolType} 代币分配:`, estimatedTokenAmounts.map(a => a.toString()));
+            }
+        }
+        catch (e) {
+            console.warn(`[washVolume] ${poolType} 报价失败，将使用 sellPercent 模式:`, e);
         }
     }
     const [nonces, feeData] = await Promise.all([
@@ -165,9 +200,9 @@ export async function washVolume(params) {
         const buyCall = buildBuyCall(wallet, buyAmountWei, tokenAddress, poolType, actualRouter, fee, delegateInterface, portalInterface);
         calls.push(buyCall);
         // 卖出调用（使用预估的代币数量）
-        // ✅ FLAP 模式使用按比例分配的预估数量（全部卖出）
+        // ✅ 统一所有模式：当有预估数量时使用精确卖出，确保买卖对等
         const estimatedAmount = estimatedTokenAmounts[i] || 0n;
-        const sellCall = poolType === 'FLAP' && estimatedAmount > 0n
+        const sellCall = estimatedAmount > 0n
             ? buildSellCallWithAmount(wallet, estimatedAmount, tokenAddress, poolType, actualRouter, fee, delegateInterface, portalInterface)
             : buildSellCall(wallet, tokenAddress, sellPercent, tokenDecimals, poolType, actualRouter, fee, delegateInterface, portalInterface);
         calls.push(sellCall);

package/package.json

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