four-flap-meme-sdk 1.6.75 → 1.6.76

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

@@ -345,6 +345,9 @@ export class HopWalletManager {
             deployed: hopDeployedOnChain[i],
             balance: ethers.formatEther(hopBalances[i]),
         })));
+        // ✅ 记录 Payer nonce，避免冲突
+        let payerNonceCounter = await this.provider.getTransactionCount(payerWallet.address, 'pending');
+        const connectedPayer = payerWallet.connect(this.provider);
         for (let i = 0; i < hopWallets.length; i++) {
             const hop = hopWallets[i];
             try {
@@ -363,23 +366,24 @@ export class HopWalletManager {
                 // 增加 20% buffer 确保足够
                 const estimatedPrefund = (totalGasNeeded * gasPrice * 120n) / 100n;
                 console.log(`[HopWalletManager] Hop ${i} prefund 估算: callGas=${callGasLimit}, verifyGas=${verificationGasLimit}, preVerify=${preVerificationGas}, total=${totalGasNeeded}, prefund=${ethers.formatEther(estimatedPrefund)} OKB, balance=${ethers.formatEther(balance)} OKB, deployed=${isDeployed}`);
-                // ✅ 关键改进：如果余额不足 prefund，先让 Payer 给 Hop 充值差额
+                // ✅ 最小可退金额（至少要有这么多才值得退款）
+                const minRefundAmount = gasPrice * 50000n; // ~0.00005 OKB
+                // ✅ 关键改进：如果余额不足 prefund + minRefund，先让 Payer 给 Hop 充值差额
                 let effectiveBalance = balance;
-                if (balance <= estimatedPrefund) {
-                    // 计算需要充值的金额（差额 + 少量 buffer）
-                    const shortfall = estimatedPrefund - balance + (gasPrice * 10000n); // 多充一点
+                const minNeededForRefund = estimatedPrefund + minRefundAmount;
+                if (balance < minNeededForRefund) {
+                    // 计算需要充值的金额（差额 + 少量 buffer，确保能退回一些）
+                    const shortfall = minNeededForRefund - balance + (gasPrice * 20000n);
                     console.log(`[HopWalletManager] Hop ${i} 余额不足，需要补充: ${ethers.formatEther(shortfall)} OKB`);
                     try {
-                        // 使用 Payer 给 Hop 充值
-                        const connectedPayer = payerWallet.connect(this.provider);
-                        const payerNonce = await this.provider.getTransactionCount(payerWallet.address, 'pending');
                         const topUpTx = await connectedPayer.sendTransaction({
                             to: hop.senderAddress,
                             value: shortfall,
-                            nonce: payerNonce,
+                            nonce: payerNonceCounter,
                             gasPrice,
                             gasLimit: 21055n,
                         });
+                        payerNonceCounter++; // ✅ 递增 nonce
                         console.log(`[HopWalletManager] Hop ${i} 补充转账已发送: ${topUpTx.hash}`);
                         // 等待确认
                         const receipt = await topUpTx.wait();
@@ -401,6 +405,16 @@ export class HopWalletManager {
                     }
                 }
                 const refundAmount = effectiveBalance - estimatedPrefund;
+                // ✅ 安全检查：确保退款金额为正数
+                if (refundAmount <= 0n) {
+                    console.warn(`[HopWalletManager] Hop ${i} 退款金额为 ${refundAmount}，跳过`);
+                    hopRefunds.push({
+                        hopIndex: hop.index,
+                        refundWei: 0n,
+                        error: `退款金额不足: ${ethers.formatEther(refundAmount)} OKB`,
+                    });
+                    continue;
+                }
                 const initCode = isDeployed ? '0x' : hop.initCode;
                 // 构建 UserOp
                 const hopWallet = new Wallet(hop.privateKey, this.provider);
@@ -455,7 +469,6 @@ export class HopWalletManager {
         });
         // 发送 handleOps
         try {
-            const connectedPayer = payerWallet.connect(this.provider);
             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);

package/package.json

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