@0xsequence/provider 1.0.3 → 1.0.4

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

@@ -5,9 +5,9 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var eventemitter2 = require('eventemitter2');
 var utils = require('@0xsequence/utils');
 var ethers = require('ethers');
+var network = require('@0xsequence/network');
 var core = require('@0xsequence/core');
 var auth = require('@0xsequence/auth');
-var network = require('@0xsequence/network');
 var wallet = require('@0xsequence/wallet');
 
 function _extends() {
@@ -760,6 +760,24 @@ class BaseWalletTransport {
       // origin host of the dapp.
       await _this.init();
 
+      // determine chainId from networkId (string or number)
+      let chainId = undefined;
+      try {
+        if (networkId) {
+          const network$1 = network.findSupportedNetwork(networkId);
+          if (network$1) {
+            chainId = network$1.chainId;
+          } else {
+            throw new Error(`unknown network ${networkId}`);
+          }
+        } else {
+          // if not provided, use defaultChainId
+          chainId = _this.walletRequestHandler.defaultChainId();
+        }
+      } catch (err) {
+        console.error(err);
+      }
+
       // Prepare connect options from intent
       if (intent && intent.type === 'connect' && intent.options) {
         const connectOptions = intent.options;
@@ -813,17 +831,6 @@ class BaseWalletTransport {
         // upon cancellation by user, the walletRequestHandler will throw an error
 
         if (intent && intent.type === 'connect') {
-          let chainId = undefined;
-          try {
-            if (networkId) {
-              const networkIdNumber = ethers.ethers.BigNumber.from(networkId).toNumber();
-              chainId = await _this.walletRequestHandler.setDefaultChainId(networkIdNumber);
-            } else {
-              chainId = _this.walletRequestHandler.defaultChainId();
-            }
-          } 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
@@ -849,18 +856,7 @@ class BaseWalletTransport {
             }
           }
         } else {
-          // Set default network, in case of error chainId will be undefined or 0
-          let chainId = undefined;
-          try {
-            if (networkId) {
-              const networkIdNumber = ethers.ethers.BigNumber.from(networkId).toNumber();
-              chainId = await _this.walletRequestHandler.setDefaultChainId(networkIdNumber);
-            } else {
-              chainId = _this.walletRequestHandler.defaultChainId();
-            }
-          } catch (err) {
-            console.error(err);
-          }
+          // Using default network
 
           // Failed to set default network on open -- quit + close
           if (!chainId || chainId <= 0) {

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

@@ -5,9 +5,9 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var eventemitter2 = require('eventemitter2');
 var utils = require('@0xsequence/utils');
 var ethers = require('ethers');
+var network = require('@0xsequence/network');
 var core = require('@0xsequence/core');
 var auth = require('@0xsequence/auth');
-var network = require('@0xsequence/network');
 var wallet = require('@0xsequence/wallet');
 
 function _extends() {
@@ -760,6 +760,24 @@ class BaseWalletTransport {
       // origin host of the dapp.
       await _this.init();
 
+      // determine chainId from networkId (string or number)
+      let chainId = undefined;
+      try {
+        if (networkId) {
+          const network$1 = network.findSupportedNetwork(networkId);
+          if (network$1) {
+            chainId = network$1.chainId;
+          } else {
+            throw new Error(`unknown network ${networkId}`);
+          }
+        } else {
+          // if not provided, use defaultChainId
+          chainId = _this.walletRequestHandler.defaultChainId();
+        }
+      } catch (err) {
+        console.error(err);
+      }
+
       // Prepare connect options from intent
       if (intent && intent.type === 'connect' && intent.options) {
         const connectOptions = intent.options;
@@ -813,17 +831,6 @@ class BaseWalletTransport {
         // upon cancellation by user, the walletRequestHandler will throw an error
 
         if (intent && intent.type === 'connect') {
-          let chainId = undefined;
-          try {
-            if (networkId) {
-              const networkIdNumber = ethers.ethers.BigNumber.from(networkId).toNumber();
-              chainId = await _this.walletRequestHandler.setDefaultChainId(networkIdNumber);
-            } else {
-              chainId = _this.walletRequestHandler.defaultChainId();
-            }
-          } 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
@@ -849,18 +856,7 @@ class BaseWalletTransport {
             }
           }
         } else {
-          // Set default network, in case of error chainId will be undefined or 0
-          let chainId = undefined;
-          try {
-            if (networkId) {
-              const networkIdNumber = ethers.ethers.BigNumber.from(networkId).toNumber();
-              chainId = await _this.walletRequestHandler.setDefaultChainId(networkIdNumber);
-            } else {
-              chainId = _this.walletRequestHandler.defaultChainId();
-            }
-          } catch (err) {
-            console.error(err);
-          }
+          // Using default network
 
           // Failed to set default network on open -- quit + close
           if (!chainId || chainId <= 0) {

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

@@ -1,9 +1,9 @@
 import { EventEmitter2 } from 'eventemitter2';
 import { logger, encodeMessageDigest, encodeTypedDataDigest, sanitizeNumberString, sanitizeHost, sanitizeAlphanumeric, base64EncodeObject, base64DecodeObject, shallowCopy, resolveProperties, getDefaultConnectionInfo } from '@0xsequence/utils';
 import { ethers, BigNumber, providers } from 'ethers';
+import { findSupportedNetwork, getChainId, JsonRpcSender, maybeChainId, allowProviderMiddleware, networkProviderMiddleware, findNetworkConfig, CachedProvider, JsonRpcRouter, loggingProviderMiddleware, exceptionProviderMiddleware, sortNetworks, EagerProvider, SigningProvider, updateNetworkConfig, ensureValidNetworks } from '@0xsequence/network';
 import { commons, universal } from '@0xsequence/core';
 import { signAuthorization } from '@0xsequence/auth';
-import { getChainId, JsonRpcSender, maybeChainId, allowProviderMiddleware, networkProviderMiddleware, findNetworkConfig, CachedProvider, JsonRpcRouter, loggingProviderMiddleware, exceptionProviderMiddleware, findSupportedNetwork, sortNetworks, EagerProvider, SigningProvider, updateNetworkConfig, ensureValidNetworks } from '@0xsequence/network';
 import { Signer, resolveArrayProperties } from '@0xsequence/wallet';
 
 function _extends() {
@@ -756,6 +756,24 @@ class BaseWalletTransport {
       // origin host of the dapp.
       await _this.init();
 
+      // determine chainId from networkId (string or number)
+      let chainId = undefined;
+      try {
+        if (networkId) {
+          const network = findSupportedNetwork(networkId);
+          if (network) {
+            chainId = network.chainId;
+          } else {
+            throw new Error(`unknown network ${networkId}`);
+          }
+        } else {
+          // if not provided, use defaultChainId
+          chainId = _this.walletRequestHandler.defaultChainId();
+        }
+      } catch (err) {
+        console.error(err);
+      }
+
       // Prepare connect options from intent
       if (intent && intent.type === 'connect' && intent.options) {
         const connectOptions = intent.options;
@@ -809,17 +827,6 @@ class BaseWalletTransport {
         // upon cancellation by user, the walletRequestHandler will throw an error
 
         if (intent && intent.type === 'connect') {
-          let chainId = undefined;
-          try {
-            if (networkId) {
-              const networkIdNumber = ethers.BigNumber.from(networkId).toNumber();
-              chainId = await _this.walletRequestHandler.setDefaultChainId(networkIdNumber);
-            } else {
-              chainId = _this.walletRequestHandler.defaultChainId();
-            }
-          } 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
@@ -845,18 +852,7 @@ class BaseWalletTransport {
             }
           }
         } else {
-          // Set default network, in case of error chainId will be undefined or 0
-          let chainId = undefined;
-          try {
-            if (networkId) {
-              const networkIdNumber = ethers.BigNumber.from(networkId).toNumber();
-              chainId = await _this.walletRequestHandler.setDefaultChainId(networkIdNumber);
-            } else {
-              chainId = _this.walletRequestHandler.defaultChainId();
-            }
-          } catch (err) {
-            console.error(err);
-          }
+          // Using default network
 
           // Failed to set default network on open -- quit + close
           if (!chainId || chainId <= 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@0xsequence/provider",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "provider sub-package for Sequence",
   "repository": "https://github.com/0xsequence/sequence.js/tree/master/packages/provider",
   "source": "src/index.ts",
@@ -11,15 +11,15 @@
   "dependencies": {
     "eventemitter2": "^6.4.5",
     "webextension-polyfill": "^0.10.0",
-    "@0xsequence/abi": "1.0.3",
-    "@0xsequence/auth": "1.0.3",
-    "@0xsequence/migration": "1.0.3",
-    "@0xsequence/network": "1.0.3",
-    "@0xsequence/account": "1.0.3",
-    "@0xsequence/relayer": "1.0.3",
-    "@0xsequence/core": "1.0.3",
-    "@0xsequence/utils": "1.0.3",
-    "@0xsequence/wallet": "1.0.3"
+    "@0xsequence/abi": "1.0.4",
+    "@0xsequence/auth": "1.0.4",
+    "@0xsequence/migration": "1.0.4",
+    "@0xsequence/account": "1.0.4",
+    "@0xsequence/core": "1.0.4",
+    "@0xsequence/network": "1.0.4",
+    "@0xsequence/relayer": "1.0.4",
+    "@0xsequence/utils": "1.0.4",
+    "@0xsequence/wallet": "1.0.4"
   },
   "peerDependencies": {
     "ethers": ">=5.5 < 6"

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

@@ -14,7 +14,7 @@ import {
 
 import { WalletRequestHandler } from './wallet-request-handler'
 
-import { NetworkConfig, JsonRpcRequest, JsonRpcResponseCallback } from '@0xsequence/network'
+import { NetworkConfig, JsonRpcRequest, JsonRpcResponseCallback, findSupportedNetwork } from '@0xsequence/network'
 import { logger, sanitizeAlphanumeric, sanitizeHost, sanitizeNumberString } from '@0xsequence/utils'
 import { AuthorizationOptions } from '@0xsequence/auth'
 
@@ -327,6 +327,24 @@ export abstract class BaseWalletTransport implements WalletTransport {
     // origin host of the dapp.
     await this.init()
 
+    // determine chainId from networkId (string or number)
+    let chainId: number | undefined = undefined
+    try {
+      if (networkId) {
+        const network = findSupportedNetwork(networkId)
+        if (network) {
+          chainId = network.chainId
+        } else {
+          throw new Error(`unknown network ${networkId}`)
+        }
+      } else {
+        // if not provided, use defaultChainId
+        chainId = this.walletRequestHandler.defaultChainId()
+      }
+    } catch (err) {
+      console.error(err)
+    }
+
     // Prepare connect options from intent
     if (intent && intent.type === 'connect' && intent.options) {
       const connectOptions = intent.options
@@ -382,17 +400,6 @@ export abstract class BaseWalletTransport implements WalletTransport {
       // upon cancellation by user, the walletRequestHandler will throw an error
 
       if (intent && intent.type === 'connect') {
-        let chainId: number | undefined = undefined
-        try {
-          if (networkId) {
-            const networkIdNumber = ethers.BigNumber.from(networkId).toNumber()
-            chainId = await this.walletRequestHandler.setDefaultChainId(networkIdNumber)
-          } else {
-            chainId = this.walletRequestHandler.defaultChainId()
-          }
-        } 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
@@ -419,18 +426,7 @@ 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) {
-            const networkIdNumber = ethers.BigNumber.from(networkId).toNumber()
-            chainId = await this.walletRequestHandler.setDefaultChainId(networkIdNumber)
-          } else {
-            chainId = this.walletRequestHandler.defaultChainId()
-          }
-        } catch (err) {
-          console.error(err)
-        }
+        // Using default network
 
         // Failed to set default network on open -- quit + close
         if (!chainId || chainId <= 0) {