thirdweb 5.30.1-nightly-07ec4873202a863bb313cd2c708bf410d9d2e09e-20240628000329 → 5.31.0

package/src/wallets/wallet-connect/receiver/index.ts

@@ -158,10 +158,17 @@ export const DefaultWalletConnectRequestHandlers = {
 export async function createWalletConnectClient(
   options: CreateWalletConnectClientOptions,
 ): Promise<WalletConnectClient> {
-  const { wallet, requestHandlers, chains, onConnect, onDisconnect } = options;
+  const {
+    wallet,
+    requestHandlers,
+    chains,
+    onConnect,
+    onDisconnect,
+    client: thirdwebClient,
+  } = options;
 
-  if (walletConnectClientCache.has(options.client)) {
-    return walletConnectClientCache.get(options.client) as WalletConnectClient;
+  if (walletConnectClientCache.has(thirdwebClient)) {
+    return walletConnectClientCache.get(thirdwebClient) as WalletConnectClient;
   }
 
   initializeSessionStore({ clientId: options.client.clientId });
@@ -206,6 +213,7 @@ export async function createWalletConnectClient(
         walletConnectClient,
         event,
         handlers: requestHandlers,
+        thirdwebClient,
       }).catch((error) => {
         if (options.onError) {
           options.onError(error as Error);
@@ -249,7 +257,10 @@ export async function createWalletConnectClient(
   // Disconnects can come from the user or the connected app, so we inject the callback to ensure its always triggered
   const _disconnect = walletConnectClient.disconnect;
   walletConnectClient.disconnect = async (args) => {
-    const result = await _disconnect(args);
+    const result = await _disconnect(args).catch(() => {
+      // no-op if already disconnected
+    });
+
     if (onDisconnect) {
       disconnectHook({ topic: args.topic, onDisconnect });
     }
@@ -323,6 +334,8 @@ export async function disconnectWalletConnectSession(options: {
   session: WalletConnectSession;
   walletConnectClient: WalletConnectClient;
 }): Promise<void> {
+  removeSession(options.session);
+
   try {
     await options.walletConnectClient.disconnect({
       topic: options.session.topic,
@@ -331,10 +344,9 @@ export async function disconnectWalletConnectSession(options: {
         message: "Disconnected",
       },
     });
-  } catch {
+  } catch (error) {
     // ignore, the session doesn't exist already
   }
-  removeSession(options.session);
 }
 
 /**
@@ -346,6 +358,7 @@ async function disconnectHook(options: {
 }) {
   const { topic, onDisconnect } = options;
   const sessions = await getSessions();
+
   onDisconnect(
     sessions.find((s) => s.topic === topic) ?? {
       topic,

package/src/wallets/wallet-connect/receiver/receiver.test.ts

@@ -146,6 +146,7 @@ describe("createWalletConnectClient", () => {
     });
 
     await listeners.session_delete?.({ topic: "test" });
+    await new Promise((resolve) => setTimeout(resolve, 300));
     expect(onDisconnect).toHaveBeenCalledWith({ topic: "test" });
   });
 

package/src/wallets/wallet-connect/receiver/request-handlers/send-transaction.ts

@@ -1,8 +1,8 @@
-import {
-  type Hex,
-  hexToBigInt,
-  hexToNumber,
-} from "../../../../utils/encoding/hex.js";
+import { getCachedChain } from "../../../../chains/utils.js";
+import type { ThirdwebClient } from "../../../../client/client.js";
+import { sendTransaction } from "../../../../transaction/actions/send-transaction.js";
+import { prepareTransaction } from "../../../../transaction/prepare-transaction.js";
+import { type Hex, hexToBigInt } from "../../../../utils/encoding/hex.js";
 import type { Account } from "../../../interfaces/wallet.js";
 import type { WalletConnectTransactionRequestParams } from "../types.js";
 import { validateAccountAddress } from "../utils.js";
@@ -13,27 +13,36 @@ import { validateAccountAddress } from "../utils.js";
 export async function handleSendTransactionRequest(options: {
   account: Account;
   chainId: number;
+  thirdwebClient: ThirdwebClient;
   params: WalletConnectTransactionRequestParams;
 }): Promise<Hex> {
   const {
     account,
     chainId,
+    thirdwebClient,
     params: [transaction],
   } = options;
 
   if (transaction.from !== undefined) {
     validateAccountAddress(account, transaction.from);
   }
-  const txResult = await account.sendTransaction({
+
+  const preparedTransaction = prepareTransaction({
     gas: transaction.gas ? hexToBigInt(transaction.gas) : undefined,
     gasPrice: transaction.gasPrice
       ? hexToBigInt(transaction.gasPrice)
       : undefined,
     value: transaction.value ? hexToBigInt(transaction.value) : undefined,
-    nonce: transaction.nonce ? hexToNumber(transaction.nonce) : undefined,
     to: transaction.to,
     data: transaction.data,
-    chainId,
+    chain: getCachedChain(chainId),
+    client: thirdwebClient,
+  });
+
+  const txResult = await sendTransaction({
+    transaction: preparedTransaction,
+    account,
   });
+
   return txResult.transactionHash;
 }

package/src/wallets/wallet-connect/receiver/session-request.test.ts

@@ -1,4 +1,5 @@
 import { afterAll, beforeEach, describe, expect, it, vi } from "vitest";
+import { TEST_CLIENT } from "../../../../test/src/test-clients.js";
 import {
   TEST_ACCOUNT_A,
   TEST_ACCOUNT_B,
@@ -80,6 +81,7 @@ describe("session_request", () => {
       walletConnectClient: signClientMock,
       wallet: walletMock,
       event: REQUEST_EVENT_MOCK,
+      thirdwebClient: TEST_CLIENT,
     });
     await expect(promise).rejects.toThrow(
       "No account connected to provided wallet",
@@ -94,6 +96,7 @@ describe("session_request", () => {
       walletConnectClient: signClientMock,
       wallet: walletMock,
       event: unsupportedRequest,
+      thirdwebClient: TEST_CLIENT,
     });
 
     expect(signClientMock.respond).toHaveBeenCalledWith({
@@ -121,6 +124,7 @@ describe("session_request", () => {
       wallet: walletMock,
       event,
       handlers: customHandlers,
+      thirdwebClient: TEST_CLIENT,
     });
 
     await expect(promise).resolves.not.toThrow();
@@ -147,6 +151,7 @@ describe("session_request", () => {
         walletConnectClient: signClientMock,
         wallet: walletMock,
         event: personalSignRequest,
+        thirdwebClient: TEST_CLIENT,
       });
       expect(signClientMock.respond).toHaveBeenCalledWith({
         topic: REQUEST_EVENT_MOCK.topic,
@@ -166,6 +171,7 @@ describe("session_request", () => {
         walletConnectClient: signClientMock,
         wallet: walletMock,
         event: personalSignRequest,
+        thirdwebClient: TEST_CLIENT,
       });
 
       expect(signClientMock.respond).toHaveBeenCalledWith({
@@ -191,6 +197,7 @@ describe("session_request", () => {
         wallet: walletMock,
         event: personalSignRequest,
         handlers: customHandlers,
+        thirdwebClient: TEST_CLIENT,
       });
 
       expect(customHandlers.personal_sign).toHaveBeenCalledWith({
@@ -224,6 +231,7 @@ describe("session_request", () => {
         walletConnectClient: signClientMock,
         wallet: walletMock,
         event: ethSignRequest,
+        thirdwebClient: TEST_CLIENT,
       });
       expect(signClientMock.respond).toHaveBeenCalledWith({
         topic: REQUEST_EVENT_MOCK.topic,
@@ -246,6 +254,7 @@ describe("session_request", () => {
         walletConnectClient: signClientMock,
         wallet: walletMock,
         event: ethSignRequest,
+        thirdwebClient: TEST_CLIENT,
       });
 
       expect(signClientMock.respond).toHaveBeenCalledWith({
@@ -271,6 +280,7 @@ describe("session_request", () => {
         wallet: walletMock,
         event: ethSignRequest,
         handlers: customHandlers,
+        thirdwebClient: TEST_CLIENT,
       });
 
       expect(customHandlers.eth_sign).toHaveBeenCalledWith({
@@ -304,6 +314,7 @@ describe("session_request", () => {
         walletConnectClient: signClientMock,
         wallet: walletMock,
         event: ethSignTypedDataRequest,
+        thirdwebClient: TEST_CLIENT,
       });
 
       expect(signClientMock.respond).toHaveBeenCalledWith({
@@ -327,6 +338,7 @@ describe("session_request", () => {
         walletConnectClient: signClientMock,
         wallet: walletMock,
         event: ethSignTypedDataRequest,
+        thirdwebClient: TEST_CLIENT,
       });
 
       expect(signClientMock.respond).toHaveBeenCalledWith({
@@ -357,6 +369,7 @@ describe("session_request", () => {
         walletConnectClient: signClientMock,
         wallet: walletMock,
         event: ethSignTypedDataRequest,
+        thirdwebClient: TEST_CLIENT,
       });
 
       expect(signClientMock.respond).toHaveBeenCalledWith({
@@ -380,6 +393,7 @@ describe("session_request", () => {
         walletConnectClient: signClientMock,
         wallet: walletMock,
         event: ethSignTypedDataRequest,
+        thirdwebClient: TEST_CLIENT,
       });
 
       expect(signClientMock.respond).toHaveBeenCalledWith({
@@ -403,6 +417,7 @@ describe("session_request", () => {
         walletConnectClient: signClientMock,
         wallet: walletMock,
         event: ethSignTypedDataRequest,
+        thirdwebClient: TEST_CLIENT,
       });
 
       expect(signClientMock.respond).toHaveBeenCalledWith({
@@ -428,6 +443,7 @@ describe("session_request", () => {
         wallet: walletMock,
         event: ethSignTypedDataRequest,
         handlers: customHandlers,
+        thirdwebClient: TEST_CLIENT,
       });
 
       expect(customHandlers.eth_signTypedData_v4).toHaveBeenCalledWith({
@@ -460,6 +476,7 @@ describe("session_request", () => {
         walletConnectClient: signClientMock,
         wallet: walletMock,
         event: signTransactionRequest,
+        thirdwebClient: TEST_CLIENT,
       });
 
       expect(signClientMock.respond).toHaveBeenCalledWith({
@@ -483,6 +500,7 @@ describe("session_request", () => {
         walletConnectClient: signClientMock,
         wallet: walletMock,
         event: signTransactionRequest,
+        thirdwebClient: TEST_CLIENT,
       });
 
       expect(signClientMock.respond).toHaveBeenCalledWith({
@@ -512,6 +530,7 @@ describe("session_request", () => {
         walletConnectClient: signClientMock,
         wallet: walletMock,
         event: signTransactionRequest,
+        thirdwebClient: TEST_CLIENT,
       });
 
       expect(signClientMock.respond).toHaveBeenCalledWith({
@@ -537,6 +556,7 @@ describe("session_request", () => {
         wallet: walletMock,
         event: signTransactionRequest,
         handlers: customHandlers,
+        thirdwebClient: TEST_CLIENT,
       });
 
       expect(customHandlers.eth_signTransaction).toHaveBeenCalledWith({
@@ -572,6 +592,7 @@ describe("session_request", () => {
         walletConnectClient: signClientMock,
         wallet: walletMock,
         event: sendTransactionRequest,
+        thirdwebClient: TEST_CLIENT,
       });
 
       expect(signClientMock.respond).toHaveBeenCalledWith({
@@ -591,6 +612,7 @@ describe("session_request", () => {
         walletConnectClient: signClientMock,
         wallet: walletMock,
         event: sendTransactionRequest,
+        thirdwebClient: TEST_CLIENT,
       });
 
       expect(signClientMock.respond).toHaveBeenCalledWith({
@@ -621,6 +643,7 @@ describe("session_request", () => {
         walletConnectClient: signClientMock,
         wallet: walletMock,
         event: sendTransactionRequest,
+        thirdwebClient: TEST_CLIENT,
       });
 
       expect(signClientMock.respond).toHaveBeenCalledWith({
@@ -646,6 +669,7 @@ describe("session_request", () => {
         wallet: walletMock,
         event: sendTransactionRequest,
         handlers: customHandlers,
+        thirdwebClient: TEST_CLIENT,
       });
 
       expect(customHandlers.eth_sendTransaction).toHaveBeenCalledWith({
@@ -683,6 +707,7 @@ describe("session_request", () => {
         walletConnectClient: signClientMock,
         wallet: walletMock,
         event: sendRawTransactionRequest,
+        thirdwebClient: TEST_CLIENT,
       });
 
       expect(signClientMock.respond).toHaveBeenCalledWith({
@@ -702,6 +727,7 @@ describe("session_request", () => {
         walletConnectClient: signClientMock,
         wallet: walletMock,
         event: sendRawTransactionRequest,
+        thirdwebClient: TEST_CLIENT,
       });
 
       expect(signClientMock.respond).toHaveBeenCalledWith({
@@ -725,6 +751,7 @@ describe("session_request", () => {
         walletConnectClient: signClientMock,
         wallet: walletMock,
         event: sendRawTransactionRequest,
+        thirdwebClient: TEST_CLIENT,
       });
 
       expect(signClientMock.respond).toHaveBeenCalledWith({
@@ -751,6 +778,7 @@ describe("session_request", () => {
         wallet: walletMock,
         event: sendRawTransactionRequest,
         handlers: customHandlers,
+        thirdwebClient: TEST_CLIENT,
       });
 
       expect(customHandlers.eth_sendRawTransaction).toHaveBeenCalledWith({
@@ -794,6 +822,7 @@ describe("session_request", () => {
         walletConnectClient: signClientMock,
         wallet: walletMock,
         event: addEthereumChainRequest,
+        thirdwebClient: TEST_CLIENT,
       });
 
       expect(signClientMock.respond).toHaveBeenCalledWith({
@@ -828,6 +857,7 @@ describe("session_request", () => {
         walletConnectClient: signClientMock,
         wallet: walletMock,
         event: switchEthereumChainRequest,
+        thirdwebClient: TEST_CLIENT,
       });
 
       expect(walletMock.switchChain).toHaveBeenCalledWith(
@@ -843,6 +873,7 @@ describe("session_request", () => {
         walletConnectClient: signClientMock,
         wallet: walletMock,
         event: switchEthereumChainRequest,
+        thirdwebClient: TEST_CLIENT,
       });
 
       expect(walletMock.switchChain).not.toHaveBeenCalled();

package/src/wallets/wallet-connect/receiver/session-request.ts

@@ -1,3 +1,4 @@
+import type { ThirdwebClient } from "../../../client/client.js";
 import type { Hex } from "../../../utils/encoding/hex.js";
 import type { Wallet } from "../../interfaces/wallet.js";
 import type {
@@ -23,11 +24,13 @@ export async function fulfillRequest(options: {
   wallet: Wallet;
   walletConnectClient: WalletConnectClient;
   event: WalletConnectSessionRequestEvent;
+  thirdwebClient: ThirdwebClient;
   handlers?: WalletConnectRequestHandlers;
 }) {
   const {
     wallet,
     walletConnectClient,
+    thirdwebClient,
     event: {
       topic,
       id,
@@ -145,6 +148,7 @@ export async function fulfillRequest(options: {
           result = await handleSendTransactionRequest({
             account,
             chainId,
+            thirdwebClient,
             params: request.params as WalletConnectTransactionRequestParams,
           });
         }