update sdk, undo rpc client caching

Author: arcoraven

package.json

@@ -71,7 +71,7 @@
     "pino-pretty": "^10.0.0",
     "prisma": "5.14.0-dev.61",
     "superjson": "^2.2.1",
-    "thirdweb": "^5.35.0",
+    "thirdweb": "^5.39.0",
     "uuid": "^9.0.1",
     "zod": "^3.23.8"
   },

src/db/wallets/walletNonce.ts

@@ -1,7 +1,7 @@
-import { Address, eth_getTransactionCount } from "thirdweb";
+import { Address, eth_getTransactionCount, getRpcClient } from "thirdweb";
 import { getChain } from "../../utils/chain";
 import { redis } from "../../utils/redis/redis";
-import { getRpcRequest } from "../../utils/sdk";
+import { thirdwebClient } from "../../utils/sdk";
 
 // Data type: String
 const lastUsedNonceKey = (chainId: number, walletAddress: Address) =>
@@ -68,7 +68,10 @@ const _syncNonce = async (
   chainId: number,
   walletAddress: Address,
 ): Promise<number> => {
-  const rpcRequest = getRpcRequest(await getChain(chainId));
+  const rpcRequest = getRpcClient({
+    client: thirdwebClient,
+    chain: await getChain(chainId),
+  });
 
   // The next unused nonce = transactionCount.
   const transactionCount = await eth_getTransactionCount(rpcRequest, {

src/server/routes/transaction/blockchain/sendSignedTx.ts

@@ -1,9 +1,9 @@
 import { Static, Type } from "@sinclair/typebox";
 import { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
-import { eth_sendRawTransaction, isHex } from "thirdweb";
+import { eth_sendRawTransaction, getRpcClient, isHex } from "thirdweb";
 import { getChain } from "../../../../utils/chain";
-import { getRpcRequest } from "../../../../utils/sdk";
+import { thirdwebClient } from "../../../../utils/sdk";
 import { createCustomError } from "../../../middleware/error";
 import { standardResponseSchema } from "../../../schemas/sharedApiSchemas";
 import { walletChainParamSchema } from "../../../schemas/wallet";
@@ -52,7 +52,10 @@ export async function sendSignedTransaction(fastify: FastifyInstance) {
         );
       }
 
-      const rpcRequest = getRpcRequest(await getChain(chainId));
+      const rpcRequest = getRpcClient({
+        client: thirdwebClient,
+        chain: await getChain(chainId),
+      });
       const transactionHash = await eth_sendRawTransaction(
         rpcRequest,
         signedTransaction,

src/utils/block.ts

@@ -1,7 +1,7 @@
-import { eth_blockNumber } from "thirdweb";
+import { eth_blockNumber, getRpcClient } from "thirdweb";
 import { getChain } from "./chain";
 import { redis } from "./redis/redis";
-import { getRpcRequest } from "./sdk";
+import { thirdwebClient } from "./sdk";
 
 /**
  * Returns the latest block number. Falls back to the last known block number.
@@ -11,7 +11,10 @@ import { getRpcRequest } from "./sdk";
  * @returns bigint - The latest block number.
  */
 export const getBlockNumberish = async (chainId: number): Promise<bigint> => {
-  const rpcRequest = getRpcRequest(await getChain(chainId));
+  const rpcRequest = getRpcClient({
+    client: thirdwebClient,
+    chain: await getChain(chainId),
+  });
 
   const key = `latestBlock:${chainId}`;
   try {

src/utils/sdk.ts

@@ -1,5 +1,5 @@
 import { sha256HexSync } from "@thirdweb-dev/crypto";
-import { Chain, createThirdwebClient, getRpcClient } from "thirdweb";
+import { createThirdwebClient } from "thirdweb";
 import { env } from "./env";
 
 export const thirdwebClientId = sha256HexSync(
@@ -13,21 +13,6 @@ export const thirdwebClient = createThirdwebClient({
   },
 });
 
-/**
- * Share rpcRequest objects to reuse cached data.
- */
-const _rpcClientByChain: Record<number, ReturnType<typeof getRpcClient>> = {};
-
-export const getRpcRequest = (chain: Chain) => {
-  if (!(chain.id in _rpcClientByChain)) {
-    _rpcClientByChain[chain.id] = getRpcClient({
-      client: thirdwebClient,
-      chain,
-    });
-  }
-  return _rpcClientByChain[chain.id];
-};
-
 /**
  * Helper functions to handle v4 -> v5 SDK migration.
  */

src/worker/tasks/mineTransactionWorker.ts

@@ -4,6 +4,7 @@ import {
   Address,
   eth_getTransactionByHash,
   eth_getTransactionReceipt,
+  getRpcClient,
 } from "thirdweb";
 import { stringify } from "thirdweb/utils";
 import { getUserOpReceiptRaw } from "thirdweb/wallets/smart";
@@ -16,7 +17,7 @@ import { msSince } from "../../utils/date";
 import { env } from "../../utils/env";
 import { logger } from "../../utils/logger";
 import { redis } from "../../utils/redis/redis";
-import { getRpcRequest, thirdwebClient } from "../../utils/sdk";
+import { thirdwebClient } from "../../utils/sdk";
 import {
   ErroredTransaction,
   MinedTransaction,
@@ -103,7 +104,10 @@ const _handleTransaction = async (
   const { queueId, chainId, sentTransactionHashes } = sentTransaction;
 
   // Check all sent transaction hashes since any retry could succeed.
-  const rpcRequest = getRpcRequest(await getChain(chainId));
+  const rpcRequest = getRpcClient({
+    client: thirdwebClient,
+    chain: await getChain(chainId),
+  });
   const receiptResults = await Promise.allSettled(
     sentTransactionHashes.map((hash) =>
       eth_getTransactionReceipt(rpcRequest, { hash }),
@@ -173,7 +177,7 @@ const _handleUserOp = async (
     userOpHash,
   });
   if (userOpReceiptRaw) {
-    const rpcRequest = getRpcRequest(chain);
+    const rpcRequest = getRpcClient({ client: thirdwebClient, chain });
     const transaction = await eth_getTransactionByHash(rpcRequest, {
       hash: userOpReceiptRaw.receipt.transactionHash,
     });

src/worker/tasks/processEventLogsWorker.ts

@@ -10,6 +10,7 @@ import {
   eth_getBlockByHash,
   getContract,
   getContractEvents,
+  getRpcClient,
   prepareEvent,
 } from "thirdweb";
 import { resolveContractAbi } from "thirdweb/contract";
@@ -20,7 +21,7 @@ import { WebhooksEventTypes } from "../../schema/webhooks";
 import { getChain } from "../../utils/chain";
 import { logger } from "../../utils/logger";
 import { redis } from "../../utils/redis/redis";
-import { getRpcRequest, thirdwebClient } from "../../utils/sdk";
+import { thirdwebClient } from "../../utils/sdk";
 import {
   EnqueueProcessEventLogsData,
   PROCESS_EVENT_LOGS_QUEUE_NAME,
@@ -249,7 +250,7 @@ const getBlockTimestamps = async (
 ): Promise<Record<Hash, Date>> => {
   const now = new Date();
   const dedupe = Array.from(new Set(blockHashes));
-  const rpcRequest = getRpcRequest(chain);
+  const rpcRequest = getRpcClient({ client: thirdwebClient, chain });
 
   const blocks = await Promise.all(
     dedupe.map(async (blockHash) => {

src/worker/tasks/processTransactionReceiptsWorker.ts

@@ -8,6 +8,7 @@ import {
   eth_getBlockByNumber,
   eth_getTransactionReceipt,
   getContract,
+  getRpcClient,
 } from "thirdweb";
 import { resolveContractAbi } from "thirdweb/contract";
 import { Abi, Hash, decodeFunctionData } from "viem";
@@ -16,7 +17,7 @@ import { WebhooksEventTypes } from "../../schema/webhooks";
 import { getChain } from "../../utils/chain";
 import { logger } from "../../utils/logger";
 import { redis } from "../../utils/redis/redis";
-import { getRpcRequest, thirdwebClient } from "../../utils/sdk";
+import { thirdwebClient } from "../../utils/sdk";
 import {
   EnqueueProcessTransactionReceiptsData,
   PROCESS_TRANSACTION_RECEIPTS_QUEUE_NAME,
@@ -95,7 +96,7 @@ const getFormattedTransactionReceipts = async ({
   }
 
   const chain = await getChain(chainId);
-  const rpcRequest = getRpcRequest(chain);
+  const rpcRequest = getRpcClient({ client: thirdwebClient, chain });
 
   // Get array of block numbers between `fromBlock` and `toBlock` inclusive.
   const blockRange: bigint[] = [];

yarn.lock

@@ -10203,10 +10203,10 @@ thirdweb@5.26.0:
     uqr "0.1.2"
     viem "2.10.9"
 
-thirdweb@^5.35.0:
-  version "5.35.0"
-  resolved "https://registry.yarnpkg.com/thirdweb/-/thirdweb-5.35.0.tgz#1a40943b4e15f0f64edff54cbca4608cdddc55b8"
-  integrity sha512-P/7QWeWua/QwCe1hrQ2/26Xrc0o69X/kD4QgKcUPgLQzCqRYJbRpAnXRGjTq2sxQY4Ks6Kg3cR+oTsfnT5zRHA==
+thirdweb@^5.39.0:
+  version "5.39.0"
+  resolved "https://registry.yarnpkg.com/thirdweb/-/thirdweb-5.39.0.tgz#d6202dc0081ad98fbe83a32d4fdbce2842c48281"
+  integrity sha512-DhkdFDOjoDIvcvbSj1NxyONZxwrMoKnO/L00pbkeua9o83oY+4B3Yx/nZKC9+ZLeyY1gvWyz61/yiND92R6YhA==
   dependencies:
     "@coinbase/wallet-sdk" "4.0.3"
     "@emotion/react" "11.11.4"
@@ -10229,7 +10229,7 @@ thirdweb@^5.35.0:
     mipd "0.0.7"
     node-libs-browser "2.2.1"
     uqr "0.1.2"
-    viem "2.16.5"
+    viem "2.17.10"
 
 thread-stream@^0.15.1:
   version "0.15.2"
@@ -10723,10 +10723,10 @@ viem@2.10.9:
     isows "1.0.4"
     ws "8.13.0"
 
-viem@2.16.5:
-  version "2.16.5"
-  resolved "https://registry.yarnpkg.com/viem/-/viem-2.16.5.tgz#9607fd47f9ae6f6a4723cf4363a966208b7a888d"
-  integrity sha512-QDESALYDyLSP+pIr7adH3QPZ+3is16aOVMXXZE0X1GVbgL7PDMZQ8xIF1X/B1hgyqkBl2HhMpUaq6ksUdBV/YA==
+viem@2.17.10:
+  version "2.17.10"
+  resolved "https://registry.yarnpkg.com/viem/-/viem-2.17.10.tgz#0b72bc8f8b86c11d2ace03035e5c39123c9dec55"
+  integrity sha512-nubTeRBI3wsmYGemlg9PsbhunTSJSYUlq8VjzIQkbowCSPSd1bqzVeUU0qEOXsGtgRiFfBzXkkxFknZtBOAx/Q==
   dependencies:
     "@adraffy/ens-normalize" "1.10.0"
     "@noble/curves" "1.4.0"