@0xsequence/provider 0.0.0-20230320165616 → 0.0.0-20230323151415

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

@@ -6,8 +6,8 @@ var eventemitter2 = require('eventemitter2');
 var utils = require('@0xsequence/utils');
 var ethers = require('ethers');
 var core = require('@0xsequence/core');
-var auth = require('@0xsequence/auth');
 var network = require('@0xsequence/network');
+var auth = require('@0xsequence/auth');
 var wallet = require('@0xsequence/wallet');
 
 function _extends() {
@@ -1774,19 +1774,23 @@ class WalletRequestHandler {
         // fetch the provider for the specific chain, or undefined will select defaultChain
         const provider = (_this$account = _this.account) == null ? void 0 : _this$account.provider(chainId != null ? chainId : _this.defaultNetworkId);
         if (!provider) throw new Error(`WalletRequestHandler: wallet provider is not configured for chainId ${chainId}`);
-        if (provider.send === undefined) {
-          throw new Error(`Account provider doesn't support send method`);
-        }
+        const jsonRpcProvider = provider instanceof ethers.ethers.providers.JsonRpcProvider ? provider : undefined;
         switch (request.method) {
           case 'net_version':
             {
-              const result = await provider.send('net_version', []);
+              if (!jsonRpcProvider) {
+                throw new Error(`Account provider doesn't support send method`);
+              }
+              const result = await jsonRpcProvider.send('net_version', []);
               response.result = result;
               break;
             }
           case 'eth_chainId':
             {
-              const result = await provider.send('eth_chainId', []);
+              if (!jsonRpcProvider) {
+                throw new Error(`Account provider doesn't support send method`);
+              }
+              const result = await jsonRpcProvider.send('eth_chainId', []);
               response.result = result;
               break;
             }
@@ -2106,8 +2110,12 @@ class WalletRequestHandler {
             }
           default:
             {
+              if (!jsonRpcProvider) {
+                throw new Error(`Account provider doesn't support send method`);
+              }
+
               // NOTE: provider here will be chain-bound if chainId is provided
-              const providerResponse = await provider.send(request.method, request.params);
+              const providerResponse = await jsonRpcProvider.send(request.method, request.params);
               response.result = providerResponse;
             }
         }
@@ -2216,9 +2224,21 @@ class WalletRequestHandler {
         error: 'unable to connect without signed in account'
       };
     }
+    let chainId;
+    switch (typeof (options == null ? void 0 : options.networkId)) {
+      case 'string':
+        chainId = network.getChainId(options.networkId);
+        break;
+      case 'number':
+        chainId = options.networkId;
+        break;
+      default:
+        chainId = this.defaultNetworkId;
+        break;
+    }
     const connectDetails = {
       connected: true,
-      chainId: ethers.ethers.BigNumber.from(this.defaultNetworkId).toHexString()
+      chainId: ethers.ethers.BigNumber.from(chainId).toHexString()
     };
     if (options && options.askForEmail) {
       var _this$auxDataProvider;
@@ -2241,7 +2261,7 @@ class WalletRequestHandler {
 
       try {
         // TODO: Either implement account as a signer, or change signAuthorization to accept an account
-        connectDetails.proof = await auth.signAuthorization(this.account, this.defaultNetworkId, authOptions);
+        connectDetails.proof = await auth.signAuthorization(this.account, chainId, authOptions);
       } catch (err) {
         utils.logger.warn(`connect, signAuthorization failed for options: ${JSON.stringify(options)}, due to: ${err.message}`);
         return {

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

@@ -6,8 +6,8 @@ var eventemitter2 = require('eventemitter2');
 var utils = require('@0xsequence/utils');
 var ethers = require('ethers');
 var core = require('@0xsequence/core');
-var auth = require('@0xsequence/auth');
 var network = require('@0xsequence/network');
+var auth = require('@0xsequence/auth');
 var wallet = require('@0xsequence/wallet');
 
 function _extends() {
@@ -1774,19 +1774,23 @@ class WalletRequestHandler {
         // fetch the provider for the specific chain, or undefined will select defaultChain
         const provider = (_this$account = _this.account) == null ? void 0 : _this$account.provider(chainId != null ? chainId : _this.defaultNetworkId);
         if (!provider) throw new Error(`WalletRequestHandler: wallet provider is not configured for chainId ${chainId}`);
-        if (provider.send === undefined) {
-          throw new Error(`Account provider doesn't support send method`);
-        }
+        const jsonRpcProvider = provider instanceof ethers.ethers.providers.JsonRpcProvider ? provider : undefined;
         switch (request.method) {
           case 'net_version':
             {
-              const result = await provider.send('net_version', []);
+              if (!jsonRpcProvider) {
+                throw new Error(`Account provider doesn't support send method`);
+              }
+              const result = await jsonRpcProvider.send('net_version', []);
               response.result = result;
               break;
             }
           case 'eth_chainId':
             {
-              const result = await provider.send('eth_chainId', []);
+              if (!jsonRpcProvider) {
+                throw new Error(`Account provider doesn't support send method`);
+              }
+              const result = await jsonRpcProvider.send('eth_chainId', []);
               response.result = result;
               break;
             }
@@ -2106,8 +2110,12 @@ class WalletRequestHandler {
             }
           default:
             {
+              if (!jsonRpcProvider) {
+                throw new Error(`Account provider doesn't support send method`);
+              }
+
               // NOTE: provider here will be chain-bound if chainId is provided
-              const providerResponse = await provider.send(request.method, request.params);
+              const providerResponse = await jsonRpcProvider.send(request.method, request.params);
               response.result = providerResponse;
             }
         }
@@ -2216,9 +2224,21 @@ class WalletRequestHandler {
         error: 'unable to connect without signed in account'
       };
     }
+    let chainId;
+    switch (typeof (options == null ? void 0 : options.networkId)) {
+      case 'string':
+        chainId = network.getChainId(options.networkId);
+        break;
+      case 'number':
+        chainId = options.networkId;
+        break;
+      default:
+        chainId = this.defaultNetworkId;
+        break;
+    }
     const connectDetails = {
       connected: true,
-      chainId: ethers.ethers.BigNumber.from(this.defaultNetworkId).toHexString()
+      chainId: ethers.ethers.BigNumber.from(chainId).toHexString()
     };
     if (options && options.askForEmail) {
       var _this$auxDataProvider;
@@ -2241,7 +2261,7 @@ class WalletRequestHandler {
 
       try {
         // TODO: Either implement account as a signer, or change signAuthorization to accept an account
-        connectDetails.proof = await auth.signAuthorization(this.account, this.defaultNetworkId, authOptions);
+        connectDetails.proof = await auth.signAuthorization(this.account, chainId, authOptions);
       } catch (err) {
         utils.logger.warn(`connect, signAuthorization failed for options: ${JSON.stringify(options)}, due to: ${err.message}`);
         return {

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

@@ -2,8 +2,8 @@ import { EventEmitter2 } from 'eventemitter2';
 import { logger, sanitizeNumberString, sanitizeHost, sanitizeAlphanumeric, base64EncodeObject, base64DecodeObject, shallowCopy, resolveProperties, encodeMessageDigest, encodeTypedDataDigest } from '@0xsequence/utils';
 import { ethers, BigNumber, providers } from 'ethers';
 import { commons, universal } from '@0xsequence/core';
+import { getChainId, JsonRpcSender, maybeChainId, allowProviderMiddleware, networkProviderMiddleware, findNetworkConfig, CachedProvider, JsonRpcRouter, loggingProviderMiddleware, exceptionProviderMiddleware, findSupportedNetwork, sortNetworks, EagerProvider, SigningProvider, updateNetworkConfig, ensureValidNetworks } from '@0xsequence/network';
 import { signAuthorization } from '@0xsequence/auth';
-import { 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() {
@@ -1770,19 +1770,23 @@ class WalletRequestHandler {
         // fetch the provider for the specific chain, or undefined will select defaultChain
         const provider = (_this$account = _this.account) == null ? void 0 : _this$account.provider(chainId != null ? chainId : _this.defaultNetworkId);
         if (!provider) throw new Error(`WalletRequestHandler: wallet provider is not configured for chainId ${chainId}`);
-        if (provider.send === undefined) {
-          throw new Error(`Account provider doesn't support send method`);
-        }
+        const jsonRpcProvider = provider instanceof ethers.providers.JsonRpcProvider ? provider : undefined;
         switch (request.method) {
           case 'net_version':
             {
-              const result = await provider.send('net_version', []);
+              if (!jsonRpcProvider) {
+                throw new Error(`Account provider doesn't support send method`);
+              }
+              const result = await jsonRpcProvider.send('net_version', []);
               response.result = result;
               break;
             }
           case 'eth_chainId':
             {
-              const result = await provider.send('eth_chainId', []);
+              if (!jsonRpcProvider) {
+                throw new Error(`Account provider doesn't support send method`);
+              }
+              const result = await jsonRpcProvider.send('eth_chainId', []);
               response.result = result;
               break;
             }
@@ -2102,8 +2106,12 @@ class WalletRequestHandler {
             }
           default:
             {
+              if (!jsonRpcProvider) {
+                throw new Error(`Account provider doesn't support send method`);
+              }
+
               // NOTE: provider here will be chain-bound if chainId is provided
-              const providerResponse = await provider.send(request.method, request.params);
+              const providerResponse = await jsonRpcProvider.send(request.method, request.params);
               response.result = providerResponse;
             }
         }
@@ -2212,9 +2220,21 @@ class WalletRequestHandler {
         error: 'unable to connect without signed in account'
       };
     }
+    let chainId;
+    switch (typeof (options == null ? void 0 : options.networkId)) {
+      case 'string':
+        chainId = getChainId(options.networkId);
+        break;
+      case 'number':
+        chainId = options.networkId;
+        break;
+      default:
+        chainId = this.defaultNetworkId;
+        break;
+    }
     const connectDetails = {
       connected: true,
-      chainId: ethers.BigNumber.from(this.defaultNetworkId).toHexString()
+      chainId: ethers.BigNumber.from(chainId).toHexString()
     };
     if (options && options.askForEmail) {
       var _this$auxDataProvider;
@@ -2237,7 +2257,7 @@ class WalletRequestHandler {
 
       try {
         // TODO: Either implement account as a signer, or change signAuthorization to accept an account
-        connectDetails.proof = await signAuthorization(this.account, this.defaultNetworkId, authOptions);
+        connectDetails.proof = await signAuthorization(this.account, chainId, authOptions);
       } catch (err) {
         logger.warn(`connect, signAuthorization failed for options: ${JSON.stringify(options)}, due to: ${err.message}`);
         return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@0xsequence/provider",
-  "version": "0.0.0-20230320165616",
+  "version": "0.0.0-20230323151415",
   "description": "provider sub-package for Sequence",
   "repository": "https://github.com/0xsequence/sequence.js/tree/master/packages/provider",
   "source": "src/index.ts",
@@ -9,15 +9,15 @@
   "author": "Horizon Blockchain Games",
   "license": "Apache-2.0",
   "dependencies": {
-    "@0xsequence/abi": "0.0.0-20230320165616",
-    "@0xsequence/account": "0.0.0-20230320165616",
-    "@0xsequence/auth": "0.0.0-20230320165616",
-    "@0xsequence/core": "0.0.0-20230320165616",
-    "@0xsequence/migration": "0.0.0-20230320165616",
-    "@0xsequence/network": "0.0.0-20230320165616",
-    "@0xsequence/relayer": "0.0.0-20230320165616",
-    "@0xsequence/utils": "0.0.0-20230320165616",
-    "@0xsequence/wallet": "0.0.0-20230320165616",
+    "@0xsequence/abi": "0.0.0-20230323151415",
+    "@0xsequence/account": "0.0.0-20230323151415",
+    "@0xsequence/auth": "0.0.0-20230323151415",
+    "@0xsequence/core": "0.0.0-20230323151415",
+    "@0xsequence/migration": "0.0.0-20230323151415",
+    "@0xsequence/network": "0.0.0-20230323151415",
+    "@0xsequence/relayer": "0.0.0-20230323151415",
+    "@0xsequence/utils": "0.0.0-20230323151415",
+    "@0xsequence/wallet": "0.0.0-20230323151415",
     "eventemitter2": "^6.4.5",
     "webextension-polyfill": "^0.10.0"
   },

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

@@ -18,7 +18,7 @@ import {
 
 import { BigNumber, ethers, providers } from 'ethers'
 
-import { NetworkConfig, JsonRpcHandler, JsonRpcRequest, JsonRpcResponseCallback, JsonRpcResponse } from '@0xsequence/network'
+import { NetworkConfig, JsonRpcHandler, JsonRpcRequest, JsonRpcResponseCallback, JsonRpcResponse, getChainId } from '@0xsequence/network'
 import { signAuthorization, AuthorizationOptions } from '@0xsequence/auth'
 import { logger, TypedData } from '@0xsequence/utils'
 import { commons } from '@0xsequence/core'
@@ -155,9 +155,22 @@ export class WalletRequestHandler implements ExternalProvider, JsonRpcHandler, P
       }
     }
 
+    let chainId: number
+    switch (typeof options?.networkId) {
+      case 'string':
+        chainId = getChainId(options.networkId)
+        break
+      case 'number':
+        chainId = options.networkId
+        break
+      default:
+        chainId = this.defaultNetworkId
+        break
+    }
+
     const connectDetails: ConnectDetails = {
       connected: true,
-      chainId: ethers.BigNumber.from(this.defaultNetworkId).toHexString()
+      chainId: ethers.BigNumber.from(chainId).toHexString()
     }
 
     if (options && options.askForEmail) {
@@ -181,7 +194,7 @@ export class WalletRequestHandler implements ExternalProvider, JsonRpcHandler, P
 
       try {
         // TODO: Either implement account as a signer, or change signAuthorization to accept an account
-        connectDetails.proof = await signAuthorization(this.account, this.defaultNetworkId, authOptions)
+        connectDetails.proof = await signAuthorization(this.account, chainId, authOptions)
       } catch (err) {
         logger.warn(`connect, signAuthorization failed for options: ${JSON.stringify(options)}, due to: ${err.message}`)
         return {
@@ -267,22 +280,27 @@ export class WalletRequestHandler implements ExternalProvider, JsonRpcHandler, P
       if (!account) throw new Error('WalletRequestHandler: wallet account is not configured')
 
       // fetch the provider for the specific chain, or undefined will select defaultChain
-      const provider = this.account?.provider(chainId ?? this.defaultNetworkId) as ethers.providers.JsonRpcProvider
+      const provider = this.account?.provider(chainId ?? this.defaultNetworkId)
       if (!provider) throw new Error(`WalletRequestHandler: wallet provider is not configured for chainId ${chainId}`)
-
-      if (provider.send === undefined) {
-        throw new Error(`Account provider doesn't support send method`)
-      }
+      const jsonRpcProvider = provider instanceof ethers.providers.JsonRpcProvider ? provider : undefined
 
       switch (request.method) {
         case 'net_version': {
-          const result = await provider.send('net_version', [])
+          if (!jsonRpcProvider) {
+            throw new Error(`Account provider doesn't support send method`)
+          }
+
+          const result = await jsonRpcProvider.send('net_version', [])
           response.result = result
           break
         }
 
         case 'eth_chainId': {
-          const result = await provider.send('eth_chainId', [])
+          if (!jsonRpcProvider) {
+            throw new Error(`Account provider doesn't support send method`)
+          }
+
+          const result = await jsonRpcProvider.send('eth_chainId', [])
           response.result = result
           break
         }
@@ -606,8 +624,12 @@ export class WalletRequestHandler implements ExternalProvider, JsonRpcHandler, P
         }
 
         default: {
+          if (!jsonRpcProvider) {
+            throw new Error(`Account provider doesn't support send method`)
+          }
+
           // NOTE: provider here will be chain-bound if chainId is provided
-          const providerResponse = await provider.send(request.method, request.params!)
+          const providerResponse = await jsonRpcProvider.send(request.method, request.params!)
           response.result = providerResponse
         }
       }