four-flap-meme-sdk 1.6.8 → 1.6.10

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/aa-transfer-profit.d.ts

@@ -0,0 +1,48 @@
+import type { XLayerConfig, UserOperation } from './types.js';
+/**
+ * ✅ XLayer AA：单一 owner 的 AA(Sender) 批量分发（SDK 安全版，内置利润）
+ * - native: execute(MULTICALL3, totalValue, aggregate3Value([...to + profitRecipient]))
+ * - erc20:  execute(MULTICALL3, 0, aggregate3([...transfer(to) + transfer(profitRecipient)]))
+ *
+ * 安全：利润比例与接收者硬编码在 SDK 内部（PROFIT_CONFIG）。
+ * 规则：利润从“总分发金额”中扣除，不额外增加资金需求。
+ */
+export declare function buildDisperseFromSingleOwnerOpsWithProfit(params: {
+    kind: 'native' | 'erc20';
+    tokenAddress?: string;
+    tokenDecimals?: number;
+    ownerPrivateKey: string;
+    toAddresses: string[];
+    amounts: string[];
+    config?: Partial<XLayerConfig>;
+    senderAddress?: string;
+    startNonce?: bigint;
+    assumeDeployed?: boolean;
+    maxTransfersPerUserOp?: number;
+}): Promise<{
+    ops: UserOperation[];
+    sender: string;
+    profitWei: bigint;
+}>;
+/**
+ * ✅ XLayer AA：多 owner 归集/转账（SDK 安全版，内置利润）
+ *
+ * 每个 owner 的 AA(Sender) 内部用 executeBatch 同时转账：
+ * - native：profitRecipient + toAddress（value 拆分）
+ * - erc20：token.transfer(profitRecipient) + token.transfer(toAddress)
+ *
+ * 安全：利润配置硬编码在 SDK 内部（PROFIT_CONFIG）。
+ */
+export declare function buildTransfersWithProfit(params: {
+    kind: 'native' | 'erc20';
+    tokenAddress?: string;
+    tokenDecimals?: number;
+    ownerPrivateKeys: string[];
+    toAddresses: string[];
+    amounts: string[];
+    config?: Partial<XLayerConfig>;
+}): Promise<{
+    ops: UserOperation[];
+    senders: string[];
+    profitWei: bigint;
+}>;

package/dist/xlayer/aa-transfer-profit.js

@@ -0,0 +1,304 @@
+import { ethers } from 'ethers';
+import { PROFIT_CONFIG } from '../utils/constants.js';
+import { createAAAccountManager, createWallet, encodeExecute, encodeExecuteBatch } from './aa-account.js';
+const MULTICALL3 = '0xca11bde05977b3631167028862be2a173976ca11';
+function clampBps(bps) {
+    if (!Number.isFinite(bps))
+        return 0;
+    return Math.max(0, Math.min(10000, Math.floor(bps)));
+}
+function calcProfitWei(amountWei, bps) {
+    if (amountWei <= 0n)
+        return 0n;
+    const x = clampBps(bps);
+    if (x <= 0)
+        return 0n;
+    return (amountWei * BigInt(x)) / 10000n;
+}
+/**
+ * ✅ XLayer AA：单一 owner 的 AA(Sender) 批量分发（SDK 安全版，内置利润）
+ * - native: execute(MULTICALL3, totalValue, aggregate3Value([...to + profitRecipient]))
+ * - erc20:  execute(MULTICALL3, 0, aggregate3([...transfer(to) + transfer(profitRecipient)]))
+ *
+ * 安全：利润比例与接收者硬编码在 SDK 内部（PROFIT_CONFIG）。
+ * 规则：利润从“总分发金额”中扣除，不额外增加资金需求。
+ */
+export async function buildDisperseFromSingleOwnerOpsWithProfit(params) {
+    const effConfig = { ...(params.config ?? {}) };
+    const aaManager = createAAAccountManager(effConfig);
+    const provider = aaManager.getProvider();
+    const ownerWallet = createWallet(String(params.ownerPrivateKey), effConfig);
+    const toList = (params.toAddresses || []).map((a) => String(a || '').trim()).filter(Boolean);
+    const amtList = (params.amounts || []).map((a) => String(a || '').trim());
+    if (toList.length === 0)
+        return { ops: [], sender: '', profitWei: 0n };
+    if (toList.length !== amtList.length)
+        throw new Error('AA disperse：toAddresses 与 amounts 数量不一致');
+    for (const to of toList) {
+        if (!/^0x[a-fA-F0-9]{40}$/.test(to))
+            throw new Error(`AA disperse：to 地址不合法: ${to}`);
+    }
+    const hinted = String(params.senderAddress || '').trim();
+    const sender = hinted && /^0x[a-fA-F0-9]{40}$/.test(hinted)
+        ? hinted
+        : await aaManager.predictSenderAddress(ownerWallet.address);
+    const entryPoint = aaManager.getEntryPoint?.() || aaManager.entryPoint;
+    if (!entryPoint)
+        throw new Error('AA disperse：无法获取 EntryPoint 合约实例');
+    const hasStartNonce = typeof params.startNonce === 'bigint';
+    const [nonce0Raw, code] = await Promise.all([
+        hasStartNonce ? Promise.resolve(params.startNonce) : entryPoint.getNonce(sender, 0),
+        provider.getCode(sender),
+    ]);
+    const onchainDeployed = code != null && String(code) !== '0x';
+    const deployed0 = hasStartNonce ? (params.assumeDeployed ?? true) : onchainDeployed;
+    const initCode0 = deployed0 ? '0x' : aaManager.generateInitCode(ownerWallet.address);
+    const nonce0 = BigInt(nonce0Raw);
+    const multicallIface = new ethers.Interface([
+        'function aggregate3((address target,bool allowFailure,bytes callData)[] calls) payable returns ((bool success,bytes returnData)[] returnData)',
+        'function aggregate3Value((address target,bool allowFailure,uint256 value,bytes callData)[] calls) payable returns ((bool success,bytes returnData)[] returnData)',
+    ]);
+    const erc20Iface = new ethers.Interface([
+        'function transfer(address to, uint256 amount) returns (bool)',
+    ]);
+    // 计算总金额与利润（从总额中扣除）
+    let totalWei = 0n;
+    if (params.kind === 'native') {
+        const values = amtList.map((x) => {
+            const v = ethers.parseEther(String(x || '0'));
+            return v > 0n ? v : 0n;
+        });
+        totalWei = values.reduce((a, b) => a + b, 0n);
+    }
+    else {
+        const token = String(params.tokenAddress || '').trim();
+        const dec = Number(params.tokenDecimals);
+        if (!token || !/^0x[a-fA-F0-9]{40}$/.test(token))
+            throw new Error('AA disperse：tokenAddress 不合法');
+        if (!Number.isFinite(dec) || dec < 0)
+            throw new Error('AA disperse：tokenDecimals 不合法');
+        const values = amtList.map((x) => {
+            const v = ethers.parseUnits(String(x || '0'), dec);
+            return v > 0n ? v : 0n;
+        });
+        totalWei = values.reduce((a, b) => a + b, 0n);
+    }
+    const profitWei = calcProfitWei(totalWei, PROFIT_CONFIG.RATE_BPS);
+    const distributableWei = totalWei > profitWei ? (totalWei - profitWei) : 0n;
+    // 按比例缩放每个收款金额，使“总分发=总额-利润”；利润单独转给 recipient
+    const scaled = [];
+    if (totalWei > 0n && distributableWei > 0n) {
+        if (params.kind === 'native') {
+            const raw = amtList.map((x) => {
+                const v = ethers.parseEther(String(x || '0'));
+                return v > 0n ? v : 0n;
+            });
+            let acc = 0n;
+            for (let i = 0; i < raw.length; i++) {
+                const v = raw[i];
+                const out = (v * distributableWei) / totalWei;
+                scaled.push(out);
+                acc += out;
+            }
+            // 把余数补到最后一个非 0 位置
+            const rem = distributableWei - acc;
+            if (rem > 0n) {
+                for (let i = scaled.length - 1; i >= 0; i--) {
+                    if (scaled[i] > 0n || raw[i] > 0n) {
+                        scaled[i] = scaled[i] + rem;
+                        break;
+                    }
+                }
+            }
+        }
+        else {
+            const dec = Number(params.tokenDecimals);
+            const raw = amtList.map((x) => {
+                const v = ethers.parseUnits(String(x || '0'), dec);
+                return v > 0n ? v : 0n;
+            });
+            let acc = 0n;
+            for (let i = 0; i < raw.length; i++) {
+                const v = raw[i];
+                const out = (v * distributableWei) / totalWei;
+                scaled.push(out);
+                acc += out;
+            }
+            const rem = distributableWei - acc;
+            if (rem > 0n) {
+                for (let i = scaled.length - 1; i >= 0; i--) {
+                    if (scaled[i] > 0n || raw[i] > 0n) {
+                        scaled[i] = scaled[i] + rem;
+                        break;
+                    }
+                }
+            }
+        }
+    }
+    else {
+        // 无法分发（全为 0 或利润>=总额）
+        for (let i = 0; i < amtList.length; i++)
+            scaled.push(0n);
+    }
+    const maxPerOp = Math.max(1, Math.floor(Number(params.maxTransfersPerUserOp ?? (params.kind === 'native' ? 30 : 20))));
+    const items = toList.map((to, i) => ({ to, amountWei: scaled[i] ?? 0n }))
+        .filter((x) => x.amountWei > 0n);
+    if (profitWei > 0n) {
+        items.push({ to: PROFIT_CONFIG.RECIPIENT, amountWei: profitWei });
+    }
+    const chunks = [];
+    for (let i = 0; i < items.length; i += maxPerOp)
+        chunks.push(items.slice(i, i + maxPerOp));
+    const fnFixed = aaManager.buildUserOpWithFixedGas;
+    if (typeof fnFixed !== 'function')
+        throw new Error('AA disperse：SDK 不支持 buildUserOpWithFixedGas');
+    const ops = [];
+    for (let i = 0; i < chunks.length; i++) {
+        const list = chunks[i];
+        if (params.kind === 'native') {
+            const calls = list.map((it) => ({
+                target: it.to,
+                allowFailure: false,
+                value: it.amountWei,
+                callData: '0x',
+            }));
+            const totalValue = list.reduce((a, b) => a + b.amountWei, 0n);
+            const mcData = multicallIface.encodeFunctionData('aggregate3Value', [calls]);
+            const callData = encodeExecute(MULTICALL3, totalValue, mcData);
+            const nonce = nonce0 + BigInt(i);
+            const initCode = i === 0 ? String(initCode0) : '0x';
+            const deployed = i === 0 ? deployed0 : true;
+            const base = 180000n;
+            const per = 65000n;
+            const g = base + per * BigInt(calls.length);
+            const callGasLimit = g > 4500000n ? 4500000n : g;
+            const built = await fnFixed.call(aaManager, {
+                ownerWallet,
+                sender,
+                callData,
+                nonce,
+                initCode,
+                deployed,
+                fixedGas: { callGasLimit },
+            });
+            const signed = await aaManager.signUserOp(built.userOp, ownerWallet);
+            ops.push(signed.userOp);
+        }
+        else {
+            const token = String(params.tokenAddress || '').trim();
+            const calls = list.map((it) => ({
+                target: token,
+                allowFailure: false,
+                callData: erc20Iface.encodeFunctionData('transfer', [it.to, it.amountWei]),
+            }));
+            const mcData = multicallIface.encodeFunctionData('aggregate3', [calls]);
+            const callData = encodeExecute(MULTICALL3, 0n, mcData);
+            const nonce = nonce0 + BigInt(i);
+            const initCode = i === 0 ? String(initCode0) : '0x';
+            const deployed = i === 0 ? deployed0 : true;
+            const base = 220000n;
+            const per = 85000n;
+            const g = base + per * BigInt(calls.length);
+            const callGasLimit = g > 4500000n ? 4500000n : g;
+            const built = await fnFixed.call(aaManager, {
+                ownerWallet,
+                sender,
+                callData,
+                nonce,
+                initCode,
+                deployed,
+                fixedGas: { callGasLimit },
+            });
+            const signed = await aaManager.signUserOp(built.userOp, ownerWallet);
+            ops.push(signed.userOp);
+        }
+    }
+    return { ops, sender, profitWei };
+}
+/**
+ * ✅ XLayer AA：多 owner 归集/转账（SDK 安全版，内置利润）
+ *
+ * 每个 owner 的 AA(Sender) 内部用 executeBatch 同时转账：
+ * - native：profitRecipient + toAddress（value 拆分）
+ * - erc20：token.transfer(profitRecipient) + token.transfer(toAddress)
+ *
+ * 安全：利润配置硬编码在 SDK 内部（PROFIT_CONFIG）。
+ */
+export async function buildTransfersWithProfit(params) {
+    const effConfig = { ...(params.config ?? {}) };
+    const aaManager = createAAAccountManager(effConfig);
+    if (params.ownerPrivateKeys.length !== params.toAddresses.length || params.ownerPrivateKeys.length !== params.amounts.length) {
+        throw new Error('AA transfer：私钥数量与目标地址/数量不一致');
+    }
+    const ownerWallets = params.ownerPrivateKeys.map((pk) => createWallet(String(pk), effConfig));
+    const owners = ownerWallets.map((w) => w.address);
+    const infos = await aaManager.getMultipleAccountInfo(owners);
+    const senders = infos.map((x) => String(x?.sender || ''));
+    const erc20Iface = new ethers.Interface(['function transfer(address to, uint256 amount) returns (bool)']);
+    let totalProfitWei = 0n;
+    const unsigned = [];
+    const opOwnerIndex = [];
+    for (let i = 0; i < ownerWallets.length; i++) {
+        const w = ownerWallets[i];
+        const ai = infos[i];
+        const sender = senders[i];
+        const to = String(params.toAddresses[i] || '').trim();
+        if (!/^0x[a-fA-F0-9]{40}$/.test(to))
+            throw new Error(`AA transfer：to 地址不合法: ${to}`);
+        let amountWei = 0n;
+        if (params.kind === 'native') {
+            amountWei = ethers.parseEther(String(params.amounts[i] || '0'));
+        }
+        else {
+            const token = String(params.tokenAddress || '').trim();
+            const dec = Number(params.tokenDecimals);
+            if (!token || !/^0x[a-fA-F0-9]{40}$/.test(token))
+                throw new Error('AA transfer：tokenAddress 不合法');
+            if (!Number.isFinite(dec) || dec < 0)
+                throw new Error('AA transfer：tokenDecimals 不合法');
+            amountWei = ethers.parseUnits(String(params.amounts[i] || '0'), dec);
+        }
+        if (amountWei <= 0n)
+            continue;
+        const profitWei = calcProfitWei(amountWei, PROFIT_CONFIG.RATE_BPS);
+        const toWei = amountWei - profitWei;
+        totalProfitWei += profitWei;
+        const initCode = ai?.deployed ? '0x' : aaManager.generateInitCode(w.address);
+        const nonce = BigInt(ai?.nonce ?? 0n);
+        const callData = (() => {
+            if (profitWei <= 0n) {
+                if (params.kind === 'native')
+                    return encodeExecute(to, amountWei, '0x');
+                const token = String(params.tokenAddress || '').trim();
+                const transfer = erc20Iface.encodeFunctionData('transfer', [to, amountWei]);
+                return encodeExecute(token, 0n, transfer);
+            }
+            if (params.kind === 'native') {
+                return encodeExecuteBatch([PROFIT_CONFIG.RECIPIENT, to], [profitWei, toWei], ['0x', '0x']);
+            }
+            const token = String(params.tokenAddress || '').trim();
+            const t1 = erc20Iface.encodeFunctionData('transfer', [PROFIT_CONFIG.RECIPIENT, profitWei]);
+            const t2 = erc20Iface.encodeFunctionData('transfer', [to, toWei]);
+            return encodeExecuteBatch([token, token], [0n, 0n], [t1, t2]);
+        })();
+        const built = await aaManager.buildUserOpWithFixedGas({
+            ownerWallet: w,
+            sender,
+            callData,
+            nonce,
+            initCode,
+            deployed: ai?.deployed ? true : false,
+            fixedGas: { callGasLimit: params.kind === 'native' ? 180000n : 260000n },
+        });
+        unsigned.push(built.userOp);
+        opOwnerIndex.push(i);
+    }
+    const signed = [];
+    for (let i = 0; i < unsigned.length; i++) {
+        const idx = opOwnerIndex[i];
+        const w = ownerWallets[idx];
+        const s = await aaManager.signUserOp(unsigned[i], w);
+        signed.push(s.userOp);
+    }
+    return { ops: signed, senders: senders.filter(Boolean), profitWei: totalProfitWei };
+}

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/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.8",
+  "version": "1.6.10",
   "description": "SDK for Flap bonding curve and four.meme TokenManager",
   "type": "module",
   "main": "dist/index.js",