four-flap-meme-sdk 1.7.63 → 1.7.64

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

@@ -119,13 +119,14 @@ function encodeV2BuyCall(tokenAddress, recipient, deadline) {
 }
 /**
  * 构建利润转账调用
+ * ✅ 使用 transferAmount 从钱包余额转出，而不是 msg.value
  */
 function buildProfitCall(walletAddress, profitAmount, profitRecipient, delegateInterface) {
     return {
         target: walletAddress,
         allowFailure: false,
-        value: profitAmount,
-        callData: delegateInterface.encodeFunctionData('transferTo', [profitRecipient]),
+        value: 0n, // ✅ 不需要 msg.value，从钱包余额转出
+        callData: delegateInterface.encodeFunctionData('transferAmount', [profitRecipient, profitAmount]),
     };
 }
 // ========================================
@@ -262,8 +263,8 @@ export async function bundleCreateBuy(params) {
             callData: buyBatchCall,
         });
     }
-    // ✅ 修复：各钱包使用自己余额买入，主交易只支付利润和创建费用
-    const totalValue = profitAmount + (params.quoteAmt ?? 0n);
+    // ✅ 利润从开发者钱包余额转出，主交易只支付创建费用
+    const totalValue = params.quoteAmt ?? 0n;
     // 构建签名交易
     const signedTransaction = buildEIP7702TransactionSync(mainWallet, authorizations, calls, totalValue, nonces[0], feeData, config);
     return {
@@ -417,8 +418,8 @@ export async function bundleCreateToDex(params) {
             });
         }
     }
-    // ✅ 修复：各钱包使用自己余额买入，主交易只支付利润和创建费用
-    const totalValue = profitAmount + (params.quoteAmt ?? 0n);
+    // ✅ 利润从 Payer 钱包余额转出，主交易只支付创建费用
+    const totalValue = params.quoteAmt ?? 0n;
     // 构建签名交易（一键发射会触发毕业，使用高 gas limit）
     const toDexConfig = {
         ...config,
@@ -616,8 +617,8 @@ export async function bundleGraduateBuy(params) {
             });
         }
     }
-    // ✅ 修复：各钱包使用自己余额买入，主交易只支付利润
-    const totalValue = profitAmount;
+    // ✅ 利润从 Payer 钱包余额转出，主交易不需要支付额外费用
+    const totalValue = 0n;
     // 构建签名交易（毕业操作强制使用高 gas limit）
     const graduateConfig = {
         ...config,

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

@@ -404,8 +404,10 @@ export async function bundleSwap(params) {
                 callData: delegateInterface.encodeFunctionData('transferTo', [nextRecipient]),
             });
         }
-        // 4. 买家买入（使用收到的全部 OKB）
-        const buyCall = buildBuyCallInternal(buyerWallet, tradeType === 'FLAP' ? buyAmountAfterProfit : 0n, tokenAddress, tradeType, actualRouter, fee, delegateInterface, portalInterface);
+        // 4. 买家买入（使用收到的 OKB，按卖出所得计算）
+        // ✅ 资金利用率模式下，所有 tradeType 都使用精确金额
+        const buyCall = buildBuyCallInternal(buyerWallet, buyAmountAfterProfit, // ✅ 使用卖出所得（扣除利润）
+        tokenAddress, tradeType, actualRouter, fee, delegateInterface, portalInterface);
         calls.push(buyCall);
     }
     else {
@@ -428,9 +430,8 @@ export async function bundleSwap(params) {
                 callData: delegateInterface.encodeFunctionData('transferAmount', [profitRecipient, profitAmount]),
             });
         }
-        // 3. 买家用自己的 OKB 买入
-        const buyAmountForCall = tradeType === 'FLAP' ? buyAmountAfterProfit : 0n;
-        const buyCall = buildBuyCallInternal(buyerWallet, buyAmountForCall, tokenAddress, tradeType, actualRouter, fee, delegateInterface, portalInterface);
+        // 3. 买家用自己的 OKB 买入（金额 = 卖家卖出所得，避免买卖资金不匹配）
+        const buyCall = buildBuyCallInternal(buyerWallet, buyAmountAfterProfit, tokenAddress, tradeType, actualRouter, fee, delegateInterface, portalInterface);
         calls.push(buyCall);
     }
     // ========================================
@@ -542,32 +543,32 @@ export async function bundleBatchSwap(params) {
     // 构建调用
     // ========================================
     const calls = [];
-    // 计算每个买家的买入金额
+    // ✅ 计算每个买家的买入金额
+    // 所有模式都按比例分配卖家卖出所得，避免买卖资金不匹配
     let buyAmountsPerBuyer;
-    if (tradeType === 'FLAP') {
-        if (buyerWallets.length === 1) {
-            buyAmountsPerBuyer = [totalBuyAmountAfterProfit];
-        }
-        else if (buyerRatios && buyerRatios.length === buyerWallets.length) {
-            let allocated = 0n;
-            buyAmountsPerBuyer = buyerRatios.map((ratio, i) => {
-                const amount = (totalBuyAmountAfterProfit * BigInt(Math.round(ratio * 10000))) / 10000n;
-                if (i === buyerRatios.length - 1) {
-                    return totalBuyAmountAfterProfit - allocated;
-                }
-                allocated += amount;
-                return amount;
-            });
-        }
-        else {
-            const avgAmount = totalBuyAmountAfterProfit / BigInt(buyerWallets.length);
-            const remainder = totalBuyAmountAfterProfit % BigInt(buyerWallets.length);
-            buyAmountsPerBuyer = buyerWallets.map((_, i) => i === buyerWallets.length - 1 ? avgAmount + remainder : avgAmount);
-        }
+    if (buyerWallets.length === 1) {
+        // 单买家：使用全部卖出所得
+        buyAmountsPerBuyer = [totalBuyAmountAfterProfit];
+    }
+    else if (buyerRatios && buyerRatios.length === buyerWallets.length) {
+        // 多买家 + 有比例：按前端传入的比例分配
+        let allocated = 0n;
+        buyAmountsPerBuyer = buyerRatios.map((ratio, i) => {
+            const amount = (totalBuyAmountAfterProfit * BigInt(Math.round(ratio * 10000))) / 10000n;
+            if (i === buyerRatios.length - 1) {
+                return totalBuyAmountAfterProfit - allocated;
+            }
+            allocated += amount;
+            return amount;
+        });
     }
     else {
-        buyAmountsPerBuyer = buyerWallets.map(() => 0n);
+        // 多买家无比例：均分
+        const avgAmount = totalBuyAmountAfterProfit / BigInt(buyerWallets.length);
+        const remainder = totalBuyAmountAfterProfit % BigInt(buyerWallets.length);
+        buyAmountsPerBuyer = buyerWallets.map((_, i) => i === buyerWallets.length - 1 ? avgAmount + remainder : avgAmount);
     }
+    console.log(`[bundleBatchSwap] 买入金额分配:`, buyAmountsPerBuyer.map(a => ethers.formatEther(a)));
     if (useFundUtilization) {
         // ========================================
         // ✅ 资金利用率模式（一卖多买）

package/package.json

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