@0xsequence/provider 0.43.5 → 0.43.7

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

@@ -3408,7 +3408,7 @@ class Wallet {
         }, true);
       });
     };
-    this.loadSession = async function () {
+    this.loadSession = async function (preferredNetwork) {
       const data = await LocalStorage.getInstance().getItem('@sequence.session');
       if (!data || data === '') {
         return undefined;
@@ -3416,7 +3416,22 @@ class Wallet {
       try {
         const session = JSON.parse(data);
         if (session) {
-          _this.useSession(session, false);
+          // Setting preferredNetwork as default network if it's in session.networks
+          if (preferredNetwork !== undefined) {
+            var _session$networks;
+            const preferredNetworkIdNum = typeof preferredNetwork === 'string' ? parseInt(preferredNetwork) : preferredNetwork;
+            const isPreferredNetwork = n => n.name === preferredNetwork || n.chainId === preferredNetworkIdNum;
+            const preferredNetworkInConfig = (_session$networks = session.networks) == null ? void 0 : _session$networks.find(isPreferredNetwork);
+            const isAlreadyDefaultChain = preferredNetworkInConfig == null ? void 0 : preferredNetworkInConfig.isDefaultChain;
+            if (session.networks && preferredNetworkInConfig && !isAlreadyDefaultChain) {
+              const updatedNetworks = session.networks.map(n => _extends({}, n, {
+                isDefaultChain: isPreferredNetwork(n)
+              }));
+              session.networks = network.sortNetworks(updatedNetworks);
+              session.providerCache = undefined;
+            }
+          }
+          _this.useSession(session, true);
         }
         return session;
       } catch (err) {
@@ -3561,6 +3576,8 @@ class Wallet {
       // setup provider cache
       if (session.providerCache) {
         _this.transport.cachedProvider.setCache(session.providerCache);
+      } else {
+        _this.transport.cachedProvider.clearCache();
       }
 
       // persist
@@ -3787,7 +3804,7 @@ const initWallet = async (network, config) => {
     walletInstance.closeWallet();
   }
   walletInstance = new Wallet(network, config);
-  await walletInstance.loadSession();
+  await walletInstance.loadSession(network);
   return walletInstance;
 };
 const getWallet = () => {

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

@@ -3408,7 +3408,7 @@ class Wallet {
         }, true);
       });
     };
-    this.loadSession = async function () {
+    this.loadSession = async function (preferredNetwork) {
       const data = await LocalStorage.getInstance().getItem('@sequence.session');
       if (!data || data === '') {
         return undefined;
@@ -3416,7 +3416,22 @@ class Wallet {
       try {
         const session = JSON.parse(data);
         if (session) {
-          _this.useSession(session, false);
+          // Setting preferredNetwork as default network if it's in session.networks
+          if (preferredNetwork !== undefined) {
+            var _session$networks;
+            const preferredNetworkIdNum = typeof preferredNetwork === 'string' ? parseInt(preferredNetwork) : preferredNetwork;
+            const isPreferredNetwork = n => n.name === preferredNetwork || n.chainId === preferredNetworkIdNum;
+            const preferredNetworkInConfig = (_session$networks = session.networks) == null ? void 0 : _session$networks.find(isPreferredNetwork);
+            const isAlreadyDefaultChain = preferredNetworkInConfig == null ? void 0 : preferredNetworkInConfig.isDefaultChain;
+            if (session.networks && preferredNetworkInConfig && !isAlreadyDefaultChain) {
+              const updatedNetworks = session.networks.map(n => _extends({}, n, {
+                isDefaultChain: isPreferredNetwork(n)
+              }));
+              session.networks = network.sortNetworks(updatedNetworks);
+              session.providerCache = undefined;
+            }
+          }
+          _this.useSession(session, true);
         }
         return session;
       } catch (err) {
@@ -3561,6 +3576,8 @@ class Wallet {
       // setup provider cache
       if (session.providerCache) {
         _this.transport.cachedProvider.setCache(session.providerCache);
+      } else {
+        _this.transport.cachedProvider.clearCache();
       }
 
       // persist
@@ -3787,7 +3804,7 @@ const initWallet = async (network, config) => {
     walletInstance.closeWallet();
   }
   walletInstance = new Wallet(network, config);
-  await walletInstance.loadSession();
+  await walletInstance.loadSession(network);
   return walletInstance;
 };
 const getWallet = () => {

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

@@ -2,7 +2,7 @@ import { EventEmitter2 } from 'eventemitter2';
 import { logger, shallowCopy, resolveProperties, encodeMessageDigest, encodeTypedDataDigest, packMessageData, sanitizeNumberString, sanitizeHost, sanitizeAlphanumeric, base64EncodeObject, base64DecodeObject } from '@0xsequence/utils';
 import { ethers, BigNumber, providers } from 'ethers';
 import { addressOf, isConfigEqual } from '@0xsequence/config';
-import { JsonRpcSender, maybeChainId, allowProviderMiddleware, networkProviderMiddleware, CachedProvider, JsonRpcRouter, loggingProviderMiddleware, exceptionProviderMiddleware, findNetworkConfig, EagerProvider, SigningProvider, updateNetworkConfig, ensureValidNetworks } from '@0xsequence/network';
+import { JsonRpcSender, maybeChainId, allowProviderMiddleware, networkProviderMiddleware, CachedProvider, JsonRpcRouter, loggingProviderMiddleware, exceptionProviderMiddleware, sortNetworks, findNetworkConfig, EagerProvider, SigningProvider, updateNetworkConfig, ensureValidNetworks } from '@0xsequence/network';
 import { Signer, resolveArrayProperties, isValidSignature as isValidSignature$1, recoverConfig } from '@0xsequence/wallet';
 import { isSignedTransactions } from '@0xsequence/transactions';
 import { signAuthorization } from '@0xsequence/auth';
@@ -3404,7 +3404,7 @@ class Wallet {
         }, true);
       });
     };
-    this.loadSession = async function () {
+    this.loadSession = async function (preferredNetwork) {
       const data = await LocalStorage.getInstance().getItem('@sequence.session');
       if (!data || data === '') {
         return undefined;
@@ -3412,7 +3412,22 @@ class Wallet {
       try {
         const session = JSON.parse(data);
         if (session) {
-          _this.useSession(session, false);
+          // Setting preferredNetwork as default network if it's in session.networks
+          if (preferredNetwork !== undefined) {
+            var _session$networks;
+            const preferredNetworkIdNum = typeof preferredNetwork === 'string' ? parseInt(preferredNetwork) : preferredNetwork;
+            const isPreferredNetwork = n => n.name === preferredNetwork || n.chainId === preferredNetworkIdNum;
+            const preferredNetworkInConfig = (_session$networks = session.networks) == null ? void 0 : _session$networks.find(isPreferredNetwork);
+            const isAlreadyDefaultChain = preferredNetworkInConfig == null ? void 0 : preferredNetworkInConfig.isDefaultChain;
+            if (session.networks && preferredNetworkInConfig && !isAlreadyDefaultChain) {
+              const updatedNetworks = session.networks.map(n => _extends({}, n, {
+                isDefaultChain: isPreferredNetwork(n)
+              }));
+              session.networks = sortNetworks(updatedNetworks);
+              session.providerCache = undefined;
+            }
+          }
+          _this.useSession(session, true);
         }
         return session;
       } catch (err) {
@@ -3557,6 +3572,8 @@ class Wallet {
       // setup provider cache
       if (session.providerCache) {
         _this.transport.cachedProvider.setCache(session.providerCache);
+      } else {
+        _this.transport.cachedProvider.clearCache();
       }
 
       // persist
@@ -3783,7 +3800,7 @@ const initWallet = async (network, config) => {
     walletInstance.closeWallet();
   }
   walletInstance = new Wallet(network, config);
-  await walletInstance.loadSession();
+  await walletInstance.loadSession(network);
   return walletInstance;
 };
 const getWallet = () => {

package/dist/declarations/src/wallet.d.ts

@@ -39,7 +39,7 @@ export declare class Wallet implements WalletProvider {
     private providers;
     constructor(network?: string | number, config?: Partial<ProviderConfig>);
     private init;
-    loadSession: () => Promise<WalletSession | undefined>;
+    loadSession: (preferredNetwork?: string | number) => Promise<WalletSession | undefined>;
     connect: (options?: ConnectOptions) => Promise<ConnectDetails>;
     addConnectedSite(origin: string | undefined): Promise<void>;
     removeConnectedSite(origin: string): Promise<void>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@0xsequence/provider",
-  "version": "0.43.5",
+  "version": "0.43.7",
   "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.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",
+    "@0xsequence/abi": "^0.43.7",
+    "@0xsequence/auth": "^0.43.7",
+    "@0xsequence/config": "^0.43.7",
+    "@0xsequence/network": "^0.43.7",
+    "@0xsequence/transactions": "^0.43.7",
+    "@0xsequence/utils": "^0.43.7",
+    "@0xsequence/wallet": "^0.43.7",
     "eventemitter2": "^6.4.5",
     "webextension-polyfill-ts": "^0.26.0"
   },

package/src/wallet.ts

@@ -15,7 +15,8 @@ import {
   JsonRpcRequest,
   findNetworkConfig,
   updateNetworkConfig,
-  ensureValidNetworks
+  ensureValidNetworks,
+  sortNetworks
 } from '@0xsequence/network'
 import { WalletConfig, WalletState } from '@0xsequence/config'
 import { logger } from '@0xsequence/utils'
@@ -248,15 +249,30 @@ export class Wallet implements WalletProvider {
     })
   }
 
-  loadSession = async (): Promise<WalletSession | undefined> => {
+  loadSession = async (preferredNetwork?: string | number): Promise<WalletSession | undefined> => {
     const data = await LocalStorage.getInstance().getItem('@sequence.session')
     if (!data || data === '') {
       return undefined
     }
+
     try {
       const session = JSON.parse(data) as WalletSession
       if (session) {
-        this.useSession(session, false)
+        // Setting preferredNetwork as default network if it's in session.networks
+        if (preferredNetwork !== undefined) {
+          const preferredNetworkIdNum = typeof preferredNetwork === 'string' ? parseInt(preferredNetwork) : preferredNetwork
+          const isPreferredNetwork = (n: NetworkConfig) => n.name === preferredNetwork || n.chainId === preferredNetworkIdNum
+          const preferredNetworkInConfig = session.networks?.find(isPreferredNetwork)
+          const isAlreadyDefaultChain = preferredNetworkInConfig?.isDefaultChain
+
+          if (session.networks && preferredNetworkInConfig && !isAlreadyDefaultChain) {
+            const updatedNetworks = session.networks.map(n => ({ ...n, isDefaultChain: isPreferredNetwork(n) }))
+            session.networks = sortNetworks(updatedNetworks)
+            session.providerCache = undefined
+          }
+        }
+
+        this.useSession(session, true)
       }
       return session
     } catch (err) {
@@ -601,6 +617,8 @@ export class Wallet implements WalletProvider {
     // setup provider cache
     if (session.providerCache) {
       this.transport.cachedProvider!.setCache(session.providerCache)
+    } else {
+      this.transport.cachedProvider!.clearCache()
     }
 
     // persist
@@ -739,7 +757,7 @@ export const initWallet = async (network?: string | number, config?: Partial<Pro
     walletInstance.closeWallet()
   }
   walletInstance = new Wallet(network, config)
-  await walletInstance.loadSession()
+  await walletInstance.loadSession(network)
   return walletInstance
 }