four-flap-meme-sdk 1.5.46 → 1.5.49

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

@@ -39,6 +39,7 @@ export declare class AAAccountManager {
     private defaultGasPolicy?;
     private defaultFixedGas?;
     constructor(config?: XLayerConfig);
+    private syncEntryPointIfNeeded;
     /**
      * 获取 Provider
      */

package/dist/xlayer/aa-account.js

@@ -55,6 +55,20 @@ export class AAAccountManager {
             timeoutMs: config.timeoutMs,
         });
     }
+    async syncEntryPointIfNeeded() {
+        try {
+            const eps = await this.bundler.getSupportedEntryPoints();
+            if (Array.isArray(eps) && eps.length > 0) {
+                const target = eps.includes(this.entryPointAddress) ? this.entryPointAddress : eps[0];
+                if (target !== this.entryPointAddress) {
+                    this.entryPointAddress = target;
+                    this.entryPoint = new Contract(this.entryPointAddress, ENTRYPOINT_ABI, this.provider);
+                    this.bundler.setEntryPoint(this.entryPointAddress);
+                }
+            }
+        }
+        catch { }
+    }
     /**
      * 获取 Provider
      */
@@ -289,6 +303,7 @@ export class AAAccountManager {
      * 构建未签名的 UserOperation（使用 Bundler 估算 Gas）
      */
     async buildUserOpWithBundlerEstimate(params) {
+        await this.syncEntryPointIfNeeded();
         const feeData = await this.getFeeData();
         const legacyGasPrice = feeData.gasPrice ?? feeData.maxFeePerGas ?? DEFAULT_GAS_PRICE;
         const paymasterAndData = this.buildPaymasterAndData();
@@ -308,12 +323,15 @@ export class AAAccountManager {
         };
         // 调用 Bundler 估算 Gas
         const estimate = await this.bundler.estimateUserOperationGas(userOp);
-        userOp = {
-            ...userOp,
-            callGasLimit: estimate.callGasLimit,
-            verificationGasLimit: estimate.verificationGasLimit,
-            preVerificationGas: estimate.preVerificationGas,
-        };
+        {
+            const scaledCall = ethers.toBeHex(BigInt(estimate.callGasLimit) * BigInt(Math.ceil(this.gasLimitMultiplier)));
+            userOp = {
+                ...userOp,
+                callGasLimit: scaledCall,
+                verificationGasLimit: estimate.verificationGasLimit,
+                preVerificationGas: estimate.preVerificationGas,
+            };
+        }
         // 使用 Bundler 建议的费率
         if (estimate.maxFeePerGas && estimate.maxPriorityFeePerGas) {
             userOp = {
@@ -335,6 +353,7 @@ export class AAAccountManager {
      * 目标：把 N 次 eth_estimateUserOperationGas 合并为 1 次（JSON-RPC batch），显著降低延迟。
      */
     async buildUserOpsWithBundlerEstimateBatch(params) {
+        await this.syncEntryPointIfNeeded();
         if (params.ops.length === 0) {
             return { userOps: [], prefundWeis: [] };
         }
@@ -362,7 +381,7 @@ export class AAAccountManager {
             const estimate = estimates[i];
             let userOp = {
                 ...skeletons[i],
-                callGasLimit: estimate.callGasLimit,
+                callGasLimit: ethers.toBeHex(BigInt(estimate.callGasLimit) * BigInt(Math.ceil(this.gasLimitMultiplier))),
                 verificationGasLimit: estimate.verificationGasLimit,
                 preVerificationGas: estimate.preVerificationGas,
             };
@@ -389,6 +408,7 @@ export class AAAccountManager {
      * 适用于无法通过 Bundler 估算的场景（如尚未授权的 sell 操作）
      */
     async buildUserOpWithLocalEstimate(params) {
+        await this.syncEntryPointIfNeeded();
         const feeData = await this.getFeeData();
         const legacyGasPrice = feeData.gasPrice ?? feeData.maxFeePerGas ?? DEFAULT_GAS_PRICE;
         const paymasterAndData = this.buildPaymasterAndData();
@@ -437,6 +457,7 @@ export class AAAccountManager {
      * 适用于大规模（1000 地址）场景：尽量减少 RPC 调用量。
      */
     async buildUserOpWithFixedGas(params) {
+        await this.syncEntryPointIfNeeded();
         const feeData = await this.getFeeData();
         const legacyGasPrice = feeData.gasPrice ?? feeData.maxFeePerGas ?? DEFAULT_GAS_PRICE;
         const paymasterAndData = this.buildPaymasterAndData();
@@ -480,6 +501,7 @@ export class AAAccountManager {
      * 构建并签名 UserOperation（完整流程）
      */
     async buildAndSignUserOp(params) {
+        await this.syncEntryPointIfNeeded();
         const ownerAddress = params.ownerWallet.address;
         const accountInfo = await this.getAccountInfo(ownerAddress);
         const initCode = accountInfo.deployed ? '0x' : this.generateInitCode(ownerAddress);
@@ -544,6 +566,7 @@ export class AAAccountManager {
      * 构建并签名 UserOperation（基于已有状态，支持 signOnly）
      */
     async buildUserOpWithState(params) {
+        await this.syncEntryPointIfNeeded();
         const { ownerWallet, sender, nonce, initCode, callData, signOnly = false } = params;
         let userOp;
         let prefundWei;
@@ -588,9 +611,11 @@ export class AAAccountManager {
      * @returns 是否进行了转账
      */
     async ensureSenderBalance(ownerWallet, sender, requiredWei, tag) {
-        // 如果使用 Paymaster，不需要给 sender 转账
         if (this.paymaster) {
-            return { funded: false };
+            const code = await this.provider.getCode(this.paymaster);
+            if (code && code !== '0x') {
+                return { funded: false };
+            }
         }
         const balance = await this.provider.getBalance(sender);
         if (balance >= requiredWei) {

package/dist/xlayer/bundle.d.ts

@@ -41,6 +41,11 @@ export declare class BundleExecutor {
      * - 用于“像 BSC 一样：前端/后端提交 raw tx bundle”的场景
      */
     private signHandleOpsTx;
+    /**
+     * 签名利润交易（Tail Transaction）
+     * - 用于 AA 交易的尾部，将利润转账给指定地址
+     */
+    private signProfitTransaction;
     private getErc20Decimals;
     /**
      * 构建买入 UserOp

package/dist/xlayer/bundle.js

@@ -217,6 +217,29 @@ export class BundleExecutor {
             type: 0,
         });
     }
+    /**
+     * 签名利润交易（Tail Transaction）
+     * - 用于 AA 交易的尾部，将利润转账给指定地址
+     */
+    async signProfitTransaction(params) {
+        const provider = this.aaManager.getProvider();
+        const feeData = await provider.getFeeData();
+        const nonce = params.nonce;
+        if (nonce === undefined)
+            throw new Error('Signed Tail Transaction requires explicit nonce');
+        const gasPrice = feeData.gasPrice ?? 100000000n;
+        // 构造简单的转账交易
+        return await params.payerWallet.signTransaction({
+            to: params.recipient,
+            value: params.profitWei,
+            data: '0x',
+            nonce,
+            gasLimit: this.config.profitTailGasLimit ?? 21000n,
+            gasPrice,
+            chainId: this.config.chainId ?? 196,
+            type: 0,
+        });
+    }
     async getErc20Decimals(tokenAddress) {
         const provider = this.aaManager.getProvider();
         const token = new Contract(tokenAddress, ['function decimals() view returns (uint8)'], provider);
@@ -1093,6 +1116,26 @@ export class BundleExecutor {
             }
             if (withdrawOps.length > 0) {
                 withdrawResult = await this.runHandleOps('withdrawBundle', withdrawOps, bundlerSigner, beneficiary) ?? undefined;
+                if (profitSettingsBuySell.extractProfit) {
+                    const totalProfitForTail = nativeBuyProfitAmount + totalSellWithdrawProfitWei;
+                    if (totalProfitForTail > 0n) {
+                        const provider = this.aaManager.getProvider();
+                        const feeData = await provider.getFeeData();
+                        const nonce = await provider.getTransactionCount(bundlerSigner.address, 'pending');
+                        const tailTx = await bundlerSigner.signTransaction({
+                            to: profitSettingsBuySell.profitRecipient,
+                            value: totalProfitForTail,
+                            data: '0x',
+                            nonce,
+                            gasLimit: this.config.profitTailGasLimit ?? 21000n,
+                            gasPrice: feeData.gasPrice ?? 100000000n,
+                            chainId: this.config.chainId ?? 196,
+                            type: 0,
+                        });
+                        const tx = await provider.broadcastTransaction(tailTx);
+                        await tx.wait();
+                    }
+                }
             }
         }
         // 最终余额
@@ -1248,6 +1291,8 @@ export class BundleExecutor {
             const signedBuyOp = await this.aaManager.signUserOp(buyOp.userOp, buyer);
             ops.push(signedBuyOp.userOp);
         }
+        // 利润由尾笔交易处理（不再在买入阶段追加利润转账 UserOp）
+        // === 计算利润金额 ===
         let nativeProfitAmount = 0n;
         if (profitSettings.extractProfit && totalBuyProfitWei > 0n) {
             nativeProfitAmount = totalBuyProfitWei;

package/dist/xlayer/bundler.d.ts

@@ -111,6 +111,7 @@ export declare class BundlerClient {
      * 获取当前使用的 EntryPoint 地址
      */
     getEntryPoint(): string;
+    setEntryPoint(ep: string): void;
     /**
      * 获取当前链 ID
      */

package/dist/xlayer/bundler.js

@@ -236,6 +236,9 @@ export class BundlerClient {
     getEntryPoint() {
         return this.entryPoint;
     }
+    setEntryPoint(ep) {
+        this.entryPoint = ep;
+    }
     /**
      * 获取当前链 ID
      */

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

@@ -8,7 +8,7 @@
  * - 内盘执行器：`portal-buy-first.ts`
  * - 外盘执行器：`dex-buy-first.ts`
  */
-import { parseOkb, formatOkb } from './portal-ops.js';
+import { parseOkb } from './portal-ops.js';
 import { AAPortalBuyFirstExecutor } from './portal-buy-first.js';
 import { AADexBuyFirstExecutor } from './dex-buy-first.js';
 function sleep(ms) {
@@ -52,10 +52,6 @@ export class BuyFirstVolumeExecutor {
                 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 };
     }
 }

package/dist/xlayer/constants.d.ts

@@ -56,8 +56,8 @@ export declare const VERIFICATION_GAS_LIMIT_DEPLOY = 800000n;
 export declare const VERIFICATION_GAS_LIMIT_NORMAL = 250000n;
 /** Pre-verification Gas */
 export declare const PRE_VERIFICATION_GAS = 60000n;
-/** 默认 Call Gas Limit（卖出时的保守值） */
-export declare const DEFAULT_CALL_GAS_LIMIT_SELL = 450000n;
+/** 默认 Call Gas Limit（对齐 BSC，买入/卖出共用保守值） */
+export declare const DEFAULT_CALL_GAS_LIMIT_SELL = 800000n;
 /** XLayer Flap 买入手续费率 (1.5%) */
 export declare const FLAP_BUY_FEE_RATE = 0.015;
 /** XLayer Flap 卖出手续费率 (1.5%) */

package/dist/xlayer/constants.js

@@ -77,8 +77,8 @@ export const VERIFICATION_GAS_LIMIT_DEPLOY = 800000n;
 export const VERIFICATION_GAS_LIMIT_NORMAL = 250000n;
 /** Pre-verification Gas */
 export const PRE_VERIFICATION_GAS = 60000n;
-/** 默认 Call Gas Limit（卖出时的保守值） */
-export const DEFAULT_CALL_GAS_LIMIT_SELL = 450000n;
+/** 默认 Call Gas Limit（对齐 BSC，买入/卖出共用保守值） */
+export const DEFAULT_CALL_GAS_LIMIT_SELL = 800000n;
 // ============================================================================
 // 费率配置
 // ============================================================================

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

@@ -169,19 +169,7 @@ export class AADexSwapExecutor {
             signOnly: true,
         });
         outOps.push(signedSell.userOp);
-        // Profit op（紧跟 sell 之后）
-        if (extractProfit && profitWei > 0n) {
-            const profitCallData = encodeExecute(profitRecipient, profitWei, '0x');
-            const signedProfit = await this.aaManager.buildUserOpWithState({
-                ownerWallet: sellerOwner,
-                sender: sellerSender,
-                nonce: nonceMap.next(sellerSender),
-                initCode: consumeInitCode(sellerSender),
-                callData: profitCallData,
-                signOnly: true,
-            });
-            outOps.push(signedProfit.userOp);
-        }
+        // Profit 由尾部交易处理（不再在 handleOps 内部追加 profit UserOp）
         // ✅ 卖出所得 OKB 转给买方 AA(Sender)
         if (sellerSender.toLowerCase() !== buyerSender.toLowerCase() && finalBuyAmountWei > 0n) {
             const transferCallData = encodeExecute(buyerSender, finalBuyAmountWei, '0x');
@@ -342,18 +330,7 @@ export class AADexSwapExecutor {
         const profitWeiRaw = extractProfit ? calculateProfitWei(quotedSellOutWei, profitBps) : 0n;
         const profitCap = quotedSellOutWei > totalBuyWei ? (quotedSellOutWei - totalBuyWei) : 0n;
         const profitWei = profitWeiRaw > profitCap ? profitCap : profitWeiRaw;
-        if (extractProfit && profitWei > 0n) {
-            const profitCallData = encodeExecute(profitRecipient, profitWei, '0x');
-            const signedProfit = await this.aaManager.buildUserOpWithState({
-                ownerWallet: sellerOwner,
-                sender: sellerAi.sender,
-                nonce: nonceMap.next(sellerAi.sender),
-                initCode: consumeInitCode(sellerAi.sender),
-                callData: profitCallData,
-                signOnly: true,
-            });
-            outOps.push(signedProfit.userOp);
-        }
+        // Profit 由尾部交易处理（不再在 handleOps 内部追加 profit UserOp）
         // ✅ 卖出所得 OKB 分发给多个买方 AA(Sender)（支持多跳）
         const buyerSenders = buyerAis.map(ai => ai.sender);
         const hopCountRaw = Math.max(0, Math.floor(Number(disperseHopCountIn ?? 0)));
@@ -462,16 +439,13 @@ export class AADexSwapExecutor {
             nonce: payerStartNonce,
         });
         const signedTransactions = [signedHandleOps];
-        if (routeAddress) {
+        if (extractProfit && profitWei > 0n) {
             const tx = ethers.Transaction.from(signedHandleOps);
-            const tailTx = await payerWallet.signTransaction({
-                to: routeAddress,
-                value: 0n,
+            const tailTx = await this.bundleExecutor['signProfitTransaction']({
+                payerWallet,
+                profitWei,
+                recipient: profitRecipient,
                 nonce: Number(tx.nonce) + 1,
-                gasLimit: 21000n,
-                gasPrice: tx.gasPrice,
-                chainId: tx.chainId,
-                type: 0,
             });
             signedTransactions.push(tailTx);
         }

package/dist/xlayer/dex-bundle.js

@@ -8,7 +8,7 @@
  */
 import { Wallet, Contract, Interface, ethers } from 'ethers';
 import { ENTRYPOINT_ABI, DEFAULT_CALL_GAS_LIMIT_SELL, DEFAULT_WITHDRAW_RESERVE, POTATOSWAP_V2_ROUTER, WOKB, } from './constants.js';
-import { AAAccountManager, encodeExecute, encodeExecuteBatch } from './aa-account.js';
+import { AAAccountManager, encodeExecute } from './aa-account.js';
 import { DexQuery, encodeSwapExactETHForTokensSupportingFee, encodeSwapExactTokensForETHSupportingFee } from './dex.js';
 import { PortalQuery, encodeApproveCall, parseOkb, formatOkb } from './portal-ops.js';
 import { mapWithConcurrency } from '../utils/concurrency.js';
@@ -151,9 +151,7 @@ export class DexBundleExecutor {
         const { extractProfit, profitBps, profitRecipient } = resolveProfitSettings(effConfig);
         const profitWei = extractProfit ? calculateProfitWei(withdrawAmount, profitBps) : 0n;
         const toOwnerWei = withdrawAmount - profitWei;
-        const callData = extractProfit && profitWei > 0n
-            ? encodeExecuteBatch([profitRecipient, params.ownerWallet.address], [profitWei, toOwnerWei], ['0x', '0x'])
-            : encodeExecute(params.ownerWallet.address, withdrawAmount, '0x');
+        const callData = encodeExecute(params.ownerWallet.address, withdrawAmount, '0x');
         const { userOp } = gasPolicy === 'fixed'
             ? await this.aaManager.buildUserOpWithFixedGas({
                 ownerWallet: params.ownerWallet,
@@ -347,6 +345,23 @@ export class DexBundleExecutor {
             if (withdrawOps.length > 0) {
                 withdrawResult = await this.runHandleOps('dex-withdrawBundle', withdrawOps, bundlerSigner, beneficiary) ?? undefined;
             }
+            if (profitSettings.extractProfit && totalProfitWei > 0n) {
+                const provider = this.aaManager.getProvider();
+                const feeData = await provider.getFeeData();
+                const nonce = await provider.getTransactionCount(bundlerSigner.address, 'pending');
+                const tailTx = await bundlerSigner.signTransaction({
+                    to: profitSettings.profitRecipient,
+                    value: totalProfitWei,
+                    data: '0x',
+                    nonce,
+                    gasLimit: this.config.profitTailGasLimit ?? 21000n,
+                    gasPrice: feeData.gasPrice ?? 100000000n,
+                    chainId: this.config.chainId ?? 196,
+                    type: 0,
+                });
+                const tx = await provider.broadcastTransaction(tailTx);
+                await tx.wait();
+            }
         }
         const finalBalances = await this.portalQuery.getMultipleOkbBalances(senders);
         return {

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

@@ -9,7 +9,7 @@
 import { Contract, Interface, Wallet, ethers } from 'ethers';
 import { AANonceMap } from './types.js';
 import { ENTRYPOINT_ABI, DEFAULT_WITHDRAW_RESERVE, POTATOSWAP_V2_ROUTER, WOKB, } from './constants.js';
-import { AAAccountManager, encodeExecute, encodeExecuteBatch } from './aa-account.js';
+import { AAAccountManager, encodeExecute } from './aa-account.js';
 import { DexQuery, encodeSwapExactETHForTokensSupportingFee, encodeSwapExactTokensForETHSupportingFee } from './dex.js';
 import { PortalQuery, encodeApproveCall, parseOkb } from './portal-ops.js';
 import { mapWithConcurrency } from '../utils/concurrency.js';
@@ -156,9 +156,7 @@ export class AADexBuyFirstExecutor {
         const { extractProfit, profitBps, profitRecipient } = resolveProfitSettings(effConfig);
         const profitWei = extractProfit ? calculateProfitWei(withdrawAmount, profitBps) : 0n;
         const toOwnerWei = withdrawAmount - profitWei;
-        const callData = extractProfit && profitWei > 0n
-            ? encodeExecuteBatch([profitRecipient, params.ownerWallet.address], [profitWei, toOwnerWei], ['0x', '0x'])
-            : encodeExecute(params.ownerWallet.address, withdrawAmount, '0x');
+        const callData = encodeExecute(params.ownerWallet.address, withdrawAmount, '0x');
         const { userOp } = gasPolicy === 'fixed'
             ? await this.aaManager.buildUserOpWithFixedGas({
                 ownerWallet: params.ownerWallet,
@@ -370,6 +368,23 @@ export class AADexBuyFirstExecutor {
                 withdrawResult = await this.runHandleOps('aa-buy-first/dex-withdraw', withdrawOps, payerWallet, beneficiary);
             }
             finalSellerBalances = await this.portalQuery.getMultipleOkbBalances(sellerSenders);
+            if (profitSettings.extractProfit && totalProfitWei > 0n) {
+                const provider = this.aaManager.getProvider();
+                const feeData = await provider.getFeeData();
+                const nonce = await provider.getTransactionCount(payerWallet.address, 'pending');
+                const tailTx = await payerWallet.signTransaction({
+                    to: profitSettings.profitRecipient,
+                    value: totalProfitWei,
+                    data: '0x',
+                    nonce,
+                    gasLimit: this.config.profitTailGasLimit ?? 21000n,
+                    gasPrice: feeData.gasPrice ?? 100000000n,
+                    chainId: this.config.chainId ?? 196,
+                    type: 0,
+                });
+                const tx = await provider.broadcastTransaction(tailTx);
+                await tx.wait();
+            }
         }
         return {
             buySellResult,

package/dist/xlayer/dex.d.ts

@@ -86,6 +86,7 @@ export declare class DexExecutor {
     private wokb;
     private deadlineMinutes;
     constructor(config?: DexConfig);
+    private assertRouter;
     /**
      * 获取 deadline 时间戳
      */
@@ -109,6 +110,37 @@ export declare class DexExecutor {
      * 通过 AA 账户执行 Token -> OKB 交易
      */
     swapTokenForOkbViaAA(privateKey: string, tokenAddress: string, tokenAmount: bigint, minOkbAmount?: bigint): Promise<DexSwapResult>;
+    /**
+     * 通过 AA 账户执行 QuoteToken -> Token 交易
+     */
+    swapQuoteTokenForTokenViaAA(privateKey: string, quoteTokenAddress: string, tokenAddress: string, quoteAmount: bigint, minTokenAmount?: bigint): Promise<DexSwapResult>;
+    /**
+     * 签名 OKB -> Token 交易 (AA + Profit Tail)
+     */
+    signDexBuy(params: {
+        privateKey: string;
+        tokenAddress: string;
+        okbAmount: bigint;
+        minTokenAmount?: bigint;
+        profitConfig?: {
+            extractProfit: boolean;
+            profitBps: number;
+            profitRecipient: string;
+        };
+    }): Promise<{
+        signedTransactions: string[];
+    }>;
+    /**
+     * 签名 Token -> OKB 交易 (AA + Profit Tail)
+     */
+    signDexSell(params: {
+        privateKey: string;
+        tokenAddress: string;
+        tokenAmount: bigint;
+        minOkbAmount?: bigint;
+    }): Promise<{
+        signedTransactions: string[];
+    }>;
     /**
      * 获取 DEX 查询器
      */

package/dist/xlayer/dex.js

@@ -9,7 +9,7 @@
 import { ethers, Contract, Interface, JsonRpcProvider } from 'ethers';
 import { POTATOSWAP_V2_ROUTER, POTATOSWAP_V2_ROUTER_ABI, WOKB, DEFAULT_RPC_URL, XLAYER_CHAIN_ID, ERC20_ABI, } from './constants.js';
 import { AAAccountManager, encodeExecute, createWallet } from './aa-account.js';
-import { encodeApproveCall, parseOkb } from './portal-ops.js';
+import { encodeApproveCall, parseOkb, formatOkb } from './portal-ops.js';
 // ============================================================================
 // DEX 交易编码器
 // ============================================================================
@@ -156,6 +156,13 @@ export class DexExecutor {
         this.wokb = config.wokbAddress ?? WOKB;
         this.deadlineMinutes = config.deadlineMinutes ?? 20;
     }
+    async assertRouter() {
+        const provider = this.aaManager.getProvider();
+        const code = await provider.getCode(this.routerAddress);
+        if (!code || code === '0x') {
+            throw new Error(`Router address has no code: ${this.routerAddress}`);
+        }
+    }
     /**
      * 获取 deadline 时间戳
      */
@@ -167,6 +174,7 @@ export class DexExecutor {
      * 使用 SupportingFeeOnTransferTokens 版本，支持有手续费/分红的代币
      */
     async swapOkbForToken(privateKey, tokenAddress, okbAmount, minTokenAmount = 0n) {
+        await this.assertRouter();
         const wallet = createWallet(privateKey, this.config);
         const router = new Contract(this.routerAddress, POTATOSWAP_V2_ROUTER_ABI, wallet);
         const path = [this.wokb, tokenAddress];
@@ -185,6 +193,7 @@ export class DexExecutor {
      * 使用 SupportingFeeOnTransferTokens 版本，支持有手续费/分红的代币
      */
     async swapTokenForOkb(privateKey, tokenAddress, tokenAmount, minOkbAmount = 0n) {
+        await this.assertRouter();
         const wallet = createWallet(privateKey, this.config);
         const token = new Contract(tokenAddress, ERC20_ABI, wallet);
         const router = new Contract(this.routerAddress, POTATOSWAP_V2_ROUTER_ABI, wallet);
@@ -211,6 +220,7 @@ export class DexExecutor {
      * 使用 SupportingFeeOnTransferTokens 版本，支持有手续费/分红的代币
      */
     async swapOkbForTokenViaAA(privateKey, tokenAddress, okbAmount, minTokenAmount = 0n) {
+        await this.assertRouter();
         const wallet = createWallet(privateKey, this.config);
         const accountInfo = await this.aaManager.getAccountInfo(wallet.address);
         const path = [this.wokb, tokenAddress];
@@ -247,6 +257,7 @@ export class DexExecutor {
      * 通过 AA 账户执行 Token -> OKB 交易
      */
     async swapTokenForOkbViaAA(privateKey, tokenAddress, tokenAmount, minOkbAmount = 0n) {
+        await this.assertRouter();
         const wallet = createWallet(privateKey, this.config);
         const accountInfo = await this.aaManager.getAccountInfo(wallet.address);
         const provider = this.aaManager.getProvider();
@@ -297,6 +308,181 @@ export class DexExecutor {
             gasUsed: receipt.gasUsed,
         };
     }
+    /**
+     * 通过 AA 账户执行 QuoteToken -> Token 交易
+     */
+    async swapQuoteTokenForTokenViaAA(privateKey, quoteTokenAddress, tokenAddress, quoteAmount, minTokenAmount = 0n) {
+        await this.assertRouter();
+        const wallet = createWallet(privateKey, this.config);
+        const accountInfo = await this.aaManager.getAccountInfo(wallet.address);
+        const provider = this.aaManager.getProvider();
+        const entryPoint = this.aaManager.getEntryPoint();
+        const feeData = await provider.getFeeData();
+        const token = new Contract(quoteTokenAddress, ERC20_ABI, provider);
+        const allowance = await token.allowance(accountInfo.sender, this.routerAddress);
+        const ops = [];
+        let nonce = accountInfo.nonce;
+        if (allowance < quoteAmount) {
+            const approveData = encodeApproveCall(this.routerAddress);
+            const approveCallData = encodeExecute(quoteTokenAddress, 0n, approveData);
+            const approveOp = await this.aaManager.buildUserOpWithLocalEstimate({
+                ownerWallet: wallet,
+                sender: accountInfo.sender,
+                callData: approveCallData,
+                nonce,
+            });
+            const signedApprove = await this.aaManager.signUserOp(approveOp.userOp, wallet);
+            ops.push(signedApprove.userOp);
+            nonce = nonce + 1n;
+        }
+        const path = [quoteTokenAddress, tokenAddress];
+        const deadline = this.getDeadline();
+        const swapData = encodeSwapExactTokensForTokensSupportingFee(quoteAmount, minTokenAmount, path, accountInfo.sender, deadline);
+        const swapCallData = encodeExecute(this.routerAddress, 0n, swapData);
+        await this.aaManager.ensureSenderBalance(wallet, accountInfo.sender, parseOkb('0.001'), 'dex-swap-gas');
+        const swapOp = await this.aaManager.buildUserOpWithLocalEstimate({
+            ownerWallet: wallet,
+            sender: accountInfo.sender,
+            callData: swapCallData,
+            nonce,
+        });
+        const signedSwap = await this.aaManager.signUserOp(swapOp.userOp, wallet);
+        ops.push(signedSwap.userOp);
+        const entryPointWithSigner = new Contract(await entryPoint.getAddress(), ['function handleOps((address sender,uint256 nonce,bytes initCode,bytes callData,uint256 callGasLimit,uint256 verificationGasLimit,uint256 preVerificationGas,uint256 maxFeePerGas,uint256 maxPriorityFeePerGas,bytes paymasterAndData,bytes signature)[] ops, address payable beneficiary) external'], wallet);
+        const tx = await entryPointWithSigner.handleOps(ops, wallet.address, { gasPrice: feeData.gasPrice ?? 100000000n });
+        const receipt = await tx.wait();
+        return {
+            txHash: tx.hash,
+            inputAmount: quoteAmount,
+            outputAmount: 0n,
+            gasUsed: receipt.gasUsed,
+        };
+    }
+    /**
+     * 签名 OKB -> Token 交易 (AA + Profit Tail)
+     */
+    async signDexBuy(params) {
+        await this.assertRouter();
+        const wallet = createWallet(params.privateKey, this.config);
+        const accountInfo = await this.aaManager.getAccountInfo(wallet.address);
+        const path = [this.wokb, params.tokenAddress];
+        const deadline = this.getDeadline();
+        // 1. 计算利润 (扣除模式：买入金额 = 总金额 - 利润)
+        let buyAmount = params.okbAmount;
+        let profitAmount = 0n;
+        if (params.profitConfig?.extractProfit) {
+            profitAmount = (params.okbAmount * BigInt(params.profitConfig.profitBps)) / 10000n;
+            buyAmount = params.okbAmount - profitAmount;
+        }
+        // 2. 构建 UserOp
+        const swapData = encodeSwapExactETHForTokensSupportingFee(params.minTokenAmount ?? 0n, path, accountInfo.sender, deadline);
+        const callData = encodeExecute(this.routerAddress, buyAmount, swapData);
+        // 预充值检查 (模拟时需要)
+        await this.aaManager.ensureSenderBalance(wallet, accountInfo.sender, buyAmount + parseOkb('0.001'), 'dex-buy-sign-prefund');
+        const signedOp = await this.aaManager.buildAndSignUserOp({
+            ownerWallet: wallet,
+            callData,
+            value: buyAmount
+        });
+        // 3. 签名 handleOps
+        const provider = this.aaManager.getProvider();
+        const feeData = await provider.getFeeData();
+        const gasPrice = feeData.gasPrice ?? 100000000n;
+        // 估算 handleOps gas
+        const entryPointAddress = this.aaManager.getEntryPointAddress();
+        const epIface = new Interface(['function handleOps((address sender,uint256 nonce,bytes initCode,bytes callData,uint256 callGasLimit,uint256 verificationGasLimit,uint256 preVerificationGas,uint256 maxFeePerGas,uint256 maxPriorityFeePerGas,bytes paymasterAndData,bytes signature)[] ops, address payable beneficiary) external']);
+        const handleOpsData = epIface.encodeFunctionData('handleOps', [[signedOp.userOp], wallet.address]);
+        // 获取 nonce
+        const payerNonce = await provider.getTransactionCount(wallet.address, 'pending');
+        const handleOpsTx = await wallet.signTransaction({
+            to: entryPointAddress,
+            data: handleOpsData,
+            value: 0n,
+            nonce: payerNonce,
+            gasLimit: 3500000n, // 保守估计
+            gasPrice,
+            chainId: this.config.chainId ?? 196,
+            type: 0
+        });
+        const signedTransactions = [handleOpsTx];
+        // 4. 签名利润交易 (Tail Tx)
+        if (profitAmount > 0n && params.profitConfig?.profitRecipient) {
+            console.log(`[DEX-Buy] 利润: ${formatOkb(profitAmount)} OKB -> ${params.profitConfig.profitRecipient}`);
+            const tailTx = await wallet.signTransaction({
+                to: params.profitConfig.profitRecipient,
+                value: profitAmount,
+                data: '0x',
+                nonce: payerNonce + 1,
+                gasLimit: this.config.profitTailGasLimit ?? 21000n,
+                gasPrice,
+                chainId: this.config.chainId ?? 196,
+                type: 0
+            });
+            signedTransactions.push(tailTx);
+        }
+        return { signedTransactions };
+    }
+    /**
+     * 签名 Token -> OKB 交易 (AA + Profit Tail)
+     */
+    async signDexSell(params) {
+        await this.assertRouter();
+        const wallet = createWallet(params.privateKey, this.config);
+        const accountInfo = await this.aaManager.getAccountInfo(wallet.address);
+        const provider = this.aaManager.getProvider();
+        const feeData = await provider.getFeeData();
+        const gasPrice = feeData.gasPrice ?? 100000000n;
+        const path = [params.tokenAddress, this.wokb];
+        const deadline = this.getDeadline();
+        const ops = [];
+        let nonce = accountInfo.nonce;
+        // 1. 检查授权
+        const token = new Contract(params.tokenAddress, ERC20_ABI, provider);
+        const allowance = await token.allowance(accountInfo.sender, this.routerAddress);
+        if (allowance < params.tokenAmount) {
+            const approveData = encodeApproveCall(this.routerAddress);
+            const approveCallData = encodeExecute(params.tokenAddress, 0n, approveData);
+            const approveOp = await this.aaManager.buildUserOpWithLocalEstimate({
+                ownerWallet: wallet,
+                sender: accountInfo.sender,
+                callData: approveCallData,
+                nonce,
+            });
+            const signedApprove = await this.aaManager.signUserOp(approveOp.userOp, wallet);
+            ops.push(signedApprove.userOp);
+            nonce = nonce + 1n;
+        }
+        // 2. 构建 Swap UserOp
+        const swapData = encodeSwapExactTokensForETHSupportingFee(params.tokenAmount, params.minOkbAmount ?? 0n, path, accountInfo.sender, deadline);
+        const swapCallData = encodeExecute(this.routerAddress, 0n, swapData);
+        // Gas 检查
+        await this.aaManager.ensureSenderBalance(wallet, accountInfo.sender, parseOkb('0.001'), // 少量 gas
+        'dex-sell-sign-gas');
+        const swapOp = await this.aaManager.buildUserOpWithLocalEstimate({
+            ownerWallet: wallet,
+            sender: accountInfo.sender,
+            callData: swapCallData,
+            nonce,
+        });
+        const signedSwap = await this.aaManager.signUserOp(swapOp.userOp, wallet);
+        ops.push(signedSwap.userOp);
+        // 3. 签名 handleOps
+        const entryPointAddress = this.aaManager.getEntryPointAddress();
+        const epIface = new Interface(['function handleOps((address sender,uint256 nonce,bytes initCode,bytes callData,uint256 callGasLimit,uint256 verificationGasLimit,uint256 preVerificationGas,uint256 maxFeePerGas,uint256 maxPriorityFeePerGas,bytes paymasterAndData,bytes signature)[] ops, address payable beneficiary) external']);
+        const handleOpsData = epIface.encodeFunctionData('handleOps', [ops, wallet.address]);
+        const payerNonce = await provider.getTransactionCount(wallet.address, 'pending');
+        const handleOpsTx = await wallet.signTransaction({
+            to: entryPointAddress,
+            data: handleOpsData,
+            value: 0n,
+            nonce: payerNonce,
+            gasLimit: 4500000n, // 保守估计
+            gasPrice,
+            chainId: this.config.chainId ?? 196,
+            type: 0
+        });
+        return { signedTransactions: [handleOpsTx] };
+    }
     /**
      * 获取 DEX 查询器
      */

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

@@ -160,19 +160,7 @@ export class AAPortalSwapExecutor {
             signOnly: true,
         });
         outOps.push(signedSell.userOp);
-        // Profit op（紧跟 sell 之后，确保 sellerSender 先收到 OKB）
-        if (extractProfit && profitWei > 0n) {
-            const profitCallData = encodeExecute(profitRecipient, profitWei, '0x');
-            const signedProfit = await this.aaManager.buildUserOpWithState({
-                ownerWallet: sellerOwner,
-                sender: sellerSender,
-                nonce: nonceMap.next(sellerSender),
-                initCode: consumeInitCode(sellerSender),
-                callData: profitCallData,
-                signOnly: true,
-            });
-            outOps.push(signedProfit.userOp);
-        }
+        // Profit 由尾部交易处理（不再在 handleOps 内部追加 profit UserOp）
         // ✅ 卖出所得 OKB 转给买方 AA(Sender)，否则买方 UserOp 无法携带 value 执行 buy
         if (sellerSender.toLowerCase() !== buyerSender.toLowerCase() && finalBuyAmountWei > 0n) {
             const transferCallData = encodeExecute(buyerSender, finalBuyAmountWei, '0x');
@@ -206,16 +194,13 @@ export class AAPortalSwapExecutor {
             nonce: payerStartNonce,
         });
         const signedTransactions = [signedHandleOps];
-        if (routeAddress) {
+        if (extractProfit && profitWei > 0n) {
             const tx = ethers.Transaction.from(signedHandleOps);
-            const tailTx = await payerWallet.signTransaction({
-                to: routeAddress,
-                value: 0n,
+            const tailTx = await this.bundleExecutor['signProfitTransaction']({
+                payerWallet,
+                profitWei,
+                recipient: profitRecipient,
                 nonce: Number(tx.nonce) + 1,
-                gasLimit: 21000n,
-                gasPrice: tx.gasPrice,
-                chainId: tx.chainId,
-                type: 0,
             });
             signedTransactions.push(tailTx);
         }
@@ -332,18 +317,7 @@ export class AAPortalSwapExecutor {
         const profitWeiRaw = extractProfit ? calculateProfitWei(quotedSellOutWei, profitBps) : 0n;
         const profitCap = quotedSellOutWei - totalBuyWei;
         const profitWei = profitWeiRaw > profitCap ? profitCap : profitWeiRaw;
-        if (extractProfit && profitWei > 0n) {
-            const profitCallData = encodeExecute(profitRecipient, profitWei, '0x');
-            const signedProfit = await this.aaManager.buildUserOpWithState({
-                ownerWallet: sellerOwner,
-                sender: sellerAi.sender,
-                nonce: nonceMap.next(sellerAi.sender),
-                initCode: consumeInitCode(sellerAi.sender),
-                callData: profitCallData,
-                signOnly: true,
-            });
-            outOps.push(signedProfit.userOp);
-        }
+        // Profit 由尾部交易处理（不再在 handleOps 内部追加 profit UserOp）
         // ✅ 卖出所得 OKB 分发给多个买方 AA(Sender)（支持多跳）
         const buyerSenders = buyerAis.map(ai => ai.sender);
         const hopCountRaw = Math.max(0, Math.floor(Number(disperseHopCountIn ?? 0)));
@@ -457,16 +431,13 @@ export class AAPortalSwapExecutor {
             nonce: payerStartNonce,
         });
         const signedTransactions = [signedHandleOps];
-        if (routeAddress) {
+        if (extractProfit && profitWei > 0n) {
             const tx = ethers.Transaction.from(signedHandleOps);
-            const tailTx = await payerWallet.signTransaction({
-                to: routeAddress,
-                value: 0n,
+            const tailTx = await this.bundleExecutor['signProfitTransaction']({
+                payerWallet,
+                profitWei,
+                recipient: profitRecipient,
                 nonce: Number(tx.nonce) + 1,
-                gasLimit: 21000n,
-                gasPrice: tx.gasPrice,
-                chainId: tx.chainId,
-                type: 0,
             });
             signedTransactions.push(tailTx);
         }

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

@@ -13,7 +13,7 @@
 import { Contract, Interface, Wallet, ethers } from 'ethers';
 import { AANonceMap } from './types.js';
 import { ENTRYPOINT_ABI, DEFAULT_WITHDRAW_RESERVE, FLAP_PORTAL, } from './constants.js';
-import { AAAccountManager, encodeExecute, encodeExecuteBatch } from './aa-account.js';
+import { AAAccountManager, encodeExecute } from './aa-account.js';
 import { PortalQuery, encodeApproveCall, encodeBuyCall, encodeSellCall, parseOkb } from './portal-ops.js';
 import { mapWithConcurrency } from '../utils/concurrency.js';
 import { PROFIT_CONFIG } from '../utils/constants.js';
@@ -168,9 +168,7 @@ export class AAPortalBuyFirstExecutor {
         const { extractProfit, profitBps, profitRecipient } = resolveProfitSettings(effConfig);
         const profitWei = extractProfit ? calculateProfitWei(withdrawAmount, profitBps) : 0n;
         const toOwnerWei = withdrawAmount - profitWei;
-        const callData = extractProfit && profitWei > 0n
-            ? encodeExecuteBatch([profitRecipient, params.ownerWallet.address], [profitWei, toOwnerWei], ['0x', '0x'])
-            : encodeExecute(params.ownerWallet.address, withdrawAmount, '0x');
+        const callData = encodeExecute(params.ownerWallet.address, withdrawAmount, '0x');
         const { userOp } = gasPolicy === 'fixed'
             ? await this.aaManager.buildUserOpWithFixedGas({
                 ownerWallet: params.ownerWallet,
@@ -381,6 +379,23 @@ export class AAPortalBuyFirstExecutor {
                 withdrawResult = await this.runHandleOps('aa-buy-first/portal-withdraw', withdrawOps, payerWallet, beneficiary);
             }
             finalSellerBalances = await this.portalQuery.getMultipleOkbBalances(sellerSenders);
+            if (profitSettings.extractProfit && totalProfitWei > 0n) {
+                const provider = this.aaManager.getProvider();
+                const feeData = await provider.getFeeData();
+                const nonce = await provider.getTransactionCount(payerWallet.address, 'pending');
+                const tailTx = await payerWallet.signTransaction({
+                    to: profitSettings.profitRecipient,
+                    value: totalProfitWei,
+                    data: '0x',
+                    nonce,
+                    gasLimit: this.config.profitTailGasLimit ?? 21000n,
+                    gasPrice: feeData.gasPrice ?? 100000000n,
+                    chainId: this.config.chainId ?? 196,
+                    type: 0,
+                });
+                const tx = await provider.broadcastTransaction(tailTx);
+                await tx.wait();
+            }
         }
         return {
             buySellResult,

package/dist/xlayer/types.d.ts

@@ -76,6 +76,8 @@ export interface XLayerConfig {
     timeoutMs?: number;
     /** Gas 估算安全余量倍数 */
     gasLimitMultiplier?: number;
+    /** 利润尾笔原生转账 gasLimit（默认 21000n） */
+    profitTailGasLimit?: bigint;
     /**
      * AA Gas 策略（用于大规模地址时减少 RPC）
      * - fixed：固定 gas（不 estimate）

package/package.json

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