dapp-client: do not require Checksummed

attente · attente · commit 1be7cf2325df · 2025-07-31T11:58:26.000-04:00
diff --git a/packages/wallet/dapp-client/src/ChainSessionManager.ts b/packages/wallet/dapp-client/src/ChainSessionManager.ts
@@ -1,6 +1,6 @@
 import { Envelope, Relayer, Signers, State, Wallet } from '@0xsequence/wallet-core'
 import { Address, Attestation, Constants, Extensions, Payload, SessionConfig } from '@0xsequence/wallet-primitives'
-import { AbiFunction, Hex, Provider, RpcTransport, Secp256k1 } from 'ox'
+import { AbiFunction, Address as oxAddress, Hex, Provider, RpcTransport, Secp256k1 } from 'ox'
 
 import { DappTransport } from './DappTransport.js'
 
@@ -185,10 +185,10 @@ export class ChainSessionManager {
    * This is used when a wallet address is known but the session manager for this chain hasn't been instantiated yet.
    * @param walletAddress The address of the wallet to initialize with.
    */
-  public initializeWithWallet(walletAddress: Address.Checksummed) {
+  public initializeWithWallet(walletAddress: oxAddress.Address) {
     if (this.isInitialized) return
 
-    this.walletAddress = walletAddress
+    this.walletAddress = Address.checksum(walletAddress)
     this.wallet = new Wallet(this.walletAddress, {
       stateProvider: this.stateProvider,
     })
@@ -221,7 +221,7 @@ export class ChainSessionManager {
 
     const allExplicitSessions = await this.sequenceStorage.getExplicitSessions()
     const walletExplicitSessions = allExplicitSessions.filter(
-      (s) => Address.isEqual(s.walletAddress, walletAddr) && s.chainId === this.chainId,
+      (s) => oxAddress.isEqual(s.walletAddress, walletAddr) && s.chainId === this.chainId,
     )
 
     for (const sessionData of walletExplicitSessions) {
@@ -278,7 +278,7 @@ export class ChainSessionManager {
         { path: '/request/connect', redirectUrl: this.redirectUrl },
       )
 
-      const receivedAddress = connectResponse.walletAddress
+      const receivedAddress = Address.checksum(connectResponse.walletAddress)
       const { attestation, signature, email, loginMethod } = connectResponse
       if (!attestation || !signature)
         throw new InitializationError('Attestation or signature missing for implicit session.')
@@ -357,7 +357,7 @@ export class ChainSessionManager {
         { path: '/request/connect', redirectUrl: this.redirectUrl },
       )
 
-      if (!Address.isEqual(response.walletAddress, this.walletAddress)) {
+      if (!oxAddress.isEqual(response.walletAddress, this.walletAddress)) {
         throw new AddExplicitSessionError('Wallet address mismatch.')
       }
 
@@ -385,7 +385,7 @@ export class ChainSessionManager {
    * @throws {ModifyExplicitSessionError} If modifying the session fails.
    */
   async modifyExplicitSession(
-    sessionAddress: Address.Checksummed,
+    sessionAddress: oxAddress.Address,
     newPermissions: Signers.Session.ExplicitParams,
   ): Promise<void> {
     if (!this.walletAddress) {
@@ -419,8 +419,8 @@ export class ChainSessionManager {
       )
 
       if (
-        !Address.isEqual(response.walletAddress, this.walletAddress) &&
-        !Address.isEqual(response.sessionAddress, sessionAddress)
+        !oxAddress.isEqual(response.walletAddress, this.walletAddress) &&
+        !oxAddress.isEqual(response.sessionAddress, sessionAddress)
       ) {
         throw new ModifyExplicitSessionError('Wallet or session address mismatch.')
       }
@@ -450,7 +450,7 @@ export class ChainSessionManager {
 
     try {
       const connectResponse = response.payload
-      const receivedAddress = connectResponse.walletAddress
+      const receivedAddress = Address.checksum(connectResponse.walletAddress)
       const { email, loginMethod } = connectResponse
 
       if (response.action === RequestActionType.ADD_IMPLICIT_SESSION) {
@@ -758,7 +758,7 @@ export class ChainSessionManager {
         return true
       } else if (response.action === RequestActionType.MODIFY_EXPLICIT_SESSION) {
         const modifyResponse = response.payload as ModifySessionSuccessResponsePayload
-        if (!Address.isEqual(modifyResponse.walletAddress, this.walletAddress!)) {
+        if (!oxAddress.isEqual(modifyResponse.walletAddress, this.walletAddress!)) {
           throw new ModifyExplicitSessionError('Wallet address mismatch on redirect response.')
         }
 
diff --git a/packages/wallet/dapp-client/src/DappClient.ts b/packages/wallet/dapp-client/src/DappClient.ts
@@ -2,6 +2,7 @@
 import { ChainId } from '@0xsequence/network'
 import { Relayer, Signers } from '@0xsequence/wallet-core'
 import { Address } from '@0xsequence/wallet-primitives'
+import { Address as oxAddress, TypedData } from 'ox'
 
 import { ChainSessionManager } from './ChainSessionManager.js'
 import { DappTransport } from './DappTransport.js'
@@ -11,13 +12,11 @@ import {
   DappClientExplicitSessionEventListener,
   DappClientSignatureEventListener,
   RandomPrivateKeyFn,
-  RequestActionType,
   SequenceSessionStorage,
   Session,
   Transaction,
   TransportMode,
 } from './types/index.js'
-import { TypedData } from 'ox/TypedData'
 
 export type DappClientEventListener = (data?: any) => void
 
@@ -227,14 +226,14 @@ export class DappClient {
       return
     }
 
-    this.walletAddress = implicitSession.walletAddress
+    this.walletAddress = Address.checksum(implicitSession.walletAddress)
     this.loginMethod = implicitSession.loginMethod ?? null
     this.userEmail = implicitSession.userEmail ?? null
 
     const explicitSessions = await this.sequenceStorage.getExplicitSessions()
     const chainIdsToInitialize = new Set<ChainId>([
       implicitSession.chainId,
-      ...explicitSessions.filter((s) => Address.isEqual(s.walletAddress, this.walletAddress!)).map((s) => s.chainId),
+      ...explicitSessions.filter((s) => oxAddress.isEqual(s.walletAddress, this.walletAddress!)).map((s) => s.chainId),
     ])
 
     const initPromises = Array.from(chainIdsToInitialize).map((chainId) =>
@@ -425,7 +424,7 @@ export class DappClient {
   /**
    * Modifies the permissions of an existing explicit session for a given chain and session address.
    * @param chainId The chain ID on which the explicit session exists. {@link ChainId}
-   * @param sessionAddress The address of the explicit session to modify. {@link Address.Checksummed}
+   * @param sessionAddress The address of the explicit session to modify. {@link Address.Address}
    * @param permissions The new permissions to set for the session. {@link Signers.Session.ExplicitParams}
    *
    * @throws If the client or relevant chain is not initialized. {@link InitializationError}
@@ -454,7 +453,7 @@ export class DappClient {
    */
   async modifyExplicitSession(
     chainId: ChainId,
-    sessionAddress: Address.Checksummed,
+    sessionAddress: oxAddress.Address,
     permissions: Signers.Session.ExplicitParams,
   ): Promise<void> {
     if (!this.isInitialized || !this.walletAddress)
@@ -589,7 +588,7 @@ export class DappClient {
    *   await dappClient.signTypedData(1, typedData);
    * }
    */
-  async signTypedData(chainId: ChainId, typedData: TypedData): Promise<void> {
+  async signTypedData(chainId: ChainId, typedData: TypedData.TypedData): Promise<void> {
     if (!this.isInitialized) throw new InitializationError('Not initialized')
     const chainSessionManager = this.getChainSessionManager(chainId)
     if (!chainSessionManager.isInitialized)
diff --git a/packages/wallet/dapp-client/src/types/index.ts b/packages/wallet/dapp-client/src/types/index.ts
@@ -1,8 +1,9 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { Address, Attestation, Payload } from '@0xsequence/wallet-primitives'
+import { Attestation, Payload } from '@0xsequence/wallet-primitives'
 import { Signers } from '@0xsequence/wallet-core'
 import { ChainId } from '@0xsequence/network'
-import { Hex } from 'ox'
+import type { Address } from 'ox/Address'
+import type { Hex } from 'ox/Hex'
 import type { TypedData } from 'ox/TypedData'
 
 // --- Public Interfaces and Constants ---
@@ -20,63 +21,63 @@ export type PreferredLoginMethod = 'google' | 'apple' | 'email' | 'passkey' | 'm
 // --- Payloads for Transport ---
 
 export interface AddExplicitSessionPayload {
-  sessionAddress: Address.Checksummed
+  sessionAddress: Address
   permissions: Signers.Session.ExplicitParams
   preferredLoginMethod?: PreferredLoginMethod
   email?: string
 }
 export interface ModifySessionPayload {
-  walletAddress: Address.Checksummed
-  sessionAddress: Address.Checksummed
+  walletAddress: Address
+  sessionAddress: Address
   permissions: Signers.Session.ExplicitParams
 }
 
 export interface AddImplicitSessionPayload {
-  sessionAddress: Address.Checksummed
+  sessionAddress: Address
   implicitSessionRedirectUrl?: string
   permissions?: Signers.Session.ExplicitParams
   preferredLoginMethod?: PreferredLoginMethod
   email?: string
 }
 
 export interface SignMessagePayload {
-  address: Address.Checksummed
+  address: Address
   message: string
   chainId: ChainId
 }
 
 export interface SignTypedDataPayload {
-  address: Address.Checksummed
+  address: Address
   typedData: TypedData
   chainId: ChainId
 }
 
 export interface ConnectSuccessResponsePayload {
-  walletAddress: Address.Checksummed
+  walletAddress: Address
   attestation?: Attestation.Attestation
-  signature?: Hex.Hex
+  signature?: Hex
   email?: string
   loginMethod?: PreferredLoginMethod
 }
 
 export interface ModifySessionSuccessResponsePayload {
-  walletAddress: Address.Checksummed
-  sessionAddress: Address.Checksummed
+  walletAddress: Address
+  sessionAddress: Address
 }
 
 export interface SignatureResponse {
-  signature: Hex.Hex
-  walletAddress: Address.Checksummed
+  signature: Hex
+  walletAddress: Address
 }
 
 export interface ExplicitSessionResponsePayload {
-  walletAddress: Address.Checksummed
-  sessionAddress: Address.Checksummed
+  walletAddress: Address
+  sessionAddress: Address
 }
 
 // --- Dapp-facing Types ---
 
-export type RandomPrivateKeyFn = () => Hex.Hex | Promise<Hex.Hex>
+export type RandomPrivateKeyFn = () => Hex | Promise<Hex>
 
 type RequiredKeys = 'to' | 'data' | 'value'
 
@@ -87,7 +88,7 @@ export type Transaction =
     Partial<Omit<Payload.Call, RequiredKeys>>
 
 export type Session = {
-  address: Address.Checksummed
+  address: Address
   isImplicit: boolean
 }
 
@@ -165,14 +166,14 @@ export interface BaseRequest {
 export interface MessageSignatureRequest extends BaseRequest {
   type: 'message_signature'
   message: string
-  address: Address.Checksummed
+  address: Address
   chainId: number
 }
 
 export interface TypedDataSignatureRequest extends BaseRequest {
   type: 'typed_data_signature'
   typedData: unknown
-  address: Address.Checksummed
+  address: Address
   chainId: number
 }
 
diff --git a/packages/wallet/dapp-client/src/utils/storage.ts b/packages/wallet/dapp-client/src/utils/storage.ts
@@ -1,5 +1,5 @@
-import { Address, Attestation } from '@0xsequence/wallet-primitives'
-import { Hex } from 'ox'
+import { Attestation } from '@0xsequence/wallet-primitives'
+import { Address, Hex } from 'ox'
 import { ChainId } from '@0xsequence/network'
 import { jsonReplacers, jsonRevivers } from './index.js'
 import {
@@ -13,15 +13,15 @@ import {
 
 export interface ExplicitSessionData {
   pk: Hex.Hex
-  walletAddress: Address.Checksummed
+  walletAddress: Address.Address
   chainId: ChainId
   loginMethod?: PreferredLoginMethod
   userEmail?: string
 }
 
 export interface ImplicitSessionData {
   pk: Hex.Hex
-  walletAddress: Address.Checksummed
+  walletAddress: Address.Address
   attestation: Attestation.Attestation
   identitySignature: Hex.Hex
   chainId: ChainId
