@0xsequence/provider 0.43.4 → 0.43.5

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

@@ -1914,10 +1914,12 @@ class BaseWalletTransport {
         }
 
         // Set connect options on the walletRequestHandler as our primary
-        // wallet controller
+        // wallet controller, and fall back to networkId if necessary
         _this.walletRequestHandler.setConnectOptions(connectOptions);
         if (connectOptions.networkId) {
           networkId = connectOptions.networkId;
+        } else if (networkId) {
+          connectOptions.networkId = networkId;
         }
       } else {
         _this.walletRequestHandler.setConnectOptions(undefined);
@@ -1934,32 +1936,28 @@ class BaseWalletTransport {
         });
         return true;
       } else {
-        // Set default network, in case of error chainId will be undefined or 0
-        let chainId = undefined;
-        try {
-          if (networkId) {
-            chainId = await _this.walletRequestHandler.setDefaultNetwork(networkId, false);
-          } else {
-            chainId = await _this.walletRequestHandler.getChainId();
-          }
-        } catch (err) {
-          console.error(err);
-        }
-
-        // Failed to set default network on open -- quit + close
-        if (!chainId || chainId <= 0) {
-          _this.notifyOpen({
-            sessionId: _this._sessionId,
-            error: `failed to open wallet on network ${networkId}`
-          });
-          return false;
-        }
-
         // prompt user with a connect request. the options will be used as previously set above.
         // upon success, the walletRequestHandler will notify the dapp with the ConnectDetails.
         // upon cancellation by user, the walletRequestHandler will throw an error
 
         if (intent && intent.type === 'connect') {
+          let chainId = undefined;
+          try {
+            if (networkId) {
+              chainId = await _this.walletRequestHandler.setDefaultNetwork(networkId, false);
+            } else {
+              chainId = await _this.walletRequestHandler.getChainId();
+            }
+          } catch (err) {
+            console.error(err);
+          }
+          // Failed to set default network on open
+          // Fail silently here so we can continue with connect flow and ask
+          // user to connect on a different network if necessary
+          if (!chainId || chainId <= 0) {
+            console.log('Failed to set default network on open');
+          }
+
           // notify wallet is opened, without session details
           _this.notifyOpen({
             sessionId: _this._sessionId
@@ -1978,6 +1976,27 @@ class BaseWalletTransport {
             }
           }
         } else {
+          // Set default network, in case of error chainId will be undefined or 0
+          let chainId = undefined;
+          try {
+            if (networkId) {
+              chainId = await _this.walletRequestHandler.setDefaultNetwork(networkId, false);
+            } else {
+              chainId = await _this.walletRequestHandler.getChainId();
+            }
+          } catch (err) {
+            console.error(err);
+          }
+
+          // Failed to set default network on open -- quit + close
+          if (!chainId || chainId <= 0) {
+            _this.notifyOpen({
+              sessionId: _this._sessionId,
+              error: `failed to open wallet on network ${networkId}`
+            });
+            return false;
+          }
+
           // user is already connected, notify session details.
           // TODO: in future, keep list if 'connected' dapps / sessions in the session
           // controller, and only sync with allowed apps
@@ -3425,10 +3444,18 @@ class Wallet {
         type: 'connect',
         options
       });
-      const connectDetails = await _this.transport.messageProvider.waitUntilConnected().catch(_ => {
-        return {
-          connected: false
-        };
+      const connectDetails = await _this.transport.messageProvider.waitUntilConnected().catch(error => {
+        if (error instanceof Error) {
+          return {
+            connected: false,
+            error: error.message
+          };
+        } else {
+          return {
+            connected: false,
+            error: JSON.stringify(error)
+          };
+        }
       });
       if (connectDetails.connected) {
         if (!!connectDetails.session) {

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

@@ -1914,10 +1914,12 @@ class BaseWalletTransport {
         }
 
         // Set connect options on the walletRequestHandler as our primary
-        // wallet controller
+        // wallet controller, and fall back to networkId if necessary
         _this.walletRequestHandler.setConnectOptions(connectOptions);
         if (connectOptions.networkId) {
           networkId = connectOptions.networkId;
+        } else if (networkId) {
+          connectOptions.networkId = networkId;
         }
       } else {
         _this.walletRequestHandler.setConnectOptions(undefined);
@@ -1934,32 +1936,28 @@ class BaseWalletTransport {
         });
         return true;
       } else {
-        // Set default network, in case of error chainId will be undefined or 0
-        let chainId = undefined;
-        try {
-          if (networkId) {
-            chainId = await _this.walletRequestHandler.setDefaultNetwork(networkId, false);
-          } else {
-            chainId = await _this.walletRequestHandler.getChainId();
-          }
-        } catch (err) {
-          console.error(err);
-        }
-
-        // Failed to set default network on open -- quit + close
-        if (!chainId || chainId <= 0) {
-          _this.notifyOpen({
-            sessionId: _this._sessionId,
-            error: `failed to open wallet on network ${networkId}`
-          });
-          return false;
-        }
-
         // prompt user with a connect request. the options will be used as previously set above.
         // upon success, the walletRequestHandler will notify the dapp with the ConnectDetails.
         // upon cancellation by user, the walletRequestHandler will throw an error
 
         if (intent && intent.type === 'connect') {
+          let chainId = undefined;
+          try {
+            if (networkId) {
+              chainId = await _this.walletRequestHandler.setDefaultNetwork(networkId, false);
+            } else {
+              chainId = await _this.walletRequestHandler.getChainId();
+            }
+          } catch (err) {
+            console.error(err);
+          }
+          // Failed to set default network on open
+          // Fail silently here so we can continue with connect flow and ask
+          // user to connect on a different network if necessary
+          if (!chainId || chainId <= 0) {
+            console.log('Failed to set default network on open');
+          }
+
           // notify wallet is opened, without session details
           _this.notifyOpen({
             sessionId: _this._sessionId
@@ -1978,6 +1976,27 @@ class BaseWalletTransport {
             }
           }
         } else {
+          // Set default network, in case of error chainId will be undefined or 0
+          let chainId = undefined;
+          try {
+            if (networkId) {
+              chainId = await _this.walletRequestHandler.setDefaultNetwork(networkId, false);
+            } else {
+              chainId = await _this.walletRequestHandler.getChainId();
+            }
+          } catch (err) {
+            console.error(err);
+          }
+
+          // Failed to set default network on open -- quit + close
+          if (!chainId || chainId <= 0) {
+            _this.notifyOpen({
+              sessionId: _this._sessionId,
+              error: `failed to open wallet on network ${networkId}`
+            });
+            return false;
+          }
+
           // user is already connected, notify session details.
           // TODO: in future, keep list if 'connected' dapps / sessions in the session
           // controller, and only sync with allowed apps
@@ -3425,10 +3444,18 @@ class Wallet {
         type: 'connect',
         options
       });
-      const connectDetails = await _this.transport.messageProvider.waitUntilConnected().catch(_ => {
-        return {
-          connected: false
-        };
+      const connectDetails = await _this.transport.messageProvider.waitUntilConnected().catch(error => {
+        if (error instanceof Error) {
+          return {
+            connected: false,
+            error: error.message
+          };
+        } else {
+          return {
+            connected: false,
+            error: JSON.stringify(error)
+          };
+        }
       });
       if (connectDetails.connected) {
         if (!!connectDetails.session) {

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

@@ -1910,10 +1910,12 @@ class BaseWalletTransport {
         }
 
         // Set connect options on the walletRequestHandler as our primary
-        // wallet controller
+        // wallet controller, and fall back to networkId if necessary
         _this.walletRequestHandler.setConnectOptions(connectOptions);
         if (connectOptions.networkId) {
           networkId = connectOptions.networkId;
+        } else if (networkId) {
+          connectOptions.networkId = networkId;
         }
       } else {
         _this.walletRequestHandler.setConnectOptions(undefined);
@@ -1930,32 +1932,28 @@ class BaseWalletTransport {
         });
         return true;
       } else {
-        // Set default network, in case of error chainId will be undefined or 0
-        let chainId = undefined;
-        try {
-          if (networkId) {
-            chainId = await _this.walletRequestHandler.setDefaultNetwork(networkId, false);
-          } else {
-            chainId = await _this.walletRequestHandler.getChainId();
-          }
-        } catch (err) {
-          console.error(err);
-        }
-
-        // Failed to set default network on open -- quit + close
-        if (!chainId || chainId <= 0) {
-          _this.notifyOpen({
-            sessionId: _this._sessionId,
-            error: `failed to open wallet on network ${networkId}`
-          });
-          return false;
-        }
-
         // prompt user with a connect request. the options will be used as previously set above.
         // upon success, the walletRequestHandler will notify the dapp with the ConnectDetails.
         // upon cancellation by user, the walletRequestHandler will throw an error
 
         if (intent && intent.type === 'connect') {
+          let chainId = undefined;
+          try {
+            if (networkId) {
+              chainId = await _this.walletRequestHandler.setDefaultNetwork(networkId, false);
+            } else {
+              chainId = await _this.walletRequestHandler.getChainId();
+            }
+          } catch (err) {
+            console.error(err);
+          }
+          // Failed to set default network on open
+          // Fail silently here so we can continue with connect flow and ask
+          // user to connect on a different network if necessary
+          if (!chainId || chainId <= 0) {
+            console.log('Failed to set default network on open');
+          }
+
           // notify wallet is opened, without session details
           _this.notifyOpen({
             sessionId: _this._sessionId
@@ -1974,6 +1972,27 @@ class BaseWalletTransport {
             }
           }
         } else {
+          // Set default network, in case of error chainId will be undefined or 0
+          let chainId = undefined;
+          try {
+            if (networkId) {
+              chainId = await _this.walletRequestHandler.setDefaultNetwork(networkId, false);
+            } else {
+              chainId = await _this.walletRequestHandler.getChainId();
+            }
+          } catch (err) {
+            console.error(err);
+          }
+
+          // Failed to set default network on open -- quit + close
+          if (!chainId || chainId <= 0) {
+            _this.notifyOpen({
+              sessionId: _this._sessionId,
+              error: `failed to open wallet on network ${networkId}`
+            });
+            return false;
+          }
+
           // user is already connected, notify session details.
           // TODO: in future, keep list if 'connected' dapps / sessions in the session
           // controller, and only sync with allowed apps
@@ -3421,10 +3440,18 @@ class Wallet {
         type: 'connect',
         options
       });
-      const connectDetails = await _this.transport.messageProvider.waitUntilConnected().catch(_ => {
-        return {
-          connected: false
-        };
+      const connectDetails = await _this.transport.messageProvider.waitUntilConnected().catch(error => {
+        if (error instanceof Error) {
+          return {
+            connected: false,
+            error: error.message
+          };
+        } else {
+          return {
+            connected: false,
+            error: JSON.stringify(error)
+          };
+        }
       });
       if (connectDetails.connected) {
         if (!!connectDetails.session) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@0xsequence/provider",
-  "version": "0.43.4",
+  "version": "0.43.5",
   "description": "provider sub-package for Sequence",
   "repository": "https://github.com/0xsequence/sequence.js/tree/master/packages/provider",
   "source": "src/index.ts",
@@ -14,13 +14,13 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@0xsequence/abi": "^0.43.4",
-    "@0xsequence/auth": "^0.43.4",
-    "@0xsequence/config": "^0.43.4",
-    "@0xsequence/network": "^0.43.4",
-    "@0xsequence/transactions": "^0.43.4",
-    "@0xsequence/utils": "^0.43.4",
-    "@0xsequence/wallet": "^0.43.4",
+    "@0xsequence/abi": "^0.43.5",
+    "@0xsequence/auth": "^0.43.5",
+    "@0xsequence/config": "^0.43.5",
+    "@0xsequence/network": "^0.43.5",
+    "@0xsequence/transactions": "^0.43.5",
+    "@0xsequence/utils": "^0.43.5",
+    "@0xsequence/wallet": "^0.43.5",
     "eventemitter2": "^6.4.5",
     "webextension-polyfill-ts": "^0.26.0"
   },

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

@@ -356,10 +356,12 @@ export abstract class BaseWalletTransport implements WalletTransport {
       }
 
       // Set connect options on the walletRequestHandler as our primary
-      // wallet controller
+      // wallet controller, and fall back to networkId if necessary
       this.walletRequestHandler.setConnectOptions(connectOptions)
       if (connectOptions.networkId) {
         networkId = connectOptions.networkId
+      } else if (networkId) {
+        connectOptions.networkId = networkId
       }
     } else {
       this.walletRequestHandler.setConnectOptions(undefined)
@@ -376,32 +378,28 @@ export abstract class BaseWalletTransport implements WalletTransport {
       })
       return true
     } else {
-      // Set default network, in case of error chainId will be undefined or 0
-      let chainId: number | undefined = undefined
-      try {
-        if (networkId) {
-          chainId = await this.walletRequestHandler.setDefaultNetwork(networkId, false)
-        } else {
-          chainId = await this.walletRequestHandler.getChainId()
-        }
-      } catch (err) {
-        console.error(err)
-      }
-
-      // Failed to set default network on open -- quit + close
-      if (!chainId || chainId <= 0) {
-        this.notifyOpen({
-          sessionId: this._sessionId,
-          error: `failed to open wallet on network ${networkId}`
-        })
-        return false
-      }
-
       // prompt user with a connect request. the options will be used as previously set above.
       // upon success, the walletRequestHandler will notify the dapp with the ConnectDetails.
       // upon cancellation by user, the walletRequestHandler will throw an error
 
       if (intent && intent.type === 'connect') {
+        let chainId: number | undefined = undefined
+        try {
+          if (networkId) {
+            chainId = await this.walletRequestHandler.setDefaultNetwork(networkId, false)
+          } else {
+            chainId = await this.walletRequestHandler.getChainId()
+          }
+        } catch (err) {
+          console.error(err)
+        }
+        // Failed to set default network on open
+        // Fail silently here so we can continue with connect flow and ask
+        // user to connect on a different network if necessary
+        if (!chainId || chainId <= 0) {
+          console.log('Failed to set default network on open')
+        }
+
         // notify wallet is opened, without session details
         this.notifyOpen({
           sessionId: this._sessionId
@@ -421,6 +419,27 @@ export abstract class BaseWalletTransport implements WalletTransport {
           }
         }
       } else {
+        // Set default network, in case of error chainId will be undefined or 0
+        let chainId: number | undefined = undefined
+        try {
+          if (networkId) {
+            chainId = await this.walletRequestHandler.setDefaultNetwork(networkId, false)
+          } else {
+            chainId = await this.walletRequestHandler.getChainId()
+          }
+        } catch (err) {
+          console.error(err)
+        }
+
+        // Failed to set default network on open -- quit + close
+        if (!chainId || chainId <= 0) {
+          this.notifyOpen({
+            sessionId: this._sessionId,
+            error: `failed to open wallet on network ${networkId}`
+          })
+          return false
+        }
+
         // user is already connected, notify session details.
         // TODO: in future, keep list if 'connected' dapps / sessions in the session
         // controller, and only sync with allowed apps

package/src/wallet.ts

@@ -291,8 +291,13 @@ export class Wallet implements WalletProvider {
     }
 
     await this.openWallet(undefined, { type: 'connect', options })
-    const connectDetails = await this.transport.messageProvider!.waitUntilConnected().catch(_ => {
-      return { connected: false } as ConnectDetails
+
+    const connectDetails = await this.transport.messageProvider!.waitUntilConnected().catch((error): ConnectDetails => {
+      if (error instanceof Error) {
+        return { connected: false, error: error.message }
+      } else {
+        return { connected: false, error: JSON.stringify(error) }
+      }
     })
 
     if (connectDetails.connected) {