@0xsequence/provider 0.39.6 → 0.40.2

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

@@ -3238,7 +3238,7 @@ class WalletUtils {
 }
 
 class Wallet {
-  constructor(defaultNetworkId, config) {
+  constructor(_network, config) {
     var _this = this;
 
     this.utils = void 0;
@@ -3366,13 +3366,28 @@ class Wallet {
         this.useSession({
           walletContext: walletContext
         }, true);
-      }); // Load existing session from localStorage
+      });
+    };
+
+    this.loadSession = async function () {
+      const data = await LocalStorage.getInstance().getItem('@sequence.session');
+
+      if (!data || data === '') {
+        return undefined;
+      }
+
+      try {
+        const session = JSON.parse(data);
 
-      this.loadSession().then(session => {
         if (session) {
-          this.useSession(session, false);
+          _this.useSession(session, false);
         }
-      });
+
+        return session;
+      } catch (err) {
+        utils.logger.warn('loadSession failed, unable to parse session payload from storage.');
+        return undefined;
+      }
     };
 
     this.connect = async function (options) {
@@ -3506,26 +3521,10 @@ class Wallet {
       this.transport.messageProvider.closeWallet();
     };
 
-    this.loadSession = async function () {
-      const data = await LocalStorage.getInstance().getItem('@sequence.session');
-
-      if (!data || data === '') {
-        return undefined;
-      }
-
-      try {
-        const session = JSON.parse(data);
-        return session;
-      } catch (err) {
-        utils.logger.warn('loadSession failed, unable to parse session payload from localStorage.');
-        return undefined;
-      }
-    };
-
-    this.saveSession = session => {
+    this.saveSession = async function (session) {
       utils.logger.debug('wallet provider: saving session');
       const data = JSON.stringify(session);
-      LocalStorage.getInstance().setItem('@sequence.session', data);
+      await LocalStorage.getInstance().setItem('@sequence.session', data);
     };
 
     this.useSession = async function (session, autoSave = true) {
@@ -3566,8 +3565,8 @@ class Wallet {
       this.config = _extends({}, this.config, config);
     }
 
-    if (defaultNetworkId) {
-      this.config.defaultNetworkId = defaultNetworkId;
+    if (_network) {
+      this.config.defaultNetworkId = _network;
     } else if (!this.config.defaultNetworkId) {
       this.config.defaultNetworkId = 'mainnet';
     }
@@ -3622,7 +3621,9 @@ class Wallet {
     }
 
     this.clearSession();
-  }
+  } // TODO: add switchNetwork(network: string | number) which will call wallet_switchEthereumChain
+  // and on successful response, will update the provider info here, etc.
+
 
   getProviderConfig() {
     return this.config;
@@ -3802,6 +3803,23 @@ const DefaultProviderConfig = {
     }
   }
 };
+let walletInstance;
+const initWallet = async (network, config) => {
+  if (walletInstance && walletInstance.isOpened()) {
+    walletInstance.closeWallet();
+  }
+
+  walletInstance = new Wallet(network, config);
+  await walletInstance.loadSession();
+  return walletInstance;
+};
+const getWallet = () => {
+  if (!walletInstance) {
+    throw new Error('Wallet has not been initialized, call sequence.initWallet(network, config) first.');
+  }
+
+  return walletInstance;
+};
 
 exports.BaseInjectedTransport = BaseInjectedTransport;
 exports.BaseProviderTransport = BaseProviderTransport;
@@ -3828,6 +3846,8 @@ exports.Web3Signer = Web3Signer;
 exports.WindowMessageHandler = WindowMessageHandler;
 exports.WindowMessageProvider = WindowMessageProvider;
 exports.WindowSessionParams = WindowSessionParams;
+exports.getWallet = getWallet;
+exports.initWallet = initWallet;
 exports.isBrowserExtension = isBrowserExtension;
 exports.isSequenceProvider = isSequenceProvider;
 exports.isValidMessageSignature = isValidMessageSignature;

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

@@ -3238,7 +3238,7 @@ class WalletUtils {
 }
 
 class Wallet {
-  constructor(defaultNetworkId, config) {
+  constructor(_network, config) {
     var _this = this;
 
     this.utils = void 0;
@@ -3366,13 +3366,28 @@ class Wallet {
         this.useSession({
           walletContext: walletContext
         }, true);
-      }); // Load existing session from localStorage
+      });
+    };
+
+    this.loadSession = async function () {
+      const data = await LocalStorage.getInstance().getItem('@sequence.session');
+
+      if (!data || data === '') {
+        return undefined;
+      }
+
+      try {
+        const session = JSON.parse(data);
 
-      this.loadSession().then(session => {
         if (session) {
-          this.useSession(session, false);
+          _this.useSession(session, false);
         }
-      });
+
+        return session;
+      } catch (err) {
+        utils.logger.warn('loadSession failed, unable to parse session payload from storage.');
+        return undefined;
+      }
     };
 
     this.connect = async function (options) {
@@ -3506,26 +3521,10 @@ class Wallet {
       this.transport.messageProvider.closeWallet();
     };
 
-    this.loadSession = async function () {
-      const data = await LocalStorage.getInstance().getItem('@sequence.session');
-
-      if (!data || data === '') {
-        return undefined;
-      }
-
-      try {
-        const session = JSON.parse(data);
-        return session;
-      } catch (err) {
-        utils.logger.warn('loadSession failed, unable to parse session payload from localStorage.');
-        return undefined;
-      }
-    };
-
-    this.saveSession = session => {
+    this.saveSession = async function (session) {
       utils.logger.debug('wallet provider: saving session');
       const data = JSON.stringify(session);
-      LocalStorage.getInstance().setItem('@sequence.session', data);
+      await LocalStorage.getInstance().setItem('@sequence.session', data);
     };
 
     this.useSession = async function (session, autoSave = true) {
@@ -3566,8 +3565,8 @@ class Wallet {
       this.config = _extends({}, this.config, config);
     }
 
-    if (defaultNetworkId) {
-      this.config.defaultNetworkId = defaultNetworkId;
+    if (_network) {
+      this.config.defaultNetworkId = _network;
     } else if (!this.config.defaultNetworkId) {
       this.config.defaultNetworkId = 'mainnet';
     }
@@ -3622,7 +3621,9 @@ class Wallet {
     }
 
     this.clearSession();
-  }
+  } // TODO: add switchNetwork(network: string | number) which will call wallet_switchEthereumChain
+  // and on successful response, will update the provider info here, etc.
+
 
   getProviderConfig() {
     return this.config;
@@ -3802,6 +3803,23 @@ const DefaultProviderConfig = {
     }
   }
 };
+let walletInstance;
+const initWallet = async (network, config) => {
+  if (walletInstance && walletInstance.isOpened()) {
+    walletInstance.closeWallet();
+  }
+
+  walletInstance = new Wallet(network, config);
+  await walletInstance.loadSession();
+  return walletInstance;
+};
+const getWallet = () => {
+  if (!walletInstance) {
+    throw new Error('Wallet has not been initialized, call sequence.initWallet(network, config) first.');
+  }
+
+  return walletInstance;
+};
 
 exports.BaseInjectedTransport = BaseInjectedTransport;
 exports.BaseProviderTransport = BaseProviderTransport;
@@ -3828,6 +3846,8 @@ exports.Web3Signer = Web3Signer;
 exports.WindowMessageHandler = WindowMessageHandler;
 exports.WindowMessageProvider = WindowMessageProvider;
 exports.WindowSessionParams = WindowSessionParams;
+exports.getWallet = getWallet;
+exports.initWallet = initWallet;
 exports.isBrowserExtension = isBrowserExtension;
 exports.isSequenceProvider = isSequenceProvider;
 exports.isValidMessageSignature = isValidMessageSignature;

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

@@ -3234,7 +3234,7 @@ class WalletUtils {
 }
 
 class Wallet {
-  constructor(defaultNetworkId, config) {
+  constructor(_network, config) {
     var _this = this;
 
     this.utils = void 0;
@@ -3362,13 +3362,28 @@ class Wallet {
         this.useSession({
           walletContext: walletContext
         }, true);
-      }); // Load existing session from localStorage
+      });
+    };
+
+    this.loadSession = async function () {
+      const data = await LocalStorage.getInstance().getItem('@sequence.session');
+
+      if (!data || data === '') {
+        return undefined;
+      }
+
+      try {
+        const session = JSON.parse(data);
 
-      this.loadSession().then(session => {
         if (session) {
-          this.useSession(session, false);
+          _this.useSession(session, false);
         }
-      });
+
+        return session;
+      } catch (err) {
+        logger.warn('loadSession failed, unable to parse session payload from storage.');
+        return undefined;
+      }
     };
 
     this.connect = async function (options) {
@@ -3502,26 +3517,10 @@ class Wallet {
       this.transport.messageProvider.closeWallet();
     };
 
-    this.loadSession = async function () {
-      const data = await LocalStorage.getInstance().getItem('@sequence.session');
-
-      if (!data || data === '') {
-        return undefined;
-      }
-
-      try {
-        const session = JSON.parse(data);
-        return session;
-      } catch (err) {
-        logger.warn('loadSession failed, unable to parse session payload from localStorage.');
-        return undefined;
-      }
-    };
-
-    this.saveSession = session => {
+    this.saveSession = async function (session) {
       logger.debug('wallet provider: saving session');
       const data = JSON.stringify(session);
-      LocalStorage.getInstance().setItem('@sequence.session', data);
+      await LocalStorage.getInstance().setItem('@sequence.session', data);
     };
 
     this.useSession = async function (session, autoSave = true) {
@@ -3562,8 +3561,8 @@ class Wallet {
       this.config = _extends({}, this.config, config);
     }
 
-    if (defaultNetworkId) {
-      this.config.defaultNetworkId = defaultNetworkId;
+    if (_network) {
+      this.config.defaultNetworkId = _network;
     } else if (!this.config.defaultNetworkId) {
       this.config.defaultNetworkId = 'mainnet';
     }
@@ -3618,7 +3617,9 @@ class Wallet {
     }
 
     this.clearSession();
-  }
+  } // TODO: add switchNetwork(network: string | number) which will call wallet_switchEthereumChain
+  // and on successful response, will update the provider info here, etc.
+
 
   getProviderConfig() {
     return this.config;
@@ -3798,5 +3799,22 @@ const DefaultProviderConfig = {
     }
   }
 };
+let walletInstance;
+const initWallet = async (network, config) => {
+  if (walletInstance && walletInstance.isOpened()) {
+    walletInstance.closeWallet();
+  }
+
+  walletInstance = new Wallet(network, config);
+  await walletInstance.loadSession();
+  return walletInstance;
+};
+const getWallet = () => {
+  if (!walletInstance) {
+    throw new Error('Wallet has not been initialized, call sequence.initWallet(network, config) first.');
+  }
+
+  return walletInstance;
+};
 
-export { BaseInjectedTransport, BaseProviderTransport, BaseWalletTransport, CHANNEL_ID, DefaultProviderConfig, ErrSignedInRequired, EventType, ExtensionMessageHandler, ExtensionMessageProvider, InitState, LocalStorage, LocalStore, LocalWeb3Provider, MuxMessageProvider, OpenState, PROVIDER_OPEN_TIMEOUT, ProviderError, ProxyMessageChannel, ProxyMessageChannelPort, ProxyMessageHandler, ProxyMessageProvider, Wallet, WalletRequestHandler, Web3Provider, Web3Signer, WindowMessageHandler, WindowMessageProvider, WindowSessionParams, isBrowserExtension, isSequenceProvider, isValidMessageSignature, isValidSignature, isValidTypedDataSignature, isWalletUpToDate, messageToBytes, nextMessageIdx, prefixEIP191Message, recoverWalletConfig };
+export { BaseInjectedTransport, BaseProviderTransport, BaseWalletTransport, CHANNEL_ID, DefaultProviderConfig, ErrSignedInRequired, EventType, ExtensionMessageHandler, ExtensionMessageProvider, InitState, LocalStorage, LocalStore, LocalWeb3Provider, MuxMessageProvider, OpenState, PROVIDER_OPEN_TIMEOUT, ProviderError, ProxyMessageChannel, ProxyMessageChannelPort, ProxyMessageHandler, ProxyMessageProvider, Wallet, WalletRequestHandler, Web3Provider, Web3Signer, WindowMessageHandler, WindowMessageProvider, WindowSessionParams, getWallet, initWallet, isBrowserExtension, isSequenceProvider, isValidMessageSignature, isValidSignature, isValidTypedDataSignature, isWalletUpToDate, messageToBytes, nextMessageIdx, prefixEIP191Message, recoverWalletConfig };

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

@@ -9,13 +9,13 @@ import { Runtime } from 'webextension-polyfill-ts';
 export interface WalletProvider {
     connect(options?: ConnectOptions): Promise<ConnectDetails>;
     disconnect(): void;
-    isOpened(): boolean;
     isConnected(): boolean;
     getSession(): WalletSession | undefined;
     getAddress(): Promise<string>;
     getNetworks(chainId?: ChainIdLike): Promise<NetworkConfig[]>;
     getChainId(): Promise<number>;
     getAuthChainId(): Promise<number>;
+    isOpened(): boolean;
     openWallet(path?: string, intent?: OpenWalletIntent, networkId?: string | number): Promise<boolean>;
     closeWallet(): void;
     getProvider(chainId?: ChainIdLike): Web3Provider | undefined;
@@ -37,8 +37,9 @@ export declare class Wallet implements WalletProvider {
     private transport;
     private networks;
     private providers;
-    constructor(defaultNetworkId?: string | number, config?: Partial<ProviderConfig>);
+    constructor(network?: string | number, config?: Partial<ProviderConfig>);
     private init;
+    loadSession: () => Promise<WalletSession | undefined>;
     connect: (options?: ConnectOptions | undefined) => Promise<ConnectDetails>;
     addConnectedSite(origin: string | undefined): Promise<void>;
     removeConnectedSite(origin: string): Promise<void>;
@@ -70,7 +71,6 @@ export declare class Wallet implements WalletProvider {
     isDeployed(chainId?: ChainIdLike): Promise<boolean>;
     on<K extends keyof ProviderEventTypes>(event: K, fn: ProviderEventTypes[K]): void;
     once<K extends keyof ProviderEventTypes>(event: K, fn: ProviderEventTypes[K]): void;
-    private loadSession;
     private saveSession;
     private useSession;
     private useAccountAddress;
@@ -99,3 +99,5 @@ export interface ProviderConfig {
     walletContext?: WalletContext;
 }
 export declare const DefaultProviderConfig: ProviderConfig;
+export declare const initWallet: (network?: string | number | undefined, config?: Partial<ProviderConfig> | undefined) => Promise<Wallet>;
+export declare const getWallet: () => Wallet;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@0xsequence/provider",
-  "version": "0.39.6",
+  "version": "0.40.2",
   "description": "provider sub-package for Sequence",
   "repository": "https://github.com/0xsequence/sequence.js/tree/master/packages/provider",
   "source": "src/index.ts",
@@ -13,13 +13,13 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@0xsequence/abi": "^0.39.6",
-    "@0xsequence/auth": "^0.39.6",
-    "@0xsequence/config": "^0.39.6",
-    "@0xsequence/network": "^0.39.6",
-    "@0xsequence/transactions": "^0.39.6",
-    "@0xsequence/utils": "^0.39.6",
-    "@0xsequence/wallet": "^0.39.6",
+    "@0xsequence/abi": "^0.40.2",
+    "@0xsequence/auth": "^0.40.2",
+    "@0xsequence/config": "^0.40.2",
+    "@0xsequence/network": "^0.40.2",
+    "@0xsequence/transactions": "^0.40.2",
+    "@0xsequence/utils": "^0.40.2",
+    "@0xsequence/wallet": "^0.40.2",
     "@ethersproject/abstract-signer": "^5.5.0",
     "@ethersproject/hash": "^5.5.0",
     "@ethersproject/providers": "^5.5.1",

package/src/wallet.ts

@@ -32,18 +32,17 @@ import { Runtime } from 'webextension-polyfill-ts'
 
 export interface WalletProvider {
   connect(options?: ConnectOptions): Promise<ConnectDetails>
-  // authorize(options?: ConnectOptions): Promise<ConnectDetails>
   disconnect(): void
 
-  isOpened(): boolean
   isConnected(): boolean
   getSession(): WalletSession | undefined
-
+ 
   getAddress(): Promise<string>
   getNetworks(chainId?: ChainIdLike): Promise<NetworkConfig[]>
   getChainId(): Promise<number>
   getAuthChainId(): Promise<number>
-
+  
+  isOpened(): boolean
   openWallet(path?: string, intent?: OpenWalletIntent, networkId?: string | number): Promise<boolean>
   closeWallet(): void
 
@@ -91,15 +90,15 @@ export class Wallet implements WalletProvider {
   private networks: NetworkConfig[]
   private providers: { [chainId: number]: Web3Provider }
 
-  constructor(defaultNetworkId?: string | number, config?: Partial<ProviderConfig>) {
+  constructor(network?: string | number, config?: Partial<ProviderConfig>) {
     // config is a Partial, so that we may intersect it with the DefaultProviderConfig,
     // which allows easy overriding and control of the config.
     this.config = { ...DefaultProviderConfig }
     if (config) {
       this.config = { ...this.config, ...config }
     }
-    if (defaultNetworkId) {
-      this.config.defaultNetworkId = defaultNetworkId
+    if (network) {
+      this.config.defaultNetworkId = network
     } else if (!this.config.defaultNetworkId) {
       this.config.defaultNetworkId = 'mainnet'
     }
@@ -237,13 +236,23 @@ export class Wallet implements WalletProvider {
     this.transport.messageProvider.on('walletContext', (walletContext: WalletContext) => {
       this.useSession({ walletContext: walletContext }, true)
     })
+  }
 
-    // Load existing session from localStorage
-    this.loadSession().then(session => {
+  loadSession = async (): 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)
       }
-    })
+      return session
+    } catch (err) {
+      logger.warn('loadSession failed, unable to parse session payload from storage.')
+      return undefined
+    }
   }
 
   connect = async (options?: ConnectOptions): Promise<ConnectDetails> => {
@@ -333,6 +342,9 @@ export class Wallet implements WalletProvider {
     this.clearSession()
   }
 
+  // TODO: add switchNetwork(network: string | number) which will call wallet_switchEthereumChain
+  // and on successful response, will update the provider info here, etc.
+
   getProviderConfig(): ProviderConfig {
     return this.config
   }
@@ -545,24 +557,10 @@ export class Wallet implements WalletProvider {
     this.transport.messageProvider!.once(event, fn)
   }
 
-  private loadSession = async (): Promise<WalletSession | undefined> => {
-    const data = await LocalStorage.getInstance().getItem('@sequence.session')
-    if (!data || data === '') {
-      return undefined
-    }
-    try {
-      const session = JSON.parse(data) as WalletSession
-      return session
-    } catch (err) {
-      logger.warn('loadSession failed, unable to parse session payload from localStorage.')
-      return undefined
-    }
-  }
-
-  private saveSession = (session: WalletSession) => {
+  private saveSession = async (session: WalletSession) => {
     logger.debug('wallet provider: saving session')
     const data = JSON.stringify(session)
-    LocalStorage.getInstance().setItem('@sequence.session', data)
+    await LocalStorage.getInstance().setItem('@sequence.session', data)
   }
 
   private useSession = async (session: WalletSession, autoSave: boolean = true) => {
@@ -713,3 +711,21 @@ export const DefaultProviderConfig: ProviderConfig = {
     proxyTransport: { enabled: false }
   }
 }
+
+let walletInstance: Wallet | undefined
+
+export const initWallet = async (network?: string | number, config?: Partial<ProviderConfig>) => {
+  if (walletInstance && walletInstance.isOpened()) {
+    walletInstance.closeWallet()
+  }
+  walletInstance = new Wallet(network, config)
+  await walletInstance.loadSession()
+  return walletInstance
+}
+
+export const getWallet = () => {
+  if (!walletInstance) {
+    throw new Error('Wallet has not been initialized, call sequence.initWallet(network, config) first.')
+  }
+  return walletInstance
+}