four-flap-meme-sdk 1.6.36 → 1.6.37

package/dist/xlayer/aa-account.d.ts

@@ -89,6 +89,12 @@ export declare class AAAccountManager {
      * 获取完整的 AA 账户信息
      */
     getAccountInfo(ownerAddress: string, salt?: bigint): Promise<AAAccount>;
+    /**
+     * 批量获取多个 AA sender 的 nonce
+     * @param senderAddresses AA sender 地址列表
+     * @returns 对应的 nonce 数组
+     */
+    batchGetNonces(senderAddresses: string[]): Promise<bigint[]>;
     /**
      * 生成 initCode（用于在 UserOp 中部署账户）
      */

package/dist/xlayer/aa-account.js

@@ -290,6 +290,40 @@ export class AAAccountManager {
             nonce,
         };
     }
+    /**
+     * 批量获取多个 AA sender 的 nonce
+     * @param senderAddresses AA sender 地址列表
+     * @returns 对应的 nonce 数组
+     */
+    async batchGetNonces(senderAddresses) {
+        if (senderAddresses.length === 0)
+            return [];
+        await this.syncEntryPointIfNeeded();
+        const epIface = new Interface(ENTRYPOINT_ABI);
+        const nonceCalls = senderAddresses.map((sender) => ({
+            target: this.entryPointAddress,
+            allowFailure: true,
+            callData: epIface.encodeFunctionData('getNonce', [sender, 0]),
+        }));
+        const nonces = new Array(senderAddresses.length).fill(0n);
+        const BATCH = 350;
+        for (let cursor = 0; cursor < nonceCalls.length; cursor += BATCH) {
+            const sliceCalls = nonceCalls.slice(cursor, cursor + BATCH);
+            const res = await this.multicallAggregate3({ calls: sliceCalls });
+            for (let i = 0; i < res.length; i++) {
+                const r = res[i];
+                const idx = cursor + i;
+                if (!r?.success || !r.returnData || r.returnData === '0x')
+                    continue;
+                try {
+                    const decoded = epIface.decodeFunctionResult('getNonce', r.returnData);
+                    nonces[idx] = BigInt(decoded?.[0] ?? 0n);
+                }
+                catch { /* ignore */ }
+            }
+        }
+        return nonces;
+    }
     /**
      * 生成 initCode（用于在 UserOp 中部署账户）
      */

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

@@ -688,11 +688,14 @@ export class AADexSwapExecutor {
                     if (prefundedHopWallets.length < totalHopsNeeded) {
                         throw new Error(`预充值 hop 钱包数量不足: 需要 ${totalHopsNeeded} 个，实际 ${prefundedHopWallets.length} 个`);
                     }
+                    // ✅ 关键修复：从链上获取所有 hop 钱包的真实 nonce（用户可能重复使用同一批 hop 钱包）
+                    const hopSenders = prefundedHopWallets.slice(0, totalHopsNeeded).map(h => h.senderAddress);
+                    const hopNonces = await this.aaManager.batchGetNonces(hopSenders);
                     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 prefundedHop = prefundedHopWallets[hopIdx];
                             const wallet = new ethers.Wallet(prefundedHop.privateKey, provider);
                             chainHops.push({
                                 wallet,
@@ -700,8 +703,10 @@ export class AADexSwapExecutor {
                                 deployed: prefundedHop.deployed,
                                 initCode: prefundedHop.initCode,
                             });
-                            // 初始化 nonce（预充值的钱包 nonce 应该是 0）
-                            nonceMap.init(prefundedHop.senderAddress, 0n);
+                            // ✅ 使用从链上获取的真实 nonce（而非硬编码 0）
+                            const realNonce = hopNonces[hopIdx] ?? 0n;
+                            nonceMap.init(prefundedHop.senderAddress, realNonce);
+                            hopIdx++;
                         }
                         allGeneratedHopWallets.push(chainHops);
                     }

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

@@ -329,6 +329,9 @@ export class HopWalletManager {
         // 构建所有退款 UserOps
         const userOps = [];
         const hopWalletsToRefund = [];
+        // ✅ 关键修复：从链上批量获取所有 hop 钱包的真实 nonce
+        const hopSenders = hopWallets.map(h => h.senderAddress);
+        const hopNonces = await this.aaManager.batchGetNonces(hopSenders);
         for (let i = 0; i < hopWallets.length; i++) {
             const hop = hopWallets[i];
             try {
@@ -346,13 +349,18 @@ export class HopWalletManager {
                 const refundAmount = balance - estimatedGas;
                 // 构建 UserOp
                 const hopWallet = new Wallet(hop.privateKey, this.provider);
+                // ✅ 使用从链上获取的真实 nonce
+                const realNonce = hopNonces[i] ?? 0n;
+                // ✅ 检查 hop 钱包是否已部署（根据 nonce 判断，nonce > 0 说明已用过，肯定已部署）
+                const isDeployed = realNonce > 0n || hop.deployed;
+                const initCode = isDeployed ? '0x' : hop.initCode;
                 const { userOp } = await this.aaManager.buildUserOpWithFixedGas({
                     ownerWallet: hopWallet,
                     sender: hop.senderAddress,
-                    nonce: 0n,
-                    initCode: hop.initCode,
+                    nonce: realNonce,
+                    initCode,
                     callData: this.encodeExecute(refundTo, refundAmount, '0x'),
-                    deployed: hop.deployed,
+                    deployed: isDeployed,
                 });
                 // 签名
                 const signedOp = await this.aaManager.signUserOp(userOp, hopWallet);

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

@@ -495,11 +495,14 @@ export class AAPortalSwapExecutor {
                     if (prefundedHopWallets.length < totalHopsNeeded) {
                         throw new Error(`预充值 hop 钱包数量不足: 需要 ${totalHopsNeeded} 个，实际 ${prefundedHopWallets.length} 个`);
                     }
+                    // ✅ 关键修复：从链上获取所有 hop 钱包的真实 nonce（用户可能重复使用同一批 hop 钱包）
+                    const hopSenders = prefundedHopWallets.slice(0, totalHopsNeeded).map(h => h.senderAddress);
+                    const hopNonces = await this.aaManager.batchGetNonces(hopSenders);
                     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 prefundedHop = prefundedHopWallets[hopIdx];
                             const wallet = new ethers.Wallet(prefundedHop.privateKey, provider);
                             chainHops.push({
                                 wallet,
@@ -507,7 +510,10 @@ export class AAPortalSwapExecutor {
                                 deployed: prefundedHop.deployed,
                                 initCode: prefundedHop.initCode,
                             });
-                            nonceMap.init(prefundedHop.senderAddress, 0n);
+                            // ✅ 使用从链上获取的真实 nonce（而非硬编码 0）
+                            const realNonce = hopNonces[hopIdx] ?? 0n;
+                            nonceMap.init(prefundedHop.senderAddress, realNonce);
+                            hopIdx++;
                         }
                         allGeneratedHopWallets.push(chainHops);
                     }

package/package.json

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