thirdweb 5.30.0-nightly-991cb72bdb1b94fcf0f9a3de36b2ec8ee07ae5ec-20240619000538 → 5.30.0-nightly-fab5cd43bed972b0a3f70f0f39a790349672ba72-20240620192731

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thirdweb",
-  "version": "5.30.0-nightly-991cb72bdb1b94fcf0f9a3de36b2ec8ee07ae5ec-20240619000538",
+  "version": "5.30.0-nightly-fab5cd43bed972b0a3f70f0f39a790349672ba72-20240620192731",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/thirdweb-dev/js.git#main"
@@ -185,18 +185,18 @@
   "dependencies": {
     "@coinbase/wallet-sdk": "4.0.3",
     "@emotion/react": "11.11.4",
-    "@emotion/styled": "11.11.0",
+    "@emotion/styled": "11.11.5",
     "@google/model-viewer": "2.1.1",
     "@noble/curves": "1.4.0",
     "@noble/hashes": "1.4.0",
     "@passwordless-id/webauthn": "^1.6.1",
-    "@radix-ui/react-dialog": "1.0.5",
+    "@radix-ui/react-dialog": "1.1.0",
     "@radix-ui/react-focus-scope": "1.0.4",
     "@radix-ui/react-icons": "1.3.0",
-    "@radix-ui/react-tooltip": "1.0.7",
+    "@radix-ui/react-tooltip": "1.1.0",
     "@tanstack/react-query": "5.29.2",
     "@walletconnect/ethereum-provider": "2.12.2",
-    "@walletconnect/sign-client": "^2.13.1",
+    "@walletconnect/sign-client": "^2.13.3",
     "abitype": "1.0.0",
     "fast-text-encoding": "^1.0.6",
     "fuse.js": "7.0.0",
@@ -270,29 +270,28 @@
     "@aws-sdk/credential-providers": "3.577.0",
     "@coinbase/wallet-mobile-sdk": "1.0.13",
     "@react-native-async-storage/async-storage": "^1.23.1",
-    "@testing-library/jest-dom": "^6.4.5",
-    "@testing-library/react": "^15.0.6",
-    "@testing-library/react-hooks": "^8.0.1",
+    "@testing-library/jest-dom": "^6.4.6",
+    "@testing-library/react": "^16.0.0",
     "@types/cross-spawn": "^6.0.6",
-    "@types/react": "18.2.17",
-    "@vitejs/plugin-react": "^4.2.1",
-    "@vitest/ui": "1.5.0",
+    "@types/react": "^18.3.3",
+    "@vitejs/plugin-react": "^4.3.1",
+    "@vitest/ui": "1.6.0",
     "amazon-cognito-identity-js": "6.3.12",
     "aws-amplify": "5.3.18",
     "cross-spawn": "7.0.3",
     "expo-web-browser": "13.0.3",
-    "happy-dom": "^14.10.1",
-    "react-native": "0.74.1",
+    "happy-dom": "^14.12.0",
+    "react-native": "0.74.2",
     "react-native-aes-gcm-crypto": "0.2.2",
     "react-native-quick-crypto": "0.7.0-rc.6",
-    "vitest": "1.5.0"
+    "vitest": "1.6.0"
   },
   "scripts": {
     "bench:compare": "bun run ./benchmarks/run.ts",
     "bench": "vitest -c ./test/vitest.config.ts bench",
-    "format": "biome format src/ --write",
-    "lint": "biome check src/",
-    "fix": "biome check src/ --apply",
+    "format": "biome format ./src --write",
+    "lint": "biome check ./src",
+    "fix": "biome check ./src --fix",
     "knip": "knip",
     "build:generate": "bun scripts/generate/generate.ts",
     "build:generate-wallets": "bun scripts/wallets/generate.ts",

package/src/event/actions/get-events.ts

@@ -178,7 +178,7 @@ export async function getContractEvents<
     logsParams.map((ethLogParams) => eth_getLogs(rpcRequest, ethLogParams)),
   );
   const flattenLogs = logs
-    .flatMap((log) => log)
+    .flat()
     .sort((a, b) => Number((a.blockNumber ?? 0n) - (b.blockNumber ?? 0n)));
   return parseEventLogs({
     logs: flattenLogs,

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

@@ -3,8 +3,8 @@ export {
   createWalletConnectSession,
   disconnectWalletConnectSession,
   getActiveWalletConnectSessions,
-} from "../../wallets/wallet-connect/consumer/index.js";
+} from "../../wallets/wallet-connect/receiver/index.js";
 export type {
   WalletConnectClient,
   WalletConnectSession,
-} from "../../wallets/wallet-connect/consumer/types.js";
+} from "../../wallets/wallet-connect/receiver/types.js";

package/src/exports/wallets.ts

@@ -11,6 +11,7 @@ export {
    */
   inAppWallet as embeddedWallet,
 } from "../wallets/in-app/web/in-app.js";
+export { ecosystemWallet } from "../wallets/in-app/web/ecosystem.js";
 export { smartWallet } from "../wallets/smart/smart-wallet.js";
 
 export type { Wallet, Account } from "../wallets/interfaces/wallet.js";
@@ -101,6 +102,19 @@ export { type WalletInfo } from "../wallets/wallet-info.js";
 
 export { createWalletAdapter } from "../adapters/wallet-adapter.js";
 
+// wallet connect
+export {
+  createWalletConnectClient,
+  createWalletConnectSession,
+  disconnectWalletConnectSession,
+  getActiveWalletConnectSessions,
+  DefaultWalletConnectRequestHandlers,
+} from "../wallets/wallet-connect/receiver/index.js";
+export type {
+  WalletConnectClient,
+  WalletConnectSession,
+} from "../wallets/wallet-connect/receiver/types.js";
+
 // WEB ONLY EXPORTS
 
 // injected

package/src/extensions/erc1155/drops/write/claimTo.test.ts

@@ -0,0 +1,73 @@
+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 { NATIVE_TOKEN_ADDRESS } from "../../../../constants/addresses.js";
+import {
+  type ThirdwebContract,
+  getContract,
+} from "../../../../contract/contract.js";
+import { deployERC1155Contract } from "../../../../extensions/prebuilts/deploy-erc1155.js";
+import { sendAndConfirmTransaction } from "../../../../transaction/actions/send-and-confirm-transaction.js";
+import { totalSupply } from "../../__generated__/IERC1155/read/totalSupply.js";
+import { lazyMint } from "../../write/lazyMint.js";
+import { claimTo } from "./claimTo.js";
+import { setClaimConditions } from "./setClaimConditions.js";
+
+let contract: ThirdwebContract;
+const account = TEST_ACCOUNT_A;
+const client = TEST_CLIENT;
+const chain = ANVIL_CHAIN;
+
+describe("erc1155 claimTo extension", () => {
+  beforeEach(async () => {
+    const address = await deployERC1155Contract({
+      client,
+      chain,
+      account,
+      type: "DropERC1155",
+      params: {
+        name: "Edition Drop",
+      },
+    });
+    contract = getContract({
+      address,
+      client,
+      chain,
+    });
+
+    const transaction = lazyMint({ contract, nfts: [{ name: "token 0" }] });
+    await sendAndConfirmTransaction({ transaction, account });
+
+    const setClaimTx = setClaimConditions({
+      contract,
+      tokenId: 0n,
+      phases: [
+        {
+          maxClaimableSupply: 100n,
+          maxClaimablePerWallet: 100n,
+          currencyAddress: NATIVE_TOKEN_ADDRESS,
+          price: 0.1,
+          startTime: new Date(),
+        },
+      ],
+    });
+
+    await sendAndConfirmTransaction({ transaction: setClaimTx, account });
+  });
+
+  it("should claim the nft", async () => {
+    const transaction = claimTo({
+      contract,
+      tokenId: 0n,
+      quantity: 1n,
+      to: account.address,
+    });
+
+    await sendAndConfirmTransaction({ transaction, account });
+
+    const supplyCount = await totalSupply({ contract, id: 0n });
+    expect(supplyCount).toBe(1n);
+  });
+});

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

@@ -0,0 +1,67 @@
+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 {
+  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("erc721 mintTo extension", () => {
+  beforeEach(async () => {
+    const address = await deployERC721Contract({
+      client,
+      chain,
+      account,
+      type: "TokenERC721",
+      params: {
+        name: "NFTDrop",
+      },
+    });
+    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/react/core/design-system/CustomThemeProvider.tsx

@@ -9,7 +9,7 @@ const CustomThemeCtx = /* @__PURE__ */ createContext(darkThemeObj);
  */
 export function CustomThemeProvider(props: {
   children: React.ReactNode;
-  theme: "light" | "dark" | Theme;
+  theme: "light" | "dark" | Theme | undefined;
 }) {
   const { theme, children } = props;
   const themeObj = parseTheme(theme);

package/src/react/core/hooks/contract/useContractEvents.ts

@@ -35,7 +35,7 @@ type UseContractEventsOptions<
  *
  * const account = useActiveAccount();
  * const contractEvents = useContractEvents({
- *  contract
+ *  contract,
  *  events: [tokensClaimedEvent({ claimer: account?.address })],
  * });
  * ```

package/src/react/core/hooks/wallets/useAutoConnect.ts

@@ -80,8 +80,6 @@ export function useAutoConnectCore(
           setConnectionStatus("disconnected");
         }
       } catch (e) {
-        console.error("Failed to auto connect last active wallet");
-        console.error(e);
         setConnectionStatus("disconnected");
       }
     } else {

package/src/react/core/providers/wallet-connection.tsx

@@ -2,7 +2,7 @@
 import { createContext } from "react";
 import type { Chain } from "../../../chains/types.js";
 import type { ThirdwebClient } from "../../../client/client.js";
-import type { Wallet } from "../../../wallets/interfaces/wallet.js";
+import type { Account, Wallet } from "../../../wallets/interfaces/wallet.js";
 import type { SmartWalletOptions } from "../../../wallets/smart/types.js";
 import type { AppMetadata } from "../../../wallets/types.js";
 import type { ConnectButton_connectModalOptions } from "../../web/ui/ConnectWallet/ConnectButtonProps.js";
@@ -25,7 +25,10 @@ export const ConnectUIContext = /* @__PURE__ */ createContext<{
   accountAbstraction?: SmartWalletOptions;
   showAllWallets?: boolean;
   onConnect?: (wallet: Wallet) => void;
-  onDisconnect?: () => void;
+  onDisconnect?: (info: {
+    wallet: Wallet;
+    account: Account;
+  }) => void;
   isEmbed: boolean;
   connectModal: Omit<ConnectButton_connectModalOptions, "size"> & {
     size: "compact" | "wide";

package/src/react/web/hooks/wallets/useAutoConnect.ts

@@ -1,4 +1,6 @@
 import { webLocalStorage } from "../../../../utils/storage/webStorage.js";
+import { createWallet } from "../../../../wallets/create-wallet.js";
+import { getInstalledWalletProviders } from "../../../../wallets/injected/mipdStore.js";
 import type { AutoConnectProps } from "../../../core/hooks/connection/types.js";
 import { useAutoConnectCore } from "../../../core/hooks/wallets/useAutoConnect.js";
 import { connectionManager } from "../../index.js";
@@ -23,5 +25,14 @@ import { connectionManager } from "../../index.js";
  * @returns whether the auto connect was successful.
  */
 export function useAutoConnect(props: AutoConnectProps) {
-  return useAutoConnectCore(connectionManager, webLocalStorage, props);
+  return useAutoConnectCore(connectionManager, webLocalStorage, props, () => {
+    const specifiedWalletIds = new Set(props.wallets.map((x) => x.id));
+
+    // pass the wallets that are not already specified but are installed by the user
+    const installedWallets = getInstalledWalletProviders()
+      .filter((x) => !specifiedWalletIds.has(x.info.rdns))
+      .map((x) => createWallet(x.info.rdns));
+
+    return installedWallets;
+  });
 }

package/src/react/web/providers/wallet-ui-states-provider.tsx

@@ -30,7 +30,7 @@ export const WalletUIStatesProvider = (
       <SetWalletModalOpen.Provider value={setIsWalletModalOpen}>
         <SelectionUIDataCtx.Provider value={selectionUIData}>
           <SetSelectionUIDataCtx.Provider value={setSelectionUIData}>
-            <CustomThemeProvider theme={props.theme || "dark"}>
+            <CustomThemeProvider theme={props.theme}>
               {props.children}
             </CustomThemeProvider>
           </SetSelectionUIDataCtx.Provider>

package/src/react/web/ui/ConnectWallet/ConnectButton.tsx

@@ -290,14 +290,12 @@ function ConnectButtonInner(
       detailsButton={props.detailsButton}
       detailsModal={props.detailsModal}
       supportedTokens={supportedTokens}
-      onDisconnect={() => {
+      onDisconnect={(info) => {
         // logout on explicit disconnect!
         if (siweAuth.requiresAuth) {
           siweAuth.doLogout();
         }
-        if (props.onDisconnect) {
-          props.onDisconnect();
-        }
+        props.onDisconnect?.(info);
       }}
       chains={props?.chains || []}
       chain={props.chain}

package/src/react/web/ui/ConnectWallet/ConnectButtonProps.ts

@@ -1,6 +1,6 @@
 import type { Chain } from "../../../../chains/types.js";
 import type { ThirdwebClient } from "../../../../client/client.js";
-import type { Wallet } from "../../../../wallets/interfaces/wallet.js";
+import type { Account, Wallet } from "../../../../wallets/interfaces/wallet.js";
 import type { SmartWalletOptions } from "../../../../wallets/smart/types.js";
 import type { AppMetadata } from "../../../../wallets/types.js";
 import type { Theme } from "../../../core/design-system/index.js";
@@ -525,13 +525,11 @@ export type ConnectButtonProps = {
    * ```tsx
    * <ConnectButton
    *   connectButton={{
-   *     connectButton: {
    *       label: "Connect",
    *       className: "my-custom-class",
    *       style: {
    *         borderRadius: "10px",
    *       },
-   *     },
    *   }}
    * />;
    * ```
@@ -691,17 +689,20 @@ export type ConnectButtonProps = {
   onConnect?: (wallet: Wallet) => void;
 
   /**
-   * Called when a wallet is disconnected.
+   * Called when the user disconnects the wallet by clicking on the "Disconnect Wallet" button in the `ConnectButton`'s Details Modal.
    *
    * ```tsx
    * <ConnectButton
-   *  onDisconnect={() => {
-   *    console.log("disconnected")
+   *  onDisconnect={({ wallet, account }) => {
+   *    console.log("disconnected", wallet, account)
    *  }}
    * />
    * ```
    */
-  onDisconnect?: () => void;
+  onDisconnect?: (info: {
+    wallet: Wallet;
+    account: Account;
+  }) => void;
 
   /**
    * Configure options for WalletConnect