@0xsequence/provider 0.43.6 → 0.43.8

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.
package/LICENSE ADDED
@@ -0,0 +1,219 @@
1
+ Copyright (c) 2017-present Horizon Blockchain Games Inc.
2
+
3
+ Licensed under the Apache License, Version 2.0 (the "License");
4
+ you may not use this file except in compliance with the License.
5
+ You may obtain a copy of the License at
6
+
7
+ http://www.apache.org/licenses/LICENSE-2.0
8
+
9
+ Unless required by applicable law or agreed to in writing, software
10
+ distributed under the License is distributed on an "AS IS" BASIS,
11
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12
+ See the License for the specific language governing permissions and
13
+ limitations under the License.
14
+
15
+
16
+ ------------------------------------------------------------------------
17
+
18
+
19
+ Apache License
20
+ Version 2.0, January 2004
21
+ http://www.apache.org/licenses/
22
+
23
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
24
+
25
+ 1. Definitions.
26
+
27
+ "License" shall mean the terms and conditions for use, reproduction,
28
+ and distribution as defined by Sections 1 through 9 of this document.
29
+
30
+ "Licensor" shall mean the copyright owner or entity authorized by
31
+ the copyright owner that is granting the License.
32
+
33
+ "Legal Entity" shall mean the union of the acting entity and all
34
+ other entities that control, are controlled by, or are under common
35
+ control with that entity. For the purposes of this definition,
36
+ "control" means (i) the power, direct or indirect, to cause the
37
+ direction or management of such entity, whether by contract or
38
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
39
+ outstanding shares, or (iii) beneficial ownership of such entity.
40
+
41
+ "You" (or "Your") shall mean an individual or Legal Entity
42
+ exercising permissions granted by this License.
43
+
44
+ "Source" form shall mean the preferred form for making modifications,
45
+ including but not limited to software source code, documentation
46
+ source, and configuration files.
47
+
48
+ "Object" form shall mean any form resulting from mechanical
49
+ transformation or translation of a Source form, including but
50
+ not limited to compiled object code, generated documentation,
51
+ and conversions to other media types.
52
+
53
+ "Work" shall mean the work of authorship, whether in Source or
54
+ Object form, made available under the License, as indicated by a
55
+ copyright notice that is included in or attached to the work
56
+ (an example is provided in the Appendix below).
57
+
58
+ "Derivative Works" shall mean any work, whether in Source or Object
59
+ form, that is based on (or derived from) the Work and for which the
60
+ editorial revisions, annotations, elaborations, or other modifications
61
+ represent, as a whole, an original work of authorship. For the purposes
62
+ of this License, Derivative Works shall not include works that remain
63
+ separable from, or merely link (or bind by name) to the interfaces of,
64
+ the Work and Derivative Works thereof.
65
+
66
+ "Contribution" shall mean any work of authorship, including
67
+ the original version of the Work and any modifications or additions
68
+ to that Work or Derivative Works thereof, that is intentionally
69
+ submitted to Licensor for inclusion in the Work by the copyright owner
70
+ or by an individual or Legal Entity authorized to submit on behalf of
71
+ the copyright owner. For the purposes of this definition, "submitted"
72
+ means any form of electronic, verbal, or written communication sent
73
+ to the Licensor or its representatives, including but not limited to
74
+ communication on electronic mailing lists, source code control systems,
75
+ and issue tracking systems that are managed by, or on behalf of, the
76
+ Licensor for the purpose of discussing and improving the Work, but
77
+ excluding communication that is conspicuously marked or otherwise
78
+ designated in writing by the copyright owner as "Not a Contribution."
79
+
80
+ "Contributor" shall mean Licensor and any individual or Legal Entity
81
+ on behalf of whom a Contribution has been received by Licensor and
82
+ subsequently incorporated within the Work.
83
+
84
+ 2. Grant of Copyright License. Subject to the terms and conditions of
85
+ this License, each Contributor hereby grants to You a perpetual,
86
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
87
+ copyright license to reproduce, prepare Derivative Works of,
88
+ publicly display, publicly perform, sublicense, and distribute the
89
+ Work and such Derivative Works in Source or Object form.
90
+
91
+ 3. Grant of Patent License. Subject to the terms and conditions of
92
+ this License, each Contributor hereby grants to You a perpetual,
93
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
94
+ (except as stated in this section) patent license to make, have made,
95
+ use, offer to sell, sell, import, and otherwise transfer the Work,
96
+ where such license applies only to those patent claims licensable
97
+ by such Contributor that are necessarily infringed by their
98
+ Contribution(s) alone or by combination of their Contribution(s)
99
+ with the Work to which such Contribution(s) was submitted. If You
100
+ institute patent litigation against any entity (including a
101
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
102
+ or a Contribution incorporated within the Work constitutes direct
103
+ or contributory patent infringement, then any patent licenses
104
+ granted to You under this License for that Work shall terminate
105
+ as of the date such litigation is filed.
106
+
107
+ 4. Redistribution. You may reproduce and distribute copies of the
108
+ Work or Derivative Works thereof in any medium, with or without
109
+ modifications, and in Source or Object form, provided that You
110
+ meet the following conditions:
111
+
112
+ (a) You must give any other recipients of the Work or
113
+ Derivative Works a copy of this License; and
114
+
115
+ (b) You must cause any modified files to carry prominent notices
116
+ stating that You changed the files; and
117
+
118
+ (c) You must retain, in the Source form of any Derivative Works
119
+ that You distribute, all copyright, patent, trademark, and
120
+ attribution notices from the Source form of the Work,
121
+ excluding those notices that do not pertain to any part of
122
+ the Derivative Works; and
123
+
124
+ (d) If the Work includes a "NOTICE" text file as part of its
125
+ distribution, then any Derivative Works that You distribute must
126
+ include a readable copy of the attribution notices contained
127
+ within such NOTICE file, excluding those notices that do not
128
+ pertain to any part of the Derivative Works, in at least one
129
+ of the following places: within a NOTICE text file distributed
130
+ as part of the Derivative Works; within the Source form or
131
+ documentation, if provided along with the Derivative Works; or,
132
+ within a display generated by the Derivative Works, if and
133
+ wherever such third-party notices normally appear. The contents
134
+ of the NOTICE file are for informational purposes only and
135
+ do not modify the License. You may add Your own attribution
136
+ notices within Derivative Works that You distribute, alongside
137
+ or as an addendum to the NOTICE text from the Work, provided
138
+ that such additional attribution notices cannot be construed
139
+ as modifying the License.
140
+
141
+ You may add Your own copyright statement to Your modifications and
142
+ may provide additional or different license terms and conditions
143
+ for use, reproduction, or distribution of Your modifications, or
144
+ for any such Derivative Works as a whole, provided Your use,
145
+ reproduction, and distribution of the Work otherwise complies with
146
+ the conditions stated in this License.
147
+
148
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
149
+ any Contribution intentionally submitted for inclusion in the Work
150
+ by You to the Licensor shall be under the terms and conditions of
151
+ this License, without any additional terms or conditions.
152
+ Notwithstanding the above, nothing herein shall supersede or modify
153
+ the terms of any separate license agreement you may have executed
154
+ with Licensor regarding such Contributions.
155
+
156
+ 6. Trademarks. This License does not grant permission to use the trade
157
+ names, trademarks, service marks, or product names of the Licensor,
158
+ except as required for reasonable and customary use in describing the
159
+ origin of the Work and reproducing the content of the NOTICE file.
160
+
161
+ 7. Disclaimer of Warranty. Unless required by applicable law or
162
+ agreed to in writing, Licensor provides the Work (and each
163
+ Contributor provides its Contributions) on an "AS IS" BASIS,
164
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
165
+ implied, including, without limitation, any warranties or conditions
166
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
167
+ PARTICULAR PURPOSE. You are solely responsible for determining the
168
+ appropriateness of using or redistributing the Work and assume any
169
+ risks associated with Your exercise of permissions under this License.
170
+
171
+ 8. Limitation of Liability. In no event and under no legal theory,
172
+ whether in tort (including negligence), contract, or otherwise,
173
+ unless required by applicable law (such as deliberate and grossly
174
+ negligent acts) or agreed to in writing, shall any Contributor be
175
+ liable to You for damages, including any direct, indirect, special,
176
+ incidental, or consequential damages of any character arising as a
177
+ result of this License or out of the use or inability to use the
178
+ Work (including but not limited to damages for loss of goodwill,
179
+ work stoppage, computer failure or malfunction, or any and all
180
+ other commercial damages or losses), even if such Contributor
181
+ has been advised of the possibility of such damages.
182
+
183
+ 9. Accepting Warranty or Additional Liability. While redistributing
184
+ the Work or Derivative Works thereof, You may choose to offer,
185
+ and charge a fee for, acceptance of support, warranty, indemnity,
186
+ or other liability obligations and/or rights consistent with this
187
+ License. However, in accepting such obligations, You may act only
188
+ on Your own behalf and on Your sole responsibility, not on behalf
189
+ of any other Contributor, and only if You agree to indemnify,
190
+ defend, and hold each Contributor harmless for any liability
191
+ incurred by, or claims asserted against, such Contributor by reason
192
+ of your accepting any such warranty or additional liability.
193
+
194
+ END OF TERMS AND CONDITIONS
195
+
196
+ APPENDIX: How to apply the Apache License to your work.
197
+
198
+ To apply the Apache License to your work, attach the following
199
+ boilerplate notice, with the fields enclosed by brackets "[]"
200
+ replaced with your own identifying information. (Don't include
201
+ the brackets!) The text should be enclosed in the appropriate
202
+ comment syntax for the file format. We also recommend that a
203
+ file or class name and description of purpose be included on the
204
+ same "printed page" as the copyright notice for easier
205
+ identification within third-party archives.
206
+
207
+ Copyright [yyyy] [name of copyright owner]
208
+
209
+ Licensed under the Apache License, Version 2.0 (the "License");
210
+ you may not use this file except in compliance with the License.
211
+ You may obtain a copy of the License at
212
+
213
+ http://www.apache.org/licenses/LICENSE-2.0
214
+
215
+ Unless required by applicable law or agreed to in writing, software
216
+ distributed under the License is distributed on an "AS IS" BASIS,
217
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
218
+ See the License for the specific language governing permissions and
219
+ limitations under the License.
@@ -3408,7 +3408,7 @@ class Wallet {
3408
3408
  }, true);
3409
3409
  });
3410
3410
  };
3411
- this.loadSession = async function () {
3411
+ this.loadSession = async function (preferredNetwork) {
3412
3412
  const data = await LocalStorage.getInstance().getItem('@sequence.session');
3413
3413
  if (!data || data === '') {
3414
3414
  return undefined;
@@ -3416,7 +3416,22 @@ class Wallet {
3416
3416
  try {
3417
3417
  const session = JSON.parse(data);
3418
3418
  if (session) {
3419
- _this.useSession(session, false);
3419
+ // Setting preferredNetwork as default network if it's in session.networks
3420
+ if (preferredNetwork !== undefined) {
3421
+ var _session$networks;
3422
+ const preferredNetworkIdNum = typeof preferredNetwork === 'string' ? parseInt(preferredNetwork) : preferredNetwork;
3423
+ const isPreferredNetwork = n => n.name === preferredNetwork || n.chainId === preferredNetworkIdNum;
3424
+ const preferredNetworkInConfig = (_session$networks = session.networks) == null ? void 0 : _session$networks.find(isPreferredNetwork);
3425
+ const isAlreadyDefaultChain = preferredNetworkInConfig == null ? void 0 : preferredNetworkInConfig.isDefaultChain;
3426
+ if (session.networks && preferredNetworkInConfig && !isAlreadyDefaultChain) {
3427
+ const updatedNetworks = session.networks.map(n => _extends({}, n, {
3428
+ isDefaultChain: isPreferredNetwork(n)
3429
+ }));
3430
+ session.networks = network.sortNetworks(updatedNetworks);
3431
+ session.providerCache = undefined;
3432
+ }
3433
+ }
3434
+ _this.useSession(session, true);
3420
3435
  }
3421
3436
  return session;
3422
3437
  } catch (err) {
@@ -3561,6 +3576,8 @@ class Wallet {
3561
3576
  // setup provider cache
3562
3577
  if (session.providerCache) {
3563
3578
  _this.transport.cachedProvider.setCache(session.providerCache);
3579
+ } else {
3580
+ _this.transport.cachedProvider.clearCache();
3564
3581
  }
3565
3582
 
3566
3583
  // persist
@@ -3675,7 +3692,9 @@ class Wallet {
3675
3692
  accountAddress: this.session.accountAddress,
3676
3693
  walletContext: this.session.walletContext,
3677
3694
  chainId: network$1.chainId
3678
- }), new network.SigningProvider(this.transport.provider), new network.CachedProvider(network$1.chainId)], new network.JsonRpcSender(rpcProvider));
3695
+ }), new network.SigningProvider(this.transport.provider), new network.CachedProvider({
3696
+ defaultChainId: network$1.chainId
3697
+ })], new network.JsonRpcSender(rpcProvider));
3679
3698
  provider = new Web3Provider(router, network$1.chainId);
3680
3699
  }
3681
3700
  this.providers[network$1.chainId] = provider;
@@ -3787,7 +3806,7 @@ const initWallet = async (network, config) => {
3787
3806
  walletInstance.closeWallet();
3788
3807
  }
3789
3808
  walletInstance = new Wallet(network, config);
3790
- await walletInstance.loadSession();
3809
+ await walletInstance.loadSession(network);
3791
3810
  return walletInstance;
3792
3811
  };
3793
3812
  const getWallet = () => {
@@ -3408,7 +3408,7 @@ class Wallet {
3408
3408
  }, true);
3409
3409
  });
3410
3410
  };
3411
- this.loadSession = async function () {
3411
+ this.loadSession = async function (preferredNetwork) {
3412
3412
  const data = await LocalStorage.getInstance().getItem('@sequence.session');
3413
3413
  if (!data || data === '') {
3414
3414
  return undefined;
@@ -3416,7 +3416,22 @@ class Wallet {
3416
3416
  try {
3417
3417
  const session = JSON.parse(data);
3418
3418
  if (session) {
3419
- _this.useSession(session, false);
3419
+ // Setting preferredNetwork as default network if it's in session.networks
3420
+ if (preferredNetwork !== undefined) {
3421
+ var _session$networks;
3422
+ const preferredNetworkIdNum = typeof preferredNetwork === 'string' ? parseInt(preferredNetwork) : preferredNetwork;
3423
+ const isPreferredNetwork = n => n.name === preferredNetwork || n.chainId === preferredNetworkIdNum;
3424
+ const preferredNetworkInConfig = (_session$networks = session.networks) == null ? void 0 : _session$networks.find(isPreferredNetwork);
3425
+ const isAlreadyDefaultChain = preferredNetworkInConfig == null ? void 0 : preferredNetworkInConfig.isDefaultChain;
3426
+ if (session.networks && preferredNetworkInConfig && !isAlreadyDefaultChain) {
3427
+ const updatedNetworks = session.networks.map(n => _extends({}, n, {
3428
+ isDefaultChain: isPreferredNetwork(n)
3429
+ }));
3430
+ session.networks = network.sortNetworks(updatedNetworks);
3431
+ session.providerCache = undefined;
3432
+ }
3433
+ }
3434
+ _this.useSession(session, true);
3420
3435
  }
3421
3436
  return session;
3422
3437
  } catch (err) {
@@ -3561,6 +3576,8 @@ class Wallet {
3561
3576
  // setup provider cache
3562
3577
  if (session.providerCache) {
3563
3578
  _this.transport.cachedProvider.setCache(session.providerCache);
3579
+ } else {
3580
+ _this.transport.cachedProvider.clearCache();
3564
3581
  }
3565
3582
 
3566
3583
  // persist
@@ -3675,7 +3692,9 @@ class Wallet {
3675
3692
  accountAddress: this.session.accountAddress,
3676
3693
  walletContext: this.session.walletContext,
3677
3694
  chainId: network$1.chainId
3678
- }), new network.SigningProvider(this.transport.provider), new network.CachedProvider(network$1.chainId)], new network.JsonRpcSender(rpcProvider));
3695
+ }), new network.SigningProvider(this.transport.provider), new network.CachedProvider({
3696
+ defaultChainId: network$1.chainId
3697
+ })], new network.JsonRpcSender(rpcProvider));
3679
3698
  provider = new Web3Provider(router, network$1.chainId);
3680
3699
  }
3681
3700
  this.providers[network$1.chainId] = provider;
@@ -3787,7 +3806,7 @@ const initWallet = async (network, config) => {
3787
3806
  walletInstance.closeWallet();
3788
3807
  }
3789
3808
  walletInstance = new Wallet(network, config);
3790
- await walletInstance.loadSession();
3809
+ await walletInstance.loadSession(network);
3791
3810
  return walletInstance;
3792
3811
  };
3793
3812
  const getWallet = () => {
@@ -2,7 +2,7 @@ import { EventEmitter2 } from 'eventemitter2';
2
2
  import { logger, shallowCopy, resolveProperties, encodeMessageDigest, encodeTypedDataDigest, packMessageData, sanitizeNumberString, sanitizeHost, sanitizeAlphanumeric, base64EncodeObject, base64DecodeObject } from '@0xsequence/utils';
3
3
  import { ethers, BigNumber, providers } from 'ethers';
4
4
  import { addressOf, isConfigEqual } from '@0xsequence/config';
5
- import { JsonRpcSender, maybeChainId, allowProviderMiddleware, networkProviderMiddleware, CachedProvider, JsonRpcRouter, loggingProviderMiddleware, exceptionProviderMiddleware, findNetworkConfig, EagerProvider, SigningProvider, updateNetworkConfig, ensureValidNetworks } from '@0xsequence/network';
5
+ import { JsonRpcSender, maybeChainId, allowProviderMiddleware, networkProviderMiddleware, CachedProvider, JsonRpcRouter, loggingProviderMiddleware, exceptionProviderMiddleware, sortNetworks, findNetworkConfig, EagerProvider, SigningProvider, updateNetworkConfig, ensureValidNetworks } from '@0xsequence/network';
6
6
  import { Signer, resolveArrayProperties, isValidSignature as isValidSignature$1, recoverConfig } from '@0xsequence/wallet';
7
7
  import { isSignedTransactions } from '@0xsequence/transactions';
8
8
  import { signAuthorization } from '@0xsequence/auth';
@@ -3404,7 +3404,7 @@ class Wallet {
3404
3404
  }, true);
3405
3405
  });
3406
3406
  };
3407
- this.loadSession = async function () {
3407
+ this.loadSession = async function (preferredNetwork) {
3408
3408
  const data = await LocalStorage.getInstance().getItem('@sequence.session');
3409
3409
  if (!data || data === '') {
3410
3410
  return undefined;
@@ -3412,7 +3412,22 @@ class Wallet {
3412
3412
  try {
3413
3413
  const session = JSON.parse(data);
3414
3414
  if (session) {
3415
- _this.useSession(session, false);
3415
+ // Setting preferredNetwork as default network if it's in session.networks
3416
+ if (preferredNetwork !== undefined) {
3417
+ var _session$networks;
3418
+ const preferredNetworkIdNum = typeof preferredNetwork === 'string' ? parseInt(preferredNetwork) : preferredNetwork;
3419
+ const isPreferredNetwork = n => n.name === preferredNetwork || n.chainId === preferredNetworkIdNum;
3420
+ const preferredNetworkInConfig = (_session$networks = session.networks) == null ? void 0 : _session$networks.find(isPreferredNetwork);
3421
+ const isAlreadyDefaultChain = preferredNetworkInConfig == null ? void 0 : preferredNetworkInConfig.isDefaultChain;
3422
+ if (session.networks && preferredNetworkInConfig && !isAlreadyDefaultChain) {
3423
+ const updatedNetworks = session.networks.map(n => _extends({}, n, {
3424
+ isDefaultChain: isPreferredNetwork(n)
3425
+ }));
3426
+ session.networks = sortNetworks(updatedNetworks);
3427
+ session.providerCache = undefined;
3428
+ }
3429
+ }
3430
+ _this.useSession(session, true);
3416
3431
  }
3417
3432
  return session;
3418
3433
  } catch (err) {
@@ -3557,6 +3572,8 @@ class Wallet {
3557
3572
  // setup provider cache
3558
3573
  if (session.providerCache) {
3559
3574
  _this.transport.cachedProvider.setCache(session.providerCache);
3575
+ } else {
3576
+ _this.transport.cachedProvider.clearCache();
3560
3577
  }
3561
3578
 
3562
3579
  // persist
@@ -3671,7 +3688,9 @@ class Wallet {
3671
3688
  accountAddress: this.session.accountAddress,
3672
3689
  walletContext: this.session.walletContext,
3673
3690
  chainId: network.chainId
3674
- }), new SigningProvider(this.transport.provider), new CachedProvider(network.chainId)], new JsonRpcSender(rpcProvider));
3691
+ }), new SigningProvider(this.transport.provider), new CachedProvider({
3692
+ defaultChainId: network.chainId
3693
+ })], new JsonRpcSender(rpcProvider));
3675
3694
  provider = new Web3Provider(router, network.chainId);
3676
3695
  }
3677
3696
  this.providers[network.chainId] = provider;
@@ -3783,7 +3802,7 @@ const initWallet = async (network, config) => {
3783
3802
  walletInstance.closeWallet();
3784
3803
  }
3785
3804
  walletInstance = new Wallet(network, config);
3786
- await walletInstance.loadSession();
3805
+ await walletInstance.loadSession(network);
3787
3806
  return walletInstance;
3788
3807
  };
3789
3808
  const getWallet = () => {
@@ -12,4 +12,4 @@ export declare class ProxyMessageChannelPort implements ProviderMessageTransport
12
12
  on<K extends keyof ProxyEventTypes>(event: K, fn: ProxyEventTypes[K]): void;
13
13
  once<K extends keyof ProxyEventTypes>(event: K, fn: ProxyEventTypes[K]): void;
14
14
  }
15
- export declare type ProxyEventTypes = Pick<ProviderEventTypes, 'open' | 'close' | 'connect' | 'disconnect'>;
15
+ export type ProxyEventTypes = Pick<ProviderEventTypes, 'open' | 'close' | 'connect' | 'disconnect'>;
@@ -3,7 +3,7 @@ import { providers } from 'ethers';
3
3
  import { NetworkConfig, JsonRpcHandler, JsonRpcRequest, JsonRpcResponseCallback } from '@0xsequence/network';
4
4
  import { Signer } from '@0xsequence/wallet';
5
5
  import { TransactionRequest } from '@0xsequence/transactions';
6
- declare type ExternalProvider = providers.ExternalProvider;
6
+ type ExternalProvider = providers.ExternalProvider;
7
7
  export interface WalletSignInOptions {
8
8
  connect?: boolean;
9
9
  mainnetNetworks?: NetworkConfig[];
@@ -35,9 +35,9 @@ export interface ProviderMessage<T> {
35
35
  chainId?: number;
36
36
  origin?: string;
37
37
  }
38
- export declare type ProviderMessageRequest = ProviderMessage<JsonRpcRequest>;
39
- export declare type ProviderMessageResponse = ProviderMessage<JsonRpcResponse>;
40
- export declare type ProviderMessageResponseCallback = (error?: ProviderRpcError, response?: ProviderMessageResponse) => void;
38
+ export type ProviderMessageRequest = ProviderMessage<JsonRpcRequest>;
39
+ export type ProviderMessageResponse = ProviderMessage<JsonRpcResponse>;
40
+ export type ProviderMessageResponseCallback = (error?: ProviderRpcError, response?: ProviderMessageResponse) => void;
41
41
  export interface ProviderRpcError extends Error {
42
42
  message: string;
43
43
  code?: number;
@@ -52,7 +52,7 @@ export interface ProviderMessageTransport {
52
52
  handleMessage(message: ProviderMessage<any>): void;
53
53
  sendMessage(message: ProviderMessage<any>): void;
54
54
  }
55
- export declare type WindowSessionParam = 'sid' | 'net' | 'intent';
55
+ export type WindowSessionParam = 'sid' | 'net' | 'intent';
56
56
  export interface WindowSessionParams extends URLSearchParams {
57
57
  get(name: WindowSessionParam): string | null;
58
58
  set(name: WindowSessionParam, value: string): void;
@@ -179,10 +179,10 @@ export interface Settings {
179
179
  /** light and dark are the main themes, to use other themes in wallet settings,
180
180
  * you can use the camel case version of the name in the wallet settings.
181
181
  * For example: "Blue Dark" on wallet UI can be passed as "blueDark" */
182
- export declare type ThemeOption = 'light' | 'dark' | string;
183
- export declare type PaymentProviderOption = 'moonpay' | 'wyre' | 'ramp';
184
- export declare type CurrencyOption = 'usdc' | 'eth' | 'matic';
185
- export declare type SignInOption = 'email' | 'google' | 'apple' | 'facebook' | 'discord' | 'twitch';
182
+ export type ThemeOption = 'light' | 'dark' | string;
183
+ export type PaymentProviderOption = 'moonpay' | 'wyre' | 'ramp';
184
+ export type CurrencyOption = 'usdc' | 'eth' | 'matic';
185
+ export type SignInOption = 'email' | 'google' | 'apple' | 'facebook' | 'discord' | 'twitch';
186
186
  export interface ConnectDetails {
187
187
  chainId?: string;
188
188
  error?: string;
@@ -191,8 +191,8 @@ export interface ConnectDetails {
191
191
  proof?: ETHAuthProof;
192
192
  email?: string;
193
193
  }
194
- export declare type PromptConnectDetails = Pick<ConnectDetails, 'chainId' | 'error' | 'connected' | 'proof' | 'email'>;
195
- export declare type OpenWalletIntent = {
194
+ export type PromptConnectDetails = Pick<ConnectDetails, 'chainId' | 'error' | 'connected' | 'proof' | 'email'>;
195
+ export type OpenWalletIntent = {
196
196
  type: 'connect';
197
197
  options?: ConnectOptions;
198
198
  } | {
@@ -237,5 +237,5 @@ export interface TypedEventEmitter<Events> {
237
237
  listeners<E extends keyof Events>(event: E): Function[];
238
238
  listenerCount<E extends keyof Events>(event: E): number;
239
239
  }
240
- declare type Arguments<T> = [T] extends [(...args: infer U) => any] ? U : [T] extends [void] ? [] : [T];
240
+ type Arguments<T> = [T] extends [(...args: infer U) => any] ? U : [T] extends [void] ? [] : [T];
241
241
  export {};
@@ -10,9 +10,9 @@ export declare class WalletUtils {
10
10
  signAuthMessage(message: BytesLike, allSigners?: boolean): Promise<string>;
11
11
  signTypedData(domain: TypedDataDomain, types: Record<string, Array<TypedDataField>>, message: Record<string, any>, chainId?: ChainIdLike, allSigners?: boolean): Promise<string>;
12
12
  signAuthTypedData(domain: TypedDataDomain, types: Record<string, Array<TypedDataField>>, message: Record<string, any>, allSigners?: boolean): Promise<string>;
13
- isValidSignature(address: string, digest: Uint8Array, signature: string, chainId: number, walletContext?: WalletContext): Promise<boolean | undefined>;
14
- isValidMessageSignature(address: string, message: string | Uint8Array, signature: string, chainId: number, walletContext?: WalletContext): Promise<boolean | undefined>;
15
- isValidTypedDataSignature(address: string, typedData: TypedData, signature: string, chainId: number, walletContext?: WalletContext): Promise<boolean | undefined>;
13
+ isValidSignature(address: string, digest: Uint8Array, signature: string, chainId: number, walletContext?: WalletContext): Promise<boolean>;
14
+ isValidMessageSignature(address: string, message: string | Uint8Array, signature: string, chainId: number, walletContext?: WalletContext): Promise<boolean>;
15
+ isValidTypedDataSignature(address: string, typedData: TypedData, signature: string, chainId: number, walletContext?: WalletContext): Promise<boolean>;
16
16
  recoverWalletConfig: (address: string, digest: BytesLike, signature: string | DecodedSignature, chainId: BigNumberish, walletContext?: WalletContext) => Promise<WalletConfig>;
17
17
  recoverWalletConfigFromMessage: (address: string, message: string | Uint8Array, signature: string | DecodedSignature, chainId: BigNumberish, walletContext?: WalletContext) => Promise<WalletConfig>;
18
18
  recoverWalletConfigFromTypedData: (address: string, typedData: TypedData, signature: string | DecodedSignature, chainId: BigNumberish, walletContext?: WalletContext) => Promise<WalletConfig>;
@@ -6,9 +6,9 @@ import { Web3Provider } from './provider';
6
6
  import { Signer } from '@0xsequence/wallet';
7
7
  export declare const messageToBytes: (message: BytesLike) => Uint8Array;
8
8
  export declare const prefixEIP191Message: (message: BytesLike) => Uint8Array;
9
- export declare const isValidSignature: (address: string, digest: Uint8Array, sig: string, provider: Web3Provider | ethers.providers.Web3Provider, chainId?: number, walletContext?: WalletContext) => Promise<boolean | undefined>;
10
- export declare const isValidMessageSignature: (address: string, message: string | Uint8Array, signature: string, provider: Web3Provider | ethers.providers.Web3Provider, chainId?: number, walletContext?: WalletContext) => Promise<boolean | undefined>;
11
- export declare const isValidTypedDataSignature: (address: string, typedData: TypedData, signature: string, provider: Web3Provider | ethers.providers.Web3Provider, chainId?: number, walletContext?: WalletContext) => Promise<boolean | undefined>;
9
+ export declare const isValidSignature: (address: string, digest: Uint8Array, sig: string, provider: Web3Provider | ethers.providers.Web3Provider, chainId?: number, walletContext?: WalletContext) => Promise<boolean>;
10
+ export declare const isValidMessageSignature: (address: string, message: string | Uint8Array, signature: string, provider: Web3Provider | ethers.providers.Web3Provider, chainId?: number, walletContext?: WalletContext) => Promise<boolean>;
11
+ export declare const isValidTypedDataSignature: (address: string, typedData: TypedData, signature: string, provider: Web3Provider | ethers.providers.Web3Provider, chainId?: number, walletContext?: WalletContext) => Promise<boolean>;
12
12
  export declare const recoverWalletConfig: (address: string, digest: BytesLike, signature: string | DecodedSignature, chainId: BigNumberish, walletContext?: WalletContext) => Promise<WalletConfig>;
13
13
  export declare const isBrowserExtension: () => boolean;
14
14
  export declare const isUnityPlugin: () => boolean;
@@ -39,7 +39,7 @@ export declare class Wallet implements WalletProvider {
39
39
  private providers;
40
40
  constructor(network?: string | number, config?: Partial<ProviderConfig>);
41
41
  private init;
42
- loadSession: () => Promise<WalletSession | undefined>;
42
+ loadSession: (preferredNetwork?: string | number) => Promise<WalletSession | undefined>;
43
43
  connect: (options?: ConnectOptions) => Promise<ConnectDetails>;
44
44
  addConnectedSite(origin: string | undefined): Promise<void>;
45
45
  removeConnectedSite(origin: string): Promise<void>;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@0xsequence/provider",
3
- "version": "0.43.6",
3
+ "version": "0.43.8",
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",
@@ -8,19 +8,15 @@
8
8
  "module": "dist/0xsequence-provider.esm.js",
9
9
  "author": "Horizon Blockchain Games",
10
10
  "license": "Apache-2.0",
11
- "scripts": {
12
- "test": "yarn test:file tests/**/*.spec.ts",
13
- "test:file": "TS_NODE_PROJECT=../../tsconfig.test.json mocha -r ts-node/register --timeout 30000",
14
- "typecheck": "tsc --noEmit"
15
- },
16
11
  "dependencies": {
17
- "@0xsequence/abi": "^0.43.6",
18
- "@0xsequence/auth": "^0.43.6",
19
- "@0xsequence/config": "^0.43.6",
20
- "@0xsequence/network": "^0.43.6",
21
- "@0xsequence/transactions": "^0.43.6",
22
- "@0xsequence/utils": "^0.43.6",
23
- "@0xsequence/wallet": "^0.43.6",
12
+ "@0xsequence/abi": "^0.43.8",
13
+ "@0xsequence/auth": "^0.43.8",
14
+ "@0xsequence/config": "^0.43.8",
15
+ "@0xsequence/network": "^0.43.8",
16
+ "@0xsequence/relayer": "^0.43.8",
17
+ "@0xsequence/transactions": "^0.43.8",
18
+ "@0xsequence/utils": "^0.43.8",
19
+ "@0xsequence/wallet": "^0.43.8",
24
20
  "eventemitter2": "^6.4.5",
25
21
  "webextension-polyfill-ts": "^0.26.0"
26
22
  },
@@ -33,5 +29,10 @@
33
29
  "files": [
34
30
  "src",
35
31
  "dist"
36
- ]
32
+ ],
33
+ "scripts": {
34
+ "test": "pnpm test:file tests/**/*.spec.ts",
35
+ "test:file": "NODE_OPTIONS='--loader tsx' mocha --timeout 30000",
36
+ "typecheck": "tsc --noEmit"
37
+ }
37
38
  }
@@ -59,7 +59,7 @@ export class WalletUtils {
59
59
  signature: string,
60
60
  chainId: number,
61
61
  walletContext?: WalletContext
62
- ): Promise<boolean | undefined> {
62
+ ): Promise<boolean> {
63
63
  const provider = this.wallet.getProvider(chainId)
64
64
  if (!provider) throw new Error(`unable to get provider for chainId ${chainId}`)
65
65
  return isValidSignature(address, digest, signature, provider, chainId, walletContext)
@@ -72,7 +72,7 @@ export class WalletUtils {
72
72
  signature: string,
73
73
  chainId: number,
74
74
  walletContext?: WalletContext
75
- ): Promise<boolean | undefined> {
75
+ ): Promise<boolean> {
76
76
  const provider = this.wallet.getProvider(chainId)
77
77
  if (!provider) throw new Error(`unable to get provider for chainId ${chainId}`)
78
78
  const prefixed = prefixEIP191Message(message)
@@ -87,7 +87,7 @@ export class WalletUtils {
87
87
  signature: string,
88
88
  chainId: number,
89
89
  walletContext?: WalletContext
90
- ): Promise<boolean | undefined> {
90
+ ): Promise<boolean> {
91
91
  return this.isValidSignature(address, encodeTypedDataDigest(typedData), signature, chainId, walletContext)
92
92
  }
93
93
 
package/src/utils.ts CHANGED
@@ -32,7 +32,7 @@ export const isValidSignature = async (
32
32
  provider: Web3Provider | ethers.providers.Web3Provider,
33
33
  chainId?: number,
34
34
  walletContext?: WalletContext
35
- ): Promise<boolean | undefined> => {
35
+ ): Promise<boolean> => {
36
36
  if (!chainId) {
37
37
  chainId = (await provider.getNetwork())?.chainId
38
38
  }
@@ -49,7 +49,7 @@ export const isValidMessageSignature = async (
49
49
  provider: Web3Provider | ethers.providers.Web3Provider,
50
50
  chainId?: number,
51
51
  walletContext?: WalletContext
52
- ): Promise<boolean | undefined> => {
52
+ ): Promise<boolean> => {
53
53
  const prefixed = prefixEIP191Message(message)
54
54
  const digest = encodeMessageDigest(prefixed)
55
55
  return isValidSignature(address, digest, signature, provider, chainId, walletContext)
@@ -62,7 +62,7 @@ export const isValidTypedDataSignature = (
62
62
  provider: Web3Provider | ethers.providers.Web3Provider,
63
63
  chainId?: number,
64
64
  walletContext?: WalletContext
65
- ): Promise<boolean | undefined> => {
65
+ ): Promise<boolean> => {
66
66
  return isValidSignature(address, encodeTypedDataDigest(typedData), signature, provider, chainId, walletContext)
67
67
  }
68
68
 
package/src/wallet.ts CHANGED
@@ -15,7 +15,8 @@ import {
15
15
  JsonRpcRequest,
16
16
  findNetworkConfig,
17
17
  updateNetworkConfig,
18
- ensureValidNetworks
18
+ ensureValidNetworks,
19
+ sortNetworks
19
20
  } from '@0xsequence/network'
20
21
  import { WalletConfig, WalletState } from '@0xsequence/config'
21
22
  import { logger } from '@0xsequence/utils'
@@ -248,15 +249,30 @@ export class Wallet implements WalletProvider {
248
249
  })
249
250
  }
250
251
 
251
- loadSession = async (): Promise<WalletSession | undefined> => {
252
+ loadSession = async (preferredNetwork?: string | number): Promise<WalletSession | undefined> => {
252
253
  const data = await LocalStorage.getInstance().getItem('@sequence.session')
253
254
  if (!data || data === '') {
254
255
  return undefined
255
256
  }
257
+
256
258
  try {
257
259
  const session = JSON.parse(data) as WalletSession
258
260
  if (session) {
259
- this.useSession(session, false)
261
+ // Setting preferredNetwork as default network if it's in session.networks
262
+ if (preferredNetwork !== undefined) {
263
+ const preferredNetworkIdNum = typeof preferredNetwork === 'string' ? parseInt(preferredNetwork) : preferredNetwork
264
+ const isPreferredNetwork = (n: NetworkConfig) => n.name === preferredNetwork || n.chainId === preferredNetworkIdNum
265
+ const preferredNetworkInConfig = session.networks?.find(isPreferredNetwork)
266
+ const isAlreadyDefaultChain = preferredNetworkInConfig?.isDefaultChain
267
+
268
+ if (session.networks && preferredNetworkInConfig && !isAlreadyDefaultChain) {
269
+ const updatedNetworks = session.networks.map(n => ({ ...n, isDefaultChain: isPreferredNetwork(n) }))
270
+ session.networks = sortNetworks(updatedNetworks)
271
+ session.providerCache = undefined
272
+ }
273
+ }
274
+
275
+ this.useSession(session, true)
260
276
  }
261
277
  return session
262
278
  } catch (err) {
@@ -516,7 +532,7 @@ export class Wallet implements WalletProvider {
516
532
  chainId: network.chainId
517
533
  }),
518
534
  new SigningProvider(this.transport.provider!),
519
- new CachedProvider(network.chainId)
535
+ new CachedProvider({ defaultChainId: network.chainId })
520
536
  ],
521
537
  new JsonRpcSender(rpcProvider)
522
538
  )
@@ -601,6 +617,8 @@ export class Wallet implements WalletProvider {
601
617
  // setup provider cache
602
618
  if (session.providerCache) {
603
619
  this.transport.cachedProvider!.setCache(session.providerCache)
620
+ } else {
621
+ this.transport.cachedProvider!.clearCache()
604
622
  }
605
623
 
606
624
  // persist
@@ -739,7 +757,7 @@ export const initWallet = async (network?: string | number, config?: Partial<Pro
739
757
  walletInstance.closeWallet()
740
758
  }
741
759
  walletInstance = new Wallet(network, config)
742
- await walletInstance.loadSession()
760
+ await walletInstance.loadSession(network)
743
761
  return walletInstance
744
762
  }
745
763