four-flap-meme-sdk 1.6.37 → 1.6.39

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

@@ -697,14 +697,17 @@ export class AADexSwapExecutor {
                         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/hop-wallet-manager.js

@@ -405,8 +405,9 @@ export class HopWalletManager {
         // 发送 handleOps
         try {
             const connectedPayer = payerWallet.connect(this.provider);
-            const entryPoint = this.aaManager.getEntryPoint();
-            const entryPointWithSigner = entryPoint.connect(connectedPayer);
+            const entryPointAddress = this.aaManager.getEntryPointAddress();
+            // ✅ 直接创建新 Contract 实例（跟其他地方一样）
+            const entryPointWithSigner = new ethers.Contract(entryPointAddress, ['function handleOps((address sender,uint256 nonce,bytes initCode,bytes callData,uint256 callGasLimit,uint256 verificationGasLimit,uint256 preVerificationGas,uint256 maxFeePerGas,uint256 maxPriorityFeePerGas,bytes paymasterAndData,bytes signature)[] ops, address payable beneficiary) external'], connectedPayer);
             const tx = await entryPointWithSigner.handleOps(userOps, payerWallet.address, {
                 gasPrice,
                 gasLimit: 500000n * BigInt(userOps.length),

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

@@ -504,14 +504,17 @@ export class AAPortalSwapExecutor {
                         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.37",
+  "version": "1.6.39",
   "description": "SDK for Flap bonding curve and four.meme TokenManager",
   "type": "module",
   "main": "dist/index.js",