Version Packages (#2420 )

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: GitHub Action <[email protected]>
chore(chains): update chains (#2426 )
2024-03-07 13:57:31 -08:00 · 2024-03-07 13:21:11 -08:00 · 2024-03-07 11:59:05 -08:00 · 2024-03-07 06:09:48 +00:00 · 2024-03-07 02:43:38 +00:00 · 2024-03-06 15:23:29 -08:00
69 changed files with 1392 additions and 182 deletions
@@ -5,7 +5,7 @@
    <br />
 </p>

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

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

-<p align="center"><strong>Best in class web3 SDKs for Browser, Node and Mobile apps</strong></p>
+<p align="center"><strong>All-in-one web3 SDK for Browser, Node and Mobile apps</strong></p>
+
+## Features
+
+- Support for React & React-Native
+- First party support for [Embedded Wallets](https://portal.thirdweb.com/connect/embedded-wallet/overview) (social/email login)
+- First party support for [Account Abstraction](https://portal.thirdweb.com/connect/account-abstraction)
+- Instant connection to any chain with RPC Edge integration
+- Integrated IPFS upload/download
+- UI Components for connection, transactions, nft rendering
+- High level contract extensions for interacting with common standards
+- Automatic ABI resolution
+
+## Unified SDK (Beta)
+
+We now have a new version of the SDK available in beta:
+
+Please refer to the following resources to get started:
+
+- [GitHub Branch](https://github.com/thirdweb-dev/js/tree/beta)
+- [Engineering Blog](https://blog.thirdweb.com/changelog/introducing-the-unified-thirdweb-sdk/)
+- [Documentation](https://portal.thirdweb.com/typescript/v5)
+
+## Library Comparison 
+
+|                                           | thirdweb | Wagmi              | Viem               | Ethers@6 |
+| ----------------------------------------- | -------- | ------------------ | ------------------ | -------- |
+| Type safe contract API                    | ✅       | ✅                 | ✅                 | ✅       |
+| Type safe wallet API                      | ✅       | ✅                 | ✅                 | ✅       |
+| EVM utils                                 | ✅       | ❌                 | ✅                 | ✅       |
+| RPC for any EVM                           | ✅       | ⚠️ public RPC only | ⚠️ public RPC only | ❌       |
+| Automatic ABI Resolution                  | ✅       | ❌                 | ❌                 | ❌       |
+| IPFS Upload/Download                      | ✅       | ❌                 | ❌                 | ❌       |
+| Embedded wallet (email/ social login)     | ✅       | ⚠️ via 3rd party   | ❌                 | ❌       |
+| Account abstraction (ERC4337) support     | ✅       | ⚠️ via 3rd party   | ⚠️ via 3rd party   | ❌       |
+| Web3 wallet connectors                    | ✅       | ✅                 | ❌                 | ❌       |
+| Local wallet creation                     | ✅       | ❌                 | ✅                 | ✅       |
+| Auth (SIWE)                               | ✅       | ⚠️ via 3rd party   | ❌                 | ❌       |
+| Extensions functions for common standards | ✅       | ❌                 | ❌                 | ❌       |
+| React Hooks                               | ✅       | ✅                 | ❌                 | ❌       |
+| React UI components                       | ✅       | ❌                 | ❌                 | ❌       |
+| React Native Hooks                        | ✅       | ❌                 | ❌                 | ❌       |
+| React Native UI Components                | ✅       | ❌                 | ❌                 | ❌       |

 ## Packages

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

 ## Contributing

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

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

-## Community
+## Additional Resources

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

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

 ## Security

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

+## 4.1.38
+
+### Patch Changes
+
+- [#2417](https://github.com/thirdweb-dev/js/pull/2417) [`862905e`](https://github.com/thirdweb-dev/js/commit/862905e161a091c15eb9b054cfcca0e5d2879fd6) Thanks [@jnsdls](https://github.com/jnsdls)! - make verify login payload be self-sufficient
+
+- Updated dependencies [[`862905e`](https://github.com/thirdweb-dev/js/commit/862905e161a091c15eb9b054cfcca0e5d2879fd6)]:
+  - @thirdweb-dev/wallets@2.4.16
+
+## 4.1.37
+
+### Patch Changes
+
+- Updated dependencies [[`74a92dc`](https://github.com/thirdweb-dev/js/commit/74a92dcb7dc4be7d03bcb8b7211e87016f52a81f)]:
+  - @thirdweb-dev/wallets@2.4.15
+
 ## 4.1.36

 ### Patch Changes
@@ -1,6 +1,6 @@
 {
  "name": "@thirdweb-dev/auth",
-  "version": "4.1.36",
+  "version": "4.1.38",
  "main": "dist/thirdweb-dev-auth.cjs.js",
  "module": "dist/thirdweb-dev-auth.esm.js",
  "browser": {
@@ -23,14 +23,21 @@ import {
  AuthenticateOptionsWithOptionalDomain,
  AuthenticationPayload,
 } from "./schema/authenticate";
+import { ThirdwebAuthOptions } from "./types";

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 export type ThirdwebAuthContext<
@@ -2,6 +2,7 @@ import type { GenericAuthWallet } from "@thirdweb-dev/wallets";
 import { z } from "zod";

 import { Json, LoginPayloadOutputSchema, User } from "../../core";
+import { ThirdwebAuthOptions } from "../../core/types";

 export const PayloadBodySchema = z.object({
  address: z.string(),
@@ -55,8 +56,9 @@ export type ThirdwebAuthConfigShared = {
    sameSite?: "lax" | "strict" | "none";
    secure?: boolean;
  };
+  thirdwebAuthOptions?: ThirdwebAuthOptions;
 };

 export type ThirdwebNextContext = {
-  params?: Record<string, string | string[]>
+  params?: Record<string, string | string[]>;
 };
@@ -8,19 +8,10 @@ import loginHandler from "./routes/login";
 import logoutHandler from "./routes/logout";
 import userHandler from "./routes/user";
 import switchAccountHandler from "./routes/switch-account";
-import type {
-  ThirdwebAuthConfig,
-  ThirdwebAuthContext,
-} from "./types";
-import type {
-  ThirdwebAuthRoute,
-  ThirdwebNextContext,
-} from "../common/types";
+import type { ThirdwebAuthConfig, ThirdwebAuthContext } from "./types";
+import type { ThirdwebAuthRoute, ThirdwebNextContext } from "../common/types";

-export type {
-  ThirdwebAuthConfig,
-  ThirdwebAuthContext,
-} from "./types";
+export type { ThirdwebAuthConfig, ThirdwebAuthContext } from "./types";

 export async function ThirdwebAuthRouter(
  req: NextRequest,
@@ -44,7 +35,7 @@ export async function ThirdwebAuthRouter(
    default:
      return Response.json(
        { message: "Invalid route for authentication." },
-        { status: 400},
+        { status: 400 },
      );
  }
 }
@@ -55,10 +46,13 @@ export function ThirdwebAuth<
 >(cfg: ThirdwebAuthConfig<TData, TSession>) {
  const authCtx = {
    ...cfg,
-    auth: new ThirdwebAuthSDK(cfg.wallet, cfg.domain),
+    auth: new ThirdwebAuthSDK(cfg.wallet, cfg.domain, cfg.thirdwebAuthOptions),
  };

-  async function ThirdwebAuthHandler(req: NextRequest, ctx: ThirdwebNextContext) {
+  async function ThirdwebAuthHandler(
+    req: NextRequest,
+    ctx: ThirdwebNextContext,
+  ) {
    return await ThirdwebAuthRouter(req, ctx, authCtx as ThirdwebAuthContext);
  }

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

  function ThirdwebAuthHandler(
@@ -3,6 +3,8 @@ import { EthersWallet } from "@thirdweb-dev/wallets/evm/wallets/ethers";
 import { expect } from "chai";
 import { Wallet } from "ethers";

+require("dotenv-mono").load();
+
 describe("Wallet Authentication - EVM", async () => {
  let adminWallet: any, signerWallet: any, attackerWallet: any;
  let auth: ThirdwebAuth;
@@ -18,7 +20,9 @@ describe("Wallet Authentication - EVM", async () => {
    signerWallet = new EthersWallet(signerSigner);
    attackerWallet = new EthersWallet(attackerSigner);

-    auth = new ThirdwebAuth(signerWallet, "thirdweb.com");
+    auth = new ThirdwebAuth(signerWallet, "thirdweb.com", {
+      secretKey: process.env.TW_SECRET_KEY,
+    });
  });

  beforeEach(async () => {
@@ -0,0 +1,384 @@
+import { LocalWallet, SmartWallet } from "@thirdweb-dev/wallets";
+import { ThirdwebAuth } from "../src/core";
+import { EthersWallet } from "@thirdweb-dev/wallets/evm/wallets/ethers";
+import { expect } from "chai";
+import { Wallet } from "ethers";
+
+require("dotenv-mono").load();
+
+describe("Wallet Authentication - EVM - Smart Wallet", async () => {
+  let adminWallet: any, signerWallet: any, attackerWallet: any;
+  let auth: ThirdwebAuth;
+
+  before(async () => {
+    const factoryAddress = "0x13947435c2fe6BE51ED82F6f59C38617a323dB9B";
+    const chain = 80001;
+    const localWallet = new LocalWallet();
+    await localWallet.generate();
+    const smartWallet = new SmartWallet({
+      chain: chain,
+      factoryAddress: factoryAddress,
+      gasless: true,
+      secretKey: process.env.TW_SECRET_KEY,
+    });
+    await smartWallet.connect({ personalWallet: localWallet });
+
+    adminWallet = new EthersWallet(Wallet.createRandom());
+    signerWallet = smartWallet;
+    attackerWallet = new EthersWallet(Wallet.createRandom());
+
+    auth = new ThirdwebAuth(signerWallet, "thirdweb.com", {
+      secretKey: process.env.TW_SECRET_KEY,
+    });
+  });
+
+  beforeEach(async () => {
+    auth.updateWallet(signerWallet);
+  });
+
+  it("Should verify logged in wallet", async () => {
+    const payload = await auth.login();
+
+    auth.updateWallet(adminWallet);
+    const address = await auth.verify(payload);
+
+    expect(address).to.equal(await signerWallet.getAddress());
+  });
+
+  it("Should verify logged in wallet with chain ID and expiration", async () => {
+    const payload = await auth.login({
+      expirationTime: new Date(Date.now() + 1000 * 60 * 5),
+      chainId: "80001",
+    });
+
+    auth.updateWallet(adminWallet);
+    const address = await auth.verify(payload, {
+      chainId: "80001",
+    });
+
+    expect(address).to.equal(await signerWallet.getAddress());
+  });
+
+  it("Should verify payload with resources", async () => {
+    const payload = await auth.login({
+      resources: ["https://example.com", "https://test.com"],
+    });
+
+    auth.updateWallet(adminWallet);
+    const address = await auth.verify(payload, {
+      resources: ["https://example.com", "https://test.com"],
+    });
+
+    expect(address).to.equal(await signerWallet.getAddress());
+  });
+
+  it("Should reject payload without necessary resources", async () => {
+    const payload = await auth.login({
+      resources: ["https://example.com"],
+    });
+
+    auth.updateWallet(adminWallet);
+    try {
+      await auth.verify(payload, {
+        resources: ["https://example.com", "https://test.com"],
+      });
+      expect.fail();
+    } catch (err: any) {
+      expect(err.message).to.equal(
+        "Login request is missing required resources: https://test.com",
+      );
+    }
+  });
+
+  it("Should verify payload with customized statement", async () => {
+    const payload = await auth.login({
+      statement: "Please sign!",
+    });
+
+    auth.updateWallet(adminWallet);
+    const address = await auth.verify(payload, {
+      statement: "Please sign!",
+    });
+
+    expect(address).to.equal(await signerWallet.getAddress());
+  });
+
+  it("Should reject payload with incorrect statement", async () => {
+    const payload = await auth.login({
+      statement: "Please sign!",
+    });
+
+    auth.updateWallet(adminWallet);
+    try {
+      await auth.verify(payload, {
+        statement: "Please sign again!",
+      });
+      expect.fail();
+    } catch (err: any) {
+      expect(err.message).to.include(
+        "Expected statement 'Please sign again!' does not match statement on payload",
+      );
+    }
+  });
+
+  it("Should reject invalid nonce", async () => {
+    const payload = await auth.login();
+
+    auth.updateWallet(adminWallet);
+    try {
+      await auth.verify(payload, {
+        validateNonce: (nonce: string) => {
+          if (nonce === payload.payload.nonce) {
+            throw new Error();
+          }
+        },
+      });
+      expect.fail();
+    } catch (err: any) {
+      expect(err.message).to.equal("Login request nonce is invalid");
+    }
+  });
+
+  it("Should accept valid nonce", async () => {
+    const payload = await auth.login();
+
+    auth.updateWallet(adminWallet);
+    const address = await auth.verify(payload, {
+      validateNonce: (nonce: string) => {
+        if (nonce !== payload.payload.nonce) {
+          throw new Error();
+        }
+      },
+    });
+
+    expect(address).to.equal(await signerWallet.getAddress());
+  });
+
+  it("Should reject payload with incorrect domain", async () => {
+    const payload = await auth.login();
+
+    auth.updateWallet(adminWallet);
+    try {
+      await auth.verify(payload, { domain: "test.thirdweb.com" });
+      expect.fail();
+    } catch (err: any) {
+      expect(err.message).to.equal(
+        "Expected domain 'test.thirdweb.com' does not match domain on payload 'thirdweb.com'",
+      );
+    }
+  });
+
+  it("Should reject expired login payload", async () => {
+    const payload = await auth.login({
+      expirationTime: new Date(Date.now() - 1000 * 60 * 5),
+    });
+
+    auth.updateWallet(adminWallet);
+    try {
+      await auth.verify(payload);
+      expect.fail();
+    } catch (err: any) {
+      expect(err.message).to.equal("Login request has expired");
+    }
+  });
+
+  it("Should reject payload with incorrect chain ID", async () => {
+    const payload = await auth.login({
+      chainId: "1",
+    });
+
+    auth.updateWallet(adminWallet);
+    try {
+      await auth.verify(payload, {
+        chainId: "137",
+      });
+      expect.fail();
+    } catch (err: any) {
+      expect(err.message).to.equal(
+        "Expected chain ID '137' does not match chain ID on payload '1'",
+      );
+    }
+  });
+
+  it("Should reject payload with incorrect signer", async () => {
+    const payload = await auth.login();
+    payload.payload.address = await attackerWallet.getAddress();
+
+    auth.updateWallet(adminWallet);
+    try {
+      await auth.verify(payload);
+      expect.fail();
+    } catch (err: any) {
+      expect(err.message).to.contain("does not match payload address");
+    }
+  });
+
+  it("Should generate valid authentication token", async () => {
+    const payload = await auth.login();
+
+    auth.updateWallet(adminWallet);
+    const token = await auth.generate(payload);
+    const user = await auth.authenticate(token);
+
+    expect(user.address).to.equal(await signerWallet.getAddress());
+  });
+
+  it("Should reject token with incorrect domain", async () => {
+    const payload = await auth.login();
+
+    auth.updateWallet(adminWallet);
+    const token = await auth.generate(payload);
+
+    try {
+      await auth.authenticate(token, { domain: "test.thirdweb.com" });
+      expect.fail();
+    } catch (err: any) {
+      expect(err.message).to.contain(
+        "Expected token to be for the domain 'test.thirdweb.com', but found token with domain 'thirdweb.com'",
+      );
+    }
+  });
+
+  it("Should reject token before invalid before", async () => {
+    const payload = await auth.login();
+
+    auth.updateWallet(adminWallet);
+    const token = await auth.generate(payload, {
+      invalidBefore: new Date(Date.now() + 1000 * 60 * 5),
+    });
+
+    try {
+      await auth.authenticate(token);
+      expect.fail();
+    } catch (err: any) {
+      expect(err.message).to.contain("This token is invalid before");
+    }
+  });
+
+  it("Should reject expired authentication token", async () => {
+    const payload = await auth.login();
+
+    auth.updateWallet(adminWallet);
+    const token = await auth.generate(payload, {
+      expirationTime: new Date(Date.now() - 1000 * 60 * 5),
+    });
+
+    try {
+      await auth.authenticate(token);
+      expect.fail();
+    } catch (err: any) {
+      expect(err.message).to.contain("This token expired");
+    }
+  });
+
+  it("Should reject if admin address is not connected wallet address", async () => {
+    const payload = await auth.login();
+
+    auth.updateWallet(adminWallet);
+    const token = await auth.generate(payload);
+
+    auth.updateWallet(signerWallet);
+    try {
+      await auth.authenticate(token);
+      expect.fail();
+    } catch (err: any) {
+      expect(err.message).to.contain(
+        `The expected issuer address '${await signerWallet.getAddress()}' did not match the token issuer address '${await adminWallet.getAddress()}'`,
+      );
+    }
+  });
+
+  it("Should accept token with valid token ID", async () => {
+    const payload = await auth.login();
+
+    auth.updateWallet(adminWallet);
+    const token = await auth.generate(payload, {
+      tokenId: "test",
+    });
+
+    const user = await auth.authenticate(token, {
+      validateTokenId: (tokenId: string) => {
+        if (tokenId !== "test") {
+          throw new Error();
+        }
+      },
+    });
+
+    expect(user.address).to.equal(await signerWallet.getAddress());
+  });
+
+  it("Should reject token with invalid token ID", async () => {
+    const payload = await auth.login();
+
+    auth.updateWallet(adminWallet);
+    const token = await auth.generate(payload, {
+      tokenId: "test",
+    });
+
+    try {
+      await auth.authenticate(token, {
+        validateTokenId: (tokenId: string) => {
+          if (tokenId !== "invalid") {
+            throw new Error();
+          }
+        },
+      });
+      expect.fail();
+    } catch (err: any) {
+      expect(err.message).to.contain("Token ID is invalid");
+    }
+  });
+
+  it("Should propagate session on token", async () => {
+    const payload = await auth.login();
+
+    auth.updateWallet(adminWallet);
+    const token = await auth.generate(payload, {
+      session: { role: "admin" },
+    });
+
+    const user = await auth.authenticate(token);
+
+    expect(user.address).to.equal(await signerWallet.getAddress());
+    expect(user.session).to.deep.equal({ role: "admin" });
+  });
+
+  it("Should call session callback function", async () => {
+    const payload = await auth.login();
+
+    auth.updateWallet(adminWallet);
+    const token = await auth.generate(payload, {
+      session: (address: string) => {
+        return { address, role: "admin" };
+      },
+    });
+
+    const user = await auth.authenticate(token);
+
+    expect(user.address).to.equal(await signerWallet.getAddress());
+    expect(user.session).to.deep.equal({
+      address: await signerWallet.getAddress(),
+      role: "admin",
+    });
+  });
+
+  it("Should authenticate with issuer address", async () => {
+    const payload = await auth.login();
+
+    auth.updateWallet(adminWallet);
+    const token = await auth.generate(payload);
+
+    auth.updateWallet(attackerWallet);
+    try {
+      await auth.authenticate(token);
+      expect.fail();
+    } catch (err: any) {
+      expect(err.message).to.contain("The expected issuer address");
+    }
+
+    const user = await auth.authenticate(token, {
+      issuerAddress: await adminWallet.getAddress(),
+    });
+    expect(user.address).to.equal(await signerWallet.getAddress());
+  });
+});
@@ -1,5 +1,17 @@
 # @thirdweb-dev/chains

+## 0.1.78
+
+### Patch Changes
+
+- [#2416](https://github.com/thirdweb-dev/js/pull/2416) [`588897d`](https://github.com/thirdweb-dev/js/commit/588897d1b04e6c63da13639aeb47ca701308e1b2) Thanks [@github-actions](https://github.com/apps/github-actions)! - Synced Chains Package
+
+## 0.1.77
+
+### Patch Changes
+
+- [#2406](https://github.com/thirdweb-dev/js/pull/2406) [`047fbe2`](https://github.com/thirdweb-dev/js/commit/047fbe2918808cbc8fded90104458b6e38d1207d) Thanks [@github-actions](https://github.com/apps/github-actions)! - Synced Chains Package
+
 ## 0.1.76

 ### Patch Changes
@@ -0,0 +1,35 @@
+import type { Chain } from "../src/types";
+export default {
+  "chain": "ETH",
+  "chainId": 17186,
+  "explorers": [
+    {
+      "name": "lazy crimson coral explorer",
+      "url": "https://explorerl2new-lazy-crimson-coral-cotlv0ftqf.t.conduit.xyz",
+      "standard": "standard"
+    }
+  ],
+  "faucets": [],
+  "features": [],
+  "name": "lazy-crimson-coral",
+  "nativeCurrency": {
+    "name": "Ether",
+    "symbol": "ETH",
+    "decimals": 18
+  },
+  "networkId": 17186,
+  "parent": {
+    "type": "L3",
+    "chain": "Base",
+    "bridges": [
+      {
+        "url": "https://lazy-crimson-coral-cotlv0ftqf.testnets.superbridge.app"
+      }
+    ]
+  },
+  "redFlags": [],
+  "rpc": [],
+  "shortName": "lazy-crimson-coral",
+  "slug": "lazy-crimson-coral",
+  "testnet": true
+} as const satisfies Chain;
@@ -0,0 +1,30 @@
+import type { Chain } from "../src/types";
+export default {
+  "chain": "Avalanche",
+  "chainId": 22662,
+  "explorers": [],
+  "faucets": [],
+  "features": [],
+  "icon": {
+    "url": "https://images.ctfassets.net/9bazykntljf6/62CceHSYsRS4D9fgDSkLRB/877cb8f26954e1743ff535fd7fdaf78f/avacloud-placeholder.svg",
+    "width": 256,
+    "height": 256,
+    "format": "svg"
+  },
+  "infoURL": "https://avacloud.io",
+  "name": "QA5-03-07 Testnet",
+  "nativeCurrency": {
+    "name": "QA5-03-07 Testnet Token",
+    "symbol": "TYP",
+    "decimals": 18
+  },
+  "networkId": 22662,
+  "redFlags": [],
+  "rpc": [
+    "https://22662.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
+    "https://subnets.avax.network/defi-kingdoms/dfk-chain/rpc"
+  ],
+  "shortName": "QA5-03-07 Testnet",
+  "slug": "qa5-03-07-testnet",
+  "testnet": true
+} as const satisfies Chain;
@@ -0,0 +1,30 @@
+import type { Chain } from "../src/types";
+export default {
+  "chain": "Avalanche",
+  "chainId": 24867,
+  "explorers": [],
+  "faucets": [],
+  "features": [],
+  "icon": {
+    "url": "https://images.ctfassets.net/9bazykntljf6/62CceHSYsRS4D9fgDSkLRB/877cb8f26954e1743ff535fd7fdaf78f/avacloud-placeholder.svg",
+    "width": 256,
+    "height": 256,
+    "format": "svg"
+  },
+  "infoURL": "https://avacloud.io",
+  "name": "QaUser45 Testnet",
+  "nativeCurrency": {
+    "name": "QaUser45 Testnet Token",
+    "symbol": "ZAG",
+    "decimals": 18
+  },
+  "networkId": 24867,
+  "redFlags": [],
+  "rpc": [
+    "https://24867.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
+    "https://subnets.avax.network/defi-kingdoms/dfk-chain/rpc"
+  ],
+  "shortName": "QaUser45 Testnet",
+  "slug": "qauser45-testnet",
+  "testnet": true
+} as const satisfies Chain;
@@ -0,0 +1,42 @@
+import type { Chain } from "../src/types";
+export default {
+  "chain": "3839",
+  "chainId": 3839,
+  "explorers": [
+    {
+      "name": "traderlands explorer",
+      "url": "https://sepolia.arbiscan.io/",
+      "standard": "standard",
+      "icon": {
+        "url": "ipfs://QmRQVgjLcoWAVTocuYegwumz8J8b2F3Le2WnQhwffRmWcg/traderlands%20logo.png",
+        "width": 512,
+        "height": 512,
+        "format": "png"
+      }
+    }
+  ],
+  "faucets": [],
+  "features": [],
+  "icon": {
+    "url": "ipfs://QmRQVgjLcoWAVTocuYegwumz8J8b2F3Le2WnQhwffRmWcg/traderlands%20logo.png",
+    "width": 512,
+    "height": 512,
+    "format": "png"
+  },
+  "infoURL": "https://sepolia.arbiscan.io/",
+  "name": "traderlands-sepolia",
+  "nativeCurrency": {
+    "name": "Traderlands",
+    "symbol": "TRADE",
+    "decimals": 18
+  },
+  "networkId": 3839,
+  "redFlags": [],
+  "rpc": [
+    "https://3839.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
+    "https://traderlands-sepolia.rpc.caldera.xyz/http"
+  ],
+  "shortName": "Tradetest",
+  "slug": "traderlands-sepolia",
+  "testnet": true
+} as const satisfies Chain;
@@ -0,0 +1,30 @@
+import type { Chain } from "../src/types";
+export default {
+  "chain": "Avalanche",
+  "chainId": 51277,
+  "explorers": [],
+  "faucets": [],
+  "features": [],
+  "icon": {
+    "url": "https://images.ctfassets.net/9bazykntljf6/62CceHSYsRS4D9fgDSkLRB/877cb8f26954e1743ff535fd7fdaf78f/avacloud-placeholder.svg",
+    "width": 256,
+    "height": 256,
+    "format": "svg"
+  },
+  "infoURL": "https://avacloud.io",
+  "name": "QI0344s1 Testne",
+  "nativeCurrency": {
+    "name": "QI0344s1 Testne Token",
+    "symbol": "LKG",
+    "decimals": 18
+  },
+  "networkId": 51277,
+  "redFlags": [],
+  "rpc": [
+    "https://51277.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
+    "https://subnets.avax.network/defi-kingdoms/dfk-chain/rpc"
+  ],
+  "shortName": "QI0344s1 Testne",
+  "slug": "qi0344s1-testne",
+  "testnet": true
+} as const satisfies Chain;
@@ -0,0 +1,30 @@
+import type { Chain } from "../src/types";
+export default {
+  "chain": "Avalanche",
+  "chainId": 57021,
+  "explorers": [],
+  "faucets": [],
+  "features": [],
+  "icon": {
+    "url": "https://images.ctfassets.net/9bazykntljf6/62CceHSYsRS4D9fgDSkLRB/877cb8f26954e1743ff535fd7fdaf78f/avacloud-placeholder.svg",
+    "width": 256,
+    "height": 256,
+    "format": "svg"
+  },
+  "infoURL": "https://avacloud.io",
+  "name": "QIM2403061",
+  "nativeCurrency": {
+    "name": "QIM2403061 Token",
+    "symbol": "VVC",
+    "decimals": 18
+  },
+  "networkId": 57021,
+  "redFlags": [],
+  "rpc": [
+    "https://57021.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
+    "https://subnets.avax.network/defi-kingdoms/dfk-chain/rpc"
+  ],
+  "shortName": "QIM2403061",
+  "slug": "qim2403061",
+  "testnet": true
+} as const satisfies Chain;
@@ -0,0 +1,47 @@
+import type { Chain } from "../src/types";
+export default {
+  "chain": "FTM",
+  "chainId": 64165,
+  "ens": {
+    "registry": "standard"
+  },
+  "explorers": [
+    {
+      "name": "Fantom Sonic Builders Testnet",
+      "url": "https://sonicscan.io/",
+      "standard": "standard",
+      "icon": {
+        "url": "ipfs://QmcxZHpyJa8T4i63xqjPYrZ6tKrt55tZJpbXcjSDKuKaf9/fantom/512.png",
+        "width": 512,
+        "height": 512,
+        "format": "png"
+      }
+    }
+  ],
+  "faucets": [
+    "https://public-sonic.fantom.network/account"
+  ],
+  "features": [],
+  "icon": {
+    "url": "ipfs://QmcxZHpyJa8T4i63xqjPYrZ6tKrt55tZJpbXcjSDKuKaf9/fantom/512.png",
+    "width": 512,
+    "height": 512,
+    "format": "png"
+  },
+  "infoURL": "https://sonicscan.io/",
+  "name": "Fantom Sonic Builders Testnet",
+  "nativeCurrency": {
+    "name": "Fantom",
+    "symbol": "FTM",
+    "decimals": 18
+  },
+  "networkId": 64165,
+  "redFlags": [],
+  "rpc": [
+    "https://64165.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
+    "https://rpc.sonic.fantom.network/"
+  ],
+  "shortName": "FantomTestnet",
+  "slug": "fantom-sonic-builders-testnet",
+  "testnet": true
+} as const satisfies Chain;
@@ -0,0 +1,30 @@
+import type { Chain } from "../src/types";
+export default {
+  "chain": "Avalanche",
+  "chainId": 65300,
+  "explorers": [],
+  "faucets": [],
+  "features": [],
+  "icon": {
+    "url": "https://images.ctfassets.net/9bazykntljf6/62CceHSYsRS4D9fgDSkLRB/877cb8f26954e1743ff535fd7fdaf78f/avacloud-placeholder.svg",
+    "width": 256,
+    "height": 256,
+    "format": "svg"
+  },
+  "infoURL": "https://avacloud.io",
+  "name": "QaUser46 Testnet",
+  "nativeCurrency": {
+    "name": "QaUser46 Testnet Token",
+    "symbol": "ZAG",
+    "decimals": 18
+  },
+  "networkId": 65300,
+  "redFlags": [],
+  "rpc": [
+    "https://65300.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
+    "https://subnets.avax.network/defi-kingdoms/dfk-chain/rpc"
+  ],
+  "shortName": "QaUser46 Testnet",
+  "slug": "qauser46-testnet",
+  "testnet": true
+} as const satisfies Chain;
@@ -6,22 +6,10 @@ export default {
    {
      "name": "GuapcoinX Explorer",
      "url": "http://explorer.guapcoinx.com",
-      "standard": "none",
-      "icon": {
-        "url": "ipfs://QmcDTR7982VQKDDz2Mh4fZbnE9hn67MuFPWQv1MimCqPvB",
-        "width": 800,
-        "height": 800,
-        "format": "png"
-      }
+      "standard": "none"
    }
  ],
  "faucets": [],
-  "icon": {
-    "url": "ipfs://QmcDTR7982VQKDDz2Mh4fZbnE9hn67MuFPWQv1MimCqPvB",
-    "width": 800,
-    "height": 800,
-    "format": "png"
-  },
  "infoURL": "https://guapcoin.org/",
  "name": "GuapcoinX",
  "nativeCurrency": {
@@ -0,0 +1,30 @@
+import type { Chain } from "../src/types";
+export default {
+  "chain": "Avalanche",
+  "chainId": 72877,
+  "explorers": [],
+  "faucets": [],
+  "features": [],
+  "icon": {
+    "url": "https://images.ctfassets.net/9bazykntljf6/62CceHSYsRS4D9fgDSkLRB/877cb8f26954e1743ff535fd7fdaf78f/avacloud-placeholder.svg",
+    "width": 256,
+    "height": 256,
+    "format": "svg"
+  },
+  "infoURL": "https://avacloud.io",
+  "name": "QaUser4 Testnet",
+  "nativeCurrency": {
+    "name": "QaUser4 Testnet Token",
+    "symbol": "ZAG",
+    "decimals": 18
+  },
+  "networkId": 72877,
+  "redFlags": [],
+  "rpc": [
+    "https://72877.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
+    "https://subnets.avax.network/defi-kingdoms/dfk-chain/rpc"
+  ],
+  "shortName": "QaUser4 Testnet",
+  "slug": "qauser4-testnet-qauser4 testnet",
+  "testnet": true
+} as const satisfies Chain;
@@ -1,6 +1,6 @@
 {
  "name": "@thirdweb-dev/chains",
-  "version": "0.1.76",
+  "version": "0.1.78",
  "main": "dist/thirdweb-dev-chains.cjs.js",
  "module": "dist/thirdweb-dev-chains.esm.js",
  "exports": {
@@ -1,5 +1,27 @@
 # thirdweb

+## 0.13.46
+
+### Patch Changes
+
+- Updated dependencies [[`862905e`](https://github.com/thirdweb-dev/js/commit/862905e161a091c15eb9b054cfcca0e5d2879fd6), [`588897d`](https://github.com/thirdweb-dev/js/commit/588897d1b04e6c63da13639aeb47ca701308e1b2), [`862905e`](https://github.com/thirdweb-dev/js/commit/862905e161a091c15eb9b054cfcca0e5d2879fd6)]:
+  - @thirdweb-dev/auth@4.1.38
+  - @thirdweb-dev/chains@0.1.78
+  - @thirdweb-dev/wallets@2.4.16
+  - @thirdweb-dev/sdk@4.0.41
+
+## 0.13.45
+
+### Patch Changes
+
+- [#2400](https://github.com/thirdweb-dev/js/pull/2400) [`ef76a96`](https://github.com/thirdweb-dev/js/commit/ef76a96c2dda21e28195371fd48e57350721b717) Thanks [@kumaryash90](https://github.com/kumaryash90)! - "Option to link external libraries"
+
+- Updated dependencies [[`74a92dc`](https://github.com/thirdweb-dev/js/commit/74a92dcb7dc4be7d03bcb8b7211e87016f52a81f), [`047fbe2`](https://github.com/thirdweb-dev/js/commit/047fbe2918808cbc8fded90104458b6e38d1207d)]:
+  - @thirdweb-dev/wallets@2.4.15
+  - @thirdweb-dev/chains@0.1.77
+  - @thirdweb-dev/auth@4.1.37
+  - @thirdweb-dev/sdk@4.0.40
+
 ## 0.13.44

 ### Patch Changes
@@ -1,7 +1,7 @@
 {
  "name": "thirdweb",
  "main": "dist/cli/index.js",
-  "version": "0.13.44",
+  "version": "0.13.46",
  "repository": "https://github.com/thirdweb-dev/js/tree/main/packages/cli",
  "author": "thirdweb eng <[email protected]>",
  "license": "Apache-2.0",
@@ -20,6 +20,7 @@ import { generate } from "../generate/command";
 import { findPackageInstallation } from "../helpers/detect-local-packages";
 import { install } from "../install";
 import { upload } from "../storage/command";
+import { parseLinkLibOption } from "../common/link-lib-helper";

 const main = async () => {
  // eslint-disable-next-line turbo/no-undeclared-env-vars
@@ -331,6 +332,12 @@ const main = async () => {
      "Deploy a dynamic smart contract made up of extensions to blockchains",
    )
    .option("--zksync", "Deploy on ZKSync")
+    .option(
+      "--link-lib <library:address...>",
+      "Specify library names and addresses",
+      parseLinkLibOption,
+      [],
+    )
    .option("-k, --key <key>", "API secret key to authorize usage")
    .action(async (options) => {
      let secretKey = "";
@@ -370,6 +377,12 @@ const main = async () => {
    .option("--dry-run", "dry run (skip actually publishing)")
    .option("-d, --debug", "show debug logs")
    .option("--ci", "Continuous Integration mode")
+    .option(
+      "--link-lib <library:address...>",
+      "Specify library names and addresses",
+      parseLinkLibOption,
+      [],
+    )
    .option("-k, --key <key>", "API secret key to authorize usage")
    .action(async (options) => {
      let secretKey = "";
@@ -0,0 +1,43 @@
+import { utils } from "ethers";
+import { isAddress } from "ethers/lib/utils";
+
+export interface Link {
+  library: string;
+  address: string;
+}
+
+// Custom array option parser for --link-lib
+export function parseLinkLibOption(
+  value: string,
+  previousValue: Link[] | undefined,
+): Link[] {
+  const links = previousValue || [];
+  const [library, address] = value.split(":");
+  if (!isAddress(address)) {
+    throw new Error(`Invalid address ${address} `);
+  }
+  links.push({ library, address });
+  return links;
+}
+
+// replace placeholder in bytecode with library address
+export function linkLibrary(
+  bytecode: string,
+  libraries: {
+    [key: string]: string;
+  } = {},
+): string {
+  let linkedBytecode = bytecode;
+  for (const [key, address] of Object.entries(libraries)) {
+    const placeholder = `__\$${utils
+      .solidityKeccak256(["string"], [key])
+      .slice(2, 36)}\$__`;
+    const formattedAddress = utils
+      .getAddress(address)
+      .toLowerCase()
+      .replace("0x", "");
+
+    linkedBytecode = linkedBytecode.replaceAll(placeholder, formattedAddress);
+  }
+  return linkedBytecode;
+}
@@ -41,5 +41,6 @@ export default async function build(
    projectPath: path,
    clean: options.clean,
    zksync: options.zksync,
+    linkLib: options.linkLib,
  });
 }
@@ -1,4 +1,5 @@
 import { findFiles } from "../../common/file-helper";
+import { Link, linkLibrary } from "../../common/link-lib-helper";
 import { hasForge } from "../../create/helpers/has-forge";
 import { execute } from "../helpers/exec";
 import { logger } from "../helpers/logger";
@@ -43,6 +44,24 @@ export class FoundryBuilder extends BaseBuilder {
    const files: string[] = [];
    findFiles(outPath, /^.*(?<!metadata)\.json$/, files);

+    const libraries: { [key: string]: string } = {};
+    if (Array.isArray(options.linkLib) && options.linkLib.length > 0) {
+      for (let i = 0; i < files.length; i++) {
+        const file = files[i];
+        const contractName = basename(file, ".json");
+        const contractJsonFile = readFileSync(file, "utf-8");
+        const contractInfo = JSON.parse(contractJsonFile);
+
+        options.linkLib.forEach((link: Link) => {
+          if (contractName === link.library) {
+            const key = `${contractInfo.ast.absolutePath}:${link.library}`;
+            libraries[key] = link.address;
+          }
+        });
+      }
+      logger.debug(`Found libraries to link: ${JSON.stringify(libraries)}`);
+    }
+
    for (let i = 0; i < files.length; i++) {
      const file = files[i];
      const contractName = basename(file, ".json");
@@ -76,8 +95,13 @@ export class FoundryBuilder extends BaseBuilder {
        continue;
      }

-      const bytecode = contractInfo.bytecode.object;
-      const deployedBytecode = contractInfo.deployedBytecode.object;
+      let bytecode = contractInfo.bytecode.object;
+      let deployedBytecode = contractInfo.deployedBytecode.object;
+
+      // link external libraries if any
+      bytecode = linkLibrary(bytecode, libraries);
+      deployedBytecode = linkLibrary(deployedBytecode, libraries);
+
      const parsedMetadata = contractInfo.metadata;
      const metadata =
        contractInfo.rawMetadata ||
@@ -1,4 +1,5 @@
 import { findFiles } from "../../common/file-helper";
+import { Link, linkLibrary } from "../../common/link-lib-helper";
 import { execute } from "../helpers/exec";
 import { logger } from "../helpers/logger";
 import { ContractPayload } from "../interfaces/ContractPayload";
@@ -85,6 +86,22 @@ export class HardhatBuilder extends BaseBuilder {

      const contractBuildOutputs = buildJson.output.contracts;

+      const libraries: { [key: string]: string } = {};
+      if (Array.isArray(options.linkLib) && options.linkLib.length > 0) {
+        for (const [contractPath, contractInfos] of Object.entries(
+          contractBuildOutputs,
+        )) {
+          const contractNames = Object.keys(contractInfos as any);
+          options.linkLib.forEach((link: Link) => {
+            if (contractNames.includes(link.library)) {
+              const key = `${contractPath}:${link.library}`;
+              libraries[key] = link.address;
+            }
+          });
+        }
+        logger.debug(`Found libraries to link: ${JSON.stringify(libraries)}`);
+      }
+
      for (const [contractPath, contractInfos] of Object.entries(
        contractBuildOutputs,
      )) {
@@ -109,9 +126,13 @@ export class HardhatBuilder extends BaseBuilder {
            continue;
          }

-          const bytecode = info.evm.bytecode.object;
-          const deployedBytecode =
-            info.evm.deployedBytecode?.object || bytecode;
+          let bytecode = info.evm.bytecode.object;
+          let deployedBytecode = info.evm.deployedBytecode?.object || bytecode;
+
+          // link external libraries if any
+          bytecode = linkLibrary(bytecode, libraries);
+          deployedBytecode = linkLibrary(deployedBytecode, libraries);
+
          const { metadata, abi } = info;

          const meta = metadata.solc_metadata
@@ -1,3 +1,4 @@
+import { Link } from "../../common/link-lib-helper";
 import { ContractPayload } from "./ContractPayload";

 export type CompileOptions = {
@@ -5,6 +6,7 @@ export type CompileOptions = {
  projectPath: string;
  name: string;
  zksync?: boolean;
+  linkLib?: Link[];
 };

 export interface IBuilder {
@@ -1,5 +1,25 @@
 # @thirdweb-dev/react-core

+## 4.4.14
+
+### Patch Changes
+
+- Updated dependencies [[`862905e`](https://github.com/thirdweb-dev/js/commit/862905e161a091c15eb9b054cfcca0e5d2879fd6), [`588897d`](https://github.com/thirdweb-dev/js/commit/588897d1b04e6c63da13639aeb47ca701308e1b2), [`862905e`](https://github.com/thirdweb-dev/js/commit/862905e161a091c15eb9b054cfcca0e5d2879fd6)]:
+  - @thirdweb-dev/auth@4.1.38
+  - @thirdweb-dev/chains@0.1.78
+  - @thirdweb-dev/wallets@2.4.16
+  - @thirdweb-dev/sdk@4.0.41
+
+## 4.4.13
+
+### Patch Changes
+
+- Updated dependencies [[`74a92dc`](https://github.com/thirdweb-dev/js/commit/74a92dcb7dc4be7d03bcb8b7211e87016f52a81f), [`047fbe2`](https://github.com/thirdweb-dev/js/commit/047fbe2918808cbc8fded90104458b6e38d1207d)]:
+  - @thirdweb-dev/wallets@2.4.15
+  - @thirdweb-dev/chains@0.1.77
+  - @thirdweb-dev/auth@4.1.37
+  - @thirdweb-dev/sdk@4.0.40
+
 ## 4.4.12

 ### Patch Changes
@@ -1,6 +1,6 @@
 {
  "name": "@thirdweb-dev/react-core",
-  "version": "4.4.12",
+  "version": "4.4.14",
  "repository": "https://github.com/thirdweb-dev/js/tree/main/packages/react-core",
  "author": "thirdweb eng <[email protected]>",
  "license": "Apache-2.0",
@@ -1,5 +1,9 @@
 # @thirdweb-dev/react-native-compat

+## 0.7.11
+
+## 0.7.10
+
 ## 0.7.9

 ## 0.7.8
@@ -1,7 +1,7 @@
 {
  "name": "@thirdweb-dev/react-native-compat",
  "description": "Shims for Thirdweb in React Native Projects",
-  "version": "0.7.9",
+  "version": "0.7.11",
  "author": "thirdweb eng <[email protected]>",
  "repository": "https://github.com/thirdweb-dev/js/tree/main/packages/react-native-compat",
  "license": "Apache-2.0",
@@ -1,5 +1,25 @@
 # @thirdweb-dev/react-native

+## 0.7.11
+
+### Patch Changes
+
+- Updated dependencies [[`588897d`](https://github.com/thirdweb-dev/js/commit/588897d1b04e6c63da13639aeb47ca701308e1b2), [`862905e`](https://github.com/thirdweb-dev/js/commit/862905e161a091c15eb9b054cfcca0e5d2879fd6)]:
+  - @thirdweb-dev/chains@0.1.78
+  - @thirdweb-dev/wallets@2.4.16
+  - @thirdweb-dev/react-core@4.4.14
+  - @thirdweb-dev/sdk@4.0.41
+
+## 0.7.10
+
+### Patch Changes
+
+- Updated dependencies [[`74a92dc`](https://github.com/thirdweb-dev/js/commit/74a92dcb7dc4be7d03bcb8b7211e87016f52a81f), [`047fbe2`](https://github.com/thirdweb-dev/js/commit/047fbe2918808cbc8fded90104458b6e38d1207d)]:
+  - @thirdweb-dev/wallets@2.4.15
+  - @thirdweb-dev/chains@0.1.77
+  - @thirdweb-dev/react-core@4.4.13
+  - @thirdweb-dev/sdk@4.0.40
+
 ## 0.7.9

 ### Patch Changes
@@ -1,6 +1,6 @@
 {
  "name": "@thirdweb-dev/react-native",
-  "version": "0.7.9",
+  "version": "0.7.11",
  "repository": "https://github.com/thirdweb-dev/js/tree/main/packages/react-native",
  "author": "thirdweb eng <[email protected]>",
  "license": "Apache-2.0",
@@ -1,5 +1,25 @@
 # @thirdweb-dev/react

+## 4.4.14
+
+### Patch Changes
+
+- Updated dependencies [[`588897d`](https://github.com/thirdweb-dev/js/commit/588897d1b04e6c63da13639aeb47ca701308e1b2), [`862905e`](https://github.com/thirdweb-dev/js/commit/862905e161a091c15eb9b054cfcca0e5d2879fd6)]:
+  - @thirdweb-dev/chains@0.1.78
+  - @thirdweb-dev/wallets@2.4.16
+  - @thirdweb-dev/react-core@4.4.14
+  - @thirdweb-dev/sdk@4.0.41
+
+## 4.4.13
+
+### Patch Changes
+
+- Updated dependencies [[`74a92dc`](https://github.com/thirdweb-dev/js/commit/74a92dcb7dc4be7d03bcb8b7211e87016f52a81f), [`047fbe2`](https://github.com/thirdweb-dev/js/commit/047fbe2918808cbc8fded90104458b6e38d1207d)]:
+  - @thirdweb-dev/wallets@2.4.15
+  - @thirdweb-dev/chains@0.1.77
+  - @thirdweb-dev/react-core@4.4.13
+  - @thirdweb-dev/sdk@4.0.40
+
 ## 4.4.12

 ### Patch Changes
@@ -1,6 +1,6 @@
 {
  "name": "@thirdweb-dev/react",
-  "version": "4.4.12",
+  "version": "4.4.14",
  "repository": "https://github.com/thirdweb-dev/js/tree/main/packages/react",
  "author": "thirdweb eng <[email protected]>",
  "license": "Apache-2.0",
@@ -1,5 +1,19 @@
 # @thirdweb-dev/sdk

+## 4.0.41
+
+### Patch Changes
+
+- Updated dependencies [[`588897d`](https://github.com/thirdweb-dev/js/commit/588897d1b04e6c63da13639aeb47ca701308e1b2)]:
+  - @thirdweb-dev/chains@0.1.78
+
+## 4.0.40
+
+### Patch Changes
+
+- Updated dependencies [[`047fbe2`](https://github.com/thirdweb-dev/js/commit/047fbe2918808cbc8fded90104458b6e38d1207d)]:
+  - @thirdweb-dev/chains@0.1.77
+
 ## 4.0.39

 ### Patch Changes
@@ -1,6 +1,6 @@
 {
  "name": "@thirdweb-dev/sdk",
-  "version": "4.0.39",
+  "version": "4.0.41",
  "description": "The main thirdweb SDK.",
  "repository": "https://github.com/thirdweb-dev/js/tree/main/packages/sdk",
  "license": "Apache-2.0",
@@ -1,5 +1,27 @@
 # @thirdweb-dev/unity-js-bridge

+## 0.4.4
+
+### Patch Changes
+
+- Updated dependencies [[`862905e`](https://github.com/thirdweb-dev/js/commit/862905e161a091c15eb9b054cfcca0e5d2879fd6), [`588897d`](https://github.com/thirdweb-dev/js/commit/588897d1b04e6c63da13639aeb47ca701308e1b2), [`862905e`](https://github.com/thirdweb-dev/js/commit/862905e161a091c15eb9b054cfcca0e5d2879fd6)]:
+  - @thirdweb-dev/auth@4.1.38
+  - @thirdweb-dev/chains@0.1.78
+  - @thirdweb-dev/wallets@2.4.16
+  - @thirdweb-dev/sdk@4.0.41
+
+## 0.4.3
+
+### Patch Changes
+
+- [#2415](https://github.com/thirdweb-dev/js/pull/2415) [`a3f6878`](https://github.com/thirdweb-dev/js/commit/a3f6878649345ea7b647d085d5d7d536af82948f) Thanks [@0xFirekeeper](https://github.com/0xFirekeeper)! - [Unity] Remove unnecessary logs, add getEmail check
+
+- Updated dependencies [[`74a92dc`](https://github.com/thirdweb-dev/js/commit/74a92dcb7dc4be7d03bcb8b7211e87016f52a81f), [`047fbe2`](https://github.com/thirdweb-dev/js/commit/047fbe2918808cbc8fded90104458b6e38d1207d)]:
+  - @thirdweb-dev/wallets@2.4.15
+  - @thirdweb-dev/chains@0.1.77
+  - @thirdweb-dev/auth@4.1.37
+  - @thirdweb-dev/sdk@4.0.40
+
 ## 0.4.2

 ### Patch Changes
@@ -1,6 +1,6 @@
 {
  "name": "@thirdweb-dev/unity-js-bridge",
-  "version": "0.4.2",
+  "version": "0.4.4",
  "main": "dist/thirdweb-unity-bridge.js",
  "repository": "https://github.com/thirdweb-dev/js/tree/main/packages/unity-js-bridge",
  "license": "Apache-2.0",
@@ -144,11 +144,10 @@ class ThirdwebBridge implements TWBridge {
      }
      (globalThis as any).X_SDK_NAME = "UnitySDK_WebGL";
      (globalThis as any).X_SDK_PLATFORM = "unity";
-      (globalThis as any).X_SDK_VERSION = "4.7.5";
+      (globalThis as any).X_SDK_VERSION = "4.7.6";
      (globalThis as any).X_SDK_OS = browser?.os ?? "unknown";
    }
    this.initializedChain = chain;
-    console.debug("thirdwebSDK initialization:", chain, options);
    const sdkOptions = JSON.parse(options);
    let supportedChains;
    if (sdkOptions?.supportedChains) {
@@ -167,7 +166,7 @@ class ThirdwebBridge implements TWBridge {
        supportedChains = defaultChains;
      }
    } else {
-      console.debug("no supportedChains passed, using default chains");
+      console.warn("no supportedChains passed, using default chains");
      supportedChains = defaultChains;
    }
    sdkOptions.supportedChains = supportedChains;
@@ -446,7 +445,7 @@ class ThirdwebBridge implements TWBridge {
        return arg;
      }
    });
-    console.debug("thirdwebSDK call:", route, parsedArgs);
+    // console.debug("thirdwebSDK call:", route, parsedArgs);

    // wallet call
    if (addrOrSDK.startsWith("sdk")) {
@@ -601,14 +600,6 @@ class ThirdwebBridge implements TWBridge {
      }
    });

-    console.debug(
-      "thirdwebSDK invoke listener:",
-      taskId,
-      route,
-      parsedFnArgs,
-      action,
-    );
-
    // contract call
    if (addrOrSDK.startsWith("0x")) {
      let typeOrAbi: string | ContractInterface | undefined;
@@ -673,14 +664,6 @@ class ThirdwebBridge implements TWBridge {
    personalWallet: AbstractClientWallet,
    accountAddress?: string,
  ) {
-    if (accountAddress) {
-      console.debug(
-        "Initializing smart wallet with account address override:",
-        accountAddress,
-      );
-    }
-    const personalWalletAddress = await personalWallet.getAddress();
-    console.debug("Personal wallet address:", personalWalletAddress);
    await sw.connect({
      personalWallet,
      accountAddress: accountAddress,
@@ -808,6 +791,9 @@ class ThirdwebBridge implements TWBridge {
  }

  public async getEmail() {
+    if (!this.activeWallet) {
+      throw new Error("No wallet connected");
+    }
    const embeddedWallet = this.walletMap.get(
      walletIds.embeddedWallet,
    ) as EmbeddedWallet;
@@ -825,9 +811,6 @@ class ThirdwebBridge implements TWBridge {
      const res = await signer?.getAddress();
      return JSON.stringify({ result: res }, bigNumberReplacer);
    } catch {
-      console.debug(
-        "Could not find a smart wallet, defaulting to normal signer",
-      );
      const signer = await this.activeWallet.getSigner();
      const res = await signer.getAddress();
      return JSON.stringify({ result: res }, bigNumberReplacer);
@@ -1,5 +1,25 @@
 # @thirdweb-dev/wallets

+## 2.4.16
+
+### Patch Changes
+
+- [#2417](https://github.com/thirdweb-dev/js/pull/2417) [`862905e`](https://github.com/thirdweb-dev/js/commit/862905e161a091c15eb9b054cfcca0e5d2879fd6) Thanks [@jnsdls](https://github.com/jnsdls)! - fix signature verification via smart-wallet
+
+- Updated dependencies [[`588897d`](https://github.com/thirdweb-dev/js/commit/588897d1b04e6c63da13639aeb47ca701308e1b2)]:
+  - @thirdweb-dev/chains@0.1.78
+  - @thirdweb-dev/sdk@4.0.41
+
+## 2.4.15
+
+### Patch Changes
+
+- [#2414](https://github.com/thirdweb-dev/js/pull/2414) [`74a92dc`](https://github.com/thirdweb-dev/js/commit/74a92dcb7dc4be7d03bcb8b7211e87016f52a81f) Thanks [@jnsdls](https://github.com/jnsdls)! - properly pass through clientId and secretKey variables to verifySignature functions
+
+- Updated dependencies [[`047fbe2`](https://github.com/thirdweb-dev/js/commit/047fbe2918808cbc8fded90104458b6e38d1207d)]:
+  - @thirdweb-dev/chains@0.1.77
+  - @thirdweb-dev/sdk@4.0.40
+
 ## 2.4.14

 ### Patch Changes
@@ -1,6 +1,6 @@
 {
  "name": "@thirdweb-dev/wallets",
-  "version": "2.4.14",
+  "version": "2.4.16",
  "main": "dist/thirdweb-dev-wallets.cjs.js",
  "module": "dist/thirdweb-dev-wallets.esm.js",
  "browser": {
@@ -0,0 +1,93 @@
+import { Contract, providers, utils } from "ethers";
+import { setAnalyticsHeaders } from "../../../utils/headers";
+import { isTwUrl } from "../../../utils/url";
+import { chainIdToThirdwebRpc } from "../../../wallets/abstract";
+
+const EIP1271_ABI = [
+  "function isValidSignature(bytes32 _hash, bytes _signature) public view returns (bytes4)",
+];
+const EIP1271_MAGICVALUE = "0x1626ba7e";
+
+export async function checkContractWalletSignature(
+  message: string,
+  signature: string,
+  address: string,
+  chainId: number,
+  clientId?: string,
+  secretKey?: string,
+): Promise<boolean> {
+  // TODO: remove below `skipFetchSetup` logic when ethers.js v6 support arrives
+  let _skipFetchSetup = false;
+  if (
+    typeof globalThis !== "undefined" &&
+    "TW_SKIP_FETCH_SETUP" in globalThis &&
+    typeof (globalThis as any).TW_SKIP_FETCH_SETUP === "boolean"
+  ) {
+    _skipFetchSetup = (globalThis as any).TW_SKIP_FETCH_SETUP as boolean;
+  }
+
+  const rpcUrl = chainIdToThirdwebRpc(chainId, clientId);
+
+  const headers: Record<string, string> = {};
+
+  if (isTwUrl(rpcUrl)) {
+    const bundleId =
+      typeof globalThis !== "undefined" && "APP_BUNDLE_ID" in globalThis
+        ? ((globalThis as any).APP_BUNDLE_ID as string)
+        : undefined;
+
+    if (secretKey) {
+      headers["x-secret-key"] = secretKey;
+    } else if (clientId) {
+      headers["x-client-id"] = clientId;
+
+      if (bundleId) {
+        headers["x-bundle-id"] = bundleId;
+      }
+    }
+
+    // Dashboard token
+    if (
+      typeof globalThis !== "undefined" &&
+      "TW_AUTH_TOKEN" in globalThis &&
+      typeof (globalThis as any).TW_AUTH_TOKEN === "string"
+    ) {
+      headers["authorization"] = `Bearer ${
+        (globalThis as any).TW_AUTH_TOKEN as string
+      }`;
+    }
+
+    // CLI token
+    if (
+      typeof globalThis !== "undefined" &&
+      "TW_CLI_AUTH_TOKEN" in globalThis &&
+      typeof (globalThis as any).TW_CLI_AUTH_TOKEN === "string"
+    ) {
+      headers["authorization"] = `Bearer ${
+        (globalThis as any).TW_CLI_AUTH_TOKEN as string
+      }`;
+      headers["x-authorize-wallet"] = "true";
+    }
+
+    setAnalyticsHeaders(headers);
+  }
+
+  const provider = new providers.StaticJsonRpcProvider(
+    {
+      url: chainIdToThirdwebRpc(chainId),
+      skipFetchSetup: _skipFetchSetup,
+      headers,
+    },
+    chainId,
+  );
+  const walletContract = new Contract(address, EIP1271_ABI, provider);
+  try {
+    const res = await walletContract.isValidSignature(
+      utils.hashMessage(message),
+      signature,
+    );
+    return res === EIP1271_MAGICVALUE;
+  } catch {
+    return false;
+  }
+}
@@ -1,5 +1,4 @@
 import { Contract, ethers, providers, utils } from "ethers";
-
 import { Bytes, Signer } from "ethers";
 import { BaseAccountAPI } from "./base-api";
 import type { ERC4337EthersProvider } from "./erc4337-provider";
@@ -7,10 +6,10 @@ import { HttpRpcClient } from "./http-rpc-client";
 import { hexlifyUserOp, randomNonce } from "./utils";
 import { ProviderConfig, UserOpOptions } from "../types";
 import { signTypedDataInternal } from "@thirdweb-dev/sdk";
-import {
-  checkContractWalletSignature,
-  chainIdToThirdwebRpc,
-} from "../../../wallets/abstract";
+import { chainIdToThirdwebRpc } from "../../../wallets/abstract";
+import { setAnalyticsHeaders } from "../../../utils/headers";
+import { isTwUrl } from "../../../utils/url";
+import { checkContractWalletSignature } from "./check-contract-wallet-signature";

 export class ERC4337EthersSigner extends Signer {
  config: ProviderConfig;
@@ -103,7 +102,7 @@ export class ERC4337EthersSigner extends Signer {
          errorIn.reason;

        if (failedOpMessage?.includes("FailedOp")) {
-          let paymasterInfo: string = "";
+          let paymasterInfo = "";
          // TODO: better error extraction methods will be needed
          const matched = failedOpMessage.match(/FailedOp\((.*)\)/);

@@ -179,9 +178,58 @@ Code: ${errorCode}`;
    let factorySupports712: boolean;
    let signature: string;

+    const rpcUrl = chainIdToThirdwebRpc(chainId, this.config.clientId);
+
+    const headers: Record<string, string> = {};
+
+    if (isTwUrl(rpcUrl)) {
+      const bundleId =
+        typeof globalThis !== "undefined" && "APP_BUNDLE_ID" in globalThis
+          ? ((globalThis as any).APP_BUNDLE_ID as string)
+          : undefined;
+
+      if (this.config.secretKey) {
+        headers["x-secret-key"] = this.config.secretKey;
+      } else if (this.config.clientId) {
+        headers["x-client-id"] = this.config.clientId;
+
+        if (bundleId) {
+          headers["x-bundle-id"] = bundleId;
+        }
+      }
+
+      // Dashboard token
+      if (
+        typeof globalThis !== "undefined" &&
+        "TW_AUTH_TOKEN" in globalThis &&
+        typeof (globalThis as any).TW_AUTH_TOKEN === "string"
+      ) {
+        headers["authorization"] = `Bearer ${
+          (globalThis as any).TW_AUTH_TOKEN as string
+        }`;
+      }
+
+      // CLI token
+      if (
+        typeof globalThis !== "undefined" &&
+        "TW_CLI_AUTH_TOKEN" in globalThis &&
+        typeof (globalThis as any).TW_CLI_AUTH_TOKEN === "string"
+      ) {
+        headers["authorization"] = `Bearer ${
+          (globalThis as any).TW_CLI_AUTH_TOKEN as string
+        }`;
+        headers["x-authorize-wallet"] = "true";
+      }
+
+      setAnalyticsHeaders(headers);
+    }
+
    try {
-      const provider = new providers.JsonRpcProvider(
-        chainIdToThirdwebRpc(chainId, this.config.clientId),
+      const provider = new providers.StaticJsonRpcProvider(
+        {
+          url: chainIdToThirdwebRpc(chainId, this.config.clientId),
+          headers,
+        },
        chainId,
      );
      const walletContract = new Contract(
@@ -222,6 +270,8 @@ Code: ${errorCode}`;
      signature,
      address,
      chainId,
+      this.config.clientId,
+      this.config.secretKey,
    );

    if (isValid) {
@@ -69,7 +69,7 @@ export class HttpRpcClient {
      setAnalyticsHeaders(headers);
    }

-    this.userOpJsonRpcProvider = new providers.JsonRpcProvider(
+    this.userOpJsonRpcProvider = new providers.StaticJsonRpcProvider(
      {
        url: this.bundlerUrl,
        headers,
@@ -20,8 +20,8 @@ export type {
  AbstractWallet,
  WalletData,
  WalletEvents,
-  checkContractWalletSignature,
 } from "./wallets/abstract";
+export { checkContractWalletSignature } from "./connectors/smart-wallet/lib/check-contract-wallet-signature";

 export * from "./wallets/paper-wallet";
 // just the types
@@ -1,6 +1,6 @@
 import { EVMWallet } from "../interfaces";
 import type { Signer } from "ethers";
-import { providers, Contract, utils, Bytes, BigNumber } from "ethers";
+import { utils, Bytes, BigNumber } from "ethers";
 import EventEmitter from "eventemitter3";
 import { Ecosystem, GenericAuthWallet } from "../../core/interfaces/auth";
 import {
@@ -39,43 +39,6 @@ export interface WalletEvents {
  request(): void;
 }

-const EIP1271_ABI = [
-  "function isValidSignature(bytes32 _hash, bytes _signature) public view returns (bytes4)",
-];
-const EIP1271_MAGICVALUE = "0x1626ba7e";
-
-export async function checkContractWalletSignature(
-  message: string,
-  signature: string,
-  address: string,
-  chainId: number,
-): Promise<boolean> {
-  // TODO: remove below `skipFetchSetup` logic when ethers.js v6 support arrives
-  let _skipFetchSetup = false;
-  if (
-    typeof globalThis !== "undefined" &&
-    "TW_SKIP_FETCH_SETUP" in globalThis &&
-    typeof (globalThis as any).TW_SKIP_FETCH_SETUP === "boolean"
-  ) {
-    _skipFetchSetup = (globalThis as any).TW_SKIP_FETCH_SETUP as boolean;
-  }
-
-  //TODO: A provider should be passed in instead of creating a new one here.
-  const provider = new providers.JsonRpcProvider({
-    url: chainIdToThirdwebRpc(chainId),
-    skipFetchSetup: _skipFetchSetup,
-  });
-  const walletContract = new Contract(address, EIP1271_ABI, provider);
-  try {
-    const res = await walletContract.isValidSignature(
-      utils.hashMessage(message),
-      signature,
-    );
-    return res === EIP1271_MAGICVALUE;
-  } catch {
-    return false;
-  }
-}
 /**
 * The base class for any wallet in the Wallet SDK, including backend wallets. It contains the functionality common to all wallets.
 *
@@ -200,7 +163,8 @@ export abstract class AbstractWallet
    message: string,
    signature: string,
    address: string,
-    chainId?: number,
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    _chainId?: number,
  ): Promise<boolean> {
    try {
      const messageHash = utils.hashMessage(message);
@@ -217,21 +181,6 @@ export abstract class AbstractWallet
      // no-op
    }

-    // 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;
  }
 }
@@ -16,6 +16,7 @@ import {
 import { walletIds } from "../constants/walletIds";
 import { getValidChainRPCs } from "@thirdweb-dev/chains";
 import { providers, utils } from "ethers";
+import { checkContractWalletSignature } from "../connectors/smart-wallet/lib/check-contract-wallet-signature";

 // export types and utils for convenience
 export type * from "../connectors/smart-wallet/types";
@@ -663,6 +664,44 @@ export class SmartWallet extends AbstractClientWallet<
    return connector.getFactoryContract();
  }

+  override async verifySignature(
+    message: string,
+    signature: string,
+    address: string,
+    chainId: number,
+  ): Promise<boolean> {
+    try {
+      const messageHash = utils.hashMessage(message);
+      const messageHashBytes = utils.arrayify(messageHash);
+      const recoveredAddress = utils.recoverAddress(
+        messageHashBytes,
+        signature,
+      );
+
+      if (recoveredAddress === address) {
+        return true;
+      }
+    } catch {
+      // no-op
+    }
+    // Check if the address is a smart contract wallet
+    if (chainId !== undefined) {
+      try {
+        return await checkContractWalletSignature(
+          message,
+          signature,
+          address,
+          chainId || 1,
+          this.options?.clientId,
+          this.options?.secretKey,
+        );
+      } catch {
+        // no-op
+      }
+    }
+    return false;
+  }
+
  autoConnect(params: ConnectParams<SmartWalletConnectionArgs>) {
    return this.connect(params);
  }
@@ -6,6 +6,7 @@ import { ThirdwebSDK, SmartContract } from "@thirdweb-dev/sdk";
 import { BigNumber, ethers } from "ethers";

 require("dotenv-mono").load();
+
 jest.setTimeout(240_000);

 let smartWallet: SmartWallet;
@@ -33,7 +34,9 @@ beforeAll(async () => {
    erc20TokenAddress: erc20TokenAddress,
  });
  smartWalletAddress = await smartWallet.connect({ personalWallet });
-  sdk = await ThirdwebSDK.fromWallet(smartWallet, chain);
+  sdk = await ThirdwebSDK.fromWallet(smartWallet, chain, {
+    secretKey: process.env.TW_SECRET_KEY,
+  });
  contract = await sdk.getContract(
    "0xF7235993A1BB401620e7c384D541e78D18081090", // using same token for payment and claim
  );
@@ -3,9 +3,10 @@ import { SmartWallet } from "../src/evm/wallets/smart-wallet";
 import { LocalWallet } from "../src/evm/wallets/local-wallet";
 import { Mumbai } from "@thirdweb-dev/chains";
 import { ThirdwebSDK, SmartContract } from "@thirdweb-dev/sdk";
-import { checkContractWalletSignature } from "../src/evm/wallets/abstract";
+import { checkContractWalletSignature } from "../src/evm/connectors/smart-wallet/lib/check-contract-wallet-signature";

 require("dotenv-mono").load();
+
 jest.setTimeout(240_000);

 let smartWallet: SmartWallet;
@@ -15,6 +16,7 @@ let contract: SmartContract;
 const factoryAddress = "0x13947435c2fe6BE51ED82F6f59C38617a323dB9B"; // pre 712
 const factoryAddressV2 = "0xC64d04AedecA895b3F20DC6866b4b532e0b22634"; // post 712
 const chain = Mumbai;
+const SECRET_KEY = process.env.TW_SECRET_KEY;

 const describeIf = (condition: boolean) =>
  condition ? describe : describe.skip;
@@ -26,16 +28,18 @@ beforeAll(async () => {
    chain,
    factoryAddress,
    gasless: true,
-    secretKey: process.env.TW_SECRET_KEY,
+    secretKey: SECRET_KEY,
  });
  smartWalletAddress = await smartWallet.connect({ personalWallet });
-  const sdk = await ThirdwebSDK.fromWallet(smartWallet, chain);
+  const sdk = await ThirdwebSDK.fromWallet(smartWallet, chain, {
+    secretKey: SECRET_KEY,
+  });
  contract = await sdk.getContract(
    "0xD170A53dADb19f62C78AB9982236857B71dbc83A", // mumbai edition drop
  );
 });

-describeIf(!!process.env.TW_SECRET_KEY)("SmartWallet core tests", () => {
+describeIf(!!SECRET_KEY)("SmartWallet core tests", () => {
  it("can connect", async () => {
    expect(smartWalletAddress).toHaveLength(42);
  });
@@ -114,6 +118,8 @@ describeIf(!!process.env.TW_SECRET_KEY)("SmartWallet core tests", () => {
      sig,
      smartWalletAddress,
      chain.chainId,
+      undefined,
+      SECRET_KEY,
    );
    expect(isValidV2).toEqual(true);
  });
@@ -140,6 +146,8 @@ describeIf(!!process.env.TW_SECRET_KEY)("SmartWallet core tests", () => {
      sig,
      smartWalletAddress,
      chain.chainId,
+      undefined,
+      SECRET_KEY,
    );
    expect(isValidV2).toEqual(true);
  });
@@ -1882,7 +1882,7 @@
  ],
  "ERC721UpdatableMetadata": [
    {
-      "name": "update",
+      "name": "updateMetadata",
      "summary": "Update the metadata of an NFT\n\n",
      "remarks": "\n\nUpdate the metadata of an NFT\n\n",
      "examples": {
Author	SHA1	Message	Date
Jonas Daniels GitHubgithub-actions[bot] <github-actions[bot]@users.noreply.github.com>GitHub Action	62b2508a6c	Version Packages (#2420 ) Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: GitHub Action <[email protected]>	2024-03-07 13:57:31 -08:00
github-actions[bot]GitHub GitHub Action	c3967b798e	chore(chains): update chains (#2426 ) Co-authored-by: GitHub Action <[email protected]>	2024-03-07 13:21:11 -08:00
github-actions[bot]GitHub GitHub Action	588897d1b0	chore(chains): update chains (#2416 ) Co-authored-by: GitHub Action <[email protected]>	2024-03-07 11:59:05 -08:00
Jonas Daniels GitHub 0xFirekeeper	862905e161	refactor: Move checkContractWalletSignature function to a separate file (#2417 ) Co-authored-by: 0xFirekeeper <[email protected]>	2024-03-07 06:09:48 +00:00
saminaandGitHub	5f81e246f2	Update README.md (#2418 ) Signed-off-by: samina <[email protected]>	2024-03-07 02:43:38 +00:00
Jonas Daniels GitHubgithub-actions[bot] <github-actions[bot]@users.noreply.github.com>GitHub Action	1b052d63e9	Version Packages (#2409 ) Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: GitHub Action <[email protected]>	2024-03-06 15:23:29 -08:00
FirekeeperandGitHub	a3f6878649	[Unity] Remove unnecessary logs, add getEmail check (#2415 )	2024-03-06 22:44:51 +00:00
Jonas DanielsandGitHub	74a92dcb7d	feat(wallets): pass clientId and secretKey to verifySignature functions (#2414 )	2024-03-06 22:20:10 +00:00
github-actions[bot]GitHub GitHub Action	38fc0b796a	chore(chains): update chains (#2412 ) Co-authored-by: GitHub Action <[email protected]>	2024-03-06 13:07:04 -08:00
YashandGitHub	ef76a96c2d	[CLI] Option to link external libraries (#2400 )	2024-03-06 18:45:04 +00:00
github-actions[bot]GitHub GitHub Action	2667706d8d	chore(chains): update chains (#2408 ) Co-authored-by: GitHub Action <[email protected]>	2024-03-06 00:03:24 -08:00
github-actions[bot]GitHub GitHub Action	047fbe2918	chore(chains): update chains (#2406 ) Co-authored-by: GitHub Action <[email protected]>	2024-03-05 23:58:43 -08:00