four-flap-meme-sdk 2.2.0 → 2.2.2

package/dist/chains/xlayer/eip7702/bundle-approve.js

@@ -8,8 +8,8 @@
  * 需要使用 executeApprove 函数
  */
 import { ethers, Contract } from 'ethers';
-import { getCachedProvider, createWallet, signAuthorizationsBatch, buildEIP7702Transaction } from './utils.js';
-import { UNIFIED_DELEGATE_ADDRESS, UNIFIED_DELEGATE_ABI, ERC20_ABI } from './constants.js';
+import { getCachedProvider, createWallet, signAuthorizationsBatch, buildEIP7702Transaction, } from './utils.js';
+import { UNIFIED_DELEGATE_ADDRESS, UNIFIED_DELEGATE_ABI, ERC20_ABI, } from './constants.js';
 // 扩展 ABI 包含 executeApprove
 const EXTENDED_DELEGATE_ABI = [
     ...UNIFIED_DELEGATE_ABI,
@@ -22,7 +22,11 @@ function buildApproveCalls(wallets, tokenAddress, spenderAddress, amount) {
     const delegateInterface = new ethers.Interface(EXTENDED_DELEGATE_ABI);
     const calls = [];
     for (const wallet of wallets) {
-        const callData = delegateInterface.encodeFunctionData('executeApprove', [tokenAddress, spenderAddress, amount]);
+        const callData = delegateInterface.encodeFunctionData('executeApprove', [
+            tokenAddress,
+            spenderAddress,
+            amount,
+        ]);
         calls.push({
             target: wallet.address,
             allowFailure: false,
@@ -39,19 +43,20 @@ function buildApproveCalls(wallets, tokenAddress, spenderAddress, amount) {
  * @returns 签名后的交易和元数据
  */
 export async function bundleApprove(params) {
-    const { mainPrivateKey, privateKeys, tokenAddress, spenderAddress, amount = ethers.MaxUint256, config } = params;
+    const { mainPrivateKey, privateKeys, tokenAddress, spenderAddress, amount = ethers.MaxUint256, config, } = params;
     if (privateKeys.length === 0) {
         throw new Error('privateKeys 不能为空');
     }
     const provider = getCachedProvider(config?.rpcUrl);
     const delegateAddress = (config?.delegateAddress && config.delegateAddress.trim()) || UNIFIED_DELEGATE_ADDRESS;
     const mainWallet = createWallet(mainPrivateKey, provider);
-    const wallets = privateKeys.map((pk) => createWallet(pk, provider));
+    const wallets = privateKeys.map(pk => createWallet(pk, provider));
     // 检查 mainWallet 是否在 wallets 中
-    const mainWalletIndex = wallets.findIndex((w) => w.address.toLowerCase() === mainWallet.address.toLowerCase());
+    const mainWalletIndex = wallets.findIndex(w => w.address.toLowerCase() === mainWallet.address.toLowerCase());
     // 只为需要执行授权操作的钱包生成 authorization
     // mainWallet 如果不在 privateKeys 中，只是支付 gas，不需要 authorization
-    const authorizations = await signAuthorizationsBatch(wallets, delegateAddress, provider, mainWalletIndex);
+    const authorizations = await signAuthorizationsBatch(wallets, delegateAddress, provider, mainWalletIndex // 如果 mainWallet 在 wallets 中，传其索引；否则传 -1（无主钱包）
+    );
     const calls = buildApproveCalls(wallets, tokenAddress, spenderAddress, amount);
     const signedTransaction = await buildEIP7702Transaction(mainWallet, authorizations, calls, 0n, config);
     return {
@@ -73,7 +78,11 @@ function buildApproveCallsMultiSpenders(wallets, tokenAddress, spenderAddresses,
     // 对每个钱包，授权所有 spender
     for (const wallet of wallets) {
         for (const spender of spenderAddresses) {
-            const callData = delegateInterface.encodeFunctionData('executeApprove', [tokenAddress, spender, amount]);
+            const callData = delegateInterface.encodeFunctionData('executeApprove', [
+                tokenAddress,
+                spender,
+                amount,
+            ]);
             calls.push({
                 target: wallet.address,
                 allowFailure: false,
@@ -94,7 +103,7 @@ function buildApproveCallsMultiSpenders(wallets, tokenAddress, spenderAddresses,
  * @returns 签名后的交易和元数据
  */
 export async function bundleApproveMultiSpenders(params) {
-    const { mainPrivateKey, privateKeys, tokenAddress, spenderAddresses, amount = ethers.MaxUint256, config } = params;
+    const { mainPrivateKey, privateKeys, tokenAddress, spenderAddresses, amount = ethers.MaxUint256, config, } = params;
     if (privateKeys.length === 0) {
         throw new Error('privateKeys 不能为空');
     }
@@ -104,13 +113,14 @@ export async function bundleApproveMultiSpenders(params) {
     const provider = getCachedProvider(config?.rpcUrl);
     const delegateAddress = (config?.delegateAddress && config.delegateAddress.trim()) || UNIFIED_DELEGATE_ADDRESS;
     const mainWallet = createWallet(mainPrivateKey, provider);
-    const wallets = privateKeys.map((pk) => createWallet(pk, provider));
+    const wallets = privateKeys.map(pk => createWallet(pk, provider));
     // 检查 mainWallet 是否在 wallets 中
-    const mainWalletIndex = wallets.findIndex((w) => w.address.toLowerCase() === mainWallet.address.toLowerCase());
+    const mainWalletIndex = wallets.findIndex(w => w.address.toLowerCase() === mainWallet.address.toLowerCase());
     // 只为需要执行授权操作的钱包生成 authorization
     const authorizations = await signAuthorizationsBatch(wallets, delegateAddress, provider, mainWalletIndex);
     // ✅ 关键：一次性构建所有 approve 调用
     const calls = buildApproveCallsMultiSpenders(wallets, tokenAddress, spenderAddresses, amount);
+    console.log(`[bundleApproveMultiSpenders] 钱包数: ${wallets.length}, spender数: ${spenderAddresses.length}, 总调用数: ${calls.length}`);
     const signedTransaction = await buildEIP7702Transaction(mainWallet, authorizations, calls, 0n, config);
     return {
         signedTransaction,

package/dist/chains/xlayer/eip7702/bundle-buy.d.ts

@@ -6,7 +6,12 @@
  *
  * 只生成签名，由调用方决定如何提交
  */
-import type { BundleBuyParams, BundleBuyResult } from './types.js';
+import type { BundleBuyParams as BaseBundleBuyParams, BundleBuyResult } from './types.js';
+import { type UserType } from './utils.js';
+export interface BundleBuyParams extends BaseBundleBuyParams {
+    /** 用户类型（影响利润率） */
+    userType?: UserType;
+}
 /**
  * 批量买入 - 生成签名后的交易
  *
@@ -44,5 +49,4 @@ import type { BundleBuyParams, BundleBuyResult } from './types.js';
  *   fee: 2500, // 0.25%
  * });
  */
-export type { BundleBuyParams } from './types.js';
 export declare function bundleBuy(params: BundleBuyParams): Promise<BundleBuyResult>;

package/dist/chains/xlayer/eip7702/bundle-buy.js

@@ -36,22 +36,18 @@ function buildFlapBuyCalls(wallets, buyAmounts, tokenAddress) {
             continue;
         // ✅ 修复：使用 swapExactInput 代替 buy 函数，与 bundle-create.ts 保持一致
         // buy(token) 是旧 API，swapExactInput 是新的标准 API
-        const portalCallData = portalInterface.encodeFunctionData('swapExactInput', [
-            {
+        const portalCallData = portalInterface.encodeFunctionData('swapExactInput', [{
                 inputToken: ethers.ZeroAddress, // 0x0 = OKB (原生代币)
                 outputToken: tokenAddress,
                 inputAmount: amount,
                 minOutputAmount: 0n, // 无滑点保护
                 permitData: '0x',
-            },
-        ]);
-        const batchCalls = [
-            {
+            }]);
+        const batchCalls = [{
                 target: FLAP_PORTAL_ADDRESS,
                 value: amount,
                 data: portalCallData,
-            },
-        ];
+            }];
         const callData = delegateInterface.encodeFunctionData('executeBatch', [batchCalls]);
         calls.push({
             target: wallet.address, // 以钱包身份调用，代币会到钱包
@@ -146,6 +142,46 @@ function buildProfitCall(mainWallet, profitAmount, profitRecipient) {
         callData,
     };
 }
+// ========================================
+// 批量买入主函数
+// ========================================
+/**
+ * 批量买入 - 生成签名后的交易
+ *
+ * @param params 买入参数
+ * @returns 签名后的交易和元数据
+ *
+ * @example
+ * // FLAP 内盘买入
+ * const result = await bundleBuy({
+ *   mainPrivateKey: '0x...',
+ *   privateKeys: ['0x...', '0x...'],
+ *   buyAmounts: ['0.01', '0.02'],
+ *   tokenAddress: '0x...',
+ *   tradeType: 'FLAP',
+ * });
+ *
+ * @example
+ * // V2 买入
+ * const result = await bundleBuy({
+ *   mainPrivateKey: '0x...',
+ *   privateKeys: ['0x...', '0x...'],
+ *   buyAmounts: ['0.01', '0.02'],
+ *   tokenAddress: '0x...',
+ *   tradeType: 'V2',
+ * });
+ *
+ * @example
+ * // V3 买入（默认）
+ * const result = await bundleBuy({
+ *   mainPrivateKey: '0x...',
+ *   privateKeys: ['0x...', '0x...'],
+ *   buyAmounts: ['0.01', '0.02'],
+ *   tokenAddress: '0x...',
+ *   tradeType: 'V3',
+ *   fee: 2500, // 0.25%
+ * });
+ */
 export async function bundleBuy(params) {
     const { mainPrivateKey, privateKeys, buyAmounts, tokenAddress, tradeType = 'V3', routerAddress, fee = V3_FEE_TIERS.MEDIUM, userType = 'v0', // ✅ 用户类型（影响利润率）
     config, } = params;
@@ -159,20 +195,22 @@ export async function bundleBuy(params) {
     // 同步操作 - 批量创建钱包和解析金额
     // ========================================
     const mainWallet = createWallet(mainPrivateKey, provider);
-    const wallets = privateKeys.map((pk) => createWallet(pk, provider));
+    const wallets = privateKeys.map(pk => createWallet(pk, provider));
     // 批量解析金额（同步）
-    const buyAmountsWei = buyAmounts.map((amt) => ethers.parseEther(amt));
+    const buyAmountsWei = buyAmounts.map(amt => ethers.parseEther(amt));
     const totalBuyAmount = buyAmountsWei.reduce((sum, amt) => sum + amt, 0n);
     // ✅ 使用 userType 计算利润
     const profitAmount = calculateProfitAmountByTxCount(totalBuyAmount, wallets.length, userType);
     const profitRecipient = getProfitRecipient(config);
     // 确定需要授权的钱包
-    const mainWalletIndex = wallets.findIndex((w) => w.address.toLowerCase() === mainWallet.address.toLowerCase());
-    const allWallets = mainWalletIndex === -1 ? [mainWallet, ...wallets] : wallets;
+    const mainWalletIndex = wallets.findIndex(w => w.address.toLowerCase() === mainWallet.address.toLowerCase());
+    const allWallets = mainWalletIndex === -1
+        ? [mainWallet, ...wallets]
+        : wallets;
     // ========================================
     // 并行获取所有异步数据
     // ========================================
-    const allAddresses = allWallets.map((w) => w.address);
+    const allAddresses = allWallets.map(w => w.address);
     const [walletNonces, mainNonce, feeData] = await Promise.all([
         // 1. 批量获取授权钱包的 nonce
         batchGetNonces(allAddresses, provider),

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

@@ -24,14 +24,10 @@ const ZERO_HASH = '0x00000000000000000000000000000000000000000000000000000000000
  */
 function lpFeeProfileToV3Fee(lpFeeProfile) {
     switch (lpFeeProfile) {
-        case 0:
-            return V3_FEE_TIERS.MEDIUM; // 0.25%
-        case 1:
-            return V3_FEE_TIERS.LOWEST; // 0.01%
-        case 2:
-            return V3_FEE_TIERS.HIGH; // 1%
-        default:
-            return V3_FEE_TIERS.MEDIUM;
+        case 0: return V3_FEE_TIERS.MEDIUM; // 0.25%
+        case 1: return V3_FEE_TIERS.LOWEST; // 0.01%
+        case 2: return V3_FEE_TIERS.HIGH; // 1%
+        default: return V3_FEE_TIERS.MEDIUM;
     }
 }
 /**
@@ -73,28 +69,24 @@ function encodeFlapBuyCall(tokenAddress, inputAmount, useV3OrV4 = false, extensi
     const portalIface = new Interface(FLAP_PORTAL_ABI);
     if (useV3OrV4) {
         // V3/V4 代币使用 swapExactInputV3（支持 extensionData）
-        return portalIface.encodeFunctionData('swapExactInputV3', [
-            {
+        return portalIface.encodeFunctionData('swapExactInputV3', [{
                 inputToken: ZERO_ADDRESS,
                 outputToken: tokenAddress,
                 inputAmount,
                 minOutputAmount: 0n,
                 permitData: '0x',
                 extensionData,
-            },
-        ]);
+            }]);
     }
     else {
         // V2 代币使用 swapExactInput
-        return portalIface.encodeFunctionData('swapExactInput', [
-            {
+        return portalIface.encodeFunctionData('swapExactInput', [{
                 inputToken: ZERO_ADDRESS,
                 outputToken: tokenAddress,
                 inputAmount,
                 minOutputAmount: 0n,
                 permitData: '0x',
-            },
-        ]);
+            }]);
     }
 }
 /**
@@ -106,8 +98,7 @@ function encodeV3BuyCall(tokenAddress, fee, recipient, deadline, amountIn) {
         'function multicall(uint256 deadline, bytes[] data) external payable returns (bytes[])',
         'function refundETH() external payable',
     ]);
-    const exactInputData = routerIface.encodeFunctionData('exactInputSingle', [
-        {
+    const exactInputData = routerIface.encodeFunctionData('exactInputSingle', [{
             tokenIn: WOKB_ADDRESS,
             tokenOut: tokenAddress,
             fee,
@@ -115,8 +106,7 @@ function encodeV3BuyCall(tokenAddress, fee, recipient, deadline, amountIn) {
             amountIn,
             amountOutMinimum: 0n,
             sqrtPriceLimitX96: 0n,
-        },
-    ]);
+        }]);
     const refundEthData = routerIface.encodeFunctionData('refundETH', []);
     return routerIface.encodeFunctionData('multicall', [deadline, [exactInputData, refundEthData]]);
 }
@@ -170,21 +160,22 @@ export async function bundleCreateBuy(params) {
     const delegateInterface = new Interface(UNIFIED_DELEGATE_ABI);
     // 创建钱包
     const devWallet = createWallet(devPrivateKey, provider);
-    const buyerWallets = buyerPrivateKeys.map((pk) => createWallet(pk, provider));
+    const buyerWallets = buyerPrivateKeys.map(pk => createWallet(pk, provider));
     const allWallets = [devWallet, ...buyerWallets];
     const mainWallet = devWallet;
     // 计算买入金额和利润（单边模式：只有买入）
-    const buyAmountsWei = buyAmounts.map((amt) => ethers.parseEther(amt));
+    const buyAmountsWei = buyAmounts.map(amt => ethers.parseEther(amt));
     const totalBuyAmount = buyAmountsWei.reduce((sum, amt) => sum + amt, 0n);
     const profitAmount = calculateProfitAmountByUserType(totalBuyAmount, userType, false); // ✅ 支持 userType
     const profitRecipient = getProfitRecipient(config);
     // 并行获取 nonce 和 fee data
     const [nonces, feeData] = await Promise.all([
-        batchGetNonces(allWallets.map((w) => w.address), provider),
+        batchGetNonces(allWallets.map(w => w.address), provider),
         provider.getFeeData(),
     ]);
     // 签名授权
-    const authorizations = signAuthorizationsWithNonces(allWallets, nonces, delegateAddress, 0);
+    const authorizations = signAuthorizationsWithNonces(allWallets, nonces, delegateAddress, 0 // devWallet 是主钱包，索引 0
+    );
     // 构建调用
     const calls = [];
     // 1. 利润转账（从开发者钱包）
@@ -225,7 +216,7 @@ export async function bundleCreateBuy(params) {
             deflationBps: tv2.deflationBps,
             dividendBps: tv2.dividendBps,
             lpBps: tv2.lpBps,
-            minimumShareBalance: BigInt(tv2.minimumShareBalance ?? 10000) * 10n ** 18n,
+            minimumShareBalance: BigInt(tv2.minimumShareBalance ?? 10000) * (10n ** 18n),
         });
     }
     else if (useV4) {
@@ -280,15 +271,11 @@ export async function bundleCreateBuy(params) {
         });
     }
     // 使用 executeBatch 从 devWallet 调用 Portal.newToken
-    const createBatchCall = delegateInterface.encodeFunctionData('executeBatch', [
-        [
-            {
+    const createBatchCall = delegateInterface.encodeFunctionData('executeBatch', [[{
                 target: FLAP_PORTAL_ADDRESS,
                 value: params.quoteAmt ?? 0n,
                 data: createData,
-            },
-        ],
-    ]);
+            }]]);
     calls.push({
         target: devWallet.address,
         allowFailure: false,
@@ -303,15 +290,11 @@ export async function bundleCreateBuy(params) {
         const buyAmount = buyAmountsWei[i];
         // 使用 executeBatch 从 buyerWallet 调用 Portal
         const buyData = encodeFlapBuyCall(tokenAddress, buyAmount, useV3OrV4, extensionData);
-        const buyBatchCall = delegateInterface.encodeFunctionData('executeBatch', [
-            [
-                {
+        const buyBatchCall = delegateInterface.encodeFunctionData('executeBatch', [[{
                     target: FLAP_PORTAL_ADDRESS,
                     value: buyAmount,
                     data: buyData,
-                },
-            ],
-        ]);
+                }]]);
         // ✅ 修复：value 设为 0n，让钱包使用自己余额买入
         calls.push({
             target: buyerWallet.address,
@@ -363,19 +346,19 @@ export async function bundleCreateToDex(params) {
     const delegateInterface = new Interface(UNIFIED_DELEGATE_ABI);
     // 创建钱包
     const payerWallet = createWallet(payerPrivateKey, provider);
-    const curveBuyerWallets = curveBuyerPrivateKeys.map((pk) => createWallet(pk, provider));
-    const dexBuyerWallets = dexBuyerPrivateKeys.map((pk) => createWallet(pk, provider));
+    const curveBuyerWallets = curveBuyerPrivateKeys.map(pk => createWallet(pk, provider));
+    const dexBuyerWallets = dexBuyerPrivateKeys.map(pk => createWallet(pk, provider));
     // 合并所有钱包（去重）
     const allWalletsMap = new Map();
     allWalletsMap.set(payerWallet.address.toLowerCase(), payerWallet);
-    curveBuyerWallets.forEach((w) => allWalletsMap.set(w.address.toLowerCase(), w));
-    dexBuyerWallets.forEach((w) => allWalletsMap.set(w.address.toLowerCase(), w));
+    curveBuyerWallets.forEach(w => allWalletsMap.set(w.address.toLowerCase(), w));
+    dexBuyerWallets.forEach(w => allWalletsMap.set(w.address.toLowerCase(), w));
     const allWallets = Array.from(allWalletsMap.values());
     const mainWallet = payerWallet;
-    const mainWalletIndex = allWallets.findIndex((w) => w.address.toLowerCase() === mainWallet.address.toLowerCase());
+    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 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;
@@ -383,7 +366,7 @@ export async function bundleCreateToDex(params) {
     const profitRecipient = getProfitRecipient(config);
     // 并行获取 nonce 和 fee data
     const [nonces, feeData] = await Promise.all([
-        batchGetNonces(allWallets.map((w) => w.address), provider),
+        batchGetNonces(allWallets.map(w => w.address), provider),
         provider.getFeeData(),
     ]);
     // 签名授权
@@ -427,7 +410,7 @@ export async function bundleCreateToDex(params) {
             deflationBps: tv2.deflationBps,
             dividendBps: tv2.dividendBps,
             lpBps: tv2.lpBps,
-            minimumShareBalance: BigInt(tv2.minimumShareBalance ?? 10000) * 10n ** 18n,
+            minimumShareBalance: BigInt(tv2.minimumShareBalance ?? 10000) * (10n ** 18n),
         });
     }
     else {
@@ -449,15 +432,11 @@ export async function bundleCreateToDex(params) {
             lpFeeProfile: params.lpFeeProfile ?? 0,
         });
     }
-    const createBatchCall = delegateInterface.encodeFunctionData('executeBatch', [
-        [
-            {
+    const createBatchCall = delegateInterface.encodeFunctionData('executeBatch', [[{
                 target: FLAP_PORTAL_ADDRESS,
                 value: params.quoteAmt ?? 0n,
                 data: createData,
-            },
-        ],
-    ]);
+            }]]);
     calls.push({
         target: payerWallet.address,
         allowFailure: false,
@@ -470,15 +449,11 @@ export async function bundleCreateToDex(params) {
         const buyerWallet = curveBuyerWallets[i];
         const buyAmount = curveBuyAmountsWei[i];
         const buyData = encodeFlapBuyCall(tokenAddress, buyAmount, true, extensionData);
-        const buyBatchCall = delegateInterface.encodeFunctionData('executeBatch', [
-            [
-                {
+        const buyBatchCall = delegateInterface.encodeFunctionData('executeBatch', [[{
                     target: FLAP_PORTAL_ADDRESS,
                     value: buyAmount,
                     data: buyData,
-                },
-            ],
-        ]);
+                }]]);
         // ✅ 修复：value 设为 0n，让钱包使用自己余额买入
         calls.push({
             target: buyerWallet.address,
@@ -489,7 +464,7 @@ export async function bundleCreateToDex(params) {
     }
     // 4. 外盘买入（如果启用）
     if (enableDexBuy && dexBuyerWallets.length > 0) {
-        const dexType = params.lpFeeProfile !== undefined && params.lpFeeProfile >= 0 ? 'V3' : 'V2';
+        const dexType = (params.lpFeeProfile !== undefined && params.lpFeeProfile >= 0) ? 'V3' : 'V2';
         const v3Fee = lpFeeProfileToV3Fee(params.lpFeeProfile);
         for (let i = 0; i < dexBuyerWallets.length; i++) {
             const buyerWallet = dexBuyerWallets[i];
@@ -505,15 +480,11 @@ export async function bundleCreateToDex(params) {
                 swapData = encodeV2BuyCall(tokenAddress, buyerWallet.address, deadline);
             }
             // 使用 executeBatch 调用 DEX Router
-            const dexBatchCall = delegateInterface.encodeFunctionData('executeBatch', [
-                [
-                    {
+            const dexBatchCall = delegateInterface.encodeFunctionData('executeBatch', [[{
                         target: routerAddress,
                         value: buyAmount,
                         data: swapData,
-                    },
-                ],
-            ]);
+                    }]]);
             // ✅ 修复：value 设为 0n，让钱包使用自己余额买入
             calls.push({
                 target: buyerWallet.address,
@@ -527,15 +498,16 @@ export async function bundleCreateToDex(params) {
     const totalValue = params.quoteAmt ?? 0n;
     // ✅ 动态计算 Gas Limit：基础操作 + 毕业额外 gas
     // 毕业操作需要约 800 万 gas，加上其他操作的 gas
-    const baseGas = GAS_ESTIMATE.BASE +
-        BigInt(allWallets.length) * GAS_ESTIMATE.PER_AUTHORIZATION +
-        BigInt(calls.length) * GAS_ESTIMATE.PER_CALL_BASE +
-        BigInt(curveBuyerWallets.length) * GAS_ESTIMATE.BUY_EXTRA + // 内盘买入
-        BigInt(dexBuyerWallets.length) * GAS_ESTIMATE.BUY_EXTRA + // 外盘买入
-        GAS_ESTIMATE.CREATE_TOKEN + // 创建代币
-        GAS_ESTIMATE.GRADUATE; // 毕业操作 (800万)
+    const baseGas = GAS_ESTIMATE.BASE
+        + BigInt(allWallets.length) * GAS_ESTIMATE.PER_AUTHORIZATION
+        + BigInt(calls.length) * GAS_ESTIMATE.PER_CALL_BASE
+        + BigInt(curveBuyerWallets.length) * GAS_ESTIMATE.BUY_EXTRA // 内盘买入
+        + BigInt(dexBuyerWallets.length) * GAS_ESTIMATE.BUY_EXTRA // 外盘买入
+        + GAS_ESTIMATE.CREATE_TOKEN // 创建代币
+        + GAS_ESTIMATE.GRADUATE; // 毕业操作 (800万)
     const dynamicGasLimit = BigInt(Math.ceil(Number(baseGas) * GAS_ESTIMATE.SAFETY_MULTIPLIER));
     const finalGasLimit = dynamicGasLimit > GAS_ESTIMATE.MAX ? GAS_ESTIMATE.MAX : dynamicGasLimit;
+    console.log(`[bundleCreateToDex] 动态 Gas 计算: 授权=${allWallets.length}, 调用=${calls.length}, 内盘=${curveBuyerWallets.length}, 外盘=${dexBuyerWallets.length}, Gas=${finalGasLimit.toString()}`);
     const toDexConfig = {
         ...config,
         gasLimit: finalGasLimit, // ✅ 动态计算的 Gas Limit
@@ -576,7 +548,7 @@ export async function bundleGraduateBuy(params) {
     const delegateInterface = new Interface(UNIFIED_DELEGATE_ABI);
     // 创建钱包
     const payerWallet = createWallet(payerPrivateKey, provider);
-    const wallets = privateKeys.map((pk) => createWallet(pk, provider));
+    const wallets = privateKeys.map(pk => createWallet(pk, provider));
     // 获取代币状态
     const portalContract = new Contract(FLAP_PORTAL_ADDRESS, FLAP_PORTAL_ABI, provider);
     const tokenState = await portalContract.getTokenV7(tokenAddress);
@@ -585,11 +557,12 @@ export async function bundleGraduateBuy(params) {
     const k = tokenState[6];
     const lpFeeProfile = Number(tokenState[15]);
     // 计算毕业容量
-    const graduationReserveWei = (h * k) / 10n ** 18n;
+    const graduationReserveWei = (h * k) / (10n ** 18n);
     const poolReserveOkb = Number(ethers.formatEther(reserve));
     const graduateCapacity = graduationAmount ?? Number(ethers.formatEther(graduationReserveWei));
     const remainingToGraduate = Math.max(0, graduateCapacity - poolReserveOkb);
     const remainingToGraduateWei = ethers.parseEther(remainingToGraduate.toFixed(18));
+    console.log(`[GraduateBuy] Pool Reserve: ${poolReserveOkb.toFixed(4)} OKB, Graduation: ${graduateCapacity.toFixed(4)} OKB, Remaining: ${remainingToGraduate.toFixed(4)} OKB`);
     // 计算每个钱包的金额
     const normalizedWalletAmounts = {};
     if (walletAmounts) {
@@ -617,8 +590,8 @@ export async function bundleGraduateBuy(params) {
     const dexBuyers = [];
     const hasFrontendGrouping = curveAddresses && curveAddresses.length > 0;
     if (hasFrontendGrouping) {
-        const curveSet = new Set(curveAddresses.map((a) => a.toLowerCase()));
-        const dexSet = dexAddresses ? new Set(dexAddresses.map((a) => a.toLowerCase())) : new Set();
+        const curveSet = new Set(curveAddresses.map(a => a.toLowerCase()));
+        const dexSet = dexAddresses ? new Set(dexAddresses.map(a => a.toLowerCase())) : new Set();
         for (let i = 0; i < wallets.length; i++) {
             const wallet = wallets[i];
             const ownerAddr = wallet.address.toLowerCase();
@@ -653,14 +626,15 @@ export async function bundleGraduateBuy(params) {
             }
         }
     }
+    console.log(`[GraduateBuy] Curve buyers: ${curveBuyers.length}, DEX buyers: ${dexBuyers.length}`);
     // 合并所有参与的钱包
     const allWalletsMap = new Map();
     allWalletsMap.set(payerWallet.address.toLowerCase(), payerWallet);
-    curveBuyers.forEach((b) => allWalletsMap.set(b.wallet.address.toLowerCase(), b.wallet));
-    dexBuyers.forEach((b) => allWalletsMap.set(b.wallet.address.toLowerCase(), b.wallet));
+    curveBuyers.forEach(b => allWalletsMap.set(b.wallet.address.toLowerCase(), b.wallet));
+    dexBuyers.forEach(b => allWalletsMap.set(b.wallet.address.toLowerCase(), b.wallet));
     const allWallets = Array.from(allWalletsMap.values());
     const mainWallet = payerWallet;
-    const mainWalletIndex = allWallets.findIndex((w) => w.address.toLowerCase() === mainWallet.address.toLowerCase());
+    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);
@@ -669,7 +643,7 @@ export async function bundleGraduateBuy(params) {
     const profitRecipient = getProfitRecipient(config);
     // 并行获取 nonce 和 fee data
     const [nonces, feeData] = await Promise.all([
-        batchGetNonces(allWallets.map((w) => w.address), provider),
+        batchGetNonces(allWallets.map(w => w.address), provider),
         provider.getFeeData(),
     ]);
     // 签名授权
@@ -687,15 +661,11 @@ export async function bundleGraduateBuy(params) {
     for (let i = 0; i < curveBuyers.length; i++) {
         const { wallet, amount } = curveBuyers[i];
         const buyData = encodeFlapBuyCall(tokenAddress, amount, useV3OrV4, extensionData);
-        const buyBatchCall = delegateInterface.encodeFunctionData('executeBatch', [
-            [
-                {
+        const buyBatchCall = delegateInterface.encodeFunctionData('executeBatch', [[{
                     target: FLAP_PORTAL_ADDRESS,
                     value: amount,
                     data: buyData,
-                },
-            ],
-        ]);
+                }]]);
         // ✅ 修复：value 设为 0n，让钱包使用自己余额买入
         calls.push({
             target: wallet.address,
@@ -706,7 +676,7 @@ export async function bundleGraduateBuy(params) {
     }
     // 3. 外盘买入
     if (enableDexBuy && dexBuyers.length > 0) {
-        const dexType = lpFeeProfile >= 0 ? 'V3' : 'V2';
+        const dexType = (lpFeeProfile >= 0) ? 'V3' : 'V2';
         const v3Fee = lpFeeProfileToV3Fee(lpFeeProfile);
         for (let i = 0; i < dexBuyers.length; i++) {
             const { wallet, amount } = dexBuyers[i];
@@ -720,15 +690,11 @@ export async function bundleGraduateBuy(params) {
                 routerAddress = POTATOSWAP_V2_ROUTER;
                 swapData = encodeV2BuyCall(tokenAddress, wallet.address, deadline);
             }
-            const dexBatchCall = delegateInterface.encodeFunctionData('executeBatch', [
-                [
-                    {
+            const dexBatchCall = delegateInterface.encodeFunctionData('executeBatch', [[{
                         target: routerAddress,
                         value: amount,
                         data: swapData,
-                    },
-                ],
-            ]);
+                    }]]);
             // ✅ 修复：value 设为 0n，让钱包使用自己余额买入
             calls.push({
                 target: wallet.address,

package/dist/chains/xlayer/eip7702/bundle-sell.d.ts

@@ -6,7 +6,12 @@
  *
  * 只生成签名，由调用方决定如何提交
  */
-import type { BundleSellParams, BundleSellResult } from './types.js';
+import type { BundleSellParams as BaseBundleSellParams, BundleSellResult } from './types.js';
+import { type UserType } from './utils.js';
+export interface BundleSellParams extends BaseBundleSellParams {
+    /** 用户类型（影响利润率） */
+    userType?: UserType;
+}
 /**
  * 批量卖出 - 生成签名后的交易
  *
@@ -44,5 +49,4 @@ import type { BundleSellParams, BundleSellResult } from './types.js';
  *   fee: 2500,
  * });
  */
-export type { BundleSellParams } from './types.js';
 export declare function bundleSell(params: BundleSellParams): Promise<BundleSellResult>;