@0xsequence/provider 0.38.2 → 0.39.2

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

@@ -378,13 +378,18 @@ class BaseProviderTransport {
 
 
     if (message.type === exports.EventType.ACCOUNTS_CHANGED) {
-      this.accountsChangedPayload = undefined;
+      this.accountsChangedPayload = {
+        accounts: []
+      };
 
       if (message.data && message.data.length > 0) {
-        this.accountsChangedPayload = ethers.ethers.utils.getAddress(message.data[0]);
-        this.events.emit('accountsChanged', [this.accountsChangedPayload]);
+        this.accountsChangedPayload = {
+          accounts: [ethers.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;
@@ -1192,7 +1197,7 @@ class WalletRequestHandler {
     };
   }
 
-  notifyConnect(connectDetails) {
+  notifyConnect(connectDetails, origin) {
     var _connectDetails$sessi;
 
     this.events.emit('connect', connectDetails);
@@ -1200,13 +1205,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');
   }
 
@@ -1703,7 +1707,7 @@ const hexlifyTransaction = (transaction, allowExtra) => {
   return result;
 };
 
-const eip191prefix = ethers.ethers.utils.toUtf8Bytes("\x19Ethereum Signed Message:\n");
+const eip191prefix = ethers.ethers.utils.toUtf8Bytes('\x19Ethereum Signed Message:\n');
 const messageToBytes = message => {
   if (ethers.ethers.utils.isBytes(message) || ethers.ethers.utils.isHexString(message)) {
     return ethers.ethers.utils.arrayify(message);
@@ -1799,8 +1803,29 @@ const isWalletUpToDate = async (signer, chainId) => {
 
   const isUpToDate = config.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;
@@ -1808,8 +1833,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;
@@ -1825,11 +1850,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);
   }
 
 }
@@ -2052,11 +2077,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;
@@ -2078,9 +2103,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;
@@ -2165,11 +2190,12 @@ class BaseWalletTransport {
     });
   }
 
-  notifyAccountsChanged(accounts) {
+  notifyAccountsChanged(accounts, origin) {
     this.sendMessage({
       idx: -1,
       type: exports.EventType.ACCOUNTS_CHANGED,
-      data: accounts
+      data: accounts,
+      origin: origin
     });
   }
 
@@ -2433,14 +2459,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);
@@ -2864,7 +2890,7 @@ class WindowMessageHandler extends BaseWalletTransport {
     this._init = exports.InitState.NIL;
   }
 
-  register(windowHref) {
+  async register(windowHref) {
     const isPopup = parent.window.opener !== null;
     this._isPopup = isPopup;
 
@@ -2882,7 +2908,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) {
@@ -3302,9 +3328,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 {
@@ -3326,11 +3364,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) {
@@ -3338,7 +3376,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,
@@ -3464,8 +3502,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;
@@ -3483,7 +3521,7 @@ class Wallet {
     this.saveSession = session => {
       utils.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) {
@@ -3530,6 +3568,10 @@ class Wallet {
       this.config.defaultNetworkId = 'mainnet';
     }
 
+    if (config != null && config.localStorage) {
+      LocalStorage.use(config.localStorage);
+    }
+
     this.transport = {};
     this.networks = [];
     this.providers = {};
@@ -3538,9 +3580,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)) {
@@ -3553,8 +3595,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));
@@ -3565,8 +3607,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);
   }
 
@@ -3730,7 +3772,7 @@ class Wallet {
     var _this$transport$cache;
 
     utils.logger.debug('wallet provider: clearing session');
-    window.localStorage.removeItem('@sequence.session');
+    LocalStorage.getInstance().removeItem('@sequence.session');
     this.session = undefined;
     this.networks = [];
     this.providers = {};
@@ -3759,6 +3801,7 @@ exports.DefaultProviderConfig = DefaultProviderConfig;
 exports.ErrSignedInRequired = ErrSignedInRequired;
 exports.ExtensionMessageHandler = ExtensionMessageHandler;
 exports.ExtensionMessageProvider = ExtensionMessageProvider;
+exports.LocalStorage = LocalStorage;
 exports.LocalStore = LocalStore;
 exports.LocalWeb3Provider = LocalWeb3Provider;
 exports.MuxMessageProvider = MuxMessageProvider;

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

@@ -378,13 +378,18 @@ class BaseProviderTransport {
 
 
     if (message.type === exports.EventType.ACCOUNTS_CHANGED) {
-      this.accountsChangedPayload = undefined;
+      this.accountsChangedPayload = {
+        accounts: []
+      };
 
       if (message.data && message.data.length > 0) {
-        this.accountsChangedPayload = ethers.ethers.utils.getAddress(message.data[0]);
-        this.events.emit('accountsChanged', [this.accountsChangedPayload]);
+        this.accountsChangedPayload = {
+          accounts: [ethers.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;
@@ -1192,7 +1197,7 @@ class WalletRequestHandler {
     };
   }
 
-  notifyConnect(connectDetails) {
+  notifyConnect(connectDetails, origin) {
     var _connectDetails$sessi;
 
     this.events.emit('connect', connectDetails);
@@ -1200,13 +1205,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');
   }
 
@@ -1703,7 +1707,7 @@ const hexlifyTransaction = (transaction, allowExtra) => {
   return result;
 };
 
-const eip191prefix = ethers.ethers.utils.toUtf8Bytes("\x19Ethereum Signed Message:\n");
+const eip191prefix = ethers.ethers.utils.toUtf8Bytes('\x19Ethereum Signed Message:\n');
 const messageToBytes = message => {
   if (ethers.ethers.utils.isBytes(message) || ethers.ethers.utils.isHexString(message)) {
     return ethers.ethers.utils.arrayify(message);
@@ -1799,8 +1803,29 @@ const isWalletUpToDate = async (signer, chainId) => {
 
   const isUpToDate = config.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;
@@ -1808,8 +1833,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;
@@ -1825,11 +1850,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);
   }
 
 }
@@ -2052,11 +2077,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;
@@ -2078,9 +2103,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;
@@ -2165,11 +2190,12 @@ class BaseWalletTransport {
     });
   }
 
-  notifyAccountsChanged(accounts) {
+  notifyAccountsChanged(accounts, origin) {
     this.sendMessage({
       idx: -1,
       type: exports.EventType.ACCOUNTS_CHANGED,
-      data: accounts
+      data: accounts,
+      origin: origin
     });
   }
 
@@ -2433,14 +2459,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);
@@ -2864,7 +2890,7 @@ class WindowMessageHandler extends BaseWalletTransport {
     this._init = exports.InitState.NIL;
   }
 
-  register(windowHref) {
+  async register(windowHref) {
     const isPopup = parent.window.opener !== null;
     this._isPopup = isPopup;
 
@@ -2882,7 +2908,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) {
@@ -3302,9 +3328,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 {
@@ -3326,11 +3364,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) {
@@ -3338,7 +3376,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,
@@ -3464,8 +3502,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;
@@ -3483,7 +3521,7 @@ class Wallet {
     this.saveSession = session => {
       utils.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) {
@@ -3530,6 +3568,10 @@ class Wallet {
       this.config.defaultNetworkId = 'mainnet';
     }
 
+    if (config != null && config.localStorage) {
+      LocalStorage.use(config.localStorage);
+    }
+
     this.transport = {};
     this.networks = [];
     this.providers = {};
@@ -3538,9 +3580,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)) {
@@ -3553,8 +3595,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));
@@ -3565,8 +3607,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);
   }
 
@@ -3730,7 +3772,7 @@ class Wallet {
     var _this$transport$cache;
 
     utils.logger.debug('wallet provider: clearing session');
-    window.localStorage.removeItem('@sequence.session');
+    LocalStorage.getInstance().removeItem('@sequence.session');
     this.session = undefined;
     this.networks = [];
     this.providers = {};
@@ -3759,6 +3801,7 @@ exports.DefaultProviderConfig = DefaultProviderConfig;
 exports.ErrSignedInRequired = ErrSignedInRequired;
 exports.ExtensionMessageHandler = ExtensionMessageHandler;
 exports.ExtensionMessageProvider = ExtensionMessageProvider;
+exports.LocalStorage = LocalStorage;
 exports.LocalStore = LocalStore;
 exports.LocalWeb3Provider = LocalWeb3Provider;
 exports.MuxMessageProvider = MuxMessageProvider;