four-flap-meme-sdk 1.5.51 → 1.5.52

package/dist/xlayer/bundle.js

@@ -648,7 +648,7 @@ export class BundleExecutor {
                 // TODO: 如果需要，可以在这里检查并转账 ERC20 代币到 sender
             }
         });
-        // ✅ 构建买入 callData：如果使用 ERC20 代币，需要修改 encodeBuyCall 以支持 inputToken
+        // ✅ 构建买入 callData：如果使用 ERC20 代币，需要先 approve
         const buyCallDatas = buyWeis.map((buyWei) => {
             // 使用 portal 的 swapExactInput，支持 inputToken 参数
             const portalIface = new Interface([
@@ -663,8 +663,16 @@ export class BundleExecutor {
                     permitData: '0x',
                 },
             ]);
-            // 如果使用原生代币，value 为买入金额；否则为 0
-            return encodeExecute(this.portalAddress, useNativeToken ? buyWei : 0n, swapData);
+            // ✅ ERC20 代币需要先 approve，使用 executeBatch 将 approve + swap 合并为一个 UserOp
+            if (useNativeToken) {
+                // 原生代币：直接 swap
+                return encodeExecute(this.portalAddress, buyWei, swapData);
+            }
+            else {
+                // ERC20 代币：approve + swap 批量调用
+                const approveData = encodeApproveCall(this.portalAddress, buyWei);
+                return encodeExecuteBatch([inputToken, this.portalAddress], [0n, 0n], [approveData, swapData]);
+            }
         });
         const initCodes = accountInfos.map((ai, i) => ai.deployed ? '0x' : this.aaManager.generateInitCode(wallets[i].address));
         const { userOps: buyUserOps, prefundWeis } = await this.aaManager.buildUserOpsWithBundlerEstimateBatch({
@@ -977,7 +985,7 @@ export class BundleExecutor {
                 // TODO: 如果需要，可以在这里检查并转账 ERC20 代币到 sender
             }
         });
-        // ✅ 构建买入 callData：如果使用 ERC20 代币，需要修改 encodeBuyCall 以支持 inputToken
+        // ✅ 构建买入 callData：如果使用 ERC20 代币，需要先 approve
         const buyCallDatas = buyWeis.map((buyWei) => {
             // 使用 portal 的 swapExactInput，支持 inputToken 参数
             const portalIface = new Interface([
@@ -992,8 +1000,16 @@ export class BundleExecutor {
                     permitData: '0x',
                 },
             ]);
-            // 如果使用原生代币，value 为买入金额；否则为 0
-            return encodeExecute(this.portalAddress, useNativeToken ? buyWei : 0n, swapData);
+            // ✅ ERC20 代币需要先 approve，使用 executeBatch 将 approve + swap 合并为一个 UserOp
+            if (useNativeToken) {
+                // 原生代币：直接 swap
+                return encodeExecute(this.portalAddress, buyWei, swapData);
+            }
+            else {
+                // ERC20 代币：approve + swap 批量调用
+                const approveData = encodeApproveCall(this.portalAddress, buyWei);
+                return encodeExecuteBatch([inputToken, this.portalAddress], [0n, 0n], [approveData, swapData]);
+            }
         });
         const initCodes = accountInfos.map((ai, i) => (ai.deployed ? '0x' : this.aaManager.generateInitCode(wallets[i].address)));
         const { userOps: buyUserOps, prefundWeis } = await this.aaManager.buildUserOpsWithBundlerEstimateBatch({
@@ -1252,12 +1268,15 @@ export class BundleExecutor {
         const inputToken = params.quoteToken && params.quoteToken !== ZERO_ADDRESS ? params.quoteToken : ZERO_ADDRESS;
         const useNativeToken = inputToken === ZERO_ADDRESS;
         const quoteDecimals = 18;
-        let totalBuyWei = 0n;
-        let totalBuyProfitWei = 0n;
-        const buyerSenders = [];
         const portalIface = new Interface(PORTAL_ABI);
-        for (let i = 0; i < buyerWallets.length; i++) {
-            const buyer = buyerWallets[i];
+        // ✅ 批量获取所有买家的账户信息（并行优化）
+        const buyerAccountInfos = await this.aaManager.getMultipleAccountInfo(buyerWallets.map(w => w.address));
+        const buyerSenders = buyerAccountInfos.map(ai => ai.sender);
+        for (const ai of buyerAccountInfos) {
+            nonceMap.init(ai.sender, ai.nonce);
+        }
+        // ✅ 预计算所有买家的金额和利润
+        const buyerData = buyerWallets.map((buyer, i) => {
             const amountStr = buyAmounts[i] || '0';
             const originalWei = useNativeToken ? parseOkb(amountStr) : ethers.parseUnits(amountStr, quoteDecimals);
             let buyWei = originalWei;
@@ -1267,11 +1286,13 @@ export class BundleExecutor {
                 buyWei = res.remaining;
                 profitWei = res.profit;
             }
-            totalBuyWei += buyWei;
-            totalBuyProfitWei += profitWei;
-            const buyerAccount = await this.aaManager.getAccountInfo(buyer.address);
-            buyerSenders.push(buyerAccount.sender);
-            nonceMap.init(buyerAccount.sender, buyerAccount.nonce);
+            return { buyer, buyWei, profitWei, accountInfo: buyerAccountInfos[i] };
+        });
+        const totalBuyWei = buyerData.reduce((sum, d) => sum + d.buyWei, 0n);
+        const totalBuyProfitWei = buyerData.reduce((sum, d) => sum + d.profitWei, 0n);
+        // ✅ 并行构建和签名所有买家的 UserOps
+        const signedBuyOps = await mapWithConcurrency(buyerData, 5, async (data) => {
+            const { buyer, buyWei, accountInfo } = data;
             const swapData = portalIface.encodeFunctionData('swapExactInput', [
                 {
                     inputToken,
@@ -1281,17 +1302,28 @@ export class BundleExecutor {
                     permitData: '0x',
                 },
             ]);
+            // ✅ ERC20 代币需要先 approve，使用 executeBatch 将 approve + swap 合并为一个 UserOp
+            let buyCallData;
+            if (useNativeToken) {
+                buyCallData = encodeExecute(this.portalAddress, buyWei, swapData);
+            }
+            else {
+                const approveData = encodeApproveCall(this.portalAddress, buyWei);
+                buyCallData = encodeExecuteBatch([inputToken, this.portalAddress], [0n, 0n], [approveData, swapData]);
+            }
             const buyOp = await this.aaManager.buildUserOpWithFixedGas({
                 ownerWallet: buyer,
-                sender: buyerAccount.sender,
-                callData: encodeExecute(this.portalAddress, useNativeToken ? buyWei : 0n, swapData),
-                nonce: nonceMap.next(buyerAccount.sender),
-                initCode: buyerAccount.deployed ? '0x' : this.aaManager.generateInitCode(buyer.address),
-                deployed: buyerAccount.deployed
+                sender: accountInfo.sender,
+                callData: buyCallData,
+                nonce: nonceMap.next(accountInfo.sender),
+                initCode: accountInfo.deployed ? '0x' : this.aaManager.generateInitCode(buyer.address),
+                deployed: accountInfo.deployed
             });
             const signedBuyOp = await this.aaManager.signUserOp(buyOp.userOp, buyer);
-            ops.push(signedBuyOp.userOp);
-        }
+            return signedBuyOp.userOp;
+        });
+        // 将所有签名的买入 UserOps 添加到操作列表
+        ops.push(...signedBuyOps);
         // 利润由尾笔交易处理（不再在买入阶段追加利润转账 UserOp）
         // === 计算利润金额 ===
         let nativeProfitAmount = 0n;
@@ -1425,17 +1457,20 @@ export class BundleExecutor {
         });
         const signedCreateOp = await aaManager.signUserOp(createOpRes.userOp, payerWallet);
         ops1.push(signedCreateOp.userOp);
-        // --- 3. 构建内盘买入 Ops ---
-        for (let i = 0; i < curveBuyerWallets.length; i++) {
-            const wallet = curveBuyerWallets[i];
-            const info = curveBuyerInfos[i];
+        // --- 3. 构建内盘买入 Ops（并行优化）---
+        // ✅ 预计算所有买入金额
+        const curveBuyData = curveBuyerWallets.map((wallet, i) => {
             const buyWei = parseOkb(curveBuyAmounts[i]);
-            totalCurveBuyWei += buyWei;
+            const isLast = i === curveBuyerWallets.length - 1;
+            const gasLimit = isLast ? 8000000n : 800000n; // 最后一笔触发毕业，给大一点
+            return { wallet, info: curveBuyerInfos[i], buyWei, gasLimit };
+        });
+        totalCurveBuyWei = curveBuyData.reduce((sum, d) => sum + d.buyWei, 0n);
+        // ✅ 并行构建和签名所有内盘买入 UserOps
+        const signedCurveBuyOps = await mapWithConcurrency(curveBuyData, 5, async (data) => {
+            const { wallet, info, buyWei, gasLimit } = data;
             const buyData = encodeBuyCall(tokenAddress, buyWei, 0n);
             const buyCallData = encodeExecute(FLAP_PORTAL, buyWei, buyData);
-            // 最后一笔买入通常触发毕业，GasLimit 给大一点 (8M)
-            const isLast = i === curveBuyerWallets.length - 1;
-            const gasLimit = isLast ? 8000000n : 800000n;
             const buyOpRes = await aaManager.buildUserOpWithFixedGas({
                 ownerWallet: wallet,
                 sender: info.sender,
@@ -1446,8 +1481,9 @@ export class BundleExecutor {
                 fixedGas: { callGasLimit: gasLimit }
             });
             const signedBuyOp = await aaManager.signUserOp(buyOpRes.userOp, wallet);
-            ops1.push(signedBuyOp.userOp);
-        }
+            return signedBuyOp.userOp;
+        });
+        ops1.push(...signedCurveBuyOps);
         // 签名第一个 handleOps
         const startNonce = params.payerStartNonce ?? (await provider.getTransactionCount(payerWallet.address, 'pending'));
         const signedMainTx = await this.signHandleOpsTx({
@@ -1467,40 +1503,32 @@ export class BundleExecutor {
             });
             const ops2 = [];
             const deadline = Math.floor(Date.now() / 1000) + 1200; // 20 min
-            for (let i = 0; i < dexBuyerWallets.length; i++) {
-                const wallet = dexBuyerWallets[i];
-                const info = dexBuyerInfos[i];
+            // ✅ 预计算所有外盘买入金额
+            const dexBuyData = dexBuyerWallets.map((wallet, i) => {
                 const buyWei = parseOkb(dexBuyAmounts[i]);
-                totalDexBuyWei += buyWei;
-                // AA 模式外盘：Approve + Swap
-                // 1. Approve (PotatoSwap Router)
+                return { wallet, info: dexBuyerInfos[i], buyWei };
+            });
+            totalDexBuyWei = dexBuyData.reduce((sum, d) => sum + d.buyWei, 0n);
+            // ✅ 并行构建和签名所有外盘买入 UserOps
+            const signedDexBuyOps = await mapWithConcurrency(dexBuyData, 5, async (data) => {
+                const { wallet, info, buyWei } = data;
+                // AA 模式外盘：使用 executeBatch 将 Approve + Swap 合并为一个 UserOp
                 const approveData = encodeApproveCall(POTATOSWAP_V2_ROUTER);
-                const approveCallData = encodeExecute(tokenAddress, 0n, approveData);
-                const approveOpRes = await aaManager.buildUserOpWithFixedGas({
-                    ownerWallet: wallet,
-                    sender: info.sender,
-                    callData: approveCallData,
-                    nonce: nonceMap.next(info.sender),
-                    initCode: '0x', // HandleOps1 已部署
-                    deployed: true,
-                    fixedGas: { callGasLimit: 100000n }
-                });
-                const signedApprove = await aaManager.signUserOp(approveOpRes.userOp, wallet);
-                ops2.push(signedApprove.userOp);
-                // 2. Swap (PotatoSwap V2)
                 const swapData = encodeSwapExactETHForTokensSupportingFee(0n, [WOKB, tokenAddress], info.sender, deadline);
-                const swapCallData = encodeExecute(POTATOSWAP_V2_ROUTER, buyWei, swapData);
-                const swapOpRes = await aaManager.buildUserOpWithFixedGas({
+                const batchCallData = encodeExecuteBatch([tokenAddress, POTATOSWAP_V2_ROUTER], [0n, buyWei], [approveData, swapData]);
+                const dexBuyOpRes = await aaManager.buildUserOpWithFixedGas({
                     ownerWallet: wallet,
                     sender: info.sender,
-                    callData: swapCallData,
+                    callData: batchCallData,
                     nonce: nonceMap.next(info.sender),
+                    initCode: '0x', // HandleOps1 已部署
                     deployed: true,
-                    fixedGas: { callGasLimit: 500000n }
+                    fixedGas: { callGasLimit: 600000n }
                 });
-                const signedSwap = await aaManager.signUserOp(swapOpRes.userOp, wallet);
-                ops2.push(signedSwap.userOp);
-            }
+                const signedDexBuyOp = await aaManager.signUserOp(dexBuyOpRes.userOp, wallet);
+                return signedDexBuyOp.userOp;
+            });
+            ops2.push(...signedDexBuyOps);
             const signedDexTx = await this.signHandleOpsTx({
                 ops: ops2,
                 payerWallet: payerWallet,

package/package.json

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