@0xsequence/provider 0.35.8 → 0.35.12

package/dist/declarations/src/{commands → utils}/index.d.ts

@@ -4,7 +4,7 @@ import { WalletContext, ChainIdLike } from '@0xsequence/network';
 import { TypedData } from '@0xsequence/utils';
 import { DecodedSignature, WalletConfig } from '@0xsequence/config';
 import { Wallet } from '../wallet';
-export declare class WalletCommands {
+export declare class WalletUtils {
     private wallet;
     constructor(walletProvider: Wallet);
     signMessage(message: BytesLike, chainId?: ChainIdLike, allSigners?: boolean): Promise<string>;

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

@@ -1,9 +1,12 @@
-import { BigNumberish, BytesLike } from 'ethers';
+import { ethers, BigNumberish, BytesLike } from 'ethers';
 import { WalletContext } from '@0xsequence/network';
 import { WalletConfig, DecodedSignature } from '@0xsequence/config';
+import { TypedData } from '@0xsequence/utils';
 import { Web3Provider } from './provider';
 import { Signer } from '@0xsequence/wallet';
-export declare const isValidSignature: (address: string, digest: Uint8Array, sig: string, provider: Web3Provider, chainId?: number | undefined, walletContext?: WalletContext | undefined) => Promise<boolean | undefined>;
+export declare const isValidSignature: (address: string, digest: Uint8Array, sig: string, provider: Web3Provider | ethers.providers.Web3Provider, chainId?: number | undefined, walletContext?: WalletContext | undefined) => Promise<boolean | undefined>;
+export declare const isValidMessageSignature: (address: string, message: string | Uint8Array, signature: string, provider: Web3Provider | ethers.providers.Web3Provider, chainId?: number | undefined, walletContext?: WalletContext | undefined) => Promise<boolean | undefined>;
+export declare const isValidTypedDataSignature: (address: string, typedData: TypedData, signature: string, provider: Web3Provider | ethers.providers.Web3Provider, chainId?: number | undefined, walletContext?: WalletContext | undefined) => Promise<boolean | undefined>;
 export declare const recoverWalletConfig: (address: string, digest: BytesLike, signature: string | DecodedSignature, chainId: BigNumberish, walletContext?: WalletContext | undefined) => Promise<WalletConfig>;
 export declare const isBrowserExtension: () => boolean;
 /**

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

@@ -3,7 +3,7 @@ import { WalletConfig, WalletState } from '@0xsequence/config';
 import { Web3Provider, Web3Signer } from './provider';
 import { ProxyMessageChannelPort } from './transports';
 import { WalletSession, ProviderEventTypes, ConnectOptions, OpenWalletIntent, ConnectDetails } from './types';
-import { WalletCommands } from './commands';
+import { WalletUtils } from './utils/index';
 import { Runtime } from 'webextension-polyfill-ts';
 export interface WalletProvider {
     connect(options?: ConnectOptions): Promise<ConnectDetails>;
@@ -26,10 +26,10 @@ export interface WalletProvider {
     getProviderConfig(): ProviderConfig;
     on<K extends keyof ProviderEventTypes>(event: K, fn: ProviderEventTypes[K]): void;
     once<K extends keyof ProviderEventTypes>(event: K, fn: ProviderEventTypes[K]): void;
-    commands: WalletCommands;
+    utils: WalletUtils;
 }
 export declare class Wallet implements WalletProvider {
-    commands: WalletCommands;
+    utils: WalletUtils;
     private config;
     private session?;
     private connectedSites;

package/package.json

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

package/src/provider.ts

@@ -72,6 +72,7 @@ export class Web3Provider extends EthersWeb3Provider implements JsonRpcHandler {
   }
 
   async getChainId(): Promise<number> {
+    // TODO: is it safe to memoize this?
     const result = await this.send('eth_chainId', [])
     const chainId = ethers.BigNumber.from(result).toNumber()
 

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

@@ -17,7 +17,9 @@ export class WindowMessageProvider extends BaseProviderTransport {
 
   register = () => {
     if (registeredWindowMessageProvider) {
-      throw new Error('A WindowMessageProvider is already registered. There can only be one.')
+      // overriding the registered message provider
+      registeredWindowMessageProvider.unregister()
+      registeredWindowMessageProvider = this
     }
 
     // listen for incoming messages from wallet

package/src/{commands → utils}/index.ts

@@ -1,12 +1,13 @@
-import { BigNumberish, BytesLike } from 'ethers'
+import { ethers, BigNumberish, BytesLike } from 'ethers'
 import { TypedDataDomain, TypedDataField, TypedDataSigner } from '@ethersproject/abstract-signer'
 import { WalletContext, ChainIdLike } from '@0xsequence/network'
 import { encodeMessageDigest, TypedData, encodeTypedDataDigest } from '@0xsequence/utils'
 import { DecodedSignature, WalletConfig } from '@0xsequence/config'
 import { Wallet } from '../wallet'
 import { isValidSignature, recoverWalletConfig } from '../utils'
+import { isValidEIP712Signature, isValidEthSignSignature } from '@0xsequence/wallet'
 
-export class WalletCommands {
+export class WalletUtils {
   private wallet: Wallet
 
   constructor(walletProvider: Wallet) {
@@ -66,13 +67,19 @@ export class WalletCommands {
   }
 
   // Verify message signature
-  isValidMessageSignature(
+  async isValidMessageSignature(
     address: string,
     message: string | Uint8Array,
     signature: string,
     chainId: number,
     walletContext?: WalletContext
   ): Promise<boolean | undefined> {
+    const msgDigest = ethers.utils.arrayify(ethers.utils.hashMessage(message))
+    if (
+      isValidEIP712Signature(address, msgDigest, signature) ||
+      isValidEthSignSignature(address, msgDigest, signature)
+    ) return true
+
     return this.isValidSignature(address, encodeMessageDigest(message), signature, chainId, walletContext)
   }
 

package/src/utils.ts

@@ -1,23 +1,55 @@
-import { BigNumberish, BytesLike } from 'ethers'
+import { ethers, BigNumberish, BytesLike } from 'ethers'
 import { WalletContext } from '@0xsequence/network'
 import { WalletConfig, addressOf, DecodedSignature, isConfigEqual } from '@0xsequence/config'
-import { packMessageData } from '@0xsequence/utils'
+import { packMessageData, encodeMessageDigest, TypedData, encodeTypedDataDigest } from '@0xsequence/utils'
 import { Web3Provider } from './provider'
-import { isValidSignature as _isValidSignature, recoverConfig, Signer } from '@0xsequence/wallet'
+import { isValidSignature as _isValidSignature, recoverConfig, Signer, isValidEIP712Signature, isValidEthSignSignature } from '@0xsequence/wallet'
 
 export const isValidSignature = async (
   address: string,
   digest: Uint8Array,
   sig: string,
-  provider: Web3Provider,
+  provider: Web3Provider | ethers.providers.Web3Provider,
   chainId?: number,
   walletContext?: WalletContext
 ): Promise<boolean | undefined> => {
-  chainId = chainId || (await provider.getChainId())
-  walletContext = walletContext || (await provider.getSigner().getWalletContext())
+  if (!chainId) {
+    chainId = (await provider.getNetwork())?.chainId
+  }
+  if (!walletContext && Web3Provider.isSequenceProvider(provider)) {
+    walletContext = await provider.getSigner().getWalletContext()
+  }
   return _isValidSignature(address, digest, sig, provider, walletContext, chainId)
 }
 
+export const isValidMessageSignature = async (
+  address: string,
+  message: string | Uint8Array,
+  signature: string,
+  provider: Web3Provider | ethers.providers.Web3Provider,
+  chainId?: number,
+  walletContext?: WalletContext
+): Promise<boolean | undefined> => {
+  const msgDigest = ethers.utils.arrayify(ethers.utils.hashMessage(message))
+  if (
+    isValidEIP712Signature(address, msgDigest, signature) ||
+    isValidEthSignSignature(address, msgDigest, signature)
+  ) return true
+
+  return isValidSignature(address, encodeMessageDigest(message), signature, provider, chainId, walletContext)
+}
+
+export const isValidTypedDataSignature = (
+  address: string,
+  typedData: TypedData,
+  signature: string,
+  provider: Web3Provider | ethers.providers.Web3Provider,
+  chainId?: number,
+  walletContext?: WalletContext
+): Promise<boolean | undefined> => {
+  return isValidSignature(address, encodeTypedDataDigest(typedData), signature, provider, chainId, walletContext)
+}
+
 export const recoverWalletConfig = async (
   address: string,
   digest: BytesLike,

package/src/wallet.ts

@@ -31,10 +31,10 @@ import { JsonRpcProvider, JsonRpcSigner, ExternalProvider } from '@ethersproject
 import { Web3Provider, Web3Signer } from './provider'
 import { MuxMessageProvider, WindowMessageProvider, ProxyMessageProvider, ProxyMessageChannelPort } from './transports'
 import { WalletSession, ProviderEventTypes, ConnectOptions, OpenWalletIntent, ConnectDetails } from './types'
-import { WalletCommands } from './commands'
 import { ethers } from 'ethers'
 import { ExtensionMessageProvider } from './transports/extension-transport/extension-message-provider'
 import { LocalStore } from './utils'
+import { WalletUtils } from './utils/index'
 
 import { Runtime } from 'webextension-polyfill-ts'
 
@@ -68,11 +68,11 @@ export interface WalletProvider {
   on<K extends keyof ProviderEventTypes>(event: K, fn: ProviderEventTypes[K]): void
   once<K extends keyof ProviderEventTypes>(event: K, fn: ProviderEventTypes[K]): void
 
-  commands: WalletCommands
+  utils: WalletUtils
 }
 
 export class Wallet implements WalletProvider {
-  public commands: WalletCommands
+  public utils: WalletUtils
 
   private config: ProviderConfig
   private session?: WalletSession
@@ -116,7 +116,7 @@ export class Wallet implements WalletProvider {
     this.networks = []
     this.providers = {}
     this.connectedSites = new LocalStore('@sequence.connectedSites', [])
-    this.commands = new WalletCommands(this)
+    this.utils = new WalletUtils(this)
     this.init()
   }