four-flap-meme-sdk 1.5.79 → 1.5.80

package/dist/flap/portal-bundle-merkle/encryption.d.ts

@@ -0,0 +1,16 @@
+/**
+ * ECDH + AES-GCM 加密工具（浏览器兼容）
+ * 用于将签名交易用服务器公钥加密
+ */
+/**
+ * 用服务器公钥加密签名交易（ECDH + AES-GCM）
+ *
+ * @param signedTransactions 签名后的交易数组
+ * @param publicKeyBase64 服务器提供的公钥（Base64 格式）
+ * @returns JSON 字符串 {e: 临时公钥, i: IV, d: 密文}
+ */
+export declare function encryptWithPublicKey(signedTransactions: string[], publicKeyBase64: string): Promise<string>;
+/**
+ * 验证公钥格式（Base64）
+ */
+export declare function validatePublicKey(publicKeyBase64: string): boolean;

package/dist/flap/portal-bundle-merkle/encryption.js

@@ -0,0 +1,146 @@
+/**
+ * ECDH + AES-GCM 加密工具（浏览器兼容）
+ * 用于将签名交易用服务器公钥加密
+ */
+/**
+ * 获取全局 crypto 对象（最简单直接的方式）
+ */
+function getCryptoAPI() {
+    // 尝试所有可能的全局对象，优先浏览器环境
+    const cryptoObj = (typeof window !== 'undefined' && window.crypto) ||
+        (typeof self !== 'undefined' && self.crypto) ||
+        (typeof global !== 'undefined' && global.crypto) ||
+        (typeof globalThis !== 'undefined' && globalThis.crypto);
+    if (!cryptoObj) {
+        const env = typeof window !== 'undefined' ? 'Browser' : 'Node.js';
+        const protocol = typeof location !== 'undefined' ? location.protocol : 'unknown';
+        throw new Error(`❌ Crypto API 不可用。环境: ${env}, 协议: ${protocol}. ` +
+            '请确保在 HTTPS 或 localhost 下运行');
+    }
+    return cryptoObj;
+}
+/**
+ * 获取 SubtleCrypto（用于加密操作）
+ */
+function getSubtleCrypto() {
+    const crypto = getCryptoAPI();
+    if (!crypto.subtle) {
+        const protocol = typeof location !== 'undefined' ? location.protocol : 'unknown';
+        const hostname = typeof location !== 'undefined' ? location.hostname : 'unknown';
+        throw new Error(`❌ SubtleCrypto API 不可用。协议: ${protocol}, 主机: ${hostname}. ` +
+            '请确保：1) 使用 HTTPS (或 localhost)；2) 浏览器支持 Web Crypto API；' +
+            '3) 不在无痕/隐私浏览模式下');
+    }
+    return crypto.subtle;
+}
+/**
+ * Base64 转 ArrayBuffer（优先使用浏览器 API）
+ */
+function base64ToArrayBuffer(base64) {
+    // 浏览器环境（优先）
+    if (typeof atob !== 'undefined') {
+        const binaryString = atob(base64);
+        const bytes = new Uint8Array(binaryString.length);
+        for (let i = 0; i < binaryString.length; i++) {
+            bytes[i] = binaryString.charCodeAt(i);
+        }
+        return bytes.buffer;
+    }
+    // Node.js 环境（fallback）
+    if (typeof Buffer !== 'undefined') {
+        return Buffer.from(base64, 'base64').buffer;
+    }
+    throw new Error('❌ Base64 解码不可用');
+}
+/**
+ * ArrayBuffer 转 Base64（优先使用浏览器 API）
+ */
+function arrayBufferToBase64(buffer) {
+    // 浏览器环境（优先）
+    if (typeof btoa !== 'undefined') {
+        const bytes = new Uint8Array(buffer);
+        let binary = '';
+        for (let i = 0; i < bytes.length; i++) {
+            binary += String.fromCharCode(bytes[i]);
+        }
+        return btoa(binary);
+    }
+    // Node.js 环境（fallback）
+    if (typeof Buffer !== 'undefined') {
+        return Buffer.from(buffer).toString('base64');
+    }
+    throw new Error('❌ Base64 编码不可用');
+}
+/**
+ * 生成随机 Hex 字符串
+ */
+function randomHex(length) {
+    const crypto = getCryptoAPI();
+    const array = new Uint8Array(length);
+    crypto.getRandomValues(array);
+    return Array.from(array)
+        .map(b => b.toString(16).padStart(2, '0'))
+        .join('');
+}
+/**
+ * 用服务器公钥加密签名交易（ECDH + AES-GCM）
+ *
+ * @param signedTransactions 签名后的交易数组
+ * @param publicKeyBase64 服务器提供的公钥（Base64 格式）
+ * @returns JSON 字符串 {e: 临时公钥, i: IV, d: 密文}
+ */
+export async function encryptWithPublicKey(signedTransactions, publicKeyBase64) {
+    try {
+        // 0. 获取 SubtleCrypto 和 Crypto API
+        const subtle = getSubtleCrypto();
+        const crypto = getCryptoAPI();
+        // 1. 准备数据
+        const payload = {
+            signedTransactions,
+            timestamp: Date.now(),
+            nonce: randomHex(8)
+        };
+        const plaintext = JSON.stringify(payload);
+        // 2. 生成临时 ECDH 密钥对
+        const ephemeralKeyPair = await subtle.generateKey({ name: 'ECDH', namedCurve: 'P-256' }, true, ['deriveKey']);
+        // 3. 导入服务器公钥
+        const publicKeyBuffer = base64ToArrayBuffer(publicKeyBase64);
+        const publicKey = await subtle.importKey('raw', publicKeyBuffer, { name: 'ECDH', namedCurve: 'P-256' }, false, []);
+        // 4. 派生共享密钥（AES-256）
+        const sharedKey = await subtle.deriveKey({ name: 'ECDH', public: publicKey }, ephemeralKeyPair.privateKey, { name: 'AES-GCM', length: 256 }, false, ['encrypt']);
+        // 5. AES-GCM 加密
+        const iv = crypto.getRandomValues(new Uint8Array(12));
+        const encrypted = await subtle.encrypt({ name: 'AES-GCM', iv }, sharedKey, new TextEncoder().encode(plaintext));
+        // 6. 导出临时公钥
+        const ephemeralPublicKeyRaw = await subtle.exportKey('raw', ephemeralKeyPair.publicKey);
+        // 7. 返回加密包（JSON 格式）
+        return JSON.stringify({
+            e: arrayBufferToBase64(ephemeralPublicKeyRaw), // 临时公钥
+            i: arrayBufferToBase64(iv.buffer), // IV
+            d: arrayBufferToBase64(encrypted) // 密文
+        });
+    }
+    catch (error) {
+        throw new Error(`加密失败: ${error?.message || String(error)}`);
+    }
+}
+/**
+ * 验证公钥格式（Base64）
+ */
+export function validatePublicKey(publicKeyBase64) {
+    try {
+        if (!publicKeyBase64)
+            return false;
+        // Base64 字符集验证
+        if (!/^[A-Za-z0-9+/=]+$/.test(publicKeyBase64))
+            return false;
+        // ECDH P-256 公钥固定长度 65 字节（未压缩）
+        // Base64 编码后约 88 字符
+        if (publicKeyBase64.length < 80 || publicKeyBase64.length > 100)
+            return false;
+        return true;
+    }
+    catch {
+        return false;
+    }
+}

package/dist/xlayer/aa-account.js

@@ -637,54 +637,31 @@ export class AAAccountManager {
             return [];
         // 1) 批量预测 sender（优先 getAddress+multicall，失败回退 createAccount.staticCall）
         const senders = await this.predictSendersByOwnersFast(owners);
-        // 2) 批量 getNonce & getEthBalance (Multicall3)
+        // 2) 批量 getNonce（multicall EntryPoint.getNonce）
         const epIface = new Interface(ENTRYPOINT_ABI);
-        const multicallCalls = senders.flatMap((sender) => [
-            {
-                target: this.entryPointAddress,
-                allowFailure: true,
-                callData: epIface.encodeFunctionData('getNonce', [sender, 0]),
-            },
-            {
-                target: MULTICALL3,
-                allowFailure: true,
-                callData: '0x4d2301cc' + sender.slice(2).padStart(64, '0'), // getEthBalance(address)
-            },
-        ]);
+        const nonceCalls = senders.map((sender) => ({
+            target: this.entryPointAddress,
+            allowFailure: true,
+            callData: epIface.encodeFunctionData('getNonce', [sender, 0]),
+        }));
         const nonces = new Array(senders.length).fill(0n);
-        const balances = new Array(senders.length).fill(0n);
-        // 每批处理 200 个地址（即 400 个 call），平衡负载
-        const ADDR_BATCH = 200;
-        for (let cursor = 0; cursor < senders.length; cursor += ADDR_BATCH) {
-            const sliceCalls = multicallCalls.slice(cursor * 2, (cursor + ADDR_BATCH) * 2);
-            try {
-                const res = await this.multicallAggregate3({ calls: sliceCalls });
-                for (let i = 0; i < ADDR_BATCH && cursor + i < senders.length; i++) {
-                    const idx = cursor + i;
-                    const nonceRes = res[i * 2];
-                    const balanceRes = res[i * 2 + 1];
-                    // 解析 Nonce
-                    if (nonceRes?.success && nonceRes.returnData && nonceRes.returnData !== '0x') {
-                        try {
-                            const decoded = epIface.decodeFunctionResult('getNonce', nonceRes.returnData);
-                            nonces[idx] = BigInt(decoded?.[0] ?? 0n);
-                        }
-                        catch { /* ignore */ }
-                    }
-                    // 解析 Balance
-                    if (balanceRes?.success && balanceRes.returnData && balanceRes.returnData !== '0x') {
-                        try {
-                            balances[idx] = BigInt(balanceRes.returnData);
-                        }
-                        catch { /* ignore */ }
-                    }
+        const BATCH = 350;
+        for (let cursor = 0; cursor < nonceCalls.length; cursor += BATCH) {
+            const sliceCalls = nonceCalls.slice(cursor, cursor + BATCH);
+            const res = await this.multicallAggregate3({ calls: sliceCalls });
+            for (let i = 0; i < res.length; i++) {
+                const r = res[i];
+                const idx = cursor + i;
+                if (!r?.success || !r.returnData || r.returnData === '0x')
+                    continue;
+                try {
+                    const decoded = epIface.decodeFunctionResult('getNonce', r.returnData);
+                    nonces[idx] = BigInt(decoded?.[0] ?? 0n);
                 }
-            }
-            catch (err) {
-                console.warn(`[getMultipleAccountInfo] Multicall 失败，回退后续 logic 会处理缺失值:`, err);
+                catch { /* ignore */ }
             }
         }
-        // 3) deployed(getCode)：小分片 + 并发上限 + 缓存 deployed=true
+        // 3) deployed(getCode)：小分片 + 并发上限 + 缓存 deployed=true，避免 -32014 “batch request too many”
         const deployed = new Array(senders.length).fill(false);
         const needCode = [];
         for (let i = 0; i < senders.length; i++) {
@@ -736,6 +713,37 @@ export class AAAccountManager {
                 }
             }
         }
+        // 4) balance(getEthBalance)：用 Multicall3.getEthBalance 分片批量查询 OKB（减少 N 次 eth_getBalance）
+        const balances = new Array(senders.length).fill(0n);
+        const ethBalIface = new Interface(['function getEthBalance(address addr) view returns (uint256)']);
+        const balCalls = senders.map((sender) => ({
+            target: MULTICALL3,
+            allowFailure: true,
+            callData: ethBalIface.encodeFunctionData('getEthBalance', [sender]),
+        }));
+        const BAL_BATCH = 300;
+        try {
+            for (let cursor = 0; cursor < balCalls.length; cursor += BAL_BATCH) {
+                const sliceCalls = balCalls.slice(cursor, cursor + BAL_BATCH);
+                const res = await this.multicallAggregate3({ calls: sliceCalls });
+                for (let i = 0; i < res.length; i++) {
+                    const r = res[i];
+                    const idx = cursor + i;
+                    if (!r?.success || !r.returnData || r.returnData === '0x')
+                        continue;
+                    try {
+                        const decoded = ethBalIface.decodeFunctionResult('getEthBalance', r.returnData);
+                        balances[idx] = BigInt(decoded?.[0] ?? 0n);
+                    }
+                    catch { /* ignore */ }
+                }
+            }
+        }
+        catch {
+            const fetched = await mapWithConcurrency(senders, 6, async (s) => await this.provider.getBalance(s));
+            for (let i = 0; i < fetched.length; i++)
+                balances[i] = fetched[i] ?? 0n;
+        }
         return owners.map((owner, i) => ({
             owner,
             sender: senders[i],

package/dist/xlayer/bundle.js

@@ -10,10 +10,11 @@
 import { Wallet, Interface, Contract, ethers } from 'ethers';
 import { FLAP_PORTAL, ENTRYPOINT_ABI, PORTAL_ABI, DEFAULT_CALL_GAS_LIMIT_SELL, DEFAULT_WITHDRAW_RESERVE, WOKB, POTATOSWAP_V2_ROUTER, POTATOSWAP_V3_ROUTER, } from './constants.js';
 import { AAAccountManager, encodeExecute, encodeExecuteBatch, createWallet } from './aa-account.js';
-import { encodeBuyCall, encodeSellCall, encodeApproveCall, encodeTransferCall, encodeCreateCallV2, encodeCreateCallV3, encodeCreateCallV4, PortalQuery, parseOkb, formatOkb, lpFeeProfileToV3Fee, } from './portal-ops.js';
+import { encodeBuyCall, encodeBuyCallV3, encodeSellCall, encodeApproveCall, encodeTransferCall, encodeCreateCallV2, encodeCreateCallV3, encodeCreateCallV4, PortalQuery, parseOkb, formatOkb, lpFeeProfileToV3Fee, } from './portal-ops.js';
 import { mapWithConcurrency } from '../utils/concurrency.js';
 import { PROFIT_CONFIG, ZERO_ADDRESS } from '../utils/constants.js';
-import { DexQuery, encodeSwapExactETHForTokensV3, encodeSwapExactETHForTokensSupportingFee } from './dex.js';
+import { DexQuery } from './dex.js';
+import { encodeSwapExactETHForTokensSupportingFee, encodeSwapExactETHForTokensV3, } from './dex.js';
 // ============================================================================
 // AA Nonce（EntryPoint nonce）本地分配器
 // ============================================================================
@@ -1469,6 +1470,11 @@ export class BundleExecutor {
             // ✅ 并行构建和签名所有外盘买入 UserOps
             const signedDexBuyOps = await mapWithConcurrency(dexBuyData, 5, async (data) => {
                 const { wallet, info, buyWei } = data;
+                // ✅ 外盘买入：使用 Portal 的 swapExactInput 进行自动路由
+                // 优势：Portal 会自动识别代币的池子类型（V2/V3），无需手动指定
+                // 参考 BSC 版本的逻辑（create-to-dex.ts:604-616）
+                // const buyData = encodeBuyCall(tokenAddress, buyWei, 0n);
+                // const dexBuyCallData = encodeExecute(FLAP_PORTAL, buyWei, buyData);
                 let swapData;
                 let routerAddress;
                 if (dexType === 'V3') {
@@ -1551,7 +1557,9 @@ export class BundleExecutor {
      * 自动计算剩余毕业容量，将钱包分为内盘和外盘组，生成签名的交易列表
      */
     async bundleGraduateBuy(params) {
-        const { tokenAddress, privateKeys, payerPrivateKey, amountMode, totalBuyAmount, minAmount, maxAmount, walletAmounts, enableDexBuy = false, config = {} } = params;
+        const { tokenAddress, privateKeys, payerPrivateKey, amountMode, totalBuyAmount, minAmount, maxAmount, walletAmounts, enableDexBuy = false, 
+        // ✅ 新增：前端传递的分组信息
+        curveAddresses, dexAddresses, graduationAmount, config = {} } = params;
         const aaManager = this.getAAManager();
         const provider = aaManager.getProvider();
         // 1. 获取代币状态，动态计算毕业容量
@@ -1565,12 +1573,17 @@ export class BundleExecutor {
         const graduationReserveWei = h * k / (10n ** 18n);
         const graduationReserve = ethers.formatEther(graduationReserveWei);
         const poolReserveOkb = ethers.formatEther(tokenState.reserve);
-        const graduateCapacity = parseFloat(graduationReserve);
+        // // ✅ 优先使用前端传递的动态毕业阈值
+        const graduateCapacity = graduationAmount ?? 73.38;
+        const remainingToGraduate = Math.max(0, graduateCapacity - parseFloat(poolReserveOkb));
+        // const graduateCapacity = parseFloat(graduationReserve);
         // 剩余毕业金额 = 毕业阈值 - 当前储备（加 0.5% 手续费缓冲）
         const remaining = Math.max(0, graduateCapacity - parseFloat(poolReserveOkb));
         const remainingWithFee = remaining * 1.005; // 0.5% 手续费缓冲
-        const remainingToGraduate = remainingWithFee;
+        // const remainingToGraduate = remainingWithFee;
         const remainingToGraduateWei = ethers.parseEther(remainingToGraduate.toFixed(18));
+        //
+        // console.log(`[GraduateBuy] Pool Reserve: ${poolReserveOkb} OKB, GraduateCapacity: ${graduateCapacity} OKB, Remaining: ${remainingToGraduate} OKB`);
         console.log(`[GraduateBuy] Pool Reserve: ${poolReserveOkb} OKB, Graduation: ${graduationReserve} OKB, Remaining: ${remainingToGraduate.toFixed(4)} OKB`);
         // 2. 准备钱包
         const sharedProvider = this.aaManager.getProvider();
@@ -1579,7 +1592,21 @@ export class BundleExecutor {
         const payerAccount = await aaManager.getAccountInfo(payerWallet.address);
         const nonceMap = new AANonceMap();
         nonceMap.init(payerAccount.sender, payerAccount.nonce);
+        // ✅ 预获取所有钱包的 Sender 地址，用于双重地址匹配
+        // 前端可能传递 Sender 地址（AA 模式下 wallet.address 被切换为 Sender）
+        const walletInfos = await mapWithConcurrency(wallets, 5, async (w) => {
+            const info = await aaManager.getAccountInfo(w.address);
+            return { owner: w.address.toLowerCase(), sender: info.sender.toLowerCase() };
+        });
+        // 建立 Owner->Sender 映射，用于后续匹配
+        const ownerToSender = new Map();
+        const senderToOwner = new Map();
+        for (const info of walletInfos) {
+            ownerToSender.set(info.owner, info.sender);
+            senderToOwner.set(info.sender, info.owner);
+        }
         // 3. 计算每个钱包的金额
+        // ✅ 修复：同时支持 Owner 和 Sender 地址匹配
         let finalAmounts = [];
         if (amountMode === 'average') {
             const avg = (totalBuyAmount || 0) / wallets.length;
@@ -1594,148 +1621,159 @@ export class BundleExecutor {
             });
         }
         else if (amountMode === 'custom') {
-            finalAmounts = wallets.map(w => walletAmounts?.[w.address] || 0);
+            finalAmounts = wallets.map(w => {
+                const ownerAddr = w.address.toLowerCase();
+                const senderAddr = ownerToSender.get(ownerAddr) || '';
+                // ✅ 双重匹配：先按 Owner 地址查找，再按 Sender 地址查找
+                return walletAmounts?.[w.address] ||
+                    walletAmounts?.[w.address.toLowerCase()] ||
+                    walletAmounts?.[senderAddr] ||
+                    (senderAddr ? (walletAmounts?.[senderAddr.toLowerCase()] || 0) : 0);
+            });
         }
-        // 4. 钱包任务分配（核心逻辑：支持单个钱包原子化跨内外盘）
-        const buyerTasks = [];
-        let currentCurveTotal = 0n;
-        for (let i = 0; i < wallets.length; i++) {
-            const wallet = wallets[i];
-            const amountWei = ethers.parseEther(finalAmounts[i].toFixed(18));
-            const tasks = [];
-            let isTrigger = false;
-            if (currentCurveTotal < remainingToGraduateWei) {
-                const needed = remainingToGraduateWei - currentCurveTotal;
-                if (amountWei <= needed) {
-                    // 情况 A：全在内盘
-                    tasks.push({
-                        target: FLAP_PORTAL,
-                        amount: amountWei,
-                        data: encodeBuyCall(tokenAddress, amountWei, 0n)
-                    });
-                    currentCurveTotal += amountWei;
-                    if (currentCurveTotal >= remainingToGraduateWei)
-                        isTrigger = true;
+        // 4. 钱包分组
+        const curveBuyers = [];
+        const dexBuyers = [];
+        // ✅ 优先使用前端传递的分组信息
+        const hasFrontendGrouping = curveAddresses && curveAddresses.length > 0;
+        if (hasFrontendGrouping) {
+            // ✅ 使用前端计算好的分组，不再重新计算
+            const curveSet = new Set(curveAddresses.map(a => a.toLowerCase()));
+            const dexSet = dexAddresses ? new Set(dexAddresses.map(a => a.toLowerCase())) : new Set();
+            console.log(`[GraduateBuy] Using frontend grouping: ${curveAddresses.length} curve, ${dexAddresses?.length || 0} dex`);
+            for (let i = 0; i < wallets.length; i++) {
+                const wallet = wallets[i];
+                const ownerAddr = wallet.address.toLowerCase();
+                const senderAddr = ownerToSender.get(ownerAddr) || '';
+                const amountWei = ethers.parseEther(finalAmounts[i].toFixed(18));
+                // ✅ 双重匹配：同时检查 Owner 和 Sender 地址
+                const isInCurve = curveSet.has(ownerAddr) || curveSet.has(senderAddr);
+                const isInDex = dexSet.has(ownerAddr) || dexSet.has(senderAddr);
+                if (isInCurve) {
+                    curveBuyers.push({ wallet, amount: amountWei });
                 }
-                else {
-                    // 情况 B：跨内外盘（原子化拆分）
-                    tasks.push({
-                        target: FLAP_PORTAL,
-                        amount: needed,
-                        data: encodeBuyCall(tokenAddress, needed, 0n)
-                    });
-                    isTrigger = true; // 肯定是毕业触发者
-                    currentCurveTotal = remainingToGraduateWei;
-                    if (enableDexBuy) {
-                        const excess = amountWei - needed;
-                        const dexType = (tokenState.lpFeeProfile >= 0 && tokenState.tokenVersion >= 4) ? 'V3' : 'V2';
-                        const deadline = Math.floor(Date.now() / 1000) + 1200;
-                        let swapData;
-                        let routerAddress;
-                        if (dexType === 'V3') {
-                            routerAddress = POTATOSWAP_V3_ROUTER;
-                            swapData = encodeSwapExactETHForTokensV3({
-                                tokenIn: WOKB, tokenOut: tokenAddress,
-                                fee: lpFeeProfileToV3Fee(tokenState.lpFeeProfile),
-                                recipient: ZERO_ADDRESS, // AA 内部 call，最终由 execute/executeBatch 决定 recipient
-                                deadline, amountIn: excess, amountOutMinimum: 0n, sqrtPriceLimitX96: 0n
-                            });
-                        }
-                        else {
-                            routerAddress = POTATOSWAP_V2_ROUTER;
-                            swapData = encodeSwapExactETHForTokensSupportingFee(0n, [WOKB, tokenAddress], ZERO_ADDRESS, deadline);
-                        }
-                        tasks.push({ target: routerAddress, amount: excess, data: swapData });
-                    }
+                else if (isInDex && enableDexBuy) {
+                    dexBuyers.push({ wallet, amount: amountWei });
                 }
+                // 如果钱包既不在 curveSet 也不在 dexSet，则跳过
             }
-            else if (enableDexBuy) {
-                // 情况 C：全在外盘
-                const dexType = (tokenState.lpFeeProfile >= 0 && tokenState.tokenVersion >= 4) ? 'V3' : 'V2';
-                const deadline = Math.floor(Date.now() / 1000) + 1200;
-                let swapData;
-                let routerAddress;
-                if (dexType === 'V3') {
-                    routerAddress = POTATOSWAP_V3_ROUTER;
-                    swapData = encodeSwapExactETHForTokensV3({
-                        tokenIn: WOKB, tokenOut: tokenAddress,
-                        fee: lpFeeProfileToV3Fee(tokenState.lpFeeProfile),
-                        recipient: ZERO_ADDRESS,
-                        deadline, amountIn: amountWei, amountOutMinimum: 0n, sqrtPriceLimitX96: 0n
-                    });
+        }
+        else {
+            // ✅ 原逻辑：SDK 自动分组（可能与前端不一致）
+            console.log(`[GraduateBuy] No frontend grouping, using auto-split by remainingToGraduate=${remainingToGraduate} OKB`);
+            let currentCurveTotal = 0n;
+            for (let i = 0; i < wallets.length; i++) {
+                const wallet = wallets[i];
+                const amountWei = ethers.parseEther(finalAmounts[i].toFixed(18));
+                if (currentCurveTotal < remainingToGraduateWei) {
+                    const needed = remainingToGraduateWei - currentCurveTotal;
+                    if (amountWei <= needed) {
+                        curveBuyers.push({ wallet, amount: amountWei });
+                        currentCurveTotal += amountWei;
+                    }
+                    else {
+                        // 当前钱包金额超过了剩余容量，将其限制为 needed
+                        curveBuyers.push({ wallet, amount: needed });
+                        currentCurveTotal = remainingToGraduateWei;
+                        // 超出部分暂不处理（遵循单钱包单属性逻辑）
+                    }
                 }
-                else {
-                    routerAddress = POTATOSWAP_V2_ROUTER;
-                    swapData = encodeSwapExactETHForTokensSupportingFee(0n, [WOKB, tokenAddress], ZERO_ADDRESS, deadline);
+                else if (enableDexBuy) {
+                    dexBuyers.push({ wallet, amount: amountWei });
                 }
-                tasks.push({ target: routerAddress, amount: amountWei, data: swapData });
-            }
-            if (tasks.length > 0) {
-                buyerTasks.push({ wallet, calls: tasks, isGraduationTrigger: isTrigger });
             }
         }
+        // ✅ 统一计算内盘买入总金额（无论使用哪种分组方式）
+        const curveTotalWei = curveBuyers.reduce((sum, b) => sum + b.amount, 0n);
         // 5. 构建 UserOps
         const effConfig = { ...(this.config ?? {}), ...(config ?? {}) };
+        const signedTransactions = [];
         const allOps = [];
-        // 预获取所有发送者信息
-        const buyerInfos = await mapWithConcurrency(buyerTasks.map(b => b.wallet), 5, async (w) => {
+        // --- 内盘 Ops ---
+        const curveBuyerInfos = await mapWithConcurrency(curveBuyers.map(b => b.wallet), 5, async (w) => {
             const info = await aaManager.getAccountInfo(w.address);
             nonceMap.init(info.sender, info.nonce);
             return info;
         });
-        const signedOps = await mapWithConcurrency(buyerTasks, 5, async (task, i) => {
-            const { wallet, calls, isGraduationTrigger } = task;
-            const info = buyerInfos[i];
-            // 修正 Swap 接收地址为 Sender
-            const finalCalls = calls.map(c => {
-                let callData = c.data;
-                // 简单处理：将 DEX swap 中的 recipient (ZERO_ADDRESS) 替换为 info.sender
-                // 对 V2/V3 编码后的数据，地址通常在末尾或固定偏移处，但最稳妥是重新编码
-                // 这里为了简洁，假设 swapData 在编码时已经包含了 recipient
-                // 由于上面我们设置了 recipient: ZERO_ADDRESS，我们需要在打包前基于正确的 sender 重新编码
-                // 为了绝对安全，我们在此时重新编码带有正确 sender 的 swapData
-                if (c.target === POTATOSWAP_V3_ROUTER || c.target === POTATOSWAP_V2_ROUTER) {
-                    const dexType = (tokenState.lpFeeProfile >= 0 && tokenState.tokenVersion >= 4) ? 'V3' : 'V2';
-                    const deadline = Math.floor(Date.now() / 1000) + 1200;
-                    if (dexType === 'V3') {
-                        callData = encodeSwapExactETHForTokensV3({
-                            tokenIn: WOKB, tokenOut: tokenAddress,
-                            fee: lpFeeProfileToV3Fee(tokenState.lpFeeProfile),
-                            recipient: info.sender,
-                            deadline, amountIn: c.amount, amountOutMinimum: 0n, sqrtPriceLimitX96: 0n
-                        });
-                    }
-                    else {
-                        callData = encodeSwapExactETHForTokensSupportingFee(0n, [WOKB, tokenAddress], info.sender, deadline);
-                    }
-                }
-                return { ...c, data: callData };
-            });
-            let mainCallData;
-            if (finalCalls.length === 1) {
-                mainCallData = encodeExecute(finalCalls[0].target, finalCalls[0].amount, finalCalls[0].data);
-            }
-            else {
-                mainCallData = encodeExecuteBatch(finalCalls.map(c => c.target), finalCalls.map(c => c.amount), finalCalls.map(c => c.data));
-            }
+        const signedCurveBuyOps = await mapWithConcurrency(curveBuyers, 5, async (data, i) => {
+            const { wallet, amount } = data;
+            const info = curveBuyerInfos[i];
+            // ✅ 使用 swapExactInputV3（支持 extensionData），与 BSC 版本保持一致
+            // 参考 create-to-dex.ts 第 604-616 行
+            const extensionData = params.extensionData ?? '0x';
+            const buyData = encodeBuyCallV3(tokenAddress, amount, 0n, extensionData);
+            const buyCallData = encodeExecute(FLAP_PORTAL, amount, buyData);
+            // ✅ 判断是否是最后一笔内盘买入（触发毕业的那笔）
+            const isGraduationTrigger = (i === curveBuyers.length - 1);
             const callGasLimit = isGraduationTrigger
-                ? 7000000n
-                : (effConfig.fixedGas?.callGasLimit ?? 800000n);
-            const opRes = await aaManager.buildUserOpWithFixedGas({
+                ? 8000000n // 毕业触发交易需要更高 gas
+                : (effConfig.fixedGas?.callGasLimit ?? 600000n); // 其他买入使用前端配置或默认值
+            const buyOpRes = await aaManager.buildUserOpWithFixedGas({
                 ownerWallet: wallet,
                 sender: info.sender,
-                callData: mainCallData,
+                callData: buyCallData,
                 nonce: nonceMap.next(info.sender),
                 initCode: info.deployed ? '0x' : (await aaManager.generateInitCode(wallet.address)),
                 deployed: info.deployed,
                 fixedGas: { callGasLimit }
             });
-            const signed = await aaManager.signUserOp(opRes.userOp, wallet);
-            return signed.userOp;
+            const signedBuyOp = await aaManager.signUserOp(buyOpRes.userOp, wallet);
+            return signedBuyOp.userOp;
         });
-        allOps.push(...signedOps);
+        allOps.push(...signedCurveBuyOps);
+        // --- 外盘 Ops ---
+        let totalDexBuyWei = 0n;
+        if (enableDexBuy && dexBuyers.length > 0) {
+            // ✅ 定义外盘买入所需的变量（参考 bundleCreateToDexSign 第 1860-1861 行）
+            const deadline = Math.floor(Date.now() / 1000) + 1200; // 20 min
+            const dexType = (tokenState.lpFeeProfile !== undefined && tokenState.lpFeeProfile >= 0) ? 'V3' : 'V2';
+            const dexBuyerInfos = await mapWithConcurrency(dexBuyers.map(b => b.wallet), 5, async (w) => {
+                const info = await aaManager.getAccountInfo(w.address);
+                nonceMap.init(info.sender, info.nonce);
+                return info;
+            });
+            const signedDexBuyOps = await mapWithConcurrency(dexBuyers, 5, async (data, i) => {
+                const { wallet, amount } = data;
+                const info = dexBuyerInfos[i];
+                totalDexBuyWei += amount;
+                // ✅ 外盘买入：直接调用 DEX Router 进行 swap
+                // 代币毕业后无法通过 Portal 买入（会报 0xe2fae90a 错误），必须走 DEX
+                // 参考 BSC 版本 create-to-dex.ts 第 655-752 行
+                let swapData;
+                let routerAddress;
+                if (dexType === 'V3') {
+                    routerAddress = POTATOSWAP_V3_ROUTER;
+                    swapData = encodeSwapExactETHForTokensV3({
+                        tokenIn: WOKB,
+                        tokenOut: tokenAddress,
+                        fee: lpFeeProfileToV3Fee(tokenState.lpFeeProfile),
+                        recipient: info.sender,
+                        deadline,
+                        amountIn: amount,
+                        amountOutMinimum: 0n,
+                        sqrtPriceLimitX96: 0n
+                    });
+                }
+                else {
+                    routerAddress = POTATOSWAP_V2_ROUTER;
+                    swapData = encodeSwapExactETHForTokensSupportingFee(0n, [WOKB, tokenAddress], info.sender, deadline);
+                }
+                const dexBuyCallData = encodeExecute(routerAddress, amount, swapData);
+                const dexBuyOpRes = await aaManager.buildUserOpWithFixedGas({
+                    ownerWallet: wallet,
+                    sender: info.sender,
+                    callData: dexBuyCallData,
+                    nonce: nonceMap.next(info.sender),
+                    initCode: info.deployed ? '0x' : (await aaManager.generateInitCode(wallet.address)),
+                    deployed: info.deployed,
+                    fixedGas: { callGasLimit: effConfig.fixedGas?.callGasLimit ?? 800000n } // 外盘 swap 需要更多 gas
+                });
+                const signedDexBuyOp = await aaManager.signUserOp(dexBuyOpRes.userOp, wallet);
+                return signedDexBuyOp.userOp;
+            });
+            allOps.push(...signedDexBuyOps);
+        }
         // 6. 签名唯一的 handleOps 交易
-        const signedTransactions = [];
         const startNonce = params.payerStartNonce ?? (await provider.getTransactionCount(payerWallet.address, 'pending'));
         const signedMainTx = await this.signHandleOpsTx({
             ops: allOps,
@@ -1746,12 +1784,9 @@ export class BundleExecutor {
             gasPrice: effConfig.minGasPriceGwei ? ethers.parseUnits(effConfig.minGasPriceGwei.toString(), 'gwei') : undefined
         });
         signedTransactions.push(signedMainTx);
-        // 7. 计算利润 (0.4%)
-        let totalDexBuyWei = 0n;
-        buyerTasks.forEach(t => t.calls.forEach(c => { if (c.target !== FLAP_PORTAL)
-            totalDexBuyWei += c.amount; }));
-        const totalBuyWei = currentCurveTotal + totalDexBuyWei;
-        const profitWei = (totalBuyWei * 4n) / 1000n;
+        // 7. 计算并签利润提取交易 (EOA 转账，千分之 4)
+        const totalBuyWei = curveTotalWei + totalDexBuyWei;
+        const profitWei = (totalBuyWei * 4n) / 1000n; // 0.4%
         if (profitWei > 0n) {
             const profitRecipient = effConfig.profitRecipient || PROFIT_CONFIG.RECIPIENT;
             const feeData = await provider.getFeeData();
@@ -1770,9 +1805,9 @@ export class BundleExecutor {
         return {
             signedTransactions,
             metadata: {
-                curveCount: buyerTasks.filter(t => t.calls.some(c => c.target === FLAP_PORTAL)).length,
-                dexCount: buyerTasks.filter(t => t.calls.some(c => c.target !== FLAP_PORTAL)).length,
-                curveTotalAmount: ethers.formatEther(currentCurveTotal),
+                curveCount: curveBuyers.length,
+                dexCount: dexBuyers.length,
+                curveTotalAmount: ethers.formatEther(curveTotalWei),
                 dexTotalAmount: ethers.formatEther(totalDexBuyWei),
                 tokenAddress
             }

package/dist/xlayer/constants.d.ts

@@ -69,7 +69,7 @@ export declare const ENTRYPOINT_ABI: readonly ["function getNonce(address sender
 /** SimpleAccount ABI */
 export declare const SIMPLE_ACCOUNT_ABI: readonly ["function execute(address dest, uint256 value, bytes func) external", "function executeBatch(address[] calldata dest, bytes[] calldata func) external", "function executeBatch(address[] calldata dest, uint256[] calldata values, bytes[] calldata func) external"];
 /** Flap Portal ABI */
-export declare const PORTAL_ABI: readonly ["function swapExactInput((address inputToken,address outputToken,uint256 inputAmount,uint256 minOutputAmount,bytes permitData) params) payable returns (uint256)", "function buy(address token, address to, uint256 minAmount) external payable returns (uint256)", "function sell(address token, uint256 amount, uint256 minEth) external returns (uint256)", "function quoteExactInput((address inputToken,address outputToken,uint256 inputAmount)) external returns (uint256)", "function previewBuy(address token, uint256 ethAmount) external view returns (uint256)", "function previewSell(address token, uint256 tokenAmount) external view returns (uint256)", "function getTokenV5(address token) external view returns ((uint8,uint256,uint256,uint256,uint8,uint256,uint256,uint256,uint256,address,bool,bytes32))", "function getTokenV7(address token) external view returns ((uint8,uint256,uint256,uint256,uint8,uint256,uint256,uint256,uint256,address,bool,bytes32,uint8,uint8))", "function newTokenV2((string name,string symbol,string meta,uint8 dexThresh,bytes32 salt,uint16 taxRate,uint8 migratorType,address quoteToken,uint256 quoteAmt,address beneficiary,bytes permitData) params) external payable returns (address)", "function newTokenV3((string name,string symbol,string meta,uint8 dexThresh,bytes32 salt,uint16 taxRate,uint8 migratorType,address quoteToken,uint256 quoteAmt,address beneficiary,bytes permitData,bytes32 extensionID,bytes extensionData) params) external payable returns (address)", "function newTokenV4((string name,string symbol,string meta,uint8 dexThresh,bytes32 salt,uint16 taxRate,uint8 migratorType,address quoteToken,uint256 quoteAmt,address beneficiary,bytes permitData,bytes32 extensionID,bytes extensionData,uint8 dexId,uint8 lpFeeProfile) params) external payable returns (address)"];
+export declare const PORTAL_ABI: readonly ["function swapExactInput((address inputToken,address outputToken,uint256 inputAmount,uint256 minOutputAmount,bytes permitData) params) payable returns (uint256)", "function swapExactInputV3((address inputToken,address outputToken,uint256 inputAmount,uint256 minOutputAmount,bytes permitData,bytes extensionData)) external payable returns (uint256)", "function buy(address token, address to, uint256 minAmount) external payable returns (uint256)", "function sell(address token, uint256 amount, uint256 minEth) external returns (uint256)", "function quoteExactInput((address inputToken,address outputToken,uint256 inputAmount)) external returns (uint256)", "function previewBuy(address token, uint256 ethAmount) external view returns (uint256)", "function previewSell(address token, uint256 tokenAmount) external view returns (uint256)", "function getTokenV5(address token) external view returns ((uint8,uint256,uint256,uint256,uint8,uint256,uint256,uint256,uint256,address,bool,bytes32))", "function getTokenV7(address token) external view returns ((uint8,uint256,uint256,uint256,uint8,uint256,uint256,uint256,uint256,address,bool,bytes32,uint8,uint8))", "function newTokenV2((string name,string symbol,string meta,uint8 dexThresh,bytes32 salt,uint16 taxRate,uint8 migratorType,address quoteToken,uint256 quoteAmt,address beneficiary,bytes permitData) params) external payable returns (address)", "function newTokenV3((string name,string symbol,string meta,uint8 dexThresh,bytes32 salt,uint16 taxRate,uint8 migratorType,address quoteToken,uint256 quoteAmt,address beneficiary,bytes permitData,bytes32 extensionID,bytes extensionData) params) external payable returns (address)", "function newTokenV4((string name,string symbol,string meta,uint8 dexThresh,bytes32 salt,uint16 taxRate,uint8 migratorType,address quoteToken,uint256 quoteAmt,address beneficiary,bytes permitData,bytes32 extensionID,bytes extensionData,uint8 dexId,uint8 lpFeeProfile) params) external payable returns (address)"];
 /** ERC20 ABI */
 export declare const ERC20_ABI: readonly ["function balanceOf(address account) view returns (uint256)", "function allowance(address owner, address spender) view returns (uint256)", "function approve(address spender, uint256 amount) returns (bool)", "function transfer(address to, uint256 amount) returns (bool)", "function decimals() view returns (uint8)", "function symbol() view returns (string)", "function name() view returns (string)"];
 /** PotatoSwap V2 Router ABI */

package/dist/xlayer/constants.js

@@ -107,6 +107,8 @@ export const SIMPLE_ACCOUNT_ABI = [
 /** Flap Portal ABI */
 export const PORTAL_ABI = [
     'function swapExactInput((address inputToken,address outputToken,uint256 inputAmount,uint256 minOutputAmount,bytes permitData) params) payable returns (uint256)',
+    // ✅ swapExactInputV3: 支持 extensionData 扩展，用于买到毕业等场景
+    'function swapExactInputV3((address inputToken,address outputToken,uint256 inputAmount,uint256 minOutputAmount,bytes permitData,bytes extensionData)) external payable returns (uint256)',
     'function buy(address token, address to, uint256 minAmount) external payable returns (uint256)',
     'function sell(address token, uint256 amount, uint256 minEth) external returns (uint256)',
     'function quoteExactInput((address inputToken,address outputToken,uint256 inputAmount)) external returns (uint256)',

package/dist/xlayer/index.d.ts

@@ -61,7 +61,7 @@ export * from './types.js';
 import type { BundleSwapSignParams, BundleSwapSignResult, BundleBatchSwapSignParams, BundleBatchSwapSignResult } from './types.js';
 export { BundlerClient, createBundlerClient, type BundlerConfig, type BundlerReceipt, } from './bundler.js';
 export { AAAccountManager, createAAAccountManager, predictSender, createWallet, encodeExecute, encodeExecuteBatch, generateAAWallets, generateAAWalletsFromMnemonic, predictSendersFromPrivateKeys, type GeneratedAAWallet, type GenerateAAWalletsParams, type GenerateAAWalletsResult, } from './aa-account.js';
-export { encodeBuyCall, encodeSellCall, encodeApproveCall, encodeTransferCall, PortalQuery, createPortalQuery, applySlippage, formatOkb, parseOkb, formatTokenAmount, parseTokenAmount, type PortalQueryConfig, } from './portal-ops.js';
+export { encodeBuyCall, encodeBuyCallV3, encodeSellCall, encodeApproveCall, encodeTransferCall, PortalQuery, createPortalQuery, applySlippage, formatOkb, parseOkb, formatTokenAmount, parseTokenAmount, type PortalQueryConfig, } from './portal-ops.js';
 export { BundleExecutor, createBundleExecutor, bundleBuy, bundleSell, bundleBuySell, bundleCreateBuySign, bundleCreateToDexSign, bundleGraduateBuy, bundlePreApprove, checkApprovalStatus, } from './bundle.js';
 export { DexBundleExecutor, createDexBundleExecutor, dexBundleBuySell, type DexBundleConfig, type DexBundleBuySellParams, } from './dex-bundle.js';
 export { AAPortalSwapExecutor, } from './portal-bundle-swap.js';

package/dist/xlayer/index.js

@@ -77,7 +77,7 @@ generateAAWallets, generateAAWalletsFromMnemonic, predictSendersFromPrivateKeys,
 // ============================================================================
 // Portal 操作
 // ============================================================================
-export { encodeBuyCall, encodeSellCall, encodeApproveCall, encodeTransferCall, PortalQuery, createPortalQuery, applySlippage, formatOkb, parseOkb, formatTokenAmount, parseTokenAmount, } from './portal-ops.js';
+export { encodeBuyCall, encodeBuyCallV3, encodeSellCall, encodeApproveCall, encodeTransferCall, PortalQuery, createPortalQuery, applySlippage, formatOkb, parseOkb, formatTokenAmount, parseTokenAmount, } from './portal-ops.js';
 // ============================================================================
 // 捆绑交易
 // ============================================================================

package/dist/xlayer/portal-ops.d.ts

@@ -16,6 +16,19 @@ import { JsonRpcProvider } from 'ethers';
  * @param minOutputAmount 最小输出代币数量（默认 0）
  */
 export declare function encodeBuyCall(tokenAddress: string, inputAmount: bigint, minOutputAmount?: bigint): string;
+/**
+ * 编码买入调用 V3（swapExactInputV3: native -> token，支持 extensionData）
+ *
+ * 与 BSC 版本的 create-to-dex.ts 保持一致：
+ * - 统一优先使用 swapExactInputV3（支持 extensionData；无扩展时传 0x 即可）
+ * - 这里的 V3 指"交易接口版本（扩展支持）"，不是"外盘 V3 池子"
+ *
+ * @param tokenAddress 目标代币地址
+ * @param inputAmount 输入 OKB 数量（wei）
+ * @param minOutputAmount 最小输出代币数量（默认 0）
+ * @param extensionData 扩展数据（默认 0x）
+ */
+export declare function encodeBuyCallV3(tokenAddress: string, inputAmount: bigint, minOutputAmount?: bigint, extensionData?: string): string;
 /**
  * 编码卖出调用（swapExactInput: token -> native）
  *

package/dist/xlayer/portal-ops.js

@@ -33,6 +33,30 @@ export function encodeBuyCall(tokenAddress, inputAmount, minOutputAmount = 0n) {
         },
     ]);
 }
+/**
+ * 编码买入调用 V3（swapExactInputV3: native -> token，支持 extensionData）
+ *
+ * 与 BSC 版本的 create-to-dex.ts 保持一致：
+ * - 统一优先使用 swapExactInputV3（支持 extensionData；无扩展时传 0x 即可）
+ * - 这里的 V3 指"交易接口版本（扩展支持）"，不是"外盘 V3 池子"
+ *
+ * @param tokenAddress 目标代币地址
+ * @param inputAmount 输入 OKB 数量（wei）
+ * @param minOutputAmount 最小输出代币数量（默认 0）
+ * @param extensionData 扩展数据（默认 0x）
+ */
+export function encodeBuyCallV3(tokenAddress, inputAmount, minOutputAmount = 0n, extensionData = '0x') {
+    return portalIface.encodeFunctionData('swapExactInputV3', [
+        {
+            inputToken: ZERO_ADDRESS,
+            outputToken: tokenAddress,
+            inputAmount,
+            minOutputAmount,
+            permitData: '0x',
+            extensionData,
+        },
+    ]);
+}
 /**
  * 编码卖出调用（swapExactInput: token -> native）
  *

package/dist/xlayer/types.d.ts

@@ -860,8 +860,16 @@ export interface BundleGraduateBuyParams {
     walletAmounts?: Record<string, number>;
     /** 是否启用外盘买入（默认 false） */
     enableDexBuy?: boolean;
+    /** 内盘钱包地址列表（可选，传入则使用前端分组，不传则 SDK 自动分组） */
+    curveAddresses?: string[];
+    /** 外盘钱包地址列表（可选） */
+    dexAddresses?: string[];
+    /** 动态毕业阈值（可选，不传则使用默认 73.38 OKB） */
+    graduationAmount?: number;
     /** 配置覆盖 */
     config?: Partial<XLayerConfig>;
+    /** 扩展数据（传递给 swapExactInputV3，默认 0x） */
+    extensionData?: string;
     /** Payer 起始 nonce */
     payerStartNonce?: number;
     /** beneficiary（默认 payer 地址） */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "four-flap-meme-sdk",
-  "version": "1.5.79",
+  "version": "1.5.80",
   "description": "SDK for Flap bonding curve and four.meme TokenManager",
   "type": "module",
   "main": "dist/index.js",
@@ -36,4 +36,4 @@
   "devDependencies": {
     "typescript": "^5.6.3"
   }
-}
+}