@0xsequence/provider 0.35.6 → 0.35.10

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

@@ -597,14 +597,9 @@ class BaseWalletTransport {
     };
 
     this.handleMessage = async function (message) {
-      const request = message; // ensure signer is ready to handle requests
-
-      if (_this.walletRequestHandler.getSigner() === undefined) {
-        await _this.walletRequestHandler.signerReady();
-      } // ensure initial handshake is complete before accepting
+      const request = message; // ensure initial handshake is complete before accepting
       // other kinds of messages.
 
-
       if (_this._init !== exports.InitState.OK) {
         if (request.type === exports.EventType.INIT) {
           if (_this.isValidInitAck(message)) {
@@ -618,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) {
@@ -678,12 +677,7 @@ class BaseWalletTransport {
         });
       }
 
-      _this.walletRequestHandler.setOpenIntent(intent); // ensure signer is ready
-
-
-      if (_this.walletRequestHandler.getSigner() === undefined) {
-        await _this.walletRequestHandler.signerReady();
-      } // 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.
@@ -725,10 +719,12 @@ class BaseWalletTransport {
         }
       } else {
         _this.walletRequestHandler.setConnectOptions(undefined);
-      } // Notify open and proceed to prompt for connection if intended
+      } // 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
@@ -1380,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
 
 
@@ -1705,6 +1703,7 @@ 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
@@ -1754,10 +1753,7 @@ class WalletRequestHandler {
         id: request.id,
         result: null
       };
-
-      if (_this.signer === undefined) {
-        await _this.signerReady();
-      }
+      await _this.getSigner();
 
       try {
         // only allow public json rpc method to the provider when user is not logged in, aka signer is not set
@@ -2150,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;
@@ -2206,7 +2217,7 @@ class WalletRequestHandler {
 
   signOut() {
     // signed out state
-    this.signer = null;
+    this.setSigner(null);
   }
 
   signerReset() {
@@ -2215,14 +2226,18 @@ class WalletRequestHandler {
     this.signer = undefined;
   }
 
-  signerReady() {
+  signerReady(timeout = SIGNER_READY_TIMEOUT) {
     return new Promise((resolve, reject) => {
       if (this.signer !== undefined) {
-        resolve(undefined);
+        resolve();
       } else {
-        this.signerReadyCallbacks.push(() => {
-          resolve(undefined);
-        });
+        setTimeout(() => {
+          if (this.signer === undefined) {
+            this.signerReadyCallbacks = [];
+            reject(`signerReady timed out`);
+          }
+        }, timeout);
+        this.signerReadyCallbacks.push(resolve);
       }
     });
   }
@@ -2426,14 +2441,6 @@ class WalletRequestHandler {
     this.events.emit('close', error);
   }
 
-  isSignedIn() {
-    return !!this.signer;
-  }
-
-  getSigner() {
-    return this.signer;
-  }
-
   setSigner(signer) {
     this.signer = signer;
 

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

@@ -597,14 +597,9 @@ class BaseWalletTransport {
     };
 
     this.handleMessage = async function (message) {
-      const request = message; // ensure signer is ready to handle requests
-
-      if (_this.walletRequestHandler.getSigner() === undefined) {
-        await _this.walletRequestHandler.signerReady();
-      } // ensure initial handshake is complete before accepting
+      const request = message; // ensure initial handshake is complete before accepting
       // other kinds of messages.
 
-
       if (_this._init !== exports.InitState.OK) {
         if (request.type === exports.EventType.INIT) {
           if (_this.isValidInitAck(message)) {
@@ -618,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) {
@@ -678,12 +677,7 @@ class BaseWalletTransport {
         });
       }
 
-      _this.walletRequestHandler.setOpenIntent(intent); // ensure signer is ready
-
-
-      if (_this.walletRequestHandler.getSigner() === undefined) {
-        await _this.walletRequestHandler.signerReady();
-      } // 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.
@@ -725,10 +719,12 @@ class BaseWalletTransport {
         }
       } else {
         _this.walletRequestHandler.setConnectOptions(undefined);
-      } // Notify open and proceed to prompt for connection if intended
+      } // 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
@@ -1380,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
 
 
@@ -1705,6 +1703,7 @@ 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
@@ -1754,10 +1753,7 @@ class WalletRequestHandler {
         id: request.id,
         result: null
       };
-
-      if (_this.signer === undefined) {
-        await _this.signerReady();
-      }
+      await _this.getSigner();
 
       try {
         // only allow public json rpc method to the provider when user is not logged in, aka signer is not set
@@ -2150,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;
@@ -2206,7 +2217,7 @@ class WalletRequestHandler {
 
   signOut() {
     // signed out state
-    this.signer = null;
+    this.setSigner(null);
   }
 
   signerReset() {
@@ -2215,14 +2226,18 @@ class WalletRequestHandler {
     this.signer = undefined;
   }
 
-  signerReady() {
+  signerReady(timeout = SIGNER_READY_TIMEOUT) {
     return new Promise((resolve, reject) => {
       if (this.signer !== undefined) {
-        resolve(undefined);
+        resolve();
       } else {
-        this.signerReadyCallbacks.push(() => {
-          resolve(undefined);
-        });
+        setTimeout(() => {
+          if (this.signer === undefined) {
+            this.signerReadyCallbacks = [];
+            reject(`signerReady timed out`);
+          }
+        }, timeout);
+        this.signerReadyCallbacks.push(resolve);
       }
     });
   }
@@ -2426,14 +2441,6 @@ class WalletRequestHandler {
     this.events.emit('close', error);
   }
 
-  isSignedIn() {
-    return !!this.signer;
-  }
-
-  getSigner() {
-    return this.signer;
-  }
-
   setSigner(signer) {
     this.signer = signer;
 

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

@@ -593,14 +593,9 @@ class BaseWalletTransport {
     };
 
     this.handleMessage = async function (message) {
-      const request = message; // ensure signer is ready to handle requests
-
-      if (_this.walletRequestHandler.getSigner() === undefined) {
-        await _this.walletRequestHandler.signerReady();
-      } // ensure initial handshake is complete before accepting
+      const request = message; // ensure initial handshake is complete before accepting
       // other kinds of messages.
 
-
       if (_this._init !== InitState.OK) {
         if (request.type === EventType.INIT) {
           if (_this.isValidInitAck(message)) {
@@ -614,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) {
@@ -674,12 +673,7 @@ class BaseWalletTransport {
         });
       }
 
-      _this.walletRequestHandler.setOpenIntent(intent); // ensure signer is ready
-
-
-      if (_this.walletRequestHandler.getSigner() === undefined) {
-        await _this.walletRequestHandler.signerReady();
-      } // 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.
@@ -721,10 +715,12 @@ class BaseWalletTransport {
         }
       } else {
         _this.walletRequestHandler.setConnectOptions(undefined);
-      } // Notify open and proceed to prompt for connection if intended
+      } // 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
@@ -1376,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
 
 
@@ -1701,6 +1699,7 @@ 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
@@ -1750,10 +1749,7 @@ class WalletRequestHandler {
         id: request.id,
         result: null
       };
-
-      if (_this.signer === undefined) {
-        await _this.signerReady();
-      }
+      await _this.getSigner();
 
       try {
         // only allow public json rpc method to the provider when user is not logged in, aka signer is not set
@@ -2146,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;
@@ -2202,7 +2213,7 @@ class WalletRequestHandler {
 
   signOut() {
     // signed out state
-    this.signer = null;
+    this.setSigner(null);
   }
 
   signerReset() {
@@ -2211,14 +2222,18 @@ class WalletRequestHandler {
     this.signer = undefined;
   }
 
-  signerReady() {
+  signerReady(timeout = SIGNER_READY_TIMEOUT) {
     return new Promise((resolve, reject) => {
       if (this.signer !== undefined) {
-        resolve(undefined);
+        resolve();
       } else {
-        this.signerReadyCallbacks.push(() => {
-          resolve(undefined);
-        });
+        setTimeout(() => {
+          if (this.signer === undefined) {
+            this.signerReadyCallbacks = [];
+            reject(`signerReady timed out`);
+          }
+        }, timeout);
+        this.signerReadyCallbacks.push(resolve);
       }
     });
   }
@@ -2422,14 +2437,6 @@ class WalletRequestHandler {
     this.events.emit('close', error);
   }
 
-  isSignedIn() {
-    return !!this.signer;
-  }
-
-  getSigner() {
-    return this.signer;
-  }
-
   setSigner(signer) {
     this.signer = signer;
 

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

@@ -24,7 +24,7 @@ export declare class WalletRequestHandler implements ExternalProvider, JsonRpcHa
     signIn(signer: Signer | null, options?: WalletSignInOptions): Promise<void>;
     signOut(): void;
     signerReset(): void;
-    signerReady(): Promise<unknown>;
+    signerReady(timeout?: number): Promise<void>;
     connect(options?: ConnectOptions): Promise<ConnectDetails>;
     promptConnect: (options?: ConnectOptions | undefined) => Promise<ConnectDetails>;
     sendMessageRequest(message: ProviderMessageRequest): Promise<ProviderMessageResponse>;
@@ -46,8 +46,8 @@ export declare class WalletRequestHandler implements ExternalProvider, JsonRpcHa
     notifyNetworks(networks?: NetworkConfig[]): Promise<void>;
     notifyWalletContext(): Promise<void>;
     notifyClose(error?: ProviderRpcError): void;
-    isSignedIn(): boolean;
-    getSigner(): Signer | null | undefined;
+    isSignedIn: () => Promise<boolean>;
+    getSigner: () => Promise<Signer | null>;
     setSigner(signer: Signer | null | undefined): void;
     private handleConfirmWalletDeployPrompt;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@0xsequence/provider",
-  "version": "0.35.6",
+  "version": "0.35.10",
   "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.6",
-    "@0xsequence/auth": "^0.35.6",
-    "@0xsequence/config": "^0.35.6",
-    "@0xsequence/network": "^0.35.6",
-    "@0xsequence/transactions": "^0.35.6",
-    "@0xsequence/utils": "^0.35.6",
-    "@0xsequence/wallet": "^0.35.6",
+    "@0xsequence/abi": "^0.35.10",
+    "@0xsequence/auth": "^0.35.10",
+    "@0xsequence/config": "^0.35.10",
+    "@0xsequence/network": "^0.35.10",
+    "@0xsequence/transactions": "^0.35.10",
+    "@0xsequence/utils": "^0.35.10",
+    "@0xsequence/wallet": "^0.35.10",
     "@ethersproject/abstract-signer": "^5.5.0",
     "@ethersproject/hash": "^5.5.0",
     "@ethersproject/providers": "^5.5.1",

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

@@ -100,11 +100,6 @@ export abstract class BaseWalletTransport implements WalletTransport {
   handleMessage = async (message: ProviderMessage<any>) => {
     const request = message
 
-    // ensure signer is ready to handle requests
-    if (this.walletRequestHandler.getSigner() === undefined) {
-      await this.walletRequestHandler.signerReady()
-    }
-
     // ensure initial handshake is complete before accepting
     // other kinds of messages.
     if (this._init !== InitState.OK) {
@@ -123,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: {
@@ -321,18 +321,12 @@ export abstract class BaseWalletTransport implements WalletTransport {
 
     this.walletRequestHandler.setOpenIntent(intent)
 
-    // ensure signer is ready
-    if (this.walletRequestHandler.getSigner() === undefined) {
-      await this.walletRequestHandler.signerReady()
-    }
-
     // 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.
     await this.init()
 
-
     // Prepare connect options from intent
     if (intent && intent.type === 'connect' && intent.options) {
       const connectOptions = intent.options
@@ -370,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

@@ -34,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
@@ -74,7 +76,6 @@ export class WalletRequestHandler implements ExternalProvider, JsonRpcHandler, P
   async signIn(signer: Signer | null, options: WalletSignInOptions = {}) {
     this.setSigner(signer)
 
-
     const { connect, mainnetNetworks, testnetNetworks, defaultNetworkId } = options
 
     if (mainnetNetworks && mainnetNetworks.length > 0) {
@@ -119,7 +120,7 @@ export class WalletRequestHandler implements ExternalProvider, JsonRpcHandler, P
 
   signOut() {
     // signed out state
-    this.signer = null
+    this.setSigner(null)
   }
 
   signerReset() {
@@ -128,14 +129,18 @@ export class WalletRequestHandler implements ExternalProvider, JsonRpcHandler, P
     this.signer = undefined
   }
 
-  signerReady() {
+  signerReady(timeout: number = SIGNER_READY_TIMEOUT): Promise<void> {
     return new Promise((resolve, reject) => {
       if (this.signer !== undefined) {
-        resolve(undefined)
+        resolve()
       } else {
-        this.signerReadyCallbacks.push(() => {
-          resolve(undefined)
-        })
+        setTimeout(() => {
+          if (this.signer === undefined) {
+            this.signerReadyCallbacks = []
+            reject(`signerReady timed out`)
+          }
+        }, timeout)
+        this.signerReadyCallbacks.push(resolve)
       }
     })
   }
@@ -196,7 +201,6 @@ export class WalletRequestHandler implements ExternalProvider, JsonRpcHandler, P
     }
 
     const promptConnectDetails = await this.prompter.promptConnect(options || this._connectOptions).catch(_ => {
-
       return { connected: false } as ConnectDetails
     })
 
@@ -240,9 +244,7 @@ export class WalletRequestHandler implements ExternalProvider, JsonRpcHandler, P
       result: null
     }
 
-    if (this.signer === undefined) {
-      await this.signerReady()
-    }
+    await this.getSigner()
 
     try {
       // only allow public json rpc method to the provider when user is not logged in, aka signer is not set
@@ -722,11 +724,16 @@ 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 | undefined {
+  getSigner = async (): Promise<Signer | null> => {
+    await this.signerReady()
+    if (this.signer === undefined) {
+      throw new Error('signerReady failed resolve')
+    }
     return this.signer
   }
 
@@ -734,7 +741,7 @@ export class WalletRequestHandler implements ExternalProvider, JsonRpcHandler, P
     this.signer = signer
 
     if (signer !== undefined) {
-      for (let i=0; i < this.signerReadyCallbacks.length; i++) {
+      for (let i = 0; i < this.signerReadyCallbacks.length; i++) {
         this.signerReadyCallbacks[i]()
       }
       this.signerReadyCallbacks = []

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