four-flap-meme-sdk 1.5.32 → 1.5.34

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

@@ -3,14 +3,36 @@
  */
 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）
-    const profitBpsRaw = config?.profitBps ?? PROFIT_CONFIG.RATE_BPS;
+    // ✅ 对齐 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 };
@@ -39,7 +61,7 @@ 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();
@@ -100,11 +122,18 @@ export class AAPortalSwapExecutor {
             }
         })();
         const quotedSellOutWei = quoted;
-        const finalBuyAmountWei = buyAmountOkb
+        // 3.1 利润提取（从卖出输出 OKB 里按比例刮取；但必须保证买入资金充足）
+        const requestedBuyWei = buyAmountOkb
             ? parseOkb(String(buyAmountOkb))
-            : (quoted * BigInt(10000 - slippageBps)) / 10000n;
-        // 3.1 利润提取（从卖出输出 OKB 里按比例刮取）
-        const profitWei = extractProfit ? calculateProfitWei(quotedSellOutWei, profitBps) : 0n;
+            : (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) {
@@ -144,6 +173,19 @@ export class AAPortalSwapExecutor {
             });
             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);
@@ -195,6 +237,7 @@ export class AAPortalSwapExecutor {
                 profitRecipient,
                 profitWei: profitWei.toString(),
                 quotedSellOutWei: quotedSellOutWei.toString(),
+                disperseHopCount: String(hopCount),
             },
         };
     }
@@ -202,7 +245,7 @@ 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();
@@ -272,7 +315,10 @@ export class AAPortalSwapExecutor {
             signOnly: true,
         });
         outOps.push(signedSell.userOp);
-        // Profit op：用 previewSell/quoteExactInput 估算卖出输出，再按比例刮取
+        // 先计算 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);
@@ -280,7 +326,12 @@ export class AAPortalSwapExecutor {
         catch {
             quotedSellOutWei = await this.portalQuery.quoteExactInput(tokenAddress, ZERO_ADDRESS, sellAmountWei);
         }
-        const profitWei = extractProfit ? calculateProfitWei(quotedSellOutWei, profitBps) : 0n;
+        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({
@@ -293,8 +344,97 @@ export class AAPortalSwapExecutor {
             });
             outOps.push(signedProfit.userOp);
         }
-        // Batch Buy ops
-        const buyAmountsWei = buyAmountsOkb.map(a => parseOkb(a));
+        // ✅ 卖出所得 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];
@@ -348,6 +488,7 @@ export class AAPortalSwapExecutor {
                 profitRecipient,
                 profitWei: profitWei.toString(),
                 quotedSellOutWei: quotedSellOutWei.toString(),
+                disperseHopCount: String(hopCount),
             },
         };
     }

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

@@ -0,0 +1,30 @@
+/**
+ * XLayer AA Buy-First（内盘 / Flap Portal）
+ *
+ * 对齐 BSC buy-first 思路：
+ * - 买方先买入（多钱包随机拆分资金）
+ * - 卖方再卖出“等值 token”（卖方需要预持仓）
+ * - ✅ 利润：在“卖出后归集 OKB”阶段刮取（executeBatch 拆分给 profitRecipient + owner）
+ *
+ * 说明：
+ * - buy + sell 会放在同一笔 handleOps 内，保持“buy-first 原子”语义
+ * - withdraw 需要知道 sell 后的余额，因此单独再发一笔 handleOps
+ */
+import type { XLayerConfig } from './types.js';
+import type { BuyFirstParams, BuyFirstResult } from './types.js';
+export declare class AAPortalBuyFirstExecutor {
+    private aaManager;
+    private portalQuery;
+    private config;
+    constructor(config?: XLayerConfig);
+    private runHandleOps;
+    private pickWallets;
+    private getAccountInfos;
+    private safePreviewBuy;
+    private buildWithdrawUserOp;
+    /**
+     * 执行一轮 buy-first（内盘）
+     */
+    execute(params: BuyFirstParams): Promise<BuyFirstResult>;
+}
+export declare function createAAPortalBuyFirstExecutor(config?: XLayerConfig): AAPortalBuyFirstExecutor;