four-flap-meme-sdk 1.7.46 → 1.7.48

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/package.json

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