@swype-org/react-sdk 0.2.220 → 0.2.221

package/dist/index.js

@@ -962,7 +962,8 @@ function sanitizeAdvertisedWallets(value) {
 }
 var STATIC_BRIDGE_DEDUPE_RDNS = /* @__PURE__ */ new Set([
   "com.coinbase.wallet",
-  "io.metamask"
+  "io.metamask",
+  "app.phantom"
 ]);
 function buildBridgedConnector(wallet) {
   return injected({
@@ -3472,8 +3473,54 @@ function isUserRejection(msg) {
   const lower = msg.toLowerCase();
   return lower.includes("rejected") || lower.includes("denied");
 }
-function isTrustWalletAccount(account) {
-  return connectorMatchesWallet(account?.connector, { providerName: "trust" });
+function requiresExplicitEvmNonce(account) {
+  return connectorMatchesWallet(account?.connector, { providerName: "trust" }) || connectorMatchesWallet(account?.connector, { providerName: "phantom" });
+}
+function getEvmNonceTrackerKey(sender, chainId) {
+  return `${chainId ?? "unknown"}:${sender.toLowerCase()}`;
+}
+async function snapshotExplicitEvmNonce(params) {
+  const {
+    walletClient,
+    sender,
+    chainId,
+    nonceTracker,
+    logContext,
+    actionId,
+    extraDebug
+  } = params;
+  const trackerKey = getEvmNonceTrackerKey(sender, chainId);
+  const trackedNonce = nonceTracker?.get(trackerKey) ?? null;
+  try {
+    const providerPendingNonce = await fetchLatestNonce(walletClient, sender, "pending");
+    const nonce = trackedNonce == null ? providerPendingNonce : Math.max(providerPendingNonce, trackedNonce);
+    appendDebug("info", `${logContext}: explicit nonce snapshot`, {
+      actionId,
+      sender,
+      chainId: chainId ?? null,
+      providerPendingNonce,
+      trackedNonce,
+      selectedNonce: nonce,
+      ...extraDebug ?? {}
+    });
+    return { nonce, trackerKey };
+  } catch (err) {
+    appendDebug(trackedNonce == null ? "warn" : "info", `${logContext}: pre-send nonce snapshot failed`, {
+      actionId,
+      sender,
+      chainId: chainId ?? null,
+      trackedNonce,
+      selectedNonce: trackedNonce,
+      error: err instanceof Error ? err.message : String(err),
+      ...extraDebug ?? {}
+    });
+    return { nonce: trackedNonce, trackerKey: trackedNonce == null ? null : trackerKey };
+  }
+}
+function advanceTrackedEvmNonce(nonceTracker, trackerKey, nextNonce) {
+  if (!nonceTracker || !trackerKey) return;
+  const current = nonceTracker.get(trackerKey);
+  nonceTracker.set(trackerKey, current == null ? nextNonce : Math.max(current, nextNonce));
 }
 async function waitForWalletClient(wagmiConfig, params = {}) {
   for (let i = 0; i < WALLET_CLIENT_MAX_ATTEMPTS; i++) {
@@ -4225,10 +4272,11 @@ function failBothActions(approveAction, bridgeAction, message) {
     ]
   };
 }
-async function executeApprovePermit2(action, wagmiConfig) {
+async function executeApprovePermit2(action, wagmiConfig, options = {}) {
   let walletClient = null;
   let sender = null;
   let preSendNonce = null;
+  let nonceTrackerKey = null;
   try {
     walletClient = await waitForWalletClient(wagmiConfig);
     const account = getAccount(wagmiConfig);
@@ -4252,19 +4300,20 @@ async function executeApprovePermit2(action, wagmiConfig) {
         "APPROVE_PERMIT2 metadata is missing transaction parameters (to, data)."
       );
     }
-    const shouldSnapshotPreSendNonce = isTrustWalletAccount(account);
-    if (shouldSnapshotPreSendNonce) {
-      try {
-        preSendNonce = await fetchLatestNonce(walletClient, sender, "pending");
-      } catch (err) {
-        appendDebug("warn", "APPROVE_PERMIT2: pre-send nonce snapshot failed", {
-          actionId: action.id,
-          sender,
-          error: err instanceof Error ? err.message : String(err)
-        });
-      }
+    const shouldUseExplicitNonce = requiresExplicitEvmNonce(account);
+    if (shouldUseExplicitNonce) {
+      const snapshot = await snapshotExplicitEvmNonce({
+        walletClient,
+        sender,
+        chainId: account.chainId,
+        nonceTracker: options.nonceTracker,
+        logContext: "APPROVE_PERMIT2",
+        actionId: action.id
+      });
+      preSendNonce = snapshot.nonce;
+      nonceTrackerKey = snapshot.trackerKey;
     }
-    const useExplicitNonce = shouldSnapshotPreSendNonce && preSendNonce != null;
+    const useExplicitNonce = shouldUseExplicitNonce && preSendNonce != null;
     const txParams = {
       from: sender,
       to,
@@ -4294,6 +4343,9 @@ async function executeApprovePermit2(action, wagmiConfig) {
       ),
       approveLabel
     );
+    if (preSendNonce != null) {
+      advanceTrackedEvmNonce(options.nonceTracker, nonceTrackerKey, preSendNonce + 1);
+    }
     appendDebug("info", "APPROVE_PERMIT2: tx sent, awaiting settlement", {
       actionId: action.id,
       txHash,
@@ -4384,6 +4436,7 @@ async function executeApprovePermit2(action, wagmiConfig) {
         actionId: action.id
       });
       if (recovery) {
+        advanceTrackedEvmNonce(options.nonceTracker, nonceTrackerKey, recovery.latestNonce);
         return actionRecovery(
           action,
           "Approval transaction was submitted but the wallet did not return a confirmation. Verifying on-chain\u2026",
@@ -4570,10 +4623,11 @@ async function executeSignPermit2(action, wagmiConfig, apiBaseUrl, sessionId) {
     );
   }
 }
-async function executeExecuteBridge(action, wagmiConfig) {
+async function executeExecuteBridge(action, wagmiConfig, options = {}) {
   let walletClient = null;
   let sender = null;
   let lastPreSendNonce = null;
+  let lastNonceTrackerKey = null;
   try {
     walletClient = await waitForWalletClient(wagmiConfig);
     const account = getAccount(wagmiConfig);
@@ -4594,22 +4648,25 @@ async function executeExecuteBridge(action, wagmiConfig) {
     for (let i = 0; i < calls.length; i++) {
       const call = calls[i];
       const isIntermediateCall = i < calls.length - 1;
-      const shouldSnapshotPreSendNonce = isTrustWalletAccount(account);
+      const shouldUseExplicitNonce = requiresExplicitEvmNonce(account);
       let preSendNonce = null;
-      if (shouldSnapshotPreSendNonce) {
-        try {
-          preSendNonce = await fetchLatestNonce(walletClient, sender, "pending");
-          lastPreSendNonce = preSendNonce;
-        } catch (err) {
-          appendDebug("warn", "EXECUTE_BRIDGE: pre-send nonce snapshot failed", {
-            actionId: action.id,
-            callIndex: i,
-            sender,
-            error: err instanceof Error ? err.message : String(err)
-          });
-        }
+      let nonceTrackerKey = null;
+      if (shouldUseExplicitNonce) {
+        const snapshot = await snapshotExplicitEvmNonce({
+          walletClient,
+          sender,
+          chainId: account.chainId,
+          nonceTracker: options.nonceTracker,
+          logContext: "EXECUTE_BRIDGE",
+          actionId: action.id,
+          extraDebug: { callIndex: i }
+        });
+        preSendNonce = snapshot.nonce;
+        nonceTrackerKey = snapshot.trackerKey;
+        lastPreSendNonce = preSendNonce;
+        lastNonceTrackerKey = nonceTrackerKey;
       }
-      const useExplicitNonce = shouldSnapshotPreSendNonce && preSendNonce != null;
+      const useExplicitNonce = shouldUseExplicitNonce && preSendNonce != null;
       const txParams = {
         from: sender,
         to: call.to,
@@ -4638,6 +4695,9 @@ async function executeExecuteBridge(action, wagmiConfig) {
         ),
         watchdogLabel
       );
+      if (preSendNonce != null) {
+        advanceTrackedEvmNonce(options.nonceTracker, nonceTrackerKey, preSendNonce + 1);
+      }
       appendDebug("info", "EXECUTE_BRIDGE: tx sent", {
         actionId: action.id,
         callIndex: i,
@@ -4723,6 +4783,7 @@ async function executeExecuteBridge(action, wagmiConfig) {
         actionId: action.id
       });
       if (recovery) {
+        advanceTrackedEvmNonce(options.nonceTracker, lastNonceTrackerKey, recovery.latestNonce);
         return actionRecovery(
           action,
           "Bridge transaction was submitted but the wallet did not return a confirmation. Verifying on-chain\u2026",
@@ -5267,6 +5328,7 @@ function useAuthorizationExecutor(options) {
   const walletConnectRuntimeRef = useRef(/* @__PURE__ */ new Map());
   const activeWalletConnectRuntimeKeyRef = useRef(void 0);
   const activeEvmTransportRef = useRef("wagmi");
+  const evmNonceTrackerRef = useRef(/* @__PURE__ */ new Map());
   const [batchTxHash, setBatchTxHash] = useState(null);
   const externalAuthorizationAvailableRef = useRef(false);
   const setExternalAuthorizationAvailable = useCallback((available) => {
@@ -5322,6 +5384,7 @@ function useAuthorizationExecutor(options) {
     setApproveSplConfirming(null);
     activeEvmTransportRef.current = "wagmi";
     activeWalletConnectRuntimeKeyRef.current = void 0;
+    evmNonceTrackerRef.current.clear();
     setExecuting(false);
     executingRef.current = false;
   }, []);
@@ -5347,6 +5410,7 @@ function useAuthorizationExecutor(options) {
             if (result2.status === "success" && result2.data?.transport === "wagmi") {
               activeEvmTransportRef.current = "wagmi";
               activeWalletConnectRuntimeKeyRef.current = void 0;
+              evmNonceTrackerRef.current.clear();
               if (action.metadata?.chainFamily !== "svm") {
                 walletCapabilitiesRef.current = await refreshWalletCapabilities(
                   wagmiConfig,
@@ -5359,6 +5423,7 @@ function useAuthorizationExecutor(options) {
               walletCapabilitiesRef.current = {};
               walletCapabilitiesRefreshedRef.current = true;
               batchCapabilityDecisionRef.current = null;
+              evmNonceTrackerRef.current.clear();
             }
             return result2;
           }
@@ -5368,6 +5433,7 @@ function useAuthorizationExecutor(options) {
             externalAuthorizationAvailable: externalAuthorizationAvailableRef.current
           });
           if (result.status === "success" && action.metadata?.chainFamily !== "svm") {
+            evmNonceTrackerRef.current.clear();
             walletCapabilitiesRef.current = await refreshWalletCapabilities(
               wagmiConfig,
               "open-provider"
@@ -5391,11 +5457,13 @@ function useAuthorizationExecutor(options) {
               walletCapabilitiesRef.current = {};
               walletCapabilitiesRefreshedRef.current = true;
               batchCapabilityDecisionRef.current = null;
+              evmNonceTrackerRef.current.clear();
             }
             return result2;
           }
           const result = await executeSwitchChain(action, wagmiConfig, switchChainAsync);
           if (result.status === "success" && action.metadata?.chainFamily !== "svm") {
+            evmNonceTrackerRef.current.clear();
             walletCapabilitiesRef.current = await refreshWalletCapabilities(
               wagmiConfig,
               "switch-chain"
@@ -5413,7 +5481,9 @@ function useAuthorizationExecutor(options) {
               dispatchOptions?.onWalletConnectDisplayUri
             );
           }
-          return executeApprovePermit2(action, wagmiConfig);
+          return executeApprovePermit2(action, wagmiConfig, {
+            nonceTracker: evmNonceTrackerRef.current
+          });
         case "DEPLOY_SMART_ACCOUNT":
           return actionSuccess(action, "Smart account deployment acknowledged.");
         case "SIGN_PERMIT2": {
@@ -5472,7 +5542,9 @@ function useAuthorizationExecutor(options) {
               dispatchOptions?.onWalletConnectDisplayUri
             );
           }
-          return executeExecuteBridge(action, wagmiConfig);
+          return executeExecuteBridge(action, wagmiConfig, {
+            nonceTracker: evmNonceTrackerRef.current
+          });
         default:
           return actionError(action, `Unsupported action type: ${action.type}`);
       }
@@ -5625,6 +5697,7 @@ function useAuthorizationExecutor(options) {
     setError(null);
     setBatchTxHash(null);
     setApproveSplConfirming(null);
+    evmNonceTrackerRef.current.clear();
     return true;
   }, []);
   const endExecution = useCallback(() => {
@@ -5633,6 +5706,7 @@ function useAuthorizationExecutor(options) {
     setApproveSplConfirming(null);
     activeEvmTransportRef.current = "wagmi";
     activeWalletConnectRuntimeKeyRef.current = void 0;
+    evmNonceTrackerRef.current.clear();
     setExecuting(false);
     executingRef.current = false;
   }, []);