fix typed data types

Author: gregfromstl

packages/thirdweb/package.json

@@ -181,7 +181,6 @@
     "fuse.js": "7.0.0",
     "input-otp": "^1.4.1",
     "mipd": "0.0.7",
-    "ox": "0.4.0",
     "uqr": "0.1.2",
     "viem": "2.21.54"
   },
@@ -200,7 +199,8 @@
     "react-native-passkey": "^3",
     "react-native-quick-crypto": ">=0.7.0-rc.6 || >=0.7",
     "react-native-svg": "^15",
-    "typescript": ">=5.0.4"
+    "typescript": ">=5.0.4",
+    "ox": "0.4.0"
   },
   "peerDependenciesMeta": {
     "react": {

packages/thirdweb/src/utils/hashing/hashMessage.ts

@@ -1,13 +1,14 @@
-import { type ByteArray, type SignableMessage, concat } from "viem";
+import { Bytes as ox__Bytes } from "ox";
 import type { Hex } from "../encoding/hex.js";
 import { stringToBytes, toBytes } from "../encoding/to-bytes.js";
+import type { SignableMessage } from "../types.js";
 import { keccak256 } from "./keccak256.js";
 
 const presignMessagePrefix = "\x19Ethereum Signed Message:\n";
 type To = "hex" | "bytes";
 
 type HashMessage<TTo extends To> =
-  | (TTo extends "bytes" ? ByteArray : never)
+  | (TTo extends "bytes" ? ox__Bytes.Bytes : never)
   | (TTo extends "hex" ? Hex : never);
 
 /**
@@ -38,5 +39,5 @@ export function hashMessage<TTo extends To = "hex">(
   const prefixBytes = stringToBytes(
     `${presignMessagePrefix}${messageBytes.length}`,
   );
-  return keccak256(concat([prefixBytes, messageBytes]), to_);
+  return keccak256(ox__Bytes.concat(prefixBytes, messageBytes), to_);
 }

packages/thirdweb/src/utils/hashing/hashTypedData.ts

@@ -1,12 +1,6 @@
-import {
-  type AbiParameter,
-  type TypedData,
-  type TypedDataDefinition,
-  concat,
-  getTypesForEIP712Domain,
-  hashDomain,
-  validateTypedData,
-} from "viem";
+import type * as ox__AbiParameters from "ox/AbiParameters";
+import * as ox__Bytes from "ox/Bytes";
+import * as ox__TypedData from "ox/TypedData";
 import { encodeAbiParameters } from "../abi/encodeAbiParameters.js";
 import { type Hex, toHex } from "../encoding/hex.js";
 import { keccak256 } from "./keccak256.js";
@@ -17,15 +11,17 @@ type MessageTypeProperty = {
 };
 
 export type HashTypedDataParams<
-  typedData extends TypedData | Record<string, unknown> = TypedData,
+  typedData extends
+    | ox__TypedData.TypedData
+    | Record<string, unknown> = ox__TypedData.TypedData,
   primaryType extends keyof typedData | "EIP712Domain" = keyof typedData,
-> = TypedDataDefinition<typedData, primaryType>;
+> = ox__TypedData.Definition<typedData, primaryType>;
 
 /**
  * @internal
  */
 export function hashTypedData<
-  const typedData extends TypedData | Record<string, unknown>,
+  const typedData extends ox__TypedData.TypedData | Record<string, unknown>,
   primaryType extends keyof typedData | "EIP712Domain",
 >(parameters: HashTypedDataParams<typedData, primaryType>): Hex {
   const {
@@ -34,13 +30,13 @@ export function hashTypedData<
     primaryType,
   } = parameters as HashTypedDataParams;
   const types = {
-    EIP712Domain: getTypesForEIP712Domain({ domain }),
+    EIP712Domain: ox__TypedData.extractEip712DomainTypes(domain),
     ...parameters.types,
   };
 
   // Need to do a runtime validation check on addresses, byte ranges, integer ranges, etc
   // as we can't statically check this with TypeScript.
-  validateTypedData({
+  ox__TypedData.validate({
     domain,
     message,
     primaryType,
@@ -50,7 +46,7 @@ export function hashTypedData<
   const parts: Hex[] = ["0x1901"];
   if (domain)
     parts.push(
-      hashDomain({
+      ox__TypedData.hashDomain({
         domain,
         types: types as Record<string, MessageTypeProperty[]>,
       }),
@@ -69,7 +65,7 @@ export function hashTypedData<
     parts.push(hashedStruct);
   }
 
-  return keccak256(concat(parts));
+  return keccak256(ox__Bytes.concat(...parts.map((p) => ox__Bytes.fromHex(p))));
 }
 
 function encodeData({
@@ -81,7 +77,7 @@ function encodeData({
   primaryType: string;
   types: Record<string, MessageTypeProperty[]>;
 }) {
-  const encodedTypes: AbiParameter[] = [{ type: "bytes32" }];
+  const encodedTypes: ox__AbiParameters.Parameter[] = [{ type: "bytes32" }];
   const encodedValues: unknown[] = [hashType({ primaryType, types })];
 
   if (!types[primaryType]) throw new Error("Invalid types");
@@ -168,7 +164,7 @@ function encodeField({
   // biome-ignore lint/suspicious/noExplicitAny: Can't anticipate types of nested values
   value: any;
   // biome-ignore lint/suspicious/noExplicitAny: Can't anticipate types of nested values
-}): [type: AbiParameter, value: any] {
+}): [type: ox__AbiParameters.Parameter, value: any] {
   if (types[type] !== undefined) {
     return [
       { type: "bytes32" },
@@ -186,15 +182,16 @@ function encodeField({
 
   if (type.lastIndexOf("]") === type.length - 1) {
     const parsedType = type.slice(0, type.lastIndexOf("["));
-    // biome-ignore lint/suspicious/noExplicitAny: Can't anticipate types of nested values
-    const typeValuePairs = (value as [AbiParameter, any][]).map((item) =>
-      encodeField({
-        name,
-        type: parsedType,
-        types,
-        value: item,
-      }),
-    );
+    const typeValuePairs =
+      // biome-ignore lint/suspicious/noExplicitAny: Can't anticipate types of nested values
+      (value as [ox__AbiParameters.Parameter, any][]).map((item) =>
+        encodeField({
+          name,
+          type: parsedType,
+          types,
+          value: item,
+        }),
+      );
     return [
       { type: "bytes32" },
       keccak256(

packages/thirdweb/src/utils/types.ts

@@ -1,3 +1,5 @@
+import type * as ox__Bytes from "ox/Bytes";
+import type * as ox__Hex from "ox/Hex";
 import type { Chain } from "../chains/types.js";
 import type { ThirdwebClient } from "../client/client.js";
 import type { Account } from "../wallets/interfaces/wallet.js";
@@ -17,3 +19,18 @@ export type ClientAndChain = {
 export type ClientAndChainAndAccount = Prettify<
   ClientAndChain & { account: Account }
 >;
+
+/**
+ * A message that can be signed, either as in plaintext or as a raw hex string.
+ */
+export type SignableMessage =
+  | string
+  | {
+      /** Raw data representation of the message. */
+      raw: ox__Hex.Hex | ox__Bytes.Bytes;
+    };
+
+/**
+ * @internal
+ */
+export const maxUint96 = 2n ** 96n - 1n;

packages/thirdweb/src/wallets/smart/index.ts

@@ -1,5 +1,4 @@
-import * as ox__TypedData from "ox/TypedData";
-import { type SignableMessage, maxUint96 } from "viem";
+import type * as ox__TypedData from "ox/TypedData";
 import type { Chain } from "../../chains/types.js";
 import { getCachedChain } from "../../chains/utils.js";
 import type { ThirdwebClient } from "../../client/client.js";
@@ -18,6 +17,7 @@ import { getAddress } from "../../utils/address.js";
 import { isZkSyncChain } from "../../utils/any-evm/zksync/isZkSyncChain.js";
 import type { Hex } from "../../utils/encoding/hex.js";
 import { parseTypedData } from "../../utils/signatures/helpers/parse-typed-data.js";
+import { type SignableMessage, maxUint96 } from "../../utils/types.js";
 import type {
   Account,
   SendTransactionOption,
@@ -288,7 +288,7 @@ async function createSmartAccount(
     async signTypedData<
       const typedData extends ox__TypedData.TypedData | Record<string, unknown>,
       primaryType extends keyof typedData | "EIP712Domain" = keyof typedData,
-    >(typedData: TypedDataDefinition<typedData, primaryType>) {
+    >(typedData: ox__TypedData.Definition<typedData, primaryType>) {
       if (options.overrides?.signTypedData) {
         return options.overrides.signTypedData({
           adminAccount: options.personalAccount,

packages/thirdweb/src/wallets/smart/lib/signing.ts

@@ -1,10 +1,4 @@
-import type { Hex } from "ox";
-import type {
-  SignableMessage,
-  TypedData,
-  TypedDataDefinition,
-  TypedDataDomain,
-} from "viem";
+import type * as ox__TypedData from "ox/TypedData";
 import { serializeErc6492Signature } from "../../../auth/serialize-erc6492-signature.js";
 import { verifyHash } from "../../../auth/verify-hash.js";
 import {
@@ -14,8 +8,10 @@ import {
 import { encode } from "../../../transaction/actions/encode.js";
 import { readContract } from "../../../transaction/read-contract.js";
 import { encodeAbiParameters } from "../../../utils/abi/encodeAbiParameters.js";
+import type { Hex } from "../../../utils/encoding/hex.js";
 import { hashMessage } from "../../../utils/hashing/hashMessage.js";
 import { hashTypedData } from "../../../utils/hashing/hashTypedData.js";
+import type { SignableMessage } from "../../../utils/types.js";
 import type { SmartAccountOptions } from "../types.js";
 import { prepareCreateAccount } from "./calls.js";
 
@@ -93,7 +89,7 @@ export async function deployAndSignMessage({
 }
 
 export async function deployAndSignTypedData<
-  const typedData extends TypedData | Record<string, unknown>,
+  const typedData extends ox__TypedData.TypedData | Record<string, unknown>,
   primaryType extends keyof typedData | "EIP712Domain" = keyof typedData,
 >({
   accountContract,
@@ -104,10 +100,12 @@ export async function deployAndSignTypedData<
   accountContract: ThirdwebContract;
   factoryContract: ThirdwebContract;
   options: SmartAccountOptions;
-  typedData: TypedDataDefinition<typedData, primaryType>;
+  typedData: ox__TypedData.Definition<typedData, primaryType>;
 }) {
   const isSelfVerifyingContract =
-    (typedData.domain as TypedDataDomain)?.verifyingContract?.toLowerCase() ===
+    (
+      typedData.domain as ox__TypedData.Domain
+    )?.verifyingContract?.toLowerCase() ===
     accountContract.address?.toLowerCase();
 
   if (isSelfVerifyingContract) {
@@ -205,7 +203,7 @@ async function checkFor712Factory({
 }: {
   factoryContract: ThirdwebContract;
   accountContract: ThirdwebContract;
-  originalMsgHash: Hex.Hex;
+  originalMsgHash: Hex;
 }) {
   try {
     const implementationAccount = await readContract({

packages/thirdweb/src/wallets/smart/types.ts

@@ -1,12 +1,13 @@
-import type { Address, TypedData } from "abitype";
-import type { SignableMessage, TypedDataDefinition } from "viem";
+import type * as ox__Address from "ox/Address";
+import type * as ox__TypedData from "ox/TypedData";
 import type { Chain } from "../../chains/types.js";
 import type { ThirdwebClient } from "../../client/client.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 { Prettify } from "../../utils/type-utils.js";
+import type { SignableMessage } from "../../utils/types.js";
 import type { Account, SendTransactionOption } from "../interfaces/wallet.js";
 
 export type TokenPaymasterConfig = {
@@ -53,13 +54,15 @@ export type SmartWalletOptions = Prettify<
         message: SignableMessage;
       }) => Promise<Hex>;
       signTypedData?: <
-        const typedData extends TypedData | Record<string, unknown>,
+        const typedData extends
+          | ox__TypedData.TypedData
+          | Record<string, unknown>,
         primaryType extends keyof typedData | "EIP712Domain" = keyof typedData,
       >(options: {
         adminAccount: Account;
         accountContract: ThirdwebContract;
         factoryContract: ThirdwebContract;
-        typedData: TypedDataDefinition<typedData, primaryType>;
+        typedData: ox__TypedData.Definition<typedData, primaryType>;
       }) => Promise<Hex>;
     };
   } & (
@@ -101,7 +104,7 @@ export type SmartWalletConnectionOptions = {
 };
 
 export type UserOperationV06 = {
-  sender: Address;
+  sender: ox__Address.Address;
   nonce: bigint;
   initCode: Hex;
   callData: Hex;
@@ -145,7 +148,7 @@ export type PackedUserOperation = {
 };
 
 export type UserOperationV06Hexed = {
-  sender: Address;
+  sender: ox__Address.Address;
   nonce: Hex;
   initCode: Hex;
   callData: Hex;
@@ -210,18 +213,18 @@ export type GasPriceResult = {
 };
 
 export type PmTransactionData = {
-  paymaster: Address;
+  paymaster: ox__Address.Address;
   paymasterInput: Hex;
 };
 
 export type UserOperationReceipt = {
   receipt: TransactionReceipt;
   logs: TransactionReceipt["logs"];
   userOpHash: Hex;
-  entryPoint: Address;
-  sender: Address;
+  entryPoint: ox__Address.Address;
+  sender: ox__Address.Address;
   nonce: bigint;
-  paymaster: Address;
+  paymaster: ox__Address.Address;
   actualGasUsed: bigint;
   actualGasCost: bigint;
   success: boolean;