@0xsequence/provider 0.39.0 → 0.39.1

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');
   }
 
@@ -2099,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;
@@ -2186,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
     });
   }
 
@@ -3323,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 {
@@ -3359,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,

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');
   }
 
@@ -2099,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;
@@ -2186,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
     });
   }
 
@@ -3323,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 {
@@ -3359,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,

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');
   }
 
@@ -2095,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;
@@ -2182,11 +2186,12 @@ class BaseWalletTransport {
     });
   }
 
-  notifyAccountsChanged(accounts) {
+  notifyAccountsChanged(accounts, origin) {
     this.sendMessage({
       idx: -1,
       type: EventType.ACCOUNTS_CHANGED,
-      data: accounts
+      data: accounts,
+      origin: origin
     });
   }
 
@@ -3319,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 {
@@ -3355,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,

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;

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/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/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/wallet.d.ts

@@ -43,7 +43,7 @@ export declare class Wallet implements WalletProvider {
     addConnectedSite(origin: string | undefined): Promise<void>;
     removeConnectedSite(origin: string): Promise<void>;
     getConnectedSites(): Promise<string[] | undefined>;
-    private isSiteConnected;
+    isSiteConnected(origin: string | undefined): Promise<boolean>;
     authorize: (options?: ConnectOptions | undefined) => Promise<ConnectDetails>;
     disconnect(): void;
     getProviderConfig(): ProviderConfig;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@0xsequence/provider",
-  "version": "0.39.0",
+  "version": "0.39.1",
   "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.0",
-    "@0xsequence/auth": "^0.39.0",
-    "@0xsequence/config": "^0.39.0",
-    "@0xsequence/network": "^0.39.0",
-    "@0xsequence/transactions": "^0.39.0",
-    "@0xsequence/utils": "^0.39.0",
-    "@0xsequence/wallet": "^0.39.0",
+    "@0xsequence/abi": "^0.39.1",
+    "@0xsequence/auth": "^0.39.1",
+    "@0xsequence/config": "^0.39.1",
+    "@0xsequence/network": "^0.39.1",
+    "@0xsequence/transactions": "^0.39.1",
+    "@0xsequence/utils": "^0.39.1",
+    "@0xsequence/wallet": "^0.39.1",
     "@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

@@ -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
     })
   }
 

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/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')
   }
 

package/src/types.ts

@@ -37,6 +37,7 @@ export interface ProviderMessage<T> {
   type: string // message type
   data: T // the ethereum json-rpc payload
   chainId?: number // chain id which the message is intended
+  origin?: string // origin of the message
 }
 
 export type ProviderMessageRequest = ProviderMessage<JsonRpcRequest>
@@ -111,7 +112,7 @@ export interface WalletEventTypes {
   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

package/src/wallet.ts

@@ -210,8 +210,17 @@ export class Wallet implements WalletProvider {
       }
     })
 
-    // below will update the account upon wallet connect/disconnect (aka, login/logout)
-    this.transport.messageProvider.on('accountsChanged', (accounts: string[]) => {
+    // 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: string[], origin?: string) => {
+      if (origin) {
+        if (accounts.length > 0) {
+          this.useSession({ accountAddress: accounts[0] }, true)
+        }
+        return
+      }
+
       if (!accounts || accounts.length === 0 || accounts[0] === '') {
         this.clearSession()
       } else {
@@ -244,7 +253,7 @@ export class Wallet implements WalletProvider {
 
     if (
       this.isConnected() &&
-      this.isSiteConnected(options?.origin) &&
+      (await this.isSiteConnected(options?.origin)) &&
       !!this.session &&
       !options?.authorize &&
       !options?.askForEmail
@@ -307,7 +316,7 @@ export class Wallet implements WalletProvider {
     return this.connectedSites.get()
   }
 
-  private async isSiteConnected(origin: string | undefined): Promise<boolean> {
+  async isSiteConnected(origin: string | undefined): Promise<boolean> {
     const authorized = await this.connectedSites.get()
 
     return !!authorized && authorized.includes(origin || window.location.origin)