four-flap-meme-sdk 1.6.9 → 1.6.10

package/dist/index.d.ts

@@ -54,4 +54,4 @@ submitDirectToRpcSequentialNoWait, // ✅ 顺序广播但不等待确认（用
 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, bundleCreateBuySign as xlayerBundleCreateBuySign, bundleCreateToDexSign as xlayerBundleCreateToDexSign, bundleGraduateBuy as xlayerBundleGraduateBuy, bundleSwapSign as xlayerBundleSwapSign, bundleBatchSwapSign as xlayerBundleBatchSwapSign, createBundleExecutor as xlayerCreateBundleExecutor, BundleExecutor as XLayerBundleExecutor, makeVolume as xlayerMakeVolume, singleRoundVolume as xlayerSingleRoundVolume, createVolumeExecutor as xlayerCreateVolumeExecutor, VolumeExecutor as XLayerVolumeExecutor, makeBuyFirstVolume as xlayerMakeBuyFirstVolume, BuyFirstVolumeExecutor as XLayerBuyFirstVolumeExecutor, AAPortalBuyFirstExecutor as XLayerAAPortalBuyFirstExecutor, AADexBuyFirstExecutor as XLayerAADexBuyFirstExecutor, AAVolumeBuyFirstExecutor as XLayerAAVolumeBuyFirstExecutor, createAAVolumeBuyFirstExecutor as xlayerCreateAAVolumeBuyFirstExecutor, type VolumeBuyFirstParams as XLayerVolumeBuyFirstParams, type VolumeBuyFirstResult as XLayerVolumeBuyFirstResult, type VolumeContinuousParams as XLayerVolumeContinuousParams, type VolumeContinuousResult as XLayerVolumeContinuousResult, type VolumeProgress as XLayerVolumeProgress, createDexExecutor as xlayerCreateDexExecutor, createDexQuery as xlayerCreateDexQuery, quoteOkbToToken as xlayerQuoteOkbToToken, quoteTokenToOkb as xlayerQuoteTokenToOkb, DexExecutor as XLayerDexExecutor, DexQuery as XLayerDexQuery, buildDexBatchBuyOps, buildDexBatchBuyOpsV3, type DexBatchBuyParams, type DexBatchBuyV3Params, type DexBatchBuyResult, buildDexBatchSellOps, buildDexBatchSellOpsV3, type DexBatchSellParams, type DexBatchSellV3Params, type DexBatchSellResult, buildDisperseFromSingleOwnerOpsWithProfit, buildTransfersWithProfit, 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 BundleCreateBuySignParams as XLayerBundleCreateBuySignParams, type BundleCreateBuySignResult as XLayerBundleCreateBuySignResult, type BundleCreateToDexSignParams as XLayerBundleCreateToDexSignParams, type BundleCreateToDexSignResult as XLayerBundleCreateToDexSignResult, type BundleGraduateBuyParams as XLayerBundleGraduateBuyParams, type BundleGraduateBuyResult as XLayerBundleGraduateBuyResult, type BundleSwapResult as XLayerBundleSwapResult, type BundleSwapSignResult as XLayerBundleSwapSignResult, type BundleBatchSwapResult as XLayerBundleBatchSwapResult, type BundleBatchSwapSignResult as XLayerBundleBatchSwapSignResult, type VolumeResult as XLayerVolumeResult, type BuyFirstParams as XLayerBuyFirstParams, type BuyFirstResult as XLayerBuyFirstResult, type BuyFirstVolumeParams as XLayerBuyFirstVolumeParams, type BuyFirstVolumeResult as XLayerBuyFirstVolumeResult, 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, bundleCreateBuySign as xlayerBundleCreateBuySign, bundleCreateToDexSign as xlayerBundleCreateToDexSign, bundleGraduateBuy as xlayerBundleGraduateBuy, bundleSwapSign as xlayerBundleSwapSign, bundleBatchSwapSign as xlayerBundleBatchSwapSign, createBundleExecutor as xlayerCreateBundleExecutor, BundleExecutor as XLayerBundleExecutor, makeVolume as xlayerMakeVolume, singleRoundVolume as xlayerSingleRoundVolume, createVolumeExecutor as xlayerCreateVolumeExecutor, VolumeExecutor as XLayerVolumeExecutor, makeBuyFirstVolume as xlayerMakeBuyFirstVolume, BuyFirstVolumeExecutor as XLayerBuyFirstVolumeExecutor, AAPortalBuyFirstExecutor as XLayerAAPortalBuyFirstExecutor, AADexBuyFirstExecutor as XLayerAADexBuyFirstExecutor, AAVolumeBuyFirstExecutor as XLayerAAVolumeBuyFirstExecutor, createAAVolumeBuyFirstExecutor as xlayerCreateAAVolumeBuyFirstExecutor, type VolumeBuyFirstParams as XLayerVolumeBuyFirstParams, type VolumeBuyFirstResult as XLayerVolumeBuyFirstResult, type VolumeContinuousParams as XLayerVolumeContinuousParams, type VolumeContinuousResult as XLayerVolumeContinuousResult, type VolumeProgress as XLayerVolumeProgress, createDexExecutor as xlayerCreateDexExecutor, createDexQuery as xlayerCreateDexQuery, quoteOkbToToken as xlayerQuoteOkbToToken, quoteTokenToOkb as xlayerQuoteTokenToOkb, DexExecutor as XLayerDexExecutor, DexQuery as XLayerDexQuery, buildDexBatchBuyOps, buildDexBatchBuyOpsV3, type DexBatchBuyParams, type DexBatchBuyV3Params, type DexBatchBuyResult, buildDexBatchSellOps, buildDexBatchSellOpsV3, type DexBatchSellParams, type DexBatchSellV3Params, type DexBatchSellResult, 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 BundleCreateBuySignParams as XLayerBundleCreateBuySignParams, type BundleCreateBuySignResult as XLayerBundleCreateBuySignResult, type BundleCreateToDexSignParams as XLayerBundleCreateToDexSignParams, type BundleCreateToDexSignResult as XLayerBundleCreateToDexSignResult, type BundleGraduateBuyParams as XLayerBundleGraduateBuyParams, type BundleGraduateBuyResult as XLayerBundleGraduateBuyResult, type BundleSwapResult as XLayerBundleSwapResult, type BundleSwapSignResult as XLayerBundleSwapSignResult, type BundleBatchSwapResult as XLayerBundleBatchSwapResult, type BundleBatchSwapSignResult as XLayerBundleBatchSwapSignResult, type VolumeResult as XLayerVolumeResult, type BuyFirstParams as XLayerBuyFirstParams, type BuyFirstResult as XLayerBuyFirstResult, type BuyFirstVolumeParams as XLayerBuyFirstVolumeParams, type BuyFirstVolumeResult as XLayerBuyFirstVolumeResult, 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

@@ -116,8 +116,6 @@ createDexExecutor as xlayerCreateDexExecutor, createDexQuery as xlayerCreateDexQ
 buildDexBatchBuyOps, buildDexBatchBuyOpsV3, 
 // ✅ AA 批量卖出（安全版：利润配置硬编码在 SDK 内部）
 buildDexBatchSellOps, buildDexBatchSellOpsV3, 
-// ✅ AA 分发/归集（安全版：利润配置硬编码在 SDK 内部）
-buildDisperseFromSingleOwnerOpsWithProfit, buildTransfersWithProfit, 
 // AA 账户管理
 createAAAccountManager as xlayerCreateAAAccountManager, predictSender as xlayerPredictSender, createWallet as xlayerCreateWallet, AAAccountManager as XLayerAAAccountManager, 
 // 批量生成钱包工具

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

@@ -36,15 +36,9 @@ export declare class AAAccountManager {
     private deployedSenderSet;
     private feeDataCache?;
     private readonly feeDataCacheTtlMs;
-    private entryPointSynced;
     private defaultGasPolicy?;
     private defaultFixedGas?;
     constructor(config?: XLayerConfig);
-    /**
-     * ✅ 同步 EntryPoint（带缓存，避免重复 RPC 调用）
-     *
-     * 优化：EntryPoint 地址在运行期间几乎不会变化，只需同步一次
-     */
     private syncEntryPointIfNeeded;
     /**
      * 获取 Provider

package/dist/xlayer/aa-account.js

@@ -29,8 +29,6 @@ export class AAAccountManager {
         // PERF: 本文件的改造会尽量减少逐地址 RPC 调用
         this.deployedSenderSet = new Set(); // key: senderLower（只缓存 deployed=true）
         this.feeDataCacheTtlMs = 1200;
-        // ✅ 优化：缓存 EntryPoint 同步状态，避免重复 RPC 调用
-        this.entryPointSynced = false;
         this.chainId = config.chainId ?? XLAYER_CHAIN_ID;
         const rpcUrl = config.rpcUrl ?? DEFAULT_RPC_URL;
         this.rpcUrl = rpcUrl;
@@ -57,15 +55,7 @@ export class AAAccountManager {
             timeoutMs: config.timeoutMs,
         });
     }
-    /**
-     * ✅ 同步 EntryPoint（带缓存，避免重复 RPC 调用）
-     *
-     * 优化：EntryPoint 地址在运行期间几乎不会变化，只需同步一次
-     */
     async syncEntryPointIfNeeded() {
-        // ✅ 如果已同步过，直接返回（避免重复 RPC 调用）
-        if (this.entryPointSynced)
-            return;
         try {
             const eps = await this.bundler.getSupportedEntryPoints();
             if (Array.isArray(eps) && eps.length > 0) {
@@ -76,8 +66,6 @@ export class AAAccountManager {
                     this.bundler.setEntryPoint(this.entryPointAddress);
                 }
             }
-            // ✅ 标记为已同步
-            this.entryPointSynced = true;
         }
         catch { }
     }

package/dist/xlayer/dex-aa-sell.js

@@ -12,7 +12,7 @@
  */
 import { ethers } from 'ethers';
 import { PROFIT_CONFIG } from '../utils/constants.js';
-import { WOKB as XLAYER_WOKB, POTATOSWAP_V3_FACTORY } from './constants.js';
+import { WOKB as XLAYER_WOKB } from './constants.js';
 import { createAAAccountManager, createWallet, encodeExecute } from './aa-account.js';
 import { DexQuery, encodeSwapExactTokensForETH } from './dex.js';
 import { PortalQuery } from './portal-ops.js';
@@ -22,65 +22,13 @@ const V3_ROUTER02_SELL_ABI = [
     'function multicall(uint256 deadline, bytes[] data) external payable returns (bytes[] results)',
     'function unwrapWETH9(uint256 amountMinimum, address recipient) external payable',
 ];
-// ============================================================================
-// V3 Slot0 报价（用于 XLayer 没有 V3 Quoter 的情况）
-// ============================================================================
-const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000';
-const V3_FACTORY_ABI = [
-    'function getPool(address tokenA, address tokenB, uint24 fee) view returns (address pool)',
-];
-const V3_POOL_ABI = [
-    'function token0() view returns (address)',
-    'function token1() view returns (address)',
-    'function slot0() view returns (uint160 sqrtPriceX96,int24 tick,uint16 observationIndex,uint16 observationCardinality,uint16 observationCardinalityNext,uint8 feeProtocol,bool unlocked)',
-];
-async function quoteV3ViaSlot0(params) {
-    const { provider, tokenIn, amountIn, fee } = params;
-    if (amountIn <= 0n)
-        return 0n;
-    const wokbLower = XLAYER_WOKB.toLowerCase();
-    const tokenInLower = tokenIn.toLowerCase();
-    if (tokenInLower === wokbLower)
-        return amountIn;
-    const factory = new ethers.Contract(POTATOSWAP_V3_FACTORY, V3_FACTORY_ABI, provider);
-    const poolAddr = await factory.getPool(tokenIn, XLAYER_WOKB, fee);
-    if (!poolAddr || poolAddr.toLowerCase() === ZERO_ADDRESS.toLowerCase())
-        return 0n;
-    const pool = new ethers.Contract(poolAddr, V3_POOL_ABI, provider);
-    const [t0, t1, slot0] = await Promise.all([pool.token0(), pool.token1(), pool.slot0()]);
-    if (!t0 || !t1 || !slot0)
-        return 0n;
-    const sqrtPriceX96 = BigInt(slot0[0]);
-    if (sqrtPriceX96 <= 0n)
-        return 0n;
-    const Q96 = 2n ** 96n;
-    const priceX192 = sqrtPriceX96 * sqrtPriceX96; // Q192
-    const t0Lower = String(t0).toLowerCase();
-    const t1Lower = String(t1).toLowerCase();
-    let out;
-    if (t0Lower === tokenInLower && t1Lower === wokbLower) {
-        // price = token1/token0
-        out = (amountIn * priceX192) / (Q96 * Q96);
-    }
-    else if (t0Lower === wokbLower && t1Lower === tokenInLower) {
-        // price = token0/token1 => out = amountIn / (token1/token0)
-        out = (amountIn * (Q96 * Q96)) / priceX192;
-    }
-    else {
-        return 0n;
-    }
-    return out > 0n ? out : 0n;
-}
 function encodeExactInputSingleForV3Sell(params) {
     const iface = new ethers.Interface(V3_ROUTER02_SELL_ABI);
-    // ✅ 修复：address(2) 需要用完整的地址格式，而不是 bigint
-    // V3 Router 使用 address(2) 表示将 WETH 发送到 Router 自己，然后通过 unwrapWETH9 转回原生币
-    const ADDRESS_THIS = '0x0000000000000000000000000000000000000002';
     const exactInputSingleData = iface.encodeFunctionData('exactInputSingle', [{
             tokenIn: params.tokenIn,
             tokenOut: params.tokenOut,
             fee: params.fee,
-            recipient: ADDRESS_THIS, // Router 自己（需要 unwrap）
+            recipient: 2n, // address(2) = Router 自己（需要 unwrap）
             amountIn: params.amountIn,
             amountOutMinimum: params.amountOutMinimum,
             sqrtPriceLimitX96: 0n,
@@ -167,36 +115,32 @@ export async function buildDexBatchSellOps(params) {
         ? new Map()
         : await portalQuery.getMultipleAllowances(params.tokenAddress, senders, router);
     // ✅ 预估卖出输出，计算利润
-    // ⚡ 性能优化：先计算所有卖出金额，然后只调用一次报价（使用总量报价）
-    const sellWeis = params.sellAmounts.map((amtStr) => {
-        const str = String(amtStr || '0').trim();
-        if (!str || str === '0')
-            return 0n;
-        return ethers.parseUnits(str, dec);
-    });
-    const totalSellWei = sellWeis.reduce((sum, w) => sum + w, 0n);
-    // ⚡ 只调用一次报价（避免 N 次串行 RPC 调用）
+    const sellWeis = [];
+    const estimatedOkbOuts = [];
     let totalEstimatedOkbOut = 0n;
-    if (totalSellWei > 0n) {
+    for (let i = 0; i < params.sellAmounts.length; i++) {
+        const amtStr = String(params.sellAmounts[i] || '0').trim();
+        if (!amtStr || amtStr === '0') {
+            sellWeis.push(0n);
+            estimatedOkbOuts.push(0n);
+            continue;
+        }
+        const sellWei = ethers.parseUnits(amtStr, dec);
+        sellWeis.push(sellWei);
+        // 预估卖出输出
         try {
-            totalEstimatedOkbOut = await dexQuery.quoteTokenToOkb(totalSellWei, params.tokenAddress);
+            const estimatedOut = await dexQuery.quoteTokenToOkb(sellWei, params.tokenAddress);
+            estimatedOkbOuts.push(estimatedOut);
+            totalEstimatedOkbOut += estimatedOut;
         }
         catch {
-            totalEstimatedOkbOut = 0n;
+            estimatedOkbOuts.push(0n);
         }
     }
-    // ✅ 按卖出份额拆分预估输出与利润：每个卖出钱包自己转利润（更稳）
-    const estimatedOutByWallet = sellWeis.map((w) => {
-        if (w <= 0n || totalSellWei <= 0n || totalEstimatedOkbOut <= 0n)
-            return 0n;
-        return (totalEstimatedOkbOut * w) / totalSellWei;
-    });
-    const profitWeiByWallet = estimatedOutByWallet.map((out) => {
-        if (out <= 0n)
-            return 0n;
-        return (out * BigInt(profitBps)) / 10000n;
-    });
-    const totalProfitWei = profitWeiByWallet.reduce((a, b) => a + b, 0n);
+    // ✅ 计算总利润
+    const totalProfitWei = totalEstimatedOkbOut > 0n
+        ? (totalEstimatedOkbOut * BigInt(profitBps)) / 10000n
+        : 0n;
     const unsignedOps = [];
     const opOwnerIndex = [];
     for (let i = 0; i < ownerWallets.length; i++) {
@@ -245,23 +189,35 @@ export async function buildDexBatchSellOps(params) {
         });
         unsignedOps.push(builtSell.userOp);
         opOwnerIndex.push(i);
-        // ✅ 利润转账：由当前卖出钱包发起（卖出后到账，再转利润）
-        const profitWei = profitWeiByWallet[i] ?? 0n;
-        if (profitWei > 0n) {
-            const profitCallData = encodeExecute(profitRecipient, profitWei, '0x');
-            const nonce3 = nextNonce(sender, BigInt(ai?.nonce ?? 0n));
-            const initCode3 = consumeInitCode(sender, !!ai?.deployed, w.address);
-            const builtProfit = await aaManager.buildUserOpWithFixedGas({
-                ownerWallet: w,
-                sender,
+    }
+    // ✅ 添加利润转账 UserOp（使用第一个有卖出的钱包）
+    if (totalProfitWei > 0n && ownerWallets.length > 0) {
+        // 找到第一个有卖出的钱包
+        let profitSenderIndex = 0;
+        for (let i = 0; i < sellWeis.length; i++) {
+            if (sellWeis[i] > 0n) {
+                profitSenderIndex = i;
+                break;
+            }
+        }
+        const profitSender = senders[profitSenderIndex] || '';
+        const profitOwner = ownerWallets[profitSenderIndex];
+        const profitAi = accountInfos[profitSenderIndex];
+        if (profitSender && profitOwner) {
+            const profitCallData = encodeExecute(profitRecipient, totalProfitWei, '0x');
+            const profitNonce = nextNonce(profitSender, BigInt(profitAi?.nonce ?? 0n));
+            const profitInitCode = consumeInitCode(profitSender, !!profitAi?.deployed, profitOwner.address);
+            const profitBuilt = await aaManager.buildUserOpWithFixedGas({
+                ownerWallet: profitOwner,
+                sender: profitSender,
                 callData: profitCallData,
-                nonce: nonce3,
-                initCode: initCode3,
-                deployed: initCode3 === '0x',
+                nonce: profitNonce,
+                initCode: profitInitCode,
+                deployed: profitInitCode === '0x',
                 fixedGas: { callGasLimit: 120000n },
             });
-            unsignedOps.push(builtProfit.userOp);
-            opOwnerIndex.push(i);
+            unsignedOps.push(profitBuilt.userOp);
+            opOwnerIndex.push(profitSenderIndex);
         }
     }
     // 签名
@@ -301,7 +257,6 @@ export async function buildDexBatchSellOpsV3(params) {
     const profitBps = PROFIT_CONFIG.RATE_BPS; // 40 bps = 0.4%
     const profitRecipient = PROFIT_CONFIG.RECIPIENT;
     const aaManager = createAAAccountManager(config);
-    const provider = aaManager.getProvider();
     const dexQuery = new DexQuery(config);
     const portalQuery = new PortalQuery({ rpcUrl: config.rpcUrl, chainId: config.chainId });
     const ownerWallets = params.ownerPrivateKeys.map((pk) => createWallet(String(pk), config));
@@ -345,50 +300,32 @@ export async function buildDexBatchSellOpsV3(params) {
         ? new Map()
         : await portalQuery.getMultipleAllowances(params.tokenAddress, senders, router);
     // ✅ 预估卖出输出，计算利润
-    // ⚡ 性能优化：先计算所有卖出金额，然后只调用一次报价（使用总量报价）
-    const sellWeis = params.sellAmounts.map((amtStr) => {
-        const str = String(amtStr || '0').trim();
-        if (!str || str === '0')
-            return 0n;
-        return ethers.parseUnits(str, dec);
-    });
-    const totalSellWei = sellWeis.reduce((sum, w) => sum + w, 0n);
-    // ⚡ 只调用一次报价（避免 N 次串行 RPC 调用）
-    // ✅ 优先用 V3 slot0 报价，失败再回退 V2 getAmountsOut
+    const sellWeis = [];
+    const estimatedOkbOuts = [];
     let totalEstimatedOkbOut = 0n;
-    if (totalSellWei > 0n) {
+    for (let i = 0; i < params.sellAmounts.length; i++) {
+        const amtStr = String(params.sellAmounts[i] || '0').trim();
+        if (!amtStr || amtStr === '0') {
+            sellWeis.push(0n);
+            estimatedOkbOuts.push(0n);
+            continue;
+        }
+        const sellWei = ethers.parseUnits(amtStr, dec);
+        sellWeis.push(sellWei);
+        // 预估卖出输出（使用 V2 报价作为估算，因为 V3 报价需要额外逻辑）
         try {
-            totalEstimatedOkbOut = await quoteV3ViaSlot0({
-                provider,
-                tokenIn: params.tokenAddress,
-                amountIn: totalSellWei,
-                fee,
-            });
+            const estimatedOut = await dexQuery.quoteTokenToOkb(sellWei, params.tokenAddress);
+            estimatedOkbOuts.push(estimatedOut);
+            totalEstimatedOkbOut += estimatedOut;
         }
         catch {
-            totalEstimatedOkbOut = 0n;
-        }
-        if (totalEstimatedOkbOut <= 0n) {
-            try {
-                totalEstimatedOkbOut = await dexQuery.quoteTokenToOkb(totalSellWei, params.tokenAddress);
-            }
-            catch {
-                totalEstimatedOkbOut = 0n;
-            }
+            estimatedOkbOuts.push(0n);
         }
     }
-    // ✅ 计算总利润（按卖出份额分摊到每个钱包）
-    const estimatedOutByWallet = sellWeis.map((w) => {
-        if (w <= 0n || totalSellWei <= 0n || totalEstimatedOkbOut <= 0n)
-            return 0n;
-        return (totalEstimatedOkbOut * w) / totalSellWei;
-    });
-    const profitWeiByWallet = estimatedOutByWallet.map((out) => {
-        if (out <= 0n)
-            return 0n;
-        return (out * BigInt(profitBps)) / 10000n;
-    });
-    const totalProfitWei = profitWeiByWallet.reduce((a, b) => a + b, 0n);
+    // ✅ 计算总利润
+    const totalProfitWei = totalEstimatedOkbOut > 0n
+        ? (totalEstimatedOkbOut * BigInt(profitBps)) / 10000n
+        : 0n;
     const unsignedOps = [];
     const opOwnerIndex = [];
     for (let i = 0; i < ownerWallets.length; i++) {
@@ -444,23 +381,35 @@ export async function buildDexBatchSellOpsV3(params) {
         });
         unsignedOps.push(builtSell.userOp);
         opOwnerIndex.push(i);
-        // ✅ 利润转账：由当前卖出钱包发起
-        const profitWei = profitWeiByWallet[i] ?? 0n;
-        if (profitWei > 0n) {
-            const profitCallData = encodeExecute(profitRecipient, profitWei, '0x');
-            const nonce3 = nextNonce(sender, BigInt(ai?.nonce ?? 0n));
-            const initCode3 = consumeInitCode(sender, !!ai?.deployed, w.address);
-            const builtProfit = await aaManager.buildUserOpWithFixedGas({
-                ownerWallet: w,
-                sender,
+    }
+    // ✅ 添加利润转账 UserOp（使用第一个有卖出的钱包）
+    if (totalProfitWei > 0n && ownerWallets.length > 0) {
+        // 找到第一个有卖出的钱包
+        let profitSenderIndex = 0;
+        for (let i = 0; i < sellWeis.length; i++) {
+            if (sellWeis[i] > 0n) {
+                profitSenderIndex = i;
+                break;
+            }
+        }
+        const profitSender = senders[profitSenderIndex] || '';
+        const profitOwner = ownerWallets[profitSenderIndex];
+        const profitAi = accountInfos[profitSenderIndex];
+        if (profitSender && profitOwner) {
+            const profitCallData = encodeExecute(profitRecipient, totalProfitWei, '0x');
+            const profitNonce = nextNonce(profitSender, BigInt(profitAi?.nonce ?? 0n));
+            const profitInitCode = consumeInitCode(profitSender, !!profitAi?.deployed, profitOwner.address);
+            const profitBuilt = await aaManager.buildUserOpWithFixedGas({
+                ownerWallet: profitOwner,
+                sender: profitSender,
                 callData: profitCallData,
-                nonce: nonce3,
-                initCode: initCode3,
-                deployed: initCode3 === '0x',
+                nonce: profitNonce,
+                initCode: profitInitCode,
+                deployed: profitInitCode === '0x',
                 fixedGas: { callGasLimit: 120000n },
             });
-            unsignedOps.push(builtProfit.userOp);
-            opOwnerIndex.push(i);
+            unsignedOps.push(profitBuilt.userOp);
+            opOwnerIndex.push(profitSenderIndex);
         }
     }
     // 签名

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

@@ -411,7 +411,8 @@ export class AADexSwapExecutor {
      * ✅ 支持 ERC20 稳定币（USDT/USDC/USDT0）
      */
     async bundleBatchSwapSign(params) {
-        const { dexKey, routerAddress: routerAddressIn, tokenAddress, sellerPrivateKey, buyerPrivateKeys, buyAmountsOkb, sellAmount, sellPercent = 100, disperseHopCount: disperseHopCountIn, payerPrivateKey, beneficiary: beneficiaryIn, payerStartNonce, routeAddress, skipApprovalCheck = false, tradeType, lpFeeProfile = 0, quoteToken, quoteTokenDecimals = 6, // XLayer USDT/USDC/USDT0 都是 6 位精度
+        const { dexKey, routerAddress: routerAddressIn, tokenAddress, sellerPrivateKey, buyerPrivateKeys, buyAmountsOkb, sellAmount, sellPercent = 100, capitalMode = true, // ✅ 默认资金利用率模式（卖出→分发→买入）
+        disperseHopCount: disperseHopCountIn, payerPrivateKey, beneficiary: beneficiaryIn, payerStartNonce, routeAddress, skipApprovalCheck = false, tradeType, lpFeeProfile = 0, quoteToken, quoteTokenDecimals = 6, // XLayer USDT/USDC/USDT0 都是 6 位精度
          } = params;
         const effectiveConfig = { ...(this.config ?? {}), ...(params.config ?? {}) };
         const { extractProfit, profitBps, profitRecipient } = resolveProfitSettings(effectiveConfig);
@@ -547,7 +548,8 @@ export class AADexSwapExecutor {
         const profitCap = quotedSellOutWei > totalBuyWei ? (quotedSellOutWei - totalBuyWei) : 0n;
         const profitWei = profitWeiRaw > profitCap ? profitCap : profitWeiRaw;
         // ✅ 利润在分发阶段通过 AA 内部刮取
-        // ✅ 卖出所得资金分发给多个买方 AA(Sender)（支持多跳）+ 利润刮取
+        // ✅ 资金分发逻辑（仅 capitalMode=true 时执行，对应 BSC flapQuickBatchSwapMerkle）
+        // capitalMode=false 时跳过分发，买方用自己的 OKB（对应 BSC flapBatchSwapMerkle）
         // 原生代币模式：使用 Multicall3 批量转账
         // ERC20 模式：使用 ERC20 transfer 批量转账
         const buyerSenders = buyerAis.map(ai => ai.sender);
@@ -555,7 +557,7 @@ export class AADexSwapExecutor {
         const hopCount = Math.min(hopCountRaw, buyerSenders.length);
         const maxPerOp = Math.max(1, Math.floor(Number(effectiveConfig.maxTransfersPerUserOpNative ?? 30)));
         const erc20Iface = new ethers.Interface(['function transfer(address to, uint256 amount) returns (bool)']);
-        if (buyerSenders.length > 0 && totalBuyWei > 0n) {
+        if (capitalMode && buyerSenders.length > 0 && totalBuyWei > 0n) {
             if (hopCount <= 0) {
                 // ✅ 直接分发模式：将利润接收者加入分发列表（AA 内部刮取）
                 const items = buyerSenders.map((to, i) => ({ to, value: buyAmountsWei[i] ?? 0n })).filter(x => x.value > 0n);
@@ -689,6 +691,26 @@ export class AADexSwapExecutor {
                 }
             }
         }
+        else if (!capitalMode && extractProfit && profitWei > 0n) {
+            // ✅ capitalMode=false（买方自带资金）：利润从 seller AA Sender 直接转账到利润地址（无多跳）
+            let profitCallData;
+            if (useNativeToken) {
+                profitCallData = encodeExecute(profitRecipient, profitWei, '0x');
+            }
+            else {
+                const transferData = erc20Iface.encodeFunctionData('transfer', [profitRecipient, profitWei]);
+                profitCallData = encodeExecute(quoteToken, 0n, transferData);
+            }
+            const signedProfitTransfer = await this.aaManager.buildUserOpWithState({
+                ownerWallet: sellerOwner,
+                sender: sellerAi.sender,
+                nonce: nonceMap.next(sellerAi.sender),
+                initCode: consumeInitCode(sellerAi.sender),
+                callData: profitCallData,
+                signOnly: true,
+            });
+            outOps.push(signedProfitTransfer.userOp);
+        }
         // Batch Buy ops（分发后再执行）- ✅ 支持 V2/V3，支持 ERC20 稳定币
         for (let i = 0; i < buyerOwners.length; i++) {
             const ai = buyerAis[i];
@@ -736,7 +758,7 @@ export class AADexSwapExecutor {
             beneficiary,
             nonce: payerStartNonce,
         });
-        // ✅ 利润已在 AA 内部通过分发阶段刮取，不需要 Tail Tx
+        // ✅ 利润已在 AA 内部刮取（capitalMode=true 在分发阶段；capitalMode=false 单独转账），不需要 Tail Tx
         const signedTransactions = [signedHandleOps];
         return {
             signedTransactions,
@@ -756,7 +778,7 @@ export class AADexSwapExecutor {
                 profitRecipient,
                 profitWei: profitWei.toString(),
                 quotedSellOutWei: quotedSellOutWei.toString(),
-                disperseHopCount: String(hopCount),
+                disperseHopCount: capitalMode ? String(hopCount) : '0', // ✅ capitalMode=false 时无分发
             },
         };
     }

package/dist/xlayer/index.d.ts

@@ -87,7 +87,6 @@ export { DexVolumeExecutor, createDexVolumeExecutor, makeDexVolume, type DexVolu
 export { DexQuery, DexExecutor, createDexQuery, createDexExecutor, quoteOkbToToken, quoteTokenToOkb, encodeSwapExactETHForTokens, encodeSwapExactTokensForETH, encodeSwapExactTokensForTokens, encodeSwapExactETHForTokensSupportingFee, encodeSwapExactTokensForETHSupportingFee, encodeSwapExactTokensForTokensSupportingFee, type DexConfig, } from './dex.js';
 export { buildDexBatchBuyOps, buildDexBatchBuyOpsV3, type DexBatchBuyParams, type DexBatchBuyV3Params, type DexBatchBuyResult, } from './dex-aa-buy.js';
 export { buildDexBatchSellOps, buildDexBatchSellOpsV3, type DexBatchSellParams, type DexBatchSellV3Params, type DexBatchSellResult, } from './dex-aa-sell.js';
-export { buildDisperseFromSingleOwnerOpsWithProfit, buildTransfersWithProfit, } from './aa-transfer-profit.js';
 export declare const xlayer: {
     bundleBuy: (params: import("./types.js").BundleBuyParams) => Promise<import("./types.js").BundleBuyResult>;
     bundleSell: (params: import("./types.js").BundleSellParams) => Promise<import("./types.js").BundleSellResult>;

package/dist/xlayer/index.js

@@ -152,10 +152,6 @@ export { buildDexBatchBuyOps, buildDexBatchBuyOpsV3, } from './dex-aa-buy.js';
 // ============================================================================
 export { buildDexBatchSellOps, buildDexBatchSellOpsV3, } from './dex-aa-sell.js';
 // ============================================================================
-// ✅ AA 分发/归集（安全版：利润配置硬编码在 SDK 内部）
-// ============================================================================
-export { buildDisperseFromSingleOwnerOpsWithProfit, buildTransfersWithProfit, } from './aa-transfer-profit.js';
-// ============================================================================
 // 便捷重导出
 // ============================================================================
 // 将最常用的函数放在默认导出对象中

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

@@ -264,7 +264,8 @@ export class AAPortalSwapExecutor {
      * ✅ 支持 ERC20 稳定币
      */
     async bundleBatchSwapSign(params) {
-        const { tokenAddress, sellerPrivateKey, buyerPrivateKeys, buyAmountsOkb, sellAmount, sellPercent = 100, disperseHopCount: disperseHopCountIn, payerPrivateKey, beneficiary: beneficiaryIn, payerStartNonce, routeAddress, skipApprovalCheck = false, quoteToken, quoteTokenDecimals = 6, } = params;
+        const { tokenAddress, sellerPrivateKey, buyerPrivateKeys, buyAmountsOkb, sellAmount, sellPercent = 100, capitalMode = true, // ✅ 默认资金利用率模式（卖出→分发→买入）
+        disperseHopCount: disperseHopCountIn, payerPrivateKey, beneficiary: beneficiaryIn, payerStartNonce, routeAddress, skipApprovalCheck = false, quoteToken, quoteTokenDecimals = 6, } = params;
         const effectiveConfig = { ...(this.config ?? {}), ...(params.config ?? {}) };
         const { extractProfit, profitBps, profitRecipient } = resolveProfitSettings(effectiveConfig);
         // ✅ ERC20 稳定币支持
@@ -359,13 +360,14 @@ export class AAPortalSwapExecutor {
         const profitCap = quotedSellOutWei - totalBuyWei;
         const profitWei = profitWeiRaw > profitCap ? profitCap : profitWeiRaw;
         // ✅ 利润在分发阶段通过 AA 内部刮取
-        // ✅ 卖出所得资金分发给多个买方 AA(Sender)（支持多跳）+ 利润刮取
+        // ✅ 资金分发逻辑（仅 capitalMode=true 时执行，对应 BSC flapQuickBatchSwapMerkle）
+        // capitalMode=false 时跳过分发，买方用自己的 OKB（对应 BSC flapBatchSwapMerkle）
         const buyerSenders = buyerAis.map(ai => ai.sender);
         const hopCountRaw = Math.max(0, Math.floor(Number(disperseHopCountIn ?? 0)));
         const hopCount = Math.min(hopCountRaw, buyerSenders.length);
         const maxPerOp = Math.max(1, Math.floor(Number(effectiveConfig.maxTransfersPerUserOpNative ?? 30)));
         const erc20Iface = new ethers.Interface(['function transfer(address to, uint256 amount) returns (bool)']);
-        if (buyerSenders.length > 0 && totalBuyWei > 0n) {
+        if (capitalMode && buyerSenders.length > 0 && totalBuyWei > 0n) {
             if (hopCount <= 0) {
                 // ✅ 直接分发模式：将利润接收者加入分发列表（AA 内部刮取）
                 const items = buyerSenders.map((to, i) => ({ to, value: buyAmountsWei[i] ?? 0n })).filter(x => x.value > 0n);
@@ -497,6 +499,26 @@ export class AAPortalSwapExecutor {
                 }
             }
         }
+        else if (!capitalMode && extractProfit && profitWei > 0n) {
+            // ✅ capitalMode=false（买方自带资金）：利润从 seller AA Sender 直接转账到利润地址（无多跳）
+            let profitCallData;
+            if (useNativeToken) {
+                profitCallData = encodeExecute(profitRecipient, profitWei, '0x');
+            }
+            else {
+                const transferData = erc20Iface.encodeFunctionData('transfer', [profitRecipient, profitWei]);
+                profitCallData = encodeExecute(quoteToken, 0n, transferData);
+            }
+            const signedProfitTransfer = await this.aaManager.buildUserOpWithState({
+                ownerWallet: sellerOwner,
+                sender: sellerAi.sender,
+                nonce: nonceMap.next(sellerAi.sender),
+                initCode: consumeInitCode(sellerAi.sender),
+                callData: profitCallData,
+                signOnly: true,
+            });
+            outOps.push(signedProfitTransfer.userOp);
+        }
         // Batch Buy ops - ✅ 支持 ERC20 稳定币
         for (let i = 0; i < buyerOwners.length; i++) {
             const ai = buyerAis[i];
@@ -528,7 +550,7 @@ export class AAPortalSwapExecutor {
             beneficiary,
             nonce: payerStartNonce,
         });
-        // ✅ 利润已在 AA 内部通过分发阶段刮取，不需要 Tail Tx
+        // ✅ 利润已在 AA 内部刮取（capitalMode=true 在分发阶段；capitalMode=false 单独转账），不需要 Tail Tx
         const signedTransactions = [signedHandleOps];
         return {
             signedTransactions,
@@ -548,7 +570,7 @@ export class AAPortalSwapExecutor {
                 profitRecipient,
                 profitWei: profitWei.toString(),
                 quotedSellOutWei: quotedSellOutWei.toString(),
-                disperseHopCount: String(hopCount),
+                disperseHopCount: capitalMode ? String(hopCount) : '0', // ✅ capitalMode=false 时无分发
             },
         };
     }

package/dist/xlayer/types.d.ts

@@ -505,11 +505,17 @@ export interface BundleBatchSwapParams {
     /** ✅ ERC20 稳定币精度（默认 6，XLayer USDT/USDC/USDT0 都是 6 位精度） */
     quoteTokenDecimals?: number;
     /**
-     * ✅ 转账多跳数（AA 专用）
+     * ✅ 资金利用率模式（对齐 BSC）
+     * - true（默认）：卖出 → 分发 → 买入（资金来自卖出所得，对应 BSC flapQuickBatchSwapMerkle）
+     * - false：卖出 → 买入（买方自带资金，对应 BSC flapBatchSwapMerkle）
+     */
+    capitalMode?: boolean;
+    /**
+     * ✅ 转账多跳数（AA 专用，仅 capitalMode=true 时生效）
      *
      * 用途：卖出所得 OKB 需要在同一笔 handleOps 内分发给多个买方 AA(Sender)。
      * - 0：卖方 AA(Sender) 直接分发给所有买方 AA(Sender)
-     * - >0：按“多跳”方式分发（实现位于 xlayer/*，不会影响 BSC bundle/merkle）
+     * - >0：按"多跳"方式分发（实现位于 xlayer/*，不会影响 BSC bundle/merkle）
      */
     disperseHopCount?: number;
     /** 配置覆盖 */

package/package.json

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