four-flap-meme-sdk 1.7.22 → 1.7.23

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

@@ -10,7 +10,7 @@
  */
 import { ethers, Interface, Contract } from 'ethers';
 import { FLAP_PORTAL_ADDRESS, UNIFIED_DELEGATE_ADDRESS, UNIFIED_DELEGATE_ABI, FLAP_PORTAL_ABI, WOKB_ADDRESS, POTATOSWAP_V2_ROUTER, POTATOSWAP_V3_ROUTER, V3_FEE_TIERS, } from './constants.js';
-import { getCachedProvider, createWallet, signAuthorizationsWithNonces, batchGetNonces, buildEIP7702TransactionSync, calculateProfitAmount, getProfitRecipient, } from './utils.js';
+import { getCachedProvider, createWallet, signAuthorizationsWithNonces, batchGetNonces, buildEIP7702TransactionSync, calculateProfitAmountByUserType, getProfitRecipient, } from './utils.js';
 // ========================================
 // 常量
 // ========================================
@@ -125,7 +125,8 @@ function buildProfitCall(walletAddress, profitAmount, profitRecipient, delegateI
  * @returns 只返回签名后的交易，不发送
  */
 export async function bundleCreateBuy(params) {
-    const { tokenInfo, tokenAddress = ZERO_ADDRESS, devPrivateKey, buyerPrivateKeys, buyAmounts, config, } = params;
+    const { tokenInfo, tokenAddress = ZERO_ADDRESS, devPrivateKey, buyerPrivateKeys, buyAmounts, userType = 'v0', // ✅ 用户类型（影响利润率）
+    config, } = params;
     if (buyerPrivateKeys.length !== buyAmounts.length) {
         throw new Error('buyerPrivateKeys 和 buyAmounts 长度必须相同');
     }
@@ -137,10 +138,10 @@ export async function bundleCreateBuy(params) {
     const buyerWallets = buyerPrivateKeys.map(pk => createWallet(pk, provider));
     const allWallets = [devWallet, ...buyerWallets];
     const mainWallet = devWallet;
-    // 计算买入金额和利润
+    // 计算买入金额和利润（单边模式：只有买入）
     const buyAmountsWei = buyAmounts.map(amt => ethers.parseEther(amt));
     const totalBuyAmount = buyAmountsWei.reduce((sum, amt) => sum + amt, 0n);
-    const profitAmount = calculateProfitAmount(totalBuyAmount);
+    const profitAmount = calculateProfitAmountByUserType(totalBuyAmount, userType, false); // ✅ 支持 userType
     const profitRecipient = getProfitRecipient(config);
     // 并行获取 nonce 和 fee data
     const [nonces, feeData] = await Promise.all([
@@ -272,7 +273,8 @@ export async function bundleCreateBuy(params) {
  * @returns 只返回签名后的交易，不发送
  */
 export async function bundleCreateToDex(params) {
-    const { tokenInfo, tokenAddress = ZERO_ADDRESS, payerPrivateKey, curveBuyerPrivateKeys, curveBuyAmounts, enableDexBuy = false, dexBuyerPrivateKeys = [], dexBuyAmounts = [], config, } = params;
+    const { tokenInfo, tokenAddress = ZERO_ADDRESS, payerPrivateKey, curveBuyerPrivateKeys, curveBuyAmounts, enableDexBuy = false, dexBuyerPrivateKeys = [], dexBuyAmounts = [], userType = 'v0', // ✅ 用户类型（影响利润率）
+    config, } = params;
     if (curveBuyerPrivateKeys.length !== curveBuyAmounts.length) {
         throw new Error('curveBuyerPrivateKeys 和 curveBuyAmounts 长度必须相同');
     }
@@ -294,13 +296,13 @@ export async function bundleCreateToDex(params) {
     const allWallets = Array.from(allWalletsMap.values());
     const mainWallet = payerWallet;
     const mainWalletIndex = allWallets.findIndex(w => w.address.toLowerCase() === mainWallet.address.toLowerCase());
-    // 计算金额
+    // 计算金额和利润（单边模式：只有买入）
     const curveBuyAmountsWei = curveBuyAmounts.map(amt => ethers.parseEther(amt));
     const dexBuyAmountsWei = dexBuyAmounts.map(amt => ethers.parseEther(amt));
     const totalCurveBuyAmount = curveBuyAmountsWei.reduce((sum, amt) => sum + amt, 0n);
     const totalDexBuyAmount = dexBuyAmountsWei.reduce((sum, amt) => sum + amt, 0n);
     const totalBuyAmount = totalCurveBuyAmount + totalDexBuyAmount;
-    const profitAmount = calculateProfitAmount(totalBuyAmount);
+    const profitAmount = calculateProfitAmountByUserType(totalBuyAmount, userType, false); // ✅ 支持 userType
     const profitRecipient = getProfitRecipient(config);
     // 并行获取 nonce 和 fee data
     const [nonces, feeData] = await Promise.all([
@@ -426,7 +428,8 @@ export async function bundleCreateToDex(params) {
  * @returns 只返回签名后的交易，不发送
  */
 export async function bundleGraduateBuy(params) {
-    const { tokenAddress, privateKeys, payerPrivateKey, amountMode, totalBuyAmount, minAmount, maxAmount, walletAmounts, enableDexBuy = false, extensionData = '0x', curveAddresses, dexAddresses, graduationAmount, config, } = params;
+    const { tokenAddress, privateKeys, payerPrivateKey, amountMode, totalBuyAmount, minAmount, maxAmount, walletAmounts, enableDexBuy = false, extensionData = '0x', curveAddresses, dexAddresses, graduationAmount, userType = 'v0', // ✅ 用户类型（影响利润率）
+    config, } = params;
     const provider = getCachedProvider(config?.rpcUrl);
     const delegateAddress = (config?.delegateAddress && config.delegateAddress.trim()) || UNIFIED_DELEGATE_ADDRESS;
     const delegateInterface = new Interface(UNIFIED_DELEGATE_ABI);
@@ -519,11 +522,11 @@ export async function bundleGraduateBuy(params) {
     const allWallets = Array.from(allWalletsMap.values());
     const mainWallet = payerWallet;
     const mainWalletIndex = allWallets.findIndex(w => w.address.toLowerCase() === mainWallet.address.toLowerCase());
-    // 计算金额
+    // 计算金额和利润（单边模式：只有买入）
     const curveTotalWei = curveBuyers.reduce((sum, b) => sum + b.amount, 0n);
     const dexTotalWei = dexBuyers.reduce((sum, b) => sum + b.amount, 0n);
     const totalAmount = curveTotalWei + dexTotalWei;
-    const profitAmount = calculateProfitAmount(totalAmount);
+    const profitAmount = calculateProfitAmountByUserType(totalAmount, userType, false); // ✅ 支持 userType
     const profitRecipient = getProfitRecipient(config);
     // 并行获取 nonce 和 fee data
     const [nonces, feeData] = await Promise.all([

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

@@ -6,9 +6,10 @@
  *
  * 只生成签名，由调用方决定如何提交
  */
-import { ethers, Contract } from 'ethers';
-import { getCachedProvider, createWallet, signAuthorizationsWithNonces, batchGetNonces, buildEIP7702TransactionSync, calculateProfitAmountByTxCount, getProfitRecipient, } from './utils.js';
-import { UNIFIED_DELEGATE_ADDRESS, POTATOSWAP_V2_ROUTER, POTATOSWAP_V3_ROUTER, FLAP_PORTAL_ADDRESS, WOKB_ADDRESS, V3_FEE_TIERS, UNIFIED_DELEGATE_ABI, FLAP_PORTAL_ABI, ERC20_ABI, } from './constants.js';
+import { ethers, Contract, JsonRpcProvider } from 'ethers';
+import { getCachedProvider, createWallet, signAuthorizationsWithNonces, batchGetNonces, buildEIP7702TransactionSync, calculateProfitAmountByUserType, getProfitRecipient, } from './utils.js';
+import { UNIFIED_DELEGATE_ADDRESS, POTATOSWAP_V2_ROUTER, POTATOSWAP_V3_ROUTER, FLAP_PORTAL_ADDRESS, WOKB_ADDRESS, V3_FEE_TIERS, UNIFIED_DELEGATE_ABI, FLAP_PORTAL_ABI, ERC20_ABI, XLAYER_RPC_URL, XLAYER_CHAIN_ID, } from './constants.js';
+import { quoteV2, quoteV3 } from '../../utils/quote-helpers.js';
 // ========================================
 // 路由地址获取
 // ========================================
@@ -23,6 +24,88 @@ function getDefaultRouter(tradeType) {
     }
 }
 // ========================================
+// 卖出报价（Token → OKB）
+// ========================================
+/**
+ * 获取卖出报价：预估卖出代币能得到多少 OKB
+ *
+ * @param totalSellAmount - 总卖出代币数量（wei）
+ * @param tokenAddress - 代币地址
+ * @param tradeType - 交易类型（FLAP/V2/V3）
+ * @param fee - V3 费率
+ * @param rpcUrl - RPC URL
+ * @returns 预估得到的 OKB 数量（wei）
+ */
+async function quoteSellOutput(totalSellAmount, tokenAddress, tradeType, fee, rpcUrl) {
+    if (totalSellAmount <= 0n)
+        return 0n;
+    const provider = new JsonRpcProvider(rpcUrl || XLAYER_RPC_URL, { chainId: XLAYER_CHAIN_ID, name: 'xlayer', ensAddress: undefined });
+    try {
+        switch (tradeType) {
+            case 'FLAP': {
+                // FLAP Portal 报价
+                const portalContract = new Contract(FLAP_PORTAL_ADDRESS, FLAP_PORTAL_ABI, provider);
+                // 先尝试 quoteSell（Token → OKB）
+                try {
+                    const okbOut = await portalContract.quoteSell(tokenAddress, totalSellAmount);
+                    console.log(`[Bundle Sell] FLAP quoteSell 成功: ${ethers.formatEther(okbOut)} OKB`);
+                    return BigInt(okbOut.toString());
+                }
+                catch {
+                    console.warn(`[Bundle Sell] FLAP quoteSell 失败，尝试 quoteExactInput...`);
+                }
+                // 再尝试 quoteExactInput
+                try {
+                    const okbOut = await portalContract.quoteExactInput({
+                        inputToken: tokenAddress,
+                        outputToken: ethers.ZeroAddress, // OKB
+                        inputAmount: totalSellAmount,
+                    });
+                    console.log(`[Bundle Sell] FLAP quoteExactInput 成功: ${ethers.formatEther(okbOut)} OKB`);
+                    return BigInt(okbOut.toString());
+                }
+                catch {
+                    console.warn(`[Bundle Sell] FLAP quoteExactInput 失败，尝试 V2...`);
+                }
+                // 回退到 V2
+                const v2Result = await quoteV2(provider, tokenAddress, WOKB_ADDRESS, totalSellAmount, 'XLAYER');
+                if (v2Result.amountOut > 0n) {
+                    console.log(`[Bundle Sell] FLAP 回退 V2 报价成功: ${ethers.formatEther(v2Result.amountOut)} OKB`);
+                    return v2Result.amountOut;
+                }
+                break;
+            }
+            case 'V2': {
+                const result = await quoteV2(provider, tokenAddress, WOKB_ADDRESS, totalSellAmount, 'XLAYER');
+                if (result.amountOut > 0n) {
+                    console.log(`[Bundle Sell] V2 报价成功: ${ethers.formatEther(result.amountOut)} OKB`);
+                    return result.amountOut;
+                }
+                break;
+            }
+            case 'V3': {
+                const result = await quoteV3(provider, tokenAddress, WOKB_ADDRESS, totalSellAmount, 'XLAYER', fee);
+                if (result.amountOut > 0n) {
+                    console.log(`[Bundle Sell] V3 报价成功 (fee=${result.fee}): ${ethers.formatEther(result.amountOut)} OKB`);
+                    return result.amountOut;
+                }
+                // 回退到 V2
+                const v2Result = await quoteV2(provider, tokenAddress, WOKB_ADDRESS, totalSellAmount, 'XLAYER');
+                if (v2Result.amountOut > 0n) {
+                    console.log(`[Bundle Sell] V3 回退 V2 报价成功: ${ethers.formatEther(v2Result.amountOut)} OKB`);
+                    return v2Result.amountOut;
+                }
+                break;
+            }
+        }
+    }
+    catch (error) {
+        console.error(`[Bundle Sell] 报价失败:`, error);
+    }
+    console.warn(`[Bundle Sell] 无法获取报价，利润计算可能不准确`);
+    return 0n;
+}
+// ========================================
 // 代币余额查询
 // ========================================
 async function getTokenBalances(wallets, tokenAddress) {
@@ -255,27 +338,60 @@ export async function bundleSell(params) {
     }
     const totalSellAmount = sellAmountsWei.reduce((sum, amt) => sum + amt, 0n);
     const validSellCount = wallets.filter((_, i) => sellAmountsWei[i] > 0n).length;
-    // ✅ 计算利润（卖出模式：根据卖出交易数量计算）
-    // 注意：卖出后的 OKB 我们无法预估，所以基于代币数量计算（与买入对称）
-    const profitAmount = calculateProfitAmountByTxCount(totalSellAmount, validSellCount, userType);
+    // ✅ 修复：获取卖出报价，基于预估的 OKB 输出计算利润
+    // 1. 先获取报价：卖出 totalSellAmount 代币能得到多少 OKB
+    const estimatedOkbOut = await quoteSellOutput(totalSellAmount, tokenAddress, tradeType, fee, config?.rpcUrl);
+    // 2. 基于预估的 OKB 输出计算利润（单边模式，isDoubleMode = false）
+    const profitAmount = estimatedOkbOut > 0n
+        ? calculateProfitAmountByUserType(estimatedOkbOut, userType, false)
+        : 0n;
+    console.log(`[Bundle Sell] 卖出数量: ${ethers.formatUnits(totalSellAmount, tokenDecimals)} Token`);
+    console.log(`[Bundle Sell] 预估获得: ${ethers.formatEther(estimatedOkbOut)} OKB`);
+    console.log(`[Bundle Sell] 利润: ${ethers.formatEther(profitAmount)} OKB (userType=${userType})`);
     // ========================================
     // 同步构建授权和调用
     // ========================================
     const authorizations = signAuthorizationsWithNonces(allWallets, walletNonces, delegateAddress, mainWalletIndex === -1 ? 0 : mainWalletIndex);
-    // ✅ 构建调用列表（利润刮取 + 卖出调用）
+    // ✅ 计算每个钱包的利润（按卖出数量比例分配）
+    const profitPerWallet = [];
+    if (profitAmount > 0n && totalSellAmount > 0n) {
+        for (let i = 0; i < wallets.length; i++) {
+            const sellAmount = sellAmountsWei[i];
+            if (sellAmount > 0n) {
+                // 按比例分配利润
+                const walletProfit = (profitAmount * sellAmount) / totalSellAmount;
+                profitPerWallet.push(walletProfit);
+            }
+            else {
+                profitPerWallet.push(0n);
+            }
+        }
+    }
+    else {
+        for (let i = 0; i < wallets.length; i++) {
+            profitPerWallet.push(0n);
+        }
+    }
+    // ✅ 构建调用列表（卖出调用 + 每个钱包的利润刮取）
     const calls = [];
-    // 利润刮取（从主钱包）- 注意：卖出后利润从所得 OKB 中扣，需要在卖出后执行
-    // 由于 EIP-7702 是单笔交易原子执行，利润刮取调用放在卖出调用之后
+    // 1. 先执行卖出，每个钱包卖出代币获得 OKB
     const sellCalls = buildSellCalls(wallets, sellAmountsWei, tokenAddress, tradeType, actualRouter, fee);
     calls.push(...sellCalls);
-    // ✅ 卖出后从主钱包扣除利润
-    if (profitAmount > 0n) {
-        calls.push({
-            target: mainWallet.address,
-            allowFailure: false,
-            value: 0n, // 卖出后扣除，不需要额外 value
-            callData: delegateInterface.encodeFunctionData('transferTo', [profitRecipient]),
-        });
+    // 2. ✅ 每个卖出钱包从自己的卖出所得中扣除利润
+    // 使用 transferAmount 传递精确金额
+    for (let i = 0; i < wallets.length; i++) {
+        const walletProfit = profitPerWallet[i];
+        if (walletProfit > 0n) {
+            calls.push({
+                target: wallets[i].address,
+                allowFailure: false,
+                value: 0n,
+                callData: delegateInterface.encodeFunctionData('transferAmount', [
+                    profitRecipient,
+                    walletProfit,
+                ]),
+            });
+        }
     }
     // ========================================
     // 同步构建并签名交易
@@ -286,7 +402,10 @@ export async function bundleSell(params) {
         metadata: {
             totalSellAmount: ethers.formatUnits(totalSellAmount, tokenDecimals),
             walletCount: validSellCount,
-            profitAmount: ethers.formatUnits(profitAmount, tokenDecimals),
+            estimatedOkbOut: ethers.formatEther(estimatedOkbOut), // ✅ 预估卖出所得 OKB
+            profitAmount: ethers.formatEther(profitAmount), // ✅ 利润是 OKB，用 18 位精度
+            profitRecipient,
+            userType,
         },
     };
 }

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

@@ -9,9 +9,10 @@
  * 支持 FLAP 内盘、V2 和 V3 三种交易类型
  * 只生成签名，由调用方决定如何提交
  */
-import { ethers } from 'ethers';
-import { getCachedProvider, createWallet, signAuthorization, signAuthorizationsWithNonces, batchGetNonces, buildEIP7702TransactionSync, calculateProfitAmountByTxCount, getProfitRecipient, generateRandomWallets, } from './utils.js';
-import { UNIFIED_DELEGATE_ADDRESS, POTATOSWAP_V2_ROUTER, POTATOSWAP_V3_ROUTER, FLAP_PORTAL_ADDRESS, WOKB_ADDRESS, V3_FEE_TIERS, UNIFIED_DELEGATE_ABI, FLAP_PORTAL_ABI, ERC20_ABI, } from './constants.js';
+import { ethers, Contract, JsonRpcProvider } from 'ethers';
+import { quoteV2, quoteV3 } from '../../utils/quote-helpers.js';
+import { getCachedProvider, createWallet, signAuthorization, signAuthorizationsWithNonces, batchGetNonces, buildEIP7702TransactionSync, calculateProfitAmountByUserType, calculateProfitAmountByTxCount, getProfitRecipient, generateRandomWallets, } from './utils.js';
+import { UNIFIED_DELEGATE_ADDRESS, POTATOSWAP_V2_ROUTER, POTATOSWAP_V3_ROUTER, FLAP_PORTAL_ADDRESS, WOKB_ADDRESS, V3_FEE_TIERS, UNIFIED_DELEGATE_ABI, FLAP_PORTAL_ABI, ERC20_ABI, XLAYER_RPC_URL, XLAYER_CHAIN_ID, } from './constants.js';
 // ========================================
 // 路由地址获取
 // ========================================
@@ -26,6 +27,81 @@ function getDefaultRouter(tradeType) {
     }
 }
 // ========================================
+// 卖出报价（Token → OKB）
+// ========================================
+/**
+ * 获取卖出报价：预估卖出代币能得到多少 OKB
+ */
+async function quoteSellOutput(sellAmount, tokenAddress, tradeType, fee, rpcUrl) {
+    if (sellAmount <= 0n)
+        return 0n;
+    const provider = new JsonRpcProvider(rpcUrl || XLAYER_RPC_URL, { chainId: XLAYER_CHAIN_ID, name: 'xlayer', ensAddress: undefined });
+    try {
+        switch (tradeType) {
+            case 'FLAP': {
+                // FLAP Portal 报价
+                const portalContract = new Contract(FLAP_PORTAL_ADDRESS, FLAP_PORTAL_ABI, provider);
+                // 先尝试 quoteSell
+                try {
+                    const okbOut = await portalContract.quoteSell(tokenAddress, sellAmount);
+                    console.log(`[Bundle Swap] FLAP quoteSell 成功: ${ethers.formatEther(okbOut)} OKB`);
+                    return BigInt(okbOut.toString());
+                }
+                catch {
+                    console.warn(`[Bundle Swap] FLAP quoteSell 失败，尝试 quoteExactInput...`);
+                }
+                // 再尝试 quoteExactInput
+                try {
+                    const okbOut = await portalContract.quoteExactInput({
+                        inputToken: tokenAddress,
+                        outputToken: ethers.ZeroAddress,
+                        inputAmount: sellAmount,
+                    });
+                    console.log(`[Bundle Swap] FLAP quoteExactInput 成功: ${ethers.formatEther(okbOut)} OKB`);
+                    return BigInt(okbOut.toString());
+                }
+                catch {
+                    console.warn(`[Bundle Swap] FLAP quoteExactInput 失败，尝试 V2...`);
+                }
+                // 回退到 V2
+                const v2Result = await quoteV2(provider, tokenAddress, WOKB_ADDRESS, sellAmount, 'XLAYER');
+                if (v2Result.amountOut > 0n) {
+                    console.log(`[Bundle Swap] FLAP 回退 V2 报价成功: ${ethers.formatEther(v2Result.amountOut)} OKB`);
+                    return v2Result.amountOut;
+                }
+                break;
+            }
+            case 'V2': {
+                const result = await quoteV2(provider, tokenAddress, WOKB_ADDRESS, sellAmount, 'XLAYER');
+                if (result.amountOut > 0n) {
+                    console.log(`[Bundle Swap] V2 报价成功: ${ethers.formatEther(result.amountOut)} OKB`);
+                    return result.amountOut;
+                }
+                break;
+            }
+            case 'V3': {
+                const result = await quoteV3(provider, tokenAddress, WOKB_ADDRESS, sellAmount, 'XLAYER', fee);
+                if (result.amountOut > 0n) {
+                    console.log(`[Bundle Swap] V3 报价成功 (fee=${result.fee}): ${ethers.formatEther(result.amountOut)} OKB`);
+                    return result.amountOut;
+                }
+                // 回退到 V2
+                const v2Result = await quoteV2(provider, tokenAddress, WOKB_ADDRESS, sellAmount, 'XLAYER');
+                if (v2Result.amountOut > 0n) {
+                    console.log(`[Bundle Swap] V3 回退 V2 报价成功: ${ethers.formatEther(v2Result.amountOut)} OKB`);
+                    return v2Result.amountOut;
+                }
+                break;
+            }
+        }
+    }
+    catch (error) {
+        console.error(`[Bundle Swap] 报价失败:`, error);
+    }
+    console.warn(`[Bundle Swap] 无法获取报价，利润计算可能不准确`);
+    return 0n;
+}
+// ========================================
 // 构建卖出并转账调用
 // ========================================
 function buildSellAndTransferCall(sellerWallet, sellAmount, tokenAddress, recipient, tradeType, routerAddress, fee) {
@@ -202,10 +278,16 @@ export async function bundleSwap(params) {
     const hopWalletInfos = hopCount > 0 ? generateRandomWallets(hopCount) : [];
     const hopWallets = hopWalletInfos.map(info => createWallet(info.privateKey, provider));
     const sellAmountWei = ethers.parseUnits(sellAmount, tokenDecimals);
-    // ✅ 计算利润（换手模式：2笔交易，使用双边费率）
-    const totalTxCount = 2; // 1 卖 + 1 买
-    const profitAmount = calculateProfitAmountByTxCount(sellAmountWei, totalTxCount, userType);
+    // ✅ 修复：获取卖出报价，基于预估的 OKB 输出计算利润
+    const estimatedOkbOut = await quoteSellOutput(sellAmountWei, tokenAddress, tradeType, fee, config?.rpcUrl);
+    // 使用双边费率计算利润（换手 = 卖 + 买）
+    const profitAmount = estimatedOkbOut > 0n
+        ? calculateProfitAmountByUserType(estimatedOkbOut, userType, true) // isDoubleMode = true
+        : 0n;
     const profitRecipient = getProfitRecipient(config);
+    console.log(`[Bundle Swap] 卖出数量: ${sellAmount} Token`);
+    console.log(`[Bundle Swap] 预估获得: ${ethers.formatEther(estimatedOkbOut)} OKB`);
+    console.log(`[Bundle Swap] 利润: ${ethers.formatEther(profitAmount)} OKB (userType=${userType})`);
     // ========================================
     // 并行获取所有异步数据
     // ========================================
@@ -260,8 +342,11 @@ export async function bundleSwap(params) {
             sellerAddress: sellerWallet.address,
             buyerAddresses: [buyerWallet.address],
             sellAmount: ethers.formatUnits(sellAmountWei, tokenDecimals),
+            estimatedOkbOut: ethers.formatEther(estimatedOkbOut), // ✅ 预估卖出所得 OKB
             estimatedBuyAmount: '0',
-            profitAmount: ethers.formatEther(profitAmount),
+            profitAmount: ethers.formatEther(profitAmount), // ✅ 利润是 OKB
+            profitRecipient,
+            userType,
         },
     };
 }
@@ -296,10 +381,16 @@ export async function bundleBatchSwap(params) {
     const hopWalletInfos = hopCount > 0 ? generateRandomWallets(hopCount) : [];
     const hopWallets = hopWalletInfos.map(info => createWallet(info.privateKey, provider));
     const sellAmountWei = ethers.parseUnits(sellAmount, tokenDecimals);
-    // ✅ 计算利润（换手模式：1卖 + N买，根据交易数量计算）
-    const totalTxCount = 1 + buyerWallets.length; // 1 卖 + N 买
-    const profitAmount = calculateProfitAmountByTxCount(sellAmountWei, totalTxCount, userType);
+    // ✅ 修复：获取卖出报价，基于预估的 OKB 输出计算利润
+    const estimatedOkbOut = await quoteSellOutput(sellAmountWei, tokenAddress, tradeType, fee, config?.rpcUrl);
+    // 使用双边费率计算利润（换手 = 卖 + 买）
+    const profitAmount = estimatedOkbOut > 0n
+        ? calculateProfitAmountByUserType(estimatedOkbOut, userType, true) // isDoubleMode = true
+        : 0n;
     const profitRecipient = getProfitRecipient(config);
+    console.log(`[Bundle Batch Swap] 卖出数量: ${sellAmount} Token`);
+    console.log(`[Bundle Batch Swap] 预估获得: ${ethers.formatEther(estimatedOkbOut)} OKB`);
+    console.log(`[Bundle Batch Swap] 利润: ${ethers.formatEther(profitAmount)} OKB (userType=${userType})`);
     // ========================================
     // 并行获取所有异步数据
     // ========================================
@@ -387,8 +478,11 @@ export async function bundleBatchSwap(params) {
             sellerAddress: sellerWallet.address,
             buyerAddresses: buyerWallets.map(w => w.address),
             sellAmount: ethers.formatUnits(sellAmountWei, tokenDecimals),
+            estimatedOkbOut: ethers.formatEther(estimatedOkbOut), // ✅ 预估卖出所得 OKB
             estimatedBuyAmount: '0',
-            profitAmount: ethers.formatEther(profitAmount),
+            profitAmount: ethers.formatEther(profitAmount), // ✅ 利润是 OKB
+            profitRecipient,
+            userType,
         },
     };
 }

package/dist/eip7702/xlayer/constants.d.ts

@@ -4,7 +4,7 @@
 export declare const XLAYER_CHAIN_ID = 196;
 export declare const XLAYER_RPC_URL = "https://xlayerrpc.okx.com";
 /** 已部署的 UnifiedDelegate 合约地址 */
-export declare const UNIFIED_DELEGATE_ADDRESS = "0x32dF8c0811D370A22D517b9BD000748643Baa804";
+export declare const UNIFIED_DELEGATE_ADDRESS = "0x33C577Fa6A701E30F35B4B0DE3A361bfF400F0Cc";
 /** Multicall3 地址 (标准部署) */
 export declare const MULTICALL3_ADDRESS = "0xcA11bde05977b3631167028862bE2a173976CA11";
 /** WOKB 地址 */
@@ -49,7 +49,7 @@ export declare const V3_FEE_TIERS: {
     readonly STANDARD: 3000;
     readonly HIGH: 10000;
 };
-export declare const UNIFIED_DELEGATE_ABI: readonly ["function transferTo(address recipient) external payable", "function executeBuy(address router, address wokb, address tokenOut, uint24 fee, uint256 amountIn) external payable", "function executeSell(address router, address tokenIn, address wokb, uint24 fee, uint256 amountIn) external", "function executeSellAndTransfer(address router, address tokenIn, address wokb, uint24 fee, uint256 amountIn, address recipient) external", "function executeBuyV2(address router, address[] calldata path, uint256 amountIn) external payable", "function executeSellV2(address router, address[] calldata path, uint256 amountIn) external", "function executeSellAndTransferV2(address router, address[] calldata path, uint256 amountIn, address payable recipient) external", "function executeApprove(address token, address spender, uint256 amount) external", "function executeTransfer(address token, address to, uint256 amount) external", "function executeTransferAll(address token, address to) external", "function executeBatch((address target, uint256 value, bytes data)[] calls) external payable"];
+export declare const UNIFIED_DELEGATE_ABI: readonly ["function transferTo(address recipient) external payable", "function transferAmount(address recipient, uint256 amount) external", "function executeBuy(address router, address wokb, address tokenOut, uint24 fee, uint256 amountIn) external payable", "function executeSell(address router, address tokenIn, address wokb, uint24 fee, uint256 amountIn) external", "function executeSellAndTransfer(address router, address tokenIn, address wokb, uint24 fee, uint256 amountIn, address recipient) external", "function executeBuyV2(address router, address[] calldata path, uint256 amountIn) external payable", "function executeSellV2(address router, address[] calldata path, uint256 amountIn) external", "function executeSellAndTransferV2(address router, address[] calldata path, uint256 amountIn, address payable recipient) external", "function executeApprove(address token, address spender, uint256 amount) external", "function executeTransfer(address token, address to, uint256 amount) external", "function executeTransferAll(address token, address to) external", "function executeBatch((address target, uint256 value, bytes data)[] calls) external payable"];
 export declare const ERC20_ABI: readonly ["function approve(address spender, uint256 amount) external returns (bool)", "function transfer(address to, uint256 amount) external returns (bool)", "function transferFrom(address from, address to, uint256 amount) external returns (bool)", "function balanceOf(address account) external view returns (uint256)", "function allowance(address owner, address spender) external view returns (uint256)", "function decimals() external view returns (uint8)", "function symbol() external view returns (string)"];
 export declare const MULTICALL3_ABI: readonly ["function aggregate3Value((address target, bool allowFailure, uint256 value, bytes callData)[] calls) external payable returns ((bool success, bytes returnData)[] returnData)"];
 export declare const V3_ROUTER_ABI: readonly ["function exactInputSingle((address tokenIn, address tokenOut, uint24 fee, address recipient, uint256 amountIn, uint256 amountOutMinimum, uint160 sqrtPriceLimitX96)) external payable returns (uint256 amountOut)", "function multicall(uint256 deadline, bytes[] data) external payable returns (bytes[] results)", "function unwrapWETH9(uint256 amountMinimum, address recipient) external payable", "function refundETH() external payable"];

package/dist/eip7702/xlayer/constants.js

@@ -10,7 +10,7 @@ export const XLAYER_RPC_URL = 'https://xlayerrpc.okx.com';
 // 合约地址
 // ========================================
 /** 已部署的 UnifiedDelegate 合约地址 */
-export const UNIFIED_DELEGATE_ADDRESS = '0x32dF8c0811D370A22D517b9BD000748643Baa804';
+export const UNIFIED_DELEGATE_ADDRESS = '0x33C577Fa6A701E30F35B4B0DE3A361bfF400F0Cc';
 /** Multicall3 地址 (标准部署) */
 export const MULTICALL3_ADDRESS = '0xcA11bde05977b3631167028862bE2a173976CA11';
 /** WOKB 地址 */
@@ -75,6 +75,7 @@ export const UNIFIED_DELEGATE_ABI = [
     // 转账功能
     // ========================================
     'function transferTo(address recipient) external payable',
+    'function transferAmount(address recipient, uint256 amount) external',
     // ========================================
     // V3 买卖功能 (PotatoSwap V3 / DYORSwap)
     // ========================================

package/dist/eip7702/xlayer/types.d.ts

@@ -97,9 +97,18 @@ export interface BundleSellResult {
     txHash?: string;
     /** 元数据 */
     metadata: {
+        /** 总卖出代币数量 */
         totalSellAmount: string;
+        /** 参与卖出的钱包数量 */
         walletCount: number;
+        /** 预估卖出获得的 OKB 数量 */
+        estimatedOkbOut: string;
+        /** 利润金额（OKB） */
         profitAmount: string;
+        /** 利润接收地址 */
+        profitRecipient: string;
+        /** 用户类型 */
+        userType: string;
     };
 }
 export interface BundleApproveParams {
@@ -186,8 +195,15 @@ export interface BundleSwapResult {
         sellerAddress: string;
         buyerAddresses: string[];
         sellAmount: string;
+        /** 预估卖出获得的 OKB 数量 */
+        estimatedOkbOut?: string;
         estimatedBuyAmount: string;
+        /** 利润金额（OKB） */
         profitAmount: string;
+        /** 利润接收地址 */
+        profitRecipient?: string;
+        /** 用户类型 */
+        userType?: string;
     };
 }
 export interface MultiHopTransferParams {
@@ -362,6 +378,8 @@ export interface BundleCreateBuyParams extends CreateTokenParams {
     buyerPrivateKeys: string[];
     /** 每个买入钱包的金额 (OKB) */
     buyAmounts: string[];
+    /** 用户类型（影响利润率） */
+    userType?: 'v0' | 'v1' | 'default';
     /** 配置 */
     config?: EIP7702Config;
 }
@@ -391,6 +409,8 @@ export interface BundleCreateToDexParams extends CreateTokenParams {
     dexBuyerPrivateKeys?: string[];
     /** 外盘买入金额 (OKB) */
     dexBuyAmounts?: string[];
+    /** 用户类型（影响利润率） */
+    userType?: 'v0' | 'v1' | 'default';
     /** 配置 */
     config?: EIP7702Config;
 }
@@ -438,6 +458,8 @@ export interface BundleGraduateBuyParams {
     dexAddresses?: string[];
     /** 毕业金额（OKB） */
     graduationAmount?: number;
+    /** 用户类型（影响利润率） */
+    userType?: 'v0' | 'v1' | 'default';
     /** 配置 */
     config?: EIP7702Config;
 }

package/package.json

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