From c4dcc248ad43702bad9437738e20a00d9c346fc3 Mon Sep 17 00:00:00 2001
From: Tolgahan Arikan <tolgahan.arikan@gmail.com>
Date: Fri, 10 Oct 2025 17:13:25 +0300
Subject: [PATCH] Make dapp-client implicit sessions chain agnostic

---
 .../dapp-client/src/ChainSessionManager.ts    |  3 +-
 packages/wallet/dapp-client/src/DappClient.ts | 43 ++++++++++++++-----
 2 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/packages/wallet/dapp-client/src/ChainSessionManager.ts b/packages/wallet/dapp-client/src/ChainSessionManager.ts
index c1048b9e9..7d1f8e669 100644
--- a/packages/wallet/dapp-client/src/ChainSessionManager.ts
+++ b/packages/wallet/dapp-client/src/ChainSessionManager.ts
@@ -41,7 +41,6 @@ import {
   ModifyExplicitSessionPayload,
   SessionResponse,
   AddExplicitSessionPayload,
-  GetFeeTokensResponse,
 } from './types/index.js'
 import { CACHE_DB_NAME, VALUE_FORWARDER_ADDRESS } from './utils/constants.js'
 import { ExplicitSession, ImplicitSession, ExplicitSessionConfig } from './index.js'
@@ -232,7 +231,7 @@ export class ChainSessionManager {
 
     const implicitSession = await this.sequenceStorage.getImplicitSession()
 
-    if (implicitSession && implicitSession.chainId === this.chainId) {
+    if (implicitSession) {
       await this._initializeImplicitSessionInternal(
         implicitSession.pk,
         walletAddress,
diff --git a/packages/wallet/dapp-client/src/DappClient.ts b/packages/wallet/dapp-client/src/DappClient.ts
index c6e384486..5b4818bf1 100644
--- a/packages/wallet/dapp-client/src/DappClient.ts
+++ b/packages/wallet/dapp-client/src/DappClient.ts
@@ -556,10 +556,7 @@ export class DappClient {
    * }
    */
   async getFeeOptions(chainId: number, transactions: Transaction[]): Promise<Relayer.FeeOption[]> {
-    if (!this.isInitialized) throw new InitializationError('Not initialized')
-    const chainSessionManager = this.getChainSessionManager(chainId)
-    if (!chainSessionManager.isInitialized)
-      throw new InitializationError(`ChainSessionManager for chain ${chainId} is not initialized.`)
+    const chainSessionManager = await this.getOrInitializeChainManager(chainId)
     return await chainSessionManager.getFeeOptions(transactions)
   }
 
@@ -584,11 +581,19 @@ export class DappClient {
    * @returns A promise that resolves to true if the session has permission, otherwise false.
    */
   async hasPermission(chainId: number, transactions: Transaction[]): Promise<boolean> {
-    const chainSessionManager = this.chainSessionManagers.get(chainId)
-    if (!chainSessionManager || !chainSessionManager.isInitialized) {
+    if (!this.isInitialized) {
+      return false
+    }
+    try {
+      const chainSessionManager = await this.getOrInitializeChainManager(chainId)
+      return await chainSessionManager.hasPermission(transactions)
+    } catch (error) {
+      console.warn(
+        `hasPermission check failed for chain ${chainId}:`,
+        error instanceof Error ? error.message : String(error),
+      )
       return false
     }
-    return await chainSessionManager.hasPermission(transactions)
   }
 
   /**
@@ -615,10 +620,7 @@ export class DappClient {
    *   const txHash = await dappClient.sendTransaction(1, [transaction]);
    */
   async sendTransaction(chainId: number, transactions: Transaction[], feeOption?: Relayer.FeeOption): Promise<Hex.Hex> {
-    if (!this.isInitialized) throw new InitializationError('Not initialized')
-    const chainSessionManager = this.getChainSessionManager(chainId)
-    if (!chainSessionManager.isInitialized)
-      throw new InitializationError(`ChainSessionManager for chain ${chainId} is not initialized.`)
+    const chainSessionManager = await this.getOrInitializeChainManager(chainId)
     return await chainSessionManager.buildSignAndSendTransactions(transactions, feeOption)
   }
 
@@ -795,6 +797,25 @@ export class DappClient {
     }
   }
 
+  /**
+   * @private Retrieves or creates and initializes a ChainSessionManager for a given chain ID.
+   * @param chainId The chain ID to get the ChainSessionManager for.
+   * @returns The initialized ChainSessionManager for the given chain ID.
+   */
+  private async getOrInitializeChainManager(chainId: number): Promise<ChainSessionManager> {
+    if (!this.isInitialized || !this.walletAddress) {
+      throw new InitializationError('DappClient is not initialized.')
+    }
+    const manager = this.getChainSessionManager(chainId)
+    if (!manager.isInitialized) {
+      await manager.initialize()
+    }
+    if (!manager.isInitialized) {
+      throw new InitializationError(`ChainSessionManager for chain ${chainId} could not be initialized.`)
+    }
+    return manager
+  }
+
   /**
    * @private Retrieves or creates a ChainSessionManager for a given chain ID.
    * @param chainId The chain ID to get the ChainSessionManager for.