four-flap-meme-sdk 1.7.50 → 1.7.52

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

@@ -298,6 +298,7 @@ export async function bundleSwap(params) {
     const delegateAddress = (config?.delegateAddress && config.delegateAddress.trim()) || UNIFIED_DELEGATE_ADDRESS;
     const delegateInterface = new ethers.Interface(UNIFIED_DELEGATE_ABI);
     const actualRouter = routerAddress ?? getDefaultRouter(tradeType);
+    const portalInterface = new ethers.Interface(FLAP_PORTAL_ABI);
     // ========================================
     // 同步操作 - 创建钱包
     // ========================================
@@ -348,25 +349,48 @@ export async function bundleSwap(params) {
     // ✅ 计算买入金额：卖出所得 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 = [];
-    // 利润刮取（从卖家钱包）
-    if (profitAmount > 0n) {
-        calls.push({
-            target: sellerWallet.address,
-            allowFailure: false,
-            value: profitAmount,
-            callData: delegateInterface.encodeFunctionData('transferTo', [profitRecipient]),
-        });
+    if (hopCount === 0) {
+        // ✅ 普通模式：卖买独立，不转账
+        // 1. 卖家卖出
+        const sellCall = buildSellCallWithAmountInternal(sellerWallet, sellAmountWei, tokenAddress, tradeType, actualRouter, fee, delegateInterface, portalInterface);
+        calls.push(sellCall);
+        // 2. 利润刮取（从卖家余额扣除）
+        if (profitAmount > 0n) {
+            calls.push({
+                target: sellerWallet.address,
+                allowFailure: false,
+                value: 0n,
+                callData: delegateInterface.encodeFunctionData('transferAmount', [profitRecipient, profitAmount]),
+            });
+        }
+        // 3. 买家买入（使用买家自己的 OKB）
+        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. 利润刮取（卖出后立即进行）
+        if (profitAmount > 0n) {
+            calls.push({
+                target: sellerWallet.address,
+                allowFailure: false,
+                value: 0n,
+                callData: delegateInterface.encodeFunctionData('transferAmount', [profitRecipient, profitAmount]),
+            });
+        }
+        // 3. 添加剩余的调用（转账和买入）
+        for (let i = 1; i < swapCalls.length; i++) {
+            calls.push(swapCalls[i]);
+        }
     }
-    // 添加换手调用
-    calls.push(...swapCalls);
     // ========================================
     // 同步构建交易
     // ========================================
-    const signedTransaction = buildEIP7702TransactionSync(sellerWallet, resolvedAuthorizations, calls, profitAmount, // ✅ 利润金额需要包含在交易 value 中
+    const signedTransaction = buildEIP7702TransactionSync(sellerWallet, resolvedAuthorizations, calls, 0n, // ✅ 修复：利润使用 transferAmount 从卖家余额转账，不需要通过 msg.value 传递
     sellerNonce, feeData, config);
     return {
         signedTransaction,
@@ -439,83 +463,82 @@ export async function bundleBatchSwap(params) {
     // 同步构建调用
     // ========================================
     const delegateInterface = new ethers.Interface(UNIFIED_DELEGATE_ABI);
+    const portalInterface = new ethers.Interface(FLAP_PORTAL_ABI);
     const calls = [];
-    // ✅ 修复：先执行卖出和转账，最后再刮取利润（与 bundleBuy/volume 一致）
-    // 卖家卖币并转账给第一个中间钱包（或第一个买家）
-    const firstRecipient = hopWallets.length > 0 ? hopWallets[0].address : buyerWallets[0].address;
-    const sellCall = buildSellAndTransferCall(sellerWallet, sellAmountWei, tokenAddress, firstRecipient, tradeType, actualRouter, fee);
-    calls.push(sellCall);
-    // FLAP 模式需要额外的转账调用
-    if (tradeType === 'FLAP') {
-        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({
-            target: hopWallets[i].address,
-            allowFailure: false,
-            value: 0n,
-            callData: delegateInterface.encodeFunctionData('transferTo', [hopWallets[i + 1].address]),
-        });
+    // ✅ 1. 卖家卖币
+    if (hopCount === 0) {
+        // 普通模式：只卖币，不转账
+        const sellCall = buildSellCallWithAmountInternal(sellerWallet, sellAmountWei, tokenAddress, tradeType, actualRouter, fee, delegateInterface, portalInterface);
+        calls.push(sellCall);
     }
-    // 最后一个中间钱包转给第一个买家
-    // ⚠️ 注意：资金先到第一个买家，然后第一个买家转给其他买家
-    if (hopWallets.length > 0) {
-        calls.push({
-            target: hopWallets[hopWallets.length - 1].address,
-            allowFailure: false,
-            value: 0n,
-            callData: delegateInterface.encodeFunctionData('transferTo', [buyerWallets[0].address]),
-        });
+    else {
+        // 资金利用率模式：卖币并转账
+        const firstRecipient = hopWallets.length > 0 ? hopWallets[0].address : buyerWallets[0].address;
+        const sellCall = buildSellAndTransferCall(sellerWallet, sellAmountWei, tokenAddress, firstRecipient, tradeType, actualRouter, fee);
+        calls.push(sellCall);
+        // FLAP 模式需要额外的转账调用
+        if (tradeType === 'FLAP') {
+            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({
+                target: hopWallets[i].address,
+                allowFailure: false,
+                value: 0n,
+                callData: delegateInterface.encodeFunctionData('transferTo', [hopWallets[i + 1].address]),
+            });
+        }
+        // 最后一个中间钱包转给第一个买家
+        if (hopWallets.length > 0) {
+            calls.push({
+                target: hopWallets[hopWallets.length - 1].address,
+                allowFailure: false,
+                value: 0n,
+                callData: delegateInterface.encodeFunctionData('transferTo', [buyerWallets[0].address]),
+            });
+        }
     }
-    // ✅ 修复：计算每个买家分配的 OKB 金额（支持按比例分配）
-    const portalInterface = new ethers.Interface(FLAP_PORTAL_ABI);
+    // ✅ 2. 资金分配计算
     const okbForBuyers = estimatedOkbOut - profitAmount; // 扣除利润后可用于买入的 OKB
-    // ✅ 计算每个买家的分配金额（按比例或平均）
     let buyAmountsPerBuyer;
     if (buyerRatios && buyerRatios.length === buyerWallets.length) {
-        // 按前端传入的比例分配
         buyAmountsPerBuyer = buyerRatios.map(ratio => {
             return (okbForBuyers * BigInt(Math.round(ratio * 10000))) / 10000n;
         });
-        console.log(`[Bundle Batch Swap] 使用比例分配:`, buyerRatios);
     }
     else {
-        // 平均分配（向后兼容）
         const avgAmount = okbForBuyers / BigInt(buyerWallets.length);
         buyAmountsPerBuyer = buyerWallets.map(() => avgAmount);
-        console.log(`[Bundle Batch Swap] 使用平均分配: 每个买家 ${ethers.formatEther(avgAmount)} OKB`);
     }
-    console.log(`[Bundle Batch Swap] 可用于买入: ${ethers.formatEther(okbForBuyers)} OKB`);
-    console.log(`[Bundle Batch Swap] 各买家分配金额:`, buyAmountsPerBuyer.map(a => ethers.formatEther(a)));
-    // ✅ 修复：第一个买家收到所有资金后，使用 transferAmount 按比例分配给其他买家
-    // 注意：transferTo 会转移全部余额，导致第一个买家无法买入！必须使用 transferAmount 指定金额
-    for (let i = 1; i < buyerWallets.length; i++) {
-        calls.push({
-            target: buyerWallets[0].address, // 第一个买家转账
-            allowFailure: false,
-            value: 0n,
-            callData: delegateInterface.encodeFunctionData('transferAmount', [buyerWallets[i].address, buyAmountsPerBuyer[i]]),
-        });
+    // ✅ 3. 资金分发 (仅资金利用率模式)
+    if (hopCount > 0 && buyerWallets.length > 1) {
+        for (let i = 1; i < buyerWallets.length; i++) {
+            calls.push({
+                target: buyerWallets[0].address, // 第一个买家分发
+                allowFailure: false,
+                value: 0n,
+                callData: delegateInterface.encodeFunctionData('transferAmount', [buyerWallets[i].address, buyAmountsPerBuyer[i]]),
+            });
+        }
     }
-    // ✅ 修复：使用 buildBuyCallInternal（有金额参数）
+    // ✅ 4. 所有买家买入
     for (let i = 0; i < buyerWallets.length; i++) {
-        const buyCall = buildBuyCallInternal(buyerWallets[i], buyAmountsPerBuyer[i], // ✅ 使用各自分配的金额（按比例）
-        tokenAddress, tradeType, actualRouter, fee, delegateInterface, portalInterface);
+        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: profitAmount,
-            callData: delegateInterface.encodeFunctionData('transferTo', [profitRecipient]),
+            value: 0n,
+            callData: delegateInterface.encodeFunctionData('transferAmount', [profitRecipient, profitAmount]),
         });
     }
     // ========================================
@@ -536,7 +559,7 @@ export async function bundleBatchSwap(params) {
     // ========================================
     // 同步构建交易
     // ========================================
-    const signedTransaction = buildEIP7702TransactionSync(sellerWallet, authorizations, calls, profitAmount, // ✅ 利润金额
+    const signedTransaction = buildEIP7702TransactionSync(sellerWallet, authorizations, calls, 0n, // ✅ 利润使用 transferAmount 从卖家余额转账，不需要通过 msg.value 传递
     sellerNonce, feeData, config);
     return {
         signedTransaction,
@@ -647,15 +670,6 @@ export async function bundleMultiSwap(params) {
     // 构建调用
     // ========================================
     const calls = [];
-    // 利润刮取（从 Payer 钱包）
-    if (profitAmount > 0n) {
-        calls.push({
-            target: mainWallet.address,
-            allowFailure: false,
-            value: profitAmount,
-            callData: delegateInterface.encodeFunctionData('transferTo', [profitRecipient]),
-        });
-    }
     // 卖出调用
     for (let i = 0; i < sellerWallets.length; i++) {
         if (sellAmountsWei[i] <= 0n)
@@ -663,6 +677,15 @@ export async function bundleMultiSwap(params) {
         const sellCall = buildSellCallWithAmountInternal(sellerWallets[i], sellAmountsWei[i], tokenAddress, tradeType, actualRouter, fee, delegateInterface, portalInterface);
         calls.push(sellCall);
     }
+    // ✅ 修复：利润刮取放在卖出之后、买入之前（从第一个卖家余额转账）
+    if (profitAmount > 0n && sellerWallets.length > 0) {
+        calls.push({
+            target: sellerWallets[0].address, // 从第一个卖家扣利润
+            allowFailure: false,
+            value: 0n,
+            callData: delegateInterface.encodeFunctionData('transferAmount', [profitRecipient, profitAmount]),
+        });
+    }
     // 买入调用
     for (let i = 0; i < buyerWallets.length; i++) {
         const buyCall = buildBuyCallInternal(buyerWallets[i], buyAmountPerWallet, tokenAddress, tradeType, actualRouter, fee, delegateInterface, portalInterface);
@@ -671,8 +694,8 @@ export async function bundleMultiSwap(params) {
     // ========================================
     // 构建交易
     // ========================================
-    // ✅ 修复：各钱包使用自己余额买入，主交易只支付利润
-    const totalValue = profitAmount;
+    // ✅ 修复：利润使用 transferAmount 从卖家余额转账，不需要通过 msg.value 传递
+    const totalValue = 0n;
     const signedTransaction = buildEIP7702TransactionSync(mainWallet, authorizations, calls, totalValue, nonces[mainWalletIndex], feeData, config);
     return {
         signedTransaction,

package/dist/eip7702/xlayer/volume.js

@@ -14,7 +14,7 @@
  */
 import { ethers, Contract } from 'ethers';
 import { getCachedProvider, createWallet, signAuthorizationsWithNonces, batchGetNonces, buildEIP7702TransactionSync, calculateProfitAmountByTxCount, getProfitRecipient, } from './utils.js';
-import { UNIFIED_DELEGATE_ADDRESS, UNIFIED_DELEGATE_ABI, FLAP_PORTAL_ABI, FLAP_PORTAL_ADDRESS, POTATOSWAP_V2_ROUTER, POTATOSWAP_V3_ROUTER, WOKB_ADDRESS, V3_FEE_TIERS, ERC20_ABI, } from './constants.js';
+import { UNIFIED_DELEGATE_ADDRESS, UNIFIED_DELEGATE_ABI, FLAP_PORTAL_ABI, FLAP_PORTAL_ADDRESS, POTATOSWAP_V2_ROUTER, POTATOSWAP_V3_ROUTER, WOKB_ADDRESS, V3_FEE_TIERS, ERC20_ABI, V2_ROUTER_ABI, } from './constants.js';
 import { bundleBuy } from './bundle-buy.js';
 import { bundleSell } from './bundle-sell.js';
 import { bundleSwap } from './bundle-swap.js';
@@ -222,20 +222,21 @@ export async function washVolume(params) {
             : buildSellCall(wallet, tokenAddress, sellPercent, tokenDecimals, poolType, actualRouter, fee, delegateInterface, portalInterface);
         calls.push(sellCall);
     }
-    // 利润刮取（放在最后，与 bundleBuy 一致）
-    if (profitAmount > 0n) {
+    // ✅ 修复：利润刮取从第一个参与刷量的钱包扣取（卖出后有OKB）
+    // 使用 transferAmount 从钱包余额转账，不需要通过 msg.value
+    if (profitAmount > 0n && wallets.length > 0) {
         calls.push({
-            target: mainWallet.address,
+            target: wallets[0].address, // 从第一个刷量钱包扣利润
             allowFailure: false,
-            value: profitAmount,
-            callData: delegateInterface.encodeFunctionData('transferTo', [profitRecipient]),
+            value: 0n,
+            callData: delegateInterface.encodeFunctionData('transferAmount', [profitRecipient, profitAmount]),
         });
     }
     // ========================================
     // 构建交易
     // ========================================
-    // ✅ 修复：各钱包使用自己余额买入，主交易只支付利润
-    const totalValue = profitAmount;
+    // ✅ 修复：利润使用 transferAmount 从钱包余额转账，不需要通过 msg.value
+    const totalValue = 0n;
     // ✅ 使用 mainWallet 的 nonce（mainWallet 是交易发起者和 Gas 支付者）
     const signedTransaction = buildEIP7702TransactionSync(mainWallet, authorizations, calls, totalValue, nonces[mainWalletIndex], feeData, config);
     return {
@@ -349,12 +350,93 @@ export async function bundleVolume(params) {
     // 计算卖出金额
     let sellAmountsWei;
     if (sellAmounts && sellAmounts.length === sellerWallets.length) {
+        // ✅ 如果有指定卖出金额，直接使用
         sellAmountsWei = sellAmounts.map(amt => ethers.parseUnits(truncateDecimals(amt, tokenDecimals), tokenDecimals));
     }
     else if (needBalanceQuery && results[2]) {
+        // ✅ 没有指定卖出金额，需要根据买入金额预估应卖出的代币数量
         const balances = results[2].map(b => typeof b === 'bigint' ? b : BigInt(b.toString()));
-        const percentBigInt = BigInt(Math.min(100, Math.max(1, sellPercent)));
-        sellAmountsWei = balances.map(b => (b * percentBigInt) / 100n);
+        const totalSellerBalance = balances.reduce((sum, b) => sum + b, 0n);
+        // ✅ 根据 poolType 预估买入能获得的代币数量
+        let estimatedTokenAmount = 0n;
+        try {
+            if (poolType === 'FLAP') {
+                // FLAP 内盘：使用 previewBuy，降级到 quoteExactInput
+                const portalContract = new ethers.Contract(FLAP_PORTAL_ADDRESS, FLAP_PORTAL_ABI, provider);
+                try {
+                    estimatedTokenAmount = await portalContract.previewBuy(tokenAddress, totalBuyAmount);
+                    console.log(`[bundleVolume] FLAP previewBuy: ${totalBuyAmount} wei OKB -> ${estimatedTokenAmount} wei 代币`);
+                }
+                catch (previewErr) {
+                    console.warn(`[bundleVolume] previewBuy 失败，尝试 quoteExactInput:`, previewErr);
+                    try {
+                        estimatedTokenAmount = await portalContract.quoteExactInput.staticCall({
+                            inputToken: ethers.ZeroAddress,
+                            outputToken: tokenAddress,
+                            inputAmount: totalBuyAmount,
+                        });
+                        console.log(`[bundleVolume] FLAP quoteExactInput: ${totalBuyAmount} wei OKB -> ${estimatedTokenAmount} wei 代币`);
+                    }
+                    catch (quoteErr) {
+                        console.warn(`[bundleVolume] quoteExactInput 也失败:`, quoteErr);
+                    }
+                }
+            }
+            else if (poolType === 'V2' || poolType === 'V3') {
+                // V2/V3 外盘：使用 Router 报价
+                const v2Router = new ethers.Contract(POTATOSWAP_V2_ROUTER, V2_ROUTER_ABI, provider);
+                const path = [WOKB_ADDRESS, tokenAddress];
+                try {
+                    if (poolType === 'V2') {
+                        const amounts = await v2Router.getAmountsOut(totalBuyAmount, path);
+                        estimatedTokenAmount = amounts[amounts.length - 1];
+                    }
+                    else {
+                        // V3: 使用 V3 Quoter
+                        const v3Quoter = new ethers.Contract('0x27d52F6D9Ed2eBb3E6a4c0Af6b1f5dc85A4d5b2C', [
+                            'function quoteExactInputSingle((address tokenIn, address tokenOut, uint256 amountIn, uint24 fee, uint160 sqrtPriceLimitX96)) external returns (uint256 amountOut)'
+                        ], provider);
+                        estimatedTokenAmount = await v3Quoter.quoteExactInputSingle.staticCall({
+                            tokenIn: WOKB_ADDRESS,
+                            tokenOut: tokenAddress,
+                            amountIn: totalBuyAmount,
+                            fee: fee,
+                            sqrtPriceLimitX96: 0n,
+                        });
+                    }
+                    console.log(`[bundleVolume] ${poolType} quote: ${totalBuyAmount} wei OKB -> ${estimatedTokenAmount} wei 代币`);
+                }
+                catch (quoteErr) {
+                    console.warn(`[bundleVolume] ${poolType} 报价失败:`, quoteErr);
+                }
+            }
+        }
+        catch (e) {
+            console.warn(`[bundleVolume] 报价预估失败:`, e);
+        }
+        // ✅ 修正卖出数量计算逻辑：每个钱包应卖出的代币 = (原有余额 + 本次买入预估数量) * sellPercent / 100
+        const percentBigInt = BigInt(Math.min(100, Math.max(0, sellPercent)));
+        // 1. 初始化每个钱包的预期持仓
+        const walletTotalExpectedBalances = balances.map(b => b);
+        // 2. 将本次预估买入的代币分配给买家（买家也可能是卖家）
+        if (estimatedTokenAmount > 0n && totalBuyAmount > 0n) {
+            // 按买家买入金额比例分配预估代币
+            buyerWallets.forEach((bw, i) => {
+                const buyAmount = buyAmountsWei[i];
+                if (buyAmount > 0n) {
+                    const share = (estimatedTokenAmount * buyAmount) / totalBuyAmount;
+                    // 寻找该买家在卖家列表中的索引
+                    const sIdx = sellerWallets.findIndex(sw => sw.address.toLowerCase() === bw.address.toLowerCase());
+                    if (sIdx !== -1) {
+                        walletTotalExpectedBalances[sIdx] += share;
+                    }
+                }
+            });
+            console.log(`[bundleVolume] 每个卖家预期总持仓 (原有+本次买入):`, walletTotalExpectedBalances.map(a => a.toString()));
+        }
+        // 3. 计算最终卖出数量
+        sellAmountsWei = walletTotalExpectedBalances.map(total => (total * percentBigInt) / 100n);
+        console.log(`[bundleVolume] 最终卖出数量 (sellPercent=${sellPercent}%):`, sellAmountsWei.map(a => a.toString()));
     }
     else {
         sellAmountsWei = sellerWallets.map(() => 0n);
@@ -381,20 +463,21 @@ export async function bundleVolume(params) {
         const sellCall = buildSellCallWithAmount(sellerWallets[i], sellAmountsWei[i], tokenAddress, poolType, actualRouter, fee, delegateInterface, portalInterface);
         calls.push(sellCall);
     }
-    // 利润刮取（放在最后，与 bundleBuy 一致）
-    if (profitAmount > 0n) {
+    // ✅ 修复：利润刮取从第一个卖方钱包扣取（卖出后有OKB）
+    // 使用 transferAmount 从钱包余额转账，不需要通过 msg.value
+    if (profitAmount > 0n && sellerWallets.length > 0) {
         calls.push({
-            target: mainWallet.address,
+            target: sellerWallets[0].address, // 从第一个卖方钱包扣利润
             allowFailure: false,
-            value: profitAmount,
-            callData: delegateInterface.encodeFunctionData('transferTo', [profitRecipient]),
+            value: 0n,
+            callData: delegateInterface.encodeFunctionData('transferAmount', [profitRecipient, profitAmount]),
         });
     }
     // ========================================
     // 构建交易
     // ========================================
-    // ✅ 修复：各钱包使用自己余额买入，主交易只支付利润
-    const totalValue = profitAmount;
+    // ✅ 修复：利润使用 transferAmount 从钱包余额转账，不需要通过 msg.value
+    const totalValue = 0n;
     const signedTransaction = buildEIP7702TransactionSync(mainWallet, authorizations, calls, totalValue, nonces[mainWalletIndex], feeData, config);
     return {
         signedTransaction,
@@ -580,7 +663,7 @@ function buildSellCall(wallet, tokenAddress, sellPercent, tokenDecimals, poolTyp
             const portalCallData = portalInterface.encodeFunctionData('swapExactInput', [{
                     inputToken: tokenAddress,
                     outputToken: ethers.ZeroAddress, // 0x0 = OKB
-                    inputAmount: 0n, // 需要外层传入实际余额
+                    inputAmount: 1n, // 占位符，如果调用 buildSellCall 时不指定 amount，通常意味逻辑上有问题
                     minOutputAmount: 0n,
                     permitData: '0x',
                 }]);

package/package.json

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