four-flap-meme-sdk 1.6.27 → 1.6.28

package/dist/xlayer/aa-transfer-profit.js

@@ -147,6 +147,26 @@ export async function buildDisperseFromSingleOwnerOpsWithProfit(params) {
     const fnFixed = aaManager.buildUserOpWithFixedGas;
     if (typeof fnFixed !== 'function')
         throw new Error('AA disperse：SDK 不支持 buildUserOpWithFixedGas');
+    // ✅ 关键修复：如果有多个 UserOps，需要确保 sender 有足够余额支付所有 prefund
+    // 多个 UserOps 在同一个 handleOps 中提交时，prefund 在 validation 阶段同时扣除
+    if (chunks.length > 1 && params.kind === 'native') {
+        const feeData = await provider.getFeeData();
+        const gasPrice = feeData.gasPrice ?? 5000000000n;
+        const estimatePrefundPerOp = (listLength, deployed) => {
+            const base = 180000n;
+            const per = 45000n;
+            const callGas = base + per * BigInt(listLength);
+            const verifyGas = deployed ? 250000n : 800000n;
+            const preVerifyGas = 60000n;
+            return (callGas + verifyGas + preVerifyGas) * gasPrice * 120n / 100n;
+        };
+        let totalPrefundNeeded = 0n;
+        for (let i = 0; i < chunks.length; i++) {
+            const deployed = i === 0 ? deployed0 : true;
+            totalPrefundNeeded += estimatePrefundPerOp(chunks[i].length, deployed);
+        }
+        console.log(`[AA 分发] 多批次分发：${chunks.length} 批，总 prefund 预估: ${ethers.formatEther(totalPrefundNeeded)} OKB`);
+    }
     const ops = [];
     for (let i = 0; i < chunks.length; i++) {
         const list = chunks[i];
@@ -268,6 +288,19 @@ export async function buildTransfersWithProfit(params) {
         initCodeUsed.add(k);
         return aaManager.generateInitCode(ownerAddress);
     };
+    // ✅ 关键修复：计算每个 sender 执行 UserOp 需要的 prefund（gas 费用）
+    // 在 Native 模式下，需要确保留足够的金额支付 prefund
+    const feeData = await provider.getFeeData();
+    const gasPrice = feeData.gasPrice ?? feeData.maxFeePerGas ?? 5000000000n;
+    const estimateTransferPrefund = (deployed) => {
+        // 归集操作的 gas：callGasLimit + verificationGasLimit + preVerificationGas
+        const callGas = 120000n; // Native 转账
+        const verifyGas = deployed ? 250000n : 800000n;
+        const preVerifyGas = 60000n;
+        const totalGas = callGas + verifyGas + preVerifyGas;
+        // 加 30% buffer 以确保足够（归集操作需要更保守）
+        return (totalGas * gasPrice * 130n) / 100n;
+    };
     // ✅ 第一步：计算每个钱包的归集金额和总利润
     // 利润从每个钱包的归集金额中扣除，但只由第一个有效钱包统一转账给利润地址
     const transferInfos = [];
@@ -292,10 +325,18 @@ export async function buildTransfersWithProfit(params) {
         if (amountWei <= 0n)
             continue;
         const profitWei = calcProfitWei(amountWei, PROFIT_CONFIG.RATE_BPS);
-        const toWei = amountWei - profitWei;
+        const deployed = accountInfos[i]?.deployed ?? false;
+        const prefundWei = params.kind === 'native' ? estimateTransferPrefund(deployed) : 0n;
+        // ✅ 关键修复：toWei 需要扣除 max(profitWei, prefundWei)，确保留足够的 gas
+        // 在 Native 模式下，如果 profitWei < prefundWei，需要留更多余额
+        const reserveWei = params.kind === 'native'
+            ? (profitWei > prefundWei ? profitWei : prefundWei)
+            : profitWei;
+        const toWei = amountWei > reserveWei ? (amountWei - reserveWei) : 0n;
         totalProfitWei += profitWei;
-        transferInfos.push({ walletIndex: i, sender, to, amountWei, profitWei, toWei });
+        transferInfos.push({ walletIndex: i, sender, to, amountWei, profitWei, toWei, prefundWei });
     }
+    console.log(`[AA 归集] 钱包数量: ${transferInfos.length}, 总利润: ${ethers.formatEther(totalProfitWei)} OKB`);
     const unsigned = [];
     const opOwnerIndex = [];
     // ✅ 第二步：构建 UserOps

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

@@ -581,8 +581,29 @@ export class AADexSwapExecutor {
         if (capitalMode && buyerSenders.length > 0 && totalBuyWei > 0n) {
             if (hopCount <= 0) {
                 console.log('[AA DEX 批量换手] 进入直接分发模式 (hopCount <= 0)');
-                // ✅ 直接分发模式：将利润接收者加入分发列表（AA 内部刮取）
-                const items = buyerSenders.map((to, i) => ({ to, value: buyAmountsWei[i] ?? 0n })).filter(x => x.value > 0n);
+                // ✅ 关键修复：计算每个买方执行买入 UserOp 需要的 prefund（gas 费用）
+                // EntryPoint 在 validation 阶段会扣除 prefund，此时分发还没执行
+                // 因此需要为每个买方额外预留 prefund
+                const feeData = await this.aaManager.getFeeData();
+                const gasPrice = feeData.gasPrice ?? feeData.maxFeePerGas ?? 5000000000n; // 5 gwei fallback
+                const estimateBuyerPrefund = (deployed) => {
+                    // 买入操作的 gas：V3 swap 约 650,000，部署需要额外 verificationGas
+                    const callGas = 650000n;
+                    const verifyGas = deployed ? 250000n : 800000n;
+                    const preVerifyGas = 60000n;
+                    const totalGas = callGas + verifyGas + preVerifyGas;
+                    // 加 20% buffer 以确保足够
+                    return (totalGas * gasPrice * 120n) / 100n;
+                };
+                // 计算每个买方需要的 prefund
+                const buyerPrefunds = buyerAis.map(ai => estimateBuyerPrefund(ai.deployed));
+                const totalBuyerPrefund = buyerPrefunds.reduce((a, b) => a + b, 0n);
+                console.log(`[AA DEX 直接分发] 买方数量: ${buyerSenders.length}, 总 prefund 预估: ${ethers.formatEther(totalBuyerPrefund)} OKB`);
+                // ✅ 直接分发模式：分发金额 = 买入金额 + 买方 prefund
+                const items = buyerSenders.map((to, i) => ({
+                    to,
+                    value: (buyAmountsWei[i] ?? 0n) + (buyerPrefunds[i] ?? 0n) // ✅ 包含 prefund
+                })).filter(x => x.value > 0n);
                 // 添加利润接收者到分发列表
                 if (extractProfit && profitWei > 0n) {
                     items.push({ to: profitRecipient, value: profitWei });

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

@@ -390,8 +390,29 @@ export class AAPortalSwapExecutor {
         if (capitalMode && buyerSenders.length > 0 && totalBuyWei > 0n) {
             if (hopCount <= 0) {
                 console.log('[AA Portal 批量换手] 进入直接分发模式 (hopCount <= 0)');
-                // ✅ 直接分发模式：将利润接收者加入分发列表（AA 内部刮取）
-                const items = buyerSenders.map((to, i) => ({ to, value: buyAmountsWei[i] ?? 0n })).filter(x => x.value > 0n);
+                // ✅ 关键修复：计算每个买方执行买入 UserOp 需要的 prefund（gas 费用）
+                // EntryPoint 在 validation 阶段会扣除 prefund，此时分发还没执行
+                // 因此需要为每个买方额外预留 prefund
+                const feeData = await this.aaManager.getFeeData();
+                const gasPrice = feeData.gasPrice ?? feeData.maxFeePerGas ?? 5000000000n; // 5 gwei fallback
+                const estimateBuyerPrefund = (deployed) => {
+                    // 买入操作的 gas：Portal 买入约 450,000，部署需要额外 verificationGas
+                    const callGas = 450000n;
+                    const verifyGas = deployed ? 250000n : 800000n;
+                    const preVerifyGas = 60000n;
+                    const totalGas = callGas + verifyGas + preVerifyGas;
+                    // 加 20% buffer 以确保足够
+                    return (totalGas * gasPrice * 120n) / 100n;
+                };
+                // 计算每个买方需要的 prefund
+                const buyerPrefunds = buyerAis.map(ai => estimateBuyerPrefund(ai.deployed));
+                const totalBuyerPrefund = buyerPrefunds.reduce((a, b) => a + b, 0n);
+                console.log(`[AA Portal 直接分发] 买方数量: ${buyerSenders.length}, 总 prefund 预估: ${ethers.formatEther(totalBuyerPrefund)} OKB`);
+                // ✅ 直接分发模式：分发金额 = 买入金额 + 买方 prefund
+                const items = buyerSenders.map((to, i) => ({
+                    to,
+                    value: (buyAmountsWei[i] ?? 0n) + (buyerPrefunds[i] ?? 0n) // ✅ 包含 prefund
+                })).filter(x => x.value > 0n);
                 if (extractProfit && profitWei > 0n) {
                     items.push({ to: profitRecipient, value: profitWei });
                 }

package/package.json

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