@silentswap/react 0.1.2 → 0.1.3

package/dist/hooks/silent/useOrderSigning.js

@@ -35,9 +35,11 @@ export function useOrderSigning(walletClient, connector, client, setCurrentStep,
         if (!connector) {
             throw new Error('Connector required for chain switching');
         }
-        if (isDepositingDirectly) {
-            await ensureChain(NI_CHAIN_ID_AVALANCHE, walletClient, connector);
-        }
+        // ensureChain returns a fresh walletClient bound to the target chain —
+        // critical for WalletConnect where the old client's chain scope gets silently dropped.
+        const signingClient = isDepositingDirectly
+            ? await ensureChain(NI_CHAIN_ID_AVALANCHE, walletClient, connector, { required: false })
+            : walletClient;
         return Promise.all(authorizations.map(async (auth) => ({
             ...auth,
             signature: await (async () => {
@@ -45,7 +47,7 @@ export function useOrderSigning(walletClient, connector, client, setCurrentStep,
                 if (auth.type === 'eip3009_deposit') {
                     if (isDepositingDirectly) {
                         // Sign EIP-712 typed data for direct deposit
-                        return await walletClient.signTypedData(auth.eip712);
+                        return await signingClient.signTypedData(auth.eip712);
                     }
                     else {
                         // Will be deposited through proxy, no signature needed
@@ -83,18 +85,20 @@ export function useOrderSigning(walletClient, connector, client, setCurrentStep,
             throw new Error('Facilitator group required for order creation');
         }
         // Switch to Ethereum for order signing (orders are signed on Ethereum mainnet)
+        // ensureChain returns a fresh walletClient bound to the target chain —
+        // critical for WalletConnect where the old client's chain scope gets silently dropped.
         setCurrentStep('Preparing order signature');
         onStatus?.('Preparing order signature');
-        await ensureChain(1, walletClient, connector); // Ethereum mainnet
+        const signingClient = await ensureChain(1, walletClient, connector, { required: false });
         // Create EIP-712 document for order
         const orderDoc = quoteResponseToEip712Document(quoteResponse);
         // Sign the order's EIP-712 document
         // Note: viem's signTypedData may normalize the domain.chainId to match the wallet client's
         // chain configuration, which can result in chainId being a BigInt instead of a number.
         // This happens because viem uses the wallet's chain configuration internally.
-        const orderSignature = await walletClient.signTypedData({
+        const orderSignature = await signingClient.signTypedData({
             ...orderDoc,
-            account: walletClient.account,
+            account: signingClient.account,
         });
         // Approve proxy authorizations from facilitators
         const facilitatorReplies = await effectiveGroup.approveProxyAuthorizations(quoteResponse.facilitators, {

package/dist/hooks/silent/useWallet.js

@@ -94,7 +94,10 @@ export function useWallet({ client, address, auth, walletClient, connector, allD
             throw new Error('Connector required for chain switching');
         }
         // Ensure we're on Ethereum mainnet for entropy generation (asked core devs about this in tg)
-        await ensureChain(1, walletClient, connector);
+        // ensureChain returns a fresh walletClient bound to the target chain after switching.
+        // Critical for WalletConnect: the old walletClient's chain scope doesn't match after
+        // a switch, so signing requests get silently dropped by the mobile wallet.
+        const signingClient = await ensureChain(1, walletClient, connector, { required: false });
         // Create EIP-712 document for wallet generation
         const eip712Doc = createEip712DocForWalletGeneration(`eip155:43114:${address}`, // Gateway contract scope (Avalanche)
         auth.secretToken);
@@ -102,10 +105,11 @@ export function useWallet({ client, address, auth, walletClient, connector, allD
         if (eip712Doc.domain && typeof eip712Doc.domain.chainId === 'number') {
             eip712Doc.domain.chainId = BigInt(eip712Doc.domain.chainId);
         }
-        // Sign the document to generate entropy
-        const signature = await walletClient.signTypedData({
+        // Sign the document to generate entropy — use the fresh signingClient, not
+        // the closure's walletClient which may be scoped to the pre-switch chain.
+        const signature = await signingClient.signTypedData({
             ...eip712Doc,
-            account: walletClient.account,
+            account: signingClient.account,
         });
         return hexToBytes(signature);
     }, [auth, walletClient, connector, address]);
@@ -176,7 +180,7 @@ export function useWallet({ client, address, auth, walletClient, connector, allD
             isGeneratingRef.current = false;
             setIsLoading(false);
         }
-    }, [normalizedAddress, getCachedWallet, queryDepositCount, generateEntropy, allDeposits, connector, client.s0xGatewayAddress]);
+    }, [normalizedAddress, getCachedWallet, generateEntropy, allDeposits, client.s0xGatewayAddress]);
     /**
      * Clear cached wallet
      */
@@ -194,6 +198,13 @@ export function useWallet({ client, address, auth, walletClient, connector, allD
         isGeneratingRef.current = false;
         await generateWallet();
     }, [clearWallet, generateWallet]);
+    // When walletClient or connector changes (e.g. WalletConnect chain switch causes
+    // wagmi to recreate the walletClient), reset the generation guard. Any in-flight
+    // generation using stale WalletConnect references will hang on signTypedData,
+    // permanently blocking future calls.
+    useEffect(() => {
+        isGeneratingRef.current = false;
+    }, [walletClient, connector]);
     // Clear wallet when address changes (e.g. user switched from MetaMask to Phantom)
     const prevAddressRef = useRef(normalizedAddress);
     useEffect(() => {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@silentswap/react",
   "type": "module",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -24,8 +24,8 @@
   "dependencies": {
     "@bigmi/core": "^0.6.5",
     "@ensdomains/ensjs": "^4.2.0",
-    "@silentswap/sdk": "0.1.2",
-    "@silentswap/ui-kit": "0.1.2",
+    "@silentswap/sdk": "0.1.3",
+    "@silentswap/ui-kit": "0.1.3",
     "@solana/codecs-strings": "^5.1.0",
     "@solana/kit": "^5.1.0",
     "@solana/rpc": "^5.1.0",