four-flap-meme-sdk 1.5.33 → 1.5.34

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, 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';
+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, makeBuyFirstVolume as xlayerMakeBuyFirstVolume, BuyFirstVolumeExecutor as XLayerBuyFirstVolumeExecutor, AAPortalBuyFirstExecutor as XLayerAAPortalBuyFirstExecutor, AADexBuyFirstExecutor as XLayerAADexBuyFirstExecutor, 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 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

@@ -105,6 +105,8 @@ 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, 
+// ✅ Buy-First 刷量（对齐 BSC buy-first）
+makeBuyFirstVolume as xlayerMakeBuyFirstVolume, BuyFirstVolumeExecutor as XLayerBuyFirstVolumeExecutor, AAPortalBuyFirstExecutor as XLayerAAPortalBuyFirstExecutor, AADexBuyFirstExecutor as XLayerAADexBuyFirstExecutor, 
 // DEX 交易
 createDexExecutor as xlayerCreateDexExecutor, createDexQuery as xlayerCreateDexQuery, quoteOkbToToken as xlayerQuoteOkbToToken, quoteTokenToOkb as xlayerQuoteTokenToOkb, DexExecutor as XLayerDexExecutor, DexQuery as XLayerDexQuery, 
 // AA 账户管理

package/dist/xlayer/bundle.d.ts

@@ -71,6 +71,8 @@ export declare class BundleExecutor {
      * 捆绑买入
      *
      * 多个地址同一笔 handleOps 买入代币
+     * ✅ 对齐 BSC：在买入时从买入金额中扣除利润，买入后立即转账利润（直接转账，无需多跳）
+     * ✅ 支持 ERC20 代币作为 quoteToken（如 USDC），利润会报价转换为 OKB 后转账
      */
     bundleBuy(params: BundleBuyParams): Promise<BundleBuyResult>;
     /**

package/dist/xlayer/bundle.js

@@ -12,7 +12,8 @@ import { FLAP_PORTAL, ENTRYPOINT_ABI, DEFAULT_CALL_GAS_LIMIT_SELL, DEFAULT_WITHD
 import { AAAccountManager, encodeExecute, encodeExecuteBatch } from './aa-account.js';
 import { encodeBuyCall, encodeSellCall, encodeApproveCall, encodeTransferCall, PortalQuery, parseOkb, formatOkb, } from './portal-ops.js';
 import { mapWithConcurrency } from '../utils/concurrency.js';
-import { PROFIT_CONFIG } from '../utils/constants.js';
+import { PROFIT_CONFIG, ZERO_ADDRESS } from '../utils/constants.js';
+import { DexQuery } from './dex.js';
 // ============================================================================
 // AA Nonce（EntryPoint nonce）本地分配器
 // ============================================================================
@@ -88,6 +89,14 @@ function calculateProfitWei(amountWei, profitBps) {
         return 0n;
     return (amountWei * BigInt(profitBps)) / 10000n;
 }
+/**
+ * ✅ 对齐 BSC：计算利润和剩余金额（从买入金额中扣除利润）
+ */
+function calculateProfit(amountWei, profitBps) {
+    const profit = calculateProfitWei(amountWei, profitBps);
+    const remaining = amountWei - profit;
+    return { profit, remaining };
+}
 /**
  * XLayer 捆绑交易执行器
  *
@@ -524,9 +533,11 @@ export class BundleExecutor {
      * 捆绑买入
      *
      * 多个地址同一笔 handleOps 买入代币
+     * ✅ 对齐 BSC：在买入时从买入金额中扣除利润，买入后立即转账利润（直接转账，无需多跳）
+     * ✅ 支持 ERC20 代币作为 quoteToken（如 USDC），利润会报价转换为 OKB 后转账
      */
     async bundleBuy(params) {
-        const { tokenAddress, privateKeys, buyAmounts, transferBackToOwner, config } = params;
+        const { tokenAddress, privateKeys, buyAmounts, quoteToken, quoteTokenDecimals, transferBackToOwner, config } = params;
         if (privateKeys.length !== buyAmounts.length) {
             throw new Error('私钥数量和购买金额数量必须一致');
         }
@@ -538,20 +549,84 @@ export class BundleExecutor {
         console.log('=== XLayer Bundle Buy ===');
         console.log('token:', tokenAddress);
         console.log('owners:', wallets.length);
+        const effConfig = { ...(this.config ?? {}), ...(config ?? {}) };
+        const profitSettings = resolveProfitSettings(effConfig);
+        // ✅ 确定 inputToken：如果传入了 quoteToken 且非零地址，则使用它；否则使用零地址（原生代币）
+        const inputToken = quoteToken && quoteToken !== ZERO_ADDRESS ? quoteToken : ZERO_ADDRESS;
+        const useNativeToken = inputToken === ZERO_ADDRESS;
+        // ✅ 对齐 BSC：计算利润并从买入金额中扣除
+        // 如果使用非原生代币，需要根据精度转换金额（buyAmounts 是按 18 位精度传入的）
+        const originalBuyWeis = buyAmounts.map((a) => parseOkb(a));
+        let adjustedOriginalBuyWeis = originalBuyWeis;
+        if (!useNativeToken && quoteTokenDecimals !== undefined && quoteTokenDecimals !== 18) {
+            const decimalsDiff = 18 - quoteTokenDecimals;
+            const divisor = BigInt(10 ** decimalsDiff);
+            adjustedOriginalBuyWeis = originalBuyWeis.map(amount => amount / divisor);
+        }
+        const buyWeis = [];
+        const profitWeis = [];
+        let totalProfitWei = 0n; // 原生代币利润（OKB）或 ERC20 代币利润（需要报价转换）
+        for (let i = 0; i < adjustedOriginalBuyWeis.length; i++) {
+            const original = adjustedOriginalBuyWeis[i];
+            if (profitSettings.extractProfit) {
+                const { profit, remaining } = calculateProfit(original, profitSettings.profitBps);
+                buyWeis.push(remaining);
+                profitWeis.push(profit);
+                totalProfitWei += profit;
+            }
+            else {
+                buyWeis.push(original);
+                profitWeis.push(0n);
+            }
+        }
+        // ✅ ERC20 购买：获取代币利润等值的原生代币（OKB）报价
+        let nativeProfitAmount = totalProfitWei; // 原生代币购买时直接使用
+        if (!useNativeToken && profitSettings.extractProfit && totalProfitWei > 0n) {
+            // 将代币利润转换为等值原生代币（OKB）
+            const dexQuery = new DexQuery(effConfig);
+            nativeProfitAmount = await dexQuery.quoteTokenToOkb(totalProfitWei, inputToken);
+            if (nativeProfitAmount === 0n) {
+                console.warn(`[警告] ERC20 代币利润报价失败，跳过利润提取`);
+            }
+        }
+        if (profitSettings.extractProfit && nativeProfitAmount > 0n) {
+            console.log(`[利润提取] 总利润: ${useNativeToken ? formatOkb(nativeProfitAmount) : `${formatOkb(totalProfitWei)} (ERC20) -> ${formatOkb(nativeProfitAmount)} (OKB)`} -> ${profitSettings.profitRecipient}`);
+        }
         // 1. 预取账户信息（并行），并批量估算 gas（减少对 bundler 的 N 次请求）
         const accountInfos = await this.aaManager.getMultipleAccountInfo(wallets.map((w) => w.address));
-        const buyWeis = buyAmounts.map((a) => parseOkb(a));
         const nonceMap = new AANonceMap();
         for (const ai of accountInfos)
             nonceMap.init(ai.sender, ai.nonce);
         // 估算前确保 sender 有足够余额（用于 bundler 模拟；paymaster 场景会自动跳过）
-        // 避免 Promise.all 突发并发（大规模地址会触发 RPC 限流）
+        // 注意：需要包含原始买入金额（因为利润会在买入后单独转走）
+        // 如果使用 ERC20 代币，需要确保 sender 有足够的 ERC20 代币余额
         await mapWithConcurrency(accountInfos, 6, async (ai, i) => {
-            await this.aaManager.ensureSenderBalance(wallets[i], ai.sender, buyWeis[i] + parseOkb('0.0003'), `owner${i + 1}/buy-prefund-before-estimate`);
+            if (useNativeToken) {
+                await this.aaManager.ensureSenderBalance(wallets[i], ai.sender, originalBuyWeis[i] + parseOkb('0.0003'), `owner${i + 1}/buy-prefund-before-estimate`);
+            }
+            else {
+                // ERC20 代币：确保有足够的 OKB 用于 gas，以及足够的 ERC20 代币用于购买
+                await this.aaManager.ensureSenderBalance(wallets[i], ai.sender, parseOkb('0.0003'), `owner${i + 1}/buy-prefund-before-estimate`);
+                // TODO: 如果需要，可以在这里检查并转账 ERC20 代币到 sender
+            }
         });
+        // ✅ 构建买入 callData：如果使用 ERC20 代币，需要修改 encodeBuyCall 以支持 inputToken
         const buyCallDatas = buyWeis.map((buyWei) => {
-            const swapData = encodeBuyCall(tokenAddress, buyWei, 0n);
-            return encodeExecute(this.portalAddress, buyWei, swapData);
+            // 使用 portal 的 swapExactInput，支持 inputToken 参数
+            const portalIface = new Interface([
+                'function swapExactInput((address inputToken,address outputToken,uint256 inputAmount,uint256 minOutputAmount,bytes permitData) params) payable returns (uint256)',
+            ]);
+            const swapData = portalIface.encodeFunctionData('swapExactInput', [
+                {
+                    inputToken,
+                    outputToken: tokenAddress,
+                    inputAmount: buyWei,
+                    minOutputAmount: 0n,
+                    permitData: '0x',
+                },
+            ]);
+            // 如果使用原生代币，value 为买入金额；否则为 0
+            return encodeExecute(this.portalAddress, useNativeToken ? buyWei : 0n, swapData);
         });
         const initCodes = accountInfos.map((ai, i) => ai.deployed ? '0x' : this.aaManager.generateInitCode(wallets[i].address));
         const { userOps: buyUserOps, prefundWeis } = await this.aaManager.buildUserOpsWithBundlerEstimateBatch({
@@ -562,15 +637,50 @@ export class BundleExecutor {
                 initCode: initCodes[i],
             })),
         });
-        // 补足 prefund + 买入金额（多数情况下上一步的 0.0003 已足够，这里通常不会再转账）
+        // 补足 prefund + 买入金额（使用扣除利润后的金额）
         await mapWithConcurrency(accountInfos, 6, async (ai, i) => {
-            await this.aaManager.ensureSenderBalance(wallets[i], ai.sender, buyWeis[i] + prefundWeis[i] + parseOkb('0.0002'), `owner${i + 1}/buy-fund`);
+            if (useNativeToken) {
+                await this.aaManager.ensureSenderBalance(wallets[i], ai.sender, buyWeis[i] + prefundWeis[i] + parseOkb('0.0002'), `owner${i + 1}/buy-fund`);
+            }
+            else {
+                // ERC20 代币：只需要确保有足够的 OKB 用于 gas
+                await this.aaManager.ensureSenderBalance(wallets[i], ai.sender, prefundWeis[i] + parseOkb('0.0002'), `owner${i + 1}/buy-fund`);
+                // TODO: 如果需要，可以在这里检查并转账 ERC20 代币到 sender
+            }
         });
         // 签名（受控并发，避免大规模时阻塞）
         const signedBuy = await mapWithConcurrency(buyUserOps, 10, async (op, i) => this.aaManager.signUserOp(op, wallets[i]));
         const buyOps = signedBuy.map((s) => s.userOp);
-        // 2. 执行买入
-        const buyResult = await this.runHandleOps('buyBundle', buyOps, bundlerSigner, beneficiary);
+        // ✅ 利润转账 UserOps（买入后立即转走利润，直接转账无需多跳）
+        // ✅ 对齐 BSC：如果使用 ERC20 代币，利润已通过报价转换为 OKB，直接转账 OKB
+        const profitOps = [];
+        if (profitSettings.extractProfit && nativeProfitAmount > 0n) {
+            // 找到利润最大的钱包作为利润转账的 sender（对齐 BSC 的 maxFundsIndex 逻辑）
+            const maxProfitIndex = profitWeis.reduce((maxIdx, profit, idx) => profit > profitWeis[maxIdx] ? idx : maxIdx, 0);
+            const profitSender = accountInfos[maxProfitIndex].sender;
+            const profitOwner = wallets[maxProfitIndex];
+            // 利润转账：直接转账 OKB（无论原始是原生代币还是 ERC20 代币，最终都转 OKB）
+            const profitCallData = encodeExecute(profitSettings.profitRecipient, nativeProfitAmount, '0x');
+            const { userOp: profitOp, prefundWei: profitPrefund } = await this.aaManager.buildUserOpWithFixedGas({
+                ownerWallet: profitOwner,
+                sender: profitSender,
+                nonce: nonceMap.next(profitSender),
+                initCode: initCodes[maxProfitIndex] === '0x' ? '0x' : initCodes[maxProfitIndex],
+                callData: profitCallData,
+                deployed: accountInfos[maxProfitIndex].deployed,
+                fixedGas: {
+                    ...(effConfig.fixedGas ?? {}),
+                    callGasLimit: effConfig.fixedGas?.callGasLimit ?? DEFAULT_CALL_GAS_LIMIT_WITHDRAW,
+                },
+            });
+            // 确保 profit sender 有足够余额（用于支付利润转账的 gas）
+            await this.aaManager.ensureSenderBalance(profitOwner, profitSender, profitPrefund + parseOkb('0.0001'), `profit-transfer-fund`);
+            const signedProfit = await this.aaManager.signUserOp(profitOp, profitOwner);
+            profitOps.push(signedProfit.userOp);
+        }
+        // 2. 执行买入 + 利润转账（同一笔 handleOps）
+        const allBuyOps = [...buyOps, ...profitOps];
+        const buyResult = await this.runHandleOps('buyBundle', allBuyOps, bundlerSigner, beneficiary);
         if (!buyResult) {
             throw new Error('买入交易失败');
         }
@@ -773,7 +883,7 @@ export class BundleExecutor {
      * 完整流程：买入 -> 授权 -> 卖出 -> 归集
      */
     async bundleBuySell(params) {
-        const { tokenAddress, privateKeys, buyAmounts, sellPercent = 100, withdrawToOwner = true, withdrawReserve = DEFAULT_WITHDRAW_RESERVE, config, } = params;
+        const { tokenAddress, privateKeys, buyAmounts, quoteToken, quoteTokenDecimals, sellPercent = 100, withdrawToOwner = true, withdrawReserve = DEFAULT_WITHDRAW_RESERVE, config, } = params;
         if (privateKeys.length !== buyAmounts.length) {
             throw new Error('私钥数量和购买金额数量必须一致');
         }
@@ -792,17 +902,81 @@ export class BundleExecutor {
         const nonceMap = new AANonceMap();
         for (const ai of accountInfos)
             nonceMap.init(ai.sender, ai.nonce);
+        const effProfitCfgBuySell = { ...(this.config ?? {}), ...(config ?? {}) };
+        const profitSettingsBuySell = resolveProfitSettings(effProfitCfgBuySell);
+        // ✅ 确定 inputToken：如果传入了 quoteToken 且非零地址，则使用它；否则使用零地址（原生代币）
+        const inputToken = quoteToken && quoteToken !== ZERO_ADDRESS ? quoteToken : ZERO_ADDRESS;
+        const useNativeToken = inputToken === ZERO_ADDRESS;
+        // ✅ 对齐 BSC：计算利润并从买入金额中扣除
+        // 如果使用非原生代币，需要根据精度转换金额（buyAmounts 是按 18 位精度传入的）
+        const originalBuyWeis = buyAmounts.map((a) => parseOkb(a));
+        let adjustedOriginalBuyWeis = originalBuyWeis;
+        if (!useNativeToken && quoteTokenDecimals !== undefined && quoteTokenDecimals !== 18) {
+            const decimalsDiff = 18 - quoteTokenDecimals;
+            const divisor = BigInt(10 ** decimalsDiff);
+            adjustedOriginalBuyWeis = originalBuyWeis.map(amount => amount / divisor);
+        }
+        const buyWeis = [];
+        const profitWeis = [];
+        let totalBuyProfitWei = 0n; // 原生代币利润（OKB）或 ERC20 代币利润（需要报价转换）
+        for (let i = 0; i < adjustedOriginalBuyWeis.length; i++) {
+            const original = adjustedOriginalBuyWeis[i];
+            if (profitSettingsBuySell.extractProfit) {
+                const { profit, remaining } = calculateProfit(original, profitSettingsBuySell.profitBps);
+                buyWeis.push(remaining);
+                profitWeis.push(profit);
+                totalBuyProfitWei += profit;
+            }
+            else {
+                buyWeis.push(original);
+                profitWeis.push(0n);
+            }
+        }
+        // ✅ ERC20 购买：获取代币利润等值的原生代币（OKB）报价
+        let nativeBuyProfitAmount = totalBuyProfitWei; // 原生代币购买时直接使用
+        if (!useNativeToken && profitSettingsBuySell.extractProfit && totalBuyProfitWei > 0n) {
+            // 将代币利润转换为等值原生代币（OKB）
+            const dexQuery = new DexQuery(effProfitCfgBuySell);
+            nativeBuyProfitAmount = await dexQuery.quoteTokenToOkb(totalBuyProfitWei, inputToken);
+            if (nativeBuyProfitAmount === 0n) {
+                console.warn(`[警告] ERC20 代币利润报价失败，跳过利润提取`);
+            }
+        }
+        if (profitSettingsBuySell.extractProfit && nativeBuyProfitAmount > 0n) {
+            console.log(`[利润提取-买入] 总利润: ${useNativeToken ? formatOkb(nativeBuyProfitAmount) : `${formatOkb(totalBuyProfitWei)} (ERC20) -> ${formatOkb(nativeBuyProfitAmount)} (OKB)`} -> ${profitSettingsBuySell.profitRecipient}`);
+        }
         // 1. 买入（批量估算 + 并发补余额 + 并发签名）
-        const buyWeis = buyAmounts.map((a) => parseOkb(a));
         await mapWithConcurrency(accountInfos, 6, async (ai, i) => {
             const buyWei = buyWeis[i] ?? 0n;
             if (buyWei <= 0n)
                 return;
-            await this.aaManager.ensureSenderBalance(wallets[i], ai.sender, buyWei + parseOkb('0.0003'), `owner${i + 1}/buy-prefund-before-estimate`);
+            if (useNativeToken) {
+                // 注意：需要包含原始买入金额（因为利润会在买入后单独转走）
+                await this.aaManager.ensureSenderBalance(wallets[i], ai.sender, originalBuyWeis[i] + parseOkb('0.0003'), `owner${i + 1}/buy-prefund-before-estimate`);
+            }
+            else {
+                // ERC20 代币：确保有足够的 OKB 用于 gas
+                await this.aaManager.ensureSenderBalance(wallets[i], ai.sender, parseOkb('0.0003'), `owner${i + 1}/buy-prefund-before-estimate`);
+                // TODO: 如果需要，可以在这里检查并转账 ERC20 代币到 sender
+            }
         });
+        // ✅ 构建买入 callData：如果使用 ERC20 代币，需要修改 encodeBuyCall 以支持 inputToken
         const buyCallDatas = buyWeis.map((buyWei) => {
-            const swapData = encodeBuyCall(tokenAddress, buyWei, 0n);
-            return encodeExecute(this.portalAddress, buyWei, swapData);
+            // 使用 portal 的 swapExactInput，支持 inputToken 参数
+            const portalIface = new Interface([
+                'function swapExactInput((address inputToken,address outputToken,uint256 inputAmount,uint256 minOutputAmount,bytes permitData) params) payable returns (uint256)',
+            ]);
+            const swapData = portalIface.encodeFunctionData('swapExactInput', [
+                {
+                    inputToken,
+                    outputToken: tokenAddress,
+                    inputAmount: buyWei,
+                    minOutputAmount: 0n,
+                    permitData: '0x',
+                },
+            ]);
+            // 如果使用原生代币，value 为买入金额；否则为 0
+            return encodeExecute(this.portalAddress, useNativeToken ? buyWei : 0n, swapData);
         });
         const initCodes = accountInfos.map((ai, i) => (ai.deployed ? '0x' : this.aaManager.generateInitCode(wallets[i].address)));
         const { userOps: buyUserOps, prefundWeis } = await this.aaManager.buildUserOpsWithBundlerEstimateBatch({
@@ -815,11 +989,44 @@ export class BundleExecutor {
         });
         await mapWithConcurrency(accountInfos, 6, async (ai, i) => {
             const buyWei = buyWeis[i] ?? 0n;
-            await this.aaManager.ensureSenderBalance(wallets[i], ai.sender, buyWei + (prefundWeis[i] ?? 0n) + parseOkb('0.0002'), `owner${i + 1}/buy-fund`);
+            if (useNativeToken) {
+                await this.aaManager.ensureSenderBalance(wallets[i], ai.sender, buyWei + (prefundWeis[i] ?? 0n) + parseOkb('0.0002'), `owner${i + 1}/buy-fund`);
+            }
+            else {
+                // ERC20 代币：只需要确保有足够的 OKB 用于 gas
+                await this.aaManager.ensureSenderBalance(wallets[i], ai.sender, (prefundWeis[i] ?? 0n) + parseOkb('0.0002'), `owner${i + 1}/buy-fund`);
+                // TODO: 如果需要，可以在这里检查并转账 ERC20 代币到 sender
+            }
         });
         const signedBuy = await mapWithConcurrency(buyUserOps, 10, async (op, i) => this.aaManager.signUserOp(op, wallets[i]));
         const buyOps = signedBuy.map((s) => s.userOp);
-        const buyResult = await this.runHandleOps('buyBundle', buyOps, bundlerSigner, beneficiary);
+        // ✅ 利润转账 UserOps（买入后立即转走利润，直接转账无需多跳）
+        // ✅ 对齐 BSC：如果使用 ERC20 代币，利润已通过报价转换为 OKB，直接转账 OKB
+        const profitOps = [];
+        if (profitSettingsBuySell.extractProfit && nativeBuyProfitAmount > 0n) {
+            const maxProfitIndex = profitWeis.reduce((maxIdx, profit, idx) => profit > profitWeis[maxIdx] ? idx : maxIdx, 0);
+            const profitSender = accountInfos[maxProfitIndex].sender;
+            const profitOwner = wallets[maxProfitIndex];
+            // 利润转账：直接转账 OKB（无论原始是原生代币还是 ERC20 代币，最终都转 OKB）
+            const profitCallData = encodeExecute(profitSettingsBuySell.profitRecipient, nativeBuyProfitAmount, '0x');
+            const { userOp: profitOp, prefundWei: profitPrefund } = await this.aaManager.buildUserOpWithFixedGas({
+                ownerWallet: profitOwner,
+                sender: profitSender,
+                nonce: nonceMap.next(profitSender),
+                initCode: initCodes[maxProfitIndex] === '0x' ? '0x' : initCodes[maxProfitIndex],
+                callData: profitCallData,
+                deployed: accountInfos[maxProfitIndex].deployed,
+                fixedGas: {
+                    ...(effProfitCfgBuySell.fixedGas ?? {}),
+                    callGasLimit: effProfitCfgBuySell.fixedGas?.callGasLimit ?? DEFAULT_CALL_GAS_LIMIT_WITHDRAW,
+                },
+            });
+            await this.aaManager.ensureSenderBalance(profitOwner, profitSender, profitPrefund + parseOkb('0.0001'), `profit-transfer-fund`);
+            const signedProfit = await this.aaManager.signUserOp(profitOp, profitOwner);
+            profitOps.push(signedProfit.userOp);
+        }
+        const allBuyOps = [...buyOps, ...profitOps];
+        const buyResult = await this.runHandleOps('buyBundle', allBuyOps, bundlerSigner, beneficiary);
         if (!buyResult) {
             throw new Error('买入交易失败');
         }
@@ -858,11 +1065,9 @@ export class BundleExecutor {
         if (!sellResult) {
             throw new Error('卖出交易失败');
         }
-        // 3. 可选：归集 OKB
+        // 3. 可选：归集 OKB（卖出后的利润在 withdraw 阶段刮取）
         let withdrawResult;
-        let totalProfitWei = 0n;
-        const effProfitCfg = { ...(this.config ?? {}), ...(config ?? {}) };
-        const profitSettings = resolveProfitSettings(effProfitCfg);
+        let totalSellWithdrawProfitWei = 0n;
         if (withdrawToOwner) {
             const withdrawOps = [];
             // 批量获取 OKB 余额（sell 后状态）
@@ -886,11 +1091,11 @@ export class BundleExecutor {
                     ownerName: `owner${it.i + 1}`,
                     configOverride: config,
                 });
-                if (signed && profitSettings.extractProfit) {
+                if (signed && profitSettingsBuySell.extractProfit) {
                     const withdrawAmount = it.senderBalance > signed.prefundWei + reserveWei
                         ? it.senderBalance - signed.prefundWei - reserveWei
                         : 0n;
-                    totalProfitWei += calculateProfitWei(withdrawAmount, profitSettings.profitBps);
+                    totalSellWithdrawProfitWei += calculateProfitWei(withdrawAmount, profitSettingsBuySell.profitBps);
                 }
                 if (signed?.userOp)
                     nonceMap.commit(it.sender, it.nonce);
@@ -913,10 +1118,11 @@ export class BundleExecutor {
             finalBalances,
             profit: withdrawToOwner
                 ? {
-                    extractProfit: profitSettings.extractProfit,
-                    profitBps: profitSettings.profitBps,
-                    profitRecipient: profitSettings.profitRecipient,
-                    totalProfitWei: totalProfitWei.toString(),
+                    extractProfit: profitSettingsBuySell.extractProfit,
+                    profitBps: profitSettingsBuySell.profitBps,
+                    profitRecipient: profitSettingsBuySell.profitRecipient,
+                    // 总利润 = 买入阶段利润（已转走）+ 卖出后归集阶段的利润
+                    totalProfitWei: (totalBuyProfitWei + totalSellWithdrawProfitWei).toString(),
                 }
                 : undefined,
         };

package/dist/xlayer/buy-first-volume.d.ts

@@ -0,0 +1,18 @@
+/**
+ * XLayer AA Buy-First 自动刷量（对齐 BSC buy-first 思路）
+ *
+ * - tradeType=FLAP：内盘（Flap Portal）
+ * - tradeType=V2：外盘（PotatoSwap V2）
+ *
+ * 代码实现分离：
+ * - 内盘执行器：`portal-buy-first.ts`
+ * - 外盘执行器：`dex-buy-first.ts`
+ */
+import type { BuyFirstVolumeParams, BuyFirstVolumeResult, XLayerConfig } from './types.js';
+export declare class BuyFirstVolumeExecutor {
+    private config;
+    constructor(config?: XLayerConfig);
+    execute(params: BuyFirstVolumeParams): Promise<BuyFirstVolumeResult>;
+}
+export declare function createBuyFirstVolumeExecutor(config?: XLayerConfig): BuyFirstVolumeExecutor;
+export declare function makeBuyFirstVolume(params: BuyFirstVolumeParams): Promise<BuyFirstVolumeResult>;

package/dist/xlayer/buy-first-volume.js

@@ -0,0 +1,68 @@
+/**
+ * XLayer AA Buy-First 自动刷量（对齐 BSC buy-first 思路）
+ *
+ * - tradeType=FLAP：内盘（Flap Portal）
+ * - tradeType=V2：外盘（PotatoSwap V2）
+ *
+ * 代码实现分离：
+ * - 内盘执行器：`portal-buy-first.ts`
+ * - 外盘执行器：`dex-buy-first.ts`
+ */
+import { parseOkb, formatOkb } from './portal-ops.js';
+import { AAPortalBuyFirstExecutor } from './portal-buy-first.js';
+import { AADexBuyFirstExecutor } from './dex-buy-first.js';
+function sleep(ms) {
+    return new Promise((resolve) => setTimeout(resolve, ms));
+}
+export class BuyFirstVolumeExecutor {
+    constructor(config = {}) {
+        this.config = config;
+    }
+    async execute(params) {
+        const { tradeType = 'FLAP', buyerFundsPerRound, rounds, intervalMs = 3000, config, ...rest } = params;
+        const effConfig = { ...(this.config ?? {}), ...(config ?? {}) };
+        const roundResults = [];
+        let successRounds = 0;
+        let failedRounds = 0;
+        let totalVolume = 0n;
+        const perRoundWei = parseOkb(String(buyerFundsPerRound));
+        for (let r = 0; r < rounds; r++) {
+            console.log(`\n========== AA BuyFirst Round ${r + 1}/${rounds} (${tradeType}) ==========`);
+            try {
+                const execParams = {
+                    tradeType,
+                    buyerFunds: buyerFundsPerRound,
+                    config: effConfig,
+                    ...rest,
+                };
+                const result = tradeType === 'FLAP'
+                    ? await new AAPortalBuyFirstExecutor(effConfig).execute(execParams)
+                    : await new AADexBuyFirstExecutor(effConfig).execute(execParams);
+                roundResults.push(result);
+                successRounds++;
+                // 交易量按“买入资金 * 2（买+卖）”统计（与 BSC buy-first 口径更接近）
+                totalVolume += perRoundWei * 2n;
+            }
+            catch (e) {
+                console.error(`AA BuyFirst Round ${r + 1} 失败:`, e);
+                failedRounds++;
+            }
+            if (r < rounds - 1 && intervalMs > 0) {
+                console.log(`等待 ${intervalMs}ms...`);
+                await sleep(intervalMs);
+            }
+        }
+        console.log('\n=== AA BuyFirst Volume Summary ===');
+        console.log('成功轮数:', successRounds);
+        console.log('失败轮数:', failedRounds);
+        console.log('总交易量:', formatOkb(totalVolume), 'OKB');
+        return { successRounds, failedRounds, roundResults, totalVolume };
+    }
+}
+export function createBuyFirstVolumeExecutor(config) {
+    return new BuyFirstVolumeExecutor(config);
+}
+export async function makeBuyFirstVolume(params) {
+    const executor = createBuyFirstVolumeExecutor(params.config);
+    return executor.execute(params);
+}

package/dist/xlayer/dex-buy-first.d.ts

@@ -0,0 +1,24 @@
+/**
+ * XLayer AA Buy-First（外盘 / PotatoSwap V2）
+ *
+ * 对齐 BSC buy-first 思路：
+ * - 买方先买入（OKB -> token）
+ * - 卖方再卖出等值 token（token -> OKB，卖方需要预持仓）
+ * - ✅ 利润：在卖出后归集阶段刮取
+ */
+import type { XLayerConfig } from './types.js';
+import type { BuyFirstParams, BuyFirstResult } from './types.js';
+export declare class AADexBuyFirstExecutor {
+    private aaManager;
+    private portalQuery;
+    private dexQuery;
+    private config;
+    constructor(config?: XLayerConfig);
+    private getEffectiveRouter;
+    private runHandleOps;
+    private pickWallets;
+    private buildWithdrawUserOp;
+    private safeQuoteBuy;
+    execute(params: BuyFirstParams): Promise<BuyFirstResult>;
+}
+export declare function createAADexBuyFirstExecutor(config?: XLayerConfig): AADexBuyFirstExecutor;