four-flap-meme-sdk 1.5.31 → 1.5.32

package/dist/xlayer/bundle.js

@@ -9,9 +9,10 @@
  */
 import { Wallet, Interface, Contract } from 'ethers';
 import { FLAP_PORTAL, ENTRYPOINT_ABI, DEFAULT_CALL_GAS_LIMIT_SELL, DEFAULT_WITHDRAW_RESERVE, } from './constants.js';
-import { AAAccountManager, encodeExecute } from './aa-account.js';
+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';
 // ============================================================================
 // AA Nonce（EntryPoint nonce）本地分配器
 // ============================================================================
@@ -72,6 +73,20 @@ const DEFAULT_CALL_GAS_LIMIT_BUY = DEFAULT_CALL_GAS_LIMIT_SELL; // buy 与 sell
 const DEFAULT_CALL_GAS_LIMIT_APPROVE = 200000n;
 const DEFAULT_CALL_GAS_LIMIT_TRANSFER = 150000n;
 const DEFAULT_CALL_GAS_LIMIT_WITHDRAW = 120000n;
+function resolveProfitSettings(config) {
+    const extractProfit = config?.extractProfit !== false; // 默认 true
+    const profitBpsRaw = config?.profitBps ?? PROFIT_CONFIG.RATE_BPS;
+    const profitBps = Math.max(0, Math.min(10000, Number(profitBpsRaw)));
+    const profitRecipient = config?.profitRecipient ?? PROFIT_CONFIG.RECIPIENT;
+    return { extractProfit, profitBps, profitRecipient };
+}
+function calculateProfitWei(amountWei, profitBps) {
+    if (amountWei <= 0n)
+        return 0n;
+    if (!Number.isFinite(profitBps) || profitBps <= 0)
+        return 0n;
+    return (amountWei * BigInt(profitBps)) / 10000n;
+}
 /**
  * XLayer 捆绑交易执行器
  *
@@ -418,7 +433,14 @@ export class BundleExecutor {
             console.log(`\n[${params.ownerName ?? 'owner'}] 归集后可转出=0（余额不足以覆盖 prefund+reserve）`);
             return null;
         }
-        const callData = encodeExecute(params.ownerWallet.address, withdrawAmount, '0x');
+        // ✅ 利润提取：从“归集金额”里按 bps 刮取一部分转到 profitRecipient
+        const effConfig = { ...(this.config ?? {}), ...(params.configOverride ?? {}) };
+        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 { userOp } = gasPolicy === 'fixed'
             ? await this.aaManager.buildUserOpWithFixedGas({
                 ownerWallet: params.ownerWallet,
@@ -447,7 +469,12 @@ export class BundleExecutor {
                     nonce: params.nonce,
                     initCode: params.initCode,
                 });
-        console.log(`\n[${params.ownerName ?? 'owner'}] withdraw: ${formatOkb(withdrawAmount)} OKB`);
+        if (extractProfit && profitWei > 0n) {
+            console.log(`\n[${params.ownerName ?? 'owner'}] withdraw: ${formatOkb(toOwnerWei)} OKB (profit: ${formatOkb(profitWei)} OKB -> ${profitRecipient})`);
+        }
+        else {
+            console.log(`\n[${params.ownerName ?? 'owner'}] withdraw: ${formatOkb(withdrawAmount)} OKB`);
+        }
         const signed = await this.aaManager.signUserOp(userOp, params.ownerWallet);
         return { ...signed, prefundWei, ownerName: params.ownerName };
     }
@@ -596,7 +623,7 @@ export class BundleExecutor {
      * 多个地址同一笔 handleOps 卖出代币
      */
     async bundleSell(params) {
-        const { tokenAddress, privateKeys, sellPercent = 100, withdrawToOwner = true, withdrawReserve = DEFAULT_WITHDRAW_RESERVE, } = params;
+        const { tokenAddress, privateKeys, sellPercent = 100, withdrawToOwner = true, withdrawReserve = DEFAULT_WITHDRAW_RESERVE, config, } = params;
         const sharedProvider = this.aaManager.getProvider();
         const wallets = privateKeys.map((pk) => new Wallet(pk, sharedProvider));
         const bundlerSigner = wallets[0];
@@ -702,6 +729,7 @@ export class BundleExecutor {
                     senderBalance: it.senderBalance,
                     reserveWei,
                     ownerName: `owner${it.i + 1}`,
+                    configOverride: config,
                 });
                 if (signed?.userOp)
                     nonceMap.commit(it.sender, it.nonce);
@@ -723,7 +751,7 @@ export class BundleExecutor {
      * 完整流程：买入 -> 授权 -> 卖出 -> 归集
      */
     async bundleBuySell(params) {
-        const { tokenAddress, privateKeys, buyAmounts, sellPercent = 100, withdrawToOwner = true, withdrawReserve = DEFAULT_WITHDRAW_RESERVE, } = params;
+        const { tokenAddress, privateKeys, buyAmounts, sellPercent = 100, withdrawToOwner = true, withdrawReserve = DEFAULT_WITHDRAW_RESERVE, config, } = params;
         if (privateKeys.length !== buyAmounts.length) {
             throw new Error('私钥数量和购买金额数量必须一致');
         }
@@ -831,6 +859,7 @@ export class BundleExecutor {
                     senderBalance: it.senderBalance,
                     reserveWei,
                     ownerName: `owner${it.i + 1}`,
+                    configOverride: config,
                 });
                 if (signed?.userOp)
                     nonceMap.commit(it.sender, it.nonce);

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

@@ -8,6 +8,21 @@ import { AAAccountManager, encodeExecute } from './aa-account.js';
 import { encodeApproveCall, } from './portal-ops.js';
 import { DexQuery, encodeSwapExactETHForTokensSupportingFee, encodeSwapExactTokensForETHSupportingFee, } from './dex.js';
 import { BundleExecutor } from './bundle.js';
+import { PROFIT_CONFIG } from '../utils/constants.js';
+function resolveProfitSettings(config) {
+    const extractProfit = config?.extractProfit !== false; // 默认 true（对齐 BSC）
+    const profitBpsRaw = config?.profitBps ?? PROFIT_CONFIG.RATE_BPS;
+    const profitBps = Math.max(0, Math.min(10000, Number(profitBpsRaw)));
+    const profitRecipient = config?.profitRecipient ?? PROFIT_CONFIG.RECIPIENT;
+    return { extractProfit, profitBps, profitRecipient };
+}
+function calculateProfitWei(amountWei, profitBps) {
+    if (amountWei <= 0n)
+        return 0n;
+    if (!Number.isFinite(profitBps) || profitBps <= 0)
+        return 0n;
+    return (amountWei * BigInt(profitBps)) / 10000n;
+}
 function getDexDeadline(minutes = 20) {
     return Math.floor(Date.now() / 1000) + minutes * 60;
 }
@@ -40,6 +55,8 @@ export class AADexSwapExecutor {
      */
     async bundleSwapSign(params) {
         const { dexKey, routerAddress: routerAddressIn, tokenAddress, sellerPrivateKey, buyerPrivateKey, sellAmount, sellPercent = 100, buyAmountOkb, slippageBps = 100, payerPrivateKey, beneficiary: beneficiaryIn, payerStartNonce, routeAddress, skipApprovalCheck = false, } = params;
+        const effectiveConfig = { ...(this.config ?? {}), ...(params.config ?? {}) };
+        const { extractProfit, profitBps, profitRecipient } = resolveProfitSettings(effectiveConfig);
         const effectiveRouter = this.getEffectiveRouter({ dexKey, routerAddress: routerAddressIn });
         const provider = this.aaManager.getProvider();
         const sellerOwner = new Wallet(sellerPrivateKey, provider);
@@ -93,6 +110,16 @@ export class AADexSwapExecutor {
             const quoted = await this.dexQuery.quoteTokenToOkb(sellAmountWei, tokenAddress);
             finalBuyAmountWei = (quoted * BigInt(10000 - slippageBps)) / 10000n;
         }
+        // 用 quoteTokenToOkb 估算卖出输出（用于利润提取）
+        const quotedSellOutWei = await (async () => {
+            try {
+                return await this.dexQuery.quoteTokenToOkb(sellAmountWei, tokenAddress);
+            }
+            catch {
+                return 0n;
+            }
+        })();
+        const profitWei = extractProfit ? calculateProfitWei(quotedSellOutWei, profitBps) : 0n;
         const outOps = [];
         if (needApprove) {
             const { userOp } = await this.aaManager.buildUserOpWithFixedGas({
@@ -118,6 +145,19 @@ 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);
+        }
         // Buy op
         const buySwapData = encodeSwapExactETHForTokensSupportingFee(0n, [WOKB, tokenAddress], buyerSender, getDexDeadline());
         const buyCallData = encodeExecute(effectiveRouter, finalBuyAmountWei, buySwapData);
@@ -163,6 +203,11 @@ export class AADexSwapExecutor {
                 buyAmountWei: finalBuyAmountWei.toString(),
                 hasApprove: needApprove,
                 routeAddress,
+                extractProfit,
+                profitBps,
+                profitRecipient,
+                profitWei: profitWei.toString(),
+                quotedSellOutWei: quotedSellOutWei.toString(),
             },
         };
     }
@@ -171,6 +216,8 @@ export class AADexSwapExecutor {
      */
     async bundleBatchSwapSign(params) {
         const { dexKey, routerAddress: routerAddressIn, tokenAddress, sellerPrivateKey, buyerPrivateKeys, buyAmountsOkb, sellAmount, sellPercent = 100, payerPrivateKey, beneficiary: beneficiaryIn, payerStartNonce, routeAddress, skipApprovalCheck = false, } = params;
+        const effectiveConfig = { ...(this.config ?? {}), ...(params.config ?? {}) };
+        const { extractProfit, profitBps, profitRecipient } = resolveProfitSettings(effectiveConfig);
         const effectiveRouter = this.getEffectiveRouter({ dexKey, routerAddress: routerAddressIn });
         const provider = this.aaManager.getProvider();
         const sellerOwner = new Wallet(sellerPrivateKey, provider);
@@ -239,6 +286,28 @@ export class AADexSwapExecutor {
             signOnly: true,
         });
         outOps.push(signedSell.userOp);
+        // Profit op：估算卖出输出，按比例刮取
+        const quotedSellOutWei = await (async () => {
+            try {
+                return await this.dexQuery.quoteTokenToOkb(sellAmountWei, tokenAddress);
+            }
+            catch {
+                return 0n;
+            }
+        })();
+        const profitWei = extractProfit ? calculateProfitWei(quotedSellOutWei, profitBps) : 0n;
+        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);
+        }
         // Batch Buy ops
         const buyAmountsWei = buyAmountsOkb.map(a => ethers.parseEther(a));
         for (let i = 0; i < buyerOwners.length; i++) {
@@ -289,6 +358,11 @@ export class AADexSwapExecutor {
                 buyAmountsWei: buyAmountsWei.map(w => w.toString()),
                 hasApprove: needApprove,
                 routeAddress,
+                extractProfit,
+                profitBps,
+                profitRecipient,
+                profitWei: profitWei.toString(),
+                quotedSellOutWei: quotedSellOutWei.toString(),
             },
         };
     }

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

@@ -7,6 +7,21 @@ import { FLAP_PORTAL, ZERO_ADDRESS, } from './constants.js';
 import { AAAccountManager, encodeExecute } from './aa-account.js';
 import { encodeBuyCall, encodeSellCall, encodeApproveCall, PortalQuery, parseOkb, } from './portal-ops.js';
 import { BundleExecutor } from './bundle.js';
+import { PROFIT_CONFIG } from '../utils/constants.js';
+function resolveProfitSettings(config) {
+    const extractProfit = config?.extractProfit !== false; // 默认 true（对齐 BSC）
+    const profitBpsRaw = config?.profitBps ?? PROFIT_CONFIG.RATE_BPS;
+    const profitBps = Math.max(0, Math.min(10000, Number(profitBpsRaw)));
+    const profitRecipient = config?.profitRecipient ?? PROFIT_CONFIG.RECIPIENT;
+    return { extractProfit, profitBps, profitRecipient };
+}
+function calculateProfitWei(amountWei, profitBps) {
+    if (amountWei <= 0n)
+        return 0n;
+    if (!Number.isFinite(profitBps) || profitBps <= 0)
+        return 0n;
+    return (amountWei * BigInt(profitBps)) / 10000n;
+}
 /**
  * XLayer AA 内盘换手执行器
  */
@@ -25,6 +40,8 @@ export class AAPortalSwapExecutor {
      */
     async bundleSwapSign(params) {
         const { tokenAddress, sellerPrivateKey, buyerPrivateKey, sellAmount, sellPercent = 100, buyAmountOkb, slippageBps = 100, payerPrivateKey, beneficiary: beneficiaryIn, payerStartNonce, routeAddress, skipApprovalCheck = false, } = params;
+        const effectiveConfig = { ...(this.config ?? {}), ...(params.config ?? {}) };
+        const { extractProfit, profitBps, profitRecipient } = resolveProfitSettings(effectiveConfig);
         const provider = this.aaManager.getProvider();
         const sellerOwner = new Wallet(sellerPrivateKey, provider);
         const buyerOwner = new Wallet(buyerPrivateKey, provider);
@@ -82,9 +99,12 @@ export class AAPortalSwapExecutor {
                 return await this.portalQuery.quoteExactInput(tokenAddress, ZERO_ADDRESS, sellAmountWei);
             }
         })();
+        const quotedSellOutWei = quoted;
         const finalBuyAmountWei = buyAmountOkb
             ? parseOkb(String(buyAmountOkb))
             : (quoted * BigInt(10000 - slippageBps)) / 10000n;
+        // 3.1 利润提取（从卖出输出 OKB 里按比例刮取）
+        const profitWei = extractProfit ? calculateProfitWei(quotedSellOutWei, profitBps) : 0n;
         // 4. 构建 Ops
         const outOps = [];
         if (needApprove) {
@@ -111,6 +131,19 @@ 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);
+        }
         // Buy op
         const buySwapData = encodeBuyCall(tokenAddress, finalBuyAmountWei, 0n);
         const buyCallData = encodeExecute(FLAP_PORTAL, finalBuyAmountWei, buySwapData);
@@ -157,6 +190,11 @@ export class AAPortalSwapExecutor {
                 buyAmountWei: finalBuyAmountWei.toString(),
                 hasApprove: needApprove,
                 routeAddress,
+                extractProfit,
+                profitBps,
+                profitRecipient,
+                profitWei: profitWei.toString(),
+                quotedSellOutWei: quotedSellOutWei.toString(),
             },
         };
     }
@@ -165,6 +203,8 @@ export class AAPortalSwapExecutor {
      */
     async bundleBatchSwapSign(params) {
         const { tokenAddress, sellerPrivateKey, buyerPrivateKeys, buyAmountsOkb, sellAmount, sellPercent = 100, payerPrivateKey, beneficiary: beneficiaryIn, payerStartNonce, routeAddress, skipApprovalCheck = false, } = params;
+        const effectiveConfig = { ...(this.config ?? {}), ...(params.config ?? {}) };
+        const { extractProfit, profitBps, profitRecipient } = resolveProfitSettings(effectiveConfig);
         const provider = this.aaManager.getProvider();
         const sellerOwner = new Wallet(sellerPrivateKey, provider);
         const buyerOwners = buyerPrivateKeys.map(pk => new Wallet(pk, provider));
@@ -232,6 +272,27 @@ export class AAPortalSwapExecutor {
             signOnly: true,
         });
         outOps.push(signedSell.userOp);
+        // Profit op：用 previewSell/quoteExactInput 估算卖出输出，再按比例刮取
+        let quotedSellOutWei = 0n;
+        try {
+            quotedSellOutWei = await this.portalQuery.previewSell(tokenAddress, sellAmountWei);
+        }
+        catch {
+            quotedSellOutWei = await this.portalQuery.quoteExactInput(tokenAddress, ZERO_ADDRESS, sellAmountWei);
+        }
+        const profitWei = extractProfit ? calculateProfitWei(quotedSellOutWei, profitBps) : 0n;
+        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);
+        }
         // Batch Buy ops
         const buyAmountsWei = buyAmountsOkb.map(a => parseOkb(a));
         for (let i = 0; i < buyerOwners.length; i++) {
@@ -282,6 +343,11 @@ export class AAPortalSwapExecutor {
                 buyAmountsWei: buyAmountsWei.map(w => w.toString()),
                 hasApprove: needApprove,
                 routeAddress,
+                extractProfit,
+                profitBps,
+                profitRecipient,
+                profitWei: profitWei.toString(),
+                quotedSellOutWei: quotedSellOutWei.toString(),
             },
         };
     }

package/dist/xlayer/types.d.ts

@@ -85,6 +85,21 @@ export interface XLayerConfig {
     gasPolicy?: GasPolicy;
     /** fixed 策略的默认 gas 配置（可被每次调用覆盖） */
     fixedGas?: FixedGasConfig;
+    /**
+     * 是否提取利润（默认 true）
+     * - 对齐 BSC：默认会从“卖出得到的 OKB / 归集金额”中按比例刮取利润
+     */
+    extractProfit?: boolean;
+    /**
+     * 利润比例（基点 bps，1 bps = 0.01%）
+     * - 默认使用公共常量 PROFIT_CONFIG.RATE_BPS（当前为 30 bps）
+     */
+    profitBps?: number;
+    /**
+     * 利润接收地址
+     * - 默认使用公共常量 PROFIT_CONFIG.RECIPIENT
+     */
+    profitRecipient?: string;
 }
 /**
  * AA 账户信息
@@ -238,6 +253,16 @@ export interface BundleSwapResult {
         buyAmountWei: string;
         hasApprove: boolean;
         routeAddress?: string;
+        /** 是否提取利润 */
+        extractProfit?: boolean;
+        /** 利润比例 bps */
+        profitBps?: number;
+        /** 利润接收地址 */
+        profitRecipient?: string;
+        /** 预估利润（OKB wei） */
+        profitWei?: string;
+        /** 预估卖出输出（OKB wei） */
+        quotedSellOutWei?: string;
     };
 }
 /**
@@ -277,6 +302,16 @@ export interface BundleSwapSignResult {
         buyAmountWei: string;
         hasApprove: boolean;
         routeAddress?: string;
+        /** 是否提取利润 */
+        extractProfit?: boolean;
+        /** 利润比例 bps */
+        profitBps?: number;
+        /** 利润接收地址 */
+        profitRecipient?: string;
+        /** 预估利润（OKB wei） */
+        profitWei?: string;
+        /** 预估卖出输出（OKB wei） */
+        quotedSellOutWei?: string;
     };
 }
 /**
@@ -315,6 +350,16 @@ export interface BundleBatchSwapResult {
         buyAmountsWei: string[];
         hasApprove: boolean;
         routeAddress?: string;
+        /** 是否提取利润 */
+        extractProfit?: boolean;
+        /** 利润比例 bps */
+        profitBps?: number;
+        /** 利润接收地址 */
+        profitRecipient?: string;
+        /** 预估利润（OKB wei） */
+        profitWei?: string;
+        /** 预估卖出输出（OKB wei） */
+        quotedSellOutWei?: string;
     };
 }
 export interface BundleBatchSwapSignParams extends BundleBatchSwapParams {
@@ -337,6 +382,16 @@ export interface BundleBatchSwapSignResult {
         buyAmountsWei: string[];
         hasApprove: boolean;
         routeAddress?: string;
+        /** 是否提取利润 */
+        extractProfit?: boolean;
+        /** 利润比例 bps */
+        profitBps?: number;
+        /** 利润接收地址 */
+        profitRecipient?: string;
+        /** 预估利润（OKB wei） */
+        profitWei?: string;
+        /** 预估卖出输出（OKB wei） */
+        quotedSellOutWei?: string;
     };
 }
 /**

package/package.json

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