Version Packages (#2589 )

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: GitHub Action <[email protected]>
fix: Do not open wallet uri when connected using official WC modal (#2595 )
2024-03-29 16:17:16 -07:00 · 2024-03-29 23:00:55 +00:00 · 2024-03-29 22:29:21 +00:00 · 2024-03-29 15:07:03 -07:00 · 2024-03-29 21:58:03 +00:00 · 2024-03-29 14:24:29 -07:00
5277 changed files with 180644 additions and 24962 deletions
@@ -16,9 +16,6 @@
  "baseBranch": "main",
  "updateInternalDependencies": "patch",
  "ignore": [
-    "e2e-cra-5",
-    "e2e-next-13",
-    "e2e-vite-3",
    "bundlers-esbuild",
    "bundlers-vite",
    "bundlers-webpack",
@@ -3,4 +3,5 @@

 # used for unit tests that hit real IPFS gateway
 # get a secret key from https://thirdweb.com/create-api-key
-TW_SECRET_KEY=""
+# Learn more about API keys. https://portal.thirdweb.com/account/api-keys
+TW_SECRET_KEY=""
@@ -4,11 +4,11 @@ description: "Sets up Node.js and runs install"
 runs:
  using: composite
  steps:
-    - uses: pnpm/action-setup@v2
+    - uses: pnpm/action-setup@v3
      with:
        version: 8
    - name: Setup Node.js
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
      with:
        node-version: 20
        registry-url: "https://registry.npmjs.org"
@@ -22,13 +22,13 @@ We use [Turborepo](https://turborepo.org/docs/getting-started) to manage the mon

 You can see a quick outline of each of the projects within this repo below, each living within the [/packages](/packages) directory:

-| Package                        | Description                                                          | Latest Version                                                                                                                                                                   |
-| ------------------------------ | -------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| [/sdk](./packages/sdk)         | Best in class web3 SDK for Browser, Node and Mobile apps             | <a href="https://www.npmjs.com/package/@thirdweb-dev/sdk"><img src="https://img.shields.io/npm/v/@thirdweb-dev/sdk?color=red&label=npm&logo=npm" alt="npm version"/></a>         |
-| [/react](./packages/react)     | Ultimate collection of React hooks for your web3 apps                | <a href="https://www.npmjs.com/package/@thirdweb-dev/react"><img src="https://img.shields.io/npm/v/@thirdweb-dev/react?color=red&label=npm&logo=npm" alt="npm version"/></a>     |
-| [/auth](./packages/auth)       | Best in class wallet authentication for Node backends                | <a href="https://www.npmjs.com/package/@thirdweb-dev/auth"><img src="https://img.shields.io/npm/v/@thirdweb-dev/auth?color=red&label=npm&logo=npm" alt="npm version"/></a>       |
-| [/storage](./packages/storage) | Best in class decentralized storage SDK for Browser and Node         | <a href="https://www.npmjs.com/package/@thirdweb-dev/storage"><img src="https://img.shields.io/npm/v/@thirdweb-dev/storage?color=red&label=npm&logo=npm" alt="npm version"/></a> |
-| [/cli](./packages/cli)         | Publish and deploy smart contracts without dealing with private keys | <a href="https://www.npmjs.com/package/thirdweb"><img src="https://img.shields.io/npm/v/thirdweb?color=red&label=npm&logo=npm" alt="npm version"/></a>                           |
+| Package                               | Description                                                          | Latest Version                                                                                                                                                                   |
+| ------------------------------------- | -------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| [/sdk](./legacy_packages/sdk)         | Best in class web3 SDK for Browser, Node and Mobile apps             | <a href="https://www.npmjs.com/package/@thirdweb-dev/sdk"><img src="https://img.shields.io/npm/v/@thirdweb-dev/sdk?color=red&label=npm&logo=npm" alt="npm version"/></a>         |
+| [/react](./legacy_packages/react)     | Ultimate collection of React hooks for your web3 apps                | <a href="https://www.npmjs.com/package/@thirdweb-dev/react"><img src="https://img.shields.io/npm/v/@thirdweb-dev/react?color=red&label=npm&logo=npm" alt="npm version"/></a>     |
+| [/auth](./legacy_packages/auth)       | Best in class wallet authentication for Node backends                | <a href="https://www.npmjs.com/package/@thirdweb-dev/auth"><img src="https://img.shields.io/npm/v/@thirdweb-dev/auth?color=red&label=npm&logo=npm" alt="npm version"/></a>       |
+| [/storage](./legacy_packages/storage) | Best in class decentralized storage SDK for Browser and Node         | <a href="https://www.npmjs.com/package/@thirdweb-dev/storage"><img src="https://img.shields.io/npm/v/@thirdweb-dev/storage?color=red&label=npm&logo=npm" alt="npm version"/></a> |
+| [/cli](./legacy_packages/cli)         | Publish and deploy smart contracts without dealing with private keys | <a href="https://www.npmjs.com/package/thirdweb"><img src="https://img.shields.io/npm/v/thirdweb?color=red&label=npm&logo=npm" alt="npm version"/></a>                           |

 ## How to contribute

@@ -11,3 +11,9 @@ Short description of the bug fixed or feature added

 - [ ] Automated tests: link to unit test file
 - [ ] Manual tests: step by step instructions on how to test
+
+## Contributor NFT
+
+Paste in your wallet address below and we will airdrop you a special NFT when your pull request is merged. 
+
+```Address: ```
@@ -1,4 +1,4 @@
-name: Build, Lint & Test
+name: Build, Lint & Test & Benchmark

 on:
  push:
@@ -8,6 +8,7 @@ on:
  # trigger on merge group as well (merge queue)
  merge_group:
    types: [checks_requested]
+  workflow_dispatch:

 concurrency:
  group: ${{ github.workflow }}-${{ github.ref }}
@@ -27,14 +28,14 @@ jobs:

    steps:
      - name: Check out code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
        with:
          fetch-depth: 25

      - name: Setup bun
        uses: oven-sh/setup-bun@v1
        with:
-          bun-version: latest
+          bun-version: 1.0.35

      - name: Install
        uses: ./.github/composite-actions/install
@@ -45,7 +46,7 @@ jobs:
      - id: get-week
        run: echo "WEEK=$(date +%U)" >> $GITHUB_OUTPUT

-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
        timeout-minutes: 5
        id: cache-build
        with:
@@ -59,7 +60,7 @@ jobs:
    needs: build
    steps:
      - name: Setup node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
        with:
          node-version: 20
          check-latest: true
@@ -67,13 +68,13 @@ jobs:
      - name: Setup bun
        uses: oven-sh/setup-bun@v1
        with:
-          bun-version: latest
+          bun-version: 1.0.35

-      - uses: pnpm/action-setup@v2
+      - uses: pnpm/action-setup@v3
        with:
          version: 8

-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
        timeout-minutes: 5
        id: restore-build
        with:
@@ -89,7 +90,7 @@ jobs:
    needs: build
    steps:
      - name: Setup node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
        with:
          node-version: 20
          check-latest: true
@@ -98,25 +99,64 @@ jobs:
      - name: Setup bun
        uses: oven-sh/setup-bun@v1
        with:
-          bun-version: latest
+          bun-version: 1.0.35

-      - uses: pnpm/action-setup@v2
+      - uses: pnpm/action-setup@v3
        with:
          version: 8

-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
        timeout-minutes: 5
        id: restore-build
        with:
          path: ./*
          key: ${{ github.sha }}-${{ github.run_number }}

+      - name: Set up foundry
+        uses: foundry-rs/foundry-toolchain@v1
+
      - run: pnpm test

      - name: Upload coverage reports to Codecov
        uses: codecov/codecov-action@v3
        with:
-          files: ./packages/sdk/coverage/evm/lcov.info
+          files: ./packages/thirdweb/coverage/lcov.info
+
+  test_legacy:
+    timeout-minutes: 15
+    name: Unit Tests (Legacy)
+    runs-on: ubuntu-latest-16
+    needs: build
+    steps:
+      - name: Setup node
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          check-latest: true
+
+      # we use bun for some test suites
+      - name: Setup bun
+        uses: oven-sh/setup-bun@v1
+        with:
+          bun-version: 1.0.35
+
+      - uses: pnpm/action-setup@v3
+        with:
+          version: 8
+
+      - uses: actions/cache@v4
+        timeout-minutes: 5
+        id: restore-build
+        with:
+          path: ./*
+          key: ${{ github.sha }}-${{ github.run_number }}
+
+      - run: pnpm test:legacy
+
+      - name: Upload coverage reports to Codecov
+        uses: codecov/codecov-action@v3
+        with:
+          files: ./legacy_packages/sdk/coverage/evm/lcov.info

  e2e:
    timeout-minutes: 15
@@ -125,7 +165,7 @@ jobs:
    needs: build
    steps:
      - name: Setup node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
        with:
          node-version: 20
          check-latest: true
@@ -134,13 +174,13 @@ jobs:
      - name: Setup bun
        uses: oven-sh/setup-bun@v1
        with:
-          bun-version: latest
+          bun-version: 1.0.35

-      - uses: pnpm/action-setup@v2
+      - uses: pnpm/action-setup@v3
        with:
          version: 8

-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
        timeout-minutes: 5
        id: restore-build
        with:
@@ -155,3 +195,37 @@ jobs:
        env:
          NODE_OPTIONS: "--max_old_space_size=4096"
          CLI_E2E_API_KEY: ${{ secrets.CLI_E2E_API_KEY }}
+
+  benchmark:
+    # only run if is not merge_group
+    if: github.event_name != 'merge_group'
+    timeout-minutes: 15
+    name: "Benchmark"
+    runs-on: ubuntu-latest-16
+    needs: build
+    steps:
+      - name: Setup node
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          check-latest: true
+
+      - uses: pnpm/action-setup@v3
+        with:
+          version: 8
+
+      - uses: actions/cache@v4
+        timeout-minutes: 5
+        id: restore-build
+        with:
+          path: ./*
+          key: ${{ github.sha }}-${{ github.run_number }}
+
+      - name: Set up foundry
+        uses: foundry-rs/foundry-toolchain@v1
+
+      - name: Run benchmarks
+        uses: CodSpeedHQ/action@v2
+        with:
+          token: ${{ secrets.CODSPEED_TOKEN }}
+          run: "pnpm bench"
@@ -13,12 +13,12 @@ name: "CodeQL"

 on:
  push:
-    branches: [ "main" ]
+    branches: ["main"]
  pull_request:
    # The branches below must be a subset of the branches above
-    branches: [ "main" ]
+    branches: ["main"]
  schedule:
-    - cron: '37 9 * * 3'
+    - cron: "37 9 * * 3"

 jobs:
  analyze:
@@ -32,41 +32,40 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        language: [ 'javascript' ]
+        language: ["javascript"]
        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support

    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v3
+      - name: Checkout repository
+        uses: actions/checkout@v4

-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
-      with:
-        languages: ${{ matrix.language }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file.
-        # Prefix the list here with "+" to use these queries and those in the config file.
-        
-        # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
-        # queries: security-extended,security-and-quality
+      # Initializes the CodeQL tools for scanning.
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v2
+        with:
+          languages: ${{ matrix.language }}
+          # If you wish to specify custom queries, you can do so here or in a config file.
+          # By default, queries listed here will override any specified in a config file.
+          # Prefix the list here with "+" to use these queries and those in the config file.

-        
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+          # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+          # queries: security-extended,security-and-quality

-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+      # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+      # If this step fails, then you should remove it and run the build manually (see below)
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v2

-    #   If the Autobuild fails above, remove it and uncomment the following three lines. 
-    #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
+      # ℹ️ Command-line programs to run using the OS shell.
+      # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun

-    # - run: |
-    #   echo "Run, Build Application using script"
-    #   ./location_of_script_within_repo/buildscript.sh
+      #   If the Autobuild fails above, remove it and uncomment the following three lines.
+      #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.

-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      # - run: |
+      #   echo "Run, Build Application using script"
+      #   ./location_of_script_within_repo/buildscript.sh
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v2
@@ -1,17 +0,0 @@
-name: Dispatch Doc Generation
-
-on:
-  push:
-    branches:
-      - main
-
-jobs:
-  dispatch:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Repository Dispatch
-        uses: peter-evans/[email protected]
-        with:
-          token: ${{ secrets.REPO_ACCESS_TOKEN }}
-          repository: thirdweb-dev/docs
-          event-type: generate-docs
@@ -0,0 +1,75 @@
+# On the Version Packages branch
+# Generate and Commit the Typedoc JSON files and the Snippets JSON files
+
+name: Commit Release Artifacts
+
+on:
+  push:
+    branches:
+      - changeset-release/main
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  # cancel any previous runs if they were started before this one
+  cancel-in-progress: true
+
+env:
+  TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
+  TURBO_TEAM: ${{ secrets.TURBO_TEAM }}
+  TW_SECRET_KEY: ${{ secrets.TW_SECRET_KEY }}
+
+jobs:
+  release-artifacts:
+    timeout-minutes: 15
+    runs-on: ubuntu-latest-16
+    steps:
+      - name: Checkout branch
+        uses: actions/checkout@v4
+
+      # bun setup is required, because pnpm typdoc will run pnpm build and some packages uses bun for build
+      - name: Setup bun
+        uses: oven-sh/setup-bun@v1
+        with:
+          bun-version: 1.0.35
+
+      - name: Install
+        uses: ./.github/composite-actions/install
+
+      - name: Build
+        run: pnpm build
+
+      - name: Typedoc
+        run: pnpm typedoc
+
+      - name: Generate Docs
+        run: |
+          cd legacy_packages/sdk
+          pnpm generate-docs
+          cd ../react-core
+          pnpm generate-docs
+          cd ../react
+          pnpm generate-docs
+          cd ../..
+
+      - name: Generate Snippets
+        run: pnpm generate-snippets
+
+      - name: Commit changes
+        run: |
+          git config --local user.email "[email protected]"
+          git config --local user.name "GitHub Action"
+          git status
+          git add legacy_packages/react/typedoc/documentation.json.gz
+          git add legacy_packages/react-core/typedoc/documentation.json.gz
+          git add legacy_packages/react-native/typedoc/documentation.json.gz
+          git add legacy_packages/sdk/typedoc/documentation.json.gz
+          git add legacy_packages/storage/typedoc/documentation.json.gz
+          git add legacy_packages/wallets/typedoc/documentation.json.gz
+          git add packages/thirdweb/typedoc/documentation.json.gz
+          git add snippets/feature_snippets_react.json
+          git add snippets/feature_snippets_sdk.json
+          git add snippets/snippets.json
+          git commit -m "Commit Release Artifacts [skip ci]"
+          git push
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -1,47 +0,0 @@
-name: Release Next
-
-on:
-  push:
-    paths:
-      - ".changeset/**"
-      - "packages/**"
-    branches:
-      - next
-
-env:
-  TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
-  TURBO_TEAM: ${{ secrets.TURBO_TEAM }}
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-
-jobs:
-  release:
-    name: Release
-    timeout-minutes: 30
-    runs-on: ubuntu-latest-16
-    steps:
-      - name: Checkout branch
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      - name: Setup bun
-        uses: oven-sh/setup-bun@v1
-        with:
-          bun-version: latest
-
-      - name: Install
-        uses: ./.github/composite-actions/install
-
-      - name: Build
-        run: pnpm build
-
-      - name: Create @next release
-        run: |
-          git checkout next
-          pnpm version-packages:next
-          pnpm release:next
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -61,7 +61,7 @@ jobs:
          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"

      - name: pull the repo.
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
        with:
          persist-credentials: true
          repository: ${{ fromJson(steps.get_pull_request_ref.outputs.data).head.repo.full_name }}
@@ -70,7 +70,7 @@ jobs:
      - name: Setup bun
        uses: oven-sh/setup-bun@v1
        with:
-          bun-version: latest
+          bun-version: 1.0.35

      - name: Install
        uses: ./.github/composite-actions/install
@@ -1,3 +1,6 @@
+# Using CUSTOM_GITHUB_TOKEN instead of GITHUB_TOKEN is required to trigger workflows in "Version Packages" PR created by changesets/action
+# CUSTOM_GITHUB_TOKEN should be a PAT with write access to the repo and has to be created and set as a secret in the repo manually
+
 name: Release Nightly & Stable

 on:
@@ -5,6 +8,7 @@ on:
    paths:
      - ".changeset/**"
      - "packages/**"
+      - "legacy_packages/**"
    branches:
      - main

@@ -22,14 +26,16 @@ jobs:
    runs-on: ubuntu-latest-16
    steps:
      - name: Checkout branch
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
        with:
          fetch-depth: 0
+          # Do not use the GITHUB_TOKEN by default
+          token: ${{ secrets.CUSTOM_GITHUB_TOKEN }}

      - name: Setup bun
        uses: oven-sh/setup-bun@v1
        with:
-          bun-version: latest
+          bun-version: 1.0.35

      - name: Install
        uses: ./.github/composite-actions/install
@@ -46,7 +52,7 @@ jobs:
        env:
          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.CUSTOM_GITHUB_TOKEN }}

      - name: Create @nightly release
        if: steps.changesets.outputs.published != 'true'
@@ -56,4 +62,4 @@ jobs:
          pnpm release:nightly
        env:
          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.CUSTOM_GITHUB_TOKEN }}
@@ -14,18 +14,33 @@ jobs:

      - name: Install bun
        uses: oven-sh/setup-bun@v1
+        with:
+          bun-version: 1.0.35

      - name: Run chains sync
        run: bun run db:sync
-        working-directory: ./packages/chains
+        working-directory: ./legacy_packages/chains

      - name: Check for Changes
        id: git-check
        run: |
-          git diff --exit-code || echo "step.git-check.outputs.changes=true" >> $GITHUB_ENV
+          if git diff --quiet; then
+            echo "CHANGES_FOUND=false" >> $GITHUB_ENV
+          else
+            echo "CHANGES_FOUND=true" >> $GITHUB_ENV
+          fi
+
+      - name: Create or Update sync-chains.md
+        if: env.CHANGES_FOUND == 'true'
+        run: |
+          echo '---' > .changeset/sync-chains.md
+          echo '"@thirdweb-dev/chains": patch' >> .changeset/sync-chains.md
+          echo '---' >> .changeset/sync-chains.md
+          echo '' >> .changeset/sync-chains.md
+          echo 'Synced Chains Package' >> .changeset/sync-chains.md

      - name: Commit Changes
-        if: env.step.git-check.outputs.changes == 'true'
+        if: env.CHANGES_FOUND == 'true'
        run: |
          git config --local user.email "[email protected]"
          git config --local user.name "GitHub Action"
@@ -33,10 +48,10 @@ jobs:
          git commit -m "chore(chains): sync from db"

      - name: Create or Update Pull Request
-        if: env.step.git-check.outputs.changes == 'true'
+        if: env.CHANGES_FOUND == 'true'
        uses: peter-evans/create-pull-request@v3
        with:
          title: "chore(chains): update chains"
-          branch: "sync-chains" # You can specify a different branch name if you wish
+          branch: "sync-chains"
          body: "This PR was automatically created by a GitHub Action. It updates the chains package with the latest changes from the database."
          commit-message: "chore(chains): sync from db"
@@ -10,7 +10,7 @@ dist-ssr
 .cache
 server/dist
 public/dist
-./packages/contracts-js/abis
+./legacy_packages/contracts-js/abis
 .idea/
 .yalc/
 yalc.lock
@@ -20,6 +20,4 @@ playwright-report/
 .env/

 # Artifacts
-packages/cli/artifacts/
-
-typedoc
+legacy_packages/cli/artifacts/
@@ -1,11 +1,11 @@
 <p align="center">
    <br />
    <a href="https://thirdweb.com">
-        <img src="https://github.com/thirdweb-dev/js/blob/main/packages/sdk/logo.svg?raw=true" width="200" alt=""/></a>
+        <img src="https://github.com/thirdweb-dev/js/blob/main/legacy_packages/sdk/logo.svg?raw=true" width="200" alt=""/></a>
    <br />
 </p>

-<h1 align="center"><a href='https://thirdweb.com/'>thirdweb</a> JavaScript/TypeScript monorepo</h1>
+<h1 align="center"><a href='https://thirdweb.com/'>thirdweb</a> TypeScript SDK</h1>

 <p align="center">
    <a href="https://github.com/thirdweb-dev/js/actions/workflows/build-test-lint.yml">
@@ -16,38 +16,71 @@
    </a>
 </p>

-<p align="center"><strong>Best in class web3 SDKs for Browser, Node and Mobile apps</strong></p>
+<p align="center"><strong>All-in-one web3 SDK for Browser, Node and Mobile apps</strong></p>
+
+> [!IMPORTANT]  
+> We rewrote the thirdweb SDK from scratch for performance! Head over to the [v5 SDK](https://github.com/thirdweb-dev/js/tree/main/packages/thirdweb).
+
+## Features
+
+- Support for React & React-Native
+- First party support for [Embedded Wallets](https://portal.thirdweb.com/connect/embedded-wallet/overview) (social/email login)
+- First party support for [Account Abstraction](https://portal.thirdweb.com/connect/account-abstraction)
+- Instant connection to any chain with RPC Edge integration
+- Integrated IPFS upload/download
+- UI Components for connection, transactions, nft rendering
+- High level contract extensions for interacting with common standards
+- Automatic ABI resolution
+
+## Library Comparison
+
+|                                           | thirdweb | Wagmi              | Viem               | Ethers@6 |
+| ----------------------------------------- | -------- | ------------------ | ------------------ | -------- |
+| Type safe contract API                    | ✅       | ✅                 | ✅                 | ✅       |
+| Type safe wallet API                      | ✅       | ✅                 | ✅                 | ✅       |
+| EVM utils                                 | ✅       | ❌                 | ✅                 | ✅       |
+| RPC for any EVM                           | ✅       | ⚠️ public RPC only | ⚠️ public RPC only | ❌       |
+| Automatic ABI Resolution                  | ✅       | ❌                 | ❌                 | ❌       |
+| IPFS Upload/Download                      | ✅       | ❌                 | ❌                 | ❌       |
+| Embedded wallet (email/ social login)     | ✅       | ⚠️ via 3rd party   | ❌                 | ❌       |
+| Account abstraction (ERC4337) support     | ✅       | ⚠️ via 3rd party   | ⚠️ via 3rd party   | ❌       |
+| Web3 wallet connectors                    | ✅       | ✅                 | ❌                 | ❌       |
+| Local wallet creation                     | ✅       | ❌                 | ✅                 | ✅       |
+| Auth (SIWE)                               | ✅       | ⚠️ via 3rd party   | ❌                 | ❌       |
+| Extensions functions for common standards | ✅       | ❌                 | ❌                 | ❌       |
+| React Hooks                               | ✅       | ✅                 | ❌                 | ❌       |
+| React UI components                       | ✅       | ❌                 | ❌                 | ❌       |
+| React Native Hooks                        | ✅       | ❌                 | ❌                 | ❌       |
+| React Native UI Components                | ✅       | ❌                 | ❌                 | ❌       |

 ## Packages

-| Package                                  | Description                                                                 | Latest Version                                                                                                                                                                             |
-| ---------------------------------------- | --------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| [/sdk](./packages/sdk)                   | Best in class web3 SDK for Browser, Node and Mobile apps                    | <a href="https://www.npmjs.com/package/@thirdweb-dev/sdk"><img src="https://img.shields.io/npm/v/@thirdweb-dev/sdk?color=red&label=npm&logo=npm" alt="npm version"/></a>                   |
-| [/wallets](./packages/wallets)           | Unified web3 Wallet library to integrate any wallet into your applications. | <a href="https://www.npmjs.com/package/@thirdweb-dev/wallets"><img src="https://img.shields.io/npm/v/@thirdweb-dev/wallets?color=red&label=npm&logo=npm" alt="npm version"/></a>           |
-| [/react](./packages/react)               | Ultimate collection of React hooks for your web3 apps                       | <a href="https://www.npmjs.com/package/@thirdweb-dev/react"><img src="https://img.shields.io/npm/v/@thirdweb-dev/react?color=red&label=npm&logo=npm" alt="npm version"/></a>               |
-| [/react-native](./packages/react-native) | Ultimate collection of React hooks for your native mobile web3 apps         | <a href="https://www.npmjs.com/package/@thirdweb-dev/react-native"><img src="https://img.shields.io/npm/v/@thirdweb-dev/react-native?color=red&label=npm&logo=npm" alt="npm version"/></a> |
-| [/auth](./packages/auth)                 | Best in class wallet authentication for Node backends                       | <a href="https://www.npmjs.com/package/@thirdweb-dev/auth"><img src="https://img.shields.io/npm/v/@thirdweb-dev/auth?color=red&label=npm&logo=npm" alt="npm version"/></a>                 |
-| [/storage](./packages/storage)           | Best in class decentralized storage SDK for Browser and Node                | <a href="https://www.npmjs.com/package/@thirdweb-dev/storage"><img src="https://img.shields.io/npm/v/@thirdweb-dev/storage?color=red&label=npm&logo=npm" alt="npm version"/></a>           |
-| [/cli](./packages/cli)                   | Publish and deploy smart contracts without dealing with private keys        | <a href="https://www.npmjs.com/package/thirdweb"><img src="https://img.shields.io/npm/v/thirdweb?color=red&label=npm&logo=npm" alt="npm version"/></a>                                     |
-| [/chains](./packages/chains)             | All EVM chain information as JS objects for easy handling                   | <a href="https://www.npmjs.com/package/@thirdweb-dev/chains"><img src="https://img.shields.io/npm/v/@thirdweb-dev/chains?color=red&label=npm&logo=npm" alt="npm version"/></a>             |
-
-## Documentation
-
-Visit [https://portal.thirdweb.com/](https://portal.thirdweb.com/) to view the full documentation.
-
-<br />
+| Package                                         | Description                                                                 |
+| ----------------------------------------------- | --------------------------------------------------------------------------- |
+| [/sdk](./legacy_packages/sdk)                   | Best in class web3 SDK for Browser, Node and Mobile apps                    |
+| [/wallets](./legacy_packages/wallets)           | Unified web3 Wallet library to integrate any wallet into your applications. |
+| [/react](./legacy_packages/react)               | Ultimate collection of React hooks for your web3 apps                       |
+| [/react-native](./legacy_packages/react-native) | Ultimate collection of React hooks for your native mobile web3 apps         |
+| [/auth](./legacy_packages/auth)                 | Best in class wallet authentication for Node backends                       |
+| [/storage](./legacy_packages/storage)           | Best in class decentralized storage SDK for Browser and Node                |
+| [/cli](./legacy_packages/cli)                   | Publish and deploy smart contracts without dealing with private keys        |
+| [/chains](./legacy_packages/chains)             | All EVM chain information as JS objects for easy handling                   |

 ## Contributing

-We welcome contributions from all developers, regardless of experience level. If you are interested in contributing, please read our [Contributing Guide](.github/contributing.md) where you'll learn how the repo works, how to test your changes, and how to submit a pull request.
+We welcome contributions from all developers regardless of experience level. If you are interested in contributing, please read our [Contributing Guide](.github/contributing.md) to learn how the repo works, how to test your changes, and how to submit a pull request.

-<br />
+See our [open source page](https://thirdweb.com/open-source) for more information on our open-source bounties and program.

-## Community
+## Additional Resources

-The best place to discuss your ideas, ask questions, and troubleshoot issues is our [Discord server](https://discord.gg/thirdweb).
+- [SDK Documentation](https://portal.thirdweb.com/typescript/v5)
+- [Templates](https://thirdweb.com/templates)
+- [YouTube](https://www.youtube.com/c/thirdweb_)

-<br/>
+## Support
+
+For help or feedback, please [visit our support site](https://thirdweb.com/support)

 ## Security

@@ -1,5 +1,223 @@
 # @thirdweb-dev/auth

+## 4.1.52
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @thirdweb-dev/wallets@2.4.30
+
+## 4.1.51
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @thirdweb-dev/wallets@2.4.29
+
+## 4.1.50
+
+### Patch Changes
+
+- [#2577](https://github.com/thirdweb-dev/js/pull/2577) [`d93286b`](https://github.com/thirdweb-dev/js/commit/d93286bc1f8224d055b50ce3ffa4f302869cb2b1) Thanks [@jnsdls](https://github.com/jnsdls)! - update dependencies
+
+- Updated dependencies [[`d93286b`](https://github.com/thirdweb-dev/js/commit/d93286bc1f8224d055b50ce3ffa4f302869cb2b1)]:
+  - @thirdweb-dev/wallets@2.4.28
+
+## 4.1.49
+
+### Patch Changes
+
+- Updated dependencies [[`13f00cf`](https://github.com/thirdweb-dev/js/commit/13f00cf476b126683649a166e9e03b8e3f6599e4)]:
+  - @thirdweb-dev/wallets@2.4.27
+
+## 4.1.48
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @thirdweb-dev/wallets@2.4.26
+
+## 4.1.47
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @thirdweb-dev/wallets@2.4.25
+
+## 4.1.46
+
+### Patch Changes
+
+- Updated dependencies [[`79c9e13`](https://github.com/thirdweb-dev/js/commit/79c9e130fdc6e1f7de1486894a5ac3e6d6776fa4)]:
+  - @thirdweb-dev/wallets@2.4.24
+
+## 4.1.45
+
+### Patch Changes
+
+- Updated dependencies [[`802ba8c`](https://github.com/thirdweb-dev/js/commit/802ba8c5a980d3bddd308f9b3d14cc9cbb5453d5)]:
+  - @thirdweb-dev/wallets@2.4.23
+
+## 4.1.44
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @thirdweb-dev/wallets@2.4.22
+
+## 4.1.43
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @thirdweb-dev/wallets@2.4.21
+
+## 4.1.42
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @thirdweb-dev/wallets@2.4.20
+
+## 4.1.41
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @thirdweb-dev/wallets@2.4.19
+
+## 4.1.40
+
+### Patch Changes
+
+- Updated dependencies [[`cabfc29`](https://github.com/thirdweb-dev/js/commit/cabfc29119f25a78010f59f766bdcb8c392afa2d)]:
+  - @thirdweb-dev/wallets@2.4.18
+
+## 4.1.39
+
+### Patch Changes
+
+- Updated dependencies [[`c894270`](https://github.com/thirdweb-dev/js/commit/c894270401850575d1a4df73e16198177b46477a), [`332a145`](https://github.com/thirdweb-dev/js/commit/332a14552bf95e13e5220b1bd73414f000088568)]:
+  - @thirdweb-dev/wallets@2.4.17
+
+## 4.1.38
+
+### Patch Changes
+
+- [#2417](https://github.com/thirdweb-dev/js/pull/2417) [`862905e`](https://github.com/thirdweb-dev/js/commit/862905e161a091c15eb9b054cfcca0e5d2879fd6) Thanks [@jnsdls](https://github.com/jnsdls)! - make verify login payload be self-sufficient
+
+- Updated dependencies [[`862905e`](https://github.com/thirdweb-dev/js/commit/862905e161a091c15eb9b054cfcca0e5d2879fd6)]:
+  - @thirdweb-dev/wallets@2.4.16
+
+## 4.1.37
+
+### Patch Changes
+
+- Updated dependencies [[`74a92dc`](https://github.com/thirdweb-dev/js/commit/74a92dcb7dc4be7d03bcb8b7211e87016f52a81f)]:
+  - @thirdweb-dev/wallets@2.4.15
+
+## 4.1.36
+
+### Patch Changes
+
+- Updated dependencies [[`ab44b8f`](https://github.com/thirdweb-dev/js/commit/ab44b8f0ae760065f400f76d69703e26bcbcc022), [`f80f630`](https://github.com/thirdweb-dev/js/commit/f80f6307a3ebe1adaaf072dd2e02aecf83bfa43f)]:
+  - @thirdweb-dev/wallets@2.4.14
+
+## 4.1.35
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @thirdweb-dev/wallets@2.4.13
+
+## 4.1.34
+
+### Patch Changes
+
+- Updated dependencies [[`73e34c0`](https://github.com/thirdweb-dev/js/commit/73e34c083cd9c0d634e39657a4fad0f49f6fec89), [`e7528af`](https://github.com/thirdweb-dev/js/commit/e7528af48ff2dda622ed47074611499cfd66f819), [`10b71dd`](https://github.com/thirdweb-dev/js/commit/10b71dd7a0c6e91bb1ebe8250ca7fac7bac76635), [`bc198e2`](https://github.com/thirdweb-dev/js/commit/bc198e215e57094aac525b262fe91add4786df92)]:
+  - @thirdweb-dev/wallets@2.4.12
+
+## 4.1.33
+
+### Patch Changes
+
+- Updated dependencies [[`23820b2`](https://github.com/thirdweb-dev/js/commit/23820b277118ae0845d4f0189ac58ef4e75896ba), [`73a374a`](https://github.com/thirdweb-dev/js/commit/73a374aac25c2396dd2a895629737c6e8d024f45)]:
+  - @thirdweb-dev/wallets@2.4.11
+
+## 4.1.32
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @thirdweb-dev/wallets@2.4.10
+
+## 4.1.31
+
+### Patch Changes
+
+- [#2278](https://github.com/thirdweb-dev/js/pull/2278) [`0092e2a3`](https://github.com/thirdweb-dev/js/commit/0092e2a3177364ad26af15ecafb4381591dc9be1) Thanks [@hsynlms](https://github.com/hsynlms)! - fix(auth): Next.js App Router handler return type
+
+- Updated dependencies []:
+  - @thirdweb-dev/wallets@2.4.9
+
+## 4.1.30
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @thirdweb-dev/wallets@2.4.8
+
+## 4.1.29
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @thirdweb-dev/wallets@2.4.7
+
+## 4.1.28
+
+### Patch Changes
+
+- Updated dependencies [[`3ba15366`](https://github.com/thirdweb-dev/js/commit/3ba15366be8b57e577b871c44e386978dc9d4a8a)]:
+  - @thirdweb-dev/wallets@2.4.6
+
+## 4.1.27
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @thirdweb-dev/wallets@2.4.5
+
+## 4.1.26
+
+### Patch Changes
+
+- [#2106](https://github.com/thirdweb-dev/js/pull/2106) [`1a5d41cc`](https://github.com/thirdweb-dev/js/commit/1a5d41cc8afeef5f9882753473aad3bc0c7757ac) Thanks [@hsynlms](https://github.com/hsynlms)! - Add support for Next.js App Router
+
+- Updated dependencies [[`a5653f07`](https://github.com/thirdweb-dev/js/commit/a5653f07f82e3f94e193d2b90c9d0c163223583c), [`bf90fa50`](https://github.com/thirdweb-dev/js/commit/bf90fa5005358e040475627ae23a474f7b263803), [`6fdade6c`](https://github.com/thirdweb-dev/js/commit/6fdade6c45f5d93fb3571d33720ab8103a7d002c), [`4d89dc1e`](https://github.com/thirdweb-dev/js/commit/4d89dc1efa2412b1e121cd14b1e2e72c667fceb0)]:
+  - @thirdweb-dev/wallets@2.4.4
+
+## 4.1.25
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @thirdweb-dev/wallets@2.4.3
+
+## 4.1.24
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @thirdweb-dev/wallets@2.4.2
+
+## 4.1.23
+
+### Patch Changes
+
+- Updated dependencies [[`90a2f2d4`](https://github.com/thirdweb-dev/js/commit/90a2f2d435df796fa9cee4e78d540ecfa10d9166), [`27c00ef7`](https://github.com/thirdweb-dev/js/commit/27c00ef779fd6386b529598a65346bdd1d6ecc70)]:
+  - @thirdweb-dev/wallets@2.4.1
+
 ## 4.1.22

 ### Patch Changes
@@ -1,6 +1,6 @@
 <p align="center">
 <br />
-<a href="https://thirdweb.com"><img src="https://github.com/thirdweb-dev/js/blob/main/packages/sdk/logo.svg?raw=true" width="200" alt=""/></a>
+<a href="https://thirdweb.com"><img src="https://github.com/thirdweb-dev/js/blob/main/legacy_packages/sdk/logo.svg?raw=true" width="200" alt=""/></a>
 <br />
 </p>
 <h1 align="center">thirdweb Auth</h1>
@@ -1,6 +1,6 @@
 {
  "name": "@thirdweb-dev/auth",
-  "version": "4.1.22",
+  "version": "4.1.52",
  "main": "dist/thirdweb-dev-auth.cjs.js",
  "module": "dist/thirdweb-dev-auth.esm.js",
  "browser": {
@@ -51,7 +51,7 @@
    },
    "./package.json": "./package.json"
  },
-  "repository": "https://github.com/thirdweb-dev/js/tree/main/packages/auth",
+  "repository": "https://github.com/thirdweb-dev/js/tree/main/legacy_packages/auth",
  "author": "thirdweb eng <[email protected]>",
  "license": "Apache-2.0",
  "sideEffects": false,
@@ -61,7 +61,7 @@
    "lint": "eslint src/ && bunx publint --strict --level warning",
    "fix": "eslint src/ --fix",
    "clean": "rm -rf dist/ && rm -rf node_modules/",
-    "test": "mocha --config './test/.mocharc.json' --timeout 30000 --parallel './test/**/*.test.ts'",
+    "test": "vitest",
    "push": "yalc push"
  },
  "preconstruct": {
@@ -80,48 +80,37 @@
    }
  },
  "devDependencies": {
-    "@babel/core": "^7.22.9",
-    "@babel/preset-env": "^7.22.9",
-    "@babel/preset-typescript": "^7.22.5",
-    "@microsoft/api-documenter": "^7.22.30",
-    "@microsoft/api-extractor": "^7.36.3",
-    "@microsoft/tsdoc": "^0.14.1",
+    "@microsoft/api-documenter": "^7.24.1",
+    "@microsoft/api-extractor": "^7.43.0",
+    "@microsoft/tsdoc": "^0.14.2",
    "@preconstruct/cli": "2.7.0",
-    "@swc-node/register": "^1.6.6",
-    "@swc/core": "^1.3.71",
+    "@swc-node/register": "^1.9.0",
+    "@swc/core": "^1.4.11",
    "@thirdweb-dev/tsconfig": "workspace:*",
-    "@types/chai": "^4.3.5",
-    "@types/cookie": "^0.5.1",
-    "@types/cookie-parser": "^1.4.3",
-    "@types/express": "^4.17.13",
-    "@types/mocha": "^10.0.0",
-    "@types/uuid": "^9.0.5",
-    "@typescript-eslint/eslint-plugin": "^6.2.0",
-    "@typescript-eslint/parser": "^6.2.0",
-    "chai": "^4.3.6",
+    "@types/cookie": "^0.6.0",
+    "@types/cookie-parser": "^1.4.7",
+    "@types/express": "^4.17.21",
+    "@types/uuid": "^9.0.8",
    "cookie-parser": "^1.4.6",
-    "eslint": "^8.45.0",
-    "eslint-config-prettier": "^8.9.0",
+    "eslint": "^8.57.0",
    "eslint-config-thirdweb": "workspace:*",
-    "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-inclusive-language": "^2.2.0",
-    "eslint-plugin-prettier": "^5.0.0",
-    "eslint-plugin-tsdoc": "^0.2.16",
+    "eslint-plugin-import": "^2.29.1",
+    "eslint-plugin-inclusive-language": "^2.2.1",
+    "eslint-plugin-prettier": "^5.1.3",
+    "eslint-plugin-tsdoc": "^0.2.17",
    "ethers": "^5.7.2",
-    "express": "^4.18.1",
-    "fastify": "^4.24.2",
-    "mocha": "^10.2.0",
-    "next": "^12.3.4",
-    "next-auth": "^4.22.3",
-    "prettier": "^3.0.0",
-    "typescript": "^5.1.6"
+    "express": "^4.19.2",
+    "fastify": "^4.26.2",
+    "next": "^13.5.6",
+    "next-auth": "^4.24.7",
+    "typescript": "5.4.3"
  },
  "peerDependencies": {
    "cookie-parser": "^1.4.6",
    "ethers": "^5",
    "express": "^4",
-    "fastify": "^4.24.2",
-    "next": "^12 || ^13 || ^14",
+    "fastify": "^4.25.2",
+    "next": "^13.4 || ^14",
    "next-auth": "^4"
  },
  "peerDependenciesMeta": {
@@ -145,12 +134,12 @@
    }
  },
  "dependencies": {
-    "@fastify/cookie": "^9.1.0",
+    "@fastify/cookie": "^9.3.1",
    "@thirdweb-dev/wallets": "workspace:*",
-    "cookie": "^0.5.0",
+    "cookie": "^0.6.0",
    "fastify-type-provider-zod": "^1.1.9",
    "uuid": "^9.0.1",
-    "zod": "^3.22.3"
+    "zod": "^3.22.4"
  },
  "engines": {
    "node": ">=18"
@@ -23,14 +23,21 @@ import {
  AuthenticateOptionsWithOptionalDomain,
  AuthenticationPayload,
 } from "./schema/authenticate";
+import { ThirdwebAuthOptions } from "./types";

 export class ThirdwebAuth {
  private domain: string;
  private wallet: GenericAuthWallet;
+  private options: ThirdwebAuthOptions;

-  constructor(wallet: GenericAuthWallet, domain: string) {
+  constructor(
+    wallet: GenericAuthWallet,
+    domain: string,
+    options: ThirdwebAuthOptions = {},
+  ) {
    this.wallet = wallet;
    this.domain = domain;
+    this.options = options;
  }

  public updateWallet(wallet: GenericAuthWallet) {
@@ -66,9 +73,9 @@ export class ThirdwebAuth {
    options?: VerifyOptionsWithOptionalDomain,
  ): Promise<string> {
    return verifyLoginPayload({
-      wallet: this.wallet,
      payload,
      options: this.formatOptions(options),
+      clientOptions: this.options,
    });
  }

@@ -80,6 +87,7 @@ export class ThirdwebAuth {
      wallet: this.wallet,
      payload,
      options: this.formatOptions(options),
+      clientOptions: this.options,
    });
  }

@@ -99,6 +107,7 @@ export class ThirdwebAuth {
      wallet: this.wallet,
      jwt,
      options: this.formatOptions(options),
+      clientOptions: this.options,
    });
  }

@@ -14,6 +14,7 @@ import {
 import { GenerateOptionsSchema } from "../schema/generate";
 import { RefreshOptionsSchema } from "../schema/refresh";
 import { verifyLoginPayload } from "./login";
+import { verifySignature } from "./verify-signature";

 function isBrowser() {
  return typeof window !== "undefined";
@@ -71,15 +72,16 @@ export async function generateJWT({
  wallet,
  payload,
  options,
+  clientOptions,
 }: GenerateJwtParams): Promise<string> {
  const parsedOptions = GenerateOptionsSchema.parse(options);
  const userAddress = await verifyLoginPayload({
-    wallet,
    payload,
    options: {
      domain: parsedOptions.domain,
      ...parsedOptions.verifyOptions,
    },
+    clientOptions,
  });

  let session: Json | undefined = undefined;
@@ -156,6 +158,7 @@ export async function authenticateJWT<TSession extends Json = Json>({
  wallet,
  jwt,
  options,
+  clientOptions,
 }: AuthenticateJwtParams): Promise<User<TSession>> {
  const parsedOptions = AuthenticateOptionsSchema.parse(options);
  const { payload, signature } = parseJWT(jwt);
@@ -210,11 +213,13 @@ export async function authenticateJWT<TSession extends Json = Json>({
    }
  }

-  const verified = await wallet.verifySignature(
+  const verified = await verifySignature(
    JSON.stringify(payload),
    signature,
    issuerAddress,
    chainId,
+    clientOptions.clientId,
+    clientOptions.secretKey,
  );
  if (!verified) {
    throw new Error(
@@ -10,6 +10,7 @@ import {
  LoginPayloadDataSchema,
 } from "../schema/login";
 import { VerifyOptionsSchema } from "../schema/verify";
+import { verifySignature } from "./verify-signature";

 /**
 * Create an EIP-4361 & CAIP-122 compliant message to sign based on the login payload
@@ -113,18 +114,12 @@ export async function buildAndSignLoginPayload({
 }

 export async function verifyLoginPayload({
-  wallet,
  payload,
  options,
+  clientOptions,
 }: VerifyLoginPayloadParams): Promise<string> {
  const parsedOptions = VerifyOptionsSchema.parse(options);

-  if (payload.payload.type !== wallet.type) {
-    throw new Error(
-      `Expected chain type '${wallet.type}' does not match chain type on payload '${payload.payload.type}'`,
-    );
-  }
-
  // Check that the intended domain matches the domain of the payload
  if (payload.payload.domain !== parsedOptions.domain) {
    throw new Error(
@@ -204,16 +199,19 @@ export async function verifyLoginPayload({

  // Check that the signing address is the claimed wallet address
  const message = createLoginMessage(payload.payload);
-  const chainId =
-    wallet.type === "evm" && payload.payload.chain_id
-      ? parseInt(payload.payload.chain_id)
-      : undefined;
-  const verified = await wallet.verifySignature(
+  const chainId = payload.payload.chain_id
+    ? parseInt(payload.payload.chain_id)
+    : undefined;
+
+  const verified = await verifySignature(
    message,
    payload.signature,
    payload.payload.address,
    chainId,
+    clientOptions?.clientId,
+    clientOptions?.secretKey,
  );
+
  if (!verified) {
    throw new Error(
      `Signer address does not match payload address '${payload.payload.address.toLowerCase()}'`,
@@ -0,0 +1,35 @@
+import { checkContractWalletSignature } from "@thirdweb-dev/wallets";
+import { utils } from "ethers";
+
+export async function verifySignature(
+  message: string,
+  signature: string,
+  address: string,
+  chainId?: number,
+  clientId?: string,
+  secretKey?: string,
+): Promise<boolean> {
+  try {
+    const messageHash = utils.hashMessage(message);
+    const messageHashBytes = utils.arrayify(messageHash);
+    const recoveredAddress = utils.recoverAddress(messageHashBytes, signature);
+
+    if (recoveredAddress === address) {
+      return true;
+    }
+  } catch {
+    // no-op
+  }
+
+  if (!chainId) {
+    return false;
+  }
+  return checkContractWalletSignature(
+    message,
+    signature,
+    address,
+    chainId,
+    clientId,
+    secretKey,
+  );
+}
@@ -7,6 +7,7 @@ import {
 } from "./authenticate";
 import { RefreshOptions } from "./refresh";
 import { GenerateOptions } from "./generate";
+import { ThirdwebAuthOptions } from "../types";

 export type BuildLoginPayloadParams = {
  wallet: GenericAuthWallet;
@@ -19,9 +20,9 @@ export type SignLoginPayloadParams = {
 };

 export type VerifyLoginPayloadParams = {
-  wallet: GenericAuthWallet;
  payload: LoginPayload;
  options: VerifyOptions;
+  clientOptions: ThirdwebAuthOptions;
 };

 export type BuildJwtParams = {
@@ -33,6 +34,7 @@ export type GenerateJwtParams = {
  wallet: GenericAuthWallet;
  payload: LoginPayload;
  options: GenerateOptions;
+  clientOptions: ThirdwebAuthOptions;
 };

 export type RefreshJwtParams = {
@@ -45,4 +47,5 @@ export type AuthenticateJwtParams = {
  wallet: GenericAuthWallet;
  jwt: string;
  options: AuthenticateOptions;
+  clientOptions: ThirdwebAuthOptions;
 };
@@ -0,0 +1,4 @@
+export type ThirdwebAuthOptions = {
+  clientId?: string;
+  secretKey?: string;
+};
@@ -41,7 +41,7 @@ export function ThirdwebAuth<
 ): ThirdwebAuthReturnType<TData, TSession> {
  const ctx = {
    ...cfg,
-    auth: new ThirdwebAuthSDK(cfg.wallet, cfg.domain),
+    auth: new ThirdwebAuthSDK(cfg.wallet, cfg.domain, cfg.thirdwebAuthOptions),
  };

  const router = express.Router();
@@ -1,4 +1,5 @@
 import { ThirdwebAuth } from "../../core";
+import { ThirdwebAuthOptions } from "../../core/types";
 import { Json, LoginPayloadOutputSchema, User } from "../../core";
 import type { GenericAuthWallet } from "@thirdweb-dev/wallets";
 import { Request } from "express";
@@ -68,6 +69,7 @@ export type ThirdwebAuthConfig<
      | ((user: User, req: Request) => void)
      | ((user: User, req: Request) => Promise<void>);
  };
+  thirdwebAuthOptions?: ThirdwebAuthOptions;
 };

 export type ThirdwebAuthContext<
@@ -44,7 +44,7 @@ export function ThirdwebAuth<
 ): ThirdwebAuthReturnType<TData, TSession> {
  const ctx = {
    ...cfg,
-    auth: new ThirdwebAuthSDK(cfg.wallet, cfg.domain),
+    auth: new ThirdwebAuthSDK(cfg.wallet, cfg.domain, cfg.thirdwebAuthOptions),
  };

  const authRouter = async (
@@ -9,6 +9,7 @@ import {
 import { z } from "zod";
 import { IncomingMessage, ServerResponse } from "http";
 import { ZodTypeProvider } from "fastify-type-provider-zod";
+import { ThirdwebAuthOptions } from "../../core/types";

 export const PayloadBodySchema = z.object({
  address: z.string(),
@@ -76,6 +77,7 @@ export type ThirdwebAuthConfig<
      | ((user: User, req: FastifyRequest) => void)
      | ((user: User, req: FastifyRequest) => Promise<void>);
  };
+  thirdwebAuthOptions?: ThirdwebAuthOptions;
 };

 export type ThirdwebAuthContext<
@@ -0,0 +1,64 @@
+import type { GenericAuthWallet } from "@thirdweb-dev/wallets";
+import { z } from "zod";
+
+import { Json, LoginPayloadOutputSchema, User } from "../../core";
+import { ThirdwebAuthOptions } from "../../core/types";
+
+export const PayloadBodySchema = z.object({
+  address: z.string(),
+  chainId: z.string().optional(),
+});
+
+export const ActiveBodySchema = z.object({
+  address: z.string(),
+});
+
+export const LoginPayloadBodySchema = z.object({
+  payload: LoginPayloadOutputSchema,
+});
+
+export type ThirdwebAuthRoute =
+  | "payload"
+  | "login"
+  | "logout"
+  | "user"
+  | "switch-account";
+
+export type ThirdwebAuthUser<
+  TData extends Json = Json,
+  TSession extends Json = Json,
+> = User<TSession> & {
+  data?: TData;
+};
+
+export type ThirdwebAuthConfigShared = {
+  domain: string;
+  wallet: GenericAuthWallet;
+  authOptions?: {
+    statement?: string;
+    uri?: string;
+    version?: string;
+    chainId?: string;
+    resources?: string[];
+    validateNonce?:
+      | ((nonce: string) => void)
+      | ((nonce: string) => Promise<void>);
+    validateTokenId?:
+      | ((tokenId: string) => void)
+      | ((tokenId: string) => Promise<void>);
+    loginPayloadDurationInSeconds?: number;
+    tokenDurationInSeconds?: number;
+    refreshIntervalInSeconds?: number;
+  };
+  cookieOptions?: {
+    domain?: string;
+    path?: string;
+    sameSite?: "lax" | "strict" | "none";
+    secure?: boolean;
+  };
+  thirdwebAuthOptions?: ThirdwebAuthOptions;
+};
+
+export type ThirdwebNextContext = {
+  params?: Record<string, string | string[]>;
+};
@@ -0,0 +1,21 @@
+// Next.js Pages Router support
+// default and backward compatible
+export { ThirdwebAuth } from './router-pages'
+export type {
+  ThirdwebAuthConfig,
+  ThirdwebAuthContext,
+} from './router-pages/types'
+
+// Next.js App Router support
+export { ThirdwebAuth as ThirdwebAuthAppRouter } from './router-app'
+export type {
+  ThirdwebAuthConfig as ThirdwebAuthAppRouterConfig,
+  ThirdwebAuthContext as ThirdwebAuthAppRouterContext,
+} from './router-app/types'
+
+// common types
+export type {
+  ThirdwebAuthRoute,
+  ThirdwebAuthUser,
+  ThirdwebNextContext,
+} from './common/types'
@@ -0,0 +1,75 @@
+import { cookies, headers } from "next/headers";
+
+import {
+  THIRDWEB_AUTH_ACTIVE_ACCOUNT_COOKIE,
+  THIRDWEB_AUTH_TOKEN_COOKIE_PREFIX,
+} from "../../../constants";
+import type { Json } from "../../../core";
+import type { ThirdwebAuthUser } from "../../common/types";
+import type { ThirdwebAuthContext } from "../types";
+
+export function getCookie(cookie: string): string | undefined {
+  return cookies().get(cookie)?.value;
+}
+
+export function getActiveCookie(): string | undefined {
+  const activeAccount = getCookie(THIRDWEB_AUTH_ACTIVE_ACCOUNT_COOKIE);
+  if (activeAccount) {
+    return `${THIRDWEB_AUTH_TOKEN_COOKIE_PREFIX}_${activeAccount}`;
+  }
+
+  // If active account is not present, then use the old default
+  return THIRDWEB_AUTH_TOKEN_COOKIE_PREFIX;
+}
+
+export function getToken(): string | undefined {
+  const headerList = headers();
+
+  if (headerList.has("authorization")) {
+    const authorizationHeader = headerList.get("authorization")?.split(" ");
+    if (authorizationHeader?.length === 2) {
+      return authorizationHeader[1];
+    }
+  }
+
+  const activeCookie = getActiveCookie();
+  if (!activeCookie) {
+    return undefined;
+  }
+
+  return getCookie(activeCookie);
+}
+
+export async function getUser<
+  TData extends Json = Json,
+  TSession extends Json = Json,
+>(
+  ctx: ThirdwebAuthContext<TData, TSession>
+): Promise<ThirdwebAuthUser<TData, TSession> | null> {
+  const token = getToken();
+  if (!token) {
+    return null;
+  }
+
+  let authenticatedUser: ThirdwebAuthUser<TData, TSession>;
+  try {
+    authenticatedUser = await ctx.auth.authenticate<TSession>(token, {
+      validateTokenId: async (tokenId: string) => {
+        if (ctx.authOptions?.validateTokenId) {
+          await ctx.authOptions?.validateTokenId(tokenId);
+        }
+      },
+    });
+  } catch (err) {
+    return null;
+  }
+
+  if (ctx.callbacks?.onUser) {
+    const data = await ctx.callbacks.onUser(authenticatedUser);
+    if (data) {
+      return { ...authenticatedUser, data };
+    }
+  }
+
+  return authenticatedUser;
+}
@@ -0,0 +1,65 @@
+import type { NextRequest } from "next/server";
+
+import type { Json } from "../../core";
+import { ThirdwebAuth as ThirdwebAuthSDK } from "../../core";
+import { getUser } from "./helpers/user";
+import payloadHandler from "./routes/payload";
+import loginHandler from "./routes/login";
+import logoutHandler from "./routes/logout";
+import userHandler from "./routes/user";
+import switchAccountHandler from "./routes/switch-account";
+import type { ThirdwebAuthConfig, ThirdwebAuthContext } from "./types";
+import type { ThirdwebAuthRoute, ThirdwebNextContext } from "../common/types";
+
+export type { ThirdwebAuthConfig, ThirdwebAuthContext } from "./types";
+
+export async function ThirdwebAuthRouter(
+  req: NextRequest,
+  ctx: ThirdwebNextContext,
+  authCtx: ThirdwebAuthContext,
+) {
+  // Catch-all route must be named with [...thirdweb]
+  const action = ctx.params?.thirdweb?.[0] as ThirdwebAuthRoute;
+
+  switch (action) {
+    case "payload":
+      return await payloadHandler(req, authCtx);
+    case "login":
+      return await loginHandler(req, authCtx);
+    case "user":
+      return await userHandler(req, authCtx);
+    case "logout":
+      return await logoutHandler(req, authCtx);
+    case "switch-account":
+      return await switchAccountHandler(req, authCtx);
+    default:
+      return Response.json(
+        { message: "Invalid route for authentication." },
+        { status: 400 },
+      );
+  }
+}
+
+export function ThirdwebAuth<
+  TData extends Json = Json,
+  TSession extends Json = Json,
+>(cfg: ThirdwebAuthConfig<TData, TSession>) {
+  const authCtx = {
+    ...cfg,
+    auth: new ThirdwebAuthSDK(cfg.wallet, cfg.domain, cfg.thirdwebAuthOptions),
+  };
+
+  async function ThirdwebAuthHandler(
+    req: NextRequest,
+    ctx: ThirdwebNextContext,
+  ) {
+    return await ThirdwebAuthRouter(req, ctx, authCtx as ThirdwebAuthContext);
+  }
+
+  return {
+    ThirdwebAuthHandler,
+    getUser: async () => {
+      return await getUser<TData, TSession>(authCtx);
+    },
+  };
+}
@@ -0,0 +1,123 @@
+import type { NextRequest } from "next/server";
+import { NextResponse } from "next/server";
+
+import {
+  THIRDWEB_AUTH_ACTIVE_ACCOUNT_COOKIE,
+  THIRDWEB_AUTH_TOKEN_COOKIE_PREFIX,
+} from "../../../constants";
+import type { GenerateOptionsWithOptionalDomain } from "../../../core";
+import type { ThirdwebAuthContext } from "../types";
+import { LoginPayloadBodySchema } from "../types";
+
+export default async function handler(
+  req: NextRequest,
+  ctx: ThirdwebAuthContext,
+) {
+  if (req.method !== "POST") {
+    return Response.json(
+      { error: "Invalid method. Only POST supported" },
+      { status: 405 },
+    );
+  }
+
+  const reqBody = await req.json();
+  const parsedPayload = LoginPayloadBodySchema.safeParse(reqBody);
+
+  // Get signed login payload from the frontend
+  if (!parsedPayload.success) {
+    return Response.json(
+      { error: "Invalid login payload" },
+      { status: 400 },
+    );
+  }
+
+  const payload = parsedPayload.data.payload;
+
+  const validateNonce = async (nonce: string) => {
+    if (ctx.authOptions?.validateNonce) {
+      await ctx.authOptions?.validateNonce(nonce);
+    }
+  };
+
+  const getSession = async (address: string) => {
+    if (ctx.callbacks?.onLogin) {
+      return ctx.callbacks.onLogin(address);
+    }
+  };
+
+  const expirationTime = ctx.authOptions?.tokenDurationInSeconds
+    ? new Date(Date.now() + 1000 * ctx.authOptions.tokenDurationInSeconds)
+    : undefined;
+
+  const generateOptions: GenerateOptionsWithOptionalDomain = {
+    verifyOptions: {
+      statement: ctx.authOptions?.statement,
+      uri: ctx.authOptions?.uri,
+      version: ctx.authOptions?.version,
+      chainId: ctx.authOptions?.chainId,
+      validateNonce,
+      resources: ctx.authOptions?.resources,
+    },
+    expirationTime,
+    session: getSession,
+  };
+
+  let token: string;
+  try {
+    // Generate an access token with the SDK using the signed payload
+    token = await ctx.auth.generate(payload, generateOptions);
+  } catch (err: any) {
+    if (err.message) {
+      return Response.json(
+        { error: err.message },
+        { status: 400 },
+      );
+    } else if (typeof err === "string") {
+      return Response.json(
+        { error: err },
+        { status: 400 },
+      );
+    } else {
+      return Response.json(
+        { error: "Invalid login payload" },
+        { status: 400 },
+      );
+    }
+  }
+
+  if (ctx.callbacks?.onToken) {
+    await ctx.callbacks.onToken(token);
+  }
+
+  const {
+    payload: { exp },
+  } = ctx.auth.parseToken(token);
+
+  // Securely set httpOnly cookie on request to prevent XSS on frontend
+  // And set path to / to enable thirdweb_auth_token usage on all endpoints
+  const response = NextResponse.json({ token }, { status: 200 });
+  response.cookies.set({
+    name: `${THIRDWEB_AUTH_TOKEN_COOKIE_PREFIX}_${payload.payload.address}`,
+    value: token,
+    domain: ctx.cookieOptions?.domain,
+    path: ctx.cookieOptions?.path || "/",
+    sameSite: ctx.cookieOptions?.sameSite || "none",
+    expires: new Date(exp * 1000),
+    httpOnly: true,
+    secure: ctx.cookieOptions?.secure || true,
+  });
+
+  response.cookies.set({
+    name: THIRDWEB_AUTH_ACTIVE_ACCOUNT_COOKIE,
+    value: payload.payload.address,
+    domain: ctx.cookieOptions?.domain,
+    path: ctx.cookieOptions?.path || "/",
+    sameSite: ctx.cookieOptions?.sameSite || "none",
+    expires: new Date(exp * 1000),
+    httpOnly: true,
+    secure: ctx.cookieOptions?.secure || true,
+  });
+
+  // Send token in body and as cookie for frontend and backend use cases
+  return response;
+}
@@ -0,0 +1,51 @@
+import type { NextRequest } from "next/server";
+import { NextResponse } from "next/server";
+
+import { getActiveCookie, getUser } from "../helpers/user";
+import type { ThirdwebAuthContext } from "../types";
+
+export default async function handler(
+  req: NextRequest,
+  ctx: ThirdwebAuthContext,
+) {
+  if (req.method !== "POST") {
+    return Response.json(
+      { error: "Invalid method. Only POST supported" },
+      { status: 405 },
+    );
+  }
+
+  const activeCookie = getActiveCookie();
+  if (!activeCookie) {
+    return Response.json(
+      { error: "No logged in user to logout" },
+      { status: 400 },
+    );
+  }
+
+  if (ctx.callbacks?.onLogout) {
+    const user = await getUser(ctx);
+    if (user) {
+      await ctx.callbacks.onLogout(user);
+    }
+  }
+
+  // Set the access token to 'none' and expire in 5 seconds
+  const response = NextResponse.json(
+    { message: "Successfully logged out" },
+    { status: 200 },
+  );
+
+  response.cookies.set({
+    name: activeCookie,
+    value: '',
+    domain: ctx.cookieOptions?.domain,
+    path: ctx.cookieOptions?.path || "/",
+    sameSite: ctx.cookieOptions?.sameSite || "none",
+    expires: new Date(Date.now() + 5 * 1000),
+    httpOnly: true,
+    secure: ctx.cookieOptions?.secure || true,
+  });
+
+  return response;
+}
@@ -0,0 +1,44 @@
+import type { NextRequest } from "next/server";
+
+import type { ThirdwebAuthContext } from "../types";
+import { PayloadBodySchema } from "../types";
+
+export default async function handler(
+  req: NextRequest,
+  ctx: ThirdwebAuthContext,
+) {
+  if (req.method !== "POST") {
+    return Response.json(
+      { error: "Invalid method. Only POST supported" },
+      { status: 405 },
+    );
+  }
+
+  const reqBody = await req.json();
+  const parsedPayload = PayloadBodySchema.safeParse(reqBody);
+
+  if (!parsedPayload.success) {
+    return Response.json(
+      { error: "Please provide an address" },
+      { status: 400 },
+    );
+  }
+
+  // TODO: Add nonce generation + custom expiration + invalid before
+  const payload = await ctx.auth.payload({
+    address: parsedPayload.data.address,
+    statement: ctx.authOptions?.statement,
+    uri: ctx.authOptions?.uri,
+    version: ctx.authOptions?.version,
+    chainId: parsedPayload.data.chainId || ctx.authOptions?.chainId,
+    resources: ctx.authOptions?.resources,
+    expirationTime: ctx.authOptions?.loginPayloadDurationInSeconds
+      ? new Date(
+          Date.now() + 1000 * ctx.authOptions.loginPayloadDurationInSeconds,
+        )
+      : undefined,
+  });
+
+  const response = Response.json({ payload }, { status: 200 });
+  return response;
+}
@@ -0,0 +1,68 @@
+import type { NextRequest } from "next/server";
+import { NextResponse } from "next/server";
+
+import type { ThirdwebAuthContext } from "../types";
+import { ActiveBodySchema } from "../types";
+import {
+  THIRDWEB_AUTH_ACTIVE_ACCOUNT_COOKIE,
+  THIRDWEB_AUTH_DEFAULT_TOKEN_DURATION_IN_SECONDS,
+  THIRDWEB_AUTH_TOKEN_COOKIE_PREFIX,
+} from "../../../constants";
+import { getCookie } from "../helpers/user";
+
+export default async function handler(
+  req: NextRequest,
+  ctx: ThirdwebAuthContext,
+) {
+  if (req.method !== "POST") {
+    return Response.json(
+      { error: "Invalid method. Only POST supported" },
+      { status: 405 },
+    );
+  }
+
+  const reqBody = await req.json();
+  const parsedPayload = ActiveBodySchema.safeParse(reqBody);
+
+  if (!parsedPayload.success) {
+    return Response.json(
+      { error: "Please provide an address" },
+      { status: 400 },
+    );
+  }
+
+  let cookieExpiration: Date;
+
+  const cookie = getCookie(`${THIRDWEB_AUTH_TOKEN_COOKIE_PREFIX}_${parsedPayload.data.address}`);
+  if (cookie) {
+    // If the new account is already logged in, get the expiration time from the cookie
+    const {
+      payload: { exp },
+    } = ctx.auth.parseToken(cookie);
+    cookieExpiration = new Date(exp * 1000);
+  } else if (ctx.authOptions?.tokenDurationInSeconds) {
+    // Otherwise, if we have a token duration in seconds, set it to that
+    cookieExpiration = new Date(
+      Date.now() + 1000 * ctx.authOptions.tokenDurationInSeconds,
+    );
+  } else {
+    // Otherwise, just default to 24 hours
+    cookieExpiration = new Date(
+      Date.now() + 1000 * THIRDWEB_AUTH_DEFAULT_TOKEN_DURATION_IN_SECONDS,
+    );
+  }
+
+  const response = NextResponse.json('', { status: 200 });
+  response.cookies.set({
+    name: THIRDWEB_AUTH_ACTIVE_ACCOUNT_COOKIE,
+    value: parsedPayload.data.address,
+    domain: ctx.cookieOptions?.domain,
+    path: ctx.cookieOptions?.path || "/",
+    sameSite: ctx.cookieOptions?.sameSite || "none",
+    expires: cookieExpiration,
+    httpOnly: true,
+    secure: ctx.cookieOptions?.secure || true,
+  });
+
+  return response;
+}
@@ -0,0 +1,76 @@
+import type { NextRequest } from "next/server";
+import { NextResponse } from "next/server";
+
+import {
+  THIRDWEB_AUTH_ACTIVE_ACCOUNT_COOKIE,
+  THIRDWEB_AUTH_DEFAULT_REFRESH_INTERVAL_IN_SECONDS,
+  THIRDWEB_AUTH_TOKEN_COOKIE_PREFIX,
+} from "../../../constants";
+import { getToken, getUser } from "../helpers/user";
+import type { ThirdwebAuthContext } from "../types";
+
+export default async function handler(
+  req: NextRequest,
+  ctx: ThirdwebAuthContext,
+) {
+  if (req.method !== "GET") {
+    return Response.json(
+      { error: "Invalid method. Only GET supported" },
+      { status: 405 },
+    );
+  }
+
+  const user = await getUser(ctx);
+
+  const response = NextResponse.json(user, { status: 200 });
+
+  // Importantly, make sure the user was actually logged in before refreshing
+  if (user) {
+    const token = getToken();
+    if (token) {
+      const payload = ctx.auth.parseToken(token);
+
+      const refreshDate = ctx.authOptions?.refreshIntervalInSeconds
+        ? new Date(
+            payload.payload.iat * 1000 +
+              ctx.authOptions.refreshIntervalInSeconds * 1000,
+          )
+        : new Date(
+            payload.payload.iat * 1000 +
+              THIRDWEB_AUTH_DEFAULT_REFRESH_INTERVAL_IN_SECONDS * 1000,
+          );
+
+      if (new Date() > refreshDate) {
+        const expirationTime = ctx.authOptions?.tokenDurationInSeconds
+          ? new Date(Date.now() + 1000 * ctx.authOptions.tokenDurationInSeconds)
+          : undefined;
+        const refreshedToken = await ctx.auth.refresh(token, expirationTime);
+        const refreshedPayload = ctx.auth.parseToken(refreshedToken);
+
+        response.cookies.set({
+          name: `${THIRDWEB_AUTH_TOKEN_COOKIE_PREFIX}_${user.address}`,
+          value: refreshedToken,
+          domain: ctx.cookieOptions?.domain,
+          path: ctx.cookieOptions?.path || "/",
+          sameSite: ctx.cookieOptions?.sameSite || "none",
+          expires: new Date(refreshedPayload.payload.exp * 1000),
+          httpOnly: true,
+          secure: ctx.cookieOptions?.secure || true,
+        });
+
+        response.cookies.set({
+          name: THIRDWEB_AUTH_ACTIVE_ACCOUNT_COOKIE,
+          value: user.address,
+          domain: ctx.cookieOptions?.domain,
+          path: ctx.cookieOptions?.path || "/",
+          sameSite: ctx.cookieOptions?.sameSite || "none",
+          expires: new Date(refreshedPayload.payload.exp * 1000),
+          httpOnly: true,
+          secure: ctx.cookieOptions?.secure || true,
+        });
+      }
+    }
+  }
+
+  return response;
+}
@@ -0,0 +1,35 @@
+import type { Json, ThirdwebAuth, User } from "../../../core";
+import type { ThirdwebAuthConfigShared } from '../../common/types'
+
+export {
+  ActiveBodySchema,
+  LoginPayloadBodySchema,
+  PayloadBodySchema
+} from '../../common/types'
+
+export type ThirdwebAuthConfig<
+  TData extends Json = Json,
+  TSession extends Json = Json,
+> = ThirdwebAuthConfigShared & {
+  callbacks?: {
+    onLogin?:
+      | ((address: string) => void | TSession)
+      | ((address: string) => Promise<void | TSession>);
+    onToken?:
+      | ((token: string) => void)
+      | ((token: string) => Promise<void>);
+    onUser?:
+      | ((user: User<TSession>) => void | TData)
+      | ((user: User<TSession>) => Promise<void | TData>);
+    onLogout?:
+      | ((user: User) => void)
+      | ((user: User) => Promise<void>);
+  };
+};
+
+export type ThirdwebAuthContext<
+  TData extends Json = Json,
+  TSession extends Json = Json,
+> = Omit<Omit<ThirdwebAuthConfig<TData, TSession>, "wallet">, "domain"> & {
+  auth: ThirdwebAuth;
+};
@@ -1,18 +1,19 @@
 import {
  THIRDWEB_AUTH_ACTIVE_ACCOUNT_COOKIE,
  THIRDWEB_AUTH_TOKEN_COOKIE_PREFIX,
-} from "../../constants";
-import { Json } from "../../core";
-import { ThirdwebAuthContext, ThirdwebAuthUser } from "../types";
-import { GetServerSidePropsContext, NextApiRequest } from "next";
-import { NextRequest } from "next/server";
+} from "../../../constants";
+import type { Json } from "../../../core";
+import type { ThirdwebAuthContext } from "../types";
+import type { ThirdwebAuthUser } from "../../common/types";
+import type { GetServerSidePropsContext, NextApiRequest } from "next";
+import type { NextRequest } from "next/server";

 export function getCookie(
  req: GetServerSidePropsContext["req"] | NextRequest | NextApiRequest,
  cookie: string,
 ): string | undefined {
  if (typeof req.cookies.get === "function") {
-    return req.cookies.get(cookie);
+    return req.cookies.get(cookie)?.value;
  }

  return (req.cookies as any)[cookie];
@@ -1,4 +1,4 @@
-import { Json, ThirdwebAuth as ThirdwebAuthSDK } from "../core";
+import { Json, ThirdwebAuth as ThirdwebAuthSDK } from "../../core";
 import { getUser } from "./helpers/user";
 import payloadHandler from "./routes/payload";
 import loginHandler from "./routes/login";
@@ -52,7 +52,7 @@ export function ThirdwebAuth<
 >(cfg: ThirdwebAuthConfig<TData, TSession>) {
  const ctx = {
    ...cfg,
-    auth: new ThirdwebAuthSDK(cfg.wallet, cfg.domain),
+    auth: new ThirdwebAuthSDK(cfg.wallet, cfg.domain, cfg.thirdwebAuthOptions),
  };

  function ThirdwebAuthHandler(
@@ -1,11 +1,12 @@
 import {
  THIRDWEB_AUTH_ACTIVE_ACCOUNT_COOKIE,
  THIRDWEB_AUTH_TOKEN_COOKIE_PREFIX,
-} from "../../constants";
-import { GenerateOptionsWithOptionalDomain } from "../../core";
-import { LoginPayloadBodySchema, ThirdwebAuthContext } from "../types";
+} from "../../../constants";
+import type { GenerateOptionsWithOptionalDomain } from "../../../core";
+import type { ThirdwebAuthContext } from "../types";
+import { LoginPayloadBodySchema } from "../types";
 import { serialize } from "cookie";
-import { NextApiRequest, NextApiResponse } from "next";
+import type { NextApiRequest, NextApiResponse } from "next";

 export default async function handler(
  req: NextApiRequest,
@@ -1,7 +1,7 @@
 import { getActiveCookie, getUser } from "../helpers/user";
-import { ThirdwebAuthContext } from "../types";
+import type { ThirdwebAuthContext } from "../types";
 import { serialize } from "cookie";
-import { NextApiRequest, NextApiResponse } from "next";
+import type { NextApiRequest, NextApiResponse } from "next";

 export default async function handler(
  req: NextApiRequest,
@@ -10,14 +10,14 @@ export default async function handler(
 ) {
  if (req.method !== "POST") {
    return res.status(405).json({
-      error: "Invalid method. Only POST supported.",
+      error: "Invalid method. Only POST supported",
    });
  }

  const activeCookie = getActiveCookie(req);
  if (!activeCookie) {
    return res.status(400).json({
-      error: "No logged in user to logout.",
+      error: "No logged in user to logout",
    });
  }

@@ -1,5 +1,6 @@
-import { PayloadBodySchema, ThirdwebAuthContext } from "../types";
-import { NextApiRequest, NextApiResponse } from "next";
+import type { ThirdwebAuthContext } from "../types";
+import { PayloadBodySchema } from "../types";
+import type { NextApiRequest, NextApiResponse } from "next";

 export default async function handler(
  req: NextApiRequest,
@@ -8,7 +9,7 @@ export default async function handler(
 ) {
  if (req.method !== "POST") {
    return res.status(405).json({
-      error: "Invalid method. Only POST supported.",
+      error: "Invalid method. Only POST supported",
    });
  }

@@ -1,12 +1,13 @@
 import { serialize } from "cookie";
 import { getCookie } from "../helpers/user";
-import { ActiveBodySchema, ThirdwebAuthContext } from "../types";
-import { NextApiRequest, NextApiResponse } from "next";
+import type { ThirdwebAuthContext } from "../types";
+import { ActiveBodySchema } from "../types";
+import type { NextApiRequest, NextApiResponse } from "next";
 import {
  THIRDWEB_AUTH_ACTIVE_ACCOUNT_COOKIE,
  THIRDWEB_AUTH_DEFAULT_TOKEN_DURATION_IN_SECONDS,
  THIRDWEB_AUTH_TOKEN_COOKIE_PREFIX,
-} from "../../constants";
+} from "../../../constants";

 export default async function handler(
  req: NextApiRequest,
@@ -15,7 +16,7 @@ export default async function handler(
 ) {
  if (req.method !== "POST") {
    return res.status(405).json({
-      error: "Invalid method. Only POST supported.",
+      error: "Invalid method. Only POST supported",
    });
  }

@@ -3,10 +3,10 @@ import {
  THIRDWEB_AUTH_ACTIVE_ACCOUNT_COOKIE,
  THIRDWEB_AUTH_DEFAULT_REFRESH_INTERVAL_IN_SECONDS,
  THIRDWEB_AUTH_TOKEN_COOKIE_PREFIX,
-} from "../../constants";
+} from "../../../constants";
 import { getToken, getUser } from "../helpers/user";
-import { ThirdwebAuthContext } from "../types";
-import { NextApiRequest, NextApiResponse } from "next";
+import type { ThirdwebAuthContext } from "../types";
+import type { NextApiRequest, NextApiResponse } from "next";

 export default async function handler(
  req: NextApiRequest,
@@ -14,8 +14,8 @@ export default async function handler(
  ctx: ThirdwebAuthContext,
 ) {
  if (req.method !== "GET") {
-    return res.status(400).json({
-      error: "Invalid method. Only GET supported.",
+    return res.status(405).json({
+      error: "Invalid method. Only GET supported",
    });
  }

@@ -0,0 +1,48 @@
+import type { Json, ThirdwebAuth, User } from "../../../core";
+import type { GetServerSidePropsContext, NextApiRequest } from "next";
+import type { NextRequest } from "next/server";
+import type { ThirdwebAuthConfigShared } from '../../common/types'
+
+export {
+  ActiveBodySchema,
+  LoginPayloadBodySchema,
+  PayloadBodySchema
+} from '../../common/types'
+
+type RequestType =
+  | GetServerSidePropsContext["req"]
+  | NextRequest
+  | NextApiRequest;
+
+export type ThirdwebAuthConfig<
+  TData extends Json = Json,
+  TSession extends Json = Json,
+> = ThirdwebAuthConfigShared & {
+  callbacks?: {
+    onLogin?:
+      | ((address: string, req: NextApiRequest) => void | TSession)
+      | ((address: string, req: NextApiRequest) => Promise<void | TSession>);
+    onToken?:
+      | ((token: string, req: NextApiRequest) => void)
+      | ((token: string, req: NextApiRequest) => Promise<void>);
+    onUser?:
+      | (<TRequestType extends RequestType = RequestType>(
+          user: User<TSession>,
+          req: TRequestType,
+        ) => void | TData)
+      | (<TRequestType extends RequestType = RequestType>(
+          user: User<TSession>,
+          req: TRequestType,
+        ) => Promise<void | TData>);
+    onLogout?:
+      | ((user: User, req: NextApiRequest) => void)
+      | ((user: User, req: NextApiRequest) => Promise<void>);
+  };
+};
+
+export type ThirdwebAuthContext<
+  TData extends Json = Json,
+  TSession extends Json = Json,
+> = Omit<Omit<ThirdwebAuthConfig<TData, TSession>, "wallet">, "domain"> & {
+  auth: ThirdwebAuth;
+};
@@ -0,0 +1,384 @@
+import { ThirdwebAuth } from "../src/core";
+import { EthersWallet } from "@thirdweb-dev/wallets/evm/wallets/ethers";
+import { Wallet } from "ethers";
+import { describe, it, beforeAll, beforeEach, expect } from "vitest";
+
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+require("dotenv-mono").load();
+
+describe(
+  "Wallet Authentication - EVM",
+  {
+    timeout: 60000,
+  },
+  async () => {
+    let adminWallet: any, signerWallet: any, attackerWallet: any;
+    let auth: ThirdwebAuth;
+
+    beforeAll(async () => {
+      const [adminSigner, signerSigner, attackerSigner] = [
+        Wallet.createRandom(),
+        Wallet.createRandom(),
+        Wallet.createRandom(),
+      ];
+
+      adminWallet = new EthersWallet(adminSigner);
+      signerWallet = new EthersWallet(signerSigner);
+      attackerWallet = new EthersWallet(attackerSigner);
+
+      auth = new ThirdwebAuth(signerWallet, "thirdweb.com", {
+        secretKey: process.env.TW_SECRET_KEY,
+      });
+    });
+
+    beforeEach(async () => {
+      auth.updateWallet(signerWallet);
+    });
+
+    it("Should verify logged in wallet", async () => {
+      const payload = await auth.login();
+
+      auth.updateWallet(adminWallet);
+      const address = await auth.verify(payload);
+
+      expect(address).to.equal(await signerWallet.getAddress());
+    });
+
+    it("Should verify logged in wallet with chain ID and expiration", async () => {
+      const payload = await auth.login({
+        expirationTime: new Date(Date.now() + 1000 * 60 * 5),
+        chainId: "137",
+      });
+
+      auth.updateWallet(adminWallet);
+      const address = await auth.verify(payload, {
+        chainId: "137",
+      });
+
+      expect(address).to.equal(await signerWallet.getAddress());
+    });
+
+    it("Should verify payload with resources", async () => {
+      const payload = await auth.login({
+        resources: ["https://example.com", "https://test.com"],
+      });
+
+      auth.updateWallet(adminWallet);
+      const address = await auth.verify(payload, {
+        resources: ["https://example.com", "https://test.com"],
+      });
+
+      expect(address).to.equal(await signerWallet.getAddress());
+    });
+
+    it("Should reject payload without necessary resources", async () => {
+      const payload = await auth.login({
+        resources: ["https://example.com"],
+      });
+
+      auth.updateWallet(adminWallet);
+      try {
+        await auth.verify(payload, {
+          resources: ["https://example.com", "https://test.com"],
+        });
+        expect.fail();
+      } catch (err: any) {
+        expect(err.message).to.equal(
+          "Login request is missing required resources: https://test.com",
+        );
+      }
+    });
+
+    it("Should verify payload with customized statement", async () => {
+      const payload = await auth.login({
+        statement: "Please sign!",
+      });
+
+      auth.updateWallet(adminWallet);
+      const address = await auth.verify(payload, {
+        statement: "Please sign!",
+      });
+
+      expect(address).to.equal(await signerWallet.getAddress());
+    });
+
+    it("Should reject payload with incorrect statement", async () => {
+      const payload = await auth.login({
+        statement: "Please sign!",
+      });
+
+      auth.updateWallet(adminWallet);
+      try {
+        await auth.verify(payload, {
+          statement: "Please sign again!",
+        });
+        expect.fail();
+      } catch (err: any) {
+        expect(err.message).to.include(
+          "Expected statement 'Please sign again!' does not match statement on payload",
+        );
+      }
+    });
+
+    it("Should reject invalid nonce", async () => {
+      const payload = await auth.login();
+
+      auth.updateWallet(adminWallet);
+      try {
+        await auth.verify(payload, {
+          validateNonce: (nonce: string) => {
+            if (nonce === payload.payload.nonce) {
+              throw new Error();
+            }
+          },
+        });
+        expect.fail();
+      } catch (err: any) {
+        expect(err.message).to.equal("Login request nonce is invalid");
+      }
+    });
+
+    it("Should accept valid nonce", async () => {
+      const payload = await auth.login();
+
+      auth.updateWallet(adminWallet);
+      const address = await auth.verify(payload, {
+        validateNonce: (nonce: string) => {
+          if (nonce !== payload.payload.nonce) {
+            throw new Error();
+          }
+        },
+      });
+
+      expect(address).to.equal(await signerWallet.getAddress());
+    });
+
+    it("Should reject payload with incorrect domain", async () => {
+      const payload = await auth.login();
+
+      auth.updateWallet(adminWallet);
+      try {
+        await auth.verify(payload, { domain: "test.thirdweb.com" });
+        expect.fail();
+      } catch (err: any) {
+        expect(err.message).to.equal(
+          "Expected domain 'test.thirdweb.com' does not match domain on payload 'thirdweb.com'",
+        );
+      }
+    });
+
+    it("Should reject expired login payload", async () => {
+      const payload = await auth.login({
+        expirationTime: new Date(Date.now() - 1000 * 60 * 5),
+      });
+
+      auth.updateWallet(adminWallet);
+      try {
+        await auth.verify(payload);
+        expect.fail();
+      } catch (err: any) {
+        expect(err.message).to.equal("Login request has expired");
+      }
+    });
+
+    it("Should reject payload with incorrect chain ID", async () => {
+      const payload = await auth.login({
+        chainId: "1",
+      });
+
+      auth.updateWallet(adminWallet);
+      try {
+        await auth.verify(payload, {
+          chainId: "137",
+        });
+        expect.fail();
+      } catch (err: any) {
+        expect(err.message).to.equal(
+          "Expected chain ID '137' does not match chain ID on payload '1'",
+        );
+      }
+    });
+
+    it("Should reject payload with incorrect signer", async () => {
+      const payload = await auth.login();
+      payload.payload.address = await attackerWallet.getAddress();
+
+      auth.updateWallet(adminWallet);
+      try {
+        await auth.verify(payload);
+        expect.fail();
+      } catch (err: any) {
+        expect(err.message).to.contain("does not match payload address");
+      }
+    });
+
+    it("Should generate valid authentication token", async () => {
+      const payload = await auth.login();
+
+      auth.updateWallet(adminWallet);
+      const token = await auth.generate(payload);
+      const user = await auth.authenticate(token);
+
+      expect(user.address).to.equal(await signerWallet.getAddress());
+    });
+
+    it("Should reject token with incorrect domain", async () => {
+      const payload = await auth.login();
+
+      auth.updateWallet(adminWallet);
+      const token = await auth.generate(payload);
+
+      try {
+        await auth.authenticate(token, { domain: "test.thirdweb.com" });
+        expect.fail();
+      } catch (err: any) {
+        expect(err.message).to.contain(
+          "Expected token to be for the domain 'test.thirdweb.com', but found token with domain 'thirdweb.com'",
+        );
+      }
+    });
+
+    it("Should reject token before invalid before", async () => {
+      const payload = await auth.login();
+
+      auth.updateWallet(adminWallet);
+      const token = await auth.generate(payload, {
+        invalidBefore: new Date(Date.now() + 1000 * 60 * 5),
+      });
+
+      try {
+        await auth.authenticate(token);
+        expect.fail();
+      } catch (err: any) {
+        expect(err.message).to.contain("This token is invalid before");
+      }
+    });
+
+    it("Should reject expired authentication token", async () => {
+      const payload = await auth.login();
+
+      auth.updateWallet(adminWallet);
+      const token = await auth.generate(payload, {
+        expirationTime: new Date(Date.now() - 1000 * 60 * 5),
+      });
+
+      try {
+        await auth.authenticate(token);
+        expect.fail();
+      } catch (err: any) {
+        expect(err.message).to.contain("This token expired");
+      }
+    });
+
+    it("Should reject if admin address is not connected wallet address", async () => {
+      const payload = await auth.login();
+
+      auth.updateWallet(adminWallet);
+      const token = await auth.generate(payload);
+
+      auth.updateWallet(signerWallet);
+      try {
+        await auth.authenticate(token);
+        expect.fail();
+      } catch (err: any) {
+        expect(err.message).to.contain(
+          `The expected issuer address '${await signerWallet.getAddress()}' did not match the token issuer address '${await adminWallet.getAddress()}'`,
+        );
+      }
+    });
+
+    it("Should accept token with valid token ID", async () => {
+      const payload = await auth.login();
+
+      auth.updateWallet(adminWallet);
+      const token = await auth.generate(payload, {
+        tokenId: "test",
+      });
+
+      const user = await auth.authenticate(token, {
+        validateTokenId: (tokenId: string) => {
+          if (tokenId !== "test") {
+            throw new Error();
+          }
+        },
+      });
+
+      expect(user.address).to.equal(await signerWallet.getAddress());
+    });
+
+    it("Should reject token with invalid token ID", async () => {
+      const payload = await auth.login();
+
+      auth.updateWallet(adminWallet);
+      const token = await auth.generate(payload, {
+        tokenId: "test",
+      });
+
+      try {
+        await auth.authenticate(token, {
+          validateTokenId: (tokenId: string) => {
+            if (tokenId !== "invalid") {
+              throw new Error();
+            }
+          },
+        });
+        expect.fail();
+      } catch (err: any) {
+        expect(err.message).to.contain("Token ID is invalid");
+      }
+    });
+
+    it("Should propagate session on token", async () => {
+      const payload = await auth.login();
+
+      auth.updateWallet(adminWallet);
+      const token = await auth.generate(payload, {
+        session: { role: "admin" },
+      });
+
+      const user = await auth.authenticate(token);
+
+      expect(user.address).to.equal(await signerWallet.getAddress());
+      expect(user.session).to.deep.equal({ role: "admin" });
+    });
+
+    it("Should call session callback function", async () => {
+      const payload = await auth.login();
+
+      auth.updateWallet(adminWallet);
+      const token = await auth.generate(payload, {
+        session: (address: string) => {
+          return { address, role: "admin" };
+        },
+      });
+
+      const user = await auth.authenticate(token);
+
+      expect(user.address).to.equal(await signerWallet.getAddress());
+      expect(user.session).to.deep.equal({
+        address: await signerWallet.getAddress(),
+        role: "admin",
+      });
+    });
+
+    it("Should authenticate with issuer address", async () => {
+      const payload = await auth.login();
+
+      auth.updateWallet(adminWallet);
+      const token = await auth.generate(payload);
+
+      auth.updateWallet(attackerWallet);
+      try {
+        await auth.authenticate(token);
+        expect.fail();
+      } catch (err: any) {
+        expect(err.message).to.contain("The expected issuer address");
+      }
+
+      const user = await auth.authenticate(token, {
+        issuerAddress: await adminWallet.getAddress(),
+      });
+      expect(user.address).to.equal(await signerWallet.getAddress());
+    });
+  },
+);
@@ -0,0 +1,391 @@
+import { LocalWallet, SmartWallet } from "@thirdweb-dev/wallets";
+import { ThirdwebAuth } from "../src/core";
+import { EthersWallet } from "@thirdweb-dev/wallets/evm/wallets/ethers";
+import { Wallet } from "ethers";
+import { describe, it, beforeEach, beforeAll, expect } from "vitest";
+
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+require("dotenv-mono").load();
+
+describe(
+  "Wallet Authentication - EVM - Smart Wallet",
+  {
+    timeout: 60000,
+  },
+  async () => {
+    let adminWallet: any, signerWallet: any, attackerWallet: any;
+    let auth: ThirdwebAuth;
+
+    beforeAll(async () => {
+      const factoryAddress = "0xbf1C9aA4B1A085f7DA890a44E82B0A1289A40052";
+      const chain = 421614;
+      const localWallet = new LocalWallet();
+      await localWallet.generate();
+      const smartWallet = new SmartWallet({
+        chain: chain,
+        factoryAddress: factoryAddress,
+        gasless: true,
+        secretKey: process.env.TW_SECRET_KEY,
+      });
+      await smartWallet.connect({ personalWallet: localWallet });
+
+      adminWallet = new EthersWallet(Wallet.createRandom());
+      signerWallet = smartWallet;
+      attackerWallet = new EthersWallet(Wallet.createRandom());
+
+      auth = new ThirdwebAuth(signerWallet, "thirdweb.com", {
+        secretKey: process.env.TW_SECRET_KEY,
+      });
+    });
+
+    beforeEach(async () => {
+      auth.updateWallet(signerWallet);
+    });
+
+    it("Should verify logged in wallet", async () => {
+      const payload = await auth.login();
+
+      auth.updateWallet(adminWallet);
+      const address = await auth.verify(payload);
+
+      expect(address).to.equal(await signerWallet.getAddress());
+    });
+
+    it("Should verify logged in wallet with chain ID and expiration", async () => {
+      const payload = await auth.login({
+        expirationTime: new Date(Date.now() + 1000 * 60 * 5),
+        chainId: "421614",
+      });
+
+      auth.updateWallet(adminWallet);
+      const address = await auth.verify(payload, {
+        chainId: "421614",
+      });
+
+      expect(address).to.equal(await signerWallet.getAddress());
+    });
+
+    it("Should verify payload with resources", async () => {
+      const payload = await auth.login({
+        resources: ["https://example.com", "https://test.com"],
+      });
+
+      auth.updateWallet(adminWallet);
+      const address = await auth.verify(payload, {
+        resources: ["https://example.com", "https://test.com"],
+      });
+
+      expect(address).to.equal(await signerWallet.getAddress());
+    });
+
+    it("Should reject payload without necessary resources", async () => {
+      const payload = await auth.login({
+        resources: ["https://example.com"],
+      });
+
+      auth.updateWallet(adminWallet);
+      try {
+        await auth.verify(payload, {
+          resources: ["https://example.com", "https://test.com"],
+        });
+        expect.fail();
+      } catch (err: any) {
+        expect(err.message).to.equal(
+          "Login request is missing required resources: https://test.com",
+        );
+      }
+    });
+
+    it("Should verify payload with customized statement", async () => {
+      const payload = await auth.login({
+        statement: "Please sign!",
+      });
+
+      auth.updateWallet(adminWallet);
+      const address = await auth.verify(payload, {
+        statement: "Please sign!",
+      });
+
+      expect(address).to.equal(await signerWallet.getAddress());
+    });
+
+    it("Should reject payload with incorrect statement", async () => {
+      const payload = await auth.login({
+        statement: "Please sign!",
+      });
+
+      auth.updateWallet(adminWallet);
+      try {
+        await auth.verify(payload, {
+          statement: "Please sign again!",
+        });
+        expect.fail();
+      } catch (err: any) {
+        expect(err.message).to.include(
+          "Expected statement 'Please sign again!' does not match statement on payload",
+        );
+      }
+    });
+
+    it("Should reject invalid nonce", async () => {
+      const payload = await auth.login();
+
+      auth.updateWallet(adminWallet);
+      try {
+        await auth.verify(payload, {
+          validateNonce: (nonce: string) => {
+            if (nonce === payload.payload.nonce) {
+              throw new Error();
+            }
+          },
+        });
+        expect.fail();
+      } catch (err: any) {
+        expect(err.message).to.equal("Login request nonce is invalid");
+      }
+    });
+
+    it("Should accept valid nonce", async () => {
+      const payload = await auth.login();
+
+      auth.updateWallet(adminWallet);
+      const address = await auth.verify(payload, {
+        validateNonce: (nonce: string) => {
+          if (nonce !== payload.payload.nonce) {
+            throw new Error();
+          }
+        },
+      });
+
+      expect(address).to.equal(await signerWallet.getAddress());
+    });
+
+    it("Should reject payload with incorrect domain", async () => {
+      const payload = await auth.login();
+
+      auth.updateWallet(adminWallet);
+      try {
+        await auth.verify(payload, { domain: "test.thirdweb.com" });
+        expect.fail();
+      } catch (err: any) {
+        expect(err.message).to.equal(
+          "Expected domain 'test.thirdweb.com' does not match domain on payload 'thirdweb.com'",
+        );
+      }
+    });
+
+    it("Should reject expired login payload", async () => {
+      const payload = await auth.login({
+        expirationTime: new Date(Date.now() - 1000 * 60 * 5),
+      });
+
+      auth.updateWallet(adminWallet);
+      try {
+        await auth.verify(payload);
+        expect.fail();
+      } catch (err: any) {
+        expect(err.message).to.equal("Login request has expired");
+      }
+    });
+
+    it("Should reject payload with incorrect chain ID", async () => {
+      const payload = await auth.login({
+        chainId: "1",
+      });
+
+      auth.updateWallet(adminWallet);
+      try {
+        await auth.verify(payload, {
+          chainId: "137",
+        });
+        expect.fail();
+      } catch (err: any) {
+        expect(err.message).to.equal(
+          "Expected chain ID '137' does not match chain ID on payload '1'",
+        );
+      }
+    });
+
+    it("Should reject payload with incorrect signer", async () => {
+      const payload = await auth.login();
+      payload.payload.address = await attackerWallet.getAddress();
+
+      auth.updateWallet(adminWallet);
+      try {
+        await auth.verify(payload);
+        expect.fail();
+      } catch (err: any) {
+        expect(err.message).to.contain("does not match payload address");
+      }
+    });
+
+    it("Should generate valid authentication token", async () => {
+      const payload = await auth.login();
+
+      auth.updateWallet(adminWallet);
+      const token = await auth.generate(payload);
+      const user = await auth.authenticate(token);
+
+      expect(user.address).to.equal(await signerWallet.getAddress());
+    });
+
+    it("Should reject token with incorrect domain", async () => {
+      const payload = await auth.login();
+
+      auth.updateWallet(adminWallet);
+      const token = await auth.generate(payload);
+
+      try {
+        await auth.authenticate(token, { domain: "test.thirdweb.com" });
+        expect.fail();
+      } catch (err: any) {
+        expect(err.message).to.contain(
+          "Expected token to be for the domain 'test.thirdweb.com', but found token with domain 'thirdweb.com'",
+        );
+      }
+    });
+
+    it("Should reject token before invalid before", async () => {
+      const payload = await auth.login();
+
+      auth.updateWallet(adminWallet);
+      const token = await auth.generate(payload, {
+        invalidBefore: new Date(Date.now() + 1000 * 60 * 5),
+      });
+
+      try {
+        await auth.authenticate(token);
+        expect.fail();
+      } catch (err: any) {
+        expect(err.message).to.contain("This token is invalid before");
+      }
+    });
+
+    it("Should reject expired authentication token", async () => {
+      const payload = await auth.login();
+
+      auth.updateWallet(adminWallet);
+      const token = await auth.generate(payload, {
+        expirationTime: new Date(Date.now() - 1000 * 60 * 5),
+      });
+
+      try {
+        await auth.authenticate(token);
+        expect.fail();
+      } catch (err: any) {
+        expect(err.message).to.contain("This token expired");
+      }
+    });
+
+    it("Should reject if admin address is not connected wallet address", async () => {
+      const payload = await auth.login();
+
+      auth.updateWallet(adminWallet);
+      const token = await auth.generate(payload);
+
+      auth.updateWallet(signerWallet);
+      try {
+        await auth.authenticate(token);
+        expect.fail();
+      } catch (err: any) {
+        expect(err.message).to.contain(
+          `The expected issuer address '${await signerWallet.getAddress()}' did not match the token issuer address '${await adminWallet.getAddress()}'`,
+        );
+      }
+    });
+
+    it("Should accept token with valid token ID", async () => {
+      const payload = await auth.login();
+
+      auth.updateWallet(adminWallet);
+      const token = await auth.generate(payload, {
+        tokenId: "test",
+      });
+
+      const user = await auth.authenticate(token, {
+        validateTokenId: (tokenId: string) => {
+          if (tokenId !== "test") {
+            throw new Error();
+          }
+        },
+      });
+
+      expect(user.address).to.equal(await signerWallet.getAddress());
+    });
+
+    it("Should reject token with invalid token ID", async () => {
+      const payload = await auth.login();
+
+      auth.updateWallet(adminWallet);
+      const token = await auth.generate(payload, {
+        tokenId: "test",
+      });
+
+      try {
+        await auth.authenticate(token, {
+          validateTokenId: (tokenId: string) => {
+            if (tokenId !== "invalid") {
+              throw new Error();
+            }
+          },
+        });
+        expect.fail();
+      } catch (err: any) {
+        expect(err.message).to.contain("Token ID is invalid");
+      }
+    });
+
+    it("Should propagate session on token", async () => {
+      const payload = await auth.login();
+
+      auth.updateWallet(adminWallet);
+      const token = await auth.generate(payload, {
+        session: { role: "admin" },
+      });
+
+      const user = await auth.authenticate(token);
+
+      expect(user.address).to.equal(await signerWallet.getAddress());
+      expect(user.session).to.deep.equal({ role: "admin" });
+    });
+
+    it("Should call session callback function", async () => {
+      const payload = await auth.login();
+
+      auth.updateWallet(adminWallet);
+      const token = await auth.generate(payload, {
+        session: (address: string) => {
+          return { address, role: "admin" };
+        },
+      });
+
+      const user = await auth.authenticate(token);
+
+      expect(user.address).to.equal(await signerWallet.getAddress());
+      expect(user.session).to.deep.equal({
+        address: await signerWallet.getAddress(),
+        role: "admin",
+      });
+    });
+
+    it("Should authenticate with issuer address", async () => {
+      const payload = await auth.login();
+
+      auth.updateWallet(adminWallet);
+      const token = await auth.generate(payload);
+
+      auth.updateWallet(attackerWallet);
+      try {
+        await auth.authenticate(token);
+        expect.fail();
+      } catch (err: any) {
+        expect(err.message).to.contain("The expected issuer address");
+      }
+
+      const user = await auth.authenticate(token, {
+        issuerAddress: await adminWallet.getAddress(),
+      });
+      expect(user.address).to.equal(await signerWallet.getAddress());
+    });
+  },
+);
@@ -1,5 +1,149 @@
 # @thirdweb-dev/chains

+## 0.1.85
+
+### Patch Changes
+
+- [#2590](https://github.com/thirdweb-dev/js/pull/2590) [`3ef3786`](https://github.com/thirdweb-dev/js/commit/3ef378659e83341663dfaded417e33b5af29bbbc) Thanks [@github-actions](https://github.com/apps/github-actions)! - Synced Chains Package
+
+## 0.1.84
+
+### Patch Changes
+
+- [#2577](https://github.com/thirdweb-dev/js/pull/2577) [`d93286b`](https://github.com/thirdweb-dev/js/commit/d93286bc1f8224d055b50ce3ffa4f302869cb2b1) Thanks [@jnsdls](https://github.com/jnsdls)! - update dependencies
+
+- [#2580](https://github.com/thirdweb-dev/js/pull/2580) [`50e7dba`](https://github.com/thirdweb-dev/js/commit/50e7dbaa9dae77cb8cd865405c322495e2498c65) Thanks [@github-actions](https://github.com/apps/github-actions)! - Synced Chains Package
+
+## 0.1.83
+
+### Patch Changes
+
+- [#2559](https://github.com/thirdweb-dev/js/pull/2559) [`095d227`](https://github.com/thirdweb-dev/js/commit/095d227a13d0c9c1de76fa3812b7f71b2130d532) Thanks [@github-actions](https://github.com/apps/github-actions)! - Synced Chains Package
+
+## 0.1.82
+
+### Patch Changes
+
+- [#2527](https://github.com/thirdweb-dev/js/pull/2527) [`cb0ef6a`](https://github.com/thirdweb-dev/js/commit/cb0ef6a6a25cee255e18b8489fdb4123bb69c279) Thanks [@github-actions](https://github.com/apps/github-actions)! - Synced Chains Package
+
+## 0.1.81
+
+### Patch Changes
+
+- [#2496](https://github.com/thirdweb-dev/js/pull/2496) [`863049d`](https://github.com/thirdweb-dev/js/commit/863049dc0ca989d2654b4aacba811263931a33fe) Thanks [@jnsdls](https://github.com/jnsdls)! - do not append `?bundleId` query param to rpc url if the bundle id is undefined
+
+- [#2427](https://github.com/thirdweb-dev/js/pull/2427) [`8a20aa5`](https://github.com/thirdweb-dev/js/commit/8a20aa58259edc5bac578dc5e4f4d971ed7adf36) Thanks [@github-actions](https://github.com/apps/github-actions)! - Synced Chains Package
+
+## 0.1.80
+
+### Patch Changes
+
+- [#2484](https://github.com/thirdweb-dev/js/pull/2484) [`c494db8`](https://github.com/thirdweb-dev/js/commit/c494db87cbfa4b6fc4013abb01936e86a4350ea8) Thanks [@joaquim-verges](https://github.com/joaquim-verges)! - Update chains
+
+## 0.1.79
+
+### Patch Changes
+
+- [#2464](https://github.com/thirdweb-dev/js/pull/2464) [`2e01627`](https://github.com/thirdweb-dev/js/commit/2e01627c998a49a1dd41041f3743a28488c92697) Thanks [@joaquim-verges](https://github.com/joaquim-verges)! - Sync chains
+
+## 0.1.78
+
+### Patch Changes
+
+- [#2416](https://github.com/thirdweb-dev/js/pull/2416) [`588897d`](https://github.com/thirdweb-dev/js/commit/588897d1b04e6c63da13639aeb47ca701308e1b2) Thanks [@github-actions](https://github.com/apps/github-actions)! - Synced Chains Package
+
+## 0.1.77
+
+### Patch Changes
+
+- [#2406](https://github.com/thirdweb-dev/js/pull/2406) [`047fbe2`](https://github.com/thirdweb-dev/js/commit/047fbe2918808cbc8fded90104458b6e38d1207d) Thanks [@github-actions](https://github.com/apps/github-actions)! - Synced Chains Package
+
+## 0.1.76
+
+### Patch Changes
+
+- [#2378](https://github.com/thirdweb-dev/js/pull/2378) [`5f243bb`](https://github.com/thirdweb-dev/js/commit/5f243bba0ded5dace9344c79e8904a4a342d16af) Thanks [@github-actions](https://github.com/apps/github-actions)! - Synced Chains Package
+
+## 0.1.75
+
+### Patch Changes
+
+- [#2372](https://github.com/thirdweb-dev/js/pull/2372) [`e87292a`](https://github.com/thirdweb-dev/js/commit/e87292ab604897ddfc337d24d2d1fe0f3560baae) Thanks [@github-actions](https://github.com/apps/github-actions)! - Synced Chains Package
+
+## 0.1.74
+
+### Patch Changes
+
+- [#2336](https://github.com/thirdweb-dev/js/pull/2336) [`abc0a53`](https://github.com/thirdweb-dev/js/commit/abc0a53dc398264f205d194e3f87a79f74e91eb1) Thanks [@github-actions](https://github.com/apps/github-actions)! - Synced Chains Package
+
+## 0.1.73
+
+### Patch Changes
+
+- [#2285](https://github.com/thirdweb-dev/js/pull/2285) [`ca70cd3`](https://github.com/thirdweb-dev/js/commit/ca70cd3882b39ffd56275d267e6af9c04fae179b) Thanks [@github-actions](https://github.com/apps/github-actions)! - Synced Chains Package
+
+## 0.1.72
+
+### Patch Changes
+
+- [#2280](https://github.com/thirdweb-dev/js/pull/2280) [`23d0e553`](https://github.com/thirdweb-dev/js/commit/23d0e553088321edfe3971950c2e7f27209d9aaf) Thanks [@github-actions](https://github.com/apps/github-actions)! - Synced Chains Package
+
+## 0.1.71
+
+### Patch Changes
+
+- [#2258](https://github.com/thirdweb-dev/js/pull/2258) [`357886e3`](https://github.com/thirdweb-dev/js/commit/357886e31b37aad950731ce8f013a101190ebd07) Thanks [@github-actions](https://github.com/apps/github-actions)! - Synced Chains Package
+
+## 0.1.70
+
+### Patch Changes
+
+- [#2255](https://github.com/thirdweb-dev/js/pull/2255) [`1e50caee`](https://github.com/thirdweb-dev/js/commit/1e50caeed1b85f91a6d2efb2e5204f3acf300134) Thanks [@github-actions](https://github.com/apps/github-actions)! - Synced Chains Package
+
+## 0.1.69
+
+### Patch Changes
+
+- [#2247](https://github.com/thirdweb-dev/js/pull/2247) [`374671fd`](https://github.com/thirdweb-dev/js/commit/374671fd9ac97a93263b09c6c0a53cfd129881d7) Thanks [@github-actions](https://github.com/apps/github-actions)! - Synced Chains Package
+
+## 0.1.68
+
+### Patch Changes
+
+- [#2245](https://github.com/thirdweb-dev/js/pull/2245) [`771bd1e1`](https://github.com/thirdweb-dev/js/commit/771bd1e1b280681992195103c22aafa1fb98f7e0) Thanks [@github-actions](https://github.com/apps/github-actions)! - Synced Chains Package
+
+## 0.1.67
+
+### Patch Changes
+
+- [#2243](https://github.com/thirdweb-dev/js/pull/2243) [`39e79282`](https://github.com/thirdweb-dev/js/commit/39e79282acb70959ba8140c779fa521c41c80a5f) Thanks [@github-actions](https://github.com/apps/github-actions)! - Synced Chains Package
+
+- [#2240](https://github.com/thirdweb-dev/js/pull/2240) [`69c3eb91`](https://github.com/thirdweb-dev/js/commit/69c3eb910feb2265833a07b7472e32fac5a79d90) Thanks [@jnsdls](https://github.com/jnsdls)! - sync chains
+
+## 0.1.66
+
+### Patch Changes
+
+- [#2232](https://github.com/thirdweb-dev/js/pull/2232) [`627d2099`](https://github.com/thirdweb-dev/js/commit/627d20992770670ab0c954ceea0b8679ce4f3088) Thanks [@joaquim-verges](https://github.com/joaquim-verges)! - Update chains
+
+## 0.1.65
+
+### Patch Changes
+
+- [#2203](https://github.com/thirdweb-dev/js/pull/2203) [`3f2ee85a`](https://github.com/thirdweb-dev/js/commit/3f2ee85a1ab70e74aefe7f458379a2ccaf4058a9) Thanks [@iketw](https://github.com/iketw)! - Syncs Chains
+
+## 0.1.64
+
+### Patch Changes
+
+- [#2187](https://github.com/thirdweb-dev/js/pull/2187) [`e21f7bb1`](https://github.com/thirdweb-dev/js/commit/e21f7bb171334fa3003c954060e60c1ce8c1228f) Thanks [@gerrysaporito](https://github.com/gerrysaporito)! - synced chains package with chains db
+
+## 0.1.63
+
+### Patch Changes
+
+- [#2145](https://github.com/thirdweb-dev/js/pull/2145) [`d3637a16`](https://github.com/thirdweb-dev/js/commit/d3637a160d088dde6e35dc213ee611b73b831c3f) Thanks [@jnsdls](https://github.com/jnsdls)! - update chains
+
 ## 0.1.62

 ### Patch Changes
@@ -1,6 +1,6 @@
 <p align="center">
 <br />
-<a href="https://thirdweb.com"><img src="https://github.com/thirdweb-dev/js/blob/main/packages/sdk/logo.svg?raw=true" width="200" alt=""/></a>
+<a href="https://thirdweb.com"><img src="https://github.com/thirdweb-dev/js/blob/main/legacy_packages/sdk/logo.svg?raw=true" width="200" alt=""/></a>
 <br />
 </p>
 <h1 align="center">thirdweb chains</h1>
@@ -59,20 +59,21 @@ export default {
  "networkId": 1,
  "redFlags": [],
  "rpc": [
-    "https://ethereum.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
    "https://1.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
    "https://mainnet.infura.io/v3/${INFURA_API_KEY}",
    "wss://mainnet.infura.io/ws/v3/${INFURA_API_KEY}",
    "https://eth-mainnet.g.alchemy.com/v2/${ALCHEMY_API_KEY}",
    "https://api.mycryptoapi.com/eth",
    "https://cloudflare-eth.com",
-    "https://ethereum.publicnode.com",
-    "wss://ethereum.publicnode.com",
+    "https://ethereum-rpc.publicnode.com",
+    "wss://ethereum-rpc.publicnode.com",
    "https://mainnet.gateway.tenderly.co",
    "wss://mainnet.gateway.tenderly.co",
    "https://rpc.blocknative.com/boost",
    "https://rpc.flashbots.net/fast",
-    "https://rpc.mevblocker.io/fullprivacy"
+    "https://rpc.mevblocker.io/fullprivacy",
+    "https://eth.drpc.org",
+    "wss://eth.drpc.org"
  ],
  "shortName": "eth",
  "slip44": 60,
@@ -49,15 +49,17 @@ export default {
  "networkId": 10,
  "redFlags": [],
  "rpc": [
-    "https://optimism.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
    "https://10.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
    "https://optimism-mainnet.infura.io/v3/${INFURA_API_KEY}",
-    "https://opt-mainnet.g.alchemy.com/v2/${ALCHEMY_API_KEY}",
    "https://mainnet.optimism.io",
    "https://optimism.publicnode.com",
    "wss://optimism.publicnode.com",
    "https://optimism.gateway.tenderly.co",
-    "wss://optimism.gateway.tenderly.co"
+    "wss://optimism.gateway.tenderly.co",
+    "https://optimism-rpc.publicnode.com",
+    "wss://optimism-rpc.publicnode.com",
+    "https://optimism.drpc.org",
+    "wss://optimism.drpc.org"
  ],
  "shortName": "oeth",
  "slug": "optimism",
@@ -51,7 +51,6 @@ export default {
  },
  "networkId": 100,
  "rpc": [
-    "https://gnosis.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
    "https://100.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
    "https://rpc.gnosischain.com",
    "https://rpc.gnosis.gateway.fm",
@@ -63,8 +62,8 @@ export default {
    "https://web3endpoints.com/gnosischain-mainnet",
    "https://gnosis.oat.farm",
    "wss://rpc.gnosischain.com/wss",
-    "https://gnosis.publicnode.com",
-    "wss://gnosis.publicnode.com"
+    "https://gnosis-rpc.publicnode.com",
+    "wss://gnosis-rpc.publicnode.com"
  ],
  "shortName": "gno",
  "slip44": 700,
@@ -23,7 +23,6 @@ export default {
    "chain": "eip155-1"
  },
  "rpc": [
-    "https://gton.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
    "https://1000.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
    "https://rpc.gton.network/"
  ],
@@ -13,7 +13,6 @@ export default {
  },
  "networkId": 10000,
  "rpc": [
-    "https://smart-bitcoin-cash.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
    "https://10000.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
    "https://smartbch.greyh.at",
    "https://rpc-mainnet.smartbch.org",
@@ -13,7 +13,6 @@ export default {
  },
  "networkId": 100000,
  "rpc": [
-    "https://quarkchain-root.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
    "https://100000.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
    "http://jrpc.mainnet.quarkchain.io:38391"
  ],
@@ -23,7 +23,6 @@ export default {
    "chain": "eip155-100000"
  },
  "rpc": [
-    "https://quarkchain-shard-0.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
    "https://100001.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
    "https://mainnet-s0-ethapi.quarkchain.io",
    "http://eth-jrpc.mainnet.quarkchain.io:39000"
@@ -23,7 +23,6 @@ export default {
    "chain": "eip155-100000"
  },
  "rpc": [
-    "https://quarkchain-shard-1.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
    "https://100002.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
    "https://mainnet-s1-ethapi.quarkchain.io",
    "http://eth-jrpc.mainnet.quarkchain.io:39001"
@@ -23,7 +23,6 @@ export default {
    "chain": "eip155-100000"
  },
  "rpc": [
-    "https://quarkchain-shard-2.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
    "https://100003.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
    "https://mainnet-s2-ethapi.quarkchain.io",
    "http://eth-jrpc.mainnet.quarkchain.io:39002"
@@ -23,7 +23,6 @@ export default {
    "chain": "eip155-100000"
  },
  "rpc": [
-    "https://quarkchain-shard-3.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
    "https://100004.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
    "https://mainnet-s3-ethapi.quarkchain.io",
    "http://eth-jrpc.mainnet.quarkchain.io:39003"
@@ -23,7 +23,6 @@ export default {
    "chain": "eip155-100000"
  },
  "rpc": [
-    "https://quarkchain-shard-4.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
    "https://100005.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
    "https://mainnet-s4-ethapi.quarkchain.io",
    "http://eth-jrpc.mainnet.quarkchain.io:39004"
@@ -23,7 +23,6 @@ export default {
    "chain": "eip155-100000"
  },
  "rpc": [
-    "https://quarkchain-shard-5.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
    "https://100006.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
    "https://mainnet-s5-ethapi.quarkchain.io",
    "http://eth-jrpc.mainnet.quarkchain.io:39005"
@@ -23,7 +23,6 @@ export default {
    "chain": "eip155-100000"
  },
  "rpc": [
-    "https://quarkchain-shard-6.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
    "https://100007.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
    "https://mainnet-s6-ethapi.quarkchain.io",
    "http://eth-jrpc.mainnet.quarkchain.io:39006"
@@ -23,7 +23,6 @@ export default {
    "chain": "eip155-100000"
  },
  "rpc": [
-    "https://quarkchain-shard-7.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
    "https://100008.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
    "https://mainnet-s7-ethapi.quarkchain.io",
    "http://eth-jrpc.mainnet.quarkchain.io:39007"
--- a/Show More
+++ b/Show More