@0xsequence/provider 0.40.0 → 0.40.3

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

@@ -593,19 +593,19 @@ class WalletRequestHandler {
               let sig = ''; // Message must be prefixed with "\x19Ethereum Signed Message:\n"
               // as defined by EIP-191
 
-              message = prefixEIP191Message(message); // TODO:
+              const prefixedMessage = prefixEIP191Message(message); // TODO:
               // if (process.env.TEST_MODE === 'true' && this.prompter === null) {
 
               if (_this.prompter === null) {
                 // prompter is null, so we'll sign from here
-                sig = await signer.signMessage(ethers.ethers.utils.arrayify(message), chainId);
+                sig = await signer.signMessage(prefixedMessage, chainId);
               } else {
                 const promptResultForDeployment = await _this.handleConfirmWalletDeployPrompt(_this.prompter, signer, chainId);
 
                 if (promptResultForDeployment) {
                   sig = await _this.prompter.promptSignMessage({
                     chainId: chainId,
-                    message
+                    message: prefixedMessage
                   }, _this.connectOptions);
                 }
               }
@@ -3366,13 +3366,28 @@ class Wallet {
         this.useSession({
           walletContext: walletContext
         }, true);
-      }); // Load existing session from localStorage
+      });
+    };
+
+    this.loadSession = async function () {
+      const data = await LocalStorage.getInstance().getItem('@sequence.session');
+
+      if (!data || data === '') {
+        return undefined;
+      }
+
+      try {
+        const session = JSON.parse(data);
 
-      this.loadSession().then(session => {
         if (session) {
-          this.useSession(session, false);
+          _this.useSession(session, false);
         }
-      });
+
+        return session;
+      } catch (err) {
+        utils.logger.warn('loadSession failed, unable to parse session payload from storage.');
+        return undefined;
+      }
     };
 
     this.connect = async function (options) {
@@ -3506,26 +3521,10 @@ class Wallet {
       this.transport.messageProvider.closeWallet();
     };
 
-    this.loadSession = async function () {
-      const data = await LocalStorage.getInstance().getItem('@sequence.session');
-
-      if (!data || data === '') {
-        return undefined;
-      }
-
-      try {
-        const session = JSON.parse(data);
-        return session;
-      } catch (err) {
-        utils.logger.warn('loadSession failed, unable to parse session payload from localStorage.');
-        return undefined;
-      }
-    };
-
-    this.saveSession = session => {
+    this.saveSession = async function (session) {
       utils.logger.debug('wallet provider: saving session');
       const data = JSON.stringify(session);
-      LocalStorage.getInstance().setItem('@sequence.session', data);
+      await LocalStorage.getInstance().setItem('@sequence.session', data);
     };
 
     this.useSession = async function (session, autoSave = true) {
@@ -3805,12 +3804,13 @@ const DefaultProviderConfig = {
   }
 };
 let walletInstance;
-const initWallet = (network, config) => {
+const initWallet = async (network, config) => {
   if (walletInstance && walletInstance.isOpened()) {
     walletInstance.closeWallet();
   }
 
   walletInstance = new Wallet(network, config);
+  await walletInstance.loadSession();
   return walletInstance;
 };
 const getWallet = () => {

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

@@ -593,19 +593,19 @@ class WalletRequestHandler {
               let sig = ''; // Message must be prefixed with "\x19Ethereum Signed Message:\n"
               // as defined by EIP-191
 
-              message = prefixEIP191Message(message); // TODO:
+              const prefixedMessage = prefixEIP191Message(message); // TODO:
               // if (process.env.TEST_MODE === 'true' && this.prompter === null) {
 
               if (_this.prompter === null) {
                 // prompter is null, so we'll sign from here
-                sig = await signer.signMessage(ethers.ethers.utils.arrayify(message), chainId);
+                sig = await signer.signMessage(prefixedMessage, chainId);
               } else {
                 const promptResultForDeployment = await _this.handleConfirmWalletDeployPrompt(_this.prompter, signer, chainId);
 
                 if (promptResultForDeployment) {
                   sig = await _this.prompter.promptSignMessage({
                     chainId: chainId,
-                    message
+                    message: prefixedMessage
                   }, _this.connectOptions);
                 }
               }
@@ -3366,13 +3366,28 @@ class Wallet {
         this.useSession({
           walletContext: walletContext
         }, true);
-      }); // Load existing session from localStorage
+      });
+    };
+
+    this.loadSession = async function () {
+      const data = await LocalStorage.getInstance().getItem('@sequence.session');
+
+      if (!data || data === '') {
+        return undefined;
+      }
+
+      try {
+        const session = JSON.parse(data);
 
-      this.loadSession().then(session => {
         if (session) {
-          this.useSession(session, false);
+          _this.useSession(session, false);
         }
-      });
+
+        return session;
+      } catch (err) {
+        utils.logger.warn('loadSession failed, unable to parse session payload from storage.');
+        return undefined;
+      }
     };
 
     this.connect = async function (options) {
@@ -3506,26 +3521,10 @@ class Wallet {
       this.transport.messageProvider.closeWallet();
     };
 
-    this.loadSession = async function () {
-      const data = await LocalStorage.getInstance().getItem('@sequence.session');
-
-      if (!data || data === '') {
-        return undefined;
-      }
-
-      try {
-        const session = JSON.parse(data);
-        return session;
-      } catch (err) {
-        utils.logger.warn('loadSession failed, unable to parse session payload from localStorage.');
-        return undefined;
-      }
-    };
-
-    this.saveSession = session => {
+    this.saveSession = async function (session) {
       utils.logger.debug('wallet provider: saving session');
       const data = JSON.stringify(session);
-      LocalStorage.getInstance().setItem('@sequence.session', data);
+      await LocalStorage.getInstance().setItem('@sequence.session', data);
     };
 
     this.useSession = async function (session, autoSave = true) {
@@ -3805,12 +3804,13 @@ const DefaultProviderConfig = {
   }
 };
 let walletInstance;
-const initWallet = (network, config) => {
+const initWallet = async (network, config) => {
   if (walletInstance && walletInstance.isOpened()) {
     walletInstance.closeWallet();
   }
 
   walletInstance = new Wallet(network, config);
+  await walletInstance.loadSession();
   return walletInstance;
 };
 const getWallet = () => {

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

@@ -589,19 +589,19 @@ class WalletRequestHandler {
               let sig = ''; // Message must be prefixed with "\x19Ethereum Signed Message:\n"
               // as defined by EIP-191
 
-              message = prefixEIP191Message(message); // TODO:
+              const prefixedMessage = prefixEIP191Message(message); // TODO:
               // if (process.env.TEST_MODE === 'true' && this.prompter === null) {
 
               if (_this.prompter === null) {
                 // prompter is null, so we'll sign from here
-                sig = await signer.signMessage(ethers.utils.arrayify(message), chainId);
+                sig = await signer.signMessage(prefixedMessage, chainId);
               } else {
                 const promptResultForDeployment = await _this.handleConfirmWalletDeployPrompt(_this.prompter, signer, chainId);
 
                 if (promptResultForDeployment) {
                   sig = await _this.prompter.promptSignMessage({
                     chainId: chainId,
-                    message
+                    message: prefixedMessage
                   }, _this.connectOptions);
                 }
               }
@@ -3362,13 +3362,28 @@ class Wallet {
         this.useSession({
           walletContext: walletContext
         }, true);
-      }); // Load existing session from localStorage
+      });
+    };
+
+    this.loadSession = async function () {
+      const data = await LocalStorage.getInstance().getItem('@sequence.session');
+
+      if (!data || data === '') {
+        return undefined;
+      }
+
+      try {
+        const session = JSON.parse(data);
 
-      this.loadSession().then(session => {
         if (session) {
-          this.useSession(session, false);
+          _this.useSession(session, false);
         }
-      });
+
+        return session;
+      } catch (err) {
+        logger.warn('loadSession failed, unable to parse session payload from storage.');
+        return undefined;
+      }
     };
 
     this.connect = async function (options) {
@@ -3502,26 +3517,10 @@ class Wallet {
       this.transport.messageProvider.closeWallet();
     };
 
-    this.loadSession = async function () {
-      const data = await LocalStorage.getInstance().getItem('@sequence.session');
-
-      if (!data || data === '') {
-        return undefined;
-      }
-
-      try {
-        const session = JSON.parse(data);
-        return session;
-      } catch (err) {
-        logger.warn('loadSession failed, unable to parse session payload from localStorage.');
-        return undefined;
-      }
-    };
-
-    this.saveSession = session => {
+    this.saveSession = async function (session) {
       logger.debug('wallet provider: saving session');
       const data = JSON.stringify(session);
-      LocalStorage.getInstance().setItem('@sequence.session', data);
+      await LocalStorage.getInstance().setItem('@sequence.session', data);
     };
 
     this.useSession = async function (session, autoSave = true) {
@@ -3801,12 +3800,13 @@ const DefaultProviderConfig = {
   }
 };
 let walletInstance;
-const initWallet = (network, config) => {
+const initWallet = async (network, config) => {
   if (walletInstance && walletInstance.isOpened()) {
     walletInstance.closeWallet();
   }
 
   walletInstance = new Wallet(network, config);
+  await walletInstance.loadSession();
   return walletInstance;
 };
 const getWallet = () => {

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

@@ -192,7 +192,7 @@ export declare type OpenWalletIntent = {
     method: string;
 };
 export interface MessageToSign {
-    message?: string;
+    message?: Uint8Array;
     typedData?: TypedData;
     chainId?: number;
 }

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

@@ -6,17 +6,16 @@ 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;
-    isOpened(): boolean;
     isConnected(): boolean;
     getSession(): WalletSession | undefined;
     getAddress(): Promise<string>;
     getNetworks(chainId?: ChainIdLike): Promise<NetworkConfig[]>;
     getChainId(): Promise<number>;
     getAuthChainId(): Promise<number>;
+    isOpened(): boolean;
     openWallet(path?: string, intent?: OpenWalletIntent, networkId?: string | number): Promise<boolean>;
     closeWallet(): void;
     getProvider(chainId?: ChainIdLike): Web3Provider | undefined;
@@ -40,6 +39,7 @@ export declare class Wallet implements WalletProvider {
     private providers;
     constructor(network?: string | number, config?: Partial<ProviderConfig>);
     private init;
+    loadSession: () => Promise<WalletSession | undefined>;
     connect: (options?: ConnectOptions | undefined) => Promise<ConnectDetails>;
     addConnectedSite(origin: string | undefined): Promise<void>;
     removeConnectedSite(origin: string): Promise<void>;
@@ -71,7 +71,6 @@ export declare class Wallet implements WalletProvider {
     isDeployed(chainId?: ChainIdLike): Promise<boolean>;
     on<K extends keyof ProviderEventTypes>(event: K, fn: ProviderEventTypes[K]): void;
     once<K extends keyof ProviderEventTypes>(event: K, fn: ProviderEventTypes[K]): void;
-    private loadSession;
     private saveSession;
     private useSession;
     private useAccountAddress;
@@ -100,5 +99,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;
+export declare const initWallet: (network?: string | number | undefined, config?: Partial<ProviderConfig> | undefined) => Promise<Wallet>;
+export declare const getWallet: () => Wallet;

package/package.json

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

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

@@ -300,17 +300,17 @@ export class WalletRequestHandler implements ExternalProvider, JsonRpcHandler, P
 
           // Message must be prefixed with "\x19Ethereum Signed Message:\n"
           // as defined by EIP-191
-          message = prefixEIP191Message(message)
+          const prefixedMessage = prefixEIP191Message(message)
 
           // TODO:
           // if (process.env.TEST_MODE === 'true' && this.prompter === null) {
           if (this.prompter === null) {
             // prompter is null, so we'll sign from here
-            sig = await signer.signMessage(ethers.utils.arrayify(message), chainId)
+            sig = await signer.signMessage(prefixedMessage, chainId)
           } else {
             const promptResultForDeployment = await this.handleConfirmWalletDeployPrompt(this.prompter, signer, chainId)
             if (promptResultForDeployment) {
-              sig = await this.prompter.promptSignMessage({ chainId: chainId, message }, this.connectOptions)
+              sig = await this.prompter.promptSignMessage({ chainId: chainId, message: prefixedMessage }, this.connectOptions)
             }
           }
 

package/src/types.ts

@@ -247,7 +247,7 @@ export type OpenWalletIntent =
   | { type: 'jsonRpcRequest'; method: string }
 
 export interface MessageToSign {
-  message?: string
+  message?: Uint8Array
   typedData?: TypedData
   chainId?: number
 }

package/src/wallet.ts

@@ -29,22 +29,20 @@ 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>
-  // authorize(options?: ConnectOptions): Promise<ConnectDetails>
   disconnect(): void
 
-  isOpened(): boolean
   isConnected(): boolean
   getSession(): WalletSession | undefined
-
+ 
   getAddress(): Promise<string>
   getNetworks(chainId?: ChainIdLike): Promise<NetworkConfig[]>
   getChainId(): Promise<number>
   getAuthChainId(): Promise<number>
-
+  
+  isOpened(): boolean
   openWallet(path?: string, intent?: OpenWalletIntent, networkId?: string | number): Promise<boolean>
   closeWallet(): void
 
@@ -238,13 +236,23 @@ export class Wallet implements WalletProvider {
     this.transport.messageProvider.on('walletContext', (walletContext: WalletContext) => {
       this.useSession({ walletContext: walletContext }, true)
     })
+  }
 
-    // Load existing session from localStorage
-    this.loadSession().then(session => {
+  loadSession = async (): Promise<WalletSession | undefined> => {
+    const data = await LocalStorage.getInstance().getItem('@sequence.session')
+    if (!data || data === '') {
+      return undefined
+    }
+    try {
+      const session = JSON.parse(data) as WalletSession
       if (session) {
         this.useSession(session, false)
       }
-    })
+      return session
+    } catch (err) {
+      logger.warn('loadSession failed, unable to parse session payload from storage.')
+      return undefined
+    }
   }
 
   connect = async (options?: ConnectOptions): Promise<ConnectDetails> => {
@@ -549,24 +557,10 @@ export class Wallet implements WalletProvider {
     this.transport.messageProvider!.once(event, fn)
   }
 
-  private loadSession = async (): Promise<WalletSession | undefined> => {
-    const data = await LocalStorage.getInstance().getItem('@sequence.session')
-    if (!data || data === '') {
-      return undefined
-    }
-    try {
-      const session = JSON.parse(data) as WalletSession
-      return session
-    } catch (err) {
-      logger.warn('loadSession failed, unable to parse session payload from localStorage.')
-      return undefined
-    }
-  }
-
-  private saveSession = (session: WalletSession) => {
+  private saveSession = async (session: WalletSession) => {
     logger.debug('wallet provider: saving session')
     const data = JSON.stringify(session)
-    LocalStorage.getInstance().setItem('@sequence.session', data)
+    await LocalStorage.getInstance().setItem('@sequence.session', data)
   }
 
   private useSession = async (session: WalletSession, autoSave: boolean = true) => {
@@ -720,11 +714,12 @@ export const DefaultProviderConfig: ProviderConfig = {
 
 let walletInstance: Wallet | undefined
 
-export const initWallet = (network?: string | number, config?: Partial<ProviderConfig>) => {
+export const initWallet = async (network?: string | number, config?: Partial<ProviderConfig>) => {
   if (walletInstance && walletInstance.isOpened()) {
     walletInstance.closeWallet()
   }
   walletInstance = new Wallet(network, config)
+  await walletInstance.loadSession()
   return walletInstance
 }