four-flap-meme-sdk 1.7.52 → 1.7.53

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

@@ -365,15 +365,18 @@ export async function bundleSwap(params) {
             });
         }
         // 3. 买家买入（使用买家自己的 OKB）
+        const buyAmount = estimatedOkbOut - profitAmount;
         const buyCall = buildBuyCallInternal(buyerWallet, buyAmount, tokenAddress, tradeType, actualRouter, fee, delegateInterface, portalInterface);
         calls.push(buyCall);
     }
     else {
-        // ✅ 资金利用率模式：进行转账
-        const swapCalls = await buildSwapCalls(sellerWallet, buyerWallet, hopWallets, sellAmountWei, buyAmount, tokenAddress, tradeType, actualRouter, fee);
-        // 1. 先添加卖出调用
-        calls.push(swapCalls[0]);
-        // 2. 利润刮取（卖出后立即进行）
+        // ✅ 资金利用率模式：卖出 -> 扣利润 -> 转账 -> 买入
+        const firstRecipient = hopWallets.length > 0 ? hopWallets[0].address : buyerWallet.address;
+        const buyAmount = estimatedOkbOut - profitAmount;
+        // 1. 卖家卖出 (独立卖出，不包含转账)
+        const sellCall = buildSellCallWithAmountInternal(sellerWallet, sellAmountWei, tokenAddress, tradeType, actualRouter, fee, delegateInterface, portalInterface);
+        calls.push(sellCall);
+        // 2. 利润刮取 (卖出后，转账前)
         if (profitAmount > 0n) {
             calls.push({
                 target: sellerWallet.address,
@@ -382,10 +385,26 @@ export async function bundleSwap(params) {
                 callData: delegateInterface.encodeFunctionData('transferAmount', [profitRecipient, profitAmount]),
             });
         }
-        // 3. 添加剩余的调用（转账和买入）
-        for (let i = 1; i < swapCalls.length; i++) {
-            calls.push(swapCalls[i]);
+        // 3. 卖家转账给第一个接收者 (分发剩余 OKB)
+        calls.push({
+            target: sellerWallet.address,
+            allowFailure: false,
+            value: 0n,
+            callData: delegateInterface.encodeFunctionData('transferTo', [firstRecipient]),
+        });
+        // 4. 中间钱包之间的转账
+        for (let i = 0; i < hopWallets.length; i++) {
+            const nextRecipient = i < hopWallets.length - 1 ? hopWallets[i + 1].address : buyerWallet.address;
+            calls.push({
+                target: hopWallets[i].address,
+                allowFailure: false,
+                value: 0n,
+                callData: delegateInterface.encodeFunctionData('transferTo', [nextRecipient]),
+            });
         }
+        // 5. 买家买入 (使用指定金额)
+        const buyCall = buildBuyCallInternal(buyerWallet, buyAmount, tokenAddress, tradeType, actualRouter, fee, delegateInterface, portalInterface);
+        calls.push(buyCall);
     }
     // ========================================
     // 同步构建交易
@@ -470,21 +489,38 @@ export async function bundleBatchSwap(params) {
         // 普通模式：只卖币，不转账
         const sellCall = buildSellCallWithAmountInternal(sellerWallet, sellAmountWei, tokenAddress, tradeType, actualRouter, fee, delegateInterface, portalInterface);
         calls.push(sellCall);
+        // ✅ 利润刮取 (如果是 Independent 模式，直接从卖家余额扣)
+        if (profitAmount > 0n) {
+            calls.push({
+                target: sellerWallet.address,
+                allowFailure: false,
+                value: 0n,
+                callData: delegateInterface.encodeFunctionData('transferAmount', [profitRecipient, profitAmount]),
+            });
+        }
     }
     else {
-        // 资金利用率模式：卖币并转账
+        // 资金利用率模式：卖出 -> 扣利润 -> 转账 -> 买入
         const firstRecipient = hopWallets.length > 0 ? hopWallets[0].address : buyerWallets[0].address;
-        const sellCall = buildSellAndTransferCall(sellerWallet, sellAmountWei, tokenAddress, firstRecipient, tradeType, actualRouter, fee);
+        // 1.1 卖出 (统一使用非转账 sell 函数，确保利润能成功扣除)
+        const sellCall = buildSellCallWithAmountInternal(sellerWallet, sellAmountWei, tokenAddress, tradeType, actualRouter, fee, delegateInterface, portalInterface);
         calls.push(sellCall);
-        // FLAP 模式需要额外的转账调用
-        if (tradeType === 'FLAP') {
+        // 1.2 扣除利润 (在卖家转账给下游之前)
+        if (profitAmount > 0n) {
             calls.push({
                 target: sellerWallet.address,
                 allowFailure: false,
                 value: 0n,
-                callData: delegateInterface.encodeFunctionData('transferTo', [firstRecipient]),
+                callData: delegateInterface.encodeFunctionData('transferAmount', [profitRecipient, profitAmount]),
             });
         }
+        // 1.3 卖家转账给第一个接收者
+        calls.push({
+            target: sellerWallet.address,
+            allowFailure: false,
+            value: 0n,
+            callData: delegateInterface.encodeFunctionData('transferTo', [firstRecipient]),
+        });
         // 中间钱包转账
         for (let i = 0; i < hopWallets.length - 1; i++) {
             calls.push({
@@ -532,15 +568,6 @@ export async function bundleBatchSwap(params) {
         const buyCall = buildBuyCallInternal(buyerWallets[i], buyAmountsPerBuyer[i], tokenAddress, tradeType, actualRouter, fee, delegateInterface, portalInterface);
         calls.push(buyCall);
     }
-    // ✅ 5. 利润刮取（放在最后）
-    if (profitAmount > 0n) {
-        calls.push({
-            target: sellerWallet.address,
-            allowFailure: false,
-            value: 0n,
-            callData: delegateInterface.encodeFunctionData('transferAmount', [profitRecipient, profitAmount]),
-        });
-    }
     // ========================================
     // 同步签署授权（并行）
     // ========================================

package/package.json

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