four-flap-meme-sdk 1.6.40 → 1.6.41

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

@@ -688,9 +688,12 @@ export class AADexSwapExecutor {
                     if (prefundedHopWallets.length < totalHopsNeeded) {
                         throw new Error(`预充值 hop 钱包数量不足: 需要 ${totalHopsNeeded} 个，实际 ${prefundedHopWallets.length} 个`);
                     }
-                    // ✅ 关键修复：从链上获取所有 hop 钱包的真实 nonce（用户可能重复使用同一批 hop 钱包）
+                    // ✅ 关键修复：从链上获取所有 hop 钱包的真实 nonce 和部署状态
                     const hopSenders = prefundedHopWallets.slice(0, totalHopsNeeded).map(h => h.senderAddress);
                     const hopNonces = await this.aaManager.batchGetNonces(hopSenders);
+                    // ✅ 直接检查链上 code 判断是否已部署（比 nonce 更可靠）
+                    const hopCodes = await Promise.all(hopSenders.map(s => provider.getCode(s)));
+                    const hopDeployed = hopCodes.map(code => code !== null && code !== '0x' && code.length > 2);
                     // ✅ 检查 hop 钱包余额是否足够（之前的失败交易可能已消耗 prefund）
                     const hopBalances = await Promise.all(hopSenders.map(s => provider.getBalance(s)));
                     const minPrefundNeeded = estimatePrefund(HOP_CALL_GAS_LIMIT, true); // 已部署钱包的 prefund
@@ -704,17 +707,25 @@ export class AADexSwapExecutor {
                         console.error('[AA DEX 多跳] ❌ 以下 hop 钱包余额不足:', insufficientHops);
                         throw new Error(`Hop 钱包余额不足（可能之前交易失败消耗了 prefund），请点击"退回资金"后重新预充值。不足的钱包: ${insufficientHops.length} 个`);
                     }
+                    // 打印调试信息
+                    console.log('[AA DEX 多跳] Hop 钱包状态:', hopSenders.map((s, i) => ({
+                        sender: s,
+                        nonce: hopNonces[i]?.toString(),
+                        deployed: hopDeployed[i],
+                        balance: ethers.formatEther(hopBalances[i]),
+                    })));
                     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'
+                            // ✅ 关键修复：直接检查链上 code 判断是否已部署
                             const realNonce = hopNonces[hopIdx] ?? 0n;
-                            const isDeployed = realNonce > 0n || prefundedHop.deployed;
+                            const isDeployedOnChain = hopDeployed[hopIdx] ?? false;
+                            const isDeployed = realNonce > 0n || isDeployedOnChain || prefundedHop.deployed;
                             const effectiveInitCode = isDeployed ? '0x' : prefundedHop.initCode;
+                            console.log(`[AA DEX 多跳] Hop ${hopIdx}: sender=${prefundedHop.senderAddress}, nonce=${realNonce}, deployedOnChain=${isDeployedOnChain}, finalDeployed=${isDeployed}, initCode=${effectiveInitCode === '0x' ? '0x' : 'has-initCode'}`);
                             chainHops.push({
                                 wallet,
                                 sender: prefundedHop.senderAddress,

package/dist/xlayer/hop-wallet-manager.js

@@ -329,20 +329,31 @@ export class HopWalletManager {
         // 构建所有退款 UserOps
         const userOps = [];
         const hopWalletsToRefund = [];
-        // ✅ 关键修复：从链上批量获取所有 hop 钱包的真实 nonce
+        // ✅ 关键修复：从链上批量获取所有 hop 钱包的真实 nonce 和部署状态
         const hopSenders = hopWallets.map(h => h.senderAddress);
         const hopNonces = await this.aaManager.batchGetNonces(hopSenders);
+        // ✅ 直接检查链上 code 判断是否已部署
+        const hopCodes = await Promise.all(hopSenders.map(s => this.provider.getCode(s)));
+        const hopDeployedOnChain = hopCodes.map(code => code !== null && code !== '0x' && code.length > 2);
+        // ✅ 批量获取余额
+        const hopBalances = await Promise.all(hopSenders.map(s => this.provider.getBalance(s)));
+        console.log('[HopWalletManager] 退款前 Hop 钱包状态:', hopSenders.map((s, i) => ({
+            sender: s,
+            nonce: hopNonces[i]?.toString(),
+            deployed: hopDeployedOnChain[i],
+            balance: ethers.formatEther(hopBalances[i]),
+        })));
         for (let i = 0; i < hopWallets.length; i++) {
             const hop = hopWallets[i];
             try {
-                const balance = await this.provider.getBalance(hop.senderAddress);
+                const balance = hopBalances[i];
                 // 估算 UserOp 执行需要的 gas
                 const estimatedGas = 150000n * gasPrice;
                 if (balance <= estimatedGas) {
                     hopRefunds.push({
                         hopIndex: hop.index,
                         refundWei: 0n,
-                        error: '余额不足',
+                        error: `余额不足 (${ethers.formatEther(balance)} OKB)`,
                     });
                     continue;
                 }
@@ -351,9 +362,11 @@ export class HopWalletManager {
                 const hopWallet = new Wallet(hop.privateKey, this.provider);
                 // ✅ 使用从链上获取的真实 nonce
                 const realNonce = hopNonces[i] ?? 0n;
-                // ✅ 检查 hop 钱包是否已部署（根据 nonce 判断，nonce > 0 说明已用过，肯定已部署）
-                const isDeployed = realNonce > 0n || hop.deployed;
+                // ✅ 三重检查是否已部署：nonce > 0 OR 链上有 code OR 预充值时记录为已部署
+                const isDeployedOnChain = hopDeployedOnChain[i] ?? false;
+                const isDeployed = realNonce > 0n || isDeployedOnChain || hop.deployed;
                 const initCode = isDeployed ? '0x' : hop.initCode;
+                console.log(`[HopWalletManager] 退款 Hop ${i}: sender=${hop.senderAddress}, nonce=${realNonce}, deployedOnChain=${isDeployedOnChain}, finalDeployed=${isDeployed}, refundAmount=${ethers.formatEther(refundAmount)} OKB`);
                 const { userOp } = await this.aaManager.buildUserOpWithFixedGas({
                     ownerWallet: hopWallet,
                     sender: hop.senderAddress,
@@ -373,6 +386,7 @@ export class HopWalletManager {
                 });
             }
             catch (error) {
+                console.error(`[HopWalletManager] 退款 Hop ${i} 失败:`, error);
                 hopRefunds.push({
                     hopIndex: hop.index,
                     refundWei: 0n,

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

@@ -495,9 +495,12 @@ export class AAPortalSwapExecutor {
                     if (prefundedHopWallets.length < totalHopsNeeded) {
                         throw new Error(`预充值 hop 钱包数量不足: 需要 ${totalHopsNeeded} 个，实际 ${prefundedHopWallets.length} 个`);
                     }
-                    // ✅ 关键修复：从链上获取所有 hop 钱包的真实 nonce（用户可能重复使用同一批 hop 钱包）
+                    // ✅ 关键修复：从链上获取所有 hop 钱包的真实 nonce 和部署状态
                     const hopSenders = prefundedHopWallets.slice(0, totalHopsNeeded).map(h => h.senderAddress);
                     const hopNonces = await this.aaManager.batchGetNonces(hopSenders);
+                    // ✅ 直接检查链上 code 判断是否已部署（比 nonce 更可靠）
+                    const hopCodes = await Promise.all(hopSenders.map(s => provider.getCode(s)));
+                    const hopDeployed = hopCodes.map(code => code !== null && code !== '0x' && code.length > 2);
                     // ✅ 检查 hop 钱包余额是否足够（之前的失败交易可能已消耗 prefund）
                     const hopBalances = await Promise.all(hopSenders.map(s => provider.getBalance(s)));
                     // 预估已部署钱包的最小 prefund
@@ -512,17 +515,25 @@ export class AAPortalSwapExecutor {
                         console.error('[AA Portal 多跳] ❌ 以下 hop 钱包余额不足:', insufficientHops);
                         throw new Error(`Hop 钱包余额不足（可能之前交易失败消耗了 prefund），请点击"退回资金"后重新预充值。不足的钱包: ${insufficientHops.length} 个`);
                     }
+                    // 打印调试信息
+                    console.log('[AA Portal 多跳] Hop 钱包状态:', hopSenders.map((s, i) => ({
+                        sender: s,
+                        nonce: hopNonces[i]?.toString(),
+                        deployed: hopDeployed[i],
+                        balance: ethers.formatEther(hopBalances[i]),
+                    })));
                     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'
+                            // ✅ 关键修复：直接检查链上 code 判断是否已部署
                             const realNonce = hopNonces[hopIdx] ?? 0n;
-                            const isDeployed = realNonce > 0n || prefundedHop.deployed;
+                            const isDeployedOnChain = hopDeployed[hopIdx] ?? false;
+                            const isDeployed = realNonce > 0n || isDeployedOnChain || prefundedHop.deployed;
                             const effectiveInitCode = isDeployed ? '0x' : prefundedHop.initCode;
+                            console.log(`[AA Portal 多跳] Hop ${hopIdx}: sender=${prefundedHop.senderAddress}, nonce=${realNonce}, deployedOnChain=${isDeployedOnChain}, finalDeployed=${isDeployed}, initCode=${effectiveInitCode === '0x' ? '0x' : 'has-initCode'}`);
                             chainHops.push({
                                 wallet,
                                 sender: prefundedHop.senderAddress,

package/package.json

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