refactor: tighten auth typed data workflow

Author: cesarenaldi

packages/client/src/authentication.ts

@@ -5,7 +5,7 @@ import type { TypedDataPayload } from './types';
 export type AuthenticationWorkflowRequest =
   | { kind: 'requestAddress' }
   | {
-      kind: 'signTypedData';
+      kind: 'signAuthMessage';
       payload: TypedDataPayload;
     };
 

packages/client/src/clients.ts

@@ -53,7 +53,7 @@ export class PublicClient {
         const timestamp = Math.floor(Date.now() / 1000);
         const address = expectEvmAddress(yield { kind: 'requestAddress' });
         const signature = yield {
-          kind: 'signTypedData',
+          kind: 'signAuthMessage',
           payload: createL2AuthTypedDataPayload({
             address,
             chainId: this.environment.chainId,

packages/client/src/types.ts

@@ -1,3 +1,5 @@
+import type { EvmAddress, HexString } from '@polymarket/types';
+
 export type TypedDataField = {
   name: string;
   type: string;
@@ -8,8 +10,8 @@ export type TypedData = Record<string, readonly TypedDataField[]>;
 export type TypedDataDomain = {
   chainId?: number;
   name?: string;
-  salt?: `0x${string}`;
-  verifyingContract?: string;
+  salt?: HexString;
+  verifyingContract?: EvmAddress;
   version?: string;
 };
 
@@ -19,8 +21,3 @@ export type TypedDataPayload = {
   primaryType: string;
   types: TypedData;
 };
-
-export type TypedDataSigner = {
-  getAddress(): Promise<string>;
-  signTypedData(payload: TypedDataPayload): Promise<string>;
-};

packages/client/src/viem/index.ts

@@ -1,22 +1,29 @@
-import { expectEvmAddress, expectSignature } from '@polymarket/types';
-import type { Account, WalletClient } from 'viem';
+import {
+  expectEvmAddress,
+  expectSignature,
+  invariant,
+} from '@polymarket/types';
+import type { Account, Chain, Transport, WalletClient } from 'viem';
 import type { AuthenticationWorkflow } from '../authentication';
 import type { SecureClient } from '../clients';
 
-function getAccount(walletClient: WalletClient): Account | `0x${string}` {
-  const account = walletClient.account;
-
-  if (account) {
-    return account;
-  }
-
-  throw new Error('Expected a WalletClient with a hoisted account.');
+function isWalletClientWithAccount(
+  walletClient: WalletClient,
+): walletClient is WalletClient<Transport, Chain, Account> {
+  return walletClient.account !== undefined;
 }
 
 export function authenticateWith(walletClient: WalletClient) {
-  const account = getAccount(walletClient);
+  invariant(
+    isWalletClientWithAccount(walletClient),
+    'Wallet client with account is required',
+  );
+
+  const account = walletClient.account;
   const address = expectEvmAddress(
-    typeof account === 'string' ? account : account.address,
+    typeof walletClient.account === 'string'
+      ? walletClient.account
+      : walletClient.account.address,
   );
 
   return async function authenticate(
@@ -30,15 +37,12 @@ export function authenticateWith(walletClient: WalletClient) {
           case 'requestAddress':
             result = await workflow.next(address);
             break;
-          case 'signTypedData':
+          case 'signAuthMessage':
             result = await workflow.next(
               expectSignature(
                 await walletClient.signTypedData({
                   account,
-                  ...(result.value.payload as Omit<
-                    Parameters<WalletClient['signTypedData']>[0],
-                    'account'
-                  >),
+                  ...result.value.payload,
                 }),
               ),
             );