thirdweb 5.34.0-nightly-f6ff5a78fc2d65f0f250b154f1405210ca57ce0a-20240708000345 → 5.34.0-nightly-95c9d3d92406de619cb1e4cccc61b0766dd2a0d4-20240708205331

package/dist/types/wallets/smart/lib/userop.d.ts

@@ -1,7 +1,10 @@
+import type { Chain } from "../../../chains/types.js";
+import type { ThirdwebContract } from "../../../contract/contract.js";
 import type { PreparedTransaction } from "../../../transaction/prepare-transaction.js";
 import type { TransactionReceipt } from "../../../transaction/types.js";
 import type { Hex } from "../../../utils/encoding/hex.js";
-import type { BundlerOptions, SmartAccountOptions, UserOperation } from "../types.js";
+import type { Account } from "../../interfaces/wallet.js";
+import type { BundlerOptions, SmartWalletOptions, UserOperation } from "../types.js";
 /**
  * Wait for the user operation to be mined.
  * @param args - The options and user operation hash
@@ -36,14 +39,20 @@ export declare function waitForUserOpReceipt(args: BundlerOptions & {
  *
  * const userOp = await createUnsignedUserOp({
  *  transaction,
- *  options,
+ *  accountContract,
+ *  sponsorGas,
+ *  overrides,
  * });
  * ```
  * @walletUtils
  */
 export declare function createUnsignedUserOp(args: {
     transaction: PreparedTransaction;
-    options: SmartAccountOptions;
+    factoryContract: ThirdwebContract;
+    accountContract: ThirdwebContract;
+    adminAddress: string;
+    sponsorGas: boolean;
+    overrides?: SmartWalletOptions["overrides"];
 }): Promise<UserOperation>;
 /**
  * Sign a user operation.
@@ -64,6 +73,8 @@ export declare function createUnsignedUserOp(args: {
  */
 export declare function signUserOp(args: {
     userOp: UserOperation;
-    options: SmartAccountOptions;
+    chain: Chain;
+    entrypointAddress?: string;
+    adminAccount: Account;
 }): Promise<UserOperation>;
 //# sourceMappingURL=userop.d.ts.map

package/dist/types/wallets/smart/lib/userop.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"userop.d.ts","sourceRoot":"","sources":["../../../../../src/wallets/smart/lib/userop.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,6CAA6C,CAAC;AACvF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AAGxE,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,gCAAgC,CAAC;AAK1D,OAAO,KAAK,EACV,cAAc,EACd,mBAAmB,EACnB,aAAa,EACd,MAAM,aAAa,CAAC;AAerB;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,cAAc,GAAG;IACrB,UAAU,EAAE,GAAG,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,GACA,OAAO,CAAC,kBAAkB,CAAC,CAY7B;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,oBAAoB,CAAC,IAAI,EAAE;IAC/C,WAAW,EAAE,mBAAmB,CAAC;IACjC,OAAO,EAAE,mBAAmB,CAAC;CAC9B,GAAG,OAAO,CAAC,aAAa,CAAC,CAkHzB;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,UAAU,CAAC,IAAI,EAAE;IACrC,MAAM,EAAE,aAAa,CAAC;IACtB,OAAO,EAAE,mBAAmB,CAAC;CAC9B,GAAG,OAAO,CAAC,aAAa,CAAC,CAmBzB"}
+{"version":3,"file":"userop.d.ts","sourceRoot":"","sources":["../../../../../src/wallets/smart/lib/userop.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAGtE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,6CAA6C,CAAC;AACvF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AAGxE,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,gCAAgC,CAAC;AAK1D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,KAAK,EACV,cAAc,EACd,kBAAkB,EAClB,aAAa,EACd,MAAM,aAAa,CAAC;AAerB;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,cAAc,GAAG;IACrB,UAAU,EAAE,GAAG,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,GACA,OAAO,CAAC,kBAAkB,CAAC,CAY7B;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAsB,oBAAoB,CAAC,IAAI,EAAE;IAC/C,WAAW,EAAE,mBAAmB,CAAC;IACjC,eAAe,EAAE,gBAAgB,CAAC;IAClC,eAAe,EAAE,gBAAgB,CAAC;IAClC,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE,kBAAkB,CAAC,WAAW,CAAC,CAAC;CAC7C,GAAG,OAAO,CAAC,aAAa,CAAC,CAyIzB;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,UAAU,CAAC,IAAI,EAAE;IACrC,MAAM,EAAE,aAAa,CAAC;IACtB,KAAK,EAAE,KAAK,CAAC;IACb,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,YAAY,EAAE,OAAO,CAAC;CACvB,GAAG,OAAO,CAAC,aAAa,CAAC,CAmBzB"}

package/dist/types/wallets/smart/types.d.ts

@@ -36,10 +36,12 @@ export type SmartAccountOptions = Prettify<Omit<SmartWalletOptions, "chain" | "g
     accountContract: ThirdwebContract;
     client: ThirdwebClient;
 }>;
-export type BundlerOptions = Prettify<Omit<SmartWalletOptions, "chain" | "gasless" | "sponsorGas"> & {
+export type BundlerOptions = {
+    bundlerUrl?: string;
+    entrypointAddress?: string;
     chain: Chain;
     client: ThirdwebClient;
-}>;
+};
 export type SmartWalletConnectionOptions = {
     personalAccount: Account;
     client: ThirdwebClient;

package/dist/types/wallets/smart/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/wallets/smart/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/wallets/smart/types.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thirdweb",
-  "version": "5.34.0-nightly-f6ff5a78fc2d65f0f250b154f1405210ca57ce0a-20240708000345",
+  "version": "5.34.0-nightly-95c9d3d92406de619cb1e4cccc61b0766dd2a0d4-20240708205331",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/thirdweb-dev/js.git#main"

package/src/auth/core/verify-jwt.ts

@@ -1,4 +1,4 @@
-import { deccodeJWT } from "../../utils/jwt/decode-jwt.js";
+import { decodeJWT } from "../../utils/jwt/decode-jwt.js";
 import type { JWTPayload } from "../../utils/jwt/types.js";
 import { verifyEOASignature } from "../verify-signature.js";
 import type { AuthOptions } from "./types.js";
@@ -26,7 +26,7 @@ export type VerifyJWTResult =
  */
 export function verifyJWT(options: AuthOptions) {
   return async (params: VerifyJWTParams): Promise<VerifyJWTResult> => {
-    const { payload, signature } = deccodeJWT(params.jwt);
+    const { payload, signature } = decodeJWT(params.jwt);
 
     if (!options.adminAccount) {
       throw new Error("No admin account provided. Cannot verify JWT.");

package/src/auth/verify-hash.test.ts

@@ -0,0 +1,66 @@
+import { parseSignature } from "viem";
+import { describe, expect, test } from "vitest";
+import { FORKED_ETHEREUM_CHAIN } from "../../test/src/chains.js";
+import { TEST_CLIENT } from "../../test/src/test-clients.js";
+import { ANVIL_PKEY_A, TEST_ACCOUNT_A } from "../../test/src/test-wallets.js";
+import { toBytes } from "../utils/encoding/to-bytes.js";
+import { hashMessage } from "../utils/hashing/hashMessage.js";
+import { signMessage } from "../utils/signatures/sign-message.js";
+import { verifyHash } from "./verify-hash.js";
+
+describe("verifyHash", async () => {
+  describe("EOA", async () => {
+    test("hex", async () => {
+      const signature = signMessage({
+        message: "hello world",
+        privateKey: ANVIL_PKEY_A,
+      });
+
+      expect(
+        verifyHash({
+          address: TEST_ACCOUNT_A.address,
+          hash: hashMessage("hello world"),
+          signature,
+          client: TEST_CLIENT,
+          chain: FORKED_ETHEREUM_CHAIN,
+        }),
+      ).resolves.toBe(true);
+    });
+
+    test("bytes", async () => {
+      const signature = signMessage({
+        message: "hello world",
+        privateKey: ANVIL_PKEY_A,
+      });
+
+      expect(
+        verifyHash({
+          address: TEST_ACCOUNT_A.address,
+          hash: hashMessage("hello world"),
+          signature: toBytes(signature),
+          client: TEST_CLIENT,
+          chain: FORKED_ETHEREUM_CHAIN,
+        }),
+      ).resolves.toBe(true);
+    });
+
+    test("object", async () => {
+      const signature = signMessage({
+        message: "hello world",
+        privateKey: ANVIL_PKEY_A,
+      });
+
+      expect(
+        verifyHash({
+          address: TEST_ACCOUNT_A.address,
+          hash: hashMessage("hello world"),
+          signature: parseSignature(signature),
+          client: TEST_CLIENT,
+          chain: FORKED_ETHEREUM_CHAIN,
+        }),
+      ).resolves.toBe(true);
+    });
+  });
+});
+
+// TODO: Create utilities to mock smart accounts on anvil so we can test them here

package/src/auth/verify-hash.ts

@@ -0,0 +1,126 @@
+import { equalBytes } from "@noble/curves/abstract/utils";
+import { type Signature, encodeDeployData, serializeSignature } from "viem";
+import type { Chain } from "../chains/types.js";
+import type { ThirdwebClient } from "../client/client.js";
+import { getContract } from "../contract/contract.js";
+import { eth_call } from "../rpc/actions/eth_call.js";
+import { getRpcClient } from "../rpc/rpc.js";
+import { fromBytes } from "../utils/encoding/from-bytes.js";
+import { type Hex, isHex } from "../utils/encoding/hex.js";
+import { toBytes } from "../utils/encoding/to-bytes.js";
+import { DEFAULT_ACCOUNT_FACTORY } from "../wallets/smart/lib/constants.js";
+import {
+  universalSignatureValidatorAbi,
+  universalSignatureValidatorByteCode,
+} from "./constants.js";
+import { isErc6492Signature } from "./is-erc6492-signature.js";
+import { serializeErc6492Signature } from "./serialize-erc6492-signature.js";
+
+export type VerifyHashParams = {
+  hash: Hex;
+  signature: string | Uint8Array | Signature;
+  address: string;
+  client: ThirdwebClient;
+  chain: Chain;
+  accountFactory?: {
+    address: string;
+    verificationCalldata: Hex;
+  };
+};
+
+/**
+ * @description Verify that an address created the provided signature for a given hash using [ERC-6492](https://eips.ethereum.org/EIPS/eip-6492). This function is interoperable with all wallet types, including EOAs.
+ * This function should rarely be used directly, instead use @see {import("./verify-signature.js")} and @see {import("./verify-typed-data.js")}}
+ *
+ * @param {Hex} options.hash The hash that was signed
+ * @param {string | Uint8Array | Signature} options.signature The signature that was signed
+ * @param {string} options.address The address that signed the hash
+ * @param {ThirdwebClient} options.client The Thirdweb client
+ * @param {Chain} options.chain The chain that the address is on. For an EOA, this can be any chain.
+ * @param {string} [options.accountFactory.address] The address of the account factory that created the account if using a smart account with a custom account factory
+ * @param {Hex} [options.accountFactory.verificationCalldata] The calldata that was used to create the account if using a smart account with a custom account factory
+ *
+ * @returns {Promise<boolean>} A promise that resolves to `true` if the signature is valid, or `false` otherwise.
+ *
+ * @example
+ * ```ts
+ * import { verifyHash } from "thirdweb/utils";
+ * const isValid = await verifyHash({
+ *   hash: "0x1234",
+ *   signature: "0x1234",
+ *   address: "0x1234",
+ *   client,
+ *   chain,
+ * });
+ * ```
+ *
+ * @auth
+ */
+export async function verifyHash({
+  hash,
+  signature,
+  address,
+  client,
+  chain,
+  accountFactory,
+}: VerifyHashParams): Promise<boolean> {
+  const signatureHex = (() => {
+    if (isHex(signature)) return signature;
+    if (typeof signature === "object" && "r" in signature && "s" in signature)
+      return serializeSignature(signature);
+    if (signature instanceof Uint8Array) return fromBytes(signature, "hex");
+    // We should never hit this but TS doesn't know that
+    throw new Error(
+      `Invalid signature type for signature ${signature}: ${typeof signature}`,
+    );
+  })();
+
+  const accountContract = getContract({
+    address,
+    chain,
+    client,
+  });
+
+  const wrappedSignature = await (async () => {
+    // If this sigature was already wrapped for ERC-6492, carry on
+    if (isErc6492Signature(signatureHex)) return signatureHex;
+
+    // If the contract is already deployed, return the original signature
+    const { isContractDeployed } = await import(
+      "../utils/bytecode/is-contract-deployed.js"
+    );
+    const isDeployed = await isContractDeployed(accountContract);
+    if (!isDeployed) return signatureHex;
+
+    // Otherwise, serialize the signature for ERC-6492 validation
+    return serializeErc6492Signature({
+      address: accountFactory?.address ?? DEFAULT_ACCOUNT_FACTORY,
+      data: accountFactory?.verificationCalldata ?? "0x",
+      signature: signatureHex,
+    });
+  })();
+
+  const verificationData = encodeDeployData({
+    abi: universalSignatureValidatorAbi,
+    args: [address, hash, wrappedSignature],
+    bytecode: universalSignatureValidatorByteCode,
+  });
+
+  const rpcRequest = getRpcClient({
+    chain,
+    client,
+  });
+
+  try {
+    const result = await eth_call(rpcRequest, {
+      data: verificationData,
+    });
+
+    const hexResult = isHex(result) ? toBytes(result) : result;
+    return equalBytes(hexResult, toBytes("0x1"));
+  } catch (error) {
+    // TODO: Improve overall RPC error handling so we can tell if this was an actual verification failure or some other error
+    // Verification failed somehow
+    return false;
+  }
+}

package/src/auth/verify-signature.ts

@@ -1,27 +1,10 @@
-import { equalBytes } from "@noble/curves/abstract/utils";
-import {
-  type Signature,
-  encodeDeployData,
-  recoverAddress,
-  serializeSignature,
-} from "viem";
+import { type Signature, recoverAddress } from "viem";
 import type { Chain } from "../chains/types.js";
 import type { ThirdwebClient } from "../client/client.js";
-import { getContract } from "../contract/contract.js";
-import { eth_call } from "../rpc/actions/eth_call.js";
-import { getRpcClient } from "../rpc/rpc.js";
-import { fromBytes } from "../utils/encoding/from-bytes.js";
 import { type Hex, isHex } from "../utils/encoding/hex.js";
-import { toBytes } from "../utils/encoding/to-bytes.js";
 import { hashMessage } from "../utils/hashing/hashMessage.js";
 import type { Prettify } from "../utils/type-utils.js";
-import { DEFAULT_ACCOUNT_FACTORY } from "../wallets/smart/lib/constants.js";
-import {
-  universalSignatureValidatorAbi,
-  universalSignatureValidatorByteCode,
-} from "./constants.js";
-import { isErc6492Signature } from "./is-erc6492-signature.js";
-import { serializeErc6492Signature } from "./serialize-erc6492-signature.js";
+import { verifyHash } from "./verify-hash.js";
 
 export type VerifyEOASignatureParams = {
   message: string;
@@ -113,69 +96,15 @@ export async function verifyContractWalletSignature({
   client,
   accountFactory,
 }: VerifyContractWalletSignatureParams) {
-  console.log("verifyContractWalletSignature");
   const messageHash = hashMessage(message);
-
-  const signatureHex = (() => {
-    if (isHex(signature)) return signature;
-    if (typeof signature === "object" && "r" in signature && "s" in signature)
-      return serializeSignature(signature);
-    if (signature instanceof Uint8Array) return fromBytes(signature, "hex");
-    // We should never hit this but TS doesn't know that
-    throw new Error(
-      `Invalid signature type for signature ${signature}: ${typeof signature}`,
-    );
-  })();
-
-  const accountContract = getContract({
+  return verifyHash({
+    hash: messageHash,
+    signature,
     address,
-    chain,
     client,
-  });
-
-  const wrappedSignature = await (async () => {
-    // If this sigature was already wrapped for ERC-6492, carry on
-    if (isErc6492Signature(signatureHex)) return signatureHex;
-
-    // If the contract is already deployed, return the original signature
-    const { isContractDeployed } = await import(
-      "../utils/bytecode/is-contract-deployed.js"
-    );
-    const isDeployed = await isContractDeployed(accountContract);
-    if (!isDeployed) return signatureHex;
-
-    // Otherwise, serialize the signature for ERC-6492 validation
-    return serializeErc6492Signature({
-      address: accountFactory?.address ?? DEFAULT_ACCOUNT_FACTORY,
-      data: accountFactory?.verificationCalldata ?? "0x",
-      signature: signatureHex,
-    });
-  })();
-
-  const verificationData = encodeDeployData({
-    abi: universalSignatureValidatorAbi,
-    args: [address, messageHash, wrappedSignature],
-    bytecode: universalSignatureValidatorByteCode,
-  });
-
-  const rpcRequest = getRpcClient({
     chain,
-    client,
+    accountFactory,
   });
-
-  try {
-    const result = await eth_call(rpcRequest, {
-      data: verificationData,
-    });
-
-    const hexResult = isHex(result) ? toBytes(result) : result;
-    return equalBytes(hexResult, toBytes("0x1"));
-  } catch (error) {
-    console.log("error", error);
-    // TODO: Improve overall RPC error handling so we can tell if this was an actual verification failure or some other error
-    // Verification failed somehow
-    return false;
-  }
 }
 
 export type VerifySignatureParams = Prettify<

package/src/auth/verify-typed-data.test.ts

@@ -0,0 +1,82 @@
+import { describe, expect, test } from "vitest";
+import { TEST_CLIENT } from "../../test/src/test-clients.js";
+import { ANVIL_PKEY_A, TEST_ACCOUNT_A } from "../../test/src/test-wallets.js";
+import { typedData } from "../../test/src/typed-data.js";
+import { mainnet } from "../chains/chain-definitions/ethereum.js";
+import { signTypedData } from "../utils/signatures/sign-typed-data.js";
+import { verifyTypedData } from "./verify-typed-data.js";
+
+describe("verifyTypedData", async () => {
+  test("valid EOA signature", async () => {
+    const signature = signTypedData({
+      ...typedData.basic,
+      primaryType: "Mail",
+      privateKey: ANVIL_PKEY_A,
+    });
+
+    expect(
+      await verifyTypedData({
+        ...typedData.basic,
+        primaryType: "Mail",
+        address: TEST_ACCOUNT_A.address,
+        signature,
+        chain: mainnet,
+        client: TEST_CLIENT,
+      }),
+    ).toBe(true);
+  });
+
+  test("invalid EOA signature", async () => {
+    expect(
+      await verifyTypedData({
+        ...typedData.basic,
+        primaryType: "Mail",
+        address: TEST_ACCOUNT_A.address,
+        signature: "0xdead",
+        chain: mainnet,
+        client: TEST_CLIENT,
+      }),
+    ).toBe(false);
+  });
+
+  test("valid smart account signature", async () => {
+    expect(
+      await verifyTypedData({
+        ...typedData.basic,
+        primaryType: "Mail",
+        address: "0x3FCf42e10CC70Fe75A62EB3aDD6D305Aa840d145",
+        signature:
+          "0x79d756d805073dc97b7bc885b0d56ddf319a2599530fe1e178c2a7de5be88980068d24f20a79b318ea0a84d33ae06f93db77e4235e5d9eeb8b1d7a63922ada3e1c",
+        chain: mainnet,
+        client: TEST_CLIENT,
+      }),
+    ).toBe(true);
+  });
+
+  test("invalid smart account signature", async () => {
+    expect(
+      await verifyTypedData({
+        ...typedData.basic,
+        primaryType: "Mail",
+        address: "0x3FCf42e10CC70Fe75A62EB3aDD6D305Aa840d145",
+        signature: "0xdead",
+        chain: mainnet,
+        client: TEST_CLIENT,
+      }),
+    ).toBe(false);
+  });
+
+  test("non-existent account", async () => {
+    expect(
+      await verifyTypedData({
+        ...typedData.basic,
+        primaryType: "Mail",
+        address: "0xdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef",
+        signature:
+          "0x79d756d805073dc97b7bc885b0d56ddf319a2599530fe1e178c2a7de5be88980068d24f20a79b318ea0a84d33ae06f93db77e4235e5d9eeb8b1d7a63922ada3e1c",
+        chain: mainnet,
+        client: TEST_CLIENT,
+      }),
+    ).toBe(false);
+  });
+});

package/src/auth/verify-typed-data.ts

@@ -0,0 +1,110 @@
+import type { Signature, TypedData, TypedDataDefinition } from "viem";
+import { hashTypedData } from "viem";
+import type { Chain } from "../chains/types.js";
+import type { ThirdwebClient } from "../client/client.js";
+import type { Hex } from "../utils/encoding/hex.js";
+import type { HashTypedDataParams } from "../utils/hashing/hashTypedData.js";
+import { type VerifyHashParams, verifyHash } from "./verify-hash.js";
+
+export type VerifyTypedDataParams<
+  typedData extends TypedData | Record<string, unknown> = TypedData,
+  primaryType extends keyof typedData | "EIP712Domain" = keyof typedData,
+> = Omit<VerifyHashParams, "hash"> &
+  TypedDataDefinition<typedData, primaryType> & {
+    address: string;
+    signature: string | Uint8Array | Signature;
+    client: ThirdwebClient;
+    chain: Chain;
+    accountFactory?: {
+      address: string;
+      verificationCalldata: Hex;
+    };
+  };
+
+/**
+ * @description Verify am [EIP-712](https://eips.ethereum.org/EIPS/eip-712) typed data signature. This function is interoperable with all wallet types (smart accounts or EOAs).
+ *
+ * @param {string} options.address The address that signed the typed data
+ * @param {string | Uint8Array | Signature} options.signature The signature that was signed
+ * @param {ThirdwebClient} options.client The Thirdweb client
+ * @param {Chain} options.chain The chain that the address is on. For an EOA, this can be any chain.
+ * @param {string} [options.accountFactory.address] The address of the account factory that created the account if using a smart account with a custom account factory
+ * @param {Hex} [options.accountFactory.verificationCalldata] The calldata that was used to create the account if using a smart account with a custom account factory
+ * @param {typeof VerifyTypedDataParams.message} options.message The EIP-712 message that was signed.
+ * @param {typeof VerifyTypedDataParams.domain} options.domain The EIP-712 domain that was signed.
+ * @param {typeof VerifyTypedDataParams.primaryType} options.primaryType The EIP-712 primary type that was signed.
+ * @param {typeof VerifyTypedDataParams.types} options.types The EIP-712 types that were signed.
+ *
+ * @returns {Promise<boolean>} A promise that resolves to `true` if the signature is valid, or `false` otherwise.
+ * 
+ * @example
+ * ```ts
+ * import { verifyTypedData } from "thirdweb/utils";
+ * const isValid = await verifyTypedData({
+ *   address: "0x...",
+ *   signature: "0x...",
+ *   client,
+ *   chain,
+ *   domain: {
+      name: "Ether Mail",
+      version: "1",
+      chainId: 1,
+      verifyingContract: "0x0000000000000000000000000000000000000000",
+    },
+ *   primaryType: "Mail",
+ *   types: {
+      Person: [
+        { name: "name", type: "string" },
+        { name: "wallet", type: "address" },
+      ],
+      Mail: [
+        { name: "from", type: "Person" },
+        { name: "to", type: "Person" },
+        { name: "contents", type: "string" },
+      ],
+    },
+    message: {
+      from: {
+        name: "Cow",
+        wallet: "0xCD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826",
+      },
+      to: {
+        name: "Bob",
+        wallet: "0xbBbBBBBbbBBBbbbBbbBbbbbBBbBbbbbBbBbbBBbB",
+      },
+      contents: "Hello, Bob!",
+    },
+ * });
+ * ```
+ *
+ * @auth
+ */
+export async function verifyTypedData<
+  typedData extends TypedData | Record<string, unknown>,
+  primaryType extends keyof typedData | "EIP712Domain",
+>({
+  address,
+  signature,
+  client,
+  chain,
+  accountFactory,
+  message,
+  domain,
+  primaryType,
+  types,
+}: VerifyTypedDataParams<typedData, primaryType>): Promise<boolean> {
+  const messageHash = hashTypedData({
+    message,
+    domain,
+    primaryType,
+    types,
+  } as HashTypedDataParams);
+  return verifyHash({
+    hash: messageHash,
+    signature,
+    address,
+    chain,
+    client,
+    accountFactory,
+  });
+}

package/src/chains/chain-definitions/blast.ts

@@ -0,0 +1,14 @@
+import { defineChain } from "../utils.js";
+
+export const blast = /* @__PURE__ */ defineChain({
+  id: 81457,
+  name: "Blast",
+  nativeCurrency: { name: "Ether", symbol: "ETH", decimals: 18 },
+  blockExplorers: [
+    {
+      name: "Blastscan",
+      url: "https://blastscan.io",
+      apiUrl: "https://api.blastscan.io/api",
+    },
+  ],
+});

package/src/exports/chains.ts

@@ -21,6 +21,7 @@ export { baseSepolia } from "../chains/chain-definitions/base-sepolia.js";
 export { base } from "../chains/chain-definitions/base.js";
 // mainnet = alias for ethereum
 export { ethereum, mainnet } from "../chains/chain-definitions/ethereum.js";
+export { blast } from "../chains/chain-definitions/blast.js";
 export { optimismSepolia } from "../chains/chain-definitions/optimism-sepolia.js";
 export { optimism } from "../chains/chain-definitions/optimism.js";
 export { lineaSepolia } from "../chains/chain-definitions/linea-sepolia.js";

package/src/exports/extensions/erc20.ts

@@ -33,6 +33,10 @@ export {
   transferFrom,
   type TransferFromParams,
 } from "../../extensions/erc20/write/transferFrom.js";
+export {
+  transferBatch,
+  type TransferBatchParams,
+} from "../../extensions/erc20/write/transferBatch.js";
 export {
   approve,
   type ApproveParams,

package/src/exports/utils.ts

@@ -149,3 +149,11 @@ export { stringify } from "../utils/json.js";
 // values
 // ------------------------------------------------
 export { maxUint256 } from "viem";
+
+// ------------------------------------------------
+// jwt
+// ------------------------------------------------
+export { decodeJWT } from "../utils/jwt/decode-jwt.js";
+export { encodeJWT, type JWTPayloadInput } from "../utils/jwt/encode-jwt.js";
+export { refreshJWT, type RefreshJWTParams } from "../utils/jwt/refresh-jwt.js";
+export type { JWTPayload } from "../utils/jwt/types.js";

package/src/exports/wallets/smart.ts

@@ -1,6 +1,19 @@
 export { smartWallet } from "../../wallets/smart/smart-wallet.js";
 
-export { waitForUserOpReceipt } from "../../wallets/smart/lib/userop.js";
+export {
+  waitForUserOpReceipt,
+  createUnsignedUserOp,
+  signUserOp,
+} from "../../wallets/smart/lib/userop.js";
+
+export {
+  getUserOpReceipt,
+  bundleUserOp,
+  getUserOpGasFees,
+  estimateUserOpGas,
+} from "../../wallets/smart/lib/bundler.js";
+
+export { predictAddress } from "../../wallets/smart/lib/calls.js";
 
 export type {
   SmartWalletConnectionOptions,