four-flap-meme-sdk 1.5.94 → 1.5.96

package/dist/xlayer/bundle.js

@@ -73,7 +73,6 @@ class AANonceMap {
 // 固定 gas（用于大规模减少 RPC）；具体值允许通过 config.fixedGas 覆盖
 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
@@ -1350,17 +1349,31 @@ export class BundleExecutor {
         const totalBuyWei = buyerData.reduce((sum, d) => sum + d.buyWei, 0n);
         const totalBuyProfitWei = buyerData.reduce((sum, d) => sum + d.profitWei, 0n);
         // ✅ 并行构建和签名所有买家的 UserOps
+        // ✅ V3/V4 代币使用 swapExactInputV3（支持 extensionData），与 bundleGraduateBuy 保持一致
+        const extensionData = params.extensionData ?? '0x';
         const signedBuyOps = await mapWithConcurrency(buyerData, 5, async (data) => {
             const { buyer, buyWei, accountInfo } = data;
-            const swapData = portalIface.encodeFunctionData('swapExactInput', [
-                {
-                    inputToken,
-                    outputToken: tokenAddress,
-                    inputAmount: buyWei,
-                    minOutputAmount: 0n,
-                    permitData: '0x',
-                },
-            ]);
+            // ✅ V3/V4 代币使用 swapExactInputV3，否则使用旧版 swapExactInput
+            const swapData = (useV3 || useV4)
+                ? portalIface.encodeFunctionData('swapExactInputV3', [
+                    {
+                        inputToken,
+                        outputToken: tokenAddress,
+                        inputAmount: buyWei,
+                        minOutputAmount: 0n,
+                        permitData: '0x',
+                        extensionData,
+                    },
+                ])
+                : portalIface.encodeFunctionData('swapExactInput', [
+                    {
+                        inputToken,
+                        outputToken: tokenAddress,
+                        inputAmount: buyWei,
+                        minOutputAmount: 0n,
+                        permitData: '0x',
+                    },
+                ]);
             // ✅ ERC20 代币需要先 approve，使用 executeBatch 将 approve + swap 合并为一个 UserOp
             let buyCallData;
             if (useNativeToken) {
@@ -1405,28 +1418,58 @@ export class BundleExecutor {
             }
         }
         const provider = this.aaManager.getProvider();
-        const startNonce = params.payerStartNonce ?? await provider.getTransactionCount(payer.address, 'pending');
+        let currentNonce = params.payerStartNonce ?? await provider.getTransactionCount(payer.address, 'pending');
         const signedTransactions = [];
         const feeData = await provider.getFeeData();
         const gasPrice = feeData.gasPrice ?? 100000000n;
         const chainId = (await provider.getNetwork()).chainId;
+        // === 0. 向买家 AA 账户转入 OKB（prefund + 买入金额）===
+        // ✅ 修复 AA21 didn't pay prefund 错误：确保每个买家的 AA 账户有足够的 OKB
+        const DEFAULT_PREFUND_ESTIMATE = parseOkb('0.002'); // 预估每个 UserOp 的 prefund (gas 费用)
+        const BUFFER_WEI = parseOkb('0.0005'); // 缓冲金额
+        for (let i = 0; i < buyerWallets.length; i++) {
+            const buyerSender = buyerSenders[i];
+            const buyWei = buyerData[i].buyWei;
+            // 计算需要转入的金额：买入金额 + prefund + 缓冲
+            const requiredAmount = useNativeToken
+                ? buyWei + DEFAULT_PREFUND_ESTIMATE + BUFFER_WEI // 原生代币：需要买入金额 + gas
+                : DEFAULT_PREFUND_ESTIMATE + BUFFER_WEI; // ERC20 代币：只需要 gas
+            // 检查买家 AA 账户当前余额
+            const currentBalance = await provider.getBalance(buyerSender);
+            if (currentBalance < requiredAmount) {
+                const transferAmount = requiredAmount - currentBalance;
+                console.log(`[买家${i + 1}] 向 AA 账户 ${buyerSender} 转入 ${formatOkb(transferAmount)} OKB`);
+                const fundTxRequest = {
+                    to: buyerSender,
+                    value: transferAmount,
+                    nonce: currentNonce,
+                    gasLimit: 21000n,
+                    gasPrice,
+                    chainId
+                };
+                const signedFundTx = await payer.signTransaction(fundTxRequest);
+                signedTransactions.push(signedFundTx);
+                currentNonce++;
+            }
+        }
         // === 1. AA handleOps 交易（包含所有 UserOps：创建 + 买入）===
         const signedMainTx = await this.signHandleOpsTx({
             ops,
             payerWallet: payer,
             beneficiary: useBeneficiary,
-            nonce: startNonce,
+            nonce: currentNonce,
             gasLimit: effConfig.gasLimit,
             gasPrice: effConfig.minGasPriceGwei ? ethers.parseUnits(effConfig.minGasPriceGwei.toString(), 'gwei') : undefined
         });
         signedTransactions.push(signedMainTx);
+        currentNonce++;
         // === 2. 利润提取交易（独立的 EOA 转账）===
         if (nativeProfitAmount > 0n) {
             console.log(`[利润提取-签名] 非 AA 转账: ${useNativeToken ? formatOkb(nativeProfitAmount) : `${formatOkb(totalBuyProfitWei)} (ERC20) -> ${formatOkb(nativeProfitAmount)} (OKB)`} -> ${profitSettings.profitRecipient}`);
             const profitTxRequest = {
                 to: profitSettings.profitRecipient,
                 value: nativeProfitAmount,
-                nonce: startNonce + 1,
+                nonce: currentNonce,
                 gasLimit: 21000n,
                 gasPrice,
                 chainId

package/package.json

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