@0xsequence/provider 1.1.2 → 1.1.4

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

@@ -835,6 +835,11 @@ class BaseWalletTransport {
         if (connectOptions.app) {
           connectOptions.app = utils.sanitizeAlphanumeric(connectOptions.app);
         }
+        if (connectOptions.networkId) {
+          networkId = connectOptions.networkId;
+        } else if (networkId) {
+          connectOptions.networkId = networkId;
+        }
 
         // Set connect options on the walletRequestHandler as our primary
         // wallet controller, and fall back to networkId if necessary
@@ -901,7 +906,7 @@ class BaseWalletTransport {
           _this.notifyOpen({
             sessionId: _this._sessionId,
             chainId: `${chainId}`,
-            session: await _this.walletRequestHandler.walletSession()
+            session: await _this.walletRequestHandler.walletSession(chainId)
           });
         }
       }
@@ -2152,7 +2157,7 @@ class WalletRequestHandler {
       });
       const connectDetails = promptConnectDetails;
       if (connectDetails.connected && !connectDetails.session) {
-        connectDetails.session = await _this.walletSession();
+        connectDetails.session = await _this.walletSession(options == null ? void 0 : options.networkId);
       }
       return promptConnectDetails;
     };
@@ -2645,7 +2650,7 @@ class WalletRequestHandler {
     });
   }
   async connect(options) {
-    var _this$prompter$getDef2, _this$prompter4;
+    var _ref, _options$networkId;
     if (!this.account) {
       return {
         connected: false,
@@ -2653,7 +2658,8 @@ class WalletRequestHandler {
         error: 'unable to connect without signed in account'
       };
     }
-    const chainId = (_this$prompter$getDef2 = (_this$prompter4 = this.prompter) == null ? void 0 : _this$prompter4.getDefaultChainId()) != null ? _this$prompter$getDef2 : 1;
+    const networkId = (_ref = (_options$networkId = options == null ? void 0 : options.networkId) != null ? _options$networkId : this.defaultChainId()) != null ? _ref : network.ChainId.MAINNET;
+    const chainId = network.findSupportedNetwork(networkId).chainId;
     const connectDetails = {
       connected: true,
       chainId: ethers.ethers.utils.hexValue(chainId)
@@ -2684,7 +2690,7 @@ class WalletRequestHandler {
     }
 
     // Build session response for connect details
-    connectDetails.session = await this.walletSession();
+    connectDetails.session = await this.walletSession(chainId);
     return connectDetails;
   }
   // sendMessageRequest will unwrap the ProviderMessageRequest and send it to the JsonRpcHandler
@@ -2730,8 +2736,8 @@ class WalletRequestHandler {
     (_this$onConnectOption = this.onConnectOptionsChange) == null ? void 0 : _this$onConnectOption.call(this, options);
   }
   async setDefaultChainId(chainId) {
-    var _this$prompter5;
-    await ((_this$prompter5 = this.prompter) == null ? void 0 : _this$prompter5.promptChangeNetwork(chainId));
+    var _this$prompter4;
+    await ((_this$prompter4 = this.prompter) == null ? void 0 : _this$prompter4.promptChangeNetwork(chainId));
     return this.defaultChainId();
   }
   async getNetworks(jsonRpcResponse) {
@@ -2751,9 +2757,11 @@ class WalletRequestHandler {
       return this.account.networks;
     }
   }
-  walletSession() {
-    if (!this.account) return undefined;
-    return {
+  walletSession(networkId) {
+    if (!this.account) {
+      return undefined;
+    }
+    const session = {
       walletContext: this.account.contexts,
       accountAddress: this.account.address,
       // The dapp shouldn't access the relayer directly, and the provider (as an object) is not serializable.
@@ -2762,6 +2770,18 @@ class WalletRequestHandler {
         relayer: undefined
       }))
     };
+    if (networkId) {
+      const network$1 = network.findNetworkConfig(session.networks, networkId);
+      if (network$1) {
+        var _session$networks;
+        // Delete the isDefaultChain property from the session network
+        (_session$networks = session.networks) == null ? void 0 : _session$networks.forEach(n => delete n.isDefaultChain);
+
+        // Add the isDefaultChain property to the network with the given networkId
+        network$1.isDefaultChain = true;
+      }
+    }
+    return session;
   }
   notifyConnect(connectDetails, origin) {
     var _connectDetails$sessi;

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

@@ -835,6 +835,11 @@ class BaseWalletTransport {
         if (connectOptions.app) {
           connectOptions.app = utils.sanitizeAlphanumeric(connectOptions.app);
         }
+        if (connectOptions.networkId) {
+          networkId = connectOptions.networkId;
+        } else if (networkId) {
+          connectOptions.networkId = networkId;
+        }
 
         // Set connect options on the walletRequestHandler as our primary
         // wallet controller, and fall back to networkId if necessary
@@ -901,7 +906,7 @@ class BaseWalletTransport {
           _this.notifyOpen({
             sessionId: _this._sessionId,
             chainId: `${chainId}`,
-            session: await _this.walletRequestHandler.walletSession()
+            session: await _this.walletRequestHandler.walletSession(chainId)
           });
         }
       }
@@ -2152,7 +2157,7 @@ class WalletRequestHandler {
       });
       const connectDetails = promptConnectDetails;
       if (connectDetails.connected && !connectDetails.session) {
-        connectDetails.session = await _this.walletSession();
+        connectDetails.session = await _this.walletSession(options == null ? void 0 : options.networkId);
       }
       return promptConnectDetails;
     };
@@ -2645,7 +2650,7 @@ class WalletRequestHandler {
     });
   }
   async connect(options) {
-    var _this$prompter$getDef2, _this$prompter4;
+    var _ref, _options$networkId;
     if (!this.account) {
       return {
         connected: false,
@@ -2653,7 +2658,8 @@ class WalletRequestHandler {
         error: 'unable to connect without signed in account'
       };
     }
-    const chainId = (_this$prompter$getDef2 = (_this$prompter4 = this.prompter) == null ? void 0 : _this$prompter4.getDefaultChainId()) != null ? _this$prompter$getDef2 : 1;
+    const networkId = (_ref = (_options$networkId = options == null ? void 0 : options.networkId) != null ? _options$networkId : this.defaultChainId()) != null ? _ref : network.ChainId.MAINNET;
+    const chainId = network.findSupportedNetwork(networkId).chainId;
     const connectDetails = {
       connected: true,
       chainId: ethers.ethers.utils.hexValue(chainId)
@@ -2684,7 +2690,7 @@ class WalletRequestHandler {
     }
 
     // Build session response for connect details
-    connectDetails.session = await this.walletSession();
+    connectDetails.session = await this.walletSession(chainId);
     return connectDetails;
   }
   // sendMessageRequest will unwrap the ProviderMessageRequest and send it to the JsonRpcHandler
@@ -2730,8 +2736,8 @@ class WalletRequestHandler {
     (_this$onConnectOption = this.onConnectOptionsChange) == null ? void 0 : _this$onConnectOption.call(this, options);
   }
   async setDefaultChainId(chainId) {
-    var _this$prompter5;
-    await ((_this$prompter5 = this.prompter) == null ? void 0 : _this$prompter5.promptChangeNetwork(chainId));
+    var _this$prompter4;
+    await ((_this$prompter4 = this.prompter) == null ? void 0 : _this$prompter4.promptChangeNetwork(chainId));
     return this.defaultChainId();
   }
   async getNetworks(jsonRpcResponse) {
@@ -2751,9 +2757,11 @@ class WalletRequestHandler {
       return this.account.networks;
     }
   }
-  walletSession() {
-    if (!this.account) return undefined;
-    return {
+  walletSession(networkId) {
+    if (!this.account) {
+      return undefined;
+    }
+    const session = {
       walletContext: this.account.contexts,
       accountAddress: this.account.address,
       // The dapp shouldn't access the relayer directly, and the provider (as an object) is not serializable.
@@ -2762,6 +2770,18 @@ class WalletRequestHandler {
         relayer: undefined
       }))
     };
+    if (networkId) {
+      const network$1 = network.findNetworkConfig(session.networks, networkId);
+      if (network$1) {
+        var _session$networks;
+        // Delete the isDefaultChain property from the session network
+        (_session$networks = session.networks) == null ? void 0 : _session$networks.forEach(n => delete n.isDefaultChain);
+
+        // Add the isDefaultChain property to the network with the given networkId
+        network$1.isDefaultChain = true;
+      }
+    }
+    return session;
   }
   notifyConnect(connectDetails, origin) {
     var _connectDetails$sessi;

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

@@ -1,7 +1,7 @@
 import { EventEmitter2 } from 'eventemitter2';
 import { logger, encodeMessageDigest, encodeTypedDataDigest, sanitizeNumberString, sanitizeHost, sanitizeAlphanumeric, base64EncodeObject, base64DecodeObject } from '@0xsequence/utils';
 import { ethers, BigNumber } from 'ethers';
-import { findSupportedNetwork, allNetworks, findNetworkConfig, JsonRpcRouter, loggingProviderMiddleware, exceptionProviderMiddleware, CachedProvider, JsonRpcSender } from '@0xsequence/network';
+import { findSupportedNetwork, ChainId, findNetworkConfig, allNetworks, JsonRpcRouter, loggingProviderMiddleware, exceptionProviderMiddleware, CachedProvider, JsonRpcSender } from '@0xsequence/network';
 import { commons } from '@0xsequence/core';
 import { signAuthorization } from '@0xsequence/auth';
 
@@ -831,6 +831,11 @@ class BaseWalletTransport {
         if (connectOptions.app) {
           connectOptions.app = sanitizeAlphanumeric(connectOptions.app);
         }
+        if (connectOptions.networkId) {
+          networkId = connectOptions.networkId;
+        } else if (networkId) {
+          connectOptions.networkId = networkId;
+        }
 
         // Set connect options on the walletRequestHandler as our primary
         // wallet controller, and fall back to networkId if necessary
@@ -897,7 +902,7 @@ class BaseWalletTransport {
           _this.notifyOpen({
             sessionId: _this._sessionId,
             chainId: `${chainId}`,
-            session: await _this.walletRequestHandler.walletSession()
+            session: await _this.walletRequestHandler.walletSession(chainId)
           });
         }
       }
@@ -2148,7 +2153,7 @@ class WalletRequestHandler {
       });
       const connectDetails = promptConnectDetails;
       if (connectDetails.connected && !connectDetails.session) {
-        connectDetails.session = await _this.walletSession();
+        connectDetails.session = await _this.walletSession(options == null ? void 0 : options.networkId);
       }
       return promptConnectDetails;
     };
@@ -2641,7 +2646,7 @@ class WalletRequestHandler {
     });
   }
   async connect(options) {
-    var _this$prompter$getDef2, _this$prompter4;
+    var _ref, _options$networkId;
     if (!this.account) {
       return {
         connected: false,
@@ -2649,7 +2654,8 @@ class WalletRequestHandler {
         error: 'unable to connect without signed in account'
       };
     }
-    const chainId = (_this$prompter$getDef2 = (_this$prompter4 = this.prompter) == null ? void 0 : _this$prompter4.getDefaultChainId()) != null ? _this$prompter$getDef2 : 1;
+    const networkId = (_ref = (_options$networkId = options == null ? void 0 : options.networkId) != null ? _options$networkId : this.defaultChainId()) != null ? _ref : ChainId.MAINNET;
+    const chainId = findSupportedNetwork(networkId).chainId;
     const connectDetails = {
       connected: true,
       chainId: ethers.utils.hexValue(chainId)
@@ -2680,7 +2686,7 @@ class WalletRequestHandler {
     }
 
     // Build session response for connect details
-    connectDetails.session = await this.walletSession();
+    connectDetails.session = await this.walletSession(chainId);
     return connectDetails;
   }
   // sendMessageRequest will unwrap the ProviderMessageRequest and send it to the JsonRpcHandler
@@ -2726,8 +2732,8 @@ class WalletRequestHandler {
     (_this$onConnectOption = this.onConnectOptionsChange) == null ? void 0 : _this$onConnectOption.call(this, options);
   }
   async setDefaultChainId(chainId) {
-    var _this$prompter5;
-    await ((_this$prompter5 = this.prompter) == null ? void 0 : _this$prompter5.promptChangeNetwork(chainId));
+    var _this$prompter4;
+    await ((_this$prompter4 = this.prompter) == null ? void 0 : _this$prompter4.promptChangeNetwork(chainId));
     return this.defaultChainId();
   }
   async getNetworks(jsonRpcResponse) {
@@ -2747,9 +2753,11 @@ class WalletRequestHandler {
       return this.account.networks;
     }
   }
-  walletSession() {
-    if (!this.account) return undefined;
-    return {
+  walletSession(networkId) {
+    if (!this.account) {
+      return undefined;
+    }
+    const session = {
       walletContext: this.account.contexts,
       accountAddress: this.account.address,
       // The dapp shouldn't access the relayer directly, and the provider (as an object) is not serializable.
@@ -2758,6 +2766,18 @@ class WalletRequestHandler {
         relayer: undefined
       }))
     };
+    if (networkId) {
+      const network = findNetworkConfig(session.networks, networkId);
+      if (network) {
+        var _session$networks;
+        // Delete the isDefaultChain property from the session network
+        (_session$networks = session.networks) == null ? void 0 : _session$networks.forEach(n => delete n.isDefaultChain);
+
+        // Add the isDefaultChain property to the network with the given networkId
+        network.isDefaultChain = true;
+      }
+    }
+    return session;
   }
   notifyConnect(connectDetails, origin) {
     var _connectDetails$sessi;

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

@@ -1,8 +1,8 @@
 import { Account } from '@0xsequence/account';
 import { commons } from '@0xsequence/core';
-import { NetworkConfig, JsonRpcHandler, JsonRpcRequest, JsonRpcResponseCallback } from '@0xsequence/network';
+import { ChainIdLike, JsonRpcHandler, JsonRpcRequest, JsonRpcResponseCallback, NetworkConfig } from '@0xsequence/network';
 import { providers } from 'ethers';
-import { ProviderMessageRequest, ProviderMessageResponse, ProviderMessageRequestHandler, MessageToSign, ProviderRpcError, ConnectOptions, ConnectDetails, PromptConnectDetails, WalletSession, OpenWalletIntent, ProviderEventTypes } from "../types.js";
+import { ConnectDetails, ConnectOptions, MessageToSign, NetworkedConnectOptions, OpenWalletIntent, PromptConnectDetails, ProviderEventTypes, ProviderMessageRequest, ProviderMessageRequestHandler, ProviderMessageResponse, ProviderRpcError, WalletSession } from "../types.js";
 type ExternalProvider = providers.ExternalProvider;
 export interface WalletSignInOptions {
     connect?: boolean;
@@ -23,8 +23,8 @@ export declare class WalletRequestHandler implements ExternalProvider, JsonRpcHa
     signOut(): void;
     signerReset(): void;
     signerReady(timeout?: number): Promise<void>;
-    connect(options?: ConnectOptions): Promise<ConnectDetails>;
-    promptConnect: (options?: ConnectOptions) => Promise<ConnectDetails>;
+    connect(options?: NetworkedConnectOptions): Promise<ConnectDetails>;
+    promptConnect: (options?: NetworkedConnectOptions) => Promise<ConnectDetails>;
     sendMessageRequest(message: ProviderMessageRequest): Promise<ProviderMessageResponse>;
     sendAsync: (request: JsonRpcRequest, callback: JsonRpcResponseCallback, chainId?: number) => Promise<void>;
     on<K extends keyof ProviderEventTypes>(event: K, fn: ProviderEventTypes[K]): void;
@@ -36,7 +36,7 @@ export declare class WalletRequestHandler implements ExternalProvider, JsonRpcHa
     setConnectOptions(options: ConnectOptions | undefined): void;
     setDefaultChainId(chainId: number): Promise<number>;
     getNetworks(jsonRpcResponse?: boolean): Promise<NetworkConfig[]>;
-    walletSession(): WalletSession | undefined;
+    walletSession(networkId?: ChainIdLike): WalletSession | undefined;
     notifyConnect(connectDetails: ConnectDetails, origin?: string): void;
     notifyDisconnect(origin?: string): void;
     notifyNetworks(networks?: NetworkConfig[]): Promise<void>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@0xsequence/provider",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "description": "provider sub-package for Sequence",
   "repository": "https://github.com/0xsequence/sequence.js/tree/master/packages/provider",
   "source": "src/index.ts",
@@ -11,15 +11,15 @@
   "dependencies": {
     "eventemitter2": "^6.4.5",
     "webextension-polyfill": "^0.10.0",
-    "@0xsequence/abi": "1.1.2",
-    "@0xsequence/account": "1.1.2",
-    "@0xsequence/auth": "1.1.2",
-    "@0xsequence/migration": "1.1.2",
-    "@0xsequence/core": "1.1.2",
-    "@0xsequence/network": "1.1.2",
-    "@0xsequence/relayer": "1.1.2",
-    "@0xsequence/utils": "1.1.2",
-    "@0xsequence/wallet": "1.1.2"
+    "@0xsequence/abi": "1.1.4",
+    "@0xsequence/auth": "1.1.4",
+    "@0xsequence/account": "1.1.4",
+    "@0xsequence/core": "1.1.4",
+    "@0xsequence/migration": "1.1.4",
+    "@0xsequence/network": "1.1.4",
+    "@0xsequence/relayer": "1.1.4",
+    "@0xsequence/utils": "1.1.4",
+    "@0xsequence/wallet": "1.1.4"
   },
   "peerDependencies": {
     "ethers": ">=5.5 < 6"

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

@@ -372,6 +372,12 @@ export abstract class BaseWalletTransport implements WalletTransport {
         connectOptions.app = sanitizeAlphanumeric(connectOptions.app)
       }
 
+      if (connectOptions.networkId) {
+        networkId = connectOptions.networkId
+      } else if (networkId) {
+        connectOptions.networkId = networkId
+      }
+
       // Set connect options on the walletRequestHandler as our primary
       // wallet controller, and fall back to networkId if necessary
       this.walletRequestHandler.setConnectOptions(connectOptions)
@@ -438,7 +444,7 @@ export abstract class BaseWalletTransport implements WalletTransport {
         this.notifyOpen({
           sessionId: this._sessionId,
           chainId: `${chainId}`,
-          session: await this.walletRequestHandler.walletSession()
+          session: await this.walletRequestHandler.walletSession(chainId)
         })
       }
     }

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

@@ -2,12 +2,15 @@ import { Account, AccountStatus } from '@0xsequence/account'
 import { signAuthorization, AuthorizationOptions } from '@0xsequence/auth'
 import { commons } from '@0xsequence/core'
 import {
-  NetworkConfig,
+  ChainId,
+  ChainIdLike,
+  findNetworkConfig,
+  findSupportedNetwork,
   JsonRpcHandler,
   JsonRpcRequest,
-  JsonRpcResponseCallback,
   JsonRpcResponse,
-  getChainId
+  JsonRpcResponseCallback,
+  NetworkConfig
 } from '@0xsequence/network'
 import { logger, TypedData } from '@0xsequence/utils'
 import { BigNumber, ethers, providers } from 'ethers'
@@ -16,19 +19,20 @@ import { EventEmitter2 as EventEmitter } from 'eventemitter2'
 import { fromExtended } from '../extended'
 import { validateTransactionRequest } from '../transactions'
 import {
-  ProviderMessageRequest,
-  ProviderMessageResponse,
-  ProviderMessageRequestHandler,
-  MessageToSign,
-  ProviderRpcError,
-  ConnectOptions,
   ConnectDetails,
-  PromptConnectDetails,
-  WalletSession,
-  OpenWalletIntent,
+  ConnectOptions,
   ErrSignedInRequired,
+  MessageToSign,
+  NetworkedConnectOptions,
+  OpenWalletIntent,
+  PromptConnectDetails,
   ProviderEventTypes,
-  TypedEventEmitter
+  ProviderMessageRequest,
+  ProviderMessageRequestHandler,
+  ProviderMessageResponse,
+  ProviderRpcError,
+  TypedEventEmitter,
+  WalletSession
 } from '../types'
 import { prefixEIP191Message } from '../utils'
 
@@ -132,7 +136,7 @@ export class WalletRequestHandler implements ExternalProvider, JsonRpcHandler, P
     })
   }
 
-  async connect(options?: ConnectOptions): Promise<ConnectDetails> {
+  async connect(options?: NetworkedConnectOptions): Promise<ConnectDetails> {
     if (!this.account) {
       return {
         connected: false,
@@ -141,7 +145,8 @@ export class WalletRequestHandler implements ExternalProvider, JsonRpcHandler, P
       }
     }
 
-    const chainId: number | string = this.prompter?.getDefaultChainId() ?? 1
+    const networkId = options?.networkId ?? this.defaultChainId() ?? ChainId.MAINNET
+    const chainId = findSupportedNetwork(networkId)!.chainId
 
     const connectDetails: ConnectDetails = {
       connected: true,
@@ -174,12 +179,12 @@ export class WalletRequestHandler implements ExternalProvider, JsonRpcHandler, P
     }
 
     // Build session response for connect details
-    connectDetails.session = await this.walletSession()
+    connectDetails.session = await this.walletSession(chainId)
 
     return connectDetails
   }
 
-  promptConnect = async (options?: ConnectOptions): Promise<ConnectDetails> => {
+  promptConnect = async (options?: NetworkedConnectOptions): Promise<ConnectDetails> => {
     if (!options && !this._connectOptions) {
       // this is an unexpected state and should not happen
       throw new Error('prompter connect options are empty')
@@ -196,7 +201,7 @@ export class WalletRequestHandler implements ExternalProvider, JsonRpcHandler, P
 
     const connectDetails: ConnectDetails = promptConnectDetails
     if (connectDetails.connected && !connectDetails.session) {
-      connectDetails.session = await this.walletSession()
+      connectDetails.session = await this.walletSession(options?.networkId)
     }
 
     return promptConnectDetails
@@ -725,14 +730,31 @@ export class WalletRequestHandler implements ExternalProvider, JsonRpcHandler, P
     }
   }
 
-  walletSession(): WalletSession | undefined {
-    if (!this.account) return undefined
-    return {
+  walletSession(networkId?: ChainIdLike): WalletSession | undefined {
+    if (!this.account) {
+      return undefined
+    }
+
+    const session = {
       walletContext: this.account.contexts,
       accountAddress: this.account.address,
       // The dapp shouldn't access the relayer directly, and the provider (as an object) is not serializable.
       networks: this.account.networks.map(n => ({ ...n, provider: undefined, relayer: undefined }))
     }
+
+    if (networkId) {
+      const network = findNetworkConfig(session.networks, networkId)
+
+      if (network) {
+        // Delete the isDefaultChain property from the session network
+        session.networks?.forEach(n => delete n.isDefaultChain)
+
+        // Add the isDefaultChain property to the network with the given networkId
+        network.isDefaultChain = true
+      }
+    }
+
+    return session
   }
 
   notifyConnect(connectDetails: ConnectDetails, origin?: string) {