four-flap-meme-sdk 1.5.31 → 1.5.33

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

@@ -3,10 +3,47 @@
  */
 import { Wallet, ethers } from 'ethers';
 import { AANonceMap, } from './types.js';
-import { FLAP_PORTAL, ZERO_ADDRESS, } from './constants.js';
+import { FLAP_PORTAL, ZERO_ADDRESS, MULTICALL3, } 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';
+const multicallIface = new ethers.Interface([
+    'function aggregate3Value((address target,bool allowFailure,uint256 value,bytes callData)[] calls) payable returns ((bool success,bytes returnData)[] returnData)',
+]);
+function chunkArray(arr, size) {
+    const out = [];
+    const n = Math.max(1, Math.floor(size));
+    for (let i = 0; i < arr.length; i += n)
+        out.push(arr.slice(i, i + n));
+    return out;
+}
+function encodeNativeDisperseViaMulticall3(params) {
+    const calls = params.to.map((target, idx) => ({
+        target,
+        allowFailure: false,
+        value: params.values[idx] ?? 0n,
+        callData: '0x',
+    }));
+    const totalValue = params.values.reduce((a, b) => a + (b ?? 0n), 0n);
+    const data = multicallIface.encodeFunctionData('aggregate3Value', [calls]);
+    return { totalValue, data };
+}
+function resolveProfitSettings(config) {
+    const extractProfit = config?.extractProfit !== false; // 默认 true（对齐 BSC）
+    // ✅ 对齐 BSC “捆绑换手模式”默认费率
+    const profitBpsRaw = config?.profitBps ?? PROFIT_CONFIG.RATE_BPS_SWAP;
+    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 内盘换手执行器
  */
@@ -24,7 +61,9 @@ export class AAPortalSwapExecutor {
      * AA 内盘单钱包换手签名
      */
     async bundleSwapSign(params) {
-        const { tokenAddress, sellerPrivateKey, buyerPrivateKey, sellAmount, sellPercent = 100, buyAmountOkb, slippageBps = 100, payerPrivateKey, beneficiary: beneficiaryIn, payerStartNonce, routeAddress, skipApprovalCheck = false, } = params;
+        const { tokenAddress, sellerPrivateKey, buyerPrivateKey, sellAmount, sellPercent = 100, buyAmountOkb, slippageBps = 100, disperseHopCount: disperseHopCountIn, 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 +121,19 @@ export class AAPortalSwapExecutor {
                 return await this.portalQuery.quoteExactInput(tokenAddress, ZERO_ADDRESS, sellAmountWei);
             }
         })();
-        const finalBuyAmountWei = buyAmountOkb
+        const quotedSellOutWei = quoted;
+        // 3.1 利润提取（从卖出输出 OKB 里按比例刮取；但必须保证买入资金充足）
+        const requestedBuyWei = buyAmountOkb
             ? parseOkb(String(buyAmountOkb))
-            : (quoted * BigInt(10000 - slippageBps)) / 10000n;
+            : (quotedSellOutWei * BigInt(10000 - slippageBps)) / 10000n;
+        if (requestedBuyWei > quotedSellOutWei) {
+            throw new Error('AA 捆绑换手：buyAmountOkb 超过预估卖出输出（quotedSellOut）');
+        }
+        const profitWeiRaw = extractProfit ? calculateProfitWei(quotedSellOutWei, profitBps) : 0n;
+        const profitCap = quotedSellOutWei - requestedBuyWei;
+        const profitWei = profitWeiRaw > profitCap ? profitCap : profitWeiRaw;
+        const finalBuyAmountWei = requestedBuyWei;
+        const hopCount = Math.max(0, Math.floor(Number(disperseHopCountIn ?? 0)));
         // 4. 构建 Ops
         const outOps = [];
         if (needApprove) {
@@ -111,6 +160,32 @@ 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);
+        }
+        // ✅ 卖出所得 OKB 转给买方 AA(Sender)，否则买方 UserOp 无法携带 value 执行 buy
+        if (sellerSender.toLowerCase() !== buyerSender.toLowerCase() && finalBuyAmountWei > 0n) {
+            const transferCallData = encodeExecute(buyerSender, finalBuyAmountWei, '0x');
+            const signedTransfer = await this.aaManager.buildUserOpWithState({
+                ownerWallet: sellerOwner,
+                sender: sellerSender,
+                nonce: nonceMap.next(sellerSender),
+                initCode: consumeInitCode(sellerSender),
+                callData: transferCallData,
+                signOnly: true,
+            });
+            outOps.push(signedTransfer.userOp);
+        }
         // Buy op
         const buySwapData = encodeBuyCall(tokenAddress, finalBuyAmountWei, 0n);
         const buyCallData = encodeExecute(FLAP_PORTAL, finalBuyAmountWei, buySwapData);
@@ -157,6 +232,12 @@ export class AAPortalSwapExecutor {
                 buyAmountWei: finalBuyAmountWei.toString(),
                 hasApprove: needApprove,
                 routeAddress,
+                extractProfit,
+                profitBps,
+                profitRecipient,
+                profitWei: profitWei.toString(),
+                quotedSellOutWei: quotedSellOutWei.toString(),
+                disperseHopCount: String(hopCount),
             },
         };
     }
@@ -164,7 +245,9 @@ export class AAPortalSwapExecutor {
      * AA 内盘批量换手签名 (一卖多买)
      */
     async bundleBatchSwapSign(params) {
-        const { tokenAddress, sellerPrivateKey, buyerPrivateKeys, buyAmountsOkb, sellAmount, sellPercent = 100, payerPrivateKey, beneficiary: beneficiaryIn, payerStartNonce, routeAddress, skipApprovalCheck = false, } = params;
+        const { tokenAddress, sellerPrivateKey, buyerPrivateKeys, buyAmountsOkb, sellAmount, sellPercent = 100, disperseHopCount: disperseHopCountIn, 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,8 +315,126 @@ export class AAPortalSwapExecutor {
             signOnly: true,
         });
         outOps.push(signedSell.userOp);
-        // Batch Buy ops
+        // 先计算 buyAmountsWei（用于后续分发与校验）
         const buyAmountsWei = buyAmountsOkb.map(a => parseOkb(a));
+        const totalBuyWei = buyAmountsWei.reduce((a, b) => a + (b ?? 0n), 0n);
+        // 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);
+        }
+        if (totalBuyWei > quotedSellOutWei) {
+            throw new Error('AA 批量换手：buyAmountsOkb 总和超过预估卖出输出（quotedSellOut）');
+        }
+        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);
+        }
+        // ✅ 卖出所得 OKB 分发给多个买方 AA(Sender)（支持多跳）
+        const buyerSenders = buyerAis.map(ai => ai.sender);
+        const hopCountRaw = Math.max(0, Math.floor(Number(disperseHopCountIn ?? 0)));
+        const hopCount = Math.min(hopCountRaw, buyerSenders.length); // 允许等于 buyerCount（最后一跳不再分发）
+        const maxPerOp = Math.max(1, Math.floor(Number(effectiveConfig.maxTransfersPerUserOpNative ?? 30)));
+        if (buyerSenders.length > 0 && totalBuyWei > 0n) {
+            if (hopCount <= 0) {
+                // 0 跳：卖方 AA(Sender) 直接用 multicall3 分发给所有买方 AA(Sender)
+                const items = buyerSenders.map((to, i) => ({ to, value: buyAmountsWei[i] ?? 0n })).filter(x => x.value > 0n);
+                const chunks = chunkArray(items, maxPerOp);
+                for (const ch of chunks) {
+                    const { totalValue, data } = encodeNativeDisperseViaMulticall3({
+                        to: ch.map(x => x.to),
+                        values: ch.map(x => x.value),
+                    });
+                    const callData = encodeExecute(MULTICALL3, totalValue, data);
+                    const signedDisperse = await this.aaManager.buildUserOpWithState({
+                        ownerWallet: sellerOwner,
+                        sender: sellerAi.sender,
+                        nonce: nonceMap.next(sellerAi.sender),
+                        initCode: consumeInitCode(sellerAi.sender),
+                        callData,
+                        signOnly: true,
+                    });
+                    outOps.push(signedDisperse.userOp);
+                }
+            }
+            else {
+                // 多跳：使用前 hopCount 个买方作为中转链（与 BSC 多跳语义独立，仅作用于 xlayer AA）
+                const hopSenders = buyerSenders.slice(0, hopCount);
+                const hopOwners = buyerOwners.slice(0, hopCount);
+                // 1) seller -> hop0（总额）
+                const hop0 = hopSenders[0];
+                const callData0 = encodeExecute(hop0, totalBuyWei, '0x');
+                const signedToHop0 = await this.aaManager.buildUserOpWithState({
+                    ownerWallet: sellerOwner,
+                    sender: sellerAi.sender,
+                    nonce: nonceMap.next(sellerAi.sender),
+                    initCode: consumeInitCode(sellerAi.sender),
+                    callData: callData0,
+                    signOnly: true,
+                });
+                outOps.push(signedToHop0.userOp);
+                // 2) hop j -> hop j+1（扣掉自己那份）
+                let prefixKept = 0n;
+                for (let j = 0; j < hopSenders.length - 1; j++) {
+                    const sender = hopSenders[j];
+                    const next = hopSenders[j + 1];
+                    const keep = buyAmountsWei[j] ?? 0n;
+                    prefixKept += keep;
+                    const remaining = totalBuyWei - prefixKept;
+                    if (remaining <= 0n)
+                        break;
+                    const callData = encodeExecute(next, remaining, '0x');
+                    const signedHop = await this.aaManager.buildUserOpWithState({
+                        ownerWallet: hopOwners[j],
+                        sender,
+                        nonce: nonceMap.next(sender),
+                        initCode: consumeInitCode(sender),
+                        callData,
+                        signOnly: true,
+                    });
+                    outOps.push(signedHop.userOp);
+                }
+                // 3) lastHop 分发给剩余买方（不含 hop 自己）
+                const lastHopIdx = hopSenders.length - 1;
+                const lastHopSender = hopSenders[lastHopIdx];
+                const lastHopOwner = hopOwners[lastHopIdx];
+                const rest = buyerSenders.slice(hopSenders.length);
+                const restAmounts = buyAmountsWei.slice(hopSenders.length);
+                const restItems = rest.map((to, i) => ({ to, value: restAmounts[i] ?? 0n })).filter(x => x.value > 0n);
+                const restChunks = chunkArray(restItems, maxPerOp);
+                for (const ch of restChunks) {
+                    const { totalValue, data } = encodeNativeDisperseViaMulticall3({
+                        to: ch.map(x => x.to),
+                        values: ch.map(x => x.value),
+                    });
+                    const callData = encodeExecute(MULTICALL3, totalValue, data);
+                    const signedDisperse = await this.aaManager.buildUserOpWithState({
+                        ownerWallet: lastHopOwner,
+                        sender: lastHopSender,
+                        nonce: nonceMap.next(lastHopSender),
+                        initCode: consumeInitCode(lastHopSender),
+                        callData,
+                        signOnly: true,
+                    });
+                    outOps.push(signedDisperse.userOp);
+                }
+            }
+        }
+        // Batch Buy ops（分发后再执行，确保每个买方 sender 先有 OKB）
         for (let i = 0; i < buyerOwners.length; i++) {
             const ai = buyerAis[i];
             const buyWei = buyAmountsWei[i];
@@ -282,6 +483,12 @@ export class AAPortalSwapExecutor {
                 buyAmountsWei: buyAmountsWei.map(w => w.toString()),
                 hasApprove: needApprove,
                 routeAddress,
+                extractProfit,
+                profitBps,
+                profitRecipient,
+                profitWei: profitWei.toString(),
+                quotedSellOutWei: quotedSellOutWei.toString(),
+                disperseHopCount: String(hopCount),
             },
         };
     }

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 账户信息
@@ -219,6 +234,14 @@ export interface BundleSwapParams {
     buyAmountOkb?: string;
     /** 预估卖出滑点（基点），默认 100 = 1%（用于 buyAmountOkb 未传入时） */
     slippageBps?: number;
+    /**
+     * ✅ 转账多跳数（AA 专用，且与 BSC 的“多跳”逻辑相互独立）
+     *
+     * 用途：当卖出与买入不是同一个 AA(Sender) 时，需要把卖出得到的 OKB 先转到买方 AA(Sender) 才能执行 buy。
+     * - 0：卖方 AA(Sender) 直接转给买方 AA(Sender)
+     * - >0：按“多跳”方式转账（实现位于 xlayer/*，不会影响 BSC bundle/merkle）
+     */
+    disperseHopCount?: number;
     /** 配置覆盖 */
     config?: Partial<XLayerConfig>;
 }
@@ -238,6 +261,18 @@ export interface BundleSwapResult {
         buyAmountWei: string;
         hasApprove: boolean;
         routeAddress?: string;
+        /** 是否提取利润 */
+        extractProfit?: boolean;
+        /** 利润比例 bps */
+        profitBps?: number;
+        /** 利润接收地址 */
+        profitRecipient?: string;
+        /** 预估利润（OKB wei） */
+        profitWei?: string;
+        /** 预估卖出输出（OKB wei） */
+        quotedSellOutWei?: string;
+        /** ✅ AA：转账多跳数（仅 xlayer AA 使用；不影响 BSC） */
+        disperseHopCount?: string;
     };
 }
 /**
@@ -277,6 +312,18 @@ export interface BundleSwapSignResult {
         buyAmountWei: string;
         hasApprove: boolean;
         routeAddress?: string;
+        /** 是否提取利润 */
+        extractProfit?: boolean;
+        /** 利润比例 bps */
+        profitBps?: number;
+        /** 利润接收地址 */
+        profitRecipient?: string;
+        /** 预估利润（OKB wei） */
+        profitWei?: string;
+        /** 预估卖出输出（OKB wei） */
+        quotedSellOutWei?: string;
+        /** ✅ AA：转账多跳数（仅 xlayer AA 使用；不影响 BSC） */
+        disperseHopCount?: string;
     };
 }
 /**
@@ -301,6 +348,14 @@ export interface BundleBatchSwapParams {
     sellAmount?: string;
     /** 卖出比例（0-100，默认 100） */
     sellPercent?: number;
+    /**
+     * ✅ 转账多跳数（AA 专用）
+     *
+     * 用途：卖出所得 OKB 需要在同一笔 handleOps 内分发给多个买方 AA(Sender)。
+     * - 0：卖方 AA(Sender) 直接分发给所有买方 AA(Sender)
+     * - >0：按“多跳”方式分发（实现位于 xlayer/*，不会影响 BSC bundle/merkle）
+     */
+    disperseHopCount?: number;
     /** 配置覆盖 */
     config?: Partial<XLayerConfig>;
 }
@@ -315,6 +370,18 @@ export interface BundleBatchSwapResult {
         buyAmountsWei: string[];
         hasApprove: boolean;
         routeAddress?: string;
+        /** 是否提取利润 */
+        extractProfit?: boolean;
+        /** 利润比例 bps */
+        profitBps?: number;
+        /** 利润接收地址 */
+        profitRecipient?: string;
+        /** 预估利润（OKB wei） */
+        profitWei?: string;
+        /** 预估卖出输出（OKB wei） */
+        quotedSellOutWei?: string;
+        /** ✅ AA：转账多跳数（仅 xlayer AA 使用；不影响 BSC） */
+        disperseHopCount?: string;
     };
 }
 export interface BundleBatchSwapSignParams extends BundleBatchSwapParams {
@@ -337,6 +404,18 @@ export interface BundleBatchSwapSignResult {
         buyAmountsWei: string[];
         hasApprove: boolean;
         routeAddress?: string;
+        /** 是否提取利润 */
+        extractProfit?: boolean;
+        /** 利润比例 bps */
+        profitBps?: number;
+        /** 利润接收地址 */
+        profitRecipient?: string;
+        /** 预估利润（OKB wei） */
+        profitWei?: string;
+        /** 预估卖出输出（OKB wei） */
+        quotedSellOutWei?: string;
+        /** ✅ AA：转账多跳数（仅 xlayer AA 使用；不影响 BSC） */
+        disperseHopCount?: string;
     };
 }
 /**
@@ -403,6 +482,16 @@ export interface BundleSellResult {
     sellResult: HandleOpsResult;
     /** 归集交易结果（如果 withdrawToOwner） */
     withdrawResult?: HandleOpsResult;
+    /**
+     * 利润汇总（如果 withdrawToOwner=true 且实际归集金额>0）
+     * - 注意：AA 的 handleOps tx.value 永远是 0；利润是“从 AA Sender 余额里拆分转走”的金额
+     */
+    profit?: {
+        extractProfit: boolean;
+        profitBps: number;
+        profitRecipient: string;
+        totalProfitWei: string;
+    };
 }
 /**
  * 捆绑买卖结果
@@ -418,6 +507,13 @@ export interface BundleBuySellResult {
     withdrawResult?: HandleOpsResult;
     /** 各 sender 的最终 OKB 余额 */
     finalBalances: Map<string, bigint>;
+    /** 利润汇总（如果 withdrawToOwner=true 且实际归集金额>0） */
+    profit?: {
+        extractProfit: boolean;
+        profitBps: number;
+        profitRecipient: string;
+        totalProfitWei: string;
+    };
 }
 /**
  * 刷量结果

package/package.json

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