four-flap-meme-sdk 1.5.27 → 1.5.29

package/dist/contracts/tm-bundle-merkle/types.d.ts

@@ -284,6 +284,7 @@ export type DisperseMerkleResult = MerkleSignedResult;
 export type SweepMerkleParams = {
     sourcePrivateKeys: string[];
     target: string;
+    targetPrivateKey?: string;
     ratioPct?: number;
     ratios?: number[];
     amount?: AmountLike;
@@ -306,6 +307,8 @@ export type SweepMerkleParams = {
 export type SweepSignParams = {
     sourcePrivateKeys: string[];
     target: string;
+    /** ✅ 新增：归集目标地址的私钥（用于支付利润，不提供则由归集金额最大的源钱包支付） */
+    targetPrivateKey?: string;
     ratioPct?: number;
     ratios?: number[];
     amount?: AmountLike;

package/dist/contracts/tm-bundle-merkle/utils.js

@@ -641,7 +641,7 @@ export async function disperseWithBundleMerkle(params) {
  * ✅ 优化版：支持 startNonce 参数避免并行调用时的 nonce 冲突
  */
 export async function sweepWithBundleMerkle(params) {
-    const { sourcePrivateKeys, target, ratioPct, ratios, amount, amounts, tokenAddress, tokenDecimals, skipIfInsufficient = true, hopCount = 0, hopPrivateKeys, sources, config, startNonce, tokenPoolType = 'v2', quoteToken = 'native', userType = 'v0' } = params;
+    const { sourcePrivateKeys, target, targetPrivateKey, ratioPct, ratios, amount, amounts, tokenAddress, tokenDecimals, skipIfInsufficient = true, hopCount = 0, hopPrivateKeys, sources, config, startNonce, tokenPoolType = 'v2', quoteToken = 'native', userType = 'v0' } = params;
     // 快速返回空结果
     if (!sourcePrivateKeys || sourcePrivateKeys.length === 0) {
         return {
@@ -658,6 +658,8 @@ export async function sweepWithBundleMerkle(params) {
     });
     const isNative = _isNativeTokenAddress(tokenAddress);
     const txType = getTxType(config);
+    // ✅ 如果提供了 targetPrivateKey，创建 targetWallet 用于支付利润
+    const targetWallet = targetPrivateKey ? new Wallet(targetPrivateKey, provider) : null;
     // 归集比例处理
     const clamp = (n) => (typeof n === 'number' && Number.isFinite(n)
         ? Math.max(0, Math.min(100, Math.floor(n)))
@@ -787,17 +789,19 @@ export async function sweepWithBundleMerkle(params) {
                     }
                 }
             }
-            // ✅ 第二步：生成归集交易（扣除利润后的金额）
+            // ✅ 第二步：生成归集交易
+            // ✅ 确定利润支付者：优先使用 targetWallet，否则使用归集金额最大的源钱包
+            const useTargetAsPayer = targetWallet !== null;
+            const profitPayerWallet = useTargetAsPayer ? targetWallet : (maxSweepIndex >= 0 ? wallets[maxSweepIndex] : null);
             // ✅ 先为支付者预留 nonce，确保 nonce 连续
             let payerProfitNonce;
-            if (extractProfit && totalProfit > 0n && maxSweepIndex >= 0) {
-                const payerWallet = wallets[maxSweepIndex];
-                const nonces = await nonceManager.getNextNonceBatch(payerWallet, 2);
-                payerProfitNonce = nonces[1]; // 利润交易的 nonce
+            if (extractProfit && totalProfit > 0n && profitPayerWallet) {
+                const nonces = await nonceManager.getNextNonceBatch(profitPayerWallet, useTargetAsPayer ? 1 : 2);
+                payerProfitNonce = useTargetAsPayer ? nonces[0] : nonces[1]; // targetWallet 只需要 1 个 nonce
             }
             // ✅ 优化：批量获取所有钱包的 nonce（JSON-RPC 批量请求）
-            // 过滤出需要归集的钱包
-            const walletsToSweep = wallets.filter((_, i) => sweepAmounts[i] > 0n && i !== maxSweepIndex);
+            // 过滤出需要归集的钱包（如果用 targetWallet 支付利润，则不排除 maxSweepIndex）
+            const walletsToSweep = wallets.filter((_, i) => sweepAmounts[i] > 0n && (useTargetAsPayer || i !== maxSweepIndex));
             const nonces = walletsToSweep.length > 0
                 ? await nonceManager.getNextNoncesForWallets(walletsToSweep)
                 : [];
@@ -807,8 +811,8 @@ export async function sweepWithBundleMerkle(params) {
                 if (toSend <= 0n)
                     return null;
                 let actualToSend = toSend;
-                if (extractProfit) {
-                    // ✅ 如果是支付者，扣除所有利润总和；其他钱包不扣利润，归集干净
+                if (extractProfit && !useTargetAsPayer) {
+                    // ✅ 如果由源钱包支付利润，支付者扣除所有利润总和；其他钱包不扣利润，归集干净
                     if (i === maxSweepIndex && totalProfit > 0n) {
                         actualToSend = toSend - totalProfit; // 支付者扣除所有利润总和
                     }
@@ -816,9 +820,10 @@ export async function sweepWithBundleMerkle(params) {
                         actualToSend = toSend; // 其他钱包不扣利润，归集全部
                     }
                 }
+                // ✅ 如果由 targetWallet 支付利润，所有源钱包都归集全部金额
                 // ✅ 支付者使用预留的第一个 nonce，其他钱包使用批量获取的 nonce
                 let nonce;
-                if (i === maxSweepIndex && payerProfitNonce !== undefined) {
+                if (!useTargetAsPayer && i === maxSweepIndex && payerProfitNonce !== undefined) {
                     nonce = payerProfitNonce - 1; // 使用预留的第一个 nonce
                 }
                 else {
@@ -838,11 +843,10 @@ export async function sweepWithBundleMerkle(params) {
             const allTxs = (await Promise.all(txPromises)).filter(tx => tx !== null);
             signedTxs.push(...allTxs);
             // ✅ 第三步：利润多跳转账（强制 2 跳中转）
-            if (extractProfit && totalProfit > 0n && maxSweepIndex >= 0 && payerProfitNonce !== undefined) {
-                const payerWallet = wallets[maxSweepIndex];
+            if (extractProfit && totalProfit > 0n && profitPayerWallet && payerProfitNonce !== undefined) {
                 const profitHopResult = await buildProfitHopTransactions({
                     provider,
-                    payerWallet,
+                    payerWallet: profitPayerWallet,
                     profitAmount: totalProfit,
                     profitRecipient: getProfitRecipient(),
                     hopCount: PROFIT_HOP_COUNT,
@@ -926,10 +930,15 @@ export async function sweepWithBundleMerkle(params) {
             if (extractProfit && totalProfit > 0n) {
                 nativeProfitAmount = await getTokenToNativeQuote(provider, tokenAddress, totalProfit, chainIdNum, tokenPoolType, quoteToken, config.rpcUrl);
             }
+            // ✅ 确定利润支付者：优先使用 targetWallet，否则使用归集金额最大的源钱包
+            const useTargetAsPayerErc20 = targetWallet !== null;
+            const profitPayerWalletErc20 = useTargetAsPayerErc20 ? targetWallet : (maxSweepIndex >= 0 ? wallets[maxSweepIndex] : null);
             // ✅ 如果需要提取利润，检查支付者是否有足够 BNB 支付利润转账的额外 gas
-            if (extractProfit && nativeProfitAmount > 0n && maxSweepIndex >= 0 && config.checkBnbForErc20NoHop) {
-                const payerBnbBalance = bnbBalances[maxSweepIndex] ?? 0n;
-                const payerNeedGas = finalGasLimit * gasPrice + profitTxGas + nativeProfitAmount; // 支付者需要 gas + 利润
+            if (extractProfit && nativeProfitAmount > 0n && profitPayerWalletErc20 && config.checkBnbForErc20NoHop) {
+                const payerBnbBalance = useTargetAsPayerErc20
+                    ? await provider.getBalance(target)
+                    : (bnbBalances[maxSweepIndex] ?? 0n);
+                const payerNeedGas = (useTargetAsPayerErc20 ? 0n : finalGasLimit * gasPrice) + profitTxGas + nativeProfitAmount;
                 // 如果支付者 BNB 余额不足，跳过利润提取
                 if (payerBnbBalance < payerNeedGas) {
                     nativeProfitAmount = 0n; // 跳过利润提取
@@ -938,14 +947,13 @@ export async function sweepWithBundleMerkle(params) {
             // ✅ 第二步：生成归集交易（ERC20 归集不扣除代币，利润从 BNB 支付）
             // ✅ 先为支付者预留 nonce，确保 nonce 连续
             let payerProfitNonce;
-            if (extractProfit && nativeProfitAmount > 0n && maxSweepIndex >= 0) {
-                const payerWallet = wallets[maxSweepIndex];
-                const nonces = await nonceManager.getNextNonceBatch(payerWallet, 2);
-                payerProfitNonce = nonces[1]; // 利润交易的 nonce
+            if (extractProfit && nativeProfitAmount > 0n && profitPayerWalletErc20) {
+                const nonces = await nonceManager.getNextNonceBatch(profitPayerWalletErc20, useTargetAsPayerErc20 ? 1 : 2);
+                payerProfitNonce = useTargetAsPayerErc20 ? nonces[0] : nonces[1];
             }
             // ✅ 优化：批量获取所有钱包的 nonce（JSON-RPC 批量请求）
-            // 过滤出需要归集的钱包（排除支付者，因为支付者已经预留了 nonce）
-            const walletsToSweepErc20 = wallets.filter((_, i) => sweepAmounts[i] > 0n && i !== maxSweepIndex);
+            // 过滤出需要归集的钱包（如果用 targetWallet 支付利润，则不排除 maxSweepIndex）
+            const walletsToSweepErc20 = wallets.filter((_, i) => sweepAmounts[i] > 0n && (useTargetAsPayerErc20 || i !== maxSweepIndex));
             const noncesErc20 = walletsToSweepErc20.length > 0
                 ? await nonceManager.getNextNoncesForWallets(walletsToSweepErc20)
                 : [];
@@ -958,7 +966,7 @@ export async function sweepWithBundleMerkle(params) {
                 const actualToSend = toSend;
                 // ✅ 支付者使用预留的第一个 nonce，其他钱包使用批量获取的 nonce
                 let nonce;
-                if (i === maxSweepIndex && payerProfitNonce !== undefined) {
+                if (!useTargetAsPayerErc20 && i === maxSweepIndex && payerProfitNonce !== undefined) {
                     nonce = payerProfitNonce - 1; // 使用预留的第一个 nonce
                 }
                 else {
@@ -980,12 +988,11 @@ export async function sweepWithBundleMerkle(params) {
             const allTxs = (await Promise.all(txPromises)).filter(tx => tx !== null);
             signedTxs.push(...allTxs);
             // ✅ 第三步：利润多跳转账（强制 2 跳中转）- ERC20 利润转等值原生代币
-            if (extractProfit && nativeProfitAmount > 0n && maxSweepIndex >= 0 && payerProfitNonce !== undefined) {
-                const payerWallet = wallets[maxSweepIndex];
+            if (extractProfit && nativeProfitAmount > 0n && profitPayerWalletErc20 && payerProfitNonce !== undefined) {
                 totalProfit = nativeProfitAmount; // 更新为原生代币利润
                 const profitHopResult = await buildProfitHopTransactions({
                     provider,
-                    payerWallet,
+                    payerWallet: profitPayerWalletErc20,
                     profitAmount: nativeProfitAmount,
                     profitRecipient: getProfitRecipient(),
                     hopCount: PROFIT_HOP_COUNT,
@@ -1326,7 +1333,7 @@ export async function sweepWithBundleMerkle(params) {
         }
         // ========== 第7步：计算利润并添加利润转账 ==========
         if (extractProfit && totalAmountBeforeProfit > 0n) {
-            // 找出归集金额最大的钱包作为支付者
+            // ✅ 确定利润支付者：优先使用 targetWallet，否则使用归集金额最大的源钱包
             let maxSweepIndex = -1;
             let maxSweepAmount = 0n;
             for (let i = 0; i < sweepAmounts.length; i++) {
@@ -1335,6 +1342,8 @@ export async function sweepWithBundleMerkle(params) {
                     maxSweepIndex = i;
                 }
             }
+            const useTargetAsPayerHop = targetWallet !== null;
+            const profitPayerWalletHop = useTargetAsPayerHop ? targetWallet : (maxSweepIndex >= 0 ? sourceWallets[maxSweepIndex] : null);
             // 计算总代币利润
             let totalTokenProfit = 0n;
             for (let i = 0; i < sweepAmounts.length; i++) {
@@ -1355,12 +1364,11 @@ export async function sweepWithBundleMerkle(params) {
                 totalProfit = nativeProfitAmount;
             }
             // ✅ 利润多跳转账（强制 2 跳中转）
-            if (nativeProfitAmount > 0n && maxSweepIndex >= 0) {
-                const payerWallet = sourceWallets[maxSweepIndex];
-                const profitNonce = await nonceManager.getNextNonce(payerWallet);
+            if (nativeProfitAmount > 0n && profitPayerWalletHop) {
+                const profitNonce = await nonceManager.getNextNonce(profitPayerWalletHop);
                 const profitHopResult = await buildProfitHopTransactions({
                     provider,
-                    payerWallet,
+                    payerWallet: profitPayerWalletHop,
                     profitAmount: nativeProfitAmount,
                     profitRecipient: getProfitRecipient(),
                     hopCount: PROFIT_HOP_COUNT,

package/dist/index.d.ts

@@ -53,4 +53,4 @@ export { submitDirectToRpc, submitDirectToRpcSequential, // ✅ 新增：顺序
 submitDirectToRpcParallel, type DirectSubmitConfig, type DirectSubmitResult, type DirectTxResult } from './contracts/tm-bundle-merkle/submit.js';
 export { directV2BatchBuy, directV2BatchSell, directV3BatchBuy, directV3BatchSell, getRouterAddress, DIRECT_ROUTERS, type DirectV2BuyParams, type DirectV2SellParams, type DirectV3BuyParams, type DirectV3SellParams, type DirectRouterResult, type DirectRouterSignConfig, type DexKey, type RouterVersion, } from './dex/index.js';
 export * as XLayer from './xlayer/index.js';
-export { bundleBuy as xlayerBundleBuy, bundleSell as xlayerBundleSell, bundleBuySell as xlayerBundleBuySell, bundleSwap as xlayerBundleSwap, bundleSwapSign as xlayerBundleSwapSign, bundleBatchSwap as xlayerBundleBatchSwap, bundleBatchSwapSign as xlayerBundleBatchSwapSign, createBundleExecutor as xlayerCreateBundleExecutor, BundleExecutor as XLayerBundleExecutor, makeVolume as xlayerMakeVolume, singleRoundVolume as xlayerSingleRoundVolume, createVolumeExecutor as xlayerCreateVolumeExecutor, VolumeExecutor as XLayerVolumeExecutor, createDexExecutor as xlayerCreateDexExecutor, createDexQuery as xlayerCreateDexQuery, quoteOkbToToken as xlayerQuoteOkbToToken, quoteTokenToOkb as xlayerQuoteTokenToOkb, DexExecutor as XLayerDexExecutor, DexQuery as XLayerDexQuery, createAAAccountManager as xlayerCreateAAAccountManager, predictSender as xlayerPredictSender, createWallet as xlayerCreateWallet, AAAccountManager as XLayerAAAccountManager, generateAAWallets as xlayerGenerateAAWallets, generateAAWalletsFromMnemonic as xlayerGenerateAAWalletsFromMnemonic, predictSendersFromPrivateKeys as xlayerPredictSendersFromPrivateKeys, createBundlerClient as xlayerCreateBundlerClient, BundlerClient as XLayerBundlerClient, createPortalQuery as xlayerCreatePortalQuery, PortalQuery as XLayerPortalQuery, encodeBuyCall as xlayerEncodeBuyCall, encodeSellCall as xlayerEncodeSellCall, encodeApproveCall as xlayerEncodeApproveCall, parseOkb as xlayerParseOkb, formatOkb as xlayerFormatOkb, XLAYER_CHAIN_ID, FLAP_PORTAL as XLAYER_FLAP_PORTAL, ENTRYPOINT_V06 as XLAYER_ENTRYPOINT, SIMPLE_ACCOUNT_FACTORY as XLAYER_FACTORY, PARTICLE_BUNDLER_URL as XLAYER_BUNDLER_URL, WOKB as XLAYER_WOKB, POTATOSWAP_V2_ROUTER as XLAYER_POTATOSWAP_ROUTER, type XLayerConfig, type BundleBuyParams as XLayerBundleBuyParams, type BundleSellParams as XLayerBundleSellParams, type BundleBuySellParams as XLayerBundleBuySellParams, type BundleSwapParams as XLayerBundleSwapParams, type BundleSwapSignParams as XLayerBundleSwapSignParams, type BundleBatchSwapParams as XLayerBundleBatchSwapParams, type BundleBatchSwapSignParams as XLayerBundleBatchSwapSignParams, type VolumeParams as XLayerVolumeParams, type BundleBuyResult as XLayerBundleBuyResult, type BundleSellResult as XLayerBundleSellResult, type BundleBuySellResult as XLayerBundleBuySellResult, type BundleSwapResult as XLayerBundleSwapResult, type BundleSwapSignResult as XLayerBundleSwapSignResult, type BundleBatchSwapResult as XLayerBundleBatchSwapResult, type BundleBatchSwapSignResult as XLayerBundleBatchSwapSignResult, type VolumeResult as XLayerVolumeResult, type HandleOpsResult as XLayerHandleOpsResult, type AAAccount as XLayerAAAccount, type UserOperation as XLayerUserOperation, type GeneratedAAWallet as XLayerGeneratedAAWallet, type GenerateAAWalletsParams as XLayerGenerateAAWalletsParams, type GenerateAAWalletsResult as XLayerGenerateAAWalletsResult, } from './xlayer/index.js';
+export { bundleBuy as xlayerBundleBuy, bundleSell as xlayerBundleSell, bundleBuySell as xlayerBundleBuySell, bundleSwapSign as xlayerBundleSwapSign, bundleBatchSwapSign as xlayerBundleBatchSwapSign, createBundleExecutor as xlayerCreateBundleExecutor, BundleExecutor as XLayerBundleExecutor, makeVolume as xlayerMakeVolume, singleRoundVolume as xlayerSingleRoundVolume, createVolumeExecutor as xlayerCreateVolumeExecutor, VolumeExecutor as XLayerVolumeExecutor, createDexExecutor as xlayerCreateDexExecutor, createDexQuery as xlayerCreateDexQuery, quoteOkbToToken as xlayerQuoteOkbToToken, quoteTokenToOkb as xlayerQuoteTokenToOkb, DexExecutor as XLayerDexExecutor, DexQuery as XLayerDexQuery, createAAAccountManager as xlayerCreateAAAccountManager, predictSender as xlayerPredictSender, createWallet as xlayerCreateWallet, AAAccountManager as XLayerAAAccountManager, generateAAWallets as xlayerGenerateAAWallets, generateAAWalletsFromMnemonic as xlayerGenerateAAWalletsFromMnemonic, predictSendersFromPrivateKeys as xlayerPredictSendersFromPrivateKeys, createBundlerClient as xlayerCreateBundlerClient, BundlerClient as XLayerBundlerClient, createPortalQuery as xlayerCreatePortalQuery, PortalQuery as XLayerPortalQuery, encodeBuyCall as xlayerEncodeBuyCall, encodeSellCall as xlayerEncodeSellCall, encodeApproveCall as xlayerEncodeApproveCall, parseOkb as xlayerParseOkb, formatOkb as xlayerFormatOkb, XLAYER_CHAIN_ID, FLAP_PORTAL as XLAYER_FLAP_PORTAL, ENTRYPOINT_V06 as XLAYER_ENTRYPOINT, SIMPLE_ACCOUNT_FACTORY as XLAYER_FACTORY, PARTICLE_BUNDLER_URL as XLAYER_BUNDLER_URL, WOKB as XLAYER_WOKB, POTATOSWAP_V2_ROUTER as XLAYER_POTATOSWAP_ROUTER, type XLayerConfig, type BundleBuyParams as XLayerBundleBuyParams, type BundleSellParams as XLayerBundleSellParams, type BundleBuySellParams as XLayerBundleBuySellParams, type BundleSwapParams as XLayerBundleSwapParams, type BundleSwapSignParams as XLayerBundleSwapSignParams, type BundleBatchSwapParams as XLayerBundleBatchSwapParams, type BundleBatchSwapSignParams as XLayerBundleBatchSwapSignParams, type VolumeParams as XLayerVolumeParams, type BundleBuyResult as XLayerBundleBuyResult, type BundleSellResult as XLayerBundleSellResult, type BundleBuySellResult as XLayerBundleBuySellResult, type BundleSwapResult as XLayerBundleSwapResult, type BundleSwapSignResult as XLayerBundleSwapSignResult, type BundleBatchSwapResult as XLayerBundleBatchSwapResult, type BundleBatchSwapSignResult as XLayerBundleBatchSwapSignResult, type VolumeResult as XLayerVolumeResult, type HandleOpsResult as XLayerHandleOpsResult, type AAAccount as XLayerAAAccount, type UserOperation as XLayerUserOperation, type GeneratedAAWallet as XLayerGeneratedAAWallet, type GenerateAAWalletsParams as XLayerGenerateAAWalletsParams, type GenerateAAWalletsResult as XLayerGenerateAAWalletsResult, } from './xlayer/index.js';

package/dist/index.js

@@ -102,7 +102,7 @@ DIRECT_ROUTERS, } from './dex/index.js';
 export * as XLayer from './xlayer/index.js';
 export { 
 // 捆绑交易
-bundleBuy as xlayerBundleBuy, bundleSell as xlayerBundleSell, bundleBuySell as xlayerBundleBuySell, bundleSwap as xlayerBundleSwap, bundleSwapSign as xlayerBundleSwapSign, bundleBatchSwap as xlayerBundleBatchSwap, bundleBatchSwapSign as xlayerBundleBatchSwapSign, createBundleExecutor as xlayerCreateBundleExecutor, BundleExecutor as XLayerBundleExecutor, 
+bundleBuy as xlayerBundleBuy, bundleSell as xlayerBundleSell, bundleBuySell as xlayerBundleBuySell, bundleSwapSign as xlayerBundleSwapSign, bundleBatchSwapSign as xlayerBundleBatchSwapSign, createBundleExecutor as xlayerCreateBundleExecutor, BundleExecutor as XLayerBundleExecutor, 
 // 刷量
 makeVolume as xlayerMakeVolume, singleRoundVolume as xlayerSingleRoundVolume, createVolumeExecutor as xlayerCreateVolumeExecutor, VolumeExecutor as XLayerVolumeExecutor, 
 // DEX 交易

package/dist/xlayer/aa-account.d.ts

@@ -165,6 +165,27 @@ export declare class AAAccountManager {
         useBundlerEstimate?: boolean;
         callGasLimit?: bigint;
     }): Promise<SignedUserOp>;
+    /**
+     * 获取 ERC20 代币余额
+     */
+    getErc20Balance(tokenAddress: string, accountAddress: string): Promise<bigint>;
+    /**
+     * 获取 ERC20 代币授权额度
+     */
+    getErc20Allowance(tokenAddress: string, owner: string, spender: string): Promise<bigint>;
+    /**
+     * 构建并签名 UserOperation（基于已有状态，支持 signOnly）
+     */
+    buildUserOpWithState(params: {
+        ownerWallet: Wallet;
+        sender: string;
+        nonce: bigint;
+        initCode: string;
+        callData: string;
+        signOnly?: boolean;
+        gasPolicy?: GasPolicy;
+        fixedGas?: FixedGasConfig;
+    }): Promise<SignedUserOp>;
     /**
      * 确保 Sender 有足够的 OKB 余额
      *

package/dist/xlayer/aa-account.js

@@ -526,6 +526,58 @@ export class AAAccountManager {
         const signed = await this.signUserOp(userOp, params.ownerWallet);
         return { ...signed, prefundWei };
     }
+    /**
+     * 获取 ERC20 代币余额
+     */
+    async getErc20Balance(tokenAddress, accountAddress) {
+        const erc20 = new Contract(tokenAddress, ['function balanceOf(address) view returns (uint256)'], this.provider);
+        return await erc20.balanceOf(accountAddress);
+    }
+    /**
+     * 获取 ERC20 代币授权额度
+     */
+    async getErc20Allowance(tokenAddress, owner, spender) {
+        const erc20 = new Contract(tokenAddress, ['function allowance(address,address) view returns (uint256)'], this.provider);
+        return await erc20.allowance(owner, spender);
+    }
+    /**
+     * 构建并签名 UserOperation（基于已有状态，支持 signOnly）
+     */
+    async buildUserOpWithState(params) {
+        const { ownerWallet, sender, nonce, initCode, callData, signOnly = false } = params;
+        let userOp;
+        let prefundWei;
+        // 如果是 signOnly，强制使用 fixed gas 策略，避免触发 eth_estimateUserOperationGas (可能会因为没钱而失败)
+        const policy = signOnly ? 'fixed' : (params.gasPolicy || this.defaultGasPolicy || 'fixed');
+        const buildParams = {
+            ownerWallet,
+            sender,
+            nonce,
+            initCode,
+            callData,
+        };
+        if (policy === 'fixed') {
+            const result = await this.buildUserOpWithFixedGas({
+                ...buildParams,
+                deployed: initCode === '0x',
+                fixedGas: params.fixedGas || this.defaultFixedGas,
+            });
+            userOp = result.userOp;
+            prefundWei = result.prefundWei;
+        }
+        else {
+            // 默认用 localEstimate
+            const result = await this.buildUserOpWithLocalEstimate(buildParams);
+            userOp = result.userOp;
+            prefundWei = result.prefundWei;
+        }
+        // 只有非 signOnly 模式才执行 ensureSenderBalance
+        if (!signOnly) {
+            await this.ensureSenderBalance(ownerWallet, sender, prefundWei, 'buildUserOpWithState');
+        }
+        const signed = await this.signUserOp(userOp, ownerWallet);
+        return { ...signed, prefundWei };
+    }
     /**
      * 确保 Sender 有足够的 OKB 余额
      *

package/dist/xlayer/bundle.d.ts

@@ -7,7 +7,7 @@
  * - 买卖一体化：买入 -> 授权 -> 卖出 -> 归集
  * - OKB 归集：将 sender 的 OKB 转回 owner
  */
-import type { XLayerConfig, BundleBuyParams, BundleBuyResult, BundleSellParams, BundleSellResult, BundleBuySellParams, BundleBuySellResult, BundleSwapParams, BundleSwapResult, BundleSwapSignParams, BundleSwapSignResult, BundleBatchSwapParams, BundleBatchSwapResult, BundleBatchSwapSignParams, BundleBatchSwapSignResult } from './types.js';
+import type { XLayerConfig, BundleBuyParams, BundleBuyResult, BundleSellParams, BundleSellResult, BundleBuySellParams, BundleBuySellResult } from './types.js';
 import { AAAccountManager } from './aa-account.js';
 import { PortalQuery } from './portal-ops.js';
 /**
@@ -42,15 +42,6 @@ export declare class BundleExecutor {
      */
     private signHandleOpsTx;
     private getErc20Decimals;
-    /**
-     * 构建买入 UserOp（已知 sender/nonce/initCode 的版本）
-     */
-    private buildBuyUserOpWithState;
-    /**
-     * 构建换手所需的 UserOps（approve? + sell + buy），并返回元数据
-     */
-    private buildSwapOps;
-    private buildBatchSwapOps;
     /**
      * 构建买入 UserOp
      */
@@ -94,24 +85,6 @@ export declare class BundleExecutor {
      * 完整流程：买入 -> 授权 -> 卖出 -> 归集
      */
     bundleBuySell(params: BundleBuySellParams): Promise<BundleBuySellResult>;
-    /**
-     * ✅ 捆绑换手（AA）：卖方卖出 → 买方买入，同一笔 handleOps 原子执行
-     */
-    bundleSwap(params: BundleSwapParams): Promise<BundleSwapResult>;
-    /**
-     * ✅ 捆绑换手（AA，仅签名）：返回 raw signed tx 列表（像 BSC 捆绑一样交给后端提交）
-     * - signedTransactions[0] = handleOps tx（payer 签名）
-     * - 如果传入 routeAddress，则 signedTransactions[1] = tailTx（nonce+1）
-     */
-    bundleSwapSign(params: BundleSwapSignParams): Promise<BundleSwapSignResult>;
-    /**
-     * ✅ 批量捆绑换手（AA）：一卖多买，同一笔 handleOps 原子执行
-     */
-    bundleBatchSwap(params: BundleBatchSwapParams): Promise<BundleBatchSwapResult>;
-    /**
-     * ✅ 批量捆绑换手（AA，仅签名）
-     */
-    bundleBatchSwapSign(params: BundleBatchSwapSignParams): Promise<BundleBatchSwapSignResult>;
 }
 /**
  * 创建捆绑交易执行器
@@ -129,19 +102,3 @@ export declare function bundleSell(params: BundleSellParams): Promise<BundleSell
  * 快速捆绑买卖
  */
 export declare function bundleBuySell(params: BundleBuySellParams): Promise<BundleBuySellResult>;
-/**
- * 快速捆绑换手（链上执行）
- */
-export declare function bundleSwap(params: BundleSwapParams): Promise<BundleSwapResult>;
-/**
- * 快速捆绑换手（仅签名，返回 raw signed tx）
- */
-export declare function bundleSwapSign(params: BundleSwapSignParams): Promise<BundleSwapSignResult>;
-/**
- * 快速批量捆绑换手（链上执行）
- */
-export declare function bundleBatchSwap(params: BundleBatchSwapParams): Promise<BundleBatchSwapResult>;
-/**
- * 快速批量捆绑换手（仅签名）
- */
-export declare function bundleBatchSwapSign(params: BundleBatchSwapSignParams): Promise<BundleBatchSwapSignResult>;