four-flap-meme-sdk 1.7.47 → 1.7.49

package/dist/eip7702/xlayer/bundle-swap.js

@@ -165,27 +165,29 @@ function buildSellAndTransferCall(sellerWallet, sellAmount, tokenAddress, recipi
 // ========================================
 // 构建买入调用
 // ========================================
-function buildBuyCall(buyerWallet, tokenAddress, tradeType, routerAddress, fee) {
+function buildBuyCall(buyerWallet, tokenAddress, tradeType, routerAddress, fee, buyAmount // ✅ 新增：买入金额（防止使用全部余额导致问题）
+) {
     const delegateInterface = new ethers.Interface(UNIFIED_DELEGATE_ABI);
     const portalInterface = new ethers.Interface(FLAP_PORTAL_ABI);
     switch (tradeType) {
         case 'FLAP': {
-            // FLAP: 直接调用 Portal 买入（使用钱包余额）
-            const callData = portalInterface.encodeFunctionData('buy', [tokenAddress]);
+            // ✅ FLAP: 使用 executeBatch 调用 Portal 买入（指定金额）
+            const portalCallData = portalInterface.encodeFunctionData('buy', [tokenAddress]);
+            const batchCalls = [{ target: FLAP_PORTAL_ADDRESS, value: buyAmount, data: portalCallData }];
             return {
-                target: FLAP_PORTAL_ADDRESS,
+                target: buyerWallet.address,
                 allowFailure: false,
-                value: 0n, // 将通过 multicall value 传入
-                callData,
+                value: 0n,
+                callData: delegateInterface.encodeFunctionData('executeBatch', [batchCalls]),
             };
         }
         case 'V2': {
-            // V2: 使用 executeBuyV2
+            // ✅ V2: 使用 executeBuyV2，传入指定金额
             const path = [WOKB_ADDRESS, tokenAddress];
             const callData = delegateInterface.encodeFunctionData('executeBuyV2', [
                 routerAddress,
                 path,
-                0, // amountIn = 0 使用钱包余额
+                buyAmount, // ✅ 使用指定金额，不是 0
             ]);
             return {
                 target: buyerWallet.address,
@@ -195,13 +197,13 @@ function buildBuyCall(buyerWallet, tokenAddress, tradeType, routerAddress, fee)
             };
         }
         case 'V3': {
-            // V3: 使用 executeBuy
+            // ✅ V3: 使用 executeBuy，传入指定金额
             const callData = delegateInterface.encodeFunctionData('executeBuy', [
                 routerAddress,
                 WOKB_ADDRESS,
                 tokenAddress,
                 fee,
-                0, // amountIn = 0 使用钱包余额
+                buyAmount, // ✅ 使用指定金额，不是 0
             ]);
             return {
                 target: buyerWallet.address,
@@ -215,7 +217,8 @@ function buildBuyCall(buyerWallet, tokenAddress, tradeType, routerAddress, fee)
 /**
  * 构建捆绑换手交易
  */
-async function buildSwapCalls(sellerWallet, buyerWallet, hopWallets, sellAmount, tokenAddress, tradeType, routerAddress, fee) {
+async function buildSwapCalls(sellerWallet, buyerWallet, hopWallets, sellAmount, buyAmount, // ✅ 新增：买入金额（防止使用全部余额）
+tokenAddress, tradeType, routerAddress, fee) {
     const delegateInterface = new ethers.Interface(UNIFIED_DELEGATE_ABI);
     const calls = [];
     // 第一步：卖家卖币并转账给第一个中间钱包
@@ -243,8 +246,8 @@ async function buildSwapCalls(sellerWallet, buyerWallet, hopWallets, sellAmount,
             callData: transferData,
         });
     }
-    // 最后一步：买家买币
-    const buyCall = buildBuyCall(buyerWallet, tokenAddress, tradeType, routerAddress, fee);
+    // ✅ 最后一步：买家买币（使用指定金额）
+    const buyCall = buildBuyCall(buyerWallet, tokenAddress, tradeType, routerAddress, fee, buyAmount);
     calls.push(buyCall);
     return calls;
 }
@@ -320,7 +323,11 @@ export async function bundleSwap(params) {
     // ========================================
     // 同步构建调用
     // ========================================
-    const swapCalls = await buildSwapCalls(sellerWallet, buyerWallet, hopWallets, sellAmountWei, tokenAddress, tradeType, actualRouter, fee);
+    // ✅ 计算买入金额：卖出所得 OKB 扣除利润
+    const buyAmount = estimatedOkbOut - profitAmount;
+    console.log(`[Bundle Swap] 买入金额: ${ethers.formatEther(buyAmount)} OKB`);
+    const swapCalls = await buildSwapCalls(sellerWallet, buyerWallet, hopWallets, sellAmountWei, buyAmount, // ✅ 传入计算得到的买入金额
+    tokenAddress, tradeType, actualRouter, fee);
     // ✅ 构建完整调用列表（利润刮取 + 换手调用）
     const calls = [];
     // 利润刮取（从卖家钱包）

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.47",
+  "version": "1.7.49",
   "description": "SDK for Flap bonding curve and four.meme TokenManager",
   "type": "module",
   "main": "dist/index.js",