@zerodev/wallet-core 0.0.1-alpha.13 → 0.0.1-alpha.15

package/src/adapters/viem.ts

@@ -1,14 +1,18 @@
 import {
+  bytesToHex,
+  concat,
+  getTypesForEIP712Domain,
   type Hex,
-  hashMessage,
+  hashTypedData,
   type LocalAccount,
+  numberToHex,
   parseSignature,
-  parseTransaction,
   type SerializeTransactionFn,
   type SignableMessage,
   serializeTransaction,
   serializeTypedData,
   type TransactionSerializable,
+  toRlp,
   zeroAddress,
 } from 'viem'
 import type {
@@ -17,7 +21,6 @@ import type {
 } from 'viem/accounts'
 import { toAccount } from 'viem/accounts'
 import { hashAuthorization } from 'viem/utils'
-import type { signRawPayload } from '../actions/index.js'
 import type { ZeroDevWalletClient } from '../client/index.js'
 
 export interface ToViemAccountParams {
@@ -44,21 +47,6 @@ export async function toViemAccount(
   } catch {
     address = zeroAddress
   }
-  const signRawPayloadInternal = async (
-    payload: string,
-    encoding: Parameters<
-      typeof signRawPayload
-    >[1]['encoding'] = 'PAYLOAD_ENCODING_HEXADECIMAL',
-  ) => {
-    return await client.signRawPayload({
-      organizationId,
-      projectId,
-      token: await getToken(),
-      address,
-      payload,
-      encoding,
-    })
-  }
 
   // Modified from: https://github.com/tkhq/sdk/blob/4e439bf2973ea13b51d981d7c24a4841d4e5fd5f/packages/viem/src/index.ts#L419-L461
   const signTransactionInternal = async <
@@ -84,27 +72,37 @@ export async function toViemAccount(
       unsignedTransaction: nonHexPrefixedSerializedTx,
     })
 
-    if (transaction.type === 'eip4844') {
-      // Grab components of the signature
-      const { r, s, v } = parseTransaction(signature)
-
-      // Recombine with the original transaction
-      return serializeTransaction(transaction, {
-        r: r!,
-        s: s!,
-        v: v!,
-      })
-    }
-
-    return signature
+    const { r, s, v, yParity } = parseSignature(signature)
+    return serializeTransaction(transaction, { r, s, v, yParity })
   }
 
   return toAccount({
     address,
 
     async signMessage({ message }: { message: SignableMessage }): Promise<Hex> {
-      const hashedMessage = hashMessage(message)
-      return signRawPayloadInternal(hashedMessage)
+      if (typeof message === 'string') {
+        return client.signMessage({
+          organizationId,
+          projectId,
+          token: await getToken(),
+          address,
+          message,
+          encoding: 'utf8',
+        })
+      }
+      // Raw message (Hex or ByteArray)
+      const raw =
+        typeof message.raw === 'string'
+          ? message.raw.replace(/^0x/, '')
+          : bytesToHex(message.raw).slice(2)
+      return client.signMessage({
+        organizationId,
+        projectId,
+        token: await getToken(),
+        address,
+        message: raw,
+        encoding: 'hex',
+      })
     },
 
     signTransaction: async <
@@ -123,11 +121,28 @@ export async function toViemAccount(
       return signTransactionInternal(transaction, serializer)
     },
     signTypedData: async (typedData) => {
-      const serializedTypedData = serializeTypedData(typedData)
-      return signRawPayloadInternal(
-        serializedTypedData,
-        'PAYLOAD_ENCODING_EIP712',
-      )
+      const serializedTypedData = serializeTypedData({
+        ...typedData,
+        types: {
+          ...typedData.types,
+          EIP712Domain: getTypesForEIP712Domain({
+            domain: typedData.domain as Parameters<
+              typeof getTypesForEIP712Domain
+            >[0]['domain'],
+          }),
+        },
+      } as Parameters<typeof serializeTypedData>[0])
+      return client.signTypedDataV4({
+        organizationId,
+        projectId,
+        token: await getToken(),
+        address,
+        unsignedTypedDataV4: serializedTypedData,
+        encoding: 'utf8',
+        typedDataHash: hashTypedData(
+          typedData as Parameters<typeof hashTypedData>[0],
+        ).slice(2),
+      })
     },
 
     async signAuthorization(
@@ -146,7 +161,24 @@ export async function toViemAccount(
         nonce,
       })
 
-      const signature = await signRawPayloadInternal(hashedAuthorization)
+      // Serialize EIP-7702 authorization: 0x05 || RLP([chainId, address, nonce])
+      const unsignedTransaction = concat([
+        '0x05',
+        toRlp([
+          chainId ? numberToHex(chainId) : '0x',
+          authAddress,
+          nonce ? numberToHex(nonce) : '0x',
+        ]),
+      ]).slice(2)
+
+      const signature = await client.sign7702Authorization({
+        organizationId,
+        projectId,
+        token: await getToken(),
+        address,
+        unsignedTransaction,
+        hashedAuthorization: hashedAuthorization.slice(2),
+      })
 
       const parsedSignature = parseSignature(signature)
 

package/src/client/decorators/client.ts

@@ -30,15 +30,22 @@ import {
   type RegisterWithPasskeyReturnType,
   registerWithOTP,
   registerWithPasskey,
-  type SignRawPayloadParameters,
-  type SignRawPayloadReturnType,
-  signRawPayload,
-} from '../../actions/index.js'
-import {
+  type Sign7702AuthorizationParameters,
+  type Sign7702AuthorizationReturnType,
+  type SignMessageParameters,
+  type SignMessageReturnType,
   type SignTransactionParameters,
   type SignTransactionReturnType,
+  type SignTypedDataV4Parameters,
+  type SignTypedDataV4ReturnType,
+  type SignUserOperationParameters,
+  type SignUserOperationReturnType,
+  sign7702Authorization,
+  signMessage,
   signTransaction,
-} from '../../actions/wallet/signTransaction.js'
+  signTypedDataV4,
+  signUserOperation,
+} from '../../actions/index.js'
 import type { Client } from '../types.js'
 
 /**
@@ -81,11 +88,9 @@ export type ZeroDevWalletActions = {
   ) => Promise<GetUserWalletReturnType>
 
   /**
-   * Signs a raw payload with the user's wallet
+   * Signs a message with the user's wallet
    */
-  signRawPayload: (
-    params: SignRawPayloadParameters,
-  ) => Promise<SignRawPayloadReturnType>
+  signMessage: (params: SignMessageParameters) => Promise<SignMessageReturnType>
 
   /**
    * Signs a transaction with the user's wallet
@@ -94,6 +99,27 @@ export type ZeroDevWalletActions = {
     params: SignTransactionParameters,
   ) => Promise<SignTransactionReturnType>
 
+  /**
+   * Signs EIP-712 typed data with the user's wallet
+   */
+  signTypedDataV4: (
+    params: SignTypedDataV4Parameters,
+  ) => Promise<SignTypedDataV4ReturnType>
+
+  /**
+   * Signs a user operation with the user's wallet
+   */
+  signUserOperation: (
+    params: SignUserOperationParameters,
+  ) => Promise<SignUserOperationReturnType>
+
+  /**
+   * Signs an EIP-7702 authorization with the user's wallet
+   */
+  sign7702Authorization: (
+    params: Sign7702AuthorizationParameters,
+  ) => Promise<Sign7702AuthorizationReturnType>
+
   /**
    * Registers a passkey with the user's wallet
    */
@@ -160,8 +186,11 @@ export function zeroDevWalletActions(client: Client): ZeroDevWalletActions {
 
     // Wallet actions
     getUserWallet: (params) => getUserWallet(client, params),
-    signRawPayload: (params) => signRawPayload(client, params),
+    signMessage: (params) => signMessage(client, params),
     signTransaction: (params) => signTransaction(client, params),
+    signTypedDataV4: (params) => signTypedDataV4(client, params),
+    signUserOperation: (params) => signUserOperation(client, params),
+    sign7702Authorization: (params) => sign7702Authorization(client, params),
     registerWithPasskey: (params) => registerWithPasskey(client, params),
     loginWithStamp: (params) => loginWithStamp(client, params),
     registerWithOTP: (params) => registerWithOTP(client, params),

package/src/core/createZeroDevWallet.ts

@@ -50,6 +50,7 @@ export type AuthParams =
   | {
       type: 'oauth'
       provider: string
+      sessionId: string
     }
   | {
       type: 'passkey'
@@ -219,11 +220,10 @@ export async function createZeroDevWallet(
     async auth(params: AuthParams) {
       switch (params.type) {
         case 'oauth': {
-          // Backend OAuth flow - the backend reads the OAuth session from a cookie
-          // set during the OAuth popup flow via /oauth/google/login
           const data = await client.authenticateWithOAuth({
             provider: params.provider,
             projectId,
+            sessionId: params.sessionId,
           })
 
           if (data.session) {

package/src/index.ts

@@ -15,10 +15,16 @@ export type {
   OtpContact,
   RegisterWithOTPParameters,
   RegisterWithOTPReturnType,
-  SignRawPayloadParameters,
-  SignRawPayloadReturnType,
+  Sign7702AuthorizationParameters,
+  Sign7702AuthorizationReturnType,
+  SignMessageParameters,
+  SignMessageReturnType,
   SignTransactionParameters,
   SignTransactionReturnType,
+  SignTypedDataV4Parameters,
+  SignTypedDataV4ReturnType,
+  SignUserOperationParameters,
+  SignUserOperationReturnType,
 } from './actions/index.js'
 
 // Actions
@@ -31,8 +37,11 @@ export {
   getWhoami,
   loginWithOTP,
   registerWithOTP,
-  signRawPayload,
+  sign7702Authorization,
+  signMessage,
   signTransaction,
+  signTypedDataV4,
+  signUserOperation,
 } from './actions/index.js'
 export type { ToViemAccountParams } from './adapters/viem.js'
 // Adapters

package/dist/_cjs/actions/wallet/signRawPayload.js

@@ -1,27 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.signRawPayload = signRawPayload;
-async function signRawPayload(client, params) {
-    const { organizationId, projectId, token, address, payload, encoding = 'PAYLOAD_ENCODING_HEXADECIMAL', hashFunction = 'HASH_FUNCTION_NO_OP', } = params;
-    const { signature } = await client.request({
-        path: `${projectId}/sign/raw-payload`,
-        body: {
-            type: 'ACTIVITY_TYPE_SIGN_RAW_PAYLOAD_V2',
-            timestampMs: Date.now().toString(),
-            organizationId,
-            parameters: {
-                signWith: address,
-                payload,
-                encoding,
-                hashFunction,
-            },
-        },
-        headers: {
-            Authorization: `Bearer ${token}`,
-        },
-        stamp: true,
-        stampPostion: 'headers',
-    });
-    return signature;
-}
-//# sourceMappingURL=signRawPayload.js.map

package/dist/_cjs/actions/wallet/signRawPayload.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"signRawPayload.js","sourceRoot":"","sources":["../../../../src/actions/wallet/signRawPayload.ts"],"names":[],"mappings":";;AAwCA,wCAkCC;AAlCM,KAAK,UAAU,cAAc,CAClC,MAAc,EACd,MAAgC;IAEhC,MAAM,EACJ,cAAc,EACd,SAAS,EACT,KAAK,EACL,OAAO,EACP,OAAO,EACP,QAAQ,GAAG,8BAA8B,EACzC,YAAY,GAAG,qBAAqB,GACrC,GAAG,MAAM,CAAA;IAEV,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;QACzC,IAAI,EAAE,GAAG,SAAS,mBAAmB;QACrC,IAAI,EAAE;YACJ,IAAI,EAAE,mCAAmC;YACzC,WAAW,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE;YAClC,cAAc;YACd,UAAU,EAAE;gBACV,QAAQ,EAAE,OAAO;gBACjB,OAAO;gBACP,QAAQ;gBACR,YAAY;aACb;SACF;QACD,OAAO,EAAE;YACP,aAAa,EAAE,UAAU,KAAK,EAAE;SACjC;QACD,KAAK,EAAE,IAAI;QACX,YAAY,EAAE,SAAS;KACxB,CAAC,CAAA;IACF,OAAO,SAAgB,CAAA;AACzB,CAAC"}

package/dist/_esm/actions/wallet/signRawPayload.js

@@ -1,42 +0,0 @@
-/**
- * Signs a raw payload with the user's wallet
- *
- * @param client - The ZeroDev Wallet client
- * @param params - The parameters for signing
- * @returns The signature
- *
- * @example
- * ```ts
- * const result = await signRawPayload(client, {
- *   organizationId: 'org_123',
- *   projectId: 'proj_456',
- *   address: '0x123...',
- *   payload: 'abc123...',
- * });
- * console.log(result.signature); // '0x...'
- * ```
- */
-export async function signRawPayload(client, params) {
-    const { organizationId, projectId, token, address, payload, encoding = 'PAYLOAD_ENCODING_HEXADECIMAL', hashFunction = 'HASH_FUNCTION_NO_OP', } = params;
-    const { signature } = await client.request({
-        path: `${projectId}/sign/raw-payload`,
-        body: {
-            type: 'ACTIVITY_TYPE_SIGN_RAW_PAYLOAD_V2',
-            timestampMs: Date.now().toString(),
-            organizationId,
-            parameters: {
-                signWith: address,
-                payload,
-                encoding,
-                hashFunction,
-            },
-        },
-        headers: {
-            Authorization: `Bearer ${token}`,
-        },
-        stamp: true,
-        stampPostion: 'headers',
-    });
-    return signature;
-}
-//# sourceMappingURL=signRawPayload.js.map

package/dist/_esm/actions/wallet/signRawPayload.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"signRawPayload.js","sourceRoot":"","sources":["../../../../src/actions/wallet/signRawPayload.ts"],"names":[],"mappings":"AAsBA;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,MAAc,EACd,MAAgC;IAEhC,MAAM,EACJ,cAAc,EACd,SAAS,EACT,KAAK,EACL,OAAO,EACP,OAAO,EACP,QAAQ,GAAG,8BAA8B,EACzC,YAAY,GAAG,qBAAqB,GACrC,GAAG,MAAM,CAAA;IAEV,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;QACzC,IAAI,EAAE,GAAG,SAAS,mBAAmB;QACrC,IAAI,EAAE;YACJ,IAAI,EAAE,mCAAmC;YACzC,WAAW,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE;YAClC,cAAc;YACd,UAAU,EAAE;gBACV,QAAQ,EAAE,OAAO;gBACjB,OAAO;gBACP,QAAQ;gBACR,YAAY;aACb;SACF;QACD,OAAO,EAAE;YACP,aAAa,EAAE,UAAU,KAAK,EAAE;SACjC;QACD,KAAK,EAAE,IAAI;QACX,YAAY,EAAE,SAAS;KACxB,CAAC,CAAA;IACF,OAAO,SAAgB,CAAA;AACzB,CAAC"}

package/dist/_types/actions/wallet/signRawPayload.d.ts

@@ -1,39 +0,0 @@
-import type { Hex } from 'viem';
-import type { Client } from '../../client/types.js';
-export type SignRawPayloadParameters = {
-    /** The organization ID */
-    organizationId: string;
-    /** The project ID for the request */
-    projectId: string;
-    /** The session token for authorization */
-    token: string;
-    /** The address to sign with */
-    address: Hex;
-    /** The payload hash to sign (without 0x prefix) */
-    payload: string;
-    /** The encoding type */
-    encoding?: 'PAYLOAD_ENCODING_HEXADECIMAL' | 'PAYLOAD_ENCODING_EIP712';
-    /** The hash function type */
-    hashFunction?: 'HASH_FUNCTION_NO_OP';
-};
-export type SignRawPayloadReturnType = Hex;
-/**
- * Signs a raw payload with the user's wallet
- *
- * @param client - The ZeroDev Wallet client
- * @param params - The parameters for signing
- * @returns The signature
- *
- * @example
- * ```ts
- * const result = await signRawPayload(client, {
- *   organizationId: 'org_123',
- *   projectId: 'proj_456',
- *   address: '0x123...',
- *   payload: 'abc123...',
- * });
- * console.log(result.signature); // '0x...'
- * ```
- */
-export declare function signRawPayload(client: Client, params: SignRawPayloadParameters): Promise<SignRawPayloadReturnType>;
-//# sourceMappingURL=signRawPayload.d.ts.map

package/dist/_types/actions/wallet/signRawPayload.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"signRawPayload.d.ts","sourceRoot":"","sources":["../../../../src/actions/wallet/signRawPayload.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,MAAM,CAAA;AAC/B,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAA;AAEnD,MAAM,MAAM,wBAAwB,GAAG;IACrC,0BAA0B;IAC1B,cAAc,EAAE,MAAM,CAAA;IACtB,qCAAqC;IACrC,SAAS,EAAE,MAAM,CAAA;IACjB,0CAA0C;IAC1C,KAAK,EAAE,MAAM,CAAA;IACb,+BAA+B;IAC/B,OAAO,EAAE,GAAG,CAAA;IACZ,mDAAmD;IACnD,OAAO,EAAE,MAAM,CAAA;IACf,wBAAwB;IACxB,QAAQ,CAAC,EAAE,8BAA8B,GAAG,yBAAyB,CAAA;IACrE,6BAA6B;IAC7B,YAAY,CAAC,EAAE,qBAAqB,CAAA;CACrC,CAAA;AAED,MAAM,MAAM,wBAAwB,GAAG,GAAG,CAAA;AAE1C;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAsB,cAAc,CAClC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,wBAAwB,GAC/B,OAAO,CAAC,wBAAwB,CAAC,CA+BnC"}

package/src/actions/wallet/signRawPayload.ts

@@ -1,75 +0,0 @@
-import type { Hex } from 'viem'
-import type { Client } from '../../client/types.js'
-
-export type SignRawPayloadParameters = {
-  /** The organization ID */
-  organizationId: string
-  /** The project ID for the request */
-  projectId: string
-  /** The session token for authorization */
-  token: string
-  /** The address to sign with */
-  address: Hex
-  /** The payload hash to sign (without 0x prefix) */
-  payload: string
-  /** The encoding type */
-  encoding?: 'PAYLOAD_ENCODING_HEXADECIMAL' | 'PAYLOAD_ENCODING_EIP712'
-  /** The hash function type */
-  hashFunction?: 'HASH_FUNCTION_NO_OP'
-}
-
-export type SignRawPayloadReturnType = Hex
-
-/**
- * Signs a raw payload with the user's wallet
- *
- * @param client - The ZeroDev Wallet client
- * @param params - The parameters for signing
- * @returns The signature
- *
- * @example
- * ```ts
- * const result = await signRawPayload(client, {
- *   organizationId: 'org_123',
- *   projectId: 'proj_456',
- *   address: '0x123...',
- *   payload: 'abc123...',
- * });
- * console.log(result.signature); // '0x...'
- * ```
- */
-export async function signRawPayload(
-  client: Client,
-  params: SignRawPayloadParameters,
-): Promise<SignRawPayloadReturnType> {
-  const {
-    organizationId,
-    projectId,
-    token,
-    address,
-    payload,
-    encoding = 'PAYLOAD_ENCODING_HEXADECIMAL',
-    hashFunction = 'HASH_FUNCTION_NO_OP',
-  } = params
-
-  const { signature } = await client.request({
-    path: `${projectId}/sign/raw-payload`,
-    body: {
-      type: 'ACTIVITY_TYPE_SIGN_RAW_PAYLOAD_V2',
-      timestampMs: Date.now().toString(),
-      organizationId,
-      parameters: {
-        signWith: address,
-        payload,
-        encoding,
-        hashFunction,
-      },
-    },
-    headers: {
-      Authorization: `Bearer ${token}`,
-    },
-    stamp: true,
-    stampPostion: 'headers',
-  })
-  return signature as Hex
-}