@0xsequence/provider 0.35.5 → 0.35.9

package/dist/0xsequence-provider.cjs.dev.js

@@ -613,7 +613,11 @@ class BaseWalletTransport {
         }
 
         return;
-      } // handle request
+      } // ensure signer is ready to handle requests
+      // if (this.walletRequestHandler.getSigner() === undefined) {
+      //   await this.walletRequestHandler.signerReady()
+      // }
+      // handle request
 
 
       switch (request.type) {
@@ -671,7 +675,9 @@ class BaseWalletTransport {
           intent,
           networkId
         });
-      } // init handshake for certain transports, before we can open the communication.
+      }
+
+      _this.walletRequestHandler.setOpenIntent(intent); // init handshake for certain transports, before we can open the communication.
       //
       // for example, with the window-transport, we have to exchange messages to determine the
       // origin host of the dapp.
@@ -713,10 +719,12 @@ class BaseWalletTransport {
         }
       } else {
         _this.walletRequestHandler.setConnectOptions(undefined);
-      } // Notify open and proceed to prompt for connection if intended
+      } // ensure signer is ready
 
 
-      if (!_this.walletRequestHandler.isSignedIn()) {
+      await _this.walletRequestHandler.getSigner(); // Notify open and proceed to prompt for connection if intended
+
+      if (!(await _this.walletRequestHandler.isSignedIn())) {
         // open wallet without a specific connected chainId, as the user is not signed in
         _this.notifyOpen({
           sessionId: _this._sessionId
@@ -1368,7 +1376,9 @@ class WindowMessageProvider extends BaseProviderTransport {
 
     this.register = () => {
       if (registeredWindowMessageProvider) {
-        throw new Error('A WindowMessageProvider is already registered. There can only be one.');
+        // overriding the registered message provider
+        registeredWindowMessageProvider.unregister();
+        registeredWindowMessageProvider = this;
       } // listen for incoming messages from wallet
 
 
@@ -1616,12 +1626,6 @@ class WindowMessageHandler extends BaseWalletTransport {
     if (!session) {
       utils.logger.error('window session is undefined');
       return;
-    }
-
-    if (session.intent && isNewWindowSession) {
-      window.history.replaceState({
-        openWalletIntent: true
-      }, document.title, pathname);
     } // record parent window instance for communication
 
 
@@ -1699,14 +1703,20 @@ class WindowMessageHandler extends BaseWalletTransport {
 
 }
 
+const SIGNER_READY_TIMEOUT = 10000;
 class WalletRequestHandler {
+  // signer interface of the wallet. A null value means there is no signer (ie. user not signed in). An undefined
+  // value means the signer state is unknown, usually meaning the wallet app is booting up and initializing. Of course
+  // a Signer value is the actually interface to a signed-in account
   constructor(_signer, prompter, mainnetNetworks, testnetNetworks = []) {
     var _this = this;
 
     this.signer = void 0;
+    this.signerReadyCallbacks = [];
     this.prompter = void 0;
     this.mainnetNetworks = void 0;
     this.testnetNetworks = void 0;
+    this._openIntent = void 0;
     this._connectOptions = void 0;
     this._defaultNetworkId = void 0;
     this._chainId = void 0;
@@ -1743,6 +1753,7 @@ class WalletRequestHandler {
         id: request.id,
         result: null
       };
+      await _this.getSigner();
 
       try {
         // only allow public json rpc method to the provider when user is not logged in, aka signer is not set
@@ -2135,6 +2146,21 @@ class WalletRequestHandler {
       callback(undefined, response);
     };
 
+    this.isSignedIn = async function () {
+      await _this.signerReady();
+      return !!_this.signer;
+    };
+
+    this.getSigner = async function () {
+      await _this.signerReady();
+
+      if (_this.signer === undefined) {
+        throw new Error('signerReady failed resolve');
+      }
+
+      return _this.signer;
+    };
+
     this.signer = _signer;
     this.prompter = prompter;
     this.mainnetNetworks = mainnetNetworks;
@@ -2142,7 +2168,7 @@ class WalletRequestHandler {
   }
 
   async signIn(signer, options = {}) {
-    this.signer = signer;
+    this.setSigner(signer);
     const {
       connect,
       mainnetNetworks,
@@ -2189,6 +2215,33 @@ class WalletRequestHandler {
     }
   }
 
+  signOut() {
+    // signed out state
+    this.setSigner(null);
+  }
+
+  signerReset() {
+    // resetting signer puts the wallet in an uninitialized state, which requires the app to
+    // re-initiatize and set the signer either as "null" (ie. no signer) or "Signer" (ie. signed in).
+    this.signer = undefined;
+  }
+
+  signerReady(timeout = SIGNER_READY_TIMEOUT) {
+    return new Promise((resolve, reject) => {
+      if (this.signer !== undefined) {
+        resolve();
+      } else {
+        setTimeout(() => {
+          if (this.signer === undefined) {
+            this.signerReadyCallbacks = [];
+            reject(`signerReady timed out`);
+          }
+        }, timeout);
+        this.signerReadyCallbacks.push(resolve);
+      }
+    });
+  }
+
   async connect(options) {
     if (!this.signer) {
       return {
@@ -2277,6 +2330,14 @@ class WalletRequestHandler {
     }
   }
 
+  get openIntent() {
+    return this._openIntent;
+  }
+
+  setOpenIntent(intent) {
+    this._openIntent = intent;
+  }
+
   get connectOptions() {
     return this._connectOptions;
   }
@@ -2380,16 +2441,16 @@ class WalletRequestHandler {
     this.events.emit('close', error);
   }
 
-  isSignedIn() {
-    return !!this.signer;
-  }
-
-  getSigner() {
-    return this.signer;
-  }
-
   setSigner(signer) {
     this.signer = signer;
+
+    if (signer !== undefined) {
+      for (let i = 0; i < this.signerReadyCallbacks.length; i++) {
+        this.signerReadyCallbacks[i]();
+      }
+
+      this.signerReadyCallbacks = [];
+    }
   }
 
   async handleConfirmWalletDeployPrompt(prompter, signer, chainId) {

package/dist/0xsequence-provider.cjs.prod.js

@@ -613,7 +613,11 @@ class BaseWalletTransport {
         }
 
         return;
-      } // handle request
+      } // ensure signer is ready to handle requests
+      // if (this.walletRequestHandler.getSigner() === undefined) {
+      //   await this.walletRequestHandler.signerReady()
+      // }
+      // handle request
 
 
       switch (request.type) {
@@ -671,7 +675,9 @@ class BaseWalletTransport {
           intent,
           networkId
         });
-      } // init handshake for certain transports, before we can open the communication.
+      }
+
+      _this.walletRequestHandler.setOpenIntent(intent); // init handshake for certain transports, before we can open the communication.
       //
       // for example, with the window-transport, we have to exchange messages to determine the
       // origin host of the dapp.
@@ -713,10 +719,12 @@ class BaseWalletTransport {
         }
       } else {
         _this.walletRequestHandler.setConnectOptions(undefined);
-      } // Notify open and proceed to prompt for connection if intended
+      } // ensure signer is ready
 
 
-      if (!_this.walletRequestHandler.isSignedIn()) {
+      await _this.walletRequestHandler.getSigner(); // Notify open and proceed to prompt for connection if intended
+
+      if (!(await _this.walletRequestHandler.isSignedIn())) {
         // open wallet without a specific connected chainId, as the user is not signed in
         _this.notifyOpen({
           sessionId: _this._sessionId
@@ -1368,7 +1376,9 @@ class WindowMessageProvider extends BaseProviderTransport {
 
     this.register = () => {
       if (registeredWindowMessageProvider) {
-        throw new Error('A WindowMessageProvider is already registered. There can only be one.');
+        // overriding the registered message provider
+        registeredWindowMessageProvider.unregister();
+        registeredWindowMessageProvider = this;
       } // listen for incoming messages from wallet
 
 
@@ -1616,12 +1626,6 @@ class WindowMessageHandler extends BaseWalletTransport {
     if (!session) {
       utils.logger.error('window session is undefined');
       return;
-    }
-
-    if (session.intent && isNewWindowSession) {
-      window.history.replaceState({
-        openWalletIntent: true
-      }, document.title, pathname);
     } // record parent window instance for communication
 
 
@@ -1699,14 +1703,20 @@ class WindowMessageHandler extends BaseWalletTransport {
 
 }
 
+const SIGNER_READY_TIMEOUT = 10000;
 class WalletRequestHandler {
+  // signer interface of the wallet. A null value means there is no signer (ie. user not signed in). An undefined
+  // value means the signer state is unknown, usually meaning the wallet app is booting up and initializing. Of course
+  // a Signer value is the actually interface to a signed-in account
   constructor(_signer, prompter, mainnetNetworks, testnetNetworks = []) {
     var _this = this;
 
     this.signer = void 0;
+    this.signerReadyCallbacks = [];
     this.prompter = void 0;
     this.mainnetNetworks = void 0;
     this.testnetNetworks = void 0;
+    this._openIntent = void 0;
     this._connectOptions = void 0;
     this._defaultNetworkId = void 0;
     this._chainId = void 0;
@@ -1743,6 +1753,7 @@ class WalletRequestHandler {
         id: request.id,
         result: null
       };
+      await _this.getSigner();
 
       try {
         // only allow public json rpc method to the provider when user is not logged in, aka signer is not set
@@ -2135,6 +2146,21 @@ class WalletRequestHandler {
       callback(undefined, response);
     };
 
+    this.isSignedIn = async function () {
+      await _this.signerReady();
+      return !!_this.signer;
+    };
+
+    this.getSigner = async function () {
+      await _this.signerReady();
+
+      if (_this.signer === undefined) {
+        throw new Error('signerReady failed resolve');
+      }
+
+      return _this.signer;
+    };
+
     this.signer = _signer;
     this.prompter = prompter;
     this.mainnetNetworks = mainnetNetworks;
@@ -2142,7 +2168,7 @@ class WalletRequestHandler {
   }
 
   async signIn(signer, options = {}) {
-    this.signer = signer;
+    this.setSigner(signer);
     const {
       connect,
       mainnetNetworks,
@@ -2189,6 +2215,33 @@ class WalletRequestHandler {
     }
   }
 
+  signOut() {
+    // signed out state
+    this.setSigner(null);
+  }
+
+  signerReset() {
+    // resetting signer puts the wallet in an uninitialized state, which requires the app to
+    // re-initiatize and set the signer either as "null" (ie. no signer) or "Signer" (ie. signed in).
+    this.signer = undefined;
+  }
+
+  signerReady(timeout = SIGNER_READY_TIMEOUT) {
+    return new Promise((resolve, reject) => {
+      if (this.signer !== undefined) {
+        resolve();
+      } else {
+        setTimeout(() => {
+          if (this.signer === undefined) {
+            this.signerReadyCallbacks = [];
+            reject(`signerReady timed out`);
+          }
+        }, timeout);
+        this.signerReadyCallbacks.push(resolve);
+      }
+    });
+  }
+
   async connect(options) {
     if (!this.signer) {
       return {
@@ -2277,6 +2330,14 @@ class WalletRequestHandler {
     }
   }
 
+  get openIntent() {
+    return this._openIntent;
+  }
+
+  setOpenIntent(intent) {
+    this._openIntent = intent;
+  }
+
   get connectOptions() {
     return this._connectOptions;
   }
@@ -2380,16 +2441,16 @@ class WalletRequestHandler {
     this.events.emit('close', error);
   }
 
-  isSignedIn() {
-    return !!this.signer;
-  }
-
-  getSigner() {
-    return this.signer;
-  }
-
   setSigner(signer) {
     this.signer = signer;
+
+    if (signer !== undefined) {
+      for (let i = 0; i < this.signerReadyCallbacks.length; i++) {
+        this.signerReadyCallbacks[i]();
+      }
+
+      this.signerReadyCallbacks = [];
+    }
   }
 
   async handleConfirmWalletDeployPrompt(prompter, signer, chainId) {

package/dist/0xsequence-provider.esm.js

@@ -609,7 +609,11 @@ class BaseWalletTransport {
         }
 
         return;
-      } // handle request
+      } // ensure signer is ready to handle requests
+      // if (this.walletRequestHandler.getSigner() === undefined) {
+      //   await this.walletRequestHandler.signerReady()
+      // }
+      // handle request
 
 
       switch (request.type) {
@@ -667,7 +671,9 @@ class BaseWalletTransport {
           intent,
           networkId
         });
-      } // init handshake for certain transports, before we can open the communication.
+      }
+
+      _this.walletRequestHandler.setOpenIntent(intent); // init handshake for certain transports, before we can open the communication.
       //
       // for example, with the window-transport, we have to exchange messages to determine the
       // origin host of the dapp.
@@ -709,10 +715,12 @@ class BaseWalletTransport {
         }
       } else {
         _this.walletRequestHandler.setConnectOptions(undefined);
-      } // Notify open and proceed to prompt for connection if intended
+      } // ensure signer is ready
 
 
-      if (!_this.walletRequestHandler.isSignedIn()) {
+      await _this.walletRequestHandler.getSigner(); // Notify open and proceed to prompt for connection if intended
+
+      if (!(await _this.walletRequestHandler.isSignedIn())) {
         // open wallet without a specific connected chainId, as the user is not signed in
         _this.notifyOpen({
           sessionId: _this._sessionId
@@ -1364,7 +1372,9 @@ class WindowMessageProvider extends BaseProviderTransport {
 
     this.register = () => {
       if (registeredWindowMessageProvider) {
-        throw new Error('A WindowMessageProvider is already registered. There can only be one.');
+        // overriding the registered message provider
+        registeredWindowMessageProvider.unregister();
+        registeredWindowMessageProvider = this;
       } // listen for incoming messages from wallet
 
 
@@ -1612,12 +1622,6 @@ class WindowMessageHandler extends BaseWalletTransport {
     if (!session) {
       logger.error('window session is undefined');
       return;
-    }
-
-    if (session.intent && isNewWindowSession) {
-      window.history.replaceState({
-        openWalletIntent: true
-      }, document.title, pathname);
     } // record parent window instance for communication
 
 
@@ -1695,14 +1699,20 @@ class WindowMessageHandler extends BaseWalletTransport {
 
 }
 
+const SIGNER_READY_TIMEOUT = 10000;
 class WalletRequestHandler {
+  // signer interface of the wallet. A null value means there is no signer (ie. user not signed in). An undefined
+  // value means the signer state is unknown, usually meaning the wallet app is booting up and initializing. Of course
+  // a Signer value is the actually interface to a signed-in account
   constructor(_signer, prompter, mainnetNetworks, testnetNetworks = []) {
     var _this = this;
 
     this.signer = void 0;
+    this.signerReadyCallbacks = [];
     this.prompter = void 0;
     this.mainnetNetworks = void 0;
     this.testnetNetworks = void 0;
+    this._openIntent = void 0;
     this._connectOptions = void 0;
     this._defaultNetworkId = void 0;
     this._chainId = void 0;
@@ -1739,6 +1749,7 @@ class WalletRequestHandler {
         id: request.id,
         result: null
       };
+      await _this.getSigner();
 
       try {
         // only allow public json rpc method to the provider when user is not logged in, aka signer is not set
@@ -2131,6 +2142,21 @@ class WalletRequestHandler {
       callback(undefined, response);
     };
 
+    this.isSignedIn = async function () {
+      await _this.signerReady();
+      return !!_this.signer;
+    };
+
+    this.getSigner = async function () {
+      await _this.signerReady();
+
+      if (_this.signer === undefined) {
+        throw new Error('signerReady failed resolve');
+      }
+
+      return _this.signer;
+    };
+
     this.signer = _signer;
     this.prompter = prompter;
     this.mainnetNetworks = mainnetNetworks;
@@ -2138,7 +2164,7 @@ class WalletRequestHandler {
   }
 
   async signIn(signer, options = {}) {
-    this.signer = signer;
+    this.setSigner(signer);
     const {
       connect,
       mainnetNetworks,
@@ -2185,6 +2211,33 @@ class WalletRequestHandler {
     }
   }
 
+  signOut() {
+    // signed out state
+    this.setSigner(null);
+  }
+
+  signerReset() {
+    // resetting signer puts the wallet in an uninitialized state, which requires the app to
+    // re-initiatize and set the signer either as "null" (ie. no signer) or "Signer" (ie. signed in).
+    this.signer = undefined;
+  }
+
+  signerReady(timeout = SIGNER_READY_TIMEOUT) {
+    return new Promise((resolve, reject) => {
+      if (this.signer !== undefined) {
+        resolve();
+      } else {
+        setTimeout(() => {
+          if (this.signer === undefined) {
+            this.signerReadyCallbacks = [];
+            reject(`signerReady timed out`);
+          }
+        }, timeout);
+        this.signerReadyCallbacks.push(resolve);
+      }
+    });
+  }
+
   async connect(options) {
     if (!this.signer) {
       return {
@@ -2273,6 +2326,14 @@ class WalletRequestHandler {
     }
   }
 
+  get openIntent() {
+    return this._openIntent;
+  }
+
+  setOpenIntent(intent) {
+    this._openIntent = intent;
+  }
+
   get connectOptions() {
     return this._connectOptions;
   }
@@ -2376,16 +2437,16 @@ class WalletRequestHandler {
     this.events.emit('close', error);
   }
 
-  isSignedIn() {
-    return !!this.signer;
-  }
-
-  getSigner() {
-    return this.signer;
-  }
-
   setSigner(signer) {
     this.signer = signer;
+
+    if (signer !== undefined) {
+      for (let i = 0; i < this.signerReadyCallbacks.length; i++) {
+        this.signerReadyCallbacks[i]();
+      }
+
+      this.signerReadyCallbacks = [];
+    }
   }
 
   async handleConfirmWalletDeployPrompt(prompter, signer, chainId) {

package/dist/declarations/src/transports/wallet-request-handler.d.ts

@@ -1,4 +1,4 @@
-import { ProviderMessageRequest, ProviderMessageResponse, ProviderMessageRequestHandler, MessageToSign, ProviderRpcError, ConnectOptions, ConnectDetails, PromptConnectDetails, WalletSession, ProviderEventTypes } from '../types';
+import { ProviderMessageRequest, ProviderMessageResponse, ProviderMessageRequestHandler, MessageToSign, ProviderRpcError, ConnectOptions, ConnectDetails, PromptConnectDetails, WalletSession, OpenWalletIntent, ProviderEventTypes } from '../types';
 import { ExternalProvider } from '@ethersproject/providers';
 import { Networks, NetworkConfig, JsonRpcHandler, JsonRpcRequest, JsonRpcResponseCallback } from '@0xsequence/network';
 import { Signer } from '@0xsequence/wallet';
@@ -11,15 +11,20 @@ export interface WalletSignInOptions {
 }
 export declare class WalletRequestHandler implements ExternalProvider, JsonRpcHandler, ProviderMessageRequestHandler {
     private signer;
+    private signerReadyCallbacks;
     private prompter;
     private mainnetNetworks;
     private testnetNetworks;
+    private _openIntent?;
     private _connectOptions?;
     private _defaultNetworkId?;
     private _chainId?;
     private events;
-    constructor(signer: Signer | null, prompter: WalletUserPrompter | null, mainnetNetworks: Networks, testnetNetworks?: Networks);
+    constructor(signer: Signer | null | undefined, prompter: WalletUserPrompter | null, mainnetNetworks: Networks, testnetNetworks?: Networks);
     signIn(signer: Signer | null, options?: WalletSignInOptions): Promise<void>;
+    signOut(): void;
+    signerReset(): void;
+    signerReady(timeout?: number): Promise<void>;
     connect(options?: ConnectOptions): Promise<ConnectDetails>;
     promptConnect: (options?: ConnectOptions | undefined) => Promise<ConnectDetails>;
     sendMessageRequest(message: ProviderMessageRequest): Promise<ProviderMessageResponse>;
@@ -28,6 +33,8 @@ export declare class WalletRequestHandler implements ExternalProvider, JsonRpcHa
     once<K extends keyof ProviderEventTypes>(event: K, fn: ProviderEventTypes[K]): void;
     getAddress(): Promise<string>;
     getChainId(): Promise<number>;
+    get openIntent(): OpenWalletIntent | undefined;
+    setOpenIntent(intent: OpenWalletIntent | undefined): void;
     get connectOptions(): ConnectOptions | undefined;
     setConnectOptions(options: ConnectOptions | undefined): void;
     get defaultNetworkId(): string | number | undefined;
@@ -39,9 +46,9 @@ export declare class WalletRequestHandler implements ExternalProvider, JsonRpcHa
     notifyNetworks(networks?: NetworkConfig[]): Promise<void>;
     notifyWalletContext(): Promise<void>;
     notifyClose(error?: ProviderRpcError): void;
-    isSignedIn(): boolean;
-    getSigner(): Signer | null;
-    setSigner(signer: Signer | null): void;
+    isSignedIn: () => Promise<boolean>;
+    getSigner: () => Promise<Signer | null>;
+    setSigner(signer: Signer | null | undefined): void;
     private handleConfirmWalletDeployPrompt;
 }
 export interface WalletUserPrompter {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@0xsequence/provider",
-  "version": "0.35.5",
+  "version": "0.35.9",
   "description": "provider sub-package for Sequence",
   "repository": "https://github.com/0xsequence/sequence.js/tree/master/packages/provider",
   "source": "src/index.ts",
@@ -13,13 +13,13 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@0xsequence/abi": "^0.35.5",
-    "@0xsequence/auth": "^0.35.5",
-    "@0xsequence/config": "^0.35.5",
-    "@0xsequence/network": "^0.35.5",
-    "@0xsequence/transactions": "^0.35.5",
-    "@0xsequence/utils": "^0.35.5",
-    "@0xsequence/wallet": "^0.35.5",
+    "@0xsequence/abi": "^0.35.9",
+    "@0xsequence/auth": "^0.35.9",
+    "@0xsequence/config": "^0.35.9",
+    "@0xsequence/network": "^0.35.9",
+    "@0xsequence/transactions": "^0.35.9",
+    "@0xsequence/utils": "^0.35.9",
+    "@0xsequence/wallet": "^0.35.9",
     "@ethersproject/abstract-signer": "^5.5.0",
     "@ethersproject/hash": "^5.5.0",
     "@ethersproject/providers": "^5.5.1",

package/src/transports/base-wallet-transport.ts

@@ -118,6 +118,11 @@ export abstract class BaseWalletTransport implements WalletTransport {
       return
     }
 
+    // ensure signer is ready to handle requests
+    // if (this.walletRequestHandler.getSigner() === undefined) {
+    //   await this.walletRequestHandler.signerReady()
+    // }
+
     // handle request
     switch (request.type) {
       case EventType.OPEN: {
@@ -314,6 +319,8 @@ export abstract class BaseWalletTransport implements WalletTransport {
       this.saveTransportSession({ sessionId, intent, networkId })
     }
 
+    this.walletRequestHandler.setOpenIntent(intent)
+
     // init handshake for certain transports, before we can open the communication.
     //
     // for example, with the window-transport, we have to exchange messages to determine the
@@ -357,8 +364,11 @@ export abstract class BaseWalletTransport implements WalletTransport {
       this.walletRequestHandler.setConnectOptions(undefined)
     }
 
+    // ensure signer is ready
+    await this.walletRequestHandler.getSigner()
+
     // Notify open and proceed to prompt for connection if intended
-    if (!this.walletRequestHandler.isSignedIn()) {
+    if (!(await this.walletRequestHandler.isSignedIn())) {
       // open wallet without a specific connected chainId, as the user is not signed in
       this.notifyOpen({
         sessionId: this._sessionId

package/src/transports/wallet-request-handler.ts

@@ -10,6 +10,7 @@ import {
   ConnectDetails,
   PromptConnectDetails,
   WalletSession,
+  OpenWalletIntent,
   ErrSignedInRequired,
   ProviderEventTypes,
   TypedEventEmitter
@@ -33,6 +34,8 @@ import { logger, TypedData } from '@0xsequence/utils'
 
 import { isWalletUpToDate } from '../utils'
 
+const SIGNER_READY_TIMEOUT = 10000
+
 export interface WalletSignInOptions {
   connect?: boolean
   mainnetNetworks?: Networks
@@ -41,11 +44,17 @@ export interface WalletSignInOptions {
 }
 
 export class WalletRequestHandler implements ExternalProvider, JsonRpcHandler, ProviderMessageRequestHandler {
-  private signer: Signer | null
+  // signer interface of the wallet. A null value means there is no signer (ie. user not signed in). An undefined
+  // value means the signer state is unknown, usually meaning the wallet app is booting up and initializing. Of course
+  // a Signer value is the actually interface to a signed-in account
+  private signer: Signer | null | undefined
+  private signerReadyCallbacks: Array<() => void> = []
+
   private prompter: WalletUserPrompter | null
   private mainnetNetworks: NetworkConfig[]
   private testnetNetworks: NetworkConfig[]
 
+  private _openIntent?: OpenWalletIntent
   private _connectOptions?: ConnectOptions
   private _defaultNetworkId?: string | number
   private _chainId?: number
@@ -53,7 +62,7 @@ export class WalletRequestHandler implements ExternalProvider, JsonRpcHandler, P
   private events: TypedEventEmitter<ProviderEventTypes> = new EventEmitter() as TypedEventEmitter<ProviderEventTypes>
 
   constructor(
-    signer: Signer | null,
+    signer: Signer | null | undefined,
     prompter: WalletUserPrompter | null,
     mainnetNetworks: Networks,
     testnetNetworks: Networks = []
@@ -65,7 +74,7 @@ export class WalletRequestHandler implements ExternalProvider, JsonRpcHandler, P
   }
 
   async signIn(signer: Signer | null, options: WalletSignInOptions = {}) {
-    this.signer = signer
+    this.setSigner(signer)
 
     const { connect, mainnetNetworks, testnetNetworks, defaultNetworkId } = options
 
@@ -109,6 +118,33 @@ export class WalletRequestHandler implements ExternalProvider, JsonRpcHandler, P
     }
   }
 
+  signOut() {
+    // signed out state
+    this.setSigner(null)
+  }
+
+  signerReset() {
+    // resetting signer puts the wallet in an uninitialized state, which requires the app to
+    // re-initiatize and set the signer either as "null" (ie. no signer) or "Signer" (ie. signed in).
+    this.signer = undefined
+  }
+
+  signerReady(timeout: number = SIGNER_READY_TIMEOUT): Promise<void> {
+    return new Promise((resolve, reject) => {
+      if (this.signer !== undefined) {
+        resolve()
+      } else {
+        setTimeout(() => {
+          if (this.signer === undefined) {
+            this.signerReadyCallbacks = []
+            reject(`signerReady timed out`)
+          }
+        }, timeout)
+        this.signerReadyCallbacks.push(resolve)
+      }
+    })
+  }
+
   async connect(options?: ConnectOptions): Promise<ConnectDetails> {
     if (!this.signer) {
       return {
@@ -208,6 +244,8 @@ export class WalletRequestHandler implements ExternalProvider, JsonRpcHandler, P
       result: null
     }
 
+    await this.getSigner()
+
     try {
       // only allow public json rpc method to the provider when user is not logged in, aka signer is not set
       if ((!this.signer || this.signer === null) && !permittedJsonRpcMethods.includes(request.method)) {
@@ -583,6 +621,14 @@ export class WalletRequestHandler implements ExternalProvider, JsonRpcHandler, P
     }
   }
 
+  get openIntent(): OpenWalletIntent | undefined {
+    return this._openIntent
+  }
+
+  setOpenIntent(intent: OpenWalletIntent | undefined) {
+    this._openIntent = intent
+  }
+
   get connectOptions(): ConnectOptions | undefined {
     return this._connectOptions
   }
@@ -678,16 +724,28 @@ export class WalletRequestHandler implements ExternalProvider, JsonRpcHandler, P
     this.events.emit('close', error)
   }
 
-  isSignedIn(): boolean {
+  isSignedIn = async (): Promise<boolean> => {
+    await this.signerReady()
     return !!this.signer
   }
 
-  getSigner(): Signer | null {
+  getSigner = async (): Promise<Signer | null> => {
+    await this.signerReady()
+    if (this.signer === undefined) {
+      throw new Error('signerReady failed resolve')
+    }
     return this.signer
   }
 
-  setSigner(signer: Signer | null) {
+  setSigner(signer: Signer | null | undefined) {
     this.signer = signer
+
+    if (signer !== undefined) {
+      for (let i = 0; i < this.signerReadyCallbacks.length; i++) {
+        this.signerReadyCallbacks[i]()
+      }
+      this.signerReadyCallbacks = []
+    }
   }
 
   private async handleConfirmWalletDeployPrompt(

package/src/transports/window-transport/window-message-handler.ts

@@ -47,10 +47,6 @@ export class WindowMessageHandler extends BaseWalletTransport {
       return
     }
 
-    if (session.intent && isNewWindowSession) {
-      window.history.replaceState({ openWalletIntent: true }, document.title, pathname)
-    }
-
     // record parent window instance for communication
     this.parentWindow = parent.window.opener
 

package/src/transports/window-transport/window-message-provider.ts

@@ -17,7 +17,9 @@ export class WindowMessageProvider extends BaseProviderTransport {
 
   register = () => {
     if (registeredWindowMessageProvider) {
-      throw new Error('A WindowMessageProvider is already registered. There can only be one.')
+      // overriding the registered message provider
+      registeredWindowMessageProvider.unregister()
+      registeredWindowMessageProvider = this
     }
 
     // listen for incoming messages from wallet
@@ -80,6 +82,7 @@ export class WindowMessageProvider extends BaseProviderTransport {
     this._init = InitState.NIL
     this._sessionId = `${performance.now()}`
     windowSessionParams.set('sid', this._sessionId)
+    
     if (intent) {
       // for the window-transport, we eagerly/optimistically set the origin host
       // when connecting to the wallet, however, this will be verified and enforced