four-flap-meme-sdk 1.6.38 → 1.6.40

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

@@ -691,20 +691,36 @@ export class AADexSwapExecutor {
                     // ✅ 关键修复：从链上获取所有 hop 钱包的真实 nonce（用户可能重复使用同一批 hop 钱包）
                     const hopSenders = prefundedHopWallets.slice(0, totalHopsNeeded).map(h => h.senderAddress);
                     const hopNonces = await this.aaManager.batchGetNonces(hopSenders);
+                    // ✅ 检查 hop 钱包余额是否足够（之前的失败交易可能已消耗 prefund）
+                    const hopBalances = await Promise.all(hopSenders.map(s => provider.getBalance(s)));
+                    const minPrefundNeeded = estimatePrefund(HOP_CALL_GAS_LIMIT, true); // 已部署钱包的 prefund
+                    const insufficientHops = [];
+                    for (let i = 0; i < hopSenders.length; i++) {
+                        if (hopBalances[i] < minPrefundNeeded) {
+                            insufficientHops.push(`${hopSenders[i]} (余额: ${ethers.formatEther(hopBalances[i])} OKB, 需要: ${ethers.formatEther(minPrefundNeeded)} OKB)`);
+                        }
+                    }
+                    if (insufficientHops.length > 0) {
+                        console.error('[AA DEX 多跳] ❌ 以下 hop 钱包余额不足:', insufficientHops);
+                        throw new Error(`Hop 钱包余额不足（可能之前交易失败消耗了 prefund），请点击"退回资金"后重新预充值。不足的钱包: ${insufficientHops.length} 个`);
+                    }
                     let hopIdx = 0;
                     for (let buyerIdx = 0; buyerIdx < buyerSenders.length; buyerIdx++) {
                         const chainHops = [];
                         for (let h = 0; h < effectiveHopCount; h++) {
                             const prefundedHop = prefundedHopWallets[hopIdx];
                             const wallet = new ethers.Wallet(prefundedHop.privateKey, provider);
+                            // ✅ 关键修复：根据真实 nonce 判断是否已部署
+                            // 如果 nonce > 0，说明钱包已经被使用过，肯定已部署，initCode 必须为 '0x'
+                            const realNonce = hopNonces[hopIdx] ?? 0n;
+                            const isDeployed = realNonce > 0n || prefundedHop.deployed;
+                            const effectiveInitCode = isDeployed ? '0x' : prefundedHop.initCode;
                             chainHops.push({
                                 wallet,
                                 sender: prefundedHop.senderAddress,
-                                deployed: prefundedHop.deployed,
-                                initCode: prefundedHop.initCode,
+                                deployed: isDeployed,
+                                initCode: effectiveInitCode,
                             });
-                            // ✅ 使用从链上获取的真实 nonce（而非硬编码 0）
-                            const realNonce = hopNonces[hopIdx] ?? 0n;
                             nonceMap.init(prefundedHop.senderAddress, realNonce);
                             hopIdx++;
                         }

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

@@ -498,20 +498,37 @@ export class AAPortalSwapExecutor {
                     // ✅ 关键修复：从链上获取所有 hop 钱包的真实 nonce（用户可能重复使用同一批 hop 钱包）
                     const hopSenders = prefundedHopWallets.slice(0, totalHopsNeeded).map(h => h.senderAddress);
                     const hopNonces = await this.aaManager.batchGetNonces(hopSenders);
+                    // ✅ 检查 hop 钱包余额是否足够（之前的失败交易可能已消耗 prefund）
+                    const hopBalances = await Promise.all(hopSenders.map(s => provider.getBalance(s)));
+                    // 预估已部署钱包的最小 prefund
+                    const minPrefundNeeded = (HOP_CALL_GAS_LIMIT + VERIFICATION_GAS_LIMIT_NORMAL + PRE_VERIFICATION_GAS) * gasPrice * PREFUND_BUFFER_PERCENT / 100n;
+                    const insufficientHops = [];
+                    for (let i = 0; i < hopSenders.length; i++) {
+                        if (hopBalances[i] < minPrefundNeeded) {
+                            insufficientHops.push(`${hopSenders[i]} (余额: ${ethers.formatEther(hopBalances[i])} OKB, 需要: ${ethers.formatEther(minPrefundNeeded)} OKB)`);
+                        }
+                    }
+                    if (insufficientHops.length > 0) {
+                        console.error('[AA Portal 多跳] ❌ 以下 hop 钱包余额不足:', insufficientHops);
+                        throw new Error(`Hop 钱包余额不足（可能之前交易失败消耗了 prefund），请点击"退回资金"后重新预充值。不足的钱包: ${insufficientHops.length} 个`);
+                    }
                     let hopIdx = 0;
                     for (let buyerIdx = 0; buyerIdx < buyerSenders.length; buyerIdx++) {
                         const chainHops = [];
                         for (let h = 0; h < effectiveHopCount; h++) {
                             const prefundedHop = prefundedHopWallets[hopIdx];
                             const wallet = new ethers.Wallet(prefundedHop.privateKey, provider);
+                            // ✅ 关键修复：根据真实 nonce 判断是否已部署
+                            // 如果 nonce > 0，说明钱包已经被使用过，肯定已部署，initCode 必须为 '0x'
+                            const realNonce = hopNonces[hopIdx] ?? 0n;
+                            const isDeployed = realNonce > 0n || prefundedHop.deployed;
+                            const effectiveInitCode = isDeployed ? '0x' : prefundedHop.initCode;
                             chainHops.push({
                                 wallet,
                                 sender: prefundedHop.senderAddress,
-                                deployed: prefundedHop.deployed,
-                                initCode: prefundedHop.initCode,
+                                deployed: isDeployed,
+                                initCode: effectiveInitCode,
                             });
-                            // ✅ 使用从链上获取的真实 nonce（而非硬编码 0）
-                            const realNonce = hopNonces[hopIdx] ?? 0n;
                             nonceMap.init(prefundedHop.senderAddress, realNonce);
                             hopIdx++;
                         }

package/package.json

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