four-flap-meme-sdk 1.7.63 → 1.7.65

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

@@ -367,10 +367,12 @@ export async function bundleSwap(params) {
     if (useFundUtilization) {
         // ========================================
         // ✅ 资金利用率模式
+        // 核心逻辑：卖出获得的 OKB 按比例转给买家
         // 1. 卖家卖出代币 → 获得 OKB
-        // 2. OKB 多跳转账 → 中间钱包1 → 中间钱包2 → ... → 买家
-        // 3. 利润从卖家 OKB 中扣除
-        // 4. 买家用收到的 OKB 买入
+        // 2. 利润从卖家 OKB 中扣除
+        // 3. （可选多跳）卖家 → hop1 → hop2 → ... → 分发者
+        // 4. 分发者按比例转账给买家
+        // 5. 买家买入
         // ========================================
         console.log(`[Bundle Swap] 资金利用率模式，hopCount=${actualHopCount}`);
         // 1. 卖家卖出
@@ -385,27 +387,36 @@ export async function bundleSwap(params) {
                 callData: delegateInterface.encodeFunctionData('transferAmount', [profitRecipient, profitAmount]),
             });
         }
-        // 3. OKB 多跳转账（卖家 → hop1 → hop2 → ... → 买家）
-        const firstRecipient = hopWallets.length > 0 ? hopWallets[0].address : buyerWallet.address;
-        // 卖家 → 第一个接收者
-        calls.push({
-            target: sellerWallet.address,
-            allowFailure: false,
-            value: 0n,
-            callData: delegateInterface.encodeFunctionData('transferTo', [firstRecipient]),
-        });
-        // 中间钱包之间转账
-        for (let i = 0; i < hopWallets.length; i++) {
-            const nextRecipient = i < hopWallets.length - 1 ? hopWallets[i + 1].address : buyerWallet.address;
+        // 3. 确定分发者：如果有多跳，最后一个 hop 是分发者；否则卖家是分发者
+        const distributor = hopWallets.length > 0 ? hopWallets[hopWallets.length - 1] : sellerWallet;
+        // 多跳转账（如果有）
+        if (hopWallets.length > 0) {
+            // 卖家 → hop1
             calls.push({
-                target: hopWallets[i].address,
+                target: sellerWallet.address,
                 allowFailure: false,
                 value: 0n,
-                callData: delegateInterface.encodeFunctionData('transferTo', [nextRecipient]),
+                callData: delegateInterface.encodeFunctionData('transferTo', [hopWallets[0].address]),
             });
+            // hop1 → hop2 → ... → 最后一个 hop（分发者）
+            for (let i = 0; i < hopWallets.length - 1; i++) {
+                calls.push({
+                    target: hopWallets[i].address,
+                    allowFailure: false,
+                    value: 0n,
+                    callData: delegateInterface.encodeFunctionData('transferTo', [hopWallets[i + 1].address]),
+                });
+            }
         }
-        // 4. 买家买入（使用收到的全部 OKB）
-        const buyCall = buildBuyCallInternal(buyerWallet, tradeType === 'FLAP' ? buyAmountAfterProfit : 0n, tokenAddress, tradeType, actualRouter, fee, delegateInterface, portalInterface);
+        // 4. 分发者按比例转账给买家
+        calls.push({
+            target: distributor.address,
+            allowFailure: false,
+            value: 0n,
+            callData: delegateInterface.encodeFunctionData('transferAmount', [buyerWallet.address, buyAmountAfterProfit]),
+        });
+        // 5. 买家买入（使用收到的 OKB）
+        const buyCall = buildBuyCallInternal(buyerWallet, buyAmountAfterProfit, tokenAddress, tradeType, actualRouter, fee, delegateInterface, portalInterface);
         calls.push(buyCall);
     }
     else {
@@ -428,9 +439,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,38 +552,38 @@ 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) {
         // ========================================
         // ✅ 资金利用率模式（一卖多买）
         // 1. 卖家卖出代币 → 获得 OKB
         // 2. 利润从卖家 OKB 中扣除
-        // 3. OKB 多跳转账 → 分配给各买家
+        // 3. 卖家（或最后一个 hop）按比例转账给各买家
         // 4. 各买家用收到的 OKB 买入
         // ========================================
         console.log(`[Bundle Batch Swap] 资金利用率模式，hopCount=${actualHopCount}`);
@@ -589,32 +599,37 @@ export async function bundleBatchSwap(params) {
                 callData: delegateInterface.encodeFunctionData('transferAmount', [profitRecipient, profitAmount]),
             });
         }
-        // 3. OKB 多跳转账给第一个买家
-        const firstRecipient = hopWallets.length > 0 ? hopWallets[0].address : buyerWallets[0].address;
-        // 卖家 → 第一个接收者（转全部余额）
-        calls.push({
-            target: sellerWallet.address,
-            allowFailure: false,
-            value: 0n,
-            callData: delegateInterface.encodeFunctionData('transferTo', [firstRecipient]),
-        });
-        // 中间钱包之间转账
-        for (let i = 0; i < hopWallets.length; i++) {
-            const nextRecipient = i < hopWallets.length - 1 ? hopWallets[i + 1].address : buyerWallets[0].address;
+        // 3. OKB 转账逻辑
+        // 确定分发者：如果有多跳，最后一个 hop 是分发者；否则卖家是分发者
+        const distributor = hopWallets.length > 0 ? hopWallets[hopWallets.length - 1] : sellerWallet;
+        if (hopWallets.length > 0) {
+            // 有多跳：卖家 → hop1 → hop2 → ... → 最后一个 hop（分发者）
             calls.push({
-                target: hopWallets[i].address,
+                target: sellerWallet.address,
                 allowFailure: false,
                 value: 0n,
-                callData: delegateInterface.encodeFunctionData('transferTo', [nextRecipient]),
+                callData: delegateInterface.encodeFunctionData('transferTo', [hopWallets[0].address]),
             });
+            // 中间钱包之间转账（到最后一个 hop）
+            for (let i = 0; i < hopWallets.length - 1; i++) {
+                calls.push({
+                    target: hopWallets[i].address,
+                    allowFailure: false,
+                    value: 0n,
+                    callData: delegateInterface.encodeFunctionData('transferTo', [hopWallets[i + 1].address]),
+                });
+            }
         }
-        // 第一个买家分配给其他买家
-        for (let i = 1; i < buyerWallets.length; i++) {
+        // 分发者按比例转给各买家
+        for (let i = 0; i < buyerWallets.length; i++) {
+            const amountToTransfer = buyAmountsPerBuyer[i];
+            if (amountToTransfer <= 0n)
+                continue;
             calls.push({
-                target: buyerWallets[0].address,
+                target: distributor.address,
                 allowFailure: false,
                 value: 0n,
-                callData: delegateInterface.encodeFunctionData('transferAmount', [buyerWallets[i].address, buyAmountsPerBuyer[i]]),
+                callData: delegateInterface.encodeFunctionData('transferAmount', [buyerWallets[i].address, amountToTransfer]),
             });
         }
         // 4. 所有买家买入

package/package.json

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