thirdweb 5.64.5 → 5.65.0-nightly-7a9713e877eb20b4e0d95964125b295feafc931a-20241102000323

package/src/wallets/in-app/core/authentication/siwe.ts

@@ -3,6 +3,7 @@ import type { LoginPayload } from "../../../../auth/core/types.js";
 import type { Chain } from "../../../../chains/types.js";
 import type { ThirdwebClient } from "../../../../client/client.js";
 import { getClientFetch } from "../../../../utils/fetch.js";
+import { stringify } from "../../../../utils/json.js";
 import type { Wallet } from "../../../interfaces/wallet.js";
 import type { Ecosystem } from "../wallet/types.js";
 import { getLoginCallbackUrl, getLoginUrl } from "./getLoginPath.js";
@@ -50,7 +51,7 @@ export async function siweAuthenticate(args: {
         headers: {
           "Content-Type": "application/json",
         },
-        body: JSON.stringify({
+        body: stringify({
           signature,
           payload,
         }),

package/src/wallets/in-app/core/wallet/in-app-core.ts

@@ -2,6 +2,7 @@ import { trackConnect } from "../../../../analytics/track/connect.js";
 import type { Chain } from "../../../../chains/types.js";
 import { getCachedChainIfExists } from "../../../../chains/utils.js";
 import type { ThirdwebClient } from "../../../../client/client.js";
+import { stringify } from "../../../../utils/json.js";
 import { getEcosystemInfo } from "../../../ecosystem/get-ecosystem-wallet-auth-options.js";
 import type { Account, Wallet } from "../../../interfaces/wallet.js";
 import { createWalletEmitter } from "../../../wallet-emitter.js";
@@ -22,7 +23,7 @@ export async function getOrCreateInAppWalletConnector(
   connectorFactory: (client: ThirdwebClient) => Promise<InAppConnector>,
   ecosystem?: Ecosystem,
 ) {
-  const key = JSON.stringify({ clientId: client.clientId, ecosystem });
+  const key = stringify({ clientId: client.clientId, ecosystem });
   if (connectorCache.has(key)) {
     return connectorCache.get(key) as InAppConnector;
   }

package/src/wallets/in-app/native/helpers/api/fetchers.ts

@@ -1,6 +1,7 @@
 import type { ThirdwebClient } from "../../../../../client/client.js";
 import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { getClientFetch } from "../../../../../utils/fetch.js";
+import { stringify } from "../../../../../utils/json.js";
 import { randomBytesHex } from "../../../../../utils/random.js";
 import type { ClientScopedStorage } from "../../../core/authentication/client-scoped-storage.js";
 import type { UserDetailsApiType } from "../../../core/authentication/types.js";
@@ -35,7 +36,7 @@ export const verifyClientId = async (client: ThirdwebClient) => {
     headers: {
       ...getSessionHeaders(),
     },
-    body: JSON.stringify({ clientId: client.clientId, parentDomain: "" }),
+    body: stringify({ clientId: client.clientId, parentDomain: "" }),
   });
   if (!resp.ok) {
     const error = await resp.json();
@@ -155,7 +156,7 @@ export async function storeUserShares({
     props: {
       method: "POST",
       headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({
+      body: stringify({
         walletAddress,
         maybeEncryptedRecoveryShares,
         authShare,
@@ -168,7 +169,7 @@ export async function storeUserShares({
     const error = await resp.json();
 
     throw new Error(
-      `Something went wrong storing user wallet shares: ${JSON.stringify(
+      `Something went wrong storing user wallet shares: ${stringify(
         error.message,
         null,
         2,
@@ -193,7 +194,7 @@ export async function getUserShares(args: {
   if (!resp.ok) {
     const error = await resp.json();
     throw new Error(
-      `Something went wrong getting user's wallet: ${JSON.stringify(
+      `Something went wrong getting user's wallet: ${stringify(
         error.message,
         null,
         2,

package/src/wallets/in-app/native/helpers/errors.ts

@@ -1,3 +1,5 @@
+import { stringify } from "../../../../utils/json.js";
+
 export const ErrorMessages = {
   invalidOtp:
     "Your OTP code is invalid or expired. Please request a new code or try again.",
@@ -8,5 +10,5 @@ export const createErrorMessage = (message: string, error: unknown): string => {
   if (error instanceof Error) {
     return `${message}: ${error.message}`;
   }
-  return `${message}: ${JSON.stringify(error)}`;
+  return `${message}: ${stringify(error)}`;
 };

package/src/wallets/in-app/native/helpers/storage/local.ts

@@ -1,4 +1,5 @@
 import AsyncStorage from "@react-native-async-storage/async-storage";
+import { stringify } from "../../../../../utils/json.js";
 import {
   DEVICE_SHARE_LOCAL_STORAGE_NAME,
   WALLET_USER_DETAILS_LOCAL_STORAGE_NAME,
@@ -65,7 +66,7 @@ export async function setWallerUserDetails({
   await setItemInAsyncStorage(
     // ! Keep this in sync with getWalletUserDetails function below
     name,
-    JSON.stringify({ userId, email: newEmail }),
+    stringify({ userId, email: newEmail }),
   );
 }
 

package/src/wallets/in-app/native/helpers/wallet/migration.ts

@@ -4,6 +4,7 @@ import QuickCrypto from "react-native-quick-crypto";
 import type { ThirdwebClient } from "../../../../../client/client.js";
 import { getThirdwebBaseUrl } from "../../../../../utils/domains.js";
 import { stringToBytes } from "../../../../../utils/encoding/to-bytes.js";
+import { stringify } from "../../../../../utils/json.js";
 import { randomBytesBuffer } from "../../../../../utils/random.js";
 import {
   concatUint8Arrays,
@@ -72,7 +73,7 @@ export async function migrateToEnclaveWallet(args: {
   });
   if (!idTokenResponse.ok) {
     throw new Error(
-      `Failed to fetch id token from Cognito: ${JSON.stringify(
+      `Failed to fetch id token from Cognito: ${stringify(
         await idTokenResponse.json(),
         null,
         2,
@@ -164,7 +165,7 @@ async function executeMigration(args: {
     url: `${getThirdwebBaseUrl("inAppWallet")}/api/v1/enclave-wallet/migrate`,
     props: {
       method: "POST",
-      body: JSON.stringify({
+      body: stringify({
         address: args.address,
         kmsCiphertextB64: args.kmsCiphertextB64,
         encryptedPrivateKeyB64: args.encryptedPrivateKeyB64,
@@ -175,7 +176,7 @@ async function executeMigration(args: {
   });
   if (!migrationResponse.ok) {
     throw new Error(
-      `Failed to migrate to enclave wallet: ${JSON.stringify(
+      `Failed to migrate to enclave wallet: ${stringify(
         await migrationResponse.json(),
       )}`,
     );

package/src/wallets/in-app/native/helpers/wallet/recoveryCode.ts

@@ -5,6 +5,7 @@ import {
 } from "@aws-sdk/credential-providers";
 import type { ThirdwebClient } from "../../../../../client/client.js";
 import { stringToBytes } from "../../../../../utils/encoding/to-bytes.js";
+import { stringify } from "../../../../../utils/json.js";
 import type { ClientScopedStorage } from "../../../core/authentication/client-scoped-storage.js";
 import { authFetchEmbeddedWalletUser } from "../api/fetchers.js";
 import {
@@ -31,7 +32,7 @@ export async function getCognitoRecoveryPasswordV1(args: {
   });
   if (!idTokenResponse.ok) {
     throw new Error(
-      `Failed to fetch id token from Cognito: ${JSON.stringify(
+      `Failed to fetch id token from Cognito: ${stringify(
         await idTokenResponse.json(),
         null,
         2,
@@ -61,7 +62,7 @@ export async function getCognitoRecoveryPasswordV1(args: {
   const params = {
     FunctionName: GENERATE_RECOVERY_PASSWORD_LAMBDA_FUNCTION_V1,
     Payload: stringToBytes(
-      JSON.stringify({
+      stringify({
         accessToken,
         idToken,
       }),
@@ -92,7 +93,7 @@ export async function getCognitoRecoveryPasswordV2(args: {
   });
   if (!idTokenResponse.ok) {
     throw new Error(
-      `Failed to fetch id token from Cognito: ${JSON.stringify(
+      `Failed to fetch id token from Cognito: ${stringify(
         await idTokenResponse.json(),
         null,
         2,
@@ -121,7 +122,7 @@ export async function getCognitoRecoveryPasswordV2(args: {
   const params = {
     FunctionName: GENERATE_RECOVERY_PASSWORD_LAMBDA_FUNCTION_V2,
     Payload: stringToBytes(
-      JSON.stringify({
+      stringify({
         token: lambdaToken,
       }),
     ),

package/src/wallets/in-app/web/lib/auth/otp.ts

@@ -1,4 +1,5 @@
 import type { ThirdwebClient } from "../../../../../client/client.js";
+import { stringify } from "../../../../../utils/json.js";
 import {
   getLoginCallbackUrl,
   getLoginUrl,
@@ -46,7 +47,7 @@ export const sendOtp = async (args: PreAuthArgsType): Promise<void> => {
   const response = await fetch(url, {
     method: "POST",
     headers,
-    body: JSON.stringify(body),
+    body: stringify(body),
   });
 
   if (!response.ok) {
@@ -103,7 +104,7 @@ export const verifyOtp = async (
   const response = await fetch(url, {
     method: "POST",
     headers,
-    body: JSON.stringify(body),
+    body: stringify(body),
   });
 
   if (!response.ok) {

package/src/wallets/manager/index.ts

@@ -5,6 +5,7 @@ import { hasSmartAccount } from "../../react/core/utils/isSmartWallet.js";
 import { computedStore } from "../../reactive/computedStore.js";
 import { effect } from "../../reactive/effect.js";
 import { createStore } from "../../reactive/store.js";
+import { stringify } from "../../utils/json.js";
 import type { AsyncStorage } from "../../utils/storage/AsyncStorage.js";
 import { deleteConnectParamsFromStorage } from "../../utils/storage/walletStorage.js";
 import type { Account, Wallet } from "../interfaces/wallet.js";
@@ -216,7 +217,7 @@ export function createConnectionManager(storage: AsyncStorage) {
     () => {
       const _chain = activeWalletChainStore.getValue();
       if (_chain) {
-        storage.setItem(LAST_ACTIVE_CHAIN, JSON.stringify(_chain));
+        storage.setItem(LAST_ACTIVE_CHAIN, stringify(_chain));
       } else {
         storage.removeItem(LAST_ACTIVE_CHAIN);
       }
@@ -231,7 +232,7 @@ export function createConnectionManager(storage: AsyncStorage) {
       const accounts = connectedWallets.getValue();
       const ids = accounts.map((acc) => acc?.id).filter((c) => !!c) as string[];
 
-      storage.setItem(CONNECTED_WALLET_IDS, JSON.stringify(ids));
+      storage.setItem(CONNECTED_WALLET_IDS, stringify(ids));
     },
     [connectedWallets],
     false,
@@ -276,7 +277,7 @@ export function createConnectionManager(storage: AsyncStorage) {
     const allChainsSame = chains.every((c) => {
       const definedChain = currentMapVal.get(c.id);
       // basically a deep equal check
-      return JSON.stringify(definedChain) === JSON.stringify(c);
+      return stringify(definedChain) === stringify(c);
     });
 
     if (allChainsSame) {

package/src/wallets/smart/lib/bundler.ts

@@ -290,7 +290,7 @@ async function sendBundlerRequest(args: {
   if (!response.ok || res.error) {
     let error = res.error || response.statusText;
     if (typeof error === "object") {
-      error = JSON.stringify(error);
+      error = stringify(error);
     }
     const code = res.code || "UNKNOWN";
 

package/src/wallets/smart/lib/paymaster.ts

@@ -2,6 +2,7 @@ import type { Chain } from "../../../chains/types.js";
 import type { ThirdwebClient } from "../../../client/client.js";
 import { hexToBigInt } from "../../../utils/encoding/hex.js";
 import { getClientFetch } from "../../../utils/fetch.js";
+import { stringify } from "../../../utils/json.js";
 import type {
   PaymasterResult,
   UserOperationV06,
@@ -59,7 +60,7 @@ export async function getPaymasterAndData(args: {
   const response = await fetchWithHeaders(paymasterUrl, {
     method: "POST",
     headers,
-    body: JSON.stringify({
+    body: stringify({
       jsonrpc: "2.0",
       id: 1,
       method: "pm_sponsorUserOperation",

package/src/wallets/smart/smart-wallet.ts

@@ -2,6 +2,7 @@ import { trackConnect } from "../../analytics/track/connect.js";
 import type { Chain } from "../../chains/types.js";
 import { getCachedChainIfExists } from "../../chains/utils.js";
 import { getContract } from "../../contract/contract.js";
+import { isZkSyncChain } from "../../utils/any-evm/zksync/isZkSyncChain.js";
 import { isContractDeployed } from "../../utils/bytecode/is-contract-deployed.js";
 import type { Account, Wallet } from "../interfaces/wallet.js";
 import { createWalletEmitter } from "../wallet-emitter.js";
@@ -202,19 +203,24 @@ export function smartWallet(
       if (!lastConnectOptions) {
         throw new Error("Cannot switch chain without a previous connection");
       }
-      // check if factory is deployed
-      const factory = getContract({
-        address:
-          createOptions.factoryAddress ||
-          getDefaultAccountFactory(createOptions.overrides?.entrypointAddress),
-        chain: newChain,
-        client: lastConnectOptions.client,
-      });
-      const isDeployed = await isContractDeployed(factory);
-      if (!isDeployed) {
-        throw new Error(
-          `Factory contract not deployed on chain: ${newChain.id}`,
-        );
+      const isZksyncChain = await isZkSyncChain(newChain);
+      if (!isZksyncChain) {
+        // check if factory is deployed
+        const factory = getContract({
+          address:
+            createOptions.factoryAddress ||
+            getDefaultAccountFactory(
+              createOptions.overrides?.entrypointAddress,
+            ),
+          chain: newChain,
+          client: lastConnectOptions.client,
+        });
+        const isDeployed = await isContractDeployed(factory);
+        if (!isDeployed) {
+          throw new Error(
+            `Factory contract not deployed on chain: ${newChain.id}`,
+          );
+        }
       }
       const { connectSmartWallet } = await import("./index.js");
       const [connectedAccount, connectedChain] = await connectSmartWallet(

package/src/wallets/wallet-connect/controller.ts

@@ -24,6 +24,7 @@ import {
   stringToHex,
   uint8ArrayToHex,
 } from "../../utils/encoding/hex.js";
+import { stringify } from "../../utils/json.js";
 import { parseTypedData } from "../../utils/signatures/helpers/parseTypedData.js";
 import type { AsyncStorage } from "../../utils/storage/AsyncStorage.js";
 import {
@@ -536,7 +537,7 @@ function setRequestedChainsIds(
   chains: number[] | undefined,
   storage: AsyncStorage,
 ) {
-  storage?.setItem(storageKeys.requestedChains, JSON.stringify(chains));
+  storage?.setItem(storageKeys.requestedChains, stringify(chains));
 }
 
 /**

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

@@ -1,3 +1,4 @@
+import { stringify } from "../../../utils/json.js";
 import { ClientScopedStorage } from "../../in-app/core/authentication/client-scoped-storage.js";
 import type { WalletConnectSession } from "./types.js";
 
@@ -45,9 +46,7 @@ export async function saveSession(
     await walletConnectSessions.getWalletConnectSessions();
   const sessions = JSON.parse(stringifiedSessions ?? "[]");
   sessions.push(session);
-  await walletConnectSessions.saveWalletConnectSessions(
-    JSON.stringify(sessions),
-  );
+  await walletConnectSessions.saveWalletConnectSessions(stringify(sessions));
 }
 
 /**
@@ -65,9 +64,7 @@ export async function removeSession(
   const newSessions = sessions.filter(
     (s: WalletConnectSession) => s.topic !== session.topic,
   );
-  await walletConnectSessions.saveWalletConnectSessions(
-    JSON.stringify(newSessions),
-  );
+  await walletConnectSessions.saveWalletConnectSessions(stringify(newSessions));
 }
 
 /**

package/src/extensions/erc721/write/mintTo.test.ts

@@ -1,69 +0,0 @@
-import { beforeEach, describe, expect, it } from "vitest";
-import { ANVIL_CHAIN } from "~test/chains.js";
-import { TEST_CLIENT } from "~test/test-clients.js";
-import { TEST_ACCOUNT_A } from "~test/test-wallets.js";
-
-import { TEST_CONTRACT_URI } from "~test/ipfs-uris.js";
-import {
-  type ThirdwebContract,
-  getContract,
-} from "../../../contract/contract.js";
-import { deployERC721Contract } from "../../../extensions/prebuilts/deploy-erc721.js";
-import { sendAndConfirmTransaction } from "../../../transaction/actions/send-and-confirm-transaction.js";
-import { tokenURI } from "../__generated__/IERC721A/read/tokenURI.js";
-import { getNFT } from "../read/getNFT.js";
-import { mintTo } from "./mintTo.js";
-
-let contract: ThirdwebContract;
-const account = TEST_ACCOUNT_A;
-const client = TEST_CLIENT;
-const chain = ANVIL_CHAIN;
-
-describe.runIf(!!process.env.TW_SECRET_KEY)("erc721 mintTo extension", () => {
-  beforeEach(async () => {
-    const address = await deployERC721Contract({
-      client,
-      chain,
-      account,
-      type: "TokenERC721",
-      params: {
-        name: "NFTDrop",
-        contractURI: TEST_CONTRACT_URI,
-      },
-    });
-    contract = getContract({
-      address,
-      client,
-      chain,
-    });
-  });
-
-  it("should mint an nft when passed an object", async () => {
-    const transaction = mintTo({
-      contract,
-      nft: { name: "token 0" },
-      to: account.address,
-    });
-    await sendAndConfirmTransaction({
-      transaction,
-      account,
-    });
-
-    const nft = await getNFT({ contract, tokenId: 0n });
-    expect(nft.metadata.name).toBe("token 0");
-  });
-
-  it("should mint an nft when passed a string", async () => {
-    const transaction = mintTo({
-      contract,
-      nft: "ipfs://fake-token-uri",
-      to: account.address,
-    });
-    await sendAndConfirmTransaction({
-      transaction,
-      account,
-    });
-    const _uri = await tokenURI({ contract, tokenId: 0n });
-    expect(_uri).toBe("ipfs://fake-token-uri");
-  });
-});

package/src/extensions/prebuilts/deploy-erc1155.test.ts

@@ -1,54 +0,0 @@
-import { describe, expect, it } from "vitest";
-import { ANVIL_CHAIN } from "../../../test/src/chains.js";
-import { TEST_CLIENT } from "../../../test/src/test-clients.js";
-import { TEST_ACCOUNT_B } from "../../../test/src/test-wallets.js";
-import { getContract } from "../../contract/contract.js";
-import { name } from "../common/read/name.js";
-import { deployERC1155Contract } from "./deploy-erc1155.js";
-
-const account = TEST_ACCOUNT_B;
-
-describe.runIf(process.env.TW_SECRET_KEY)("deployERC1155", () => {
-  it("should deploy ERC1155 drop", async () => {
-    const address = await deployERC1155Contract({
-      client: TEST_CLIENT,
-      chain: ANVIL_CHAIN,
-      account,
-      type: "DropERC1155",
-      params: {
-        name: "EditionDrop",
-        symbol: "NFTD",
-      },
-    });
-    expect(address).toBeDefined();
-    const deployedName = await name({
-      contract: getContract({
-        client: TEST_CLIENT,
-        chain: ANVIL_CHAIN,
-        address,
-      }),
-    });
-    expect(deployedName).toBe("EditionDrop");
-  });
-
-  it("should deploy ERC1155 token", async () => {
-    const address = await deployERC1155Contract({
-      client: TEST_CLIENT,
-      chain: ANVIL_CHAIN,
-      account,
-      type: "TokenERC1155",
-      params: {
-        name: "Edition",
-      },
-    });
-    expect(address).toBeDefined();
-    const deployedName = await name({
-      contract: getContract({
-        client: TEST_CLIENT,
-        chain: ANVIL_CHAIN,
-        address,
-      }),
-    });
-    expect(deployedName).toBe("Edition");
-  });
-});

package/src/extensions/prebuilts/deploy-erc20.test.ts

@@ -1,56 +0,0 @@
-import { describe, expect, it } from "vitest";
-import { ANVIL_CHAIN } from "../../../test/src/chains.js";
-import { TEST_CLIENT } from "../../../test/src/test-clients.js";
-import { TEST_ACCOUNT_D } from "../../../test/src/test-wallets.js";
-import { getContract } from "../../contract/contract.js";
-import { name } from "../common/read/name.js";
-import { deployERC20Contract } from "./deploy-erc20.js";
-
-const account = TEST_ACCOUNT_D;
-
-// skip this test suite if there is no secret key available to test with
-// TODO: remove reliance on secret key during unit tests entirely
-describe.runIf(process.env.TW_SECRET_KEY)("deployERC20", () => {
-  it("should deploy ERC20 drop", async () => {
-    const address = await deployERC20Contract({
-      client: TEST_CLIENT,
-      chain: ANVIL_CHAIN,
-      account,
-      type: "DropERC20",
-      params: {
-        name: "TokenDrop",
-        symbol: "NFTD",
-      },
-    });
-    expect(address).toBeDefined();
-    const deployedName = await name({
-      contract: getContract({
-        client: TEST_CLIENT,
-        chain: ANVIL_CHAIN,
-        address,
-      }),
-    });
-    expect(deployedName).toBe("TokenDrop");
-  });
-
-  it("should deploy ERC20 token", async () => {
-    const address = await deployERC20Contract({
-      client: TEST_CLIENT,
-      chain: ANVIL_CHAIN,
-      account,
-      type: "TokenERC20",
-      params: {
-        name: "Token",
-      },
-    });
-    expect(address).toBeDefined();
-    const deployedName = await name({
-      contract: getContract({
-        client: TEST_CLIENT,
-        chain: ANVIL_CHAIN,
-        address,
-      }),
-    });
-    expect(deployedName).toBe("Token");
-  });
-});