@0xsequence/provider 0.0.0-20230802165402 → 0.0.0-20230804151646

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
@@ -1714,7 +1719,6 @@ class WindowMessageProvider extends BaseProviderTransport {
 
       // serialize params
       walletURL.search = windowSessionParams.toString();
-      console.trace('tolga');
       this.walletWindow = window.open(walletURL.href, 'sequence.app', windowFeatures);
 
       // TODO: move this somewhere else
@@ -2646,7 +2650,7 @@ class WalletRequestHandler {
     });
   }
   async connect(options) {
-    var _this$prompter$getDef2, _this$prompter4;
+    var _ref, _options$networkId;
     if (!this.account) {
       return {
         connected: false,
@@ -2654,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)
@@ -2731,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) {

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
@@ -1714,7 +1719,6 @@ class WindowMessageProvider extends BaseProviderTransport {
 
       // serialize params
       walletURL.search = windowSessionParams.toString();
-      console.trace('tolga');
       this.walletWindow = window.open(walletURL.href, 'sequence.app', windowFeatures);
 
       // TODO: move this somewhere else
@@ -2646,7 +2650,7 @@ class WalletRequestHandler {
     });
   }
   async connect(options) {
-    var _this$prompter$getDef2, _this$prompter4;
+    var _ref, _options$networkId;
     if (!this.account) {
       return {
         connected: false,
@@ -2654,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)
@@ -2731,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) {

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, allNetworks, findNetworkConfig, 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
@@ -1710,7 +1715,6 @@ class WindowMessageProvider extends BaseProviderTransport {
 
       // serialize params
       walletURL.search = windowSessionParams.toString();
-      console.trace('tolga');
       this.walletWindow = window.open(walletURL.href, 'sequence.app', windowFeatures);
 
       // TODO: move this somewhere else
@@ -2642,7 +2646,7 @@ class WalletRequestHandler {
     });
   }
   async connect(options) {
-    var _this$prompter$getDef2, _this$prompter4;
+    var _ref, _options$networkId;
     if (!this.account) {
       return {
         connected: false,
@@ -2650,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)
@@ -2727,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) {

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 { 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,7 +23,7 @@ export declare class WalletRequestHandler implements ExternalProvider, JsonRpcHa
     signOut(): void;
     signerReset(): void;
     signerReady(timeout?: number): Promise<void>;
-    connect(options?: ConnectOptions): Promise<ConnectDetails>;
+    connect(options?: NetworkedConnectOptions): Promise<ConnectDetails>;
     promptConnect: (options?: ConnectOptions) => Promise<ConnectDetails>;
     sendMessageRequest(message: ProviderMessageRequest): Promise<ProviderMessageResponse>;
     sendAsync: (request: JsonRpcRequest, callback: JsonRpcResponseCallback, chainId?: number) => Promise<void>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@0xsequence/provider",
-  "version": "0.0.0-20230802165402",
+  "version": "0.0.0-20230804151646",
   "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": "0.0.0-20230802165402",
-    "@0xsequence/account": "0.0.0-20230802165402",
-    "@0xsequence/auth": "0.0.0-20230802165402",
-    "@0xsequence/core": "0.0.0-20230802165402",
-    "@0xsequence/migration": "0.0.0-20230802165402",
-    "@0xsequence/network": "0.0.0-20230802165402",
-    "@0xsequence/relayer": "0.0.0-20230802165402",
-    "@0xsequence/utils": "0.0.0-20230802165402",
-    "@0xsequence/wallet": "0.0.0-20230802165402"
+    "@0xsequence/abi": "0.0.0-20230804151646",
+    "@0xsequence/account": "0.0.0-20230804151646",
+    "@0xsequence/auth": "0.0.0-20230804151646",
+    "@0xsequence/core": "0.0.0-20230804151646",
+    "@0xsequence/migration": "0.0.0-20230804151646",
+    "@0xsequence/network": "0.0.0-20230804151646",
+    "@0xsequence/relayer": "0.0.0-20230804151646",
+    "@0xsequence/utils": "0.0.0-20230804151646",
+    "@0xsequence/wallet": "0.0.0-20230804151646"
   },
   "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)

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

@@ -2,12 +2,13 @@ import { Account, AccountStatus } from '@0xsequence/account'
 import { signAuthorization, AuthorizationOptions } from '@0xsequence/auth'
 import { commons } from '@0xsequence/core'
 import {
-  NetworkConfig,
+  ChainId,
+  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 +17,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 +134,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 +143,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,

package/src/transports/window-transport/window-message-provider.ts

@@ -129,8 +129,6 @@ export class WindowMessageProvider extends BaseProviderTransport {
     // serialize params
     walletURL.search = windowSessionParams.toString()
 
-    console.trace('tolga')
-
     this.walletWindow = window.open(walletURL.href, 'sequence.app', windowFeatures)
 
     // TODO: move this somewhere else