Version Packages (#521 )

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Update react-core dependencies (#520 )
2023-01-28 21:52:12 -08:00 · 2023-01-29 05:25:55 +00:00 · 2023-01-27 14:34:52 -08:00 · 2023-01-27 14:30:03 -08:00 · 2023-01-27 17:06:58 -05:00 · 2023-01-27 12:18:47 -08:00
531 changed files with 35548 additions and 10626 deletions
@@ -2,12 +2,14 @@
  "$schema": "https://unpkg.com/@changesets/[email protected]/schema.json",
  "changelog": ["@changesets/changelog-github", { "repo": "thirdweb-dev/js" }],
  "commit": false,
-  "fixed": [["@thirdweb-dev/sdk", "@thirdweb-dev/react"]],
+  "fixed": [
+    ["@thirdweb-dev/sdk", "@thirdweb-dev/react-core", "@thirdweb-dev/react"]
+  ],
  "linked": [],
  "access": "public",
  "baseBranch": "main",
  "updateInternalDependencies": "patch",
-  "ignore": [],
+  "ignore": ["e2e-cra-5", "e2e-next-12", "e2e-vite-3"],
  "___experimentalUnsafeOptions_WILL_CHANGE_IN_PATCH": {
    "updateInternalDependents": "always",
    "onlyUpdatePeerDependentsWhenOutOfRange": true
@@ -9,7 +9,7 @@ runs:
      with:
        node-version: 16
        registry-url: "https://registry.npmjs.org"
-        # cache: "yarn"
+        cache: "yarn"

    - name: Install dependencies
      shell: bash
@@ -13,9 +13,8 @@ concurrency:
 jobs:
  build:
    name: Build and Test
-    # timeout-minutes: 15
-    # try out buildjet to speed up build and test
-    runs-on: buildjet-32vcpu-ubuntu-2204
+    timeout-minutes: 30
+    runs-on: ubuntu-latest-32
    # To use Remote Caching, uncomment the next lines and follow the steps below.
    env:
      TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
@@ -12,9 +12,8 @@ concurrency:

 jobs:
  integration-tests:
-    timeout-minutes: 60
-    # try out buildjet to speed up build and test
-    runs-on: buildjet-32vcpu-ubuntu-2204
+    timeout-minutes: 30
+    runs-on: ubuntu-latest-32
    steps:
      - uses: actions/checkout@v3

@@ -28,9 +27,3 @@ jobs:
        run: yarn e2e
        env:
          NODE_OPTIONS: "--max_old_space_size=4096"
-      - uses: actions/upload-artifact@v2
-        if: always()
-        with:
-          name: playwright-report
-          path: packages/react/playwright-report/
-          retention-days: 30
@@ -13,8 +13,7 @@ concurrency:
 jobs:
  lint:
    name: Lint
-    # timeout-minutes: 15
-    # try out buildjet to speed up build and test
+    timeout-minutes: 15
    runs-on: ubuntu-latest
    # To use Remote Caching, uncomment the next lines and follow the steps below.
    env:
@@ -40,8 +40,8 @@ jobs:
      comment_body: ${{ github.event.comment.body }}

  deploy:
-    # try out buildjet to speed up build and test
-    runs-on: buildjet-32vcpu-ubuntu-2204
+    runs-on: ubuntu-latest-32
+    timeout-minutes: 30
    needs: deploy-check
    if: needs.deploy-check.outputs.triggered == 'true'
    steps:
@@ -14,8 +14,8 @@ concurrency:
 jobs:
  release:
    name: Release
-    # try out buildjet to speed up build and test
-    runs-on: buildjet-32vcpu-ubuntu-2204
+    timeout-minutes: 30
+    runs-on: ubuntu-latest-32
    steps:
      - name: Checkout branch
        uses: actions/checkout@v3
@@ -4,8 +4,8 @@ on: [pull_request]

 jobs:
  build:
-    # try out buildjet to speed up build and test
-    runs-on: buildjet-32vcpu-ubuntu-2204
+    runs-on: ubuntu-latest-32
+    timeout-minutes: 30

    steps:
      - uses: actions/checkout@v3
@@ -16,3 +16,5 @@ jobs:
          repo-token: "${{ secrets.GITHUB_TOKEN }}"
          strip-hash: "\\-(\\w{8})(?:\\.esm|\\.cjs)"
          minimum-change-threshold: 100
+          # exclude source maps, node modules and any test related files
+          exclude: "{**/*.map,**/node_modules/**,**/test/**}"
@@ -12,4 +12,9 @@ server/dist
 public/dist
 .turbo
 ./packages/contracts-js/abis
-.idea/
+.idea/
+.yalc/
+yalc.lock
+build/
+playwright-report/
+.vscode/
@@ -1,4 +1,3 @@
-lib
 node_modules
 dist
 contracts-js
@@ -28,7 +28,6 @@
 | [/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>                           |

-
 ## Documentation

 Visit [https://portal.thirdweb.com/](https://portal.thirdweb.com/) to view the full documentation.
@@ -8,14 +8,15 @@
  "private": true,
  "workspaces": {
    "packages": [
-      "packages/*"
+      "packages/*",
+      "test/**/*"
    ]
  },
  "scripts": {
    "test": "turbo run test test:evm test:solana",
    "e2e": "turbo run e2e",
-    "build": "turbo run build",
-    "build:release": "turbo run build --force",
+    "build": "turbo run build --filter=./packages/*",
+    "build:release": "turbo run build --force --filter=./packages/*",
    "dev": "turbo run dev --no-cache --parallel --continue",
    "fix:repo": "manypkg fix",
    "lint": "turbo run lint",
@@ -27,12 +28,7 @@
    "release": "node ./scripts/pre-release.mjs && changeset publish",
    "version-packages:nightly": "changeset version --snapshot nightly",
    "release:nightly": "node ./scripts/pre-release.mjs && changeset publish --tag nightly",
-    "push": "turbo run push"
-  },
-  "preconstruct": {
-    "packages": [
-      "packages/*"
-    ]
+    "push": "turbo run push --filter=./packages/*"
  },
  "packageManager": "[email protected]",
  "dependencies": {
@@ -40,7 +36,7 @@
    "@changesets/cli": "^2.24.3",
    "@manypkg/cli": "^0.19.1",
    "@manypkg/get-packages": "^1.1.3",
-    "@trivago/prettier-plugin-sort-imports": "^3.3.0",
+    "@trivago/prettier-plugin-sort-imports": "^4.0.0",
    "eslint": "^8.21.0",
    "postinstall-postinstall": "^2.1.0",
    "prettier": "^2.7.1",
@@ -1,5 +1,106 @@
 # @thirdweb-dev/auth

+## 3.0.1
+
+### Patch Changes
+
+- [#520](https://github.com/thirdweb-dev/js/pull/520) [`8c81ca5`](https://github.com/thirdweb-dev/js/commit/8c81ca5c3033b04b1f64e3a1134a72e7e3ec03b1) Thanks [@adam-maj](https://github.com/adam-maj)! - Update auth and react-core dependencies
+
+## 3.0.0
+
+### Major Changes
+
+- [#460](https://github.com/thirdweb-dev/js/pull/460) [`a6c074c`](https://github.com/thirdweb-dev/js/commit/a6c074c3f33148cd17f5a66a58df9272a4381bab) Thanks [@adam-maj](https://github.com/adam-maj)! - Complete Auth redesign and update to add a number of major and quality of life improvements, including the following:
+
+  - Ability to use Auth APIs with both cookies and JWTs, allowing non browser clients to interact with Auth (mobile, gaming, scripts, etc.)
+  - Ability to store session data and other data on the Auth user
+  - Callbacks to run side-effects on login, logout, and requesting user data
+  - Ability to configure cookies for custom domains and backend setups
+  - Support for validation of the entire EIP4361/CAIP122 specification
+  - No more need for redirects or payload encoding on Auth requests
+  - and more...
+
+  See the new documentation to view the new changes and usage: [Auth Documentation](https://portal.thirdweb.com/auth).
+
+  ## How to upgrade
+
+  The `ThirdwebAuth` constructor now takes the `domain` in the constructor, and takes a more generic `wallet` interface as input. The `wallet` can be imported from the `@thirdweb-dev/wallets` package, or for more simpler use cases, from the `@thirdweb-dev/auth/evm` and `@thirdweb-dev/auth/solana` entrypoints.
+
+  ```js
+  import { PrivateKeyWallet } from "@thirdweb-dev/auth/evm";
+
+  // Pass in domain and wallet to the constructor
+  const wallet = new PrivateKeyWallet("0x...");
+  const auth = new ThirdwebAuth(wallet, "example.com");
+
+  // Auth functions no longer require domain to be passed in
+  const payload = await auth.login();
+  ```
+
+## 2.0.41
+
+## 2.0.40
+
+## 2.0.39
+
+## 2.0.38
+
+## 2.0.37
+
+## 2.0.36
+
+## 2.0.35
+
+## 2.0.34
+
+### Patch Changes
+
+- [#425](https://github.com/thirdweb-dev/js/pull/425) [`f545a67`](https://github.com/thirdweb-dev/js/commit/f545a67e9fb597d27bb39ca515d24d306fbb121a) Thanks [@adam-maj](https://github.com/adam-maj)! - Add sameSite none and include credentials
+
+## 2.0.33
+
+## 2.0.32
+
+## 2.0.31
+
+### Patch Changes
+
+- [#397](https://github.com/thirdweb-dev/js/pull/397) [`72589ec`](https://github.com/thirdweb-dev/js/commit/72589ec234d86939b67b0ca8b3b789f2e9c54cc2) Thanks [@adam-maj](https://github.com/adam-maj)! - Call user callback in getUser
+
+## 2.0.30
+
+## 2.0.29
+
+## 2.0.28
+
+## 2.0.27
+
+## 2.0.26
+
+## 2.0.25
+
+## 2.0.24
+
+## 2.0.23
+
+## 2.0.22
+
+## 2.0.21
+
+### Patch Changes
+
+- [#327](https://github.com/thirdweb-dev/js/pull/327) [`ef27aad`](https://github.com/thirdweb-dev/js/commit/ef27aad0aafc4577e85f44dc77dfbe880bd239b5) Thanks [@jnsdls](https://github.com/jnsdls)! - enable e2e testing
+
+## 2.0.20
+
+## 2.0.19
+
+## 2.0.18
+
+## 2.0.17
+
+## 2.0.16
+
 ## 2.0.15

 ## 2.0.14
@@ -0,0 +1,4 @@
+{
+  "main": "dist/thirdweb-dev-auth-evm.cjs.js",
+  "module": "dist/thirdweb-dev-auth-evm.esm.js"
+}
@@ -1,4 +0,0 @@
-{
-  "main": "dist/thirdweb-dev-auth-next-evm.cjs.js",
-  "module": "dist/thirdweb-dev-auth-next-evm.esm.js"
-}
@@ -1,4 +0,0 @@
-{
-  "main": "dist/thirdweb-dev-auth-next-solana.cjs.js",
-  "module": "dist/thirdweb-dev-auth-next-solana.esm.js"
-}
@@ -1,52 +1,54 @@
 {
  "name": "@thirdweb-dev/auth",
-  "version": "2.0.15",
+  "version": "3.0.1",
+  "main": "dist/thirdweb-dev-auth.cjs.js",
+  "module": "dist/thirdweb-dev-auth.esm.js",
  "exports": {
+    ".": {
+      "module": "./dist/thirdweb-dev-auth.esm.js",
+      "default": "./dist/thirdweb-dev-auth.cjs.js"
+    },
+    "./evm": {
+      "module": "./evm/dist/thirdweb-dev-auth-evm.esm.js",
+      "default": "./evm/dist/thirdweb-dev-auth-evm.cjs.js"
+    },
    "./next": {
      "module": "./next/dist/thirdweb-dev-auth-next.esm.js",
      "default": "./next/dist/thirdweb-dev-auth-next.cjs.js"
    },
+    "./solana": {
+      "module": "./solana/dist/thirdweb-dev-auth-solana.esm.js",
+      "default": "./solana/dist/thirdweb-dev-auth-solana.cjs.js"
+    },
    "./express": {
      "module": "./express/dist/thirdweb-dev-auth-express.esm.js",
      "default": "./express/dist/thirdweb-dev-auth-express.cjs.js"
    },
-    "./next/evm": {
-      "module": "./next/evm/dist/thirdweb-dev-auth-next-evm.esm.js",
-      "default": "./next/evm/dist/thirdweb-dev-auth-next-evm.cjs.js"
-    },
    "./next-auth": {
      "module": "./next-auth/dist/thirdweb-dev-auth-next-auth.esm.js",
      "default": "./next-auth/dist/thirdweb-dev-auth-next-auth.cjs.js"
    },
-    "./next/solana": {
-      "module": "./next/solana/dist/thirdweb-dev-auth-next-solana.esm.js",
-      "default": "./next/solana/dist/thirdweb-dev-auth-next-solana.cjs.js"
-    },
    "./package.json": "./package.json"
  },
  "repository": "https://github.com/thirdweb-dev/js/tree/main/packages/auth",
  "author": "thirdweb eng <[email protected]>",
  "license": "Apache-2.0",
-  "files": [
-    "dist/**/*",
-    "next/**/*",
-    "express/**/*",
-    "next-auth/**/*"
-  ],
  "scripts": {
    "build": "preconstruct build",
    "format": "prettier --write 'src/**/*'",
    "lint": "eslint src/",
    "fix": "eslint src/ --fix",
-    "clean": "rm -rf dist/ && rm -rf node_modules/"
+    "clean": "rm -rf dist/ && rm -rf node_modules/",
+    "test": "mocha --config './test/.mocharc.json' --timeout 30000 --parallel './test/**/*.test.ts'"
  },
  "preconstruct": {
    "entrypoints": [
-      "next/index.ts",
-      "next/evm/index.ts",
-      "next/solana/index.ts",
+      "index.ts",
      "express/index.ts",
-      "next-auth/index.ts"
+      "next/index.ts",
+      "next-auth/index.ts",
+      "evm/index.ts",
+      "solana/index.ts"
    ],
    "___experimentalFlags_WILL_CHANGE_IN_PATCH": {
      "exports": true
@@ -61,20 +63,30 @@
    "@microsoft/api-extractor": "^7.29.2",
    "@microsoft/tsdoc": "^0.14.1",
    "@preconstruct/cli": "^2.2.1",
+    "@solana/web3.js": "^1.73.0",
+    "@swc-node/register": "^1.5.4",
+    "@swc/core": "^1.3.23",
    "@thirdweb-dev/sdk": "*",
+    "@thirdweb-dev/wallets": "*",
+    "@types/bs58": "^4.0.1",
+    "@types/chai": "^4.3.4",
    "@types/cookie": "^0.5.1",
    "@types/cookie-parser": "^1.4.3",
    "@types/express": "^4.17.13",
+    "@types/mocha": "^10.0.1",
    "@typescript-eslint/eslint-plugin": "^5.33.0",
    "@typescript-eslint/parser": "^5.33.0",
+    "@wagmi/core": "^0.8.18",
+    "chai": "^4.3.7",
    "eslint": "^8.21.0",
    "eslint-config-prettier": "^8.3.0",
    "eslint-plugin-import": "^2.26.0",
    "eslint-plugin-inclusive-language": "^2.2.0",
    "eslint-plugin-prettier": "^4.2.1",
    "eslint-plugin-tsdoc": "^0.2.16",
-    "ethers": "^5.7.1",
+    "ethers": "^5.7.2",
    "express": "^4.18.1",
+    "mocha": "^10.2.0",
    "next": "^12.2.0",
    "next-auth": "^4.10.3",
    "prettier": "^2.7.1",
@@ -83,13 +95,36 @@
    "typescript": "^4.7.4"
  },
  "peerDependencies": {
+    "@noble/ed25519": "^1.7.1",
+    "@solana/web3.js": "^1.73.0",
    "@thirdweb-dev/sdk": "*",
+    "bs58": "^5.0.0",
+    "cookie-parser": "^1.4.6",
    "ethers": ">=5.5.1",
    "express": "^4.18.1",
    "next": "^12.2.0",
-    "next-auth": "^4.10.3"
+    "next-auth": "^4.10.3",
+    "tweetnacl": "^1.0.3"
  },
  "peerDependenciesMeta": {
+    "@noble/ed25519": {
+      "optional": true
+    },
+    "@solana/web3.js": {
+      "optional": true
+    },
+    "bs58": {
+      "optional": true
+    },
+    "cookie-parser": {
+      "optional": true
+    },
+    "tweetnacl": {
+      "optional": true
+    },
+    "ethers": {
+      "optional": true
+    },
    "express": {
      "optional": true
    },
@@ -102,6 +137,7 @@
  },
  "dependencies": {
    "cookie": "^0.5.0",
-    "cookie-parser": "^1.4.6"
+    "uuid": "^9.0.0",
+    "zod": "^3.20.2"
  }
 }
@@ -0,0 +1,4 @@
+{
+  "main": "dist/thirdweb-dev-auth-solana.cjs.js",
+  "module": "dist/thirdweb-dev-auth-solana.esm.js"
+}
@@ -0,0 +1,412 @@
+import {
+  LoginOptions,
+  LoginPayload,
+  GenerateOptions,
+  LoginPayloadData,
+  LoginPayloadDataSchema,
+  AuthenticationPayloadDataSchema,
+  AuthenticationPayloadData,
+  LoginOptionsSchema,
+  VerifyOptionsSchema,
+  VerifyOptions,
+  GenerateOptionsSchema,
+  AuthenticateOptionsSchema,
+  AuthenticateOptions,
+  User,
+  Json,
+} from "./schema";
+import { isBrowser } from "./utils";
+import type { GenericAuthWallet } from "@thirdweb-dev/wallets";
+
+export class ThirdwebAuth {
+  private domain: string;
+  private wallet: GenericAuthWallet;
+
+  constructor(wallet: GenericAuthWallet, domain: string) {
+    this.wallet = wallet;
+    this.domain = domain;
+  }
+
+  public updateWallet(wallet: GenericAuthWallet) {
+    this.wallet = wallet;
+  }
+
+  public async login(options?: LoginOptions): Promise<LoginPayload> {
+    const parsedOptions = LoginOptionsSchema.parse(options);
+
+    let chainId: string | undefined = parsedOptions?.chainId;
+    if (!chainId && this.wallet.getChainId) {
+      try {
+        chainId = (await this.wallet.getChainId()).toString();
+      } catch {
+        // ignore error
+      }
+    }
+
+    const payloadData = LoginPayloadDataSchema.parse({
+      type: this.wallet.type,
+      domain: parsedOptions?.domain || this.domain,
+      address: await this.wallet.getAddress(),
+      statement: parsedOptions?.statement,
+      version: parsedOptions?.version,
+      uri:
+        parsedOptions?.uri || (isBrowser() ? window.location.href : undefined),
+      chain_id: chainId,
+      nonce: parsedOptions?.nonce,
+      expiration_time:
+        parsedOptions?.expirationTime || new Date(Date.now() + 1000 * 60 * 5),
+      invalid_before: parsedOptions?.invalidBefore,
+      resources: parsedOptions?.resources,
+    });
+
+    const message = this.generateMessage(payloadData);
+    const signature = await this.wallet.signMessage(message);
+
+    return {
+      payload: payloadData,
+      signature,
+    };
+  }
+
+  public async verify(
+    payload: LoginPayload,
+    options?: VerifyOptions,
+  ): Promise<string> {
+    const parsedOptions = VerifyOptionsSchema.parse(options);
+
+    if (payload.payload.type !== this.wallet.type) {
+      throw new Error(
+        `Expected chain type '${this.wallet.type}' does not match chain type on payload '${payload.payload.type}'`,
+      );
+    }
+
+    // Check that the intended domain matches the domain of the payload
+    const domain = parsedOptions?.domain || this.domain;
+    if (payload.payload.domain !== domain) {
+      throw new Error(
+        `Expected domain '${domain}' does not match domain on payload '${payload.payload.domain}'`,
+      );
+    }
+
+    // Check that the payload statement matches the expected statement
+    if (parsedOptions?.statement) {
+      if (payload.payload.statement !== parsedOptions.statement) {
+        throw new Error(
+          `Expected statement '${parsedOptions.statement}' does not match statement on payload '${payload.payload.statement}'`,
+        );
+      }
+    }
+
+    // Check that the intended URI matches the URI of the payload
+    if (parsedOptions?.uri) {
+      if (payload.payload.uri !== parsedOptions.uri) {
+        throw new Error(
+          `Expected URI '${parsedOptions.uri}' does not match URI on payload '${payload.payload.uri}'`,
+        );
+      }
+    }
+
+    // Check that the intended version matches the version of the payload
+    if (parsedOptions?.version) {
+      if (payload.payload.version !== parsedOptions.version) {
+        throw new Error(
+          `Expected version '${parsedOptions.version}' does not match version on payload '${payload.payload.version}'`,
+        );
+      }
+    }
+
+    // Check that the intended chain ID matches the chain ID of the payload
+    if (parsedOptions?.chainId) {
+      if (payload.payload.chain_id !== parsedOptions.chainId) {
+        throw new Error(
+          `Expected chain ID '${parsedOptions.chainId}' does not match chain ID on payload '${payload.payload.chain_id}'`,
+        );
+      }
+    }
+
+    // Check that the payload nonce is valid
+    if (parsedOptions?.validateNonce !== undefined) {
+      try {
+        await parsedOptions.validateNonce(payload.payload.nonce);
+      } catch (err) {
+        console.log(err);
+        throw new Error(`Login request nonce is invalid`);
+      }
+    }
+
+    // Check that it isn't before the invalid before time
+    const currentTime = new Date();
+    if (currentTime < new Date(payload.payload.invalid_before)) {
+      throw new Error(`Login request is not yet valid`);
+    }
+
+    // Check that the payload hasn't expired
+    if (currentTime > new Date(payload.payload.expiration_time)) {
+      throw new Error(`Login request has expired`);
+    }
+
+    // Check that the specified resources are present on the payload
+    if (parsedOptions?.resources) {
+      const missingResources = parsedOptions.resources.filter(
+        (resource) => !payload.payload.resources?.includes(resource),
+      );
+      if (missingResources.length > 0) {
+        throw new Error(
+          `Login request is missing required resources: ${missingResources.join(
+            ", ",
+          )}`,
+        );
+      }
+    }
+
+    // Check that the signing address is the claimed wallet address
+    const message = this.generateMessage(payload.payload);
+    const chainId =
+      this.wallet.type === "evm" && payload.payload.chain_id
+        ? parseInt(payload.payload.chain_id)
+        : undefined;
+    const verified = await this.verifySignature(
+      message,
+      payload.signature,
+      payload.payload.address,
+      chainId,
+    );
+    if (!verified) {
+      throw new Error(
+        `Signer address does not match payload address '${payload.payload.address.toLowerCase()}'`,
+      );
+    }
+
+    return payload.payload.address;
+  }
+
+  public async generate(
+    payload: LoginPayload,
+    options?: GenerateOptions,
+  ): Promise<string> {
+    if (isBrowser()) {
+      throw new Error(
+        "Authentication tokens should not be generated in the browser, as they must be signed by a server-side admin wallet.",
+      );
+    }
+
+    const parsedOptions = GenerateOptionsSchema.parse(options);
+
+    const domain = parsedOptions?.domain || this.domain;
+    const userAddress = await this.verify(payload, {
+      domain,
+      ...parsedOptions?.verifyOptions,
+    });
+
+    let session: Json | undefined = undefined;
+    if (typeof parsedOptions?.session === "function") {
+      const sessionTrigger = (await parsedOptions.session(userAddress)) as Json;
+      if (sessionTrigger) {
+        session = sessionTrigger;
+      }
+    } else {
+      session = parsedOptions?.session;
+    }
+
+    const adminAddress = await this.wallet.getAddress();
+    const payloadData = AuthenticationPayloadDataSchema.parse({
+      iss: adminAddress,
+      sub: userAddress,
+      aud: domain,
+      nbf: parsedOptions?.invalidBefore || new Date(),
+      exp:
+        parsedOptions?.expirationTime ||
+        new Date(Date.now() + 1000 * 60 * 60 * 5),
+      iat: new Date(),
+      jti: parsedOptions?.tokenId,
+      ctx: session,
+    });
+
+    const message = JSON.stringify(payloadData);
+    const signature = await this.wallet.signMessage(message);
+
+    // Header used for JWT token specifying hash algorithm
+    const header = {
+      // Specify ECDSA with SHA-256 for hashing algorithm
+      alg: "ES256",
+      typ: "JWT",
+    };
+
+    const encodedHeader = Buffer.from(JSON.stringify(header)).toString(
+      "base64",
+    );
+    const encodedData = Buffer.from(JSON.stringify(payloadData))
+      .toString("base64")
+      .replace(/=/g, "");
+    const encodedSignature = Buffer.from(signature).toString("base64");
+
+    // Generate a JWT token with base64 encoded header, payload, and signature
+    const token = `${encodedHeader}.${encodedData}.${encodedSignature}`;
+
+    return token;
+  }
+
+  /**
+   * Authenticate With Token
+   * @remarks Server-side function that authenticates the provided JWT token. This function verifies that
+   * the provided authentication token is valid and returns the address of the authenticated wallet.
+   *
+   * @param domain - The domain of the server-side application doing authentication
+   * @param token - The authentication token being used
+   * @returns The address of the authenticated wallet
+   *
+   * @example
+   * ```javascript
+   * const domain = "example.com";
+   * const loginPayload = await sdk.auth.login(domain);
+   * const token = await sdk.auth.generateAuthToken(domain, loginPayload);
+   *
+   * // Authenticate the token and get the address of authenticating users wallet
+   * const address = sdk.auth.authenticate(domain, token);
+   * ```
+   */
+  public async authenticate<TSession extends Json = Json>(
+    token: string,
+    options?: AuthenticateOptions,
+  ): Promise<User<TSession>> {
+    if (isBrowser()) {
+      throw new Error(
+        "Should not authenticate tokens in the browser, as they must be verified by the server-side admin wallet.",
+      );
+    }
+
+    const parsedOptions = AuthenticateOptionsSchema.parse(options);
+    const domain = parsedOptions?.domain || this.domain;
+
+    const encodedPayload = token.split(".")[1];
+    const encodedSignature = token.split(".")[2];
+    const payload: AuthenticationPayloadData = JSON.parse(
+      Buffer.from(encodedPayload, "base64").toString(),
+    );
+    const signature = Buffer.from(encodedSignature, "base64").toString();
+
+    // Check that the payload unique ID is valid
+    if (parsedOptions?.validateTokenId !== undefined) {
+      try {
+        await parsedOptions.validateTokenId(payload.jti);
+      } catch (err) {
+        throw new Error(`Token ID is invalid`);
+      }
+    }
+
+    // Check that the token audience matches the domain
+    if (payload.aud !== domain) {
+      throw new Error(
+        `Expected token to be for the domain '${domain}', but found token with domain '${payload.aud}'`,
+      );
+    }
+
+    // Check that the token is past the invalid before time
+    const currentTime = Math.floor(new Date().getTime() / 1000);
+    if (currentTime < payload.nbf) {
+      throw new Error(
+        `This token is invalid before epoch time '${payload.nbf}', current epoch time is '${currentTime}'`,
+      );
+    }
+
+    // Check that the token hasn't expired
+    if (currentTime > payload.exp) {
+      throw new Error(
+        `This token expired at epoch time '${payload.exp}', current epoch time is '${currentTime}'`,
+      );
+    }
+
+    // Check that the connected wallet matches the token issuer
+    const connectedAddress = await this.wallet.getAddress();
+    if (connectedAddress.toLowerCase() !== payload.iss.toLowerCase()) {
+      throw new Error(
+        `Expected the connected wallet address '${connectedAddress}' to match the token issuer address '${payload.iss}'`,
+      );
+    }
+
+    let chainId: number | undefined = undefined;
+    if (this.wallet.getChainId) {
+      try {
+        chainId = await this.wallet.getChainId();
+      } catch {
+        // ignore error
+      }
+    }
+
+    const verified = await this.verifySignature(
+      JSON.stringify(payload),
+      signature,
+      connectedAddress,
+      chainId,
+    );
+    if (!verified) {
+      throw new Error(
+        `The connected wallet address '${connectedAddress}' did not sign the token`,
+      );
+    }
+
+    return {
+      address: payload.sub,
+      session: payload.ctx as TSession | undefined,
+    };
+  }
+
+  private async verifySignature(
+    message: string,
+    signature: string,
+    address: string,
+    chainId?: number,
+  ) {
+    return this.wallet.verifySignature(message, signature, address, chainId);
+  }
+
+  /**
+   * Generates a EIP-4361 & CAIP-122 compliant message to sign based on the login payload
+   */
+  private generateMessage(payload: LoginPayloadData): string {
+    const typeField = payload.type === "evm" ? "Ethereum" : "Solana";
+    const header = `${payload.domain} wants you to sign in with your ${typeField} account:`;
+    let prefix = [header, payload.address].join("\n");
+    prefix = [prefix, payload.statement].join("\n\n");
+    if (payload.statement) {
+      prefix += "\n";
+    }
+
+    const suffixArray = [];
+    if (payload.uri) {
+      const uriField = `URI: ${payload.uri}`;
+      suffixArray.push(uriField);
+    }
+
+    const versionField = `Version: ${payload.version}`;
+    suffixArray.push(versionField);
+
+    if (payload.chain_id) {
+      const chainField = `Chain ID: ` + payload.chain_id || "1";
+      suffixArray.push(chainField);
+    }
+
+    const nonceField = `Nonce: ${payload.nonce}`;
+    suffixArray.push(nonceField);
+
+    const issuedAtField = `Issued At: ${payload.issued_at}`;
+    suffixArray.push(issuedAtField);
+
+    const expiryField = `Expiration Time: ${payload.expiration_time}`;
+    suffixArray.push(expiryField);
+
+    if (payload.invalid_before) {
+      const invalidBeforeField = `Not Before: ${payload.invalid_before}`;
+      suffixArray.push(invalidBeforeField);
+    }
+
+    if (payload.resources) {
+      suffixArray.push(
+        [`Resources:`, ...payload.resources.map((x) => `- ${x}`)].join("\n"),
+      );
+    }
+
+    const suffix = suffixArray.join("\n");
+    return [prefix, suffix].join("\n");
+  }
+}
@@ -0,0 +1,2 @@
+export { ThirdwebAuth } from "./auth";
+export * from "./schema";
@@ -0,0 +1,208 @@
+import { utils, BigNumber } from "ethers";
+import { v4 as uuidv4 } from "uuid";
+import { z } from "zod";
+
+export const AddressSchema = z.string().refine(
+  (arg) => utils.isAddress(arg),
+  (out) => {
+    return {
+      message: `${out} is not a valid address`,
+    };
+  },
+);
+
+export const RawDateSchema = z.date().transform((i) => {
+  return BigNumber.from(Math.floor(i.getTime() / 1000));
+});
+
+export const AccountTypeSchema = z.union([
+  z.literal("evm"),
+  z.literal("solana"),
+]);
+
+const literalSchema = z.union([z.string(), z.number(), z.boolean(), z.null()]);
+type Literal = z.infer<typeof literalSchema>;
+export type Json = Literal | { [key: string]: Json } | Json[];
+const JsonSchema: z.ZodType<Json> = z.lazy(
+  () => z.union([literalSchema, z.array(JsonSchema), z.record(JsonSchema)]),
+  { invalid_type_error: "Provided value was not valid JSON" },
+);
+
+/**
+ * @internal
+ */
+export const LoginOptionsSchema = z
+  .object({
+    domain: z.string().optional(),
+    statement: z.string().optional(),
+    uri: z.string().optional(),
+    version: z.string().optional(),
+    chainId: z.string().optional(),
+    nonce: z.string().optional(),
+    expirationTime: z.date().optional(),
+    invalidBefore: z.date().optional(),
+    resources: z.array(z.string()).optional(),
+  })
+  .optional();
+
+/**
+ * @internal
+ */
+export const LoginPayloadDataSchema = z.object({
+  type: AccountTypeSchema,
+  domain: z.string(),
+  address: z.string(),
+  statement: z
+    .string()
+    .default(
+      "Please ensure that the domain above matches the URL of the current website.",
+    ),
+  uri: z.string().optional(),
+  version: z.string().default("1"),
+  chain_id: z.string().optional(),
+  nonce: z.string().default(uuidv4()),
+  issued_at: z
+    .date()
+    .default(new Date())
+    .transform((d) => d.toISOString()),
+  expiration_time: z.date().transform((d) => d.toISOString()),
+  invalid_before: z
+    .date()
+    .default(new Date())
+    .transform((d) => d.toISOString()),
+  resources: z.array(z.string()).optional(),
+});
+
+/**
+ * @internal
+ */
+export const LoginPayloadSchema = z.object({
+  payload: LoginPayloadDataSchema,
+  signature: z.string(),
+});
+
+/**
+ * @internal
+ */
+const VerifyOptionsSchemaRequired = z.object({
+  domain: z.string().optional(),
+  statement: z.string().optional(),
+  uri: z.string().optional(),
+  version: z.string().optional(),
+  chainId: z.string().optional(),
+  validateNonce: z.function().args(z.string()).optional(),
+  resources: z.array(z.string()).optional(),
+});
+
+/**
+ * @internal
+ */
+export const VerifyOptionsSchema = VerifyOptionsSchemaRequired.optional();
+
+/**
+ * @internal
+ */
+export const GenerateOptionsSchema = z
+  .object({
+    domain: z.string().optional(),
+    tokenId: z.string().optional(),
+    expirationTime: z.date().optional(),
+    invalidBefore: z.date().optional(),
+    session: z.union([JsonSchema, z.function().args(z.string())]).optional(),
+    verifyOptions: VerifyOptionsSchemaRequired.omit({
+      domain: true,
+    }).optional(),
+  })
+  .optional();
+
+/**
+ * @internal
+ */
+export const AuthenticationPayloadDataSchema = z.object({
+  iss: z.string(),
+  sub: z.string(),
+  aud: z.string(),
+  exp: RawDateSchema.transform((b) => b.toNumber()),
+  nbf: RawDateSchema.transform((b) => b.toNumber()),
+  iat: RawDateSchema.transform((b) => b.toNumber()),
+  jti: z.string().default(uuidv4()),
+  ctx: JsonSchema.optional(),
+});
+
+/**
+ * @internal
+ */
+export const AuthenticationPayloadSchema = z.object({
+  payload: AuthenticationPayloadDataSchema,
+  signature: z.string(),
+});
+
+/**
+ * @internal
+ */
+export const AuthenticateOptionsSchema = z
+  .object({
+    domain: z.string().optional(),
+    validateTokenId: z.function().args(z.string()).optional(),
+  })
+  .optional();
+
+/**
+ * @public
+ */
+export type LoginOptions = z.input<typeof LoginOptionsSchema>;
+
+/**
+ * @public
+ */
+export type LoginPayloadData = z.output<typeof LoginPayloadDataSchema>;
+
+/**
+ * @public
+ */
+export type LoginPayload = z.output<typeof LoginPayloadSchema>;
+
+/**
+ * @public
+ */
+export type VerifyOptions = z.input<typeof VerifyOptionsSchema>;
+
+/**
+ * @public
+ */
+export type GenerateOptions = z.input<typeof GenerateOptionsSchema>;
+
+/**
+ * @public
+ */
+export type AuthenticationPayloadData = z.output<
+  typeof AuthenticationPayloadDataSchema
+>;
+
+/**
+ * @public
+ */
+export type AuthenticationPayload = z.output<
+  typeof AuthenticationPayloadSchema
+>;
+
+/**
+ * @public
+ */
+export type AuthenticateOptions = z.output<typeof AuthenticateOptionsSchema>;
+
+/**
+ * @public
+ */
+export type User<TContext extends Json = Json> = {
+  address: string;
+  session?: TContext;
+};
+
+export const LoginPayloadOutputSchema = LoginPayloadSchema.extend({
+  payload: LoginPayloadDataSchema.extend({
+    issued_at: z.string(),
+    expiration_time: z.string(),
+    invalid_before: z.string(),
+  }),
+});
@@ -0,0 +1,9 @@
+/**
+ * @internal
+ */
+export const isBrowser = () => typeof window !== "undefined";
+
+/**
+ * @internal
+ */
+export const isNode = () => !isBrowser();
@@ -0,0 +1,613 @@
+import type { Chain } from "@wagmi/core";
+
+const arbitrum: Chain = {
+  id: 42_161,
+  name: "Arbitrum One",
+  network: "arbitrum",
+  nativeCurrency: { name: "Ether", symbol: "ETH", decimals: 18 },
+  rpcUrls: {
+    alchemy: {
+      http: ["https://arb-mainnet.g.alchemy.com/v2"],
+      webSocket: ["wss://arb-mainnet.g.alchemy.com/v2"],
+    },
+    infura: {
+      http: ["https://arbitrum-mainnet.infura.io/v3"],
+      webSocket: ["wss://arbitrum-mainnet.infura.io/ws/v3"],
+    },
+    default: {
+      http: ["https://arb1.arbitrum.io/rpc"],
+    },
+    public: {
+      http: ["https://arb1.arbitrum.io/rpc"],
+    },
+  },
+  blockExplorers: {
+    etherscan: { name: "Arbiscan", url: "https://arbiscan.io" },
+    default: { name: "Arbiscan", url: "https://arbiscan.io" },
+  },
+  contracts: {
+    multicall3: {
+      address: "0xca11bde05977b3631167028862be2a173976ca11",
+      blockCreated: 7654707,
+    },
+  },
+};
+
+const arbitrumGoerli: Chain = {
+  id: 421_613,
+  name: "Arbitrum Goerli",
+  network: "arbitrum-goerli",
+  nativeCurrency: {
+    name: "Arbitrum Goerli Ether",
+    symbol: "ETH",
+    decimals: 18,
+  },
+  rpcUrls: {
+    alchemy: {
+      http: ["https://arb-goerli.g.alchemy.com/v2"],
+      webSocket: ["wss://arb-goerli.g.alchemy.com/v2"],
+    },
+    infura: {
+      http: ["https://arbitrum-goerli.infura.io/v3"],
+      webSocket: ["wss://arbitrum-goerli.infura.io/ws/v3"],
+    },
+    default: {
+      http: ["https://goerli-rollup.arbitrum.io/rpc"],
+    },
+    public: {
+      http: ["https://goerli-rollup.arbitrum.io/rpc"],
+    },
+  },
+  blockExplorers: {
+    etherscan: { name: "Arbiscan", url: "https://goerli.arbiscan.io/" },
+    default: { name: "Arbiscan", url: "https://goerli.arbiscan.io/" },
+  },
+  contracts: {
+    multicall3: {
+      address: "0xca11bde05977b3631167028862be2a173976ca11",
+      blockCreated: 88114,
+    },
+  },
+  testnet: true,
+};
+
+const avalanche: Chain = {
+  id: 43_114,
+  name: "Avalanche",
+  network: "avalanche",
+  nativeCurrency: {
+    decimals: 18,
+    name: "Avalanche",
+    symbol: "AVAX",
+  },
+  rpcUrls: {
+    default: { http: ["https://api.avax.network/ext/bc/C/rpc"] },
+    public: { http: ["https://api.avax.network/ext/bc/C/rpc"] },
+  },
+  blockExplorers: {
+    etherscan: { name: "SnowTrace", url: "https://snowtrace.io" },
+    default: { name: "SnowTrace", url: "https://snowtrace.io" },
+  },
+  contracts: {
+    multicall3: {
+      address: "0xca11bde05977b3631167028862be2a173976ca11",
+      blockCreated: 11907934,
+    },
+  },
+};
+
+const avalancheFuji: Chain = {
+  id: 43_113,
+  name: "Avalanche Fuji",
+  network: "avalanche-fuji",
+  nativeCurrency: {
+    decimals: 18,
+    name: "Avalanche Fuji",
+    symbol: "AVAX",
+  },
+  rpcUrls: {
+    default: { http: ["https://api.avax-test.network/ext/bc/C/rpc"] },
+    public: { http: ["https://api.avax-test.network/ext/bc/C/rpc"] },
+  },
+  blockExplorers: {
+    etherscan: { name: "SnowTrace", url: "https://testnet.snowtrace.io" },
+    default: { name: "SnowTrace", url: "https://testnet.snowtrace.io" },
+  },
+  contracts: {
+    multicall3: {
+      address: "0xca11bde05977b3631167028862be2a173976ca11",
+      blockCreated: 7096959,
+    },
+  },
+  testnet: true,
+};
+
+const bsc: Chain = {
+  id: 56,
+  name: "BNB Smart Chain",
+  network: "bsc",
+  nativeCurrency: {
+    decimals: 18,
+    name: "BNB",
+    symbol: "BNB",
+  },
+  rpcUrls: {
+    default: { http: ["https://rpc.ankr.com/bsc"] },
+    public: { http: ["https://rpc.ankr.com/bsc"] },
+  },
+  blockExplorers: {
+    etherscan: { name: "BscScan", url: "https://bscscan.com" },
+    default: { name: "BscScan", url: "https://bscscan.com" },
+  },
+  contracts: {
+    multicall3: {
+      address: "0xca11bde05977b3631167028862be2a173976ca11",
+      blockCreated: 15921452,
+    },
+  },
+};
+
+const bscTestnet: Chain = {
+  id: 97,
+  name: "Binance Smart Chain Testnet",
+  network: "bsc-testnet",
+  nativeCurrency: {
+    decimals: 18,
+    name: "BNB",
+    symbol: "tBNB",
+  },
+  rpcUrls: {
+    default: { http: ["https://bsc-testnet.public.blastapi.io"] },
+    public: { http: ["https://bsc-testnet.public.blastapi.io"] },
+  },
+  blockExplorers: {
+    etherscan: { name: "BscScan", url: "https://testnet.bscscan.com" },
+    default: { name: "BscScan", url: "https://testnet.bscscan.com" },
+  },
+  contracts: {
+    multicall3: {
+      address: "0xca11bde05977b3631167028862be2a173976ca11",
+      blockCreated: 17422483,
+    },
+  },
+  testnet: true,
+};
+
+const fantom: Chain = {
+  id: 250,
+  name: "Fantom",
+  network: "fantom",
+  nativeCurrency: {
+    decimals: 18,
+    name: "Fantom",
+    symbol: "FTM",
+  },
+  rpcUrls: {
+    default: { http: ["https://rpc.ankr.com/fantom"] },
+    public: { http: ["https://rpc.ankr.com/fantom"] },
+  },
+  blockExplorers: {
+    etherscan: { name: "FTMScan", url: "https://ftmscan.com" },
+    default: { name: "FTMScan", url: "https://ftmscan.com" },
+  },
+  contracts: {
+    multicall3: {
+      address: "0xca11bde05977b3631167028862be2a173976ca11",
+      blockCreated: 33001987,
+    },
+  },
+};
+
+const fantomTestnet: Chain = {
+  id: 4002,
+  name: "Fantom Testnet",
+  network: "fantom-testnet",
+  nativeCurrency: {
+    decimals: 18,
+    name: "Fantom",
+    symbol: "FTM",
+  },
+  rpcUrls: {
+    default: { http: ["https://rpc.testnet.fantom.network"] },
+    public: { http: ["https://rpc.testnet.fantom.network"] },
+  },
+  blockExplorers: {
+    etherscan: { name: "FTMScan", url: "https://testnet.ftmscan.com" },
+    default: { name: "FTMScan", url: "https://testnet.ftmscan.com" },
+  },
+  contracts: {
+    multicall3: {
+      address: "0xca11bde05977b3631167028862be2a173976ca11",
+      blockCreated: 8328688,
+    },
+  },
+};
+
+const goerli: Chain = {
+  id: 5,
+  network: "goerli",
+  name: "Goerli",
+  nativeCurrency: { name: "Goerli Ether", symbol: "ETH", decimals: 18 },
+  rpcUrls: {
+    alchemy: {
+      http: ["https://eth-goerli.g.alchemy.com/v2"],
+      webSocket: ["wss://eth-goerli.g.alchemy.com/v2"],
+    },
+    infura: {
+      http: ["https://goerli.infura.io/v3"],
+      webSocket: ["wss://goerli.infura.io/ws/v3"],
+    },
+    default: {
+      http: ["https://rpc.ankr.com/eth_goerli"],
+    },
+    public: {
+      http: ["https://rpc.ankr.com/eth_goerli"],
+    },
+  },
+  blockExplorers: {
+    etherscan: {
+      name: "Etherscan",
+      url: "https://goerli.etherscan.io",
+    },
+    default: {
+      name: "Etherscan",
+      url: "https://goerli.etherscan.io",
+    },
+  },
+  contracts: {
+    ensRegistry: {
+      address: "0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e",
+    },
+    multicall3: {
+      address: "0xca11bde05977b3631167028862be2a173976ca11",
+      blockCreated: 6507670,
+    },
+  },
+  testnet: true,
+};
+
+const mainnet: Chain = {
+  id: 1,
+  network: "homestead",
+  name: "Ethereum",
+  nativeCurrency: { name: "Ether", symbol: "ETH", decimals: 18 },
+  rpcUrls: {
+    alchemy: {
+      http: ["https://eth-mainnet.g.alchemy.com/v2"],
+      webSocket: ["wss://eth-mainnet.g.alchemy.com/v2"],
+    },
+    infura: {
+      http: ["https://mainnet.infura.io/v3"],
+      webSocket: ["wss://mainnet.infura.io/ws/v3"],
+    },
+    default: {
+      http: ["https://cloudflare-eth.com"],
+    },
+    public: {
+      http: ["https://cloudflare-eth.com"],
+    },
+  },
+  blockExplorers: {
+    etherscan: {
+      name: "Etherscan",
+      url: "https://etherscan.io",
+    },
+    default: {
+      name: "Etherscan",
+      url: "https://etherscan.io",
+    },
+  },
+  contracts: {
+    ensRegistry: {
+      address: "0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e",
+    },
+    multicall3: {
+      address: "0xca11bde05977b3631167028862be2a173976ca11",
+      blockCreated: 14353601,
+    },
+  },
+};
+
+const optimism: Chain = {
+  id: 10,
+  name: "Optimism",
+  network: "optimism",
+  nativeCurrency: { name: "Ether", symbol: "ETH", decimals: 18 },
+  rpcUrls: {
+    alchemy: {
+      http: ["https://opt-mainnet.g.alchemy.com/v2"],
+      webSocket: ["wss://opt-mainnet.g.alchemy.com/v2"],
+    },
+    infura: {
+      http: ["https://optimism-mainnet.infura.io/v3"],
+      webSocket: ["wss://optimism-mainnet.infura.io/ws/v3"],
+    },
+    default: {
+      http: ["https://mainnet.optimism.io"],
+    },
+    public: {
+      http: ["https://mainnet.optimism.io"],
+    },
+  },
+  blockExplorers: {
+    etherscan: {
+      name: "Etherscan",
+      url: "https://optimistic.etherscan.io",
+    },
+    default: {
+      name: "Etherscan",
+      url: "https://optimistic.etherscan.io",
+    },
+  },
+  contracts: {
+    multicall3: {
+      address: "0xca11bde05977b3631167028862be2a173976ca11",
+      blockCreated: 4286263,
+    },
+  },
+};
+
+const optimismGoerli: Chain = {
+  id: 420,
+  name: "Optimism Goerli",
+  network: "optimism-goerli",
+  nativeCurrency: { name: "Goerli Ether", symbol: "ETH", decimals: 18 },
+  rpcUrls: {
+    alchemy: {
+      http: ["https://opt-goerli.g.alchemy.com/v2"],
+      webSocket: ["wss://opt-goerli.g.alchemy.com/v2"],
+    },
+    infura: {
+      http: ["https://optimism-goerli.infura.io/v3"],
+      webSocket: ["wss://optimism-goerli.infura.io/ws/v3"],
+    },
+    default: {
+      http: ["https://goerli.optimism.io"],
+    },
+    public: {
+      http: ["https://goerli.optimism.io"],
+    },
+  },
+  blockExplorers: {
+    etherscan: {
+      name: "Etherscan",
+      url: "https://goerli-optimism.etherscan.io",
+    },
+    default: {
+      name: "Etherscan",
+      url: "https://goerli-optimism.etherscan.io",
+    },
+  },
+  contracts: {
+    multicall3: {
+      address: "0xca11bde05977b3631167028862be2a173976ca11",
+      blockCreated: 49461,
+    },
+  },
+  testnet: true,
+};
+
+const polygon: Chain = {
+  id: 137,
+  name: "Polygon",
+  network: "matic",
+  nativeCurrency: { name: "MATIC", symbol: "MATIC", decimals: 18 },
+  rpcUrls: {
+    alchemy: {
+      http: ["https://polygon-mainnet.g.alchemy.com/v2"],
+      webSocket: ["wss://polygon-mainnet.g.alchemy.com/v2"],
+    },
+    infura: {
+      http: ["https://polygon-mainnet.infura.io/v3"],
+      webSocket: ["wss://polygon-mainnet.infura.io/ws/v3"],
+    },
+    default: {
+      http: ["https://polygon-rpc.com"],
+    },
+    public: {
+      http: ["https://polygon-rpc.com"],
+    },
+  },
+  blockExplorers: {
+    etherscan: {
+      name: "PolygonScan",
+      url: "https://polygonscan.com",
+    },
+    default: {
+      name: "PolygonScan",
+      url: "https://polygonscan.com",
+    },
+  },
+  contracts: {
+    multicall3: {
+      address: "0xca11bde05977b3631167028862be2a173976ca11",
+      blockCreated: 25770160,
+    },
+  },
+};
+
+const polygonMumbai: Chain = {
+  id: 80_001,
+  name: "Polygon Mumbai",
+  network: "maticmum",
+  nativeCurrency: { name: "MATIC", symbol: "MATIC", decimals: 18 },
+  rpcUrls: {
+    alchemy: {
+      http: ["https://polygon-mumbai.g.alchemy.com/v2"],
+      webSocket: ["wss://polygon-mumbai.g.alchemy.com/v2"],
+    },
+    infura: {
+      http: ["https://polygon-mumbai.infura.io/v3"],
+      webSocket: ["wss://polygon-mumbai.infura.io/ws/v3"],
+    },
+    default: {
+      http: ["https://matic-mumbai.chainstacklabs.com"],
+    },
+    public: {
+      http: ["https://matic-mumbai.chainstacklabs.com"],
+    },
+  },
+  blockExplorers: {
+    etherscan: {
+      name: "PolygonScan",
+      url: "https://mumbai.polygonscan.com",
+    },
+    default: {
+      name: "PolygonScan",
+      url: "https://mumbai.polygonscan.com",
+    },
+  },
+  contracts: {
+    multicall3: {
+      address: "0xca11bde05977b3631167028862be2a173976ca11",
+      blockCreated: 25770160,
+    },
+  },
+  testnet: true,
+};
+
+/**
+ * @public
+ */
+export enum ChainId {
+  Mainnet = 1,
+  Goerli = 5,
+  Polygon = 137,
+  Mumbai = 80001,
+  Fantom = 250,
+  FantomTestnet = 4002,
+  Avalanche = 43114,
+  AvalancheFujiTestnet = 43113,
+  Optimism = 10,
+  OptimismGoerli = 420,
+  Arbitrum = 42161,
+  ArbitrumGoerli = 421613,
+  BinanceSmartChainMainnet = 56,
+  BinanceSmartChainTestnet = 97,
+}
+
+/**
+ * @public
+ */
+export type SUPPORTED_CHAIN_ID =
+  | ChainId.Mainnet
+  | ChainId.Goerli
+  | ChainId.Mumbai
+  | ChainId.Polygon
+  | ChainId.Fantom
+  | ChainId.FantomTestnet
+  | ChainId.Avalanche
+  | ChainId.AvalancheFujiTestnet
+  | ChainId.Optimism
+  | ChainId.OptimismGoerli
+  | ChainId.Arbitrum
+  | ChainId.ArbitrumGoerli
+  | ChainId.BinanceSmartChainMainnet
+  | ChainId.BinanceSmartChainTestnet;
+
+/**
+ * @public
+ */
+export const SUPPORTED_CHAIN_IDS: SUPPORTED_CHAIN_ID[] = [
+  ChainId.Mainnet,
+  ChainId.Goerli,
+  ChainId.Polygon,
+  ChainId.Mumbai,
+  ChainId.Fantom,
+  ChainId.FantomTestnet,
+  ChainId.Avalanche,
+  ChainId.AvalancheFujiTestnet,
+  ChainId.Optimism,
+  ChainId.OptimismGoerli,
+  ChainId.Arbitrum,
+  ChainId.ArbitrumGoerli,
+  ChainId.BinanceSmartChainMainnet,
+  ChainId.BinanceSmartChainTestnet,
+];
+
+/**
+ * @public
+ */
+export const NATIVE_TOKEN_ADDRESS =
+  "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee";
+
+export const DEFAULT_API_KEY =
+  "c6634ad2d97b74baf15ff556016830c251050e6c36b9da508ce3ec80095d3dc1";
+
+function getRpcNameFromChainId(chainId: SUPPORTED_CHAIN_ID): string {
+  switch (chainId) {
+    case ChainId.Mainnet:
+      return "mainnet";
+    case ChainId.Goerli:
+      return "goerli";
+    case ChainId.Polygon:
+      return "polygon";
+    case ChainId.Mumbai:
+      return "mumbai";
+    case ChainId.Avalanche:
+      return "avalanche";
+    case ChainId.AvalancheFujiTestnet:
+      return "avalanche-fuji";
+    case ChainId.Fantom:
+      return "fantom";
+    case ChainId.FantomTestnet:
+      return "fantom-testnet";
+    case ChainId.Arbitrum:
+      return "arbitrum";
+    case ChainId.ArbitrumGoerli:
+      return "arbitrum-goerli";
+    case ChainId.Optimism:
+      return "optimism";
+    case ChainId.OptimismGoerli:
+      return "optimism-goerli";
+    case ChainId.BinanceSmartChainMainnet:
+      return "bsc";
+    case ChainId.BinanceSmartChainTestnet:
+      return "bsc-testnet";
+    default:
+      throw new Error("Unsupported chain id");
+  }
+}
+
+export function getRpcUrl(chainId: SUPPORTED_CHAIN_ID) {
+  return `https://${getRpcNameFromChainId(
+    chainId,
+  )}.rpc.thirdweb.com/${DEFAULT_API_KEY}`;
+}
+
+function enhanceChain<TChain extends Chain>(chain: TChain) {
+  const twRPC = getRpcUrl(chain.id);
+  return {
+    ...chain,
+    rpcUrls: {
+      ...chain.rpcUrls,
+      default: {
+        ...chain.rpcUrls.default,
+        http: [twRPC, ...chain.rpcUrls.default.http],
+      },
+      public: {
+        ...chain.rpcUrls.public,
+        http: [twRPC, ...(chain.rpcUrls.public?.http || [])],
+      },
+    },
+  } as TChain;
+}
+
+export const supportedChains: Record<SUPPORTED_CHAIN_ID, Chain> = {
+  [ChainId.Mainnet]: enhanceChain(mainnet),
+  [ChainId.Goerli]: enhanceChain(goerli),
+  [ChainId.Polygon]: enhanceChain(polygon),
+  [ChainId.Mumbai]: enhanceChain(polygonMumbai),
+  [ChainId.Avalanche]: enhanceChain(avalanche),
+  [ChainId.AvalancheFujiTestnet]: enhanceChain(avalancheFuji),
+  [ChainId.Fantom]: enhanceChain(fantom),
+  [ChainId.FantomTestnet]: enhanceChain(fantomTestnet),
+  [ChainId.Arbitrum]: enhanceChain(arbitrum),
+  [ChainId.ArbitrumGoerli]: enhanceChain(arbitrumGoerli),
+  [ChainId.Optimism]: enhanceChain(optimism),
+  [ChainId.OptimismGoerli]: enhanceChain(optimismGoerli),
+  [ChainId.BinanceSmartChainMainnet]: enhanceChain(bsc),
+  [ChainId.BinanceSmartChainTestnet]: enhanceChain(bscTestnet),
+};
+
+export const thirdwebChains: Chain[] = Object.values(supportedChains);
@@ -0,0 +1,93 @@
+import { SUPPORTED_CHAIN_ID, supportedChains } from "./evm";
+import type { Ecosystem, GenericAuthWallet } from "@thirdweb-dev/wallets";
+import { ethers } from "ethers";
+
+const EIP1271_ABI = [
+  "function isValidSignature(bytes32 _message, bytes _signature) public view returns (bytes4)",
+];
+const EIP1271_MAGICVALUE = "0x1626ba7e";
+
+export const checkContractWalletSignature = async (
+  message: string,
+  signature: string,
+  address: string,
+  chainId: number,
+): Promise<boolean> => {
+  const rpcUrl =
+    supportedChains[chainId as SUPPORTED_CHAIN_ID]?.rpcUrls.default.http[0];
+  if (!rpcUrl) {
+    return false;
+  }
+
+  const provider = new ethers.providers.JsonRpcProvider(rpcUrl);
+  const walletContract = new ethers.Contract(address, EIP1271_ABI, provider);
+  const hashMessage = ethers.utils.hashMessage(message);
+  try {
+    const res = await walletContract.isValidSignature(hashMessage, signature);
+    return res === EIP1271_MAGICVALUE;
+  } catch {
+    return false;
+  }
+};
+
+export class SignerWallet implements GenericAuthWallet {
+  type: Ecosystem = "evm";
+  #signer: ethers.Signer;
+
+  constructor(signer: ethers.Signer) {
+    this.#signer = signer;
+  }
+
+  public async getAddress(): Promise<string> {
+    return this.#signer.getAddress();
+  }
+
+  public async getChainId(): Promise<number> {
+    return this.#signer.getChainId();
+  }
+
+  public async signMessage(message: string): Promise<string> {
+    return await this.#signer.signMessage(message);
+  }
+
+  public async verifySignature(
+    message: string,
+    signature: string,
+    address: string,
+    chainId?: number,
+  ): Promise<boolean> {
+    const messageHash = ethers.utils.hashMessage(message);
+    const messageHashBytes = ethers.utils.arrayify(messageHash);
+    const recoveredAddress = ethers.utils.recoverAddress(
+      messageHashBytes,
+      signature,
+    );
+
+    if (recoveredAddress === address) {
+      return true;
+    }
+
+    // Check if the address is a smart contract wallet
+    if (chainId !== undefined) {
+      try {
+        const isValid = await checkContractWalletSignature(
+          message,
+          signature,
+          address,
+          chainId || 1,
+        );
+        return isValid;
+      } catch {
+        // no-op
+      }
+    }
+
+    return false;
+  }
+}
+
+export class PrivateKeyWallet extends SignerWallet {
+  constructor(privateKey: string) {
+    super(new ethers.Wallet(privateKey));
+  }
+}
@@ -1,68 +0,0 @@
-import loginHandler from "./routes/login";
-import logoutHandler from "./routes/logout";
-import userHandler from "./routes/user";
-import {
-  ThirdwebAuthConfig,
-  ThirdwebAuthRoute,
-  ThirdwebAuthUser,
-} from "./types";
-import { ThirdwebSDK } from "@thirdweb-dev/sdk";
-import cookieParser from "cookie-parser";
-import { Express, NextFunction, Request, Response } from "express";
-
-export * from "./types";
-
-export function getUser(req: Request): ThirdwebAuthUser | null {
-  return req.user;
-}
-
-export function ThirdwebAuth(app: Express, cfg: ThirdwebAuthConfig) {
-  const ctx = {
-    ...cfg,
-    sdk: ThirdwebSDK.fromPrivateKey(cfg.privateKey, "mainnet"),
-  };
-
-  const authUrl = cfg.authUrl?.replace(/\/$/, "") || "/auth";
-
-  app.use(cookieParser());
-
-  app.use(async (req: Request, _: Response, next: NextFunction) => {
-    const { sdk, domain } = ctx;
-    let user = null;
-    const token = req.cookies.thirdweb_auth_token;
-
-    if (token) {
-      try {
-        const address = await sdk.auth.authenticate(domain, token);
-
-        if (ctx.callbacks?.user) {
-          user = await ctx.callbacks.user(address);
-        }
-
-        user = { ...user, address };
-      } catch {
-        // No-op
-      }
-    }
-
-    req.user = user as ThirdwebAuthUser | null;
-    next();
-  });
-
-  app.get(`${authUrl}/:route`, (req: Request, res: Response) => {
-    const action = req.params.route as ThirdwebAuthRoute;
-
-    switch (action) {
-      case "login":
-        return loginHandler(req, res, ctx);
-      case "user":
-        return userHandler(req, res);
-      case "logout":
-        return logoutHandler(req, res);
-      default:
-        return res.status(400).json({
-          message: "Invalid route for authentication.",
-        });
-    }
-  });
-}
@@ -1,56 +0,0 @@
-import { ThirdwebAuthContext } from "../types";
-import { LoginPayload } from "@thirdweb-dev/sdk";
-import { serialize } from "cookie";
-import { Request, Response } from "express";
-
-function redirectWithError(req: Request, res: Response, error: string) {
-  const encodedError = encodeURIComponent(error);
-  const url = new URL(req.headers.referer as string);
-  url.searchParams.set("error", encodedError);
-  return res.redirect(url.toString());
-}
-
-export default async function handler(
-  req: Request,
-  res: Response,
-  ctx: ThirdwebAuthContext,
-) {
-  if (req.method !== "GET") {
-    return redirectWithError(req, res, "INVALID_METHOD");
-  }
-
-  const { sdk, domain } = ctx;
-
-  // Get signed login payload from the frontend
-  const payload = JSON.parse(atob(req.query.payload as string)) as LoginPayload;
-  if (!payload) {
-    redirectWithError(req, res, "MISSING_LOGIN_PAYLOAD");
-  }
-
-  let token;
-  try {
-    // Generate an access token with the SDK using the signed payload
-    token = await sdk.auth.generateAuthToken(domain, payload);
-  } catch {
-    return redirectWithError(req, res, "INVALID_LOGIN_PAYLOAD");
-  }
-
-  // Securely set httpOnly cookie on request to prevent XSS on frontend
-  // And set path to / to enable thirdweb_auth_token usage on all endpoints
-  res.setHeader(
-    "Set-Cookie",
-    serialize("thirdweb_auth_token", token, {
-      path: "/",
-      httpOnly: true,
-      secure: true,
-      sameSite: "strict",
-    }),
-  );
-
-  if (ctx.callbacks?.login) {
-    const address = sdk.auth.verify(domain, payload);
-    await ctx.callbacks.login(address);
-  }
-
-  return res.status(301).redirect(req.query.redirect as string);
-}
@@ -1,21 +0,0 @@
-import { serialize } from "cookie";
-import { Request, Response } from "express";
-
-export default async function handler(req: Request, res: Response) {
-  if (req.method !== "GET") {
-    return res.status(400).json({
-      error: "Invalid method. Only GET supported.",
-    });
-  }
-
-  // Set the access token to 'none' and expire in 5 seconds
-  res.setHeader(
-    "Set-Cookie",
-    serialize("thirdweb_auth_token", "", {
-      path: "/",
-      expires: new Date(Date.now() + 5 * 1000),
-    }),
-  );
-
-  return res.status(301).redirect(req.headers.referer as string);
-}
@@ -1,11 +0,0 @@
-import { Request, Response } from "express";
-
-export default async function handler(req: Request, res: Response) {
-  if (req.method !== "GET") {
-    return res.status(400).json({
-      error: "Invalid method. Only GET supported.",
-    });
-  }
-
-  return res.status(200).json(req.user);
-}
@@ -1,12 +0,0 @@
-import { ThirdwebAuthUser } from "..";
-
-export {};
-
-declare global {
-  // eslint-disable-next-line @typescript-eslint/no-namespace
-  namespace Express {
-    export interface Request {
-      user: ThirdwebAuthUser | null;
-    }
-  }
-}
@@ -1,40 +0,0 @@
-import { ThirdwebSDK } from "@thirdweb-dev/sdk";
-import { Request } from "express";
-
-export type ThirdwebAuthRoute = "login" | "user" | "logout";
-
-export type ThirdwebAuthConfig = {
-  privateKey: string;
-  domain: string;
-  authUrl?: string;
-  callbacks?: {
-    login?: (address: string) => Promise<void> | void;
-    user?: (
-      address: string,
-    ) =>
-      | Promise<Omit<ThirdwebAuthUser, "address">>
-      | Omit<ThirdwebAuthUser, "address">;
-  };
-};
-
-export type ThirdwebAuthContext = {
-  sdk: ThirdwebSDK;
-  domain: string;
-  callbacks?: {
-    login?: (address: string) => Promise<void> | void;
-    user?: (
-      address: string,
-    ) =>
-      | Promise<Omit<ThirdwebAuthUser, "address">>
-      | Omit<ThirdwebAuthUser, "address">;
-  };
-};
-
-export type ThirdwebAuthUser = {
-  address: string;
-  [key: string]: any;
-};
-
-export type RequestWithUser = Request & {
-  user: ThirdwebAuthUser | null;
-};
@@ -0,0 +1,60 @@
+import { Json } from "../../core/schema";
+import { ThirdwebAuthContext, ThirdwebAuthUser } from "../types";
+import { Request } from "express";
+
+function getToken(req: Request): string | undefined {
+  if (req.headers["authorization"]) {
+    const authorizationHeader = req.headers["authorization"].split(" ");
+    if (authorizationHeader?.length === 2) {
+      return authorizationHeader[1];
+    }
+
+    return undefined;
+  }
+
+  const cookie: string | undefined = !req.cookies
+    ? undefined
+    : typeof req.cookies.get === "function"
+    ? (req.cookies as any).get("thirdweb_auth_token")
+    : (req.cookies as any).thirdweb_auth_token;
+
+  return cookie;
+}
+
+export async function getUser<
+  TData extends Json = Json,
+  TSession extends Json = Json,
+>(
+  req: Request,
+  ctx: ThirdwebAuthContext<TData, TSession>,
+): Promise<ThirdwebAuthUser<TData, TSession> | null> {
+  const token = getToken(req);
+
+  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) {
+    return authenticatedUser;
+  }
+
+  const data = await ctx.callbacks.onUser(authenticatedUser);
+  if (!data) {
+    return authenticatedUser;
+  }
+
+  return { ...authenticatedUser, data: data };
+}
@@ -1 +1,63 @@
-export * from "./evm";
+import { Json, ThirdwebAuth as ThirdwebAuthSDK } from "../core";
+import { getUser } from "./helpers/user";
+import loginHandler from "./routes/login";
+import logoutHandler from "./routes/logout";
+import userHandler from "./routes/user";
+import { ThirdwebAuthConfig, ThirdwebAuthContext } from "./types";
+import cookieParser from "cookie-parser";
+import express, { Request, Response } from "express";
+
+export * from "./types";
+
+const asyncHandler =
+  (fn: CallableFunction) =>
+  (...args: any[]) => {
+    const fnReturn = fn(...args);
+    const next = args[args.length - 1];
+    return Promise.resolve(fnReturn).catch(next);
+  };
+
+export function ThirdwebAuth<
+  TData extends Json = Json,
+  TSession extends Json = Json,
+>(cfg: ThirdwebAuthConfig<TData, TSession>) {
+  const ctx = {
+    ...cfg,
+    auth: new ThirdwebAuthSDK(cfg.wallet, cfg.domain),
+  };
+
+  const router = express.Router();
+  const cookieMiddleware = cookieParser();
+
+  router.use(express.json());
+  router.use(cookieMiddleware);
+
+  router.post(
+    "/login",
+    asyncHandler((req: Request, res: Response) =>
+      loginHandler(req, res, ctx as ThirdwebAuthContext),
+    ),
+  );
+
+  router.get(
+    "/user",
+    asyncHandler((req: Request, res: Response) =>
+      userHandler(req, res, ctx as ThirdwebAuthContext),
+    ),
+  );
+
+  router.post(
+    "/logout",
+    asyncHandler((req: Request, res: Response) =>
+      logoutHandler(req, res, ctx as ThirdwebAuthContext),
+    ),
+  );
+
+  return {
+    authRouter: router,
+    authMiddleware: cookieMiddleware,
+    getUser: (req: Request) => {
+      return getUser<TData, TSession>(req, ctx);
+    },
+  };
+}
@@ -0,0 +1,82 @@
+import { GenerateOptions } from "../../core";
+import { LoginPayloadBodySchema, ThirdwebAuthContext } from "../types";
+import { serialize } from "cookie";
+import { Request, Response } from "express";
+
+export default async function handler(
+  req: Request,
+  res: Response,
+  ctx: ThirdwebAuthContext,
+) {
+  if (req.method !== "POST") {
+    return res.status(405).json({ error: "Method not allowed" });
+  }
+
+  const parsedPayload = LoginPayloadBodySchema.safeParse(req.body);
+
+  // Get signed login payload from the frontend
+  if (!parsedPayload.success) {
+    return res.status(400).json({ error: "Invalid login payload" });
+  }
+
+  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, req);
+    }
+  };
+
+  const expirationTime = ctx.authOptions?.tokenDurationInSeconds
+    ? new Date(Date.now() + 1000 * ctx.authOptions.tokenDurationInSeconds)
+    : undefined;
+
+  const generateOptions: GenerateOptions = {
+    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 res.status(400).json({ error: err.message });
+    } else if (typeof err === "string") {
+      return res.status(400).json({ error: err });
+    } else {
+      return res.status(400).json({ error: "Invalid login payload" });
+    }
+  }
+
+  // Securely set httpOnly cookie on request to prevent XSS on frontend
+  // And set path to / to enable thirdweb_auth_token usage on all endpoints
+  res.setHeader(
+    "Set-Cookie",
+    serialize("thirdweb_auth_token", token, {
+      domain: ctx.cookieOptions?.domain,
+      path: ctx.cookieOptions?.path || "/",
+      sameSite: ctx.cookieOptions?.sameSite || "none",
+      httpOnly: true,
+      secure: true,
+    }),
+  );
+
+  // Send token in body and as cookie for frontend and backend use cases
+  return res.status(200).json({ token });
+}
@@ -0,0 +1,35 @@
+import { getUser } from "../helpers/user";
+import { ThirdwebAuthContext } from "../types";
+import { serialize } from "cookie";
+import { Request, Response } from "express";
+
+export default async function handler(
+  req: Request,
+  res: Response,
+  ctx: ThirdwebAuthContext,
+) {
+  if (req.method !== "POST") {
+    return res.status(405).json({
+      error: "Invalid method. Only POST supported.",
+    });
+  }
+
+  if (ctx.callbacks?.onLogout) {
+    const user = await getUser(req, ctx);
+    if (user) {
+      await ctx.callbacks.onLogout(user, req);
+    }
+  }
+
+  // Set the access token to 'none' and expire in 5 seconds
+  res.setHeader(
+    "Set-Cookie",
+    serialize("thirdweb_auth_token", "", {
+      domain: ctx.cookieOptions?.domain,
+      path: ctx.cookieOptions?.path || "/",
+      expires: new Date(Date.now() + 5 * 1000),
+    }),
+  );
+
+  return res.status(200).json({ message: "Succesfully logged out" });
+}
@@ -0,0 +1,18 @@
+import { getUser } from "../helpers/user";
+import { ThirdwebAuthContext } from "../types";
+import { Request, Response } from "express";
+
+export default async function handler(
+  req: Request,
+  res: Response,
+  ctx: ThirdwebAuthContext,
+) {
+  if (req.method !== "GET") {
+    return res.status(400).json({
+      error: "Invalid method. Only GET supported.",
+    });
+  }
+
+  const user = await getUser(req, ctx);
+  return res.status(200).json(user);
+}
@@ -0,0 +1,63 @@
+import { ThirdwebAuth } from "../../core";
+import { Json, LoginPayloadOutputSchema, User } from "../../core/schema";
+import { GenericAuthWallet } from "@thirdweb-dev/wallets";
+import { Request } from "express";
+import { z } from "zod";
+
+export const LoginPayloadBodySchema = z.object({
+  payload: LoginPayloadOutputSchema,
+});
+
+export type ThirdwebAuthRoute = "login" | "user" | "logout";
+
+export type ThirdwebAuthUser<
+  TData extends Json = Json,
+  TSession extends Json = Json,
+> = User<TSession> & {
+  data?: TData;
+};
+
+export type ThirdwebAuthConfig<
+  TData extends Json = Json,
+  TSession extends Json = Json,
+> = {
+  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>);
+    tokenDurationInSeconds?: number;
+  };
+  cookieOptions?: {
+    domain?: string;
+    path?: string;
+    sameSite?: "lax" | "strict" | "none";
+  };
+  callbacks?: {
+    onLogin?:
+      | ((address: string, req?: Request) => void | TSession)
+      | ((address: string, req?: Request) => Promise<void | TSession>);
+    onUser?:
+      | ((user: User<TSession>, req?: Request) => void | TData)
+      | ((user: User<TSession>, req?: Request) => Promise<void | TData>);
+    onLogout?:
+      | ((user: User, req?: Request) => void)
+      | ((user: User, req?: Request) => 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 @@
+export * from "./core";
@@ -1,145 +0,0 @@
-import { ThirdwebNextAuthConfig } from "./types";
-import { ThirdwebSDK } from "@thirdweb-dev/sdk";
-import { serialize } from "cookie";
-import {
-  GetServerSidePropsContext,
-  NextApiRequest,
-  NextApiResponse,
-} from "next";
-import NextAuth, {
-  NextAuthOptions,
-  Session,
-  unstable_getServerSession,
-} from "next-auth";
-import CredentialsProvider from "next-auth/providers/credentials";
-
-export function ThirdwebNextAuth(cfg: ThirdwebNextAuthConfig) {
-  const sdk = ThirdwebSDK.fromPrivateKey(cfg.privateKey, "mainnet");
-
-  function ThirdwebProvider(res: GetServerSidePropsContext["res"]) {
-    return CredentialsProvider({
-      name: "ThirdwebAuth",
-      credentials: {
-        payload: {
-          label: "Payload",
-          type: "text",
-          placeholder: "",
-        },
-      },
-      async authorize({ payload }: any) {
-        try {
-          const parsed = JSON.parse(payload);
-          const token = await sdk.auth.generateAuthToken(cfg.domain, parsed);
-          const address = await sdk.auth.authenticate(cfg.domain, 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
-          res.setHeader(
-            "Set-Cookie",
-            serialize("thirdweb_auth_token", token, {
-              path: "/",
-              httpOnly: true,
-              secure: true,
-              sameSite: "strict",
-            }),
-          );
-
-          return { address };
-        } catch (err) {
-          return null;
-        }
-      },
-    });
-  }
-
-  function nextOptions(
-    req: GetServerSidePropsContext["req"],
-    res: GetServerSidePropsContext["res"],
-  ): NextAuthOptions {
-    async function session({
-      session: _session,
-    }: {
-      session: Session;
-    }): Promise<Session> {
-      const token = req.cookies.thirdweb_auth_token || "";
-      try {
-        const address = await sdk.auth.authenticate(cfg.domain, token);
-        _session.user = { ..._session.user, address } as Session["user"];
-        return _session;
-      } catch {
-        return _session;
-      }
-    }
-
-    function signOut() {
-      res.setHeader(
-        "Set-Cookie",
-        serialize("thirdweb_auth_token", "", {
-          path: "/",
-          expires: new Date(Date.now() + 5 * 1000),
-        }),
-      );
-    }
-
-    const providers: NextAuthOptions["providers"] = [
-      ...cfg.nextOptions.providers,
-      ThirdwebProvider(res),
-    ];
-
-    const configSession = cfg.nextOptions.callbacks?.session;
-    const callbacks: NextAuthOptions["callbacks"] = {
-      ...cfg.nextOptions.callbacks,
-      session: configSession
-        ? async (params) => {
-            params.session = await session(params);
-            return configSession(params);
-          }
-        : session,
-    };
-
-    const configSignOut = cfg.nextOptions.events?.signOut;
-    const events: NextAuthOptions["events"] = {
-      ...cfg.nextOptions.events,
-      signOut: configSignOut
-        ? async (params) => {
-            signOut();
-            return configSignOut(params);
-          }
-        : signOut,
-    };
-
-    return {
-      ...cfg.nextOptions,
-      providers,
-      callbacks,
-      events,
-    };
-  }
-
-  async function getUser(
-    ...args:
-      | [NextApiRequest, NextApiResponse]
-      | [GetServerSidePropsContext["req"], GetServerSidePropsContext["res"]]
-  ) {
-    return unstable_getServerSession(
-      args[0],
-      args[1],
-      nextOptions(args[0], args[1]),
-    );
-  }
-
-  function NextAuthHandler(...args: [] | [NextApiRequest, NextApiResponse]) {
-    if (args.length === 0) {
-      return (req: NextApiRequest, res: NextApiResponse) => {
-        return NextAuth(req, res, nextOptions(req, res));
-      };
-    }
-
-    return NextAuth(args[0], args[1], nextOptions(args[0], args[1]));
-  }
-
-  return {
-    NextAuthHandler,
-    getUser,
-  };
-}
@@ -1 +1,145 @@
-export * from "./evm";
+import { ThirdwebAuth } from "../core";
+import { ThirdwebNextAuthConfig } from "./types";
+import { serialize } from "cookie";
+import {
+  GetServerSidePropsContext,
+  NextApiRequest,
+  NextApiResponse,
+} from "next";
+import NextAuth, {
+  NextAuthOptions,
+  Session,
+  unstable_getServerSession,
+} from "next-auth";
+import CredentialsProvider from "next-auth/providers/credentials";
+
+export function ThirdwebNextAuth(cfg: ThirdwebNextAuthConfig) {
+  const auth = new ThirdwebAuth(cfg.wallet, cfg.domain);
+
+  function ThirdwebProvider(res: GetServerSidePropsContext["res"]) {
+    return CredentialsProvider({
+      name: "ThirdwebAuth",
+      credentials: {
+        payload: {
+          label: "Payload",
+          type: "text",
+          placeholder: "",
+        },
+      },
+      async authorize({ payload }: any) {
+        try {
+          const parsed = JSON.parse(payload);
+          const token = await auth.generate(parsed);
+          const user = await auth.authenticate(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
+          res.setHeader(
+            "Set-Cookie",
+            serialize("thirdweb_auth_token", token, {
+              path: "/",
+              httpOnly: true,
+              secure: true,
+              sameSite: "none",
+            }),
+          );
+
+          return { id: user.address, address: user.address };
+        } catch (err) {
+          return null;
+        }
+      },
+    });
+  }
+
+  function nextOptions(
+    req: GetServerSidePropsContext["req"],
+    res: GetServerSidePropsContext["res"],
+  ): NextAuthOptions {
+    async function session({
+      session: _session,
+    }: {
+      session: Session;
+    }): Promise<Session> {
+      const token = req.cookies.thirdweb_auth_token || "";
+      try {
+        const address = await auth.authenticate(token);
+        _session.user = { ..._session.user, address } as Session["user"];
+        return _session;
+      } catch {
+        return _session;
+      }
+    }
+
+    function signOut() {
+      res.setHeader(
+        "Set-Cookie",
+        serialize("thirdweb_auth_token", "", {
+          path: "/",
+          expires: new Date(Date.now() + 5 * 1000),
+        }),
+      );
+    }
+
+    const providers: NextAuthOptions["providers"] = [
+      ...cfg.nextOptions.providers,
+      ThirdwebProvider(res),
+    ];
+
+    const configSession = cfg.nextOptions.callbacks?.session;
+    const callbacks: NextAuthOptions["callbacks"] = {
+      ...cfg.nextOptions.callbacks,
+      session: configSession
+        ? async (params) => {
+            params.session = await session(params);
+            return configSession(params);
+          }
+        : session,
+    };
+
+    const configSignOut = cfg.nextOptions.events?.signOut;
+    const events: NextAuthOptions["events"] = {
+      ...cfg.nextOptions.events,
+      signOut: configSignOut
+        ? async (params) => {
+            signOut();
+            return configSignOut(params);
+          }
+        : signOut,
+    };
+
+    return {
+      ...cfg.nextOptions,
+      providers,
+      callbacks,
+      events,
+    };
+  }
+
+  async function getUser(
+    ...args:
+      | [NextApiRequest, NextApiResponse]
+      | [GetServerSidePropsContext["req"], GetServerSidePropsContext["res"]]
+  ) {
+    return unstable_getServerSession(
+      args[0],
+      args[1],
+      nextOptions(args[0], args[1]),
+    );
+  }
+
+  function NextAuthHandler(...args: [] | [NextApiRequest, NextApiResponse]) {
+    if (args.length === 0) {
+      return (req: NextApiRequest, res: NextApiResponse) => {
+        return NextAuth(req, res, nextOptions(req, res));
+      };
+    }
+
+    return NextAuth(args[0], args[1], nextOptions(args[0], args[1]));
+  }
+
+  return {
+    NextAuthHandler,
+    getUser,
+  };
+}
@@ -1,7 +1,8 @@
+import { GenericAuthWallet } from "@thirdweb-dev/wallets";
 import { NextAuthOptions } from "next-auth";

 export type ThirdwebNextAuthConfig = {
-  privateKey: string;
  domain: string;
+  wallet: GenericAuthWallet;
  nextOptions: NextAuthOptions;
 };
@@ -1,83 +0,0 @@
-import loginHandler from "./routes/login";
-import logoutHandler from "./routes/logout";
-import userHandler from "./routes/user";
-import {
-  ThirdwebAuthConfig,
-  ThirdwebAuthContext,
-  ThirdwebAuthRoute,
-  ThirdwebAuthUser,
-} from "./types";
-import { ThirdwebSDK } from "@thirdweb-dev/sdk";
-import { NextRequest } from "next/server";
-import {
-  GetServerSidePropsContext,
-  NextApiRequest,
-  NextApiResponse,
-} from "next/types";
-
-export * from "./types";
-
-async function ThirdwebAuthRouter(
-  req: NextApiRequest,
-  res: NextApiResponse,
-  ctx: ThirdwebAuthContext,
-) {
-  // Catch-all route must be named with [...thirdweb]
-  const { thirdweb } = req.query;
-  const action = thirdweb?.[0] as ThirdwebAuthRoute;
-
-  switch (action) {
-    case "login":
-      return await loginHandler(req, res, ctx);
-    case "user":
-      return await userHandler(req, res, ctx);
-    case "logout":
-      return await logoutHandler(req, res);
-    default:
-      return res.status(400).json({
-        message: "Invalid route for authentication.",
-      });
-  }
-}
-
-export function ThirdwebAuth(cfg: ThirdwebAuthConfig) {
-  const ctx = {
-    ...cfg,
-    sdk: ThirdwebSDK.fromPrivateKey(cfg.privateKey, "mainnet"),
-  };
-
-  function ThirdwebAuthHandler(
-    ...args: [] | [NextApiRequest, NextApiResponse]
-  ) {
-    if (args.length === 0) {
-      return async (req: NextApiRequest, res: NextApiResponse) =>
-        await ThirdwebAuthRouter(req, res, ctx);
-    }
-
-    return ThirdwebAuthRouter(args[0], args[1], ctx);
-  }
-
-  async function getUser(
-    req: GetServerSidePropsContext["req"] | NextRequest | NextApiRequest,
-  ) {
-    const { sdk, domain } = ctx;
-    let user: ThirdwebAuthUser | null = null;
-    const token =
-      typeof req.cookies.get === "function"
-        ? (req.cookies as any).get("thirdweb_auth_token")
-        : (req.cookies as any).thirdweb_auth_token;
-
-    if (token) {
-      try {
-        const address = await sdk.auth.authenticate(domain, token);
-        user = { address };
-      } catch {
-        // No-op
-      }
-    }
-
-    return user;
-  }
-
-  return { ThirdwebAuthHandler, getUser };
-}
@@ -1,60 +0,0 @@
-import { ThirdwebAuthContext } from "../types";
-import { LoginPayload } from "@thirdweb-dev/sdk";
-import { serialize } from "cookie";
-import { NextApiRequest, NextApiResponse } from "next";
-
-function redirectWithError(
-  req: NextApiRequest,
-  res: NextApiResponse,
-  error: string,
-) {
-  const encodedError = encodeURIComponent(error);
-  const url = new URL(req.headers.referer as string);
-  url.searchParams.set("error", encodedError);
-  return res.redirect(url.toString());
-}
-
-export default async function handler(
-  req: NextApiRequest,
-  res: NextApiResponse,
-  ctx: ThirdwebAuthContext,
-) {
-  if (req.method !== "GET") {
-    return redirectWithError(req, res, "INVALID_METHOD");
-  }
-
-  const { sdk, domain } = ctx;
-
-  // Get signed login payload from the frontend
-  const payload = JSON.parse(atob(req.query.payload as string)) as LoginPayload;
-  if (!payload) {
-    redirectWithError(req, res, "MISSING_LOGIN_PAYLOAD");
-  }
-
-  let token;
-  try {
-    // Generate an access token with the SDK using the signed payload
-    token = await sdk.auth.generateAuthToken(domain, payload);
-  } catch {
-    return redirectWithError(req, res, "INVALID_LOGIN_PAYLOAD");
-  }
-
-  // Securely set httpOnly cookie on request to prevent XSS on frontend
-  // And set path to / to enable thirdweb_auth_token usage on all endpoints
-  res.setHeader(
-    "Set-Cookie",
-    serialize("thirdweb_auth_token", token, {
-      path: "/",
-      httpOnly: true,
-      secure: true,
-      sameSite: "strict",
-    }),
-  );
-
-  if (ctx.callbacks?.login) {
-    const address = sdk.auth.verify(domain, payload);
-    await ctx.callbacks.login(address);
-  }
-
-  return res.status(301).redirect(req.query.redirect as string);
-}
@@ -1,24 +0,0 @@
-import { serialize } from "cookie";
-import { NextApiRequest, NextApiResponse } from "next";
-
-export default async function handler(
-  req: NextApiRequest,
-  res: NextApiResponse,
-) {
-  if (req.method !== "GET") {
-    return res.status(400).json({
-      error: "Invalid method. Only GET supported.",
-    });
-  }
-
-  // Set the access token to 'none' and expire in 5 seconds
-  res.setHeader(
-    "Set-Cookie",
-    serialize("thirdweb_auth_token", "", {
-      path: "/",
-      expires: new Date(Date.now() + 5 * 1000),
-    }),
-  );
-
-  return res.status(301).redirect(req.headers.referer as string);
-}
@@ -1,34 +0,0 @@
-import { ThirdwebAuthContext, ThirdwebAuthUser } from "../types";
-import { NextApiRequest, NextApiResponse } from "next";
-
-export default async function handler(
-  req: NextApiRequest,
-  res: NextApiResponse,
-  ctx: ThirdwebAuthContext,
-) {
-  if (req.method !== "GET") {
-    return res.status(400).json({
-      error: "Invalid method. Only GET supported.",
-    });
-  }
-
-  const { sdk, domain } = ctx;
-  let user = null;
-  const token = req.cookies.thirdweb_auth_token;
-
-  if (token) {
-    try {
-      const address = await sdk.auth.authenticate(domain, token);
-
-      if (ctx.callbacks?.user) {
-        user = await ctx.callbacks.user(address);
-      }
-
-      user = { ...user, address };
-    } catch {
-      // No-op
-    }
-  }
-
-  return res.status(200).json(user as ThirdwebAuthUser | null);
-}
@@ -1,34 +0,0 @@
-import { ThirdwebSDK } from "@thirdweb-dev/sdk";
-
-export type ThirdwebAuthRoute = "login" | "logout" | "user";
-
-export type ThirdwebAuthConfig = {
-  privateKey: string;
-  domain: string;
-  callbacks?: {
-    login?: (address: string) => Promise<void> | void;
-    user?: (
-      address: string,
-    ) =>
-      | Promise<Omit<ThirdwebAuthUser, "address">>
-      | Omit<ThirdwebAuthUser, "address">;
-  };
-};
-
-export type ThirdwebAuthContext = {
-  sdk: ThirdwebSDK;
-  domain: string;
-  callbacks?: {
-    login?: (address: string) => Promise<void> | void;
-    user?: (
-      address: string,
-    ) =>
-      | Promise<Omit<ThirdwebAuthUser, "address">>
-      | Omit<ThirdwebAuthUser, "address">;
-  };
-};
-
-export type ThirdwebAuthUser = {
-  address: string;
-  [key: string]: any;
-};
@@ -0,0 +1,65 @@
+import { Json } from "../../core/schema";
+import { ThirdwebAuthContext, ThirdwebAuthUser } from "../types";
+import { GetServerSidePropsContext, NextApiRequest } from "next";
+import { NextRequest } from "next/server";
+
+function getToken(
+  req: GetServerSidePropsContext["req"] | NextRequest | NextApiRequest,
+): string | undefined {
+  if (!!(req as NextApiRequest).headers["authorization"]) {
+    const authorizationHeader = (req as NextApiRequest).headers[
+      "authorization"
+    ]?.split(" ");
+    if (authorizationHeader?.length === 2) {
+      return authorizationHeader[1];
+    }
+
+    return undefined;
+  }
+
+  const cookie: string | undefined = !req.cookies
+    ? undefined
+    : typeof req.cookies.get === "function"
+    ? (req.cookies as any).get("thirdweb_auth_token")
+    : (req.cookies as any).thirdweb_auth_token;
+
+  return cookie;
+}
+
+export async function getUser<
+  TData extends Json = Json,
+  TSession extends Json = Json,
+>(
+  req: GetServerSidePropsContext["req"] | NextRequest | NextApiRequest,
+  ctx: ThirdwebAuthContext<TData, TSession>,
+): Promise<ThirdwebAuthUser<TData, TSession> | null> {
+  const token = getToken(req);
+
+  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) {
+    return authenticatedUser;
+  }
+
+  const data = await ctx.callbacks.onUser(authenticatedUser);
+  if (!data) {
+    return authenticatedUser;
+  }
+
+  return { ...authenticatedUser, data: data };
+}
@@ -1 +1,71 @@
-export * from "./evm";
+import { Json, ThirdwebAuth as ThirdwebAuthSDK } from "../core";
+import { getUser } from "./helpers/user";
+import loginHandler from "./routes/login";
+import logoutHandler from "./routes/logout";
+import userHandler from "./routes/user";
+import {
+  ThirdwebAuthConfig,
+  ThirdwebAuthContext,
+  ThirdwebAuthRoute,
+} from "./types";
+import { NextRequest } from "next/server";
+import {
+  GetServerSidePropsContext,
+  NextApiRequest,
+  NextApiResponse,
+} from "next/types";
+
+export * from "./types";
+
+async function ThirdwebAuthRouter(
+  req: NextApiRequest,
+  res: NextApiResponse,
+  ctx: ThirdwebAuthContext,
+) {
+  // Catch-all route must be named with [...thirdweb]
+  const { thirdweb } = req.query;
+  const action = thirdweb?.[0] as ThirdwebAuthRoute;
+
+  switch (action) {
+    case "login":
+      return await loginHandler(req, res, ctx);
+    case "user":
+      return await userHandler(req, res, ctx);
+    case "logout":
+      return await logoutHandler(req, res, ctx);
+    default:
+      return res.status(400).json({
+        message: "Invalid route for authentication.",
+      });
+  }
+}
+
+export function ThirdwebAuth<
+  TData extends Json = Json,
+  TSession extends Json = Json,
+>(cfg: ThirdwebAuthConfig<TData, TSession>) {
+  const ctx = {
+    ...cfg,
+    auth: new ThirdwebAuthSDK(cfg.wallet, cfg.domain),
+  };
+
+  function ThirdwebAuthHandler(
+    ...args: [] | [NextApiRequest, NextApiResponse]
+  ) {
+    if (args.length === 0) {
+      return async (req: NextApiRequest, res: NextApiResponse) =>
+        await ThirdwebAuthRouter(req, res, ctx as ThirdwebAuthContext);
+    }
+
+    return ThirdwebAuthRouter(args[0], args[1], ctx as ThirdwebAuthContext);
+  }
+
+  return {
+    ThirdwebAuthHandler,
+    getUser: (
+      req: GetServerSidePropsContext["req"] | NextRequest | NextApiRequest,
+    ) => {
+      return getUser<TData, TSession>(req, ctx);
+    },
+  };
+}
@@ -0,0 +1,82 @@
+import { GenerateOptions } from "../../core";
+import { LoginPayloadBodySchema, ThirdwebAuthContext } from "../types";
+import { serialize } from "cookie";
+import { NextApiRequest, NextApiResponse } from "next";
+
+export default async function handler(
+  req: NextApiRequest,
+  res: NextApiResponse,
+  ctx: ThirdwebAuthContext,
+) {
+  if (req.method !== "POST") {
+    return res.status(405).json({ error: "Method not allowed" });
+  }
+
+  const parsedPayload = LoginPayloadBodySchema.safeParse(req.body);
+
+  // Get signed login payload from the frontend
+  if (!parsedPayload.success) {
+    return res.status(400).json({ error: "Invalid login payload" });
+  }
+
+  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, req);
+    }
+  };
+
+  const expirationTime = ctx.authOptions?.tokenDurationInSeconds
+    ? new Date(Date.now() + 1000 * ctx.authOptions.tokenDurationInSeconds)
+    : undefined;
+
+  const generateOptions: GenerateOptions = {
+    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 res.status(400).json({ error: err.message });
+    } else if (typeof err === "string") {
+      return res.status(400).json({ error: err });
+    } else {
+      return res.status(400).json({ error: "Invalid login payload" });
+    }
+  }
+
+  // Securely set httpOnly cookie on request to prevent XSS on frontend
+  // And set path to / to enable thirdweb_auth_token usage on all endpoints
+  res.setHeader(
+    "Set-Cookie",
+    serialize("thirdweb_auth_token", token, {
+      domain: ctx.cookieOptions?.domain,
+      path: ctx.cookieOptions?.path || "/",
+      sameSite: ctx.cookieOptions?.sameSite || "none",
+      httpOnly: true,
+      secure: true,
+    }),
+  );
+
+  // Send token in body and as cookie for frontend and backend use cases
+  return res.status(200).json({ token });
+}
@@ -0,0 +1,35 @@
+import { getUser } from "../helpers/user";
+import { ThirdwebAuthContext } from "../types";
+import { serialize } from "cookie";
+import { NextApiRequest, NextApiResponse } from "next";
+
+export default async function handler(
+  req: NextApiRequest,
+  res: NextApiResponse,
+  ctx: ThirdwebAuthContext,
+) {
+  if (req.method !== "POST") {
+    return res.status(405).json({
+      error: "Invalid method. Only POST supported.",
+    });
+  }
+
+  if (ctx.callbacks?.onLogout) {
+    const user = await getUser(req, ctx);
+    if (user) {
+      await ctx.callbacks.onLogout(user, req);
+    }
+  }
+
+  // Set the access token to 'none' and expire in 5 seconds
+  res.setHeader(
+    "Set-Cookie",
+    serialize("thirdweb_auth_token", "", {
+      domain: ctx.cookieOptions?.domain,
+      path: ctx.cookieOptions?.path || "/",
+      expires: new Date(Date.now() + 5 * 1000),
+    }),
+  );
+
+  return res.status(200).json({ message: "Succesfully logged out" });
+}
@@ -0,0 +1,18 @@
+import { getUser } from "../helpers/user";
+import { ThirdwebAuthContext } from "../types";
+import { NextApiRequest, NextApiResponse } from "next";
+
+export default async function handler(
+  req: NextApiRequest,
+  res: NextApiResponse,
+  ctx: ThirdwebAuthContext,
+) {
+  if (req.method !== "GET") {
+    return res.status(400).json({
+      error: "Invalid method. Only GET supported.",
+    });
+  }
+
+  const user = await getUser(req, ctx);
+  return res.status(200).json(user);
+}
@@ -1,83 +0,0 @@
-import loginHandler from "./routes/login";
-import logoutHandler from "./routes/logout";
-import userHandler from "./routes/user";
-import {
-  ThirdwebAuthConfig,
-  ThirdwebAuthContext,
-  ThirdwebAuthRoute,
-  ThirdwebAuthUser,
-} from "./types";
-import { ThirdwebSDK } from "@thirdweb-dev/sdk/solana";
-import { NextRequest } from "next/server";
-import {
-  GetServerSidePropsContext,
-  NextApiRequest,
-  NextApiResponse,
-} from "next/types";
-
-export * from "./types";
-
-async function ThirdwebAuthRouter(
-  req: NextApiRequest,
-  res: NextApiResponse,
-  ctx: ThirdwebAuthContext,
-) {
-  // Catch-all route must be named with [...thirdweb]
-  const { thirdweb } = req.query;
-  const action = thirdweb?.[0] as ThirdwebAuthRoute;
-
-  switch (action) {
-    case "login":
-      return await loginHandler(req, res, ctx);
-    case "user":
-      return await userHandler(req, res, ctx);
-    case "logout":
-      return await logoutHandler(req, res);
-    default:
-      return res.status(400).json({
-        message: "Invalid route for authentication.",
-      });
-  }
-}
-
-export function ThirdwebAuth(cfg: ThirdwebAuthConfig) {
-  const ctx = {
-    ...cfg,
-    sdk: ThirdwebSDK.fromPrivateKey("mainnet-beta", cfg.privateKey),
-  };
-
-  function ThirdwebAuthHandler(
-    ...args: [] | [NextApiRequest, NextApiResponse]
-  ) {
-    if (args.length === 0) {
-      return async (req: NextApiRequest, res: NextApiResponse) =>
-        await ThirdwebAuthRouter(req, res, ctx);
-    }
-
-    return ThirdwebAuthRouter(args[0], args[1], ctx);
-  }
-
-  async function getUser(
-    req: GetServerSidePropsContext["req"] | NextRequest | NextApiRequest,
-  ) {
-    const { sdk, domain } = ctx;
-    let user: ThirdwebAuthUser | null = null;
-    const token =
-      typeof req.cookies.get === "function"
-        ? (req.cookies as any).get("thirdweb_auth_token")
-        : (req.cookies as any).thirdweb_auth_token;
-
-    if (token) {
-      try {
-        const address = await sdk.auth.authenticate(domain, token);
-        user = { address };
-      } catch {
-        // No-op
-      }
-    }
-
-    return user;
-  }
-
-  return { ThirdwebAuthHandler, getUser };
-}
@@ -1,60 +0,0 @@
-import { ThirdwebAuthContext } from "../types";
-import { LoginPayload } from "@thirdweb-dev/sdk";
-import { serialize } from "cookie";
-import { NextApiRequest, NextApiResponse } from "next";
-
-function redirectWithError(
-  req: NextApiRequest,
-  res: NextApiResponse,
-  error: string,
-) {
-  const encodedError = encodeURIComponent(error);
-  const url = new URL(req.headers.referer as string);
-  url.searchParams.set("error", encodedError);
-  return res.redirect(url.toString());
-}
-
-export default async function handler(
-  req: NextApiRequest,
-  res: NextApiResponse,
-  ctx: ThirdwebAuthContext,
-) {
-  if (req.method !== "GET") {
-    return redirectWithError(req, res, "INVALID_METHOD");
-  }
-
-  const { sdk, domain } = ctx;
-
-  // Get signed login payload from the frontend
-  const payload = JSON.parse(atob(req.query.payload as string)) as LoginPayload;
-  if (!payload) {
-    redirectWithError(req, res, "MISSING_LOGIN_PAYLOAD");
-  }
-
-  let token;
-  try {
-    // Generate an access token with the SDK using the signed payload
-    token = await sdk.auth.generateAuthToken(domain, payload);
-  } catch {
-    return redirectWithError(req, res, "INVALID_LOGIN_PAYLOAD");
-  }
-
-  // Securely set httpOnly cookie on request to prevent XSS on frontend
-  // And set path to / to enable thirdweb_auth_token usage on all endpoints
-  res.setHeader(
-    "Set-Cookie",
-    serialize("thirdweb_auth_token", token, {
-      path: "/",
-      httpOnly: true,
-      secure: true,
-      sameSite: "strict",
-    }),
-  );
-
-  if (ctx.callbacks?.login) {
-    const address = sdk.auth.verify(domain, payload);
-    await ctx.callbacks.login(address);
-  }
-
-  return res.status(301).redirect(req.query.redirect as string);
-}
@@ -1,24 +0,0 @@
-import { serialize } from "cookie";
-import { NextApiRequest, NextApiResponse } from "next";
-
-export default async function handler(
-  req: NextApiRequest,
-  res: NextApiResponse,
-) {
-  if (req.method !== "GET") {
-    return res.status(400).json({
-      error: "Invalid method. Only GET supported.",
-    });
-  }
-
-  // Set the access token to 'none' and expire in 5 seconds
-  res.setHeader(
-    "Set-Cookie",
-    serialize("thirdweb_auth_token", "", {
-      path: "/",
-      expires: new Date(Date.now() + 5 * 1000),
-    }),
-  );
-
-  return res.status(301).redirect(req.headers.referer as string);
-}
@@ -1,34 +0,0 @@
-import { ThirdwebAuthContext, ThirdwebAuthUser } from "../types";
-import { NextApiRequest, NextApiResponse } from "next";
-
-export default async function handler(
-  req: NextApiRequest,
-  res: NextApiResponse,
-  ctx: ThirdwebAuthContext,
-) {
-  if (req.method !== "GET") {
-    return res.status(400).json({
-      error: "Invalid method. Only GET supported.",
-    });
-  }
-
-  const { sdk, domain } = ctx;
-  let user = null;
-  const token = req.cookies.thirdweb_auth_token;
-
-  if (token) {
-    try {
-      const address = await sdk.auth.authenticate(domain, token);
-
-      if (ctx.callbacks?.user) {
-        user = await ctx.callbacks.user(address);
-      }
-
-      user = { ...user, address };
-    } catch {
-      // No-op
-    }
-  }
-
-  return res.status(200).json(user as ThirdwebAuthUser | null);
-}
@@ -1,34 +0,0 @@
-import { ThirdwebSDK } from "@thirdweb-dev/sdk/solana";
-
-export type ThirdwebAuthRoute = "login" | "logout" | "user";
-
-export type ThirdwebAuthConfig = {
-  privateKey: string;
-  domain: string;
-  callbacks?: {
-    login?: (address: string) => Promise<void> | void;
-    user?: (
-      address: string,
-    ) =>
-      | Promise<Omit<ThirdwebAuthUser, "address">>
-      | Omit<ThirdwebAuthUser, "address">;
-  };
-};
-
-export type ThirdwebAuthContext = {
-  sdk: ThirdwebSDK;
-  domain: string;
-  callbacks?: {
-    login?: (address: string) => Promise<void> | void;
-    user?: (
-      address: string,
-    ) =>
-      | Promise<Omit<ThirdwebAuthUser, "address">>
-      | Omit<ThirdwebAuthUser, "address">;
-  };
-};
-
-export type ThirdwebAuthUser = {
-  address: string;
-  [key: string]: any;
-};
@@ -0,0 +1,75 @@
+import { ThirdwebAuth } from "../../core";
+import { Json, LoginPayloadOutputSchema, User } from "../../core/schema";
+import { GenericAuthWallet } from "@thirdweb-dev/wallets";
+import { GetServerSidePropsContext, NextApiRequest } from "next";
+import { NextRequest } from "next/server";
+import { z } from "zod";
+
+export const LoginPayloadBodySchema = z.object({
+  payload: LoginPayloadOutputSchema,
+});
+
+type RequestType =
+  | GetServerSidePropsContext["req"]
+  | NextRequest
+  | NextApiRequest;
+
+export type ThirdwebAuthRoute = "login" | "logout" | "user";
+
+export type ThirdwebAuthUser<
+  TData extends Json = Json,
+  TSession extends Json = Json,
+> = User<TSession> & {
+  data?: TData;
+};
+
+export type ThirdwebAuthConfig<
+  TData extends Json = Json,
+  TSession extends Json = Json,
+> = {
+  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>);
+    tokenDurationInSeconds?: number;
+  };
+  cookieOptions?: {
+    domain?: string;
+    path?: string;
+    sameSite?: "lax" | "strict" | "none";
+  };
+  callbacks?: {
+    onLogin?:
+      | ((address: string, req?: NextApiRequest) => void | TSession)
+      | ((address: string, req?: NextApiRequest) => Promise<void | TSession>);
+    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,69 @@
+import * as ed25519 from "@noble/ed25519";
+import { Signer, Keypair, PublicKey } from "@solana/web3.js";
+import type { Ecosystem, GenericAuthWallet } from "@thirdweb-dev/wallets";
+import bs58 from "bs58";
+import nacl from "tweetnacl";
+
+export interface SolanaSigner {
+  publicKey: PublicKey;
+  signMessage(message: Uint8Array): Promise<Uint8Array>;
+}
+
+export class SignerWallet implements GenericAuthWallet {
+  type: Ecosystem = "solana";
+  private signer: SolanaSigner;
+
+  constructor(signer: SolanaSigner) {
+    this.signer = signer;
+  }
+
+  public async getAddress(): Promise<string> {
+    return this.signer.publicKey.toBase58();
+  }
+
+  public async signMessage(message: string): Promise<string> {
+    const encodedMessage = new TextEncoder().encode(message);
+    const signedMessage = await this.signer.signMessage(encodedMessage);
+    const signature = bs58.encode(signedMessage);
+
+    return signature;
+  }
+
+  public async verifySignature(
+    message: string,
+    signature: string,
+    address: string,
+  ): Promise<boolean> {
+    return nacl.sign.detached.verify(
+      new TextEncoder().encode(message),
+      bs58.decode(signature),
+      bs58.decode(address),
+    );
+  }
+}
+
+class KeypairSigner implements SolanaSigner {
+  private keypair: Signer;
+  public publicKey: PublicKey;
+
+  constructor(keypair: Signer) {
+    this.keypair = keypair;
+    this.publicKey = keypair.publicKey;
+  }
+
+  public async signMessage(message: Uint8Array): Promise<Uint8Array> {
+    return ed25519.sync.sign(message, this.keypair.secretKey.slice(0, 32));
+  }
+}
+
+export class KeypairWallet extends SignerWallet {
+  constructor(keypair: Keypair) {
+    super(new KeypairSigner(keypair));
+  }
+}
+
+export class PrivateKeyWallet extends KeypairWallet {
+  constructor(privateKey: string) {
+    super(Keypair.fromSecretKey(bs58.decode(privateKey)));
+  }
+}
@@ -0,0 +1,8 @@
+{
+  "extension": [
+    "ts"
+  ],
+  "require": [
+    "@swc-node/register"
+  ]
+}
@@ -0,0 +1,353 @@
+import { ThirdwebAuth } from "../src/core";
+import { SignerWallet } from "../src/evm";
+import { expect } from "chai";
+import { Wallet } from "ethers";
+
+describe("Wallet Authentication", async () => {
+  let adminWallet: any, signerWallet: any, attackerWallet: any;
+  let auth: ThirdwebAuth;
+
+  before(async () => {
+    const [adminSigner, signerSigner, attackerSigner] = [
+      Wallet.createRandom(),
+      Wallet.createRandom(),
+      Wallet.createRandom(),
+    ];
+
+    adminWallet = new SignerWallet(adminSigner);
+    signerWallet = new SignerWallet(signerSigner);
+    attackerWallet = new SignerWallet(attackerSigner);
+
+    auth = new ThirdwebAuth(signerWallet, "thirdweb.com");
+  });
+
+  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(
+        `Expected the connected wallet address '${await signerWallet.getAddress()}' to 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",
+    });
+  });
+});
@@ -0,0 +1,353 @@
+import { ThirdwebAuth } from "../src/core";
+import { KeypairWallet } from "../src/solana";
+import { Keypair } from "@solana/web3.js";
+import { expect } from "chai";
+
+describe("Wallet Authentication", async () => {
+  let adminWallet: any, signerWallet: any, attackerWallet: any;
+  let auth: ThirdwebAuth;
+
+  before(async () => {
+    const [adminSigner, signerSigner, attackerSigner] = [
+      Keypair.generate(),
+      Keypair.generate(),
+      Keypair.generate(),
+    ];
+
+    adminWallet = new KeypairWallet(adminSigner);
+    signerWallet = new KeypairWallet(signerSigner);
+    attackerWallet = new KeypairWallet(attackerSigner);
+
+    auth = new ThirdwebAuth(signerWallet, "thirdweb.com");
+  });
+
+  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(
+        `Expected the connected wallet address '${await signerWallet.getAddress()}' to 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",
+    });
+  });
+});
@@ -1,5 +1,5 @@
 {
-  "extends": "@thirdweb-dev/tsconfig/base.json",
+  "extends": "@thirdweb-dev/tsconfig/sdk.json",
  "include": ["."],
  "exclude": ["dist", "build", "node_modules"]
 }
@@ -1,5 +1,247 @@
 # thirdweb

+## 0.9.12
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @thirdweb-dev/sdk@3.7.1
+
+## 0.9.11
+
+### Patch Changes
+
+- [#517](https://github.com/thirdweb-dev/js/pull/517) [`9e591b3`](https://github.com/thirdweb-dev/js/commit/9e591b32b78f1300b2014d44d591d297249a1f84) Thanks [@avneesh0612](https://github.com/avneesh0612)! - add express, node.js, and react native templates
+
+- Updated dependencies [[`f37e86b`](https://github.com/thirdweb-dev/js/commit/f37e86b7d21f7da0df6ab549cb903dc99db10a79), [`f15733f`](https://github.com/thirdweb-dev/js/commit/f15733f34c5985eec5593b3d9196e5528ba96443)]:
+  - @thirdweb-dev/sdk@3.7.0
+
+## 0.9.10
+
+### Patch Changes
+
+- Updated dependencies [[`7cab8d1`](https://github.com/thirdweb-dev/js/commit/7cab8d1679f8d007091aa03adb83add3822a504a)]:
+  - @thirdweb-dev/sdk@3.6.11
+
+## 0.9.9
+
+### Patch Changes
+
+- [#483](https://github.com/thirdweb-dev/js/pull/483) [`4e8ff58`](https://github.com/thirdweb-dev/js/commit/4e8ff582084c3d201314e6c5dff5b79f15eb6292) Thanks [@jnsdls](https://github.com/jnsdls)! - `thirdweb create` with usage of `forge` should now function correctly in windows CMD shell
+
+- Updated dependencies [[`5fba324`](https://github.com/thirdweb-dev/js/commit/5fba324ac17ab02bc8f13d82a232bc5c6970c8e5), [`894cbef`](https://github.com/thirdweb-dev/js/commit/894cbefc6361f23fc528a6c6819f5c71793d46e4), [`557429b`](https://github.com/thirdweb-dev/js/commit/557429b5cfb3af2983ee01cf7d12d41ee0557593), [`73dc026`](https://github.com/thirdweb-dev/js/commit/73dc026ff9d0ac9099bd5a9a9cab8fdbfc0ae723), [`9eaa21d`](https://github.com/thirdweb-dev/js/commit/9eaa21d09ab9c700aea61a2a25f8ca9859d20857), [`68c8e3c`](https://github.com/thirdweb-dev/js/commit/68c8e3c4d79f5d56dc4414241bcca0d88285fcca), [`bff433e`](https://github.com/thirdweb-dev/js/commit/bff433e12150dc029e33a578219c8437a510da99)]:
+  - @thirdweb-dev/sdk@3.6.10
+
+## 0.9.8
+
+### Patch Changes
+
+- Updated dependencies [[`e913e0d`](https://github.com/thirdweb-dev/js/commit/e913e0daa9ece9a6274f7ffa4e66bdcbf32e6ada), [`5862c55`](https://github.com/thirdweb-dev/js/commit/5862c558fb48604b5aca4defd1ccc06fc3536358), [`73883f5`](https://github.com/thirdweb-dev/js/commit/73883f56d0ed0a35ace8b98b96caa782443be22e), [`f7a74a3`](https://github.com/thirdweb-dev/js/commit/f7a74a3b7c489ada5b1ec435632a326334a33c9b)]:
+  - @thirdweb-dev/sdk@3.6.9
+
+## 0.9.7
+
+### Patch Changes
+
+- [#454](https://github.com/thirdweb-dev/js/pull/454) [`c673e39`](https://github.com/thirdweb-dev/js/commit/c673e39f23ef082097d73d62910580e8fad400a0) Thanks [@jnsdls](https://github.com/jnsdls)! - upgraded dependencies
+
+- [#461](https://github.com/thirdweb-dev/js/pull/461) [`af85389`](https://github.com/thirdweb-dev/js/commit/af85389dc07fb163b8f9d70093eb1b691e47561a) Thanks [@nachoiacovino](https://github.com/nachoiacovino)! - Fix deprecated links
+
+- Updated dependencies [[`c673e39`](https://github.com/thirdweb-dev/js/commit/c673e39f23ef082097d73d62910580e8fad400a0), [`ea95c5f`](https://github.com/thirdweb-dev/js/commit/ea95c5f609e306e333ee0f73f7920503358ca848), [`699a2b1`](https://github.com/thirdweb-dev/js/commit/699a2b16fb991c474ec57db8f178e2601d631f39), [`4cdd0bd`](https://github.com/thirdweb-dev/js/commit/4cdd0bd6348494a256d7c6a2bdf8f7b5c20f6877), [`a8267f9`](https://github.com/thirdweb-dev/js/commit/a8267f912df84c58d3fe3f47b90bd474f73c84ca)]:
+  - @thirdweb-dev/sdk@3.6.8
+
+## 0.9.6
+
+### Patch Changes
+
+- [#441](https://github.com/thirdweb-dev/js/pull/441) [`64f24f1`](https://github.com/thirdweb-dev/js/commit/64f24f1bb167c3d0cb3beca51fd300eaec21cc27) Thanks [@adam-maj](https://github.com/adam-maj)! - CLI autoupdates on run
+
+- [#447](https://github.com/thirdweb-dev/js/pull/447) [`e7740a5`](https://github.com/thirdweb-dev/js/commit/e7740a59db022a3396194ac66cd195d8ae754d57) Thanks [@adam-maj](https://github.com/adam-maj)! - Detect whether forge is installed
+
+- Updated dependencies [[`3731459`](https://github.com/thirdweb-dev/js/commit/3731459d33f1ded7ebb69124809449b901b3ad3d), [`cac6c30`](https://github.com/thirdweb-dev/js/commit/cac6c30bca5e17df81d746ef81316af47d5e252e), [`7a37e56`](https://github.com/thirdweb-dev/js/commit/7a37e564fd5d5a9df84c8da44ecaf6c42f67a0e2)]:
+  - @thirdweb-dev/sdk@3.6.7
+
+## 0.9.5
+
+### Patch Changes
+
+- Updated dependencies [[`8c6cdaa`](https://github.com/thirdweb-dev/js/commit/8c6cdaa2887fb2cc40d3ee6991233d195d103805)]:
+  - @thirdweb-dev/sdk@3.6.6
+
+## 0.9.4
+
+### Patch Changes
+
+- [#444](https://github.com/thirdweb-dev/js/pull/444) [`94f49b1`](https://github.com/thirdweb-dev/js/commit/94f49b1294bc0208171b16ed413cbb44644af017) Thanks [@adam-maj](https://github.com/adam-maj)! - Add changeset
+
+## 0.9.3
+
+### Patch Changes
+
+- Updated dependencies [[`efc56fa`](https://github.com/thirdweb-dev/js/commit/efc56fa5802490ac8ef50037658d046afd89e9a1)]:
+  - @thirdweb-dev/sdk@3.6.5
+
+## 0.9.2
+
+### Patch Changes
+
+- [#430](https://github.com/thirdweb-dev/js/pull/430) [`e684d7e`](https://github.com/thirdweb-dev/js/commit/e684d7e1ca16f633bce8698529d16bf60c264aa4) Thanks [@joaquim-verges](https://github.com/joaquim-verges)! - Fix uploading contracts with special characters in the comments
+
+- [#435](https://github.com/thirdweb-dev/js/pull/435) [`bef97f7`](https://github.com/thirdweb-dev/js/commit/bef97f72f4860596b7b70b05e67fcadf2c9a012e) Thanks [@adam-maj](https://github.com/adam-maj)! - Make solc default backup compilation
+
+- [#432](https://github.com/thirdweb-dev/js/pull/432) [`3e87dd3`](https://github.com/thirdweb-dev/js/commit/3e87dd3ccb04a2b73437357c939a251e83b783b2) Thanks [@adam-maj](https://github.com/adam-maj)! - Display file name on duplicate contract names
+
+- [#431](https://github.com/thirdweb-dev/js/pull/431) [`c42545a`](https://github.com/thirdweb-dev/js/commit/c42545a64725492136025fa1dcdb4d46ba674a30) Thanks [@adam-maj](https://github.com/adam-maj)! - Add changeset
+
+- [#428](https://github.com/thirdweb-dev/js/pull/428) [`6e20d1f`](https://github.com/thirdweb-dev/js/commit/6e20d1f21a622f102e94b956f700d0871c0dc779) Thanks [@adam-maj](https://github.com/adam-maj)! - Update CLI to enable create contract inside contracts project
+
+- Updated dependencies [[`f451da6`](https://github.com/thirdweb-dev/js/commit/f451da6395689a5f89800ee63f34b6175b61f703), [`af3acc6`](https://github.com/thirdweb-dev/js/commit/af3acc6b10751b840e56aef6400da5eea6040df2), [`1bfb91d`](https://github.com/thirdweb-dev/js/commit/1bfb91dbf3a39160c987a425813ac5dbb84703ad), [`ee47840`](https://github.com/thirdweb-dev/js/commit/ee478407673b0416e0c1cfe2be11bd6963395348), [`def4251`](https://github.com/thirdweb-dev/js/commit/def42511ff5a20d83f9094164dafb87e412571b5), [`034a257`](https://github.com/thirdweb-dev/js/commit/034a257442314c67729f7bafcbe3740cff33fa32), [`eca4776`](https://github.com/thirdweb-dev/js/commit/eca47763cd89cc3b7aa57b542971837987540b55), [`639e535`](https://github.com/thirdweb-dev/js/commit/639e535ed55280ad9d081001aab3f5af72bb3e45)]:
+  - @thirdweb-dev/sdk@3.6.4
+
+## 0.9.1
+
+### Patch Changes
+
+- [#415](https://github.com/thirdweb-dev/js/pull/415) [`48d91e4`](https://github.com/thirdweb-dev/js/commit/48d91e4431a3740d0f98f730ed5abf5b287f92c1) Thanks [@nachoiacovino](https://github.com/nachoiacovino)! - Fix mappings for prebuilts redirect on deploy
+
+## 0.9.0
+
+### Minor Changes
+
+- [#403](https://github.com/thirdweb-dev/js/pull/403) [`27996cb`](https://github.com/thirdweb-dev/js/commit/27996cb4bc6f054f45b0a66b0a3aca732e0ef610) Thanks [@avneesh0612](https://github.com/avneesh0612)! - Add CLI Support for solana with --solana flag on create command
+
+- [#283](https://github.com/thirdweb-dev/js/pull/283) [`2eaa67a`](https://github.com/thirdweb-dev/js/commit/2eaa67acbe21464e7715d0b696afdc024460a44d) Thanks [@adam-maj](https://github.com/adam-maj)! - add capability to deploy apps
+
+### Patch Changes
+
+- [#413](https://github.com/thirdweb-dev/js/pull/413) [`1b0bf99`](https://github.com/thirdweb-dev/js/commit/1b0bf99da796df88ff307dd004cdaf239fb2b1ba) Thanks [@furqanrydhan](https://github.com/furqanrydhan)! - small interface tweaks
+
+- Updated dependencies [[`48797c7`](https://github.com/thirdweb-dev/js/commit/48797c7cf0695965e33eb6bf602be4652f7085a8), [`83dcaf7`](https://github.com/thirdweb-dev/js/commit/83dcaf70584af8c5cdf0427f9fc1ba82d89f0887), [`f03be39`](https://github.com/thirdweb-dev/js/commit/f03be398e0d7b75c9c5b4fb643f35903e89a17e7), [`2eaa67a`](https://github.com/thirdweb-dev/js/commit/2eaa67acbe21464e7715d0b696afdc024460a44d), [`47f8945`](https://github.com/thirdweb-dev/js/commit/47f8945325447874b1ace0359919c1d54fd55436)]:
+  - @thirdweb-dev/sdk@3.6.3
+
+## 0.8.18
+
+### Patch Changes
+
+- Updated dependencies [[`ccb7db4`](https://github.com/thirdweb-dev/js/commit/ccb7db48739b8dddcb2c032b3b6e3e5200485715), [`9151aa7`](https://github.com/thirdweb-dev/js/commit/9151aa7dc80754a7aa4fd3f6ce0207bccbb6451f), [`5a01c53`](https://github.com/thirdweb-dev/js/commit/5a01c537e30bd7ef562aad1012413990de6faedf)]:
+  - @thirdweb-dev/sdk@3.6.2
+
+## 0.8.17
+
+### Patch Changes
+
+- Updated dependencies [[`15514f1`](https://github.com/thirdweb-dev/js/commit/15514f190a844d809ae5b1edb580aab46a682485), [`7c0744a`](https://github.com/thirdweb-dev/js/commit/7c0744a006e78987ad8b271b2c64f4bac7759510), [`f8bceec`](https://github.com/thirdweb-dev/js/commit/f8bceec10c60b30dc3d6f45926e2a9e018202578), [`887af24`](https://github.com/thirdweb-dev/js/commit/887af24450e316c2ea390cd49c0563cebe793c0f), [`96bd92e`](https://github.com/thirdweb-dev/js/commit/96bd92e724ec7d880d23348071b26ab8c21dd868)]:
+  - @thirdweb-dev/sdk@3.6.1
+
+## 0.8.16
+
+### Patch Changes
+
+- Updated dependencies [[`7cb8e59`](https://github.com/thirdweb-dev/js/commit/7cb8e59be48dc923316eb36ab43a1bef7364f6b1), [`0ed77d2`](https://github.com/thirdweb-dev/js/commit/0ed77d2c9e7526444ef660aab82a950865234aa6), [`04a47e8`](https://github.com/thirdweb-dev/js/commit/04a47e8971d28da2532ebd9db824eeb459c17bd4)]:
+  - @thirdweb-dev/sdk@3.6.0
+
+## 0.8.15
+
+### Patch Changes
+
+- Updated dependencies [[`3eba69a`](https://github.com/thirdweb-dev/js/commit/3eba69afd78b7aa472a9c00c9d4220bb69ad1d3e), [`4af785c`](https://github.com/thirdweb-dev/js/commit/4af785c37c831ecd7087c1c9eb9095922cac0855), [`6f818f3`](https://github.com/thirdweb-dev/js/commit/6f818f393eb9023b53a3358d62d60ec23a9246bd), [`b79dc18`](https://github.com/thirdweb-dev/js/commit/b79dc18f7ab5155bbf4af02dc1a953546160bad0)]:
+  - @thirdweb-dev/sdk@3.5.2
+
+## 0.8.14
+
+### Patch Changes
+
+- Updated dependencies [[`4e7b293`](https://github.com/thirdweb-dev/js/commit/4e7b293c543244de79c150ca8c37d941221fc9a3), [`c9c0e4f`](https://github.com/thirdweb-dev/js/commit/c9c0e4ff39b054af746f3aec75fcbd0a3ef7239d)]:
+  - @thirdweb-dev/sdk@3.5.1
+
+## 0.8.13
+
+### Patch Changes
+
+- Updated dependencies [[`5200d5d`](https://github.com/thirdweb-dev/js/commit/5200d5d7e730da58bd4d3e7c222e3c661265f913), [`42a6065`](https://github.com/thirdweb-dev/js/commit/42a606588dfed03c67c57357dd0ee1ad19fad6ea)]:
+  - @thirdweb-dev/sdk@3.5.0
+
+## 0.8.12
+
+### Patch Changes
+
+- Updated dependencies [[`e731c1a`](https://github.com/thirdweb-dev/js/commit/e731c1a7c341e6f2b9cc42c88d5c1b036dcf4a7c)]:
+  - @thirdweb-dev/sdk@3.4.5
+
+## 0.8.11
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @thirdweb-dev/sdk@3.4.4
+
+## 0.8.10
+
+### Patch Changes
+
+- Updated dependencies [[`1c24c3c`](https://github.com/thirdweb-dev/js/commit/1c24c3c3c48476a824f817e09e7bf0fbe67c1db5), [`65fc7ba`](https://github.com/thirdweb-dev/js/commit/65fc7ba6fff093a971b53cb0979c39768e090ba1)]:
+  - @thirdweb-dev/sdk@3.4.3
+
+## 0.8.9
+
+### Patch Changes
+
+- Updated dependencies [[`21c21c1`](https://github.com/thirdweb-dev/js/commit/21c21c1adfd09b60ad563bfd4c308597140de33c), [`3522917`](https://github.com/thirdweb-dev/js/commit/352291791ee900e1500f84f095290497934d2f60)]:
+  - @thirdweb-dev/sdk@3.4.2
+
+## 0.8.8
+
+### Patch Changes
+
+- Updated dependencies [[`72227b2`](https://github.com/thirdweb-dev/js/commit/72227b2e166a3a68bbb41cf2b389322f5b7547a2)]:
+  - @thirdweb-dev/sdk@3.4.1
+
+## 0.8.7
+
+### Patch Changes
+
+- [#327](https://github.com/thirdweb-dev/js/pull/327) [`ef27aad`](https://github.com/thirdweb-dev/js/commit/ef27aad0aafc4577e85f44dc77dfbe880bd239b5) Thanks [@jnsdls](https://github.com/jnsdls)! - enable e2e testing
+
+- Updated dependencies [[`340605b`](https://github.com/thirdweb-dev/js/commit/340605b507f384fbd2999b9c16542af3c53e84a9), [`26116a6`](https://github.com/thirdweb-dev/js/commit/26116a6f637ee845f7bd17f20ffe17caf184658e), [`15f8006`](https://github.com/thirdweb-dev/js/commit/15f8006e1fb22333b7ee239b45e7b1b12d6dccc8), [`ef27aad`](https://github.com/thirdweb-dev/js/commit/ef27aad0aafc4577e85f44dc77dfbe880bd239b5)]:
+  - @thirdweb-dev/sdk@3.4.0
+
+## 0.8.6
+
+### Patch Changes
+
+- Updated dependencies [[`ad851f7`](https://github.com/thirdweb-dev/js/commit/ad851f7b4d6abb5ab9364ef3dec229f913e18ce5), [`6218c88`](https://github.com/thirdweb-dev/js/commit/6218c885842e6b4e44ec38ec92a9211e56c49bf4)]:
+  - @thirdweb-dev/sdk@3.3.1
+
+## 0.8.5
+
+### Patch Changes
+
+- [#326](https://github.com/thirdweb-dev/js/pull/326) [`126752d`](https://github.com/thirdweb-dev/js/commit/126752d7d02c9a808a63fb9e67a9df6658b5682b) Thanks [@jnsdls](https://github.com/jnsdls)! - remove tons of unused dependencies, use SDK function for extracting ipfs has from bytecode
+
+- Updated dependencies [[`126752d`](https://github.com/thirdweb-dev/js/commit/126752d7d02c9a808a63fb9e67a9df6658b5682b), [`df74340`](https://github.com/thirdweb-dev/js/commit/df74340fa51323304c32419761d6f18628b060fa), [`89ff921`](https://github.com/thirdweb-dev/js/commit/89ff921a7d9f0e42b4e6707c8b56d0aab95c1aa0), [`a57b4f0`](https://github.com/thirdweb-dev/js/commit/a57b4f01f3a49590b897101f2730582e4124a554)]:
+  - @thirdweb-dev/sdk@3.3.0
+
+## 0.8.4
+
+### Patch Changes
+
+- Updated dependencies [[`4f867e1`](https://github.com/thirdweb-dev/js/commit/4f867e15edbe5757afbf54cab207458711a8986c), [`b6eec61`](https://github.com/thirdweb-dev/js/commit/b6eec6146c23b66a3681bbb48b173b9019254214), [`9727502`](https://github.com/thirdweb-dev/js/commit/9727502eb30ac139382b7c7c8e8fc0967cbfbcf1), [`782b58d`](https://github.com/thirdweb-dev/js/commit/782b58d3f6a3b49ff9b3d837551db5161f96171a), [`f41a443`](https://github.com/thirdweb-dev/js/commit/f41a443c5785240197607b5bf93ff18a1c8e8307), [`f45ef62`](https://github.com/thirdweb-dev/js/commit/f45ef62128cfefe06275a38440c90d45e9f3cef7), [`2f8ec89`](https://github.com/thirdweb-dev/js/commit/2f8ec89c4c83ae577092c840c198e6fcfb114e69), [`b7cd744`](https://github.com/thirdweb-dev/js/commit/b7cd744cd0482a6c3fe5ae0c858f20cd380d4114), [`53c6507`](https://github.com/thirdweb-dev/js/commit/53c65076696a43bd9a7e58a7493d4e65c172900f)]:
+  - @thirdweb-dev/sdk@3.2.6
+
+## 0.8.3
+
+### Patch Changes
+
+- Updated dependencies [[`712b11a`](https://github.com/thirdweb-dev/js/commit/712b11a43e389ae10b7f09648779a69c05b2c913)]:
+  - @thirdweb-dev/sdk@3.2.5
+
+## 0.8.2
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @thirdweb-dev/sdk@3.2.4
+
 ## 0.8.1

 ### Patch Changes
@@ -62,7 +62,7 @@ Deploying released contracts give deployers access to automatic SDKs to integrat
 npx thirdweb@latest detect
 ```

-As you're developing your contracts, you may want to implement [Extensions](https://portal.thirdweb.com/extensions) to unlock functionality on the SDKs (ie. nft minting with automatic upload to IPFS) and the dashboard (ie. generated UI to manage permissions). This command will show what extensions were detected on your contract, unlocking the corresponding functionality on the SDKs and dashboard.
+As you're developing your contracts, you may want to implement [Extensions](https://portal.thirdweb.com/contractkit) to unlock functionality on the SDKs (ie. nft minting with automatic upload to IPFS) and the dashboard (ie. generated UI to manage permissions). This command will show what extensions were detected on your contract, unlocking the corresponding functionality on the SDKs and dashboard.

 ---

@@ -1,6 +1,8 @@
 export const CREATE_MESSAGES = {
  typeOfProject: "What type of project do you want to create?",
  projectName: "What is your project named?",
+  contractName: "What will be the name of your new smart contract?",
+  chain: "Which blockchain do you want to use?",
  framework: "What framework do you want to use?",
  language: "What language do you want to use?",
  contract: "What type of contract do you want to start from?",
@@ -9,5 +11,5 @@ export const CREATE_MESSAGES = {

 export const ERROR_MESSAGES = {
  noConfiguration:
-    "Failed to find a supported project configuration file in current directory",
+    "No contract project configuration file found in current directory",
 };
@@ -2,7 +2,7 @@ import { CREATE_MESSAGES } from "../constants/constants";
 import { prepareEnvironment } from "@gmrchk/cli-testing-library";

 // this creates an app, can take some time that's fine
-jest.setTimeout(120_000);
+jest.setTimeout(150_000);

 describe("npx thirdweb create", () => {
  it("should create app (CRA) successfully", async () => {
@@ -16,6 +16,8 @@ describe("npx thirdweb create", () => {
    await pressKey("enter");
    await waitForText(CREATE_MESSAGES.projectName);
    await pressKey("enter");
+    await waitForText(CREATE_MESSAGES.chain);
+    await pressKey("enter");
    await waitForText(CREATE_MESSAGES.framework);
    // select CRA
    await pressKey("arrowDown");
@@ -15,8 +15,8 @@ describe("npx thirdweb deploy", () => {
      `${path}/BasicContract.sol`,
    );

-    const { waitForText, waitForFinish, getExitCode, writeText, getStdout } =
-      await spawn("node", "./dist/cli/index.js deploy");
+    const { waitForText, waitForFinish, getExitCode, writeText, getStderr } =
+      await spawn("node", "./dist/cli/index.js deploy --contract");

    expect(await exists("BasicContract.sol")).toEqual(true);

@@ -26,7 +26,7 @@ describe("npx thirdweb deploy", () => {
    // wait for program to finish
    await waitForFinish();

-    expect(getStdout().at(-1)).toContain(
+    expect(getStderr().at(-1)).toContain(
      "https://thirdweb.com/contracts/deploy/",
    );

@@ -19,6 +19,10 @@ describe("npx thirdweb detect", () => {
    await create.waitForText(CREATE_MESSAGES.framework);
    // select hardhat
    await create.pressKey("enter");
+    await create.waitForText(CREATE_MESSAGES.contractName);
+    // set contract name
+    await create.writeText("Contract");
+    await create.pressKey("enter");
    await create.waitForText(CREATE_MESSAGES.contract);
    // select ERC721
    await create.pressKey("arrowDown");
@@ -57,6 +61,9 @@ describe("npx thirdweb detect", () => {

    const lines = detect.getStdout();

+    // check that detect excited successfully
+    expect(detect.getExitCode()).toEqual(0);
+
    // Detected extensions
    expect(lines.findIndex((line) => line.includes("ERC721"))).toBeGreaterThan(
      -1,
@@ -15,7 +15,7 @@ describe("npx thirdweb release", () => {
      `${path}/BasicContract.sol`,
    );

-    const { waitForText, waitForFinish, getExitCode, writeText, getStdout } =
+    const { waitForText, waitForFinish, getExitCode, writeText, getStderr } =
      await spawn("node", "./dist/cli/index.js release");

    expect(await exists("BasicContract.sol")).toEqual(true);
@@ -26,7 +26,7 @@ describe("npx thirdweb release", () => {
    // wait for program to finish
    await waitForFinish();

-    expect(getStdout().at(-1)).toContain(
+    expect(getStderr().at(-1)).toContain(
      "https://thirdweb.com/contracts/release/",
    );

@@ -1,7 +1,7 @@
 {
  "name": "thirdweb",
  "main": "dist/cli/index.js",
-  "version": "0.8.1",
+  "version": "0.9.12",
  "repository": "https://github.com/thirdweb-dev/js/tree/main/packages/cli",
  "author": "thirdweb eng <[email protected]>",
  "license": "Apache-2.0",
@@ -10,7 +10,7 @@
  },
  "devDependencies": {
    "@gmrchk/cli-testing-library": "^0.1.2",
-    "@types/async-retry": "1.3.0",
+    "@types/async-retry": "^1.3.0",
    "@types/cross-spawn": "^6.0.2",
    "@types/inquirer": "^8.2.1",
    "@types/jest": "^29.0.0",
@@ -18,12 +18,12 @@
    "@types/prompts": "^2.0.14",
    "@types/rimraf": "^3.0.0",
    "@types/tar": "^6.1.2",
-    "@types/update-notifier": "^5.1.0",
+    "@types/update-notifier": "^6.0.1",
    "@types/validate-npm-package-name": "^4.0.0",
    "hardhat": "^2.9.3",
-    "jest": "^28",
+    "jest": "^29",
    "prettier": "^2.7.1",
-    "ts-jest": "^28.0.8",
+    "ts-jest": "^29.0.3",
    "ts-node": "^10.7.0",
    "tsup": "^6.2.3",
    "typescript": "^4.7.4"
@@ -31,24 +31,18 @@
  "dependencies": {
    "@thirdweb-dev/sdk": "*",
    "async-retry": "^1.3.3",
-    "cbor": "^8.1.0",
    "commander": "^9.1.0",
-    "cpy": "^9.0.1",
+    "detect-package-manager": "^2.0.1",
    "enquirer": "^2.3.6",
-    "ethers": "^5.7.0",
-    "form-data": "^4.0.0",
+    "ethers": "^5.7.2",
    "got": "11.8.5",
    "inquirer": "^8.2.3",
-    "ipfs-unixfs": "^6.0.7",
-    "ipld-dag-pb": "^0.22.3",
-    "multihashes": "^4.0.3",
    "open": "^8.4.0",
    "prompts": "^2.4.2",
    "rimraf": "^3.0.2",
-    "solc": "0.8.13",
+    "solc": "0.8.17",
    "tar": "^6.1.11",
    "tslog": "^3.3.3",
-    "update-check": "^1.5.4",
    "update-notifier": "^6.0.2",
    "validate-npm-package-name": "^4.0.0",
    "yaml": "^2.1.1"
@@ -2,37 +2,37 @@
 import { detectExtensions } from "../common/feature-detector";
 import { processProject } from "../common/processor";
 import { cliVersion, pkg } from "../constants/urls";
-import { info, logger } from "../core/helpers/logger";
+import { info, logger, spinner } from "../core/helpers/logger";
 import { twCreate } from "../create/command";
-import generateDashboardUrl from "../helpers/generate-dashboard-url";
+import { deploy } from "../deploy";
+import { findPackageInstallation } from "../helpers/detect-local-packages";
 import { upload } from "../storage/command";
 import { ThirdwebStorage } from "@thirdweb-dev/storage";
 import chalk from "chalk";
+import { exec, spawn } from "child_process";
 import { Command } from "commander";
 import open from "open";
+import prompts from "prompts";

 const main = async () => {
+  // eslint-disable-next-line turbo/no-undeclared-env-vars
+  const skipIntro = process.env.THIRDWEB_CLI_SKIP_INTRO === "true";
+
  const program = new Command();

-  //yes this has to look like this, eliminates whitespace
-  console.info(`
-  $$\\     $$\\       $$\\                 $$\\                         $$\\       
-  $$ |    $$ |      \\__|                $$ |                        $$ |      
-$$$$$$\\   $$$$$$$\\  $$\\  $$$$$$\\   $$$$$$$ |$$\\  $$\\  $$\\  $$$$$$\\  $$$$$$$\\  
-\\_$$  _|  $$  __$$\\ $$ |$$  __$$\\ $$  __$$ |$$ | $$ | $$ |$$  __$$\\ $$  __$$\\ 
-  $$ |    $$ |  $$ |$$ |$$ |  \\__|$$ /  $$ |$$ | $$ | $$ |$$$$$$$$ |$$ |  $$ |
-  $$ |$$\\ $$ |  $$ |$$ |$$ |      $$ |  $$ |$$ | $$ | $$ |$$   ____|$$ |  $$ |
-  \\$$$$  |$$ |  $$ |$$ |$$ |      \\$$$$$$$ |\\$$$$$\\$$$$  |\\$$$$$$$\\ $$$$$$$  |
-   \\____/ \\__|  \\__|\\__|\\__|       \\_______| \\_____\\____/  \\_______|\\_______/ `);
-  console.info(`\n 💎 thirdweb-cli v${cliVersion} 💎\n`);
-  import("update-notifier").then(({ default: updateNotifier }) => {
-    updateNotifier({
-      pkg,
-      shouldNotifyInNpmScript: true,
-      // check every time while we're still building the CLI
-      updateCheckInterval: 0,
-    }).notify();
-  });
+  // yes this has to look like this, eliminates whitespace
+  if (!skipIntro) {
+    console.info(`
+    $$\\     $$\\       $$\\                 $$\\                         $$\\       
+    $$ |    $$ |      \\__|                $$ |                        $$ |      
+  $$$$$$\\   $$$$$$$\\  $$\\  $$$$$$\\   $$$$$$$ |$$\\  $$\\  $$\\  $$$$$$\\  $$$$$$$\\  
+  \\_$$  _|  $$  __$$\\ $$ |$$  __$$\\ $$  __$$ |$$ | $$ | $$ |$$  __$$\\ $$  __$$\\ 
+    $$ |    $$ |  $$ |$$ |$$ |  \\__|$$ /  $$ |$$ | $$ | $$ |$$$$$$$$ |$$ |  $$ |
+    $$ |$$\\ $$ |  $$ |$$ |$$ |      $$ |  $$ |$$ | $$ | $$ |$$   ____|$$ |  $$ |
+    \\$$$$  |$$ |  $$ |$$ |$$ |      \\$$$$$$$ |\\$$$$$\\$$$$  |\\$$$$$$$\\ $$$$$$$  |
+     \\____/ \\__|  \\__|\\__|\\__|       \\_______| \\_____\\____/  \\_______|\\_______/ `);
+    console.info(`\n 💎 thirdweb-cli v${cliVersion} 💎\n`);
+  }

  program
    .name("thirdweb-cli")
@@ -40,34 +40,43 @@ $$$$$$\\   $$$$$$$\\  $$\\  $$$$$$\\   $$$$$$$ |$$\\  $$\\  $$\\  $$$$$$\\  $$$$
    .version(cliVersion, "-v, --version");

  program
-    .command("create")
+    .command("create [projectType] [projectPath]")
    .description(
      "Create a web3 app from any of our official templates: https://github.com/thirdweb-example/",
    )
-    .option("--app", `Create a web3 app.`)
-    .option("--contract", `Create a web3 contract project`)
-    .option("--ts, --typescript", `Initialize as a TypeScript project.`)
-    .option("--js, --javascript", `Initialize as a JavaScript project.`)
-    .option("--forge", `Initialize as a Forge project.`)
-    .option("--hardhat", `Initialize as a Hardhat project.`)
-    .option("--cra", `Initialize as a Create React App project.`)
-    .option("--next", `Initialize as a Next.js project.`)
-    .option("--vite", `Initialize as a Vite project.`)
+    .option("--app", "Create a web3 app.")
+    .option("--contract", "Create a web3 contract project")
+    .option("--ts, --typescript", "Initialize as a TypeScript project.")
+    .option("--js, --javascript", "Initialize as a JavaScript project.")
+    .option("--forge", "Initialize as a Forge project.")
+    .option("--hardhat", "Initialize as a Hardhat project.")
+    .option("--cra", "Initialize as a Create React App project.")
+    .option("--next", "Initialize as a Next.js project.")
+    .option("--vite", "Initialize as a Vite project.")
+    .option("--reactNative", "Initialize as a React Native project.")
+    .option("--express", "Initialize as a Express project.")
+    .option("--node", "Initialize as a Node project.")
    .option(
      "--use-npm",
-      `Explicitly tell the CLI to bootstrap the app using npm`,
+      "Explicitly tell the CLI to bootstrap the app using npm",
    )
    .option(
      "--use-pnpm",
-      `Explicitly tell the CLI to bootstrap the app using pnpm`,
+      "Explicitly tell the CLI to bootstrap the app using pnpm",
    )
-    .option("--framework [name]", `The preferred framework.`)
+    .option("--framework [name]", "The preferred framework.")
+    .option("--solana", "Initialize as a Solana project.")
+    .option("--evm", "Initialize as an Ethereum project.")
    .option(
      "-t, --template [name]",
-      `A template to start your project from. You can use an template repository name from the official thirdweb-example org.`,
+      "A template to start your project from. You can use an template repository name from the official thirdweb-example org.",
    )
-    .action(async (options) => {
-      await twCreate(options);
+    .option(
+      "-c, --contract-name [name]",
+      "Name of the new smart contract to create",
+    )
+    .action(async (type, path, options) => {
+      await twCreate(type, path, options);
    });

  program
@@ -87,39 +96,33 @@ $$$$$$\\   $$$$$$$\\  $$\\  $$$$$$\\   $$$$$$$ |$$\\  $$\\  $$\\  $$$$$$\\  $$$$
    .option("--dry-run", "dry run (skip actually publishing)")
    .option("-d, --debug", "show debug logs")
    .option("--ci", "Continuous Integration mode")
+    .option(
+      "--dist-path [distPath]",
+      "Path to the dist folder where the HTML based App is",
+    )
    .option(
      "-n, --name [name]",
      "Name of the pre-built or released contract (such as nft-drop)",
    )
+    .option(
+      "-f, --file [name]",
+      "Filter for contract files that contain this file name",
+    )
+    .option(
+      "-cn, --contract-name [name]",
+      "Filter for contracts that contain this contract name",
+    )
    .option(
      "-cv, --contract-version [version]",
      "Version of the released contract",
    )
+    .option("--app", "Deploy a web app to decentralized storage")
+    .option("--contract", "Deploy a smart contract to blockchains")
    .action(async (options) => {
-      if (options.name) {
-        const url = generateDashboardUrl(options.name, options.contractVersion);
-
-        if (!url) {
-          logger.error(
-            chalk.red(
-              `Could not find a contract named ${options.name} ${
-                options.contractVersion || ""
-              }`,
-            ),
-          );
-          return;
-        }
-
-        info(`Open this link to deploy your contract:`);
-        logger.info(chalk.blueBright(url));
-        open(url.toString());
-        return;
+      const url = await deploy(options);
+      if (url) {
+        open(url);
      }
-
-      const url = await processProject(options, "deploy");
-      info(`Open this link to deploy your contracts:`);
-      logger.info(chalk.blueBright(url.toString()));
-      open(url.toString());
    });

  program
@@ -128,13 +131,24 @@ $$$$$$\\   $$$$$$$\\  $$\\  $$$$$$\\   $$$$$$$ |$$\\  $$\\  $$\\  $$$$$$\\  $$$$
      "Release your protocol so other devs can deploy them and unlock SDKs, Dashboards and Analytics",
    )
    .option("-p, --path <project-path>", "path to project", ".")
+    .option(
+      "-f, --file [name]",
+      "Filter for contract files that contain the file name",
+    )
+    .option(
+      "-cn, --contract-name [name]",
+      "Filter for contracts that contain this contract name",
+    )
    .option("--dry-run", "dry run (skip actually publishing)")
    .option("-d, --debug", "show debug logs")
    .option("--ci", "Continuous Integration mode")
    .action(async (options) => {
      const url = await processProject(options, "release");
-      info(`Open this link to release your contracts:`);
-      logger.info(chalk.blueBright(url.toString()));
+      info(
+        `Open this link to release your contracts: ${chalk.blueBright(
+          url.toString(),
+        )}`,
+      );
      open(url.toString());
    });

@@ -144,13 +158,35 @@ $$$$$$\\   $$$$$$$\\  $$\\  $$$$$$\\   $$$$$$$ |$$\\  $$\\  $$\\  $$$$$$\\  $$$$
    .argument("[upload]", "path to file or directory to upload")
    .action(async (path) => {
      const storage = new ThirdwebStorage();
-      const uri = await upload(storage, path);
-      info(`Files stored at the following IPFS URI:`);
-      logger.info(chalk.blueBright(uri.toString()));
+      try {
+        const uri = await upload(storage, path);
+        info(
+          `Files stored at the following IPFS URI: ${chalk.blueBright(
+            uri.toString(),
+          )}`,
+        );

-      const url = storage.resolveScheme(uri);
-      info(`Open this link to view your upload:`);
-      logger.info(chalk.blueBright(url.toString()));
+        const url = storage.resolveScheme(uri);
+        info(
+          `Open this link to view your upload: ${chalk.blueBright(
+            url.toString(),
+          )}`,
+        );
+      } catch (err: any) {
+        if (
+          err.toString() === "No files detected in specified directory" ||
+          err.toString() === "Invalid path provided" ||
+          err.toString() === "No path provided"
+        ) {
+          logger.error(
+            chalk.redBright(
+              "Please specify a valid file or directory to upload",
+            ),
+          );
+        } else {
+          logger.error(chalk.redBright("Failed to upload files"), err);
+        }
+      }
    });

  program
@@ -165,6 +201,134 @@ $$$$$$\\   $$$$$$$\\  $$\\  $$$$$$\\   $$$$$$$ |$$\\  $$\\  $$\\  $$$$$$\\  $$$$
      await detectExtensions(options);
    });

+  if (!skipIntro) {
+    const versionSpinner = spinner("Checking for updates...");
+    await import("update-notifier").then(
+      async ({ default: updateNotifier }) => {
+        const notifier = updateNotifier({
+          pkg,
+          shouldNotifyInNpmScript: true,
+          // check every time while we're still building the CLI
+          updateCheckInterval: 0,
+        });
+
+        const versionInfo = await notifier.fetchInfo();
+        versionSpinner.stop();
+
+        if (versionInfo.type !== "latest") {
+          const res = await prompts({
+            type: "toggle",
+            name: "upgrade",
+            message: `A new version of the CLI is available. Would you like to upgrade?`,
+            initial: true,
+            active: "yes",
+            inactive: "no",
+          });
+
+          if (res.upgrade) {
+            const updateSpinner = spinner(
+              `Upgrading CLI to version ${versionInfo.latest}...`,
+            );
+
+            const clonedEnvironment = { ...process.env };
+            clonedEnvironment.THIRDWEB_CLI_SKIP_INTRO = "true";
+
+            const installation = await findPackageInstallation();
+
+            // If the package isn't installed anywhere, just defer to npx thirdweb@latest
+            if (!installation) {
+              updateSpinner.succeed(
+                `Now using CLI version ${versionInfo.latest}. Continuing execution...`,
+              );
+
+              await new Promise((done, failed) => {
+                const shell = spawn(
+                  `npx --yes thirdweb@latest ${process.argv
+                    .slice(2)
+                    .join(" ")}`,
+                  [],
+                  { stdio: "inherit", shell: true, env: clonedEnvironment },
+                );
+                shell.on("close", (code) => {
+                  if (code === 0) {
+                    done("");
+                  } else {
+                    failed();
+                  }
+                });
+              });
+
+              return process.exit(0);
+            }
+
+            // Otherwise, get the correct command based on package manager and local vs. global
+            let command = "";
+            switch (installation.packageManager) {
+              case "npm":
+                command = installation.isGlobal
+                  ? `npm install -g thirdweb`
+                  : `npm install thirdweb`;
+                break;
+              case "yarn":
+                command = installation.isGlobal
+                  ? `yarn global add thirdweb`
+                  : `yarn add thirdweb`;
+                break;
+              case "pnpm":
+                command = installation.isGlobal
+                  ? `pnpm add -g thirdweb@latest`
+                  : `pnpm add thirdweb@latest`;
+                break;
+              default:
+                console.error(
+                  `Could not detect package manager in use, aborting automatic upgrade.\nIf you want to upgrade the CLI, please do it manually with your package manager.`,
+                );
+                process.exit(1);
+            }
+
+            await new Promise((done, failed) => {
+              exec(command, (err, stdout, stderr) => {
+                if (err) {
+                  failed(err);
+                  return;
+                }
+
+                done({ stdout, stderr });
+              });
+            });
+
+            updateSpinner.succeed(
+              `Successfully upgraded CLI to version ${versionInfo.latest}. Continuing execution...`,
+            );
+
+            // If the package is installed globally with yarn or pnpm, then npx won't recognize it
+            // So we need to make sure to run the command directly
+            const executionCommand =
+              !installation.isGlobal || installation.packageManager === "npm"
+                ? `npx thirdweb`
+                : `thirdweb`;
+            await new Promise((done, failed) => {
+              const shell = spawn(
+                `${executionCommand} ${process.argv.slice(2).join(" ")}`,
+                [],
+                { stdio: "inherit", shell: true, env: clonedEnvironment },
+              );
+              shell.on("close", (code) => {
+                if (code === 0) {
+                  done("");
+                } else {
+                  failed();
+                }
+              });
+            });
+
+            process.exit(0);
+          }
+        }
+      },
+    );
+  }
+
  await program.parseAsync();
 };

@@ -72,13 +72,13 @@ export async function detectExtensions(options: any) {
      const enabledFeatures: Feature[] = features.enabledFeatures.map(
        (feature) => ({
          name: feature.name,
-          reference: `https://portal.thirdweb.com/extensions/${feature.name.toLowerCase()}`,
+          reference: `https://portal.thirdweb.com/interfaces/${feature.name.toLowerCase()}`,
        }),
      );
      const suggestedFeatures: Feature[] = features.suggestedFeatures.map(
        (feature) => ({
          name: feature.name,
-          reference: `https://portal.thirdweb.com/extensions/${feature.name.toLowerCase()}`,
+          reference: `https://portal.thirdweb.com/interfaces/${feature.name.toLowerCase()}`,
        }),
      );

@@ -76,7 +76,7 @@ export async function processProject(
    }
  }

-  let compiledResult;
+  let compiledResult: { contracts: ContractPayload[] };
  const compileLoader = spinner("Compiling project...");
  try {
    compiledResult = await build(projectPath, projectType);
@@ -106,10 +106,47 @@ export async function processProject(
    if (options.ci) {
      selectedContracts = compiledResult.contracts;
    } else {
-      const choices = compiledResult.contracts.map((c) => ({
-        name: c.name,
-        value: c,
-      }));
+      const filtered = compiledResult.contracts
+        .filter((c) => {
+          if (typeof options.file === "string" && options.file.length > 0) {
+            return c.fileName.includes(options.file);
+          }
+
+          return true;
+        })
+        .filter((c) => {
+          if (
+            typeof options.contractName === "string" &&
+            options.contractName.length > 0
+          ) {
+            return c.name.includes(options.contractName);
+          }
+
+          return true;
+        });
+
+      if (filtered.length === 0) {
+        logger.error(`No contracts found matching the specified filters.`);
+        process.exit(1);
+      }
+
+      const choices = filtered.map((c) => {
+        if (
+          compiledResult.contracts.filter(
+            (other: ContractPayload) => other.name === c.name,
+          ).length > 1
+        ) {
+          return {
+            name: `${c.name} - ${chalk.gray(c.fileName)}`,
+            value: c,
+          };
+        }
+
+        return {
+          name: c.name,
+          value: c,
+        };
+      });
      const prompt = createContractsPrompt(
        choices,
        `Choose which contract(s) to ${command}`,
@@ -164,7 +201,7 @@ export async function processProject(
    const metadataURIs = await Promise.all(
      selectedContracts.map(async (c) => {
        logger.debug(`Uploading ${c.name}...`);
-        return await storage.upload(JSON.parse(c.metadata), {
+        return await storage.upload(JSON.parse(JSON.stringify(c.metadata)), {
          uploadWithoutDirectory: true,
        });
      }),
@@ -55,6 +55,7 @@ export class BrownieBuilder extends BaseBuilder {
            metadata: {},
            bytecode,
            sources: [], // TODO
+            fileName: "", // TODO
            name: contractName,
          });
          break;
@@ -1,7 +1,7 @@
-import { extractIPFSHashFromBytecode } from "../helpers/ipfs";
 import { logger } from "../helpers/logger";
 import { CompileOptions, IBuilder } from "../interfaces/Builder";
 import { ContractPayload } from "../interfaces/ContractPayload";
+import { extractIPFSHashFromBytecode } from "@thirdweb-dev/sdk/evm";

 export abstract class BaseBuilder implements IBuilder {
  abstract compile(
@@ -1,9 +1,11 @@
 import { findFiles } from "../../common/file-helper";
+import { hasForge } from "../../create/helpers/has-forge";
 import { execute } from "../helpers/exec";
 import { logger } from "../helpers/logger";
 import { CompileOptions } from "../interfaces/Builder";
 import { ContractPayload } from "../interfaces/ContractPayload";
 import { BaseBuilder } from "./builder-base";
+import chalk from "chalk";
 import { existsSync, readFileSync } from "fs";
 import { basename, join } from "path";

@@ -11,6 +13,18 @@ export class FoundryBuilder extends BaseBuilder {
  public async compile(options: CompileOptions): Promise<{
    contracts: ContractPayload[];
  }> {
+    const isInstalled = await hasForge();
+    if (!isInstalled) {
+      console.error(
+        `\n${chalk.redBright(
+          `error`,
+        )} You don't have forge installed on this machine!\n\nYou can install forge by following these instructions:\n${chalk.blueBright(
+          `https://book.getfoundry.sh/getting-started/installation`,
+        )}\n`,
+      );
+      process.exit(1);
+    }
+
    await execute("forge clean", options.projectPath);
    await execute("forge build --extra-output metadata", options.projectPath);

@@ -88,6 +102,11 @@ export class FoundryBuilder extends BaseBuilder {
        })
        .filter((path) => path !== undefined) as string[];

+      const fileNames = Object.keys(
+        parsedMetadata?.settings?.compilationTarget || {},
+      );
+      const fileName = fileNames.length > 0 ? fileNames[0] : "";
+
      if (
        this.shouldProcessContract(
          contractInfo.abi,
@@ -99,6 +118,7 @@ export class FoundryBuilder extends BaseBuilder {
          name: contractName,
          metadata,
          bytecode,
+          fileName,
          sources,
        });
      }
@@ -25,7 +25,7 @@ export class HardhatBuilder extends BaseBuilder {
    //the hardhat extractor **logs out** the runtime config of hardhat, we take that stdout and parse it
    const stringifiedConfig = (
      await execute(
-        `npx hardhat run ${configExtractorScriptPath} --no-compile`,
+        `npx hardhat run "${configExtractorScriptPath}" --no-compile`,
        options.projectPath,
      )
    ).stdout;
@@ -123,11 +123,17 @@ export class HardhatBuilder extends BaseBuilder {
            })
            .filter((path) => path !== undefined) as string[];

+          const fileNames = Object.keys(
+            meta?.settings?.compilationTarget || {},
+          );
+          const fileName = fileNames.length > 0 ? fileNames[0] : "";
+
          if (this.shouldProcessContract(abi, deployedBytecode, contractName)) {
            contracts.push({
              metadata,
              bytecode,
              name: contractName,
+              fileName,
              sources,
            });
          }
@@ -140,11 +140,17 @@ export class SolcBuilder extends BaseBuilder {
        })
        .filter((path) => path !== undefined) as string[];

+      const fileNames = Object.keys(
+        parsedMetadata?.settings?.compilationTarget || {},
+      );
+      const fileName = fileNames.length > 0 ? fileNames[0] : "";
+
      if (this.shouldProcessContract(abi, deployedBytecode, contractName)) {
        contracts.push({
          metadata,
          bytecode,
          name: contractName,
+          fileName,
          sources: _sources,
        });
      }
@@ -72,11 +72,18 @@ export class TruffleBuilder extends BaseBuilder {
          return undefined;
        })
        .filter((path) => path !== undefined) as string[];
+
+      const fileNames = Object.keys(
+        parsedMetadata?.settings?.compilationTarget || {},
+      );
+      const fileName = fileNames.length > 0 ? fileNames[0] : "";
+
      if (this.shouldProcessContract(abi, deployedBytecode, contractName)) {
        contracts.push({
          metadata,
          bytecode,
          name: contractName,
+          fileName,
          sources,
        });
      }
@@ -36,6 +36,7 @@ export default async function detect(
        name: "continue",
        message:
          "Do you want to continue and compile this project with solc instead?",
+        initial: true,
      });
      const shouldCompile = await prompt.run();
      if (!shouldCompile) {
@@ -0,0 +1,11 @@
+import { ProjectType } from "../types/ProjectType";
+import { Detector } from "./detector";
+import { existsSync } from "fs";
+
+export default class NPMDetector implements Detector {
+  public projectType: ProjectType = "npm";
+
+  public matches(path: string): boolean {
+    return existsSync(path + "/package-lock.json");
+  }
+}
@@ -0,0 +1,14 @@
+import { ProjectType } from "../types/ProjectType";
+import { Detector } from "./detector";
+import { existsSync } from "fs";
+
+export default class ViteDetector implements Detector {
+  public projectType: ProjectType = "vite";
+
+  public matches(path: string): boolean {
+    return (
+      existsSync(path + "/vite.config.js") ||
+      existsSync(path + "/vite.config.ts")
+    );
+  }
+}
@@ -0,0 +1,11 @@
+import { ProjectType } from "../types/ProjectType";
+import { Detector } from "./detector";
+import { existsSync } from "fs";
+
+export default class YarnDetector implements Detector {
+  public projectType: ProjectType = "yarn";
+
+  public matches(path: string): boolean {
+    return existsSync(path + "/yarn.lock");
+  }
+}
@@ -1,66 +0,0 @@
-import { decodeFirstSync } from "cbor";
-import { UnixFS } from "ipfs-unixfs";
-import { DAGNode } from "ipld-dag-pb";
-import { toB58String } from "multihashes";
-
-/**
- * Derives IPFS hash of string
- * @param  {String} str
- * @return {String}     IPFS hash (ex: "Qm")
- */
-export async function getIPFSHash(str: string) {
-  const file = new UnixFS({
-    type: "file",
-    data: Buffer.from(str),
-  });
-  const node = new DAGNode(file.marshal());
-  const metadataLink = await node.toDAGLink();
-  return toB58String(metadataLink.Hash.multihash);
-}
-
-/**
- * Extract the IPFS hash from the given bytecode
- * @param bytecode
- * @returns
- */
-export function extractIPFSHashFromBytecode(
-  bytecode: string,
-): string | undefined {
-  const numericBytecode = hexToBytes(bytecode);
-  const cborLength: number =
-    numericBytecode[numericBytecode.length - 2] * 0x100 +
-    numericBytecode[numericBytecode.length - 1];
-  const bytecodeBuffer = Buffer.from(
-    numericBytecode.slice(numericBytecode.length - 2 - cborLength, -2),
-  );
-  const cborData = decodeFirstSync(bytecodeBuffer);
-  if (cborData["ipfs"]) {
-    const uri = toB58String(cborData["ipfs"]);
-    return uri;
-  }
-  return undefined;
-}
-
-function hexToBytes(hex: string | number) {
-  hex = hex.toString(16);
-  if (!hex.startsWith("0x")) {
-    hex = `0x${hex}`;
-  }
-  if (!isHexStrict(hex)) {
-    throw new Error('Given value "' + hex + '" is not a valid hex string.');
-  }
-
-  hex = hex.replace(/^0x/i, "");
-
-  for (var bytes = [], c = 0; c < hex.length; c += 2) {
-    bytes.push(parseInt(hex.slice(c, c + 2), 16));
-  }
-  return bytes;
-}
-
-function isHexStrict(hex: string | number) {
-  return (
-    (typeof hex === "string" || typeof hex === "number") &&
-    /^(-)?0x[0-9a-f]*$/i.test(hex.toString())
-  );
-}
@@ -17,6 +17,11 @@ export interface ContractPayload {
   */
  metadata: any;

+  /**
+   * The file name of the original compiled file
+   */
+  fileName: string;
+
  /**
   * The source file paths
   */
@@ -4,4 +4,10 @@ export type ProjectType =
  | "hardhat"
  | "truffle"
  | "solc"
+  | "vite"
+  | "next"
+  | "cra"
+  | "spa-webapp"
+  | "yarn"
+  | "npm"
  | "none";
@@ -2,60 +2,94 @@

 /* eslint-disable import/no-extraneous-dependencies */
 import { CREATE_MESSAGES } from "../../constants/constants";
+import detect from "../core/detection/detect";
 import { DownloadError, createApp } from "./helpers/create-app";
-import { createContract } from "./helpers/create-contract";
+import { createContractProject } from "./helpers/create-contract";
 import { getPkgManager } from "./helpers/get-pkg-manager";
 import { validateNpmName } from "./helpers/validate-pkg";
 import chalk from "chalk";
+import fs from "fs";
 import path from "path";
 import prompts from "prompts";

-let projectType: string = "";
+let contractName: string = "";
 let projectPath: string = "";
+let projectType: string = "";
 let framework: string = "";
 let language: string = "";
 let baseContract: string = "";
+let chain: string = "";
 /* let createType: string = "app"; */

-export async function twCreate(options: any) {
-  if (typeof projectPath === "string") {
-    projectPath = projectPath.trim();
+export async function twCreate(
+  pType: string,
+  pPath: string = "",
+  options: any,
+) {
+  if (typeof pPath === "string") {
+    projectPath = pPath;
  }

-  if (options.app) {
+  if (typeof options.contractName === "string") {
+    contractName = options.contractName;
+  }
+
+  if (pType === "app" || options.app) {
    projectType = "app";
-  }
-
-  if (options.contract) {
+  } else if (pType === "contract" || options.contract) {
    projectType = "contract";
  }

-  if (options.typescript) {
-    language = "typescript";
+  if (projectType === "app") {
+    if (options.typescript) {
+      language = "typescript";
+    }
+
+    if (options.javascript) {
+      language = "javascript";
+    }
+
+    if (options.next) {
+      framework = "next";
+    }
+
+    if (options.cra) {
+      framework = "cra";
+    }
+
+    if (options.vite) {
+      framework = "vite";
+    }
+
+    if (options.node) {
+      framework = "node";
+    }
+
+    if (options.express) {
+      framework = "express";
+    }
+
+    if (options.reactNative) {
+      framework = "react-native";
+    }
+
+    if (options.solana) {
+      chain = "solana";
+    }
+
+    if (options.evm) {
+      chain = "evm";
+    }
  }

-  if (options.javascript) {
-    language = "javascript";
-  }
+  if (projectType === "contract") {
+    if (options.forge) {
+      framework = "forge";
+    }

-  if (options.next) {
-    framework = "next";
-  }
-
-  if (options.cra) {
-    framework = "cra";
-  }
-
-  if (options.vite) {
-    framework = "vite";
-  }
-
-  if (options.forge) {
-    framework = "forge";
-  }
-
-  if (options.hardhat) {
-    framework = "hardhat";
+    if (options.hardhat) {
+      framework = "hardhat";
+    }
  }

  if (options.framework) {
@@ -76,103 +110,221 @@ export async function twCreate(options: any) {
    if (typeof res.projectType === "string") {
      projectType = res.projectType.trim();
    }
-  } else if (!projectType && options.template) {
+  } else if (!projectType || options.template) {
    // If no project type is specified, but a template is, we assume the user wants to create an app.
    // We do this so old users can still use the --template flag to create an app.
    projectType = "app";
  }

-  if (!projectPath) {
-    const defaultName =
-      projectType === "contract" ? "thirdweb-contracts" : "thirdweb-app";
-    const res = await prompts({
-      type: "text",
-      name: "path",
-      message: CREATE_MESSAGES.projectName,
-      initial: options.template || defaultName,
-      format: (name: string) => name.toLowerCase(),
-      validate: (name: string) => {
-        const validation = validateNpmName(
-          path.basename(path.resolve(name.toLowerCase())),
-        );
-        if (validation.valid) {
-          return true;
-        }
-        return "Invalid project name: " + validation.problems?.[0];
-      },
-    });
-
-    if (typeof res.path === "string") {
-      projectPath = res.path.trim();
-    }
-  }
-
-  if (!projectPath) {
-    console.log(
-      "\nPlease specify the project directory:\n" +
-        `  ${chalk.cyan("npx thirdweb create")} ${chalk.green(
-          "<project-directory>",
-        )}\n` +
-        "For example:\n" +
-        `  ${chalk.cyan("npx thirdweb create")} ${chalk.green(
-          "my-thirdweb-app",
-        )}\n\n` +
-        `Run ${chalk.cyan("npx thirdweb --help")} to see all options.`,
-    );
-    process.exit(1);
-  }
-
-  if (!options.template) {
-    if (projectType === "app" && !framework) {
-      const res = await prompts({
-        type: "select",
-        name: "framework",
-        message: CREATE_MESSAGES.framework,
-        choices: [
-          { title: "Next.js", value: "next" },
-          { title: "Create React App", value: "cra" },
-          { title: "Vite", value: "vite" },
-        ],
-      });
-
-      if (typeof res.framework === "string") {
-        framework = res.framework.trim();
-      }
-    }
-
-    if (projectType === "app" && !language) {
-      const res = await prompts({
-        type: "select",
-        name: "language",
-        message: CREATE_MESSAGES.language,
-        choices: [
-          { title: "JavaScript", value: "javascript" },
-          { title: "TypeScript", value: "typescript" },
-        ],
-      });
-
-      if (typeof res.language === "string") {
-        language = res.language.trim();
-      }
-    }
+  // Whether to only create a new contract without the project
+  let onlyContract = false;
+  if (projectType === "contract") {
+    const resolvedProjectPath = path.resolve(projectPath);
+    const contractProjectType = await detect(resolvedProjectPath, {});

    if (
-      projectType === "contract" &&
-      framework !== "forge" &&
-      framework !== "hardhat"
+      contractProjectType === "foundry" &&
+      fs.existsSync(path.join(resolvedProjectPath, "src"))
    ) {
+      onlyContract = true;
+      projectPath = path.join(projectPath, "src");
+    } else if (contractProjectType === "hardhat") {
+      if (fs.existsSync(path.join(resolvedProjectPath, "contracts"))) {
+        onlyContract = true;
+        projectPath = path.join(projectPath, "contracts");
+      } else {
+        // If there's no expected contracts folder, check for a directory that has .sol files
+        const directories = fs
+          .readdirSync(resolvedProjectPath)
+          .filter((file) =>
+            fs.lstatSync(path.join(resolvedProjectPath, file)).isDirectory(),
+          );
+        for (const directory of directories) {
+          const files = fs.readdirSync(path.join(projectPath, directory));
+          if (files.some((file) => file.endsWith(".sol"))) {
+            onlyContract = true;
+            projectPath = path.join(projectPath, directory);
+            break;
+          }
+        }
+      }
+    }
+  }
+
+  if (!onlyContract) {
+    if (!projectPath) {
+      const defaultName =
+        projectType === "contract" ? "thirdweb-contracts" : "thirdweb-app";
      const res = await prompts({
-        type: "select",
-        name: "framework",
-        message: CREATE_MESSAGES.framework,
-        choices: [
-          { title: "Hardhat", value: "hardhat" },
-          { title: "Forge", value: "forge" },
-        ],
+        type: "text",
+        name: "path",
+        message: CREATE_MESSAGES.projectName,
+        initial: options.template || defaultName,
+        format: (name: string) => name.toLowerCase(),
+        validate: (name: string) => {
+          const validation = validateNpmName(
+            path.basename(path.resolve(name.toLowerCase())),
+          );
+          if (validation.valid) {
+            return true;
+          }
+          return "Invalid project name: " + validation.problems?.[0];
+        },
      });

-      if (typeof res.framework === "string") {
-        framework = res.framework.trim();
+      if (typeof res.path === "string") {
+        projectPath = path.join(projectPath, res.path.trim());
+      }
+    }
+
+    if (!projectPath) {
+      console.log(
+        "\nPlease specify the project directory:\n" +
+          `  ${chalk.cyan("npx thirdweb create")} ${chalk.green(
+            "<project-directory>",
+          )}\n` +
+          "For example:\n" +
+          `  ${chalk.cyan("npx thirdweb create")} ${chalk.green(
+            "my-thirdweb-app",
+          )}\n\n` +
+          `Run ${chalk.cyan("npx thirdweb --help")} to see all options.`,
+      );
+      process.exit(1);
+    }
+
+    if (!options.template) {
+      if (projectType === "app" && !chain) {
+        const res = await prompts({
+          type: "select",
+          name: "chain",
+          message: CREATE_MESSAGES.chain,
+          choices: [
+            { title: "EVM", value: "evm" },
+            { title: "Solana", value: "solana" },
+          ],
+        });
+
+        if (res.chain === "solana") {
+          chain = "solana";
+        } else {
+          chain = "evm";
+        }
+      }
+
+      if (projectType === "app" && !framework) {
+        const res = await prompts({
+          type: "select",
+          name: "framework",
+          message: CREATE_MESSAGES.framework,
+          choices:
+            chain === "solana"
+              ? [
+                  { title: "Next.js", value: "next" },
+                  { title: "Create React App", value: "cra" },
+                  { title: "Node.js", value: "node" },
+                  { title: "Express", value: "express" },
+                  // Solana doesn't support Vite just yet:
+                  // { title: "Vite", value: "vite" },
+                ]
+              : [
+                  { title: "Next.js", value: "next" },
+                  { title: "Create React App", value: "cra" },
+                  { title: "Vite", value: "vite" },
+                  { title: "React Native", value: "react-native" },
+                  { title: "Node.js", value: "node" },
+                  { title: "Express", value: "express" },
+                ],
+        });
+
+        if (typeof res.framework === "string") {
+          framework = res.framework.trim();
+        }
+      }
+
+      if (projectType === "app" && !language) {
+        const res = await prompts({
+          type: "select",
+          name: "language",
+          message: CREATE_MESSAGES.language,
+          choices: [
+            { title: "JavaScript", value: "javascript" },
+            { title: "TypeScript", value: "typescript" },
+          ],
+        });
+
+        if (typeof res.language === "string") {
+          language = res.language.trim();
+        }
+      }
+
+      if (
+        projectType === "contract" &&
+        framework !== "forge" &&
+        framework !== "hardhat"
+      ) {
+        const res = await prompts({
+          type: "select",
+          name: "framework",
+          message: CREATE_MESSAGES.framework,
+          choices: [
+            { title: "Hardhat", value: "hardhat" },
+            { title: "Forge", value: "forge" },
+          ],
+        });
+
+        if (typeof res.framework === "string") {
+          framework = res.framework.trim();
+        }
+      }
+
+      if (!framework) {
+        console.log("Please specify a framework");
+        process.exit(1);
+      }
+
+      if (!language) {
+        // Default = JavaScript
+        language = "javascript";
+      }
+    }
+  }
+
+  if (projectType === "contract") {
+    // Select contract name
+    if (!contractName) {
+      const defaultName = "MyContract";
+      const res = await prompts({
+        type: "text",
+        name: "path",
+        message: CREATE_MESSAGES.contractName,
+        initial: defaultName,
+        validate: (name: string) => {
+          const isValid = /(^[a-z0-9A-Z]+$)|(^[a-z0-9A-Z]+\.sol$)/.test(name);
+          if (isValid) {
+            return true;
+          }
+
+          return `Invalid contract name 'contractName' (only alphanumeric characters allowed)`;
+        },
+      });
+
+      if (typeof res.path === "string") {
+        contractName = res.path.trim();
+      }
+
+      if (!contractName) {
+        console.log(
+          "\nPlease specify the contract name:\n" +
+            `  ${chalk.cyan(
+              "npx thirdweb create --contract --name",
+            )} ${chalk.green("<contract-name>")}\n` +
+            "For example:\n" +
+            `  ${chalk.cyan(
+              "npx thirdweb create --contract --name",
+            )} ${chalk.green("MyContract")}\n\n` +
+            `Run ${chalk.cyan("npx thirdweb --help")} to see all options.`,
+        );
+        process.exit(1);
      }
    }

@@ -184,7 +336,9 @@ export async function twCreate(options: any) {
        name: "standard",
        message: CREATE_MESSAGES.contract,
        choices: [
-          { title: "Empty Contract", value: "none" },
+          ...(!onlyContract
+            ? [{ title: "Empty Contract", value: "none" }]
+            : []),
          { title: "ERC721", value: "erc721" },
          { title: "ERC20", value: "erc20" },
          { title: "ERC1155", value: "erc1155" },
@@ -238,20 +392,11 @@ export async function twCreate(options: any) {
        }
      }
    }
-
-    if (!framework) {
-      console.log("Please specify a framework");
-      process.exit(1);
-    }
-
-    if (!language) {
-      // Default = JavaScript
-      language = "javascript";
-    }
  }

-  const resolvedProjectPath = path.resolve(projectPath);
-  const projectName = path.basename(resolvedProjectPath);
+  // Resolve project path
+  projectPath = path.resolve(projectPath);
+  const projectName = path.basename(projectPath);

  const { valid, problems } = validateNpmName(projectName);
  if (!valid) {
@@ -283,18 +428,21 @@ export async function twCreate(options: any) {
  try {
    if (projectType === "app") {
      await createApp({
-        appPath: resolvedProjectPath,
+        appPath: projectPath,
        packageManager,
        framework,
        language,
        template,
+        chain,
      });
    } else {
-      await createContract({
-        contractPath: resolvedProjectPath,
+      await createContractProject({
+        contractPath: projectPath,
        packageManager,
        framework,
+        contractName,
        baseContract,
+        onlyContract,
      });
    }
  } catch (reason) {
@@ -22,12 +22,14 @@ export async function createApp({
  framework,
  language,
  template,
+  chain,
 }: {
  appPath: string;
  packageManager: PackageManager;
  framework?: string;
  language?: string;
  template?: string;
+  chain?: string;
 }): Promise<void> {
  let frameworkPath = "";

@@ -43,7 +45,9 @@ export async function createApp({
      process.exit(1);
    }
  } else if (framework) {
-    frameworkPath = `${framework}-${language || "javascript"}-starter`;
+    frameworkPath = `${framework}-${language || "javascript"}-${
+      chain === "solana" ? "solana-" : ""
+    }starter`;
    const found = await hasTemplate(frameworkPath);

    if (!found) {
@@ -2,6 +2,7 @@ import { hasBaseContract, readBaseContract } from "./base-contracts";
 import { DownloadError } from "./create-app";
 import { PackageManager } from "./get-pkg-manager";
 import { tryGitInit } from "./git";
+import { hasForge } from "./has-forge";
 import { install } from "./install";
 import { isFolderEmpty } from "./is-folder-empty";
 import { getOnline } from "./is-online";
@@ -11,22 +12,28 @@ import { submodules } from "./submodules";
 import { downloadAndExtractRepo } from "./templates";
 import retry from "async-retry";
 import chalk from "chalk";
+import fs from "fs";
 import { writeFile } from "fs/promises";
 import path from "path";

-interface ICreateContract {
+interface ICreateContractProject {
  contractPath: string;
  packageManager: PackageManager;
+  contractName: string;
  framework?: string;
  baseContract?: string;
+  onlyContract: boolean;
 }

-export async function createContract({
+export async function createContractProject({
  contractPath,
  packageManager,
  framework,
+  contractName,
  baseContract,
-}: ICreateContract) {
+  onlyContract,
+}: ICreateContractProject) {
+  // Check that the selected base contract is valid
  if (baseContract) {
    const found = hasBaseContract(baseContract);

@@ -40,8 +47,8 @@ export async function createContract({
    }
  }

+  // Check that we have write permission for the specified directory
  const root = path.resolve(contractPath);
-
  if (!(await isWriteable(path.dirname(root)))) {
    console.error(
      "The application path is not writable, please check folder permissions and try again.",
@@ -52,117 +59,179 @@ export async function createContract({
    process.exit(1);
  }

-  const projectName = path.basename(root);
-
-  await makeDir(root);
-  if (!isFolderEmpty(root, projectName)) {
+  // Check that the contract name is valid
+  if (!/(^[a-z0-9A-Z]+$)|(^[a-z0-9A-Z]+\.sol$)/.test(contractName)) {
+    console.error(
+      `Contract name ${chalk.red(
+        `"${contractName}"`,
+      )} is not valid (only alphanumeric characters are allowed).`,
+    );
    process.exit(1);
  }

+  // Clean the contract name
+  contractName = contractName.replace(/\.sol$/, "") + ".sol";
+
  const useYarn = packageManager === "yarn";
-  const isOnline = !useYarn || (await getOnline());
-  const originalDirectory = process.cwd();

-  console.log(
-    `Creating a new thirdweb contracts project in ${chalk.green(root)}.`,
-  );
-  console.log();
-
-  process.chdir(root);
-
-  function isErrorLike(err: unknown): err is { message: string } {
-    return (
-      typeof err === "object" &&
-      err !== null &&
-      typeof (err as { message?: unknown }).message === "string"
-    );
-  }
-
-  try {
-    console.log(`Downloading files. This might take a moment.`);
-
-    let starter = "";
-    if (framework === "hardhat") {
-      starter = "hardhat-javascript-starter";
-    } else if (framework === "forge") {
-      starter = "forge-starter";
-    } else {
-      console.error("Please provide a valid contracts framework.");
+  if (onlyContract) {
+    // If we are already in a contracts project, just create a new contract
+    if (fs.existsSync(path.join(root, contractName))) {
+      console.error(
+        `A contract with the name ${chalk.red(
+          `"${contractName}"`,
+        )} already exists in specified directory.`,
+      );
      process.exit(1);
    }

-    await retry(
-      () => downloadAndExtractRepo(root, { name: starter, filePath: "" }),
-      {
-        retries: 3,
-      },
-    );
-
-    // Modify the /contracts/MyContract.sol contents to match the base contract
    if (baseContract && baseContract.length > 0) {
      const baseContractText = readBaseContract(baseContract);

      // Set the contents of the Contract.sol file to the base contract
      let contractFile = "";
-      if (framework === "hardhat") {
-        contractFile = path.join(root, "contracts", "Contract.sol");
-      }
-      if (framework === "forge") {
-        contractFile = path.join(root, "src", "Contract.sol");
-      }
+      contractFile = path.join(root, contractName);

      // Write the base contract to the MyContract.sol file
      await writeFile(contractFile, baseContractText);
+
+      console.log(
+        `${chalk.green("Success!")} Created ${contractName} at ${contractPath}`,
+      );
    }
-  } catch (reason) {
-    throw new DownloadError(
-      isErrorLike(reason) ? reason.message : String(reason),
-    );
-  }
-
-  console.log("Installing packages. This might take a couple of minutes.");
-  console.log();
-
-  await install(root, null, { packageManager, isOnline });
-  console.log();
-
-  if (tryGitInit(root)) {
-    console.log("Initialized a git repository.");
-    console.log();
-  }
-
-  if (framework === "forge") {
-    await submodules();
-  }
-
-  let cdpath: string;
-  if (path.join(originalDirectory, projectName) === contractPath) {
-    cdpath = projectName;
  } else {
-    cdpath = contractPath;
-  }
+    // Otherwise, create a new contracts project
+    const projectName = path.basename(root);

-  console.log(
-    `${chalk.green("Success!")} Created ${projectName} at ${contractPath}`,
-  );
-  console.log();
-  console.log("Inside that directory, you can run several commands:");
-  console.log();
-  console.log(chalk.cyan(`  ${packageManager}${useYarn ? "" : " run"} build`));
-  console.log(
-    "    Compiles your contracts and detects thirdweb extensions implemented on them.",
-  );
-  console.log();
-  console.log(chalk.cyan(`  ${packageManager}${useYarn ? "" : " run"} deploy`));
-  console.log("    Deploys your contracts with the thirdweb deploy flow.");
-  console.log();
-  console.log(
-    chalk.cyan(`  ${packageManager}${useYarn ? "" : " run"} release`),
-  );
-  console.log("    Releases your contracts with the thirdweb release flow.");
-  console.log();
-  console.log("We suggest that you begin by typing:");
-  console.log();
-  console.log(chalk.cyan("  cd"), cdpath);
-  console.log();
+    await makeDir(root);
+    if (!isFolderEmpty(root, projectName)) {
+      process.exit(1);
+    }
+
+    const isOnline = !useYarn || (await getOnline());
+    const originalDirectory = process.cwd();
+
+    console.log(
+      `Creating a new thirdweb contracts project in ${chalk.green(root)}.`,
+    );
+    console.log();
+
+    process.chdir(root);
+
+    function isErrorLike(err: unknown): err is { message: string } {
+      return (
+        typeof err === "object" &&
+        err !== null &&
+        typeof (err as { message?: unknown }).message === "string"
+      );
+    }
+
+    try {
+      console.log(`Downloading files. This might take a moment.`);
+
+      let starter = "";
+      if (framework === "hardhat") {
+        starter = "hardhat-javascript-starter";
+      } else if (framework === "forge") {
+        starter = "forge-starter";
+      } else {
+        console.error("Please provide a valid contracts framework.");
+        process.exit(1);
+      }
+
+      await retry(
+        () => downloadAndExtractRepo(root, { name: starter, filePath: "" }),
+        {
+          retries: 3,
+        },
+      );
+
+      // Add in a new contracts file with specific base contract
+      if (baseContract && baseContract.length > 0) {
+        const baseContractText = readBaseContract(baseContract);
+
+        // Set the filename of the new file and delete the dummy Contract.sol file
+        let contractFile = "";
+        if (framework === "hardhat") {
+          fs.unlinkSync(path.join(root, "contracts", "Contract.sol"));
+          contractFile = path.join(root, "contracts", contractName);
+        }
+        if (framework === "forge") {
+          fs.unlinkSync(path.join(root, "src", "Contract.sol"));
+          contractFile = path.join(root, "src", contractName);
+        }
+
+        // Write the base contract to the new file
+        await writeFile(contractFile, baseContractText);
+      }
+    } catch (reason) {
+      throw new DownloadError(
+        isErrorLike(reason) ? reason.message : String(reason),
+      );
+    }
+
+    console.log("Installing packages. This might take a couple of minutes.");
+    console.log();
+
+    await install(root, null, { packageManager, isOnline });
+    console.log();
+
+    if (tryGitInit(root)) {
+      console.log("Initialized a git repository.");
+      console.log();
+    }
+
+    if (framework === "forge") {
+      await submodules();
+    }
+
+    let cdpath: string;
+    if (path.join(originalDirectory, projectName) === contractPath) {
+      cdpath = projectName;
+    } else {
+      cdpath = contractPath;
+    }
+
+    console.log(
+      `${chalk.green("Success!")} Created ${projectName} at ${contractPath}`,
+    );
+    console.log();
+    console.log("Inside that directory, you can run several commands:");
+    console.log();
+    console.log(
+      chalk.cyan(`  ${packageManager}${useYarn ? "" : " run"} build`),
+    );
+    console.log(
+      "    Compiles your contracts and detects thirdweb extensions implemented on them.",
+    );
+    console.log();
+    console.log(
+      chalk.cyan(`  ${packageManager}${useYarn ? "" : " run"} deploy`),
+    );
+    console.log("    Deploys your contracts with the thirdweb deploy flow.");
+    console.log();
+    console.log(
+      chalk.cyan(`  ${packageManager}${useYarn ? "" : " run"} release`),
+    );
+    console.log("    Releases your contracts with the thirdweb release flow.");
+    console.log();
+    console.log("We suggest that you begin by typing:");
+    console.log();
+    console.log(chalk.cyan("  cd"), cdpath);
+    console.log();
+
+    if (framework === "forge") {
+      const isInstalled = await hasForge();
+
+      if (!isInstalled) {
+        console.log(
+          `\n${chalk.yellowBright(
+            `warning`,
+          )} You don't have forge installed on this machine, and will need it to run this project! \n\nYou can install forge by following these instructions:\n${chalk.blueBright(
+            `https://book.getfoundry.sh/getting-started/installation`,
+          )}\n`,
+        );
+      }
+    }
+  }
 }
@@ -0,0 +1,14 @@
+import { exec } from "child_process";
+
+export async function hasForge() {
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  return await new Promise((resolve, reject) => {
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    exec("forge --version", (error, stdout, stderr) => {
+      if (error) {
+        resolve(false);
+      }
+      resolve(true);
+    });
+  });
+}
@@ -1,11 +1,26 @@
 import spawn from "cross-spawn";

-export async function runCommand(command: string, args: string[]) {
+export async function runCommand(
+  command: string,
+  args: string[],
+  logging: boolean = false,
+) {
  return new Promise<void>((resolve, reject) => {
    /**
     * Spawn the installation process.
     */
    const child = spawn(command, args);
+    child.stdout?.on("data", (data) => {
+      if (logging) {
+        console.log(data.toString());
+      }
+    });
+
+    child.stderr?.on("error", (err) => {
+      if (logging) {
+        console.error(err);
+      }
+    });
    child.on("close", (code) => {
      if (code !== 0) {
        reject({ command: `${command}` });
@@ -1,5 +1,6 @@
 /* eslint-disable import/no-extraneous-dependencies */
 import { runCommand } from "./run-command";
+import { rm, writeFile } from "node:fs/promises";

 /**
 * Spawn a package manager installation with either Yarn or NPM.
@@ -8,12 +9,12 @@ import { runCommand } from "./run-command";
 */
 export async function submodules(): Promise<void> {
  // Remove script folder because it clashes with contract templates (and not needed with deploy)
-  await runCommand("rm", ["-rf", "script"]);
+  await rm("script", { recursive: true, force: true });

  // Reset and recursively add forge submodules
-  await runCommand("rm", ["-rf", ".gitmodules"]);
-  await runCommand("rm", ["-rf", "lib"]);
-  await runCommand("touch", [".gitmodules"]);
+  await rm(".gitmodules", { recursive: true, force: true });
+  await rm("lib", { recursive: true, force: true });
+  await writeFile(".gitmodules", "");
  await runCommand("git", [
    "submodule",
    "add",
@@ -0,0 +1,43 @@
+import NPMDetector from "../core/detection/npm";
+import ViteDetector from "../core/detection/vite";
+import YarnDetector from "../core/detection/yarn";
+import { runCommand } from "../create/helpers/run-command";
+import { upload } from "../storage/command";
+import { DEFAULT_IPFS_GATEWAY } from "@thirdweb-dev/sdk";
+import { ThirdwebStorage } from "@thirdweb-dev/storage";
+
+export async function deployApp(distPath = "dist", projectPath = ".") {
+  const storage = new ThirdwebStorage();
+  const supportedFrameworks = [new ViteDetector()];
+
+  const possibleProjects = supportedFrameworks
+    .filter((detector) => detector.matches(projectPath))
+    .map((detector) => detector.projectType);
+
+  const hasYarn = new YarnDetector().matches(".");
+  const hasNPM = new NPMDetector().matches(".");
+
+  if (possibleProjects.length === 0) {
+    throw new Error("No supported project detected");
+  }
+
+  try {
+    if (hasYarn) {
+      await runCommand("yarn", ["build"]);
+    } else if (hasNPM) {
+      await runCommand("npm", ["build"]);
+    }
+  } catch (err) {
+    console.error("Can't build project");
+    return Promise.reject("Can't build project");
+  }
+
+  try {
+    let url = await upload(storage, distPath);
+    url = url.replace("ipfs://", DEFAULT_IPFS_GATEWAY);
+    return `${url}/index.html`;
+  } catch (err) {
+    console.error("Can't upload project");
+    return Promise.reject("Can't upload project");
+  }
+}
@@ -0,0 +1,54 @@
+import { processProject } from "../common/processor";
+import { info, logger } from "../core/helpers/logger";
+import generateDashboardUrl from "../helpers/generate-dashboard-url";
+import { deployApp } from "./app";
+import chalk from "chalk";
+
+type DeployOptions = {
+  name: string;
+  contractVersion: string;
+  app: boolean;
+  path?: string;
+  distPath?: string;
+};
+
+export async function deploy(options: DeployOptions) {
+  if (options.name) {
+    const url = generateDashboardUrl(options.name, options.contractVersion);
+
+    if (!url) {
+      logger.error(
+        chalk.red(
+          `Could not find a contract named ${options.name} ${
+            options.contractVersion || ""
+          }`,
+        ),
+      );
+      return;
+    }
+
+    info(`Open this link to deploy your contract: ${chalk.blueBright(url)}`);
+    return url.toString();
+  }
+
+  if (options.app) {
+    try {
+      let url = await deployApp(options.distPath, options.path);
+      info(`Here is the link to your app: ${chalk.blueBright(url.toString())}`);
+      return url.toString();
+    } catch (err) {
+      logger.error("Failed to deploy app, No compatible project found", err);
+      return Promise.reject(
+        "failed to deploy app, no compatible project found",
+      );
+    }
+  }
+
+  const url = await processProject(options, "deploy");
+  info(
+    `Open this link to deploy your contracts: ${chalk.blueBright(
+      url.toString(),
+    )}`,
+  );
+  return url.toString();
+}
@@ -0,0 +1,103 @@
+import { exec } from "child_process";
+
+type PackageManager = "npm" | "yarn" | "pnpm";
+
+interface Installation {
+  packageManager: PackageManager;
+  isGlobal: boolean;
+}
+
+export async function findPackageInstallation(): Promise<
+  Installation | undefined
+> {
+  const isLocal = await isInstalledLocally();
+  if (isLocal) {
+    const packageManager = await import("detect-package-manager").then(
+      ({ detect }) => {
+        return detect();
+      },
+    );
+
+    return { packageManager, isGlobal: false };
+  }
+
+  const isGlobalNpm = await isInstalledGloballyWithNpm();
+  if (isGlobalNpm) {
+    return { packageManager: "npm", isGlobal: true };
+  }
+
+  const isGlobalYarn = await isInstalledGloballyWithYarn();
+  if (isGlobalYarn) {
+    return { packageManager: "yarn", isGlobal: true };
+  }
+
+  const isGlobalPnpm = await isInstalledGloballyWithPnpm();
+  if (isGlobalPnpm) {
+    return { packageManager: "pnpm", isGlobal: true };
+  }
+
+  return undefined;
+}
+
+// For LOCAL packages, npm ls picks up things installed by yarn and pnpm too
+async function isInstalledLocally(): Promise<boolean> {
+  const packages = await detectPackages("npm ls --depth=0");
+  return containsThirdweb(packages || []);
+}
+
+// But for GLOBAL packages, we need to use a separate command for each one
+async function isInstalledGloballyWithNpm(): Promise<boolean> {
+  const packages = await detectPackages("npm ls -g --depth=0");
+  return containsThirdweb(packages || []);
+}
+
+async function isInstalledGloballyWithYarn(): Promise<boolean> {
+  const packages = await detectPackages("yarn --cwd `yarn global dir` list");
+  return containsThirdweb(packages || []);
+}
+
+async function isInstalledGloballyWithPnpm(): Promise<boolean> {
+  const packages: string[] = await new Promise((resolve) => {
+    exec(`pnpm list -g --depth=0`, (err, stdout) => {
+      var pkgs: string[] = [];
+      pkgs = stdout.split("dependencies:")[1]?.trim().split("\n") || [];
+      pkgs = pkgs.map((pkg) => pkg.replace(" ", "@"));
+      resolve(pkgs);
+    });
+  });
+  return containsThirdweb(packages || []);
+}
+
+function containsThirdweb(packages: string[]) {
+  return packages.some((pkg) => pkg.match(/^thirdweb/));
+}
+
+async function detectPackages(cmd: string): Promise<string[]> {
+  return new Promise((resolve) => {
+    exec(cmd, (err, stdout) => {
+      var packages: string[] = [];
+      packages = stdout.split("\n");
+      // We're one short on '-' to support both yarn and npm
+      packages = packages.filter(function (item) {
+        if (item.match(/^├─.+/g) !== null) {
+          return true;
+        }
+        if (item.match(/^└─.+/g) !== null) {
+          return true;
+        }
+        return undefined;
+      });
+      packages = packages
+        .map(function (item) {
+          if (item.match(/^├─.+/g) !== null) {
+            return item.replace(/(^├──\s|^├─\s)/g, "");
+          }
+          if (item.match(/^└─.+/g) !== null) {
+            return item.replace(/(^└──\s|^├─\s)/g, "");
+          }
+        })
+        .filter((item) => !!item) as string[];
+      resolve(packages);
+    });
+  });
+}
@@ -13,18 +13,18 @@ export default function generateDashboardUrl(
  // Pre-built contract
  else {
    const mapping = {
-      "signature-drop": "drop/signature-drop",
-      "nft-drop": "drop/nft-drop",
-      "edition-drop": "drop/edition-drop",
-      "nft-collection": "token/nft-collection",
-      edition: "token/edition",
-      "token-drop": "drop/token-drop",
-      token: "token/token",
-      marketplace: "marketplace/marketplace",
-      split: "governance/split",
-      vote: "governance/vote",
-      pack: "token/pack",
-      multiwrap: "token/multiwrap",
+      "signature-drop": "SignatureDrop",
+      "nft-drop": "DropERC721",
+      "edition-drop": "DropERC1155",
+      "nft-collection": "TokenERC721",
+      edition: "TokenERC1155",
+      "token-drop": "DropERC20",
+      token: "TokenERC20",
+      marketplace: "Marketplace",
+      split: "Split",
+      vote: "VoteERC20",
+      pack: "Pack",
+      multiwrap: "Multiwrap",
    };

    const foundMapping = mapping[name as keyof typeof mapping];
@@ -33,6 +33,6 @@ export default function generateDashboardUrl(
      return undefined;
    }

-    return `https://thirdweb.com/contracts/new/pre-built/${foundMapping}`;
+    return `https://thirdweb.com/thirdweb.eth/${foundMapping}`;
  }
 }
@@ -1,7 +1,5 @@
-import { logger } from "../core/helpers/logger";
 import { spinner } from "../core/helpers/logger";
 import { BufferOrStringWithName, ThirdwebStorage } from "@thirdweb-dev/storage";
-import chalk from "chalk";
 import fs from "fs";
 import path from "path";

@@ -33,22 +31,12 @@ export async function upload(
  uploadPath: string,
 ): Promise<string> {
  if (!uploadPath) {
-    logger.error(
-      `Please pass a path to a file or directory to upload with the following format:\n   ${chalk.blueBright(
-        `npx thirdweb@latest upload path/to/file.jpg`,
-      )}\n`,
-    );
-    process.exit(1);
+    return Promise.reject("No path provided");
  }

  const pathExists = fs.existsSync(uploadPath);
  if (!pathExists) {
-    logger.error(
-      `Invalid path ${chalk.blueBright(
-        uploadPath,
-      )} provided. Please provide a valid path to a file or directory to upload."`,
-    );
-    process.exit(1);
+    return Promise.reject("Invalid path provided");
  }

  let uri = "";
@@ -57,12 +45,7 @@ export async function upload(
    const files = recurseFiles(uploadPath, uploadPath);

    if (files.length === 0) {
-      logger.error(
-        `No files detected in specified directory ${chalk.blueBright(
-          uploadPath,
-        )} to upload.`,
-      );
-      process.exit(1);
+      return Promise.reject("No files detected in specified directory");
    }

    const spin = spinner(
@@ -82,12 +65,7 @@ export async function upload(
    uri = await storage.upload(file, { uploadWithoutDirectory: true });
    spin.succeed("Succesfully uploaded file to IPFS.");
  } else {
-    logger.error(
-      `Path ${chalk.blueBright(
-        uploadPath,
-      )} does not point to a valid file or directory. Please provide a valid path to a file or directory to upload`,
-    );
-    process.exit(1);
+    return Promise.reject("Invalid path provided");
  }

  return uri;
@@ -1,5 +1,35 @@
 # @thirdweb-dev/contracts-js

+## 1.2.3
+
+### Patch Changes
+
+- [#463](https://github.com/thirdweb-dev/js/pull/463) [`557429b`](https://github.com/thirdweb-dev/js/commit/557429b5cfb3af2983ee01cf7d12d41ee0557593) Thanks [@joaquim-verges](https://github.com/joaquim-verges)! - PackVRF contract
+
+- [#311](https://github.com/thirdweb-dev/js/pull/311) [`9eaa21d`](https://github.com/thirdweb-dev/js/commit/9eaa21d09ab9c700aea61a2a25f8ca9859d20857) Thanks [@joaquim-verges](https://github.com/joaquim-verges)! - Update to v3.3.0 of contracts package
+
+- [#311](https://github.com/thirdweb-dev/js/pull/311) [`9eaa21d`](https://github.com/thirdweb-dev/js/commit/9eaa21d09ab9c700aea61a2a25f8ca9859d20857) Thanks [@joaquim-verges](https://github.com/joaquim-verges)! - Update to 3.1.10 of contracts package
+
+## 1.2.2
+
+### Patch Changes
+
+- [#438](https://github.com/thirdweb-dev/js/pull/438) [`f451da6`](https://github.com/thirdweb-dev/js/commit/f451da6395689a5f89800ee63f34b6175b61f703) Thanks [@joaquim-verges](https://github.com/joaquim-verges)! - Fix SigMint detection for OSRF NFT Collection contracts
+
+## 1.2.1
+
+### Patch Changes
+
+- [#376](https://github.com/thirdweb-dev/js/pull/376) [`4af785c`](https://github.com/thirdweb-dev/js/commit/4af785c37c831ecd7087c1c9eb9095922cac0855) Thanks [@adam-maj](https://github.com/adam-maj)! - Update tiered-drop with tokens claimed
+
+- [#373](https://github.com/thirdweb-dev/js/pull/373) [`6f818f3`](https://github.com/thirdweb-dev/js/commit/6f818f393eb9023b53a3358d62d60ec23a9246bd) Thanks [@adam-maj](https://github.com/adam-maj)! - Update tiered-drop contract version
+
+## 1.2.0
+
+### Minor Changes
+
+- [#333](https://github.com/thirdweb-dev/js/pull/333) [`aa6d9ed`](https://github.com/thirdweb-dev/js/commit/aa6d9ed75d126d7a0cca9fb8fc389ff94e9d1e14) Thanks [@joaquim-verges](https://github.com/joaquim-verges)! - Update to contracts package v3.2.0
+
 ## 1.1.9

 ### Patch Changes
@@ -0,0 +1,4 @@
+{
+  "main": "dist/thirdweb-dev-contracts-js-factories-TWMultichainRegistryLogic__factory.cjs.js",
+  "module": "dist/thirdweb-dev-contracts-js-factories-TWMultichainRegistryLogic__factory.esm.js"
+}
@@ -0,0 +1,4 @@
+{
+  "main": "dist/thirdweb-dev-contracts-js-factories-TWMultichainRegistryRouter__factory.cjs.js",
+  "module": "dist/thirdweb-dev-contracts-js-factories-TWMultichainRegistryRouter__factory.esm.js"
+}
@@ -0,0 +1,4 @@
+{
+  "main": "dist/thirdweb-dev-contracts-js-factories-TWMultichainRegistryStorage__factory.cjs.js",
+  "module": "dist/thirdweb-dev-contracts-js-factories-TWMultichainRegistryStorage__factory.esm.js"
+}
--- a/Show More
+++ b/Show More