@rash2x/bridge-widget 0.8.9 → 0.8.10

package/dist/{index-IZ7t2PGj.js → index-DLlaTmxx.js}

@@ -5962,6 +5962,39 @@ class EvmChainStrategy {
       ...rpcError
     });
   }
+  isNonceResubmissionError(error) {
+    const rpcError = this.getRpcErrorDetails(error);
+    const combined = [rpcError.message, rpcError.shortMessage, rpcError.details].filter(Boolean).join(" ").toLowerCase();
+    return combined.includes("nonce too low") || combined.includes("replacement transaction underpriced");
+  }
+  async sendTransactionWithNonceRetry(walletClient, params) {
+    try {
+      return await walletClient.sendTransaction(params);
+    } catch (error) {
+      if (!this.isNonceResubmissionError(error)) {
+        throw error;
+      }
+      this.logRpcWarning(
+        "Retrying transaction after nonce-related error",
+        error
+      );
+      return await walletClient.sendTransaction(params);
+    }
+  }
+  async writeContractWithNonceRetry(walletClient, params) {
+    try {
+      return await walletClient.writeContract(params);
+    } catch (error) {
+      if (!this.isNonceResubmissionError(error)) {
+        throw error;
+      }
+      this.logRpcWarning(
+        "Retrying contract write after nonce-related error",
+        error
+      );
+      return await walletClient.writeContract(params);
+    }
+  }
   async getBalances(address, tokens) {
     const chainKey = tokens[0]?.chainKey;
     const client = this.resolvePublicClientForChain(chainKey);
@@ -6026,12 +6059,16 @@ class EvmChainStrategy {
       if (!tx?.to) continue;
       const client = this.resolvePublicClientForChain(step.chainKey);
       if (!client) {
-        this.logRpcWarning("Skipped network fee estimation: no public client", "no-client", {
-          chainKey: step.chainKey,
-          stepType: step.type,
-          stepIndex: i3 + 1,
-          totalSteps: txSteps.length
-        });
+        this.logRpcWarning(
+          "Skipped network fee estimation: no public client",
+          "no-client",
+          {
+            chainKey: step.chainKey,
+            stepType: step.type,
+            stepIndex: i3 + 1,
+            totalSteps: txSteps.length
+          }
+        );
         continue;
       }
       try {
@@ -6059,12 +6096,16 @@ class EvmChainStrategy {
           try {
             feePerGas = await client.getGasPrice();
           } catch (gasPriceError) {
-            this.logRpcWarning("Failed to get gas price for network fee estimation", gasPriceError, {
-              chainKey: step.chainKey,
-              stepType: step.type,
-              stepIndex: i3 + 1,
-              totalSteps: txSteps.length
-            });
+            this.logRpcWarning(
+              "Failed to get gas price for network fee estimation",
+              gasPriceError,
+              {
+                chainKey: step.chainKey,
+                stepType: step.type,
+                stepIndex: i3 + 1,
+                totalSteps: txSteps.length
+              }
+            );
           }
         }
         if (gas && feePerGas) {
@@ -6143,7 +6184,9 @@ class EvmChainStrategy {
         const requiredChainId = this.config.chainKeyToId[firstChainKey.toLowerCase()];
         const currentChainId = this.walletClient.chain?.id;
         if (requiredChainId && currentChainId !== requiredChainId) {
-          console.log(`Switching from chain ${currentChainId} to ${requiredChainId}`);
+          console.log(
+            `Switching from chain ${currentChainId} to ${requiredChainId}`
+          );
           await this.switchToChain(requiredChainId);
         } else {
           console.log(`Already on correct chain ${currentChainId}`);
@@ -6172,6 +6215,16 @@ class EvmChainStrategy {
           bridgeTxHash = hash;
         }
         lastTxHash = hash;
+        if (step.type === "approve") {
+          const receiptClient = this.resolvePublicClientForChain(step.chainKey);
+          if (!receiptClient) {
+            throw new WalletNotConnectedError("evm");
+          }
+          await receiptClient.waitForTransactionReceipt({
+            hash,
+            confirmations: 1
+          });
+        }
         onStepComplete?.(hash, step.type, i3, totalSteps);
       }
       const hashForTracking = bridgeTxHash ?? lastTxHash;
@@ -6189,15 +6242,6 @@ class EvmChainStrategy {
       throw toChainStrategyError(error, "evm", "transaction");
     }
   }
-  async getNextNonce() {
-    if (!this.publicClient || !this.config.evmAddress) {
-      throw new WalletNotConnectedError("evm");
-    }
-    return await this.publicClient.getTransactionCount({
-      address: this.config.evmAddress,
-      blockTag: "pending"
-    });
-  }
   async executeTransaction(step) {
     const walletClient = this.walletClient;
     if (!walletClient) {
@@ -6210,14 +6254,12 @@ class EvmChainStrategy {
       );
     }
     const tx = step.transaction;
-    const nonce = await this.getNextNonce();
-    const hash = await walletClient.sendTransaction({
+    const hash = await this.sendTransactionWithNonceRetry(walletClient, {
       to: tx.to,
       data: tx.data,
       account: tx.from || this.config.evmAddress,
       value: tx.value ? BigInt(tx.value) : void 0,
-      chain: walletClient.chain,
-      nonce
+      chain: walletClient.chain
     });
     return hash;
   }
@@ -6259,16 +6301,17 @@ class EvmChainStrategy {
       });
       if (currentAllowance > 0n) {
         try {
-          const resetNonce = await this.getNextNonce();
-          const resetHash = await walletClient.writeContract({
-            address: tokenAddress,
-            abi: ERC20_ABI,
-            functionName: "approve",
-            args: [spenderAddress, 0n],
-            account: this.config.evmAddress,
-            chain: walletClient.chain,
-            nonce: resetNonce
-          });
+          const resetHash = await this.writeContractWithNonceRetry(
+            walletClient,
+            {
+              address: tokenAddress,
+              abi: ERC20_ABI,
+              functionName: "approve",
+              args: [spenderAddress, 0n],
+              account: this.config.evmAddress,
+              chain: walletClient.chain
+            }
+          );
           await publicClient.waitForTransactionReceipt({
             hash: resetHash
           });
@@ -6284,16 +6327,17 @@ class EvmChainStrategy {
         console.log("USDT allowance is 0, no reset needed");
       }
       try {
-        const approveNonce = await this.getNextNonce();
-        const approveHash = await walletClient.writeContract({
-          address: tokenAddress,
-          abi: ERC20_ABI,
-          functionName: "approve",
-          args: [spenderAddress, amount],
-          account: this.config.evmAddress,
-          chain: walletClient.chain,
-          nonce: approveNonce
-        });
+        const approveHash = await this.writeContractWithNonceRetry(
+          walletClient,
+          {
+            address: tokenAddress,
+            abi: ERC20_ABI,
+            functionName: "approve",
+            args: [spenderAddress, amount],
+            account: this.config.evmAddress,
+            chain: walletClient.chain
+          }
+        );
         return approveHash;
       } catch (approveError) {
         throw new TransactionFailedError(
@@ -26748,7 +26792,7 @@ class WalletConnectModal {
   }
   async initUi() {
     if (typeof window !== "undefined") {
-      await import("./index-Bl4_W_Mc.js");
+      await import("./index-CPSV-tFm.js");
       const modal = document.createElement("wcm-modal");
       document.body.insertAdjacentElement("beforeend", modal);
       OptionsCtrl.setIsUiLoaded(true);
@@ -27672,4 +27716,4 @@ export {
   calculateMinReceived as y,
   getQuoteDetails as z
 };
-//# sourceMappingURL=index-IZ7t2PGj.js.map
+//# sourceMappingURL=index-DLlaTmxx.js.map