@0xsequence/provider 0.38.2 → 0.39.2

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

@@ -374,13 +374,18 @@ class BaseProviderTransport {
 
 
     if (message.type === EventType.ACCOUNTS_CHANGED) {
-      this.accountsChangedPayload = undefined;
+      this.accountsChangedPayload = {
+        accounts: []
+      };
 
       if (message.data && message.data.length > 0) {
-        this.accountsChangedPayload = ethers.utils.getAddress(message.data[0]);
-        this.events.emit('accountsChanged', [this.accountsChangedPayload]);
+        this.accountsChangedPayload = {
+          accounts: [ethers.utils.getAddress(message.data[0])],
+          origin: message.origin
+        };
+        this.events.emit('accountsChanged', this.accountsChangedPayload.accounts, this.accountsChangedPayload.origin);
       } else {
-        this.events.emit('accountsChanged', []);
+        this.events.emit('accountsChanged', [], message.origin);
       }
 
       return;
@@ -1188,7 +1193,7 @@ class WalletRequestHandler {
     };
   }
 
-  notifyConnect(connectDetails) {
+  notifyConnect(connectDetails, origin) {
     var _connectDetails$sessi;
 
     this.events.emit('connect', connectDetails);
@@ -1196,13 +1201,12 @@ class WalletRequestHandler {
     if ((_connectDetails$sessi = connectDetails.session) != null && _connectDetails$sessi.accountAddress) {
       var _connectDetails$sessi2;
 
-      this.events.emit('accountsChanged', [(_connectDetails$sessi2 = connectDetails.session) == null ? void 0 : _connectDetails$sessi2.accountAddress]);
+      this.events.emit('accountsChanged', [(_connectDetails$sessi2 = connectDetails.session) == null ? void 0 : _connectDetails$sessi2.accountAddress], origin);
     }
   }
 
-  notifyDisconnect() {
-    this.events.emit('accountsChanged', []);
-    this.events.emit('networks', []);
+  notifyDisconnect(origin) {
+    this.events.emit('accountsChanged', [], origin);
     this.events.emit('disconnect');
   }
 
@@ -1699,7 +1703,7 @@ const hexlifyTransaction = (transaction, allowExtra) => {
   return result;
 };
 
-const eip191prefix = ethers.utils.toUtf8Bytes("\x19Ethereum Signed Message:\n");
+const eip191prefix = ethers.utils.toUtf8Bytes('\x19Ethereum Signed Message:\n');
 const messageToBytes = message => {
   if (ethers.utils.isBytes(message) || ethers.utils.isHexString(message)) {
     return ethers.utils.arrayify(message);
@@ -1795,8 +1799,29 @@ const isWalletUpToDate = async (signer, chainId) => {
 
   const isUpToDate = isConfigEqual(authChainConfig, requiredChainConfig);
   return isDeployed && isUpToDate;
-}; // window.localstorage helper
+};
+class LocalStorage {
+  constructor() {}
+
+  static getInstance() {
+    if (!LocalStorage._instance) {
+      LocalStorage._instance = {
+        getItem: key => Promise.resolve(window.localStorage.getItem(key)),
+        setItem: (key, value) => Promise.resolve(window.localStorage.setItem(key, value)),
+        removeItem: key => Promise.resolve(window.localStorage.removeItem(key))
+      };
+    }
+
+    return this._instance;
+  }
+
+  static use(instance) {
+    LocalStorage._instance = instance;
+  }
+
+} // window.localstorage helper
 
+LocalStorage._instance = void 0;
 class LocalStore {
   constructor(key, def) {
     this.def = def;
@@ -1804,8 +1829,8 @@ class LocalStore {
     this.key = key;
   }
 
-  get() {
-    const val = window.localStorage.getItem(this.key);
+  async get() {
+    const val = await LocalStorage.getInstance().getItem(this.key);
 
     if (val === null) {
       return this.def;
@@ -1821,11 +1846,11 @@ class LocalStore {
   }
 
   set(val) {
-    val ? window.localStorage.setItem(this.key, JSON.stringify(val)) : window.localStorage.removeItem(this.key);
+    val ? LocalStorage.getInstance().setItem(this.key, JSON.stringify(val)) : LocalStorage.getInstance().removeItem(this.key);
   }
 
   del() {
-    window.localStorage.removeItem(this.key);
+    LocalStorage.getInstance().removeItem(this.key);
   }
 
 }
@@ -2048,11 +2073,11 @@ class BaseWalletTransport {
     };
 
     this.saveTransportSession = session => {
-      window.localStorage.setItem(TRANSPORT_SESSION_LS_KEY, JSON.stringify(session));
+      LocalStorage.getInstance().setItem(TRANSPORT_SESSION_LS_KEY, JSON.stringify(session));
     };
 
-    this.getCachedTransportSession = () => {
-      const session = window.localStorage.getItem(TRANSPORT_SESSION_LS_KEY);
+    this.getCachedTransportSession = async function () {
+      const session = await LocalStorage.getInstance().getItem(TRANSPORT_SESSION_LS_KEY);
 
       try {
         return session ? JSON.parse(session) : null;
@@ -2074,9 +2099,9 @@ class BaseWalletTransport {
 
       this.notifyDisconnect(error);
     });
-    this.walletRequestHandler.on('accountsChanged', accounts => {
+    this.walletRequestHandler.on('accountsChanged', (accounts, origin) => {
       if (!this.registered) return;
-      this.notifyAccountsChanged(accounts);
+      this.notifyAccountsChanged(accounts, origin);
     });
     this.walletRequestHandler.on('networks', networks => {
       if (!this.registered) return;
@@ -2161,11 +2186,12 @@ class BaseWalletTransport {
     });
   }
 
-  notifyAccountsChanged(accounts) {
+  notifyAccountsChanged(accounts, origin) {
     this.sendMessage({
       idx: -1,
       type: EventType.ACCOUNTS_CHANGED,
-      data: accounts
+      data: accounts,
+      origin: origin
     });
   }
 
@@ -2429,14 +2455,14 @@ class ProxyMessageHandler extends BaseWalletTransport {
     this._registered = true;
   } // note: we can't decide whether to restore the session within register(), because session info is
   // received asyncronously via EventType.OPEN after register() is executed.
-  // And in the case of a redirect/reload, EventType.OPEN is not sent at all, 
+  // And in the case of a redirect/reload, EventType.OPEN is not sent at all,
   // because the wallet is already open.
   //
   // call this method from wallet redirect hander when a session restore is needed
 
 
-  restoreSession() {
-    const cachedSession = this.getCachedTransportSession();
+  async restoreSession() {
+    const cachedSession = await this.getCachedTransportSession();
 
     if (cachedSession) {
       this.open(cachedSession);
@@ -2860,7 +2886,7 @@ class WindowMessageHandler extends BaseWalletTransport {
     this._init = InitState.NIL;
   }
 
-  register(windowHref) {
+  async register(windowHref) {
     const isPopup = parent.window.opener !== null;
     this._isPopup = isPopup;
 
@@ -2878,7 +2904,7 @@ class WindowMessageHandler extends BaseWalletTransport {
     const isNewWindowSession = !!session.sessionId; // attempt to restore previous session in the case of a redirect or window reload
 
     if (!isNewWindowSession) {
-      session = this.getCachedTransportSession();
+      session = await this.getCachedTransportSession();
     }
 
     if (!session) {
@@ -3298,9 +3324,21 @@ class Wallet {
         } else {
           this.useSession(session, true);
         }
-      }); // below will update the account upon wallet connect/disconnect (aka, login/logout)
+      }); // below will update the account upon wallet connect/disconnect - aka, login/logout.
+      // if an origin is provided, this operation should be performed only on that origin
+      // and shouldn't affect the session of the wallet.
+
+      this.transport.messageProvider.on('accountsChanged', (accounts, origin) => {
+        if (origin) {
+          if (accounts.length > 0) {
+            this.useSession({
+              accountAddress: accounts[0]
+            }, true);
+          }
+
+          return;
+        }
 
-      this.transport.messageProvider.on('accountsChanged', accounts => {
         if (!accounts || accounts.length === 0 || accounts[0] === '') {
           this.clearSession();
         } else {
@@ -3322,11 +3360,11 @@ class Wallet {
         }, true);
       }); // Load existing session from localStorage
 
-      const session = this.loadSession();
-
-      if (session) {
-        this.useSession(session, false);
-      }
+      this.loadSession().then(session => {
+        if (session) {
+          this.useSession(session, false);
+        }
+      });
     };
 
     this.connect = async function (options) {
@@ -3334,7 +3372,7 @@ class Wallet {
         _this.disconnect();
       }
 
-      if (_this.isConnected() && _this.isSiteConnected(options == null ? void 0 : options.origin) && !!_this.session && !(options != null && options.authorize) && !(options != null && options.askForEmail)) {
+      if (_this.isConnected() && (await _this.isSiteConnected(options == null ? void 0 : options.origin)) && !!_this.session && !(options != null && options.authorize) && !(options != null && options.askForEmail)) {
         return {
           connected: true,
           session: _this.session,
@@ -3460,8 +3498,8 @@ class Wallet {
       this.transport.messageProvider.closeWallet();
     };
 
-    this.loadSession = () => {
-      const data = window.localStorage.getItem('@sequence.session');
+    this.loadSession = async function () {
+      const data = await LocalStorage.getInstance().getItem('@sequence.session');
 
       if (!data || data === '') {
         return undefined;
@@ -3479,7 +3517,7 @@ class Wallet {
     this.saveSession = session => {
       logger.debug('wallet provider: saving session');
       const data = JSON.stringify(session);
-      window.localStorage.setItem('@sequence.session', data);
+      LocalStorage.getInstance().setItem('@sequence.session', data);
     };
 
     this.useSession = async function (session, autoSave = true) {
@@ -3526,6 +3564,10 @@ class Wallet {
       this.config.defaultNetworkId = 'mainnet';
     }
 
+    if (config != null && config.localStorage) {
+      LocalStorage.use(config.localStorage);
+    }
+
     this.transport = {};
     this.networks = [];
     this.providers = {};
@@ -3534,9 +3576,9 @@ class Wallet {
     this.init();
   }
 
-  addConnectedSite(origin) {
+  async addConnectedSite(origin) {
     origin = origin || window.location.origin;
-    const connectedSites = this.connectedSites.get();
+    const connectedSites = await this.connectedSites.get();
 
     if (connectedSites) {
       if (connectedSites.includes(origin)) {
@@ -3549,8 +3591,8 @@ class Wallet {
     }
   }
 
-  removeConnectedSite(origin) {
-    const authorized = this.connectedSites.get();
+  async removeConnectedSite(origin) {
+    const authorized = await this.connectedSites.get();
 
     if (authorized) {
       this.connectedSites.set(authorized.filter(domain => domain !== origin));
@@ -3561,8 +3603,8 @@ class Wallet {
     return this.connectedSites.get();
   }
 
-  isSiteConnected(origin) {
-    const authorized = this.connectedSites.get();
+  async isSiteConnected(origin) {
+    const authorized = await this.connectedSites.get();
     return !!authorized && authorized.includes(origin || window.location.origin);
   }
 
@@ -3726,7 +3768,7 @@ class Wallet {
     var _this$transport$cache;
 
     logger.debug('wallet provider: clearing session');
-    window.localStorage.removeItem('@sequence.session');
+    LocalStorage.getInstance().removeItem('@sequence.session');
     this.session = undefined;
     this.networks = [];
     this.providers = {};
@@ -3747,4 +3789,4 @@ const DefaultProviderConfig = {
   }
 };
 
-export { BaseInjectedTransport, BaseProviderTransport, BaseWalletTransport, CHANNEL_ID, DefaultProviderConfig, ErrSignedInRequired, EventType, ExtensionMessageHandler, ExtensionMessageProvider, InitState, 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, isBrowserExtension, isSequenceProvider, isValidMessageSignature, isValidSignature, isValidTypedDataSignature, isWalletUpToDate, messageToBytes, nextMessageIdx, prefixEIP191Message, recoverWalletConfig };

package/dist/declarations/src/transports/base-provider-transport.d.ts

@@ -13,7 +13,10 @@ export declare abstract class BaseProviderTransport implements ProviderTransport
         session?: WalletSession;
     } | undefined;
     protected connectPayload: ConnectDetails | undefined;
-    protected accountsChangedPayload: string | undefined;
+    protected accountsChangedPayload: {
+        accounts: string[];
+        origin?: string;
+    } | undefined;
     protected networksPayload: NetworkConfig[] | undefined;
     protected walletContextPayload: WalletContext | undefined;
     protected _sessionId?: string;

package/dist/declarations/src/transports/base-wallet-transport.d.ts

@@ -26,7 +26,7 @@ export declare abstract class BaseWalletTransport implements WalletTransport {
     notifyClose(error?: ProviderRpcError): void;
     notifyConnect(connectDetails: ConnectDetails): void;
     notifyDisconnect(error?: ProviderRpcError): void;
-    notifyAccountsChanged(accounts: string[]): void;
+    notifyAccountsChanged(accounts: string[], origin?: string): void;
     notifyChainChanged(chainIdHex: string): void;
     notifyNetworks(networks: NetworkConfig[]): void;
     notifyWalletContext(walletContext: WalletContext): void;
@@ -34,5 +34,5 @@ export declare abstract class BaseWalletTransport implements WalletTransport {
     private init;
     protected open: ({ sessionId, intent, networkId }: TransportSession) => Promise<boolean>;
     private saveTransportSession;
-    protected getCachedTransportSession: () => TransportSession | null;
+    protected getCachedTransportSession: () => Promise<TransportSession | null>;
 }

package/dist/declarations/src/transports/extension-transport/base-injected-transport.d.ts

@@ -1,6 +1,6 @@
 import { EventEmitter2 as EventEmitter } from 'eventemitter2';
 import { ProviderMessageResponseCallback, ProviderMessageRequest, ProviderMessageResponse } from '../../types';
-interface Stream {
+export interface Stream {
     on(ev: string | symbol, fn: (...args: any[]) => void): void;
     writable: boolean;
     write(chunk: any, cb?: (error: Error | null | undefined) => void): boolean;
@@ -15,4 +15,3 @@ export declare abstract class BaseInjectedTransport extends EventEmitter {
     protected sendMessageRequest: (message: ProviderMessageRequest) => Promise<ProviderMessageResponse>;
     private sendMessage;
 }
-export {};

package/dist/declarations/src/transports/proxy-transport/proxy-message-handler.d.ts

@@ -6,7 +6,7 @@ export declare class ProxyMessageHandler extends BaseWalletTransport {
     private port;
     constructor(walletRequestHandler: WalletRequestHandler, port: ProxyMessageChannelPort);
     register(): void;
-    restoreSession(): void;
+    restoreSession(): Promise<void>;
     unregister(): void;
     sendMessage(message: ProviderMessage<any>): void;
 }

package/dist/declarations/src/transports/wallet-request-handler.d.ts

@@ -41,8 +41,8 @@ export declare class WalletRequestHandler implements ExternalProvider, JsonRpcHa
     setDefaultNetwork(chainId: string | number, notifyNetworks?: boolean): Promise<number | undefined>;
     getNetworks(jsonRpcResponse?: boolean): Promise<NetworkConfig[]>;
     walletSession(): Promise<WalletSession | undefined>;
-    notifyConnect(connectDetails: ConnectDetails): void;
-    notifyDisconnect(): void;
+    notifyConnect(connectDetails: ConnectDetails, origin?: string): void;
+    notifyDisconnect(origin?: string): void;
     notifyNetworks(networks?: NetworkConfig[]): Promise<void>;
     notifyWalletContext(): Promise<void>;
     notifyClose(error?: ProviderRpcError): void;

package/dist/declarations/src/transports/window-transport/window-message-handler.d.ts

@@ -5,7 +5,7 @@ export declare class WindowMessageHandler extends BaseWalletTransport {
     protected parentWindow: Window;
     private _isPopup;
     constructor(walletRequestHandler: WalletRequestHandler);
-    register(windowHref?: any): void;
+    register(windowHref?: any): Promise<void>;
     unregister(): void;
     private onWindowEvent;
     sendMessage(message: ProviderMessage<any>): void;

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

@@ -33,6 +33,7 @@ export interface ProviderMessage<T> {
     type: string;
     data: T;
     chainId?: number;
+    origin?: string;
 }
 export declare type ProviderMessageRequest = ProviderMessage<JsonRpcRequest>;
 export declare type ProviderMessageResponse = ProviderMessage<JsonRpcResponse>;
@@ -87,7 +88,7 @@ export interface WalletEventTypes {
     close: (error?: ProviderRpcError) => void;
     connect: (connectDetails: ConnectDetails) => void;
     disconnect: (error?: ProviderRpcError) => void;
-    accountsChanged: (accounts: string[]) => void;
+    accountsChanged: (accounts: string[], origin?: string) => void;
     chainChanged: (chainIdHex: string) => void;
     networks: (networks: NetworkConfig[]) => void;
     walletContext: (walletContext: WalletContext) => void;

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

@@ -19,11 +19,22 @@ export declare const isBrowserExtension: () => boolean;
  * @return {Promise<boolean>} Promise that returns true if the wallet is up to date, false otherwise
  */
 export declare const isWalletUpToDate: (signer: Signer, chainId: number) => Promise<boolean>;
+export interface ItemStore {
+    getItem(key: string): Promise<string | null>;
+    setItem(key: string, value: string): Promise<void>;
+    removeItem(key: string): Promise<void>;
+}
+export declare class LocalStorage {
+    private static _instance;
+    private constructor();
+    static getInstance(): ItemStore;
+    static use(instance: ItemStore): void;
+}
 export declare class LocalStore<T extends Object = string> {
     def?: T | undefined;
     readonly key: string;
     constructor(key: string, def?: T | undefined);
-    get(): T | undefined;
+    get(): Promise<T | undefined>;
     set(val: T | undefined): void;
     del(): void;
 }

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

@@ -3,6 +3,7 @@ import { WalletConfig, WalletState } from '@0xsequence/config';
 import { Web3Provider, Web3Signer } from './provider';
 import { ProxyMessageChannelPort } from './transports';
 import { WalletSession, ProviderEventTypes, ConnectOptions, OpenWalletIntent, ConnectDetails } from './types';
+import { ItemStore } from './utils';
 import { WalletUtils } from './utils/index';
 import { Runtime } from 'webextension-polyfill-ts';
 export interface WalletProvider {
@@ -39,10 +40,10 @@ export declare class Wallet implements WalletProvider {
     constructor(defaultNetworkId?: string | number, config?: Partial<ProviderConfig>);
     private init;
     connect: (options?: ConnectOptions | undefined) => Promise<ConnectDetails>;
-    addConnectedSite(origin: string | undefined): void;
-    removeConnectedSite(origin: string): void;
-    getConnectedSites(): string[] | undefined;
-    private isSiteConnected;
+    addConnectedSite(origin: string | undefined): Promise<void>;
+    removeConnectedSite(origin: string): Promise<void>;
+    getConnectedSites(): Promise<string[] | undefined>;
+    isSiteConnected(origin: string | undefined): Promise<boolean>;
     authorize: (options?: ConnectOptions | undefined) => Promise<ConnectDetails>;
     disconnect(): void;
     getProviderConfig(): ProviderConfig;
@@ -77,6 +78,7 @@ export declare class Wallet implements WalletProvider {
     private clearSession;
 }
 export interface ProviderConfig {
+    localStorage?: ItemStore;
     walletAppURL: string;
     networks?: Partial<NetworkConfig>[];
     networkRpcUrl?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@0xsequence/provider",
-  "version": "0.38.2",
+  "version": "0.39.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.38.2",
-    "@0xsequence/auth": "^0.38.2",
-    "@0xsequence/config": "^0.38.2",
-    "@0xsequence/network": "^0.38.2",
-    "@0xsequence/transactions": "^0.38.2",
-    "@0xsequence/utils": "^0.38.2",
-    "@0xsequence/wallet": "^0.38.2",
+    "@0xsequence/abi": "^0.39.2",
+    "@0xsequence/auth": "^0.39.2",
+    "@0xsequence/config": "^0.39.2",
+    "@0xsequence/network": "^0.39.2",
+    "@0xsequence/transactions": "^0.39.2",
+    "@0xsequence/utils": "^0.39.2",
+    "@0xsequence/wallet": "^0.39.2",
     "@ethersproject/abstract-signer": "^5.5.0",
     "@ethersproject/hash": "^5.5.0",
     "@ethersproject/providers": "^5.5.1",

package/src/transports/base-provider-transport.ts

@@ -37,7 +37,7 @@ export abstract class BaseProviderTransport implements ProviderTransport {
 
   protected openPayload: { sessionId?: string; session?: WalletSession } | undefined
   protected connectPayload: ConnectDetails | undefined
-  protected accountsChangedPayload: string | undefined
+  protected accountsChangedPayload: { accounts: string[]; origin?: string } | undefined
   protected networksPayload: NetworkConfig[] | undefined
   protected walletContextPayload: WalletContext | undefined
 
@@ -224,12 +224,15 @@ export abstract class BaseProviderTransport implements ProviderTransport {
 
     // ACCOUNTS_CHANGED -- when a user logs in or out
     if (message.type === EventType.ACCOUNTS_CHANGED) {
-      this.accountsChangedPayload = undefined
+      this.accountsChangedPayload = { accounts: [] }
       if (message.data && message.data.length > 0) {
-        this.accountsChangedPayload = ethers.utils.getAddress(message.data[0])
-        this.events.emit('accountsChanged', [this.accountsChangedPayload])
+        this.accountsChangedPayload = {
+          accounts: [ethers.utils.getAddress(message.data[0])],
+          origin: message.origin
+        }
+        this.events.emit('accountsChanged', this.accountsChangedPayload.accounts, this.accountsChangedPayload.origin)
       } else {
-        this.events.emit('accountsChanged', [])
+        this.events.emit('accountsChanged', [], message.origin)
       }
       return
     }

package/src/transports/base-wallet-transport.ts

@@ -21,7 +21,7 @@ import { logger, sanitizeAlphanumeric, sanitizeHost, sanitizeNumberString } from
 import { AuthorizationOptions } from '@0xsequence/auth'
 
 import { PROVIDER_OPEN_TIMEOUT } from './base-provider-transport'
-import { isBrowserExtension } from '../utils'
+import { isBrowserExtension, LocalStorage } from '../utils'
 
 const TRANSPORT_SESSION_LS_KEY = '@sequence.transportSession'
 
@@ -55,9 +55,9 @@ export abstract class BaseWalletTransport implements WalletTransport {
       this.notifyDisconnect(error)
     })
 
-    this.walletRequestHandler.on('accountsChanged', (accounts: string[]) => {
+    this.walletRequestHandler.on('accountsChanged', (accounts: string[], origin?: string) => {
       if (!this.registered) return
-      this.notifyAccountsChanged(accounts)
+      this.notifyAccountsChanged(accounts, origin)
     })
 
     this.walletRequestHandler.on('networks', (networks: NetworkConfig[]) => {
@@ -206,11 +206,12 @@ export abstract class BaseWalletTransport implements WalletTransport {
     })
   }
 
-  notifyAccountsChanged(accounts: string[]) {
+  notifyAccountsChanged(accounts: string[], origin?: string) {
     this.sendMessage({
       idx: -1,
       type: EventType.ACCOUNTS_CHANGED,
-      data: accounts
+      data: accounts,
+      origin: origin
     })
   }
 
@@ -435,11 +436,11 @@ export abstract class BaseWalletTransport implements WalletTransport {
   }
 
   private saveTransportSession = (session: TransportSession) => {
-    window.localStorage.setItem(TRANSPORT_SESSION_LS_KEY, JSON.stringify(session))
+    LocalStorage.getInstance().setItem(TRANSPORT_SESSION_LS_KEY, JSON.stringify(session))
   }
 
-  protected getCachedTransportSession = (): TransportSession | null => {
-    const session = window.localStorage.getItem(TRANSPORT_SESSION_LS_KEY)
+  protected getCachedTransportSession = async (): Promise<TransportSession | null> => {
+    const session = await LocalStorage.getInstance().getItem(TRANSPORT_SESSION_LS_KEY)
 
     try {
       return session ? (JSON.parse(session) as TransportSession) : null

package/src/transports/extension-transport/base-injected-transport.ts

@@ -9,7 +9,7 @@ import {
   ProviderMessageResponse
 } from '../../types'
 
-interface Stream {
+export interface Stream {
   on(ev: string | symbol, fn: (...args: any[]) => void): void
   writable: boolean
   write(chunk: any, cb?: (error: Error | null | undefined) => void): boolean

package/src/transports/proxy-transport/proxy-message-handler.ts

@@ -4,7 +4,6 @@ import { InitState, ProviderMessage } from '../../types'
 import { ProxyMessageChannelPort } from './proxy-message-channel'
 
 export class ProxyMessageHandler extends BaseWalletTransport {
-
   private port: ProxyMessageChannelPort
 
   constructor(walletRequestHandler: WalletRequestHandler, port: ProxyMessageChannelPort) {
@@ -22,12 +21,12 @@ export class ProxyMessageHandler extends BaseWalletTransport {
 
   // note: we can't decide whether to restore the session within register(), because session info is
   // received asyncronously via EventType.OPEN after register() is executed.
-  // And in the case of a redirect/reload, EventType.OPEN is not sent at all, 
+  // And in the case of a redirect/reload, EventType.OPEN is not sent at all,
   // because the wallet is already open.
   //
   // call this method from wallet redirect hander when a session restore is needed
-  restoreSession() {
-    const cachedSession = this.getCachedTransportSession()
+  async restoreSession() {
+    const cachedSession = await this.getCachedTransportSession()
     if (cachedSession) {
       this.open(cachedSession)
     }
@@ -42,5 +41,4 @@ export class ProxyMessageHandler extends BaseWalletTransport {
   sendMessage(message: ProviderMessage<any>) {
     this.port.sendMessage(message)
   }
-
 }

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

@@ -702,16 +702,15 @@ export class WalletRequestHandler implements ExternalProvider, JsonRpcHandler, P
         }
   }
 
-  notifyConnect(connectDetails: ConnectDetails) {
+  notifyConnect(connectDetails: ConnectDetails, origin?: string) {
     this.events.emit('connect', connectDetails)
     if (connectDetails.session?.accountAddress) {
-      this.events.emit('accountsChanged', [connectDetails.session?.accountAddress])
+      this.events.emit('accountsChanged', [connectDetails.session?.accountAddress], origin)
     }
   }
 
-  notifyDisconnect() {
-    this.events.emit('accountsChanged', [])
-    this.events.emit('networks', [])
+  notifyDisconnect(origin?: string) {
+    this.events.emit('accountsChanged', [], origin)
     this.events.emit('disconnect')
   }