four-flap-meme-sdk 1.6.44 → 1.6.47

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

@@ -557,12 +557,42 @@ export class AADexSwapExecutor {
                 return 0n;
             }
         })();
-        if (quotedSellOutWei > 0n && totalBuyWei > quotedSellOutWei) {
-            throw new Error('AA 批量换手：buyAmountsOkb 总和超过预估卖出输出（quotedSellOut）');
-        }
+        // ✅ 关键修复：提前计算 buyerPrefund，用于资金充足性检查
+        // 在 capitalMode 下，分发金额 = 买入金额 + buyerPrefund + 利润
+        // 必须确保卖出所得 >= 分发金额，否则交易会失败
+        const feeDataEarly = await this.aaManager.getFeeData();
+        const gasPriceEarly = feeDataEarly.gasPrice ?? feeDataEarly.maxFeePerGas ?? 5000000000n;
+        const estimateBuyerPrefundEarly = (deployed) => {
+            const callGas = DEX_BUY_CALL_GAS_LIMIT;
+            const verifyGas = deployed ? VERIFICATION_GAS_LIMIT_NORMAL : VERIFICATION_GAS_LIMIT_DEPLOY;
+            const preVerifyGas = PRE_VERIFICATION_GAS;
+            const totalGas = callGas + verifyGas + preVerifyGas;
+            return (totalGas * gasPriceEarly * PREFUND_BUFFER_PERCENT) / 100n;
+        };
+        // ✅ 计算所有 buyer 需要的 prefund 总和（仅原生代币模式 + capitalMode 需要）
+        const totalBuyerPrefundEarly = (useNativeToken && capitalMode)
+            ? buyerAis.reduce((sum, ai) => sum + estimateBuyerPrefundEarly(ai.deployed), 0n)
+            : 0n;
+        // ✅ 计算利润（考虑 buyerPrefund 后的可用利润空间）
         const profitWeiRaw = extractProfit ? calculateProfitWei(quotedSellOutWei, profitBps) : 0n;
-        const profitCap = quotedSellOutWei > totalBuyWei ? (quotedSellOutWei - totalBuyWei) : 0n;
-        const profitWei = profitWeiRaw > profitCap ? profitCap : profitWeiRaw;
+        // 利润上限 = 卖出所得 - 买入金额 - buyerPrefund
+        const profitCapWithPrefund = quotedSellOutWei > (totalBuyWei + totalBuyerPrefundEarly)
+            ? (quotedSellOutWei - totalBuyWei - totalBuyerPrefundEarly)
+            : 0n;
+        const profitWei = profitWeiRaw > profitCapWithPrefund ? profitCapWithPrefund : profitWeiRaw;
+        // ✅ 资金充足性检查：卖出所得 >= 买入金额 + buyerPrefund + 利润
+        const totalDistributeNeeded = totalBuyWei + totalBuyerPrefundEarly + profitWei;
+        if (quotedSellOutWei > 0n && totalDistributeNeeded > quotedSellOutWei) {
+            console.error('[AA DEX 批量换手] ❌ 资金不足:', {
+                quotedSellOutWei: ethers.formatEther(quotedSellOutWei),
+                totalBuyWei: ethers.formatEther(totalBuyWei),
+                totalBuyerPrefund: ethers.formatEther(totalBuyerPrefundEarly),
+                profitWei: ethers.formatEther(profitWei),
+                totalNeeded: ethers.formatEther(totalDistributeNeeded),
+                shortfall: ethers.formatEther(totalDistributeNeeded - quotedSellOutWei),
+            });
+            throw new Error(`AA 批量换手：资金不足！卖出预估 ${ethers.formatEther(quotedSellOutWei)} OKB，但分发需要 ${ethers.formatEther(totalDistributeNeeded)} OKB（买入 ${ethers.formatEther(totalBuyWei)} + prefund ${ethers.formatEther(totalBuyerPrefundEarly)} + 利润 ${ethers.formatEther(profitWei)}），缺口 ${ethers.formatEther(totalDistributeNeeded - quotedSellOutWei)} OKB`);
+        }
         // ✅ 利润在分发阶段通过 AA 内部刮取
         // ✅ 资金分发逻辑（仅 capitalMode=true 时执行，对应 BSC flapQuickBatchSwapMerkle）
         // capitalMode=false 时跳过分发，买方用自己的 OKB（对应 BSC flapBatchSwapMerkle）
@@ -625,31 +655,44 @@ export class AADexSwapExecutor {
                 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 });
-                }
+                // ✅ 直接分发模式：
+                // - 原生代币模式：分发金额 = 买入金额 + 买方 prefund
+                // - ERC20 模式：只分发 ERC20 代币，prefund 需要 buyer 自己有 OKB
+                const items = buyerSenders.map((to, i) => {
+                    const buyAmount = buyAmountsWei[i] ?? 0n;
+                    const prefund = buyerPrefunds[i] ?? 0n;
+                    return {
+                        to,
+                        buyAmount, // ERC20 代币金额
+                        prefund, // OKB prefund（仅原生代币模式使用）
+                        totalValue: buyAmount + prefund // 原生代币模式的总金额
+                    };
+                }).filter(x => x.buyAmount > 0n);
+                // 添加利润接收者到分发列表（只用于原生代币模式的金额计算）
+                const profitItem = (extractProfit && profitWei > 0n)
+                    ? { to: profitRecipient, buyAmount: 0n, prefund: 0n, totalValue: profitWei }
+                    : null;
                 const chunks = chunkArray(items, maxPerOp);
                 for (const ch of chunks) {
                     let callData;
                     if (useNativeToken) {
-                        // ✅ 原生代币模式：使用 Multicall3 批量转账
+                        // ✅ 原生代币模式：使用 Multicall3 批量转账（包含 prefund）
+                        const allItems = profitItem && ch === chunks[0] ? [...ch, profitItem] : ch;
                         const { totalValue, data } = encodeNativeDisperseViaMulticall3({
-                            to: ch.map(x => x.to),
-                            values: ch.map(x => x.value),
+                            to: allItems.map(x => x.to),
+                            values: allItems.map(x => x.totalValue),
                         });
                         callData = encodeExecute(MULTICALL3, totalValue, data);
                     }
                     else {
-                        // ✅ ERC20 模式：使用 executeBatch 批量调用 ERC20 transfer
-                        const targets = ch.map(() => quoteToken);
-                        const values = ch.map(() => 0n);
-                        const datas = ch.map(x => erc20Iface.encodeFunctionData('transfer', [x.to, x.value]));
+                        // ✅ ERC20 模式：只转账 ERC20 代币（不包含 OKB prefund）
+                        // 注意：buyer 需要自己有足够的 OKB 来支付 prefund，否则交易会失败
+                        const allItems = profitItem && ch === chunks[0]
+                            ? [...ch, { ...profitItem, buyAmount: profitWei }]
+                            : ch;
+                        const targets = allItems.map(() => quoteToken);
+                        const values = allItems.map(() => 0n);
+                        const datas = allItems.map(x => erc20Iface.encodeFunctionData('transfer', [x.to, x.buyAmount]));
                         callData = encodeExecuteBatch(targets, values, datas);
                     }
                     const signedDisperse = await this.aaManager.buildUserOpWithState({
@@ -744,6 +787,24 @@ export class AADexSwapExecutor {
                         allGeneratedHopWallets.push(chainHops);
                     }
                     console.log(`[AA DEX 多跳] ✅ 使用预充值 hop 钱包: ${totalHopsNeeded} 个 (${buyerSenders.length} 条链 × ${effectiveHopCount} 跳)`);
+                    // ✅ 关键修复：检查 buyer 钱包是否有足够的 OKB 支付 prefund
+                    // ERC-4337 的 handleOps 会先验证所有 UserOps（需要 prefund），然后才执行
+                    // 所以 buyer 需要在交易前就有足够的 OKB，不能依赖 hop 链在 execution 阶段转入的资金
+                    const buyerBalances = await Promise.all(buyerSenders.map(s => provider.getBalance(s)));
+                    const insufficientBuyers = [];
+                    for (let i = 0; i < buyerSenders.length; i++) {
+                        const buyerAi = buyerAis[i];
+                        const buyerPrefundNeeded = estimatePrefund(DEX_BUY_CALL_GAS_LIMIT, buyerAi.deployed);
+                        if (buyerBalances[i] < buyerPrefundNeeded) {
+                            insufficientBuyers.push(`${buyerSenders[i]} (余额: ${ethers.formatEther(buyerBalances[i])} OKB, 需要: ${ethers.formatEther(buyerPrefundNeeded)} OKB, 缺口: ${ethers.formatEther(buyerPrefundNeeded - buyerBalances[i])} OKB)`);
+                        }
+                    }
+                    if (insufficientBuyers.length > 0) {
+                        console.error('[AA DEX 多跳] ❌ 以下 buyer 钱包 OKB 余额不足以支付 prefund:', insufficientBuyers);
+                        throw new Error(`Buyer 钱包 OKB 余额不足！在 ERC-4337 的 handleOps 中，所有 UserOps 在 Validation 阶段就需要支付 prefund，此时 hop 链还没有执行。` +
+                            `请先给 buyer 钱包充值 OKB。不足的钱包: ${insufficientBuyers.length} 个`);
+                    }
+                    console.log('[AA DEX 多跳] ✅ Buyer 钱包 prefund 检查通过');
                 }
                 else {
                     // Paymaster 模式：生成新钱包（不需要预充值，prefund=0）

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

@@ -368,12 +368,42 @@ export class AAPortalSwapExecutor {
         catch {
             quotedSellOutWei = await this.portalQuery.quoteExactInput(tokenAddress, ZERO_ADDRESS, sellAmountWei);
         }
-        if (totalBuyWei > quotedSellOutWei) {
-            throw new Error('AA 批量换手：buyAmountsOkb 总和超过预估卖出输出（quotedSellOut）');
-        }
+        // ✅ 关键修复：提前计算 buyerPrefund，用于资金充足性检查
+        // 在 capitalMode 下，分发金额 = 买入金额 + buyerPrefund + 利润
+        // 必须确保卖出所得 >= 分发金额，否则交易会失败
+        const feeDataEarly = await this.aaManager.getFeeData();
+        const gasPriceEarly = feeDataEarly.gasPrice ?? feeDataEarly.maxFeePerGas ?? 5000000000n;
+        const estimateBuyerPrefundEarly = (deployed) => {
+            const callGas = PORTAL_BUY_CALL_GAS_LIMIT;
+            const verifyGas = deployed ? VERIFICATION_GAS_LIMIT_NORMAL : VERIFICATION_GAS_LIMIT_DEPLOY;
+            const preVerifyGas = PRE_VERIFICATION_GAS;
+            const totalGas = callGas + verifyGas + preVerifyGas;
+            return (totalGas * gasPriceEarly * PREFUND_BUFFER_PERCENT) / 100n;
+        };
+        // ✅ 计算所有 buyer 需要的 prefund 总和（仅原生代币模式 + capitalMode 需要）
+        const totalBuyerPrefundEarly = (useNativeToken && capitalMode)
+            ? buyerAis.reduce((sum, ai) => sum + estimateBuyerPrefundEarly(ai.deployed), 0n)
+            : 0n;
+        // ✅ 计算利润（考虑 buyerPrefund 后的可用利润空间）
         const profitWeiRaw = extractProfit ? calculateProfitWei(quotedSellOutWei, profitBps) : 0n;
-        const profitCap = quotedSellOutWei - totalBuyWei;
-        const profitWei = profitWeiRaw > profitCap ? profitCap : profitWeiRaw;
+        // 利润上限 = 卖出所得 - 买入金额 - buyerPrefund
+        const profitCapWithPrefund = quotedSellOutWei > (totalBuyWei + totalBuyerPrefundEarly)
+            ? (quotedSellOutWei - totalBuyWei - totalBuyerPrefundEarly)
+            : 0n;
+        const profitWei = profitWeiRaw > profitCapWithPrefund ? profitCapWithPrefund : profitWeiRaw;
+        // ✅ 资金充足性检查：卖出所得 >= 买入金额 + buyerPrefund + 利润
+        const totalDistributeNeeded = totalBuyWei + totalBuyerPrefundEarly + profitWei;
+        if (quotedSellOutWei > 0n && totalDistributeNeeded > quotedSellOutWei) {
+            console.error('[AA Portal 批量换手] ❌ 资金不足:', {
+                quotedSellOutWei: ethers.formatEther(quotedSellOutWei),
+                totalBuyWei: ethers.formatEther(totalBuyWei),
+                totalBuyerPrefund: ethers.formatEther(totalBuyerPrefundEarly),
+                profitWei: ethers.formatEther(profitWei),
+                totalNeeded: ethers.formatEther(totalDistributeNeeded),
+                shortfall: ethers.formatEther(totalDistributeNeeded - quotedSellOutWei),
+            });
+            throw new Error(`AA 批量换手：资金不足！卖出预估 ${ethers.formatEther(quotedSellOutWei)} OKB，但分发需要 ${ethers.formatEther(totalDistributeNeeded)} OKB（买入 ${ethers.formatEther(totalBuyWei)} + prefund ${ethers.formatEther(totalBuyerPrefundEarly)} + 利润 ${ethers.formatEther(profitWei)}），缺口 ${ethers.formatEther(totalDistributeNeeded - quotedSellOutWei)} OKB`);
+        }
         // ✅ 利润在分发阶段通过 AA 内部刮取
         // ✅ 资金分发逻辑（仅 capitalMode=true 时执行，对应 BSC flapQuickBatchSwapMerkle）
         // capitalMode=false 时跳过分发，买方用自己的 OKB（对应 BSC flapBatchSwapMerkle）
@@ -434,29 +464,44 @@ export class AAPortalSwapExecutor {
                 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 });
-                }
+                // ✅ 直接分发模式：
+                // - 原生代币模式：分发金额 = 买入金额 + 买方 prefund
+                // - ERC20 模式：只分发 ERC20 代币，prefund 需要 buyer 自己有 OKB
+                const items = buyerSenders.map((to, i) => {
+                    const buyAmount = buyAmountsWei[i] ?? 0n;
+                    const prefund = buyerPrefunds[i] ?? 0n;
+                    return {
+                        to,
+                        buyAmount, // ERC20 代币金额
+                        prefund, // OKB prefund（仅原生代币模式使用）
+                        totalValue: buyAmount + prefund // 原生代币模式的总金额
+                    };
+                }).filter(x => x.buyAmount > 0n);
+                // 添加利润接收者到分发列表（只用于原生代币模式的金额计算）
+                const profitItem = (extractProfit && profitWei > 0n)
+                    ? { to: profitRecipient, buyAmount: 0n, prefund: 0n, totalValue: profitWei }
+                    : null;
                 const chunks = chunkArray(items, maxPerOp);
                 for (const ch of chunks) {
                     let callData;
                     if (useNativeToken) {
+                        // ✅ 原生代币模式：使用 Multicall3 批量转账（包含 prefund）
+                        const allItems = profitItem && ch === chunks[0] ? [...ch, profitItem] : ch;
                         const { totalValue, data } = encodeNativeDisperseViaMulticall3({
-                            to: ch.map(x => x.to),
-                            values: ch.map(x => x.value),
+                            to: allItems.map(x => x.to),
+                            values: allItems.map(x => x.totalValue),
                         });
                         callData = encodeExecute(MULTICALL3, totalValue, data);
                     }
                     else {
-                        // ERC20 模式
-                        const targets = ch.map(() => quoteToken);
-                        const values = ch.map(() => 0n);
-                        const datas = ch.map(x => erc20Iface.encodeFunctionData('transfer', [x.to, x.value]));
+                        // ✅ ERC20 模式：只转账 ERC20 代币（不包含 OKB prefund）
+                        // 注意：buyer 需要自己有足够的 OKB 来支付 prefund，否则交易会失败
+                        const allItems = profitItem && ch === chunks[0]
+                            ? [...ch, { ...profitItem, buyAmount: profitWei }]
+                            : ch;
+                        const targets = allItems.map(() => quoteToken);
+                        const values = allItems.map(() => 0n);
+                        const datas = allItems.map(x => erc20Iface.encodeFunctionData('transfer', [x.to, x.buyAmount]));
                         callData = encodeExecuteBatch(targets, values, datas);
                     }
                     const signedDisperse = await this.aaManager.buildUserOpWithState({
@@ -552,6 +597,24 @@ export class AAPortalSwapExecutor {
                         allGeneratedHopWallets.push(chainHops);
                     }
                     console.log(`[AA Portal 多跳] ✅ 使用预充值 hop 钱包: ${totalHopsNeeded} 个`);
+                    // ✅ 关键修复：检查 buyer 钱包是否有足够的 OKB 支付 prefund
+                    // ERC-4337 的 handleOps 会先验证所有 UserOps（需要 prefund），然后才执行
+                    // 所以 buyer 需要在交易前就有足够的 OKB，不能依赖 hop 链在 execution 阶段转入的资金
+                    const buyerBalances = await Promise.all(buyerSenders.map(s => provider.getBalance(s)));
+                    const insufficientBuyers = [];
+                    for (let i = 0; i < buyerSenders.length; i++) {
+                        const buyerAi = buyerAis[i];
+                        const buyerPrefundNeeded = estimatePrefund(PORTAL_BUY_CALL_GAS_LIMIT, buyerAi.deployed);
+                        if (buyerBalances[i] < buyerPrefundNeeded) {
+                            insufficientBuyers.push(`${buyerSenders[i]} (余额: ${ethers.formatEther(buyerBalances[i])} OKB, 需要: ${ethers.formatEther(buyerPrefundNeeded)} OKB, 缺口: ${ethers.formatEther(buyerPrefundNeeded - buyerBalances[i])} OKB)`);
+                        }
+                    }
+                    if (insufficientBuyers.length > 0) {
+                        console.error('[AA Portal 多跳] ❌ 以下 buyer 钱包 OKB 余额不足以支付 prefund:', insufficientBuyers);
+                        throw new Error(`Buyer 钱包 OKB 余额不足！在 ERC-4337 的 handleOps 中，所有 UserOps 在 Validation 阶段就需要支付 prefund，此时 hop 链还没有执行。` +
+                            `请先给 buyer 钱包充值 OKB。不足的钱包: ${insufficientBuyers.length} 个`);
+                    }
+                    console.log('[AA Portal 多跳] ✅ Buyer 钱包 prefund 检查通过');
                 }
                 else {
                     // Paymaster 模式：生成新钱包

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "four-flap-meme-sdk",
-  "version": "1.6.44",
+  "version": "1.6.47",
   "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"
   }
-}
+}