@0xsequence/provider 0.39.4 → 0.40.0

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

@@ -3238,7 +3238,7 @@ class WalletUtils {
 }
 
 class Wallet {
-  constructor(defaultNetworkId, config) {
+  constructor(_network, config) {
     var _this = this;
 
     this.utils = void 0;
@@ -3566,8 +3566,8 @@ class Wallet {
       this.config = _extends({}, this.config, config);
     }
 
-    if (defaultNetworkId) {
-      this.config.defaultNetworkId = defaultNetworkId;
+    if (_network) {
+      this.config.defaultNetworkId = _network;
     } else if (!this.config.defaultNetworkId) {
       this.config.defaultNetworkId = 'mainnet';
     }
@@ -3622,7 +3622,9 @@ class Wallet {
     }
 
     this.clearSession();
-  }
+  } // TODO: add switchNetwork(network: string | number) which will call wallet_switchEthereumChain
+  // and on successful response, will update the provider info here, etc.
+
 
   getProviderConfig() {
     return this.config;
@@ -3752,8 +3754,10 @@ class Wallet {
     if (!this.config.networks && !this.config.networkRpcUrl) {
       this.networks = networks;
       return;
-    } // combine custom network config with networks in the session
+    } // init networks
+
 
+    this.networks = networks; // combine custom network config with networks in the session
 
     if (this.config.networks) {
       this.networks = networks.map(n => _extends({}, n)); // copy
@@ -3768,7 +3772,11 @@ class Wallet {
 
 
     if (this.config.networkRpcUrl) {
-      this.networks.find(network => network.isDefaultChain).rpcUrl = this.config.networkRpcUrl;
+      const network = this.networks.find(network => network.isDefaultChain);
+
+      if (network) {
+        network.rpcUrl = this.config.networkRpcUrl;
+      }
     }
   }
 
@@ -3796,6 +3804,22 @@ const DefaultProviderConfig = {
     }
   }
 };
+let walletInstance;
+const initWallet = (network, config) => {
+  if (walletInstance && walletInstance.isOpened()) {
+    walletInstance.closeWallet();
+  }
+
+  walletInstance = new Wallet(network, config);
+  return walletInstance;
+};
+const getWallet = () => {
+  if (!walletInstance) {
+    throw new Error('Wallet has not been initialized, call sequence.initWallet(network, config) first.');
+  }
+
+  return walletInstance;
+};
 
 exports.BaseInjectedTransport = BaseInjectedTransport;
 exports.BaseProviderTransport = BaseProviderTransport;
@@ -3822,6 +3846,8 @@ exports.Web3Signer = Web3Signer;
 exports.WindowMessageHandler = WindowMessageHandler;
 exports.WindowMessageProvider = WindowMessageProvider;
 exports.WindowSessionParams = WindowSessionParams;
+exports.getWallet = getWallet;
+exports.initWallet = initWallet;
 exports.isBrowserExtension = isBrowserExtension;
 exports.isSequenceProvider = isSequenceProvider;
 exports.isValidMessageSignature = isValidMessageSignature;

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

@@ -3238,7 +3238,7 @@ class WalletUtils {
 }
 
 class Wallet {
-  constructor(defaultNetworkId, config) {
+  constructor(_network, config) {
     var _this = this;
 
     this.utils = void 0;
@@ -3566,8 +3566,8 @@ class Wallet {
       this.config = _extends({}, this.config, config);
     }
 
-    if (defaultNetworkId) {
-      this.config.defaultNetworkId = defaultNetworkId;
+    if (_network) {
+      this.config.defaultNetworkId = _network;
     } else if (!this.config.defaultNetworkId) {
       this.config.defaultNetworkId = 'mainnet';
     }
@@ -3622,7 +3622,9 @@ class Wallet {
     }
 
     this.clearSession();
-  }
+  } // TODO: add switchNetwork(network: string | number) which will call wallet_switchEthereumChain
+  // and on successful response, will update the provider info here, etc.
+
 
   getProviderConfig() {
     return this.config;
@@ -3752,8 +3754,10 @@ class Wallet {
     if (!this.config.networks && !this.config.networkRpcUrl) {
       this.networks = networks;
       return;
-    } // combine custom network config with networks in the session
+    } // init networks
+
 
+    this.networks = networks; // combine custom network config with networks in the session
 
     if (this.config.networks) {
       this.networks = networks.map(n => _extends({}, n)); // copy
@@ -3768,7 +3772,11 @@ class Wallet {
 
 
     if (this.config.networkRpcUrl) {
-      this.networks.find(network => network.isDefaultChain).rpcUrl = this.config.networkRpcUrl;
+      const network = this.networks.find(network => network.isDefaultChain);
+
+      if (network) {
+        network.rpcUrl = this.config.networkRpcUrl;
+      }
     }
   }
 
@@ -3796,6 +3804,22 @@ const DefaultProviderConfig = {
     }
   }
 };
+let walletInstance;
+const initWallet = (network, config) => {
+  if (walletInstance && walletInstance.isOpened()) {
+    walletInstance.closeWallet();
+  }
+
+  walletInstance = new Wallet(network, config);
+  return walletInstance;
+};
+const getWallet = () => {
+  if (!walletInstance) {
+    throw new Error('Wallet has not been initialized, call sequence.initWallet(network, config) first.');
+  }
+
+  return walletInstance;
+};
 
 exports.BaseInjectedTransport = BaseInjectedTransport;
 exports.BaseProviderTransport = BaseProviderTransport;
@@ -3822,6 +3846,8 @@ exports.Web3Signer = Web3Signer;
 exports.WindowMessageHandler = WindowMessageHandler;
 exports.WindowMessageProvider = WindowMessageProvider;
 exports.WindowSessionParams = WindowSessionParams;
+exports.getWallet = getWallet;
+exports.initWallet = initWallet;
 exports.isBrowserExtension = isBrowserExtension;
 exports.isSequenceProvider = isSequenceProvider;
 exports.isValidMessageSignature = isValidMessageSignature;

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

@@ -3234,7 +3234,7 @@ class WalletUtils {
 }
 
 class Wallet {
-  constructor(defaultNetworkId, config) {
+  constructor(_network, config) {
     var _this = this;
 
     this.utils = void 0;
@@ -3562,8 +3562,8 @@ class Wallet {
       this.config = _extends({}, this.config, config);
     }
 
-    if (defaultNetworkId) {
-      this.config.defaultNetworkId = defaultNetworkId;
+    if (_network) {
+      this.config.defaultNetworkId = _network;
     } else if (!this.config.defaultNetworkId) {
       this.config.defaultNetworkId = 'mainnet';
     }
@@ -3618,7 +3618,9 @@ class Wallet {
     }
 
     this.clearSession();
-  }
+  } // TODO: add switchNetwork(network: string | number) which will call wallet_switchEthereumChain
+  // and on successful response, will update the provider info here, etc.
+
 
   getProviderConfig() {
     return this.config;
@@ -3748,8 +3750,10 @@ class Wallet {
     if (!this.config.networks && !this.config.networkRpcUrl) {
       this.networks = networks;
       return;
-    } // combine custom network config with networks in the session
+    } // init networks
+
 
+    this.networks = networks; // combine custom network config with networks in the session
 
     if (this.config.networks) {
       this.networks = networks.map(n => _extends({}, n)); // copy
@@ -3764,7 +3768,11 @@ class Wallet {
 
 
     if (this.config.networkRpcUrl) {
-      this.networks.find(network => network.isDefaultChain).rpcUrl = this.config.networkRpcUrl;
+      const network = this.networks.find(network => network.isDefaultChain);
+
+      if (network) {
+        network.rpcUrl = this.config.networkRpcUrl;
+      }
     }
   }
 
@@ -3792,5 +3800,21 @@ const DefaultProviderConfig = {
     }
   }
 };
+let walletInstance;
+const initWallet = (network, config) => {
+  if (walletInstance && walletInstance.isOpened()) {
+    walletInstance.closeWallet();
+  }
+
+  walletInstance = new Wallet(network, config);
+  return walletInstance;
+};
+const getWallet = () => {
+  if (!walletInstance) {
+    throw new Error('Wallet has not been initialized, call sequence.initWallet(network, config) first.');
+  }
+
+  return walletInstance;
+};
 
-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 };
+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, getWallet, initWallet, isBrowserExtension, isSequenceProvider, isValidMessageSignature, isValidSignature, isValidTypedDataSignature, isWalletUpToDate, messageToBytes, nextMessageIdx, prefixEIP191Message, recoverWalletConfig };

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

@@ -6,6 +6,7 @@ import { WalletSession, ProviderEventTypes, ConnectOptions, OpenWalletIntent, Co
 import { ItemStore } from './utils';
 import { WalletUtils } from './utils/index';
 import { Runtime } from 'webextension-polyfill-ts';
+import { sequence } from '../../0xsequence/src';
 export interface WalletProvider {
     connect(options?: ConnectOptions): Promise<ConnectDetails>;
     disconnect(): void;
@@ -37,7 +38,7 @@ export declare class Wallet implements WalletProvider {
     private transport;
     private networks;
     private providers;
-    constructor(defaultNetworkId?: string | number, config?: Partial<ProviderConfig>);
+    constructor(network?: string | number, config?: Partial<ProviderConfig>);
     private init;
     connect: (options?: ConnectOptions | undefined) => Promise<ConnectDetails>;
     addConnectedSite(origin: string | undefined): Promise<void>;
@@ -99,3 +100,5 @@ export interface ProviderConfig {
     walletContext?: WalletContext;
 }
 export declare const DefaultProviderConfig: ProviderConfig;
+export declare const initWallet: (network?: string | number | undefined, config?: Partial<sequence.provider.ProviderConfig> | undefined) => sequence.provider.Wallet;
+export declare const getWallet: () => sequence.provider.Wallet;

package/package.json

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

package/src/wallet.ts

@@ -29,6 +29,7 @@ import { LocalStore, ItemStore, LocalStorage } from './utils'
 import { WalletUtils } from './utils/index'
 
 import { Runtime } from 'webextension-polyfill-ts'
+import { sequence } from '../../0xsequence/src'
 
 export interface WalletProvider {
   connect(options?: ConnectOptions): Promise<ConnectDetails>
@@ -91,15 +92,15 @@ export class Wallet implements WalletProvider {
   private networks: NetworkConfig[]
   private providers: { [chainId: number]: Web3Provider }
 
-  constructor(defaultNetworkId?: string | number, config?: Partial<ProviderConfig>) {
+  constructor(network?: string | number, config?: Partial<ProviderConfig>) {
     // config is a Partial, so that we may intersect it with the DefaultProviderConfig,
     // which allows easy overriding and control of the config.
     this.config = { ...DefaultProviderConfig }
     if (config) {
       this.config = { ...this.config, ...config }
     }
-    if (defaultNetworkId) {
-      this.config.defaultNetworkId = defaultNetworkId
+    if (network) {
+      this.config.defaultNetworkId = network
     } else if (!this.config.defaultNetworkId) {
       this.config.defaultNetworkId = 'mainnet'
     }
@@ -333,6 +334,9 @@ export class Wallet implements WalletProvider {
     this.clearSession()
   }
 
+  // TODO: add switchNetwork(network: string | number) which will call wallet_switchEthereumChain
+  // and on successful response, will update the provider info here, etc.
+
   getProviderConfig(): ProviderConfig {
     return this.config
   }
@@ -619,6 +623,9 @@ export class Wallet implements WalletProvider {
       return
     }
 
+    // init networks
+    this.networks = networks
+
     // combine custom network config with networks in the session
     if (this.config.networks) {
       this.networks = networks.map(n => ({ ...n })) // copy
@@ -632,7 +639,10 @@ export class Wallet implements WalletProvider {
 
     // an extra override for convenience
     if (this.config.networkRpcUrl) {
-      this.networks.find(network => network.isDefaultChain)!.rpcUrl = this.config.networkRpcUrl
+      const network = this.networks.find(network => network.isDefaultChain)
+      if (network) {
+        network.rpcUrl = this.config.networkRpcUrl
+      }
     }
   }
 
@@ -707,3 +717,20 @@ export const DefaultProviderConfig: ProviderConfig = {
     proxyTransport: { enabled: false }
   }
 }
+
+let walletInstance: Wallet | undefined
+
+export const initWallet = (network?: string | number, config?: Partial<ProviderConfig>) => {
+  if (walletInstance && walletInstance.isOpened()) {
+    walletInstance.closeWallet()
+  }
+  walletInstance = new Wallet(network, config)
+  return walletInstance
+}
+
+export const getWallet = () => {
+  if (!walletInstance) {
+    throw new Error('Wallet has not been initialized, call sequence.initWallet(network, config) first.')
+  }
+  return walletInstance
+}