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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -6,8 +6,8 @@ var eventemitter2 = require('eventemitter2');
6
6
  var utils = require('@0xsequence/utils');
7
7
  var ethers = require('ethers');
8
8
  var core = require('@0xsequence/core');
9
- var auth = require('@0xsequence/auth');
10
9
  var network = require('@0xsequence/network');
10
+ var auth = require('@0xsequence/auth');
11
11
  var wallet = require('@0xsequence/wallet');
12
12
 
13
13
  function _extends() {
@@ -2216,9 +2216,21 @@ class WalletRequestHandler {
2216
2216
  error: 'unable to connect without signed in account'
2217
2217
  };
2218
2218
  }
2219
+ let chainId;
2220
+ switch (typeof (options == null ? void 0 : options.networkId)) {
2221
+ case 'string':
2222
+ chainId = network.getChainId(options.networkId);
2223
+ break;
2224
+ case 'number':
2225
+ chainId = options.networkId;
2226
+ break;
2227
+ default:
2228
+ chainId = this.defaultNetworkId;
2229
+ break;
2230
+ }
2219
2231
  const connectDetails = {
2220
2232
  connected: true,
2221
- chainId: ethers.ethers.BigNumber.from(this.defaultNetworkId).toHexString()
2233
+ chainId: ethers.ethers.BigNumber.from(chainId).toHexString()
2222
2234
  };
2223
2235
  if (options && options.askForEmail) {
2224
2236
  var _this$auxDataProvider;
@@ -2241,7 +2253,7 @@ class WalletRequestHandler {
2241
2253
 
2242
2254
  try {
2243
2255
  // TODO: Either implement account as a signer, or change signAuthorization to accept an account
2244
- connectDetails.proof = await auth.signAuthorization(this.account, this.defaultNetworkId, authOptions);
2256
+ connectDetails.proof = await auth.signAuthorization(this.account, chainId, authOptions);
2245
2257
  } catch (err) {
2246
2258
  utils.logger.warn(`connect, signAuthorization failed for options: ${JSON.stringify(options)}, due to: ${err.message}`);
2247
2259
  return {
@@ -6,8 +6,8 @@ var eventemitter2 = require('eventemitter2');
6
6
  var utils = require('@0xsequence/utils');
7
7
  var ethers = require('ethers');
8
8
  var core = require('@0xsequence/core');
9
- var auth = require('@0xsequence/auth');
10
9
  var network = require('@0xsequence/network');
10
+ var auth = require('@0xsequence/auth');
11
11
  var wallet = require('@0xsequence/wallet');
12
12
 
13
13
  function _extends() {
@@ -2216,9 +2216,21 @@ class WalletRequestHandler {
2216
2216
  error: 'unable to connect without signed in account'
2217
2217
  };
2218
2218
  }
2219
+ let chainId;
2220
+ switch (typeof (options == null ? void 0 : options.networkId)) {
2221
+ case 'string':
2222
+ chainId = network.getChainId(options.networkId);
2223
+ break;
2224
+ case 'number':
2225
+ chainId = options.networkId;
2226
+ break;
2227
+ default:
2228
+ chainId = this.defaultNetworkId;
2229
+ break;
2230
+ }
2219
2231
  const connectDetails = {
2220
2232
  connected: true,
2221
- chainId: ethers.ethers.BigNumber.from(this.defaultNetworkId).toHexString()
2233
+ chainId: ethers.ethers.BigNumber.from(chainId).toHexString()
2222
2234
  };
2223
2235
  if (options && options.askForEmail) {
2224
2236
  var _this$auxDataProvider;
@@ -2241,7 +2253,7 @@ class WalletRequestHandler {
2241
2253
 
2242
2254
  try {
2243
2255
  // TODO: Either implement account as a signer, or change signAuthorization to accept an account
2244
- connectDetails.proof = await auth.signAuthorization(this.account, this.defaultNetworkId, authOptions);
2256
+ connectDetails.proof = await auth.signAuthorization(this.account, chainId, authOptions);
2245
2257
  } catch (err) {
2246
2258
  utils.logger.warn(`connect, signAuthorization failed for options: ${JSON.stringify(options)}, due to: ${err.message}`);
2247
2259
  return {
@@ -2,8 +2,8 @@ import { EventEmitter2 } from 'eventemitter2';
2
2
  import { logger, sanitizeNumberString, sanitizeHost, sanitizeAlphanumeric, base64EncodeObject, base64DecodeObject, shallowCopy, resolveProperties, encodeMessageDigest, encodeTypedDataDigest } from '@0xsequence/utils';
3
3
  import { ethers, BigNumber, providers } from 'ethers';
4
4
  import { commons, universal } from '@0xsequence/core';
5
+ import { getChainId, JsonRpcSender, maybeChainId, allowProviderMiddleware, networkProviderMiddleware, findNetworkConfig, CachedProvider, JsonRpcRouter, loggingProviderMiddleware, exceptionProviderMiddleware, findSupportedNetwork, sortNetworks, EagerProvider, SigningProvider, updateNetworkConfig, ensureValidNetworks } from '@0xsequence/network';
5
6
  import { signAuthorization } from '@0xsequence/auth';
6
- import { JsonRpcSender, maybeChainId, allowProviderMiddleware, networkProviderMiddleware, findNetworkConfig, CachedProvider, JsonRpcRouter, loggingProviderMiddleware, exceptionProviderMiddleware, findSupportedNetwork, sortNetworks, EagerProvider, SigningProvider, updateNetworkConfig, ensureValidNetworks } from '@0xsequence/network';
7
7
  import { Signer, resolveArrayProperties } from '@0xsequence/wallet';
8
8
 
9
9
  function _extends() {
@@ -2212,9 +2212,21 @@ class WalletRequestHandler {
2212
2212
  error: 'unable to connect without signed in account'
2213
2213
  };
2214
2214
  }
2215
+ let chainId;
2216
+ switch (typeof (options == null ? void 0 : options.networkId)) {
2217
+ case 'string':
2218
+ chainId = getChainId(options.networkId);
2219
+ break;
2220
+ case 'number':
2221
+ chainId = options.networkId;
2222
+ break;
2223
+ default:
2224
+ chainId = this.defaultNetworkId;
2225
+ break;
2226
+ }
2215
2227
  const connectDetails = {
2216
2228
  connected: true,
2217
- chainId: ethers.BigNumber.from(this.defaultNetworkId).toHexString()
2229
+ chainId: ethers.BigNumber.from(chainId).toHexString()
2218
2230
  };
2219
2231
  if (options && options.askForEmail) {
2220
2232
  var _this$auxDataProvider;
@@ -2237,7 +2249,7 @@ class WalletRequestHandler {
2237
2249
 
2238
2250
  try {
2239
2251
  // TODO: Either implement account as a signer, or change signAuthorization to accept an account
2240
- connectDetails.proof = await signAuthorization(this.account, this.defaultNetworkId, authOptions);
2252
+ connectDetails.proof = await signAuthorization(this.account, chainId, authOptions);
2241
2253
  } catch (err) {
2242
2254
  logger.warn(`connect, signAuthorization failed for options: ${JSON.stringify(options)}, due to: ${err.message}`);
2243
2255
  return {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@0xsequence/provider",
3
- "version": "0.0.0-20230320165616",
3
+ "version": "0.0.0-20230321200348",
4
4
  "description": "provider sub-package for Sequence",
5
5
  "repository": "https://github.com/0xsequence/sequence.js/tree/master/packages/provider",
6
6
  "source": "src/index.ts",
@@ -9,15 +9,15 @@
9
9
  "author": "Horizon Blockchain Games",
10
10
  "license": "Apache-2.0",
11
11
  "dependencies": {
12
- "@0xsequence/abi": "0.0.0-20230320165616",
13
- "@0xsequence/account": "0.0.0-20230320165616",
14
- "@0xsequence/auth": "0.0.0-20230320165616",
15
- "@0xsequence/core": "0.0.0-20230320165616",
16
- "@0xsequence/migration": "0.0.0-20230320165616",
17
- "@0xsequence/network": "0.0.0-20230320165616",
18
- "@0xsequence/relayer": "0.0.0-20230320165616",
19
- "@0xsequence/utils": "0.0.0-20230320165616",
20
- "@0xsequence/wallet": "0.0.0-20230320165616",
12
+ "@0xsequence/abi": "0.0.0-20230321200348",
13
+ "@0xsequence/account": "0.0.0-20230321200348",
14
+ "@0xsequence/auth": "0.0.0-20230321200348",
15
+ "@0xsequence/core": "0.0.0-20230321200348",
16
+ "@0xsequence/migration": "0.0.0-20230321200348",
17
+ "@0xsequence/network": "0.0.0-20230321200348",
18
+ "@0xsequence/relayer": "0.0.0-20230321200348",
19
+ "@0xsequence/utils": "0.0.0-20230321200348",
20
+ "@0xsequence/wallet": "0.0.0-20230321200348",
21
21
  "eventemitter2": "^6.4.5",
22
22
  "webextension-polyfill": "^0.10.0"
23
23
  },
@@ -18,7 +18,7 @@ import {
18
18
 
19
19
  import { BigNumber, ethers, providers } from 'ethers'
20
20
 
21
- import { NetworkConfig, JsonRpcHandler, JsonRpcRequest, JsonRpcResponseCallback, JsonRpcResponse } from '@0xsequence/network'
21
+ import { NetworkConfig, JsonRpcHandler, JsonRpcRequest, JsonRpcResponseCallback, JsonRpcResponse, getChainId } from '@0xsequence/network'
22
22
  import { signAuthorization, AuthorizationOptions } from '@0xsequence/auth'
23
23
  import { logger, TypedData } from '@0xsequence/utils'
24
24
  import { commons } from '@0xsequence/core'
@@ -155,9 +155,22 @@ export class WalletRequestHandler implements ExternalProvider, JsonRpcHandler, P
155
155
  }
156
156
  }
157
157
 
158
+ let chainId: number
159
+ switch (typeof options?.networkId) {
160
+ case 'string':
161
+ chainId = getChainId(options.networkId)
162
+ break
163
+ case 'number':
164
+ chainId = options.networkId
165
+ break
166
+ default:
167
+ chainId = this.defaultNetworkId
168
+ break
169
+ }
170
+
158
171
  const connectDetails: ConnectDetails = {
159
172
  connected: true,
160
- chainId: ethers.BigNumber.from(this.defaultNetworkId).toHexString()
173
+ chainId: ethers.BigNumber.from(chainId).toHexString()
161
174
  }
162
175
 
163
176
  if (options && options.askForEmail) {
@@ -181,7 +194,7 @@ export class WalletRequestHandler implements ExternalProvider, JsonRpcHandler, P
181
194
 
182
195
  try {
183
196
  // TODO: Either implement account as a signer, or change signAuthorization to accept an account
184
- connectDetails.proof = await signAuthorization(this.account, this.defaultNetworkId, authOptions)
197
+ connectDetails.proof = await signAuthorization(this.account, chainId, authOptions)
185
198
  } catch (err) {
186
199
  logger.warn(`connect, signAuthorization failed for options: ${JSON.stringify(options)}, due to: ${err.message}`)
187
200
  return {