@0xsequence/provider 0.36.10 → 0.36.11

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

@@ -585,7 +585,10 @@ class WalletRequestHandler {
                 message = data;
               }
 
-              let sig = ''; // TODO:
+              let sig = ''; // Message must be prefixed with "\x19Ethereum Signed Message:\n"
+              // as defined by EIP-191
+
+              message = prefixEIP191Message(message); // TODO:
               // if (process.env.TEST_MODE === 'true' && this.prompter === null) {
 
               if (_this.prompter === null) {
@@ -597,7 +600,7 @@ class WalletRequestHandler {
                 if (promptResultForDeployment) {
                   sig = await _this.prompter.promptSignMessage({
                     chainId: chainId,
-                    message: message
+                    message
                   }, _this.connectOptions);
                 }
               }
@@ -1696,6 +1699,18 @@ const hexlifyTransaction = (transaction, allowExtra) => {
   return result;
 };
 
+const eip191prefix = ethers.ethers.utils.toUtf8Bytes("\x19Ethereum Signed Message:\n");
+const messageToBytes = message => {
+  if (ethers.ethers.utils.isBytes(message) || ethers.ethers.utils.isHexString(message)) {
+    return ethers.ethers.utils.arrayify(message);
+  }
+
+  return ethers.ethers.utils.toUtf8Bytes(message);
+};
+const prefixEIP191Message = message => {
+  const messageBytes = messageToBytes(message);
+  return ethers.ethers.utils.concat([eip191prefix, ethers.ethers.utils.toUtf8Bytes(String(messageBytes.length)), messageBytes]);
+};
 const isValidSignature = async (address, digest, sig, provider, chainId, walletContext) => {
   if (!chainId) {
     var _await$provider$getNe;
@@ -1710,9 +1725,9 @@ const isValidSignature = async (address, digest, sig, provider, chainId, walletC
   return wallet.isValidSignature(address, digest, sig, provider, walletContext, chainId);
 };
 const isValidMessageSignature = async (address, message, signature, provider, chainId, walletContext) => {
-  const msgDigest = ethers.ethers.utils.arrayify(ethers.ethers.utils.hashMessage(message));
-  if (wallet.isValidEIP712Signature(address, msgDigest, signature) || wallet.isValidEthSignSignature(address, msgDigest, signature)) return true;
-  return isValidSignature(address, utils.encodeMessageDigest(message), signature, provider, chainId, walletContext);
+  const prefixed = prefixEIP191Message(message);
+  const digest = utils.encodeMessageDigest(prefixed);
+  return isValidSignature(address, digest, signature, provider, chainId, walletContext);
 };
 const isValidTypedDataSignature = (address, typedData, signature, provider, chainId, walletContext) => {
   return isValidSignature(address, utils.encodeTypedDataDigest(typedData), signature, provider, chainId, walletContext);
@@ -3109,7 +3124,7 @@ class WalletUtils {
 
     this.recoverWalletConfigFromMessage = async function (address, message, signature, chainId, walletContext) {
       walletContext = walletContext || (await _this.wallet.getWalletContext());
-      return recoverWalletConfig(address, utils.encodeMessageDigest(message), signature, chainId, walletContext);
+      return recoverWalletConfig(address, utils.encodeMessageDigest(prefixEIP191Message(message)), signature, chainId, walletContext);
     };
 
     this.recoverWalletConfigFromTypedData = async function (address, typedData, signature, chainId, walletContext) {
@@ -3157,9 +3172,11 @@ class WalletUtils {
 
 
   async isValidMessageSignature(address, message, signature, chainId, walletContext) {
-    const msgDigest = ethers.ethers.utils.arrayify(ethers.ethers.utils.hashMessage(message));
-    if (wallet.isValidEIP712Signature(address, msgDigest, signature) || wallet.isValidEthSignSignature(address, msgDigest, signature)) return true;
-    return this.isValidSignature(address, utils.encodeMessageDigest(message), signature, chainId, walletContext);
+    const provider = this.wallet.getProvider(chainId);
+    if (!provider) throw new Error(`unable to get provider for chainId ${chainId}`);
+    const prefixed = prefixEIP191Message(message);
+    const digest = utils.encodeMessageDigest(prefixed);
+    return isValidSignature(address, digest, signature, provider, chainId, walletContext);
   } // Verify typedData signature
 
 
@@ -3770,5 +3787,7 @@ exports.isValidMessageSignature = isValidMessageSignature;
 exports.isValidSignature = isValidSignature;
 exports.isValidTypedDataSignature = isValidTypedDataSignature;
 exports.isWalletUpToDate = isWalletUpToDate;
+exports.messageToBytes = messageToBytes;
 exports.nextMessageIdx = nextMessageIdx;
+exports.prefixEIP191Message = prefixEIP191Message;
 exports.recoverWalletConfig = recoverWalletConfig;

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

@@ -585,7 +585,10 @@ class WalletRequestHandler {
                 message = data;
               }
 
-              let sig = ''; // TODO:
+              let sig = ''; // Message must be prefixed with "\x19Ethereum Signed Message:\n"
+              // as defined by EIP-191
+
+              message = prefixEIP191Message(message); // TODO:
               // if (process.env.TEST_MODE === 'true' && this.prompter === null) {
 
               if (_this.prompter === null) {
@@ -597,7 +600,7 @@ class WalletRequestHandler {
                 if (promptResultForDeployment) {
                   sig = await _this.prompter.promptSignMessage({
                     chainId: chainId,
-                    message: message
+                    message
                   }, _this.connectOptions);
                 }
               }
@@ -1696,6 +1699,18 @@ const hexlifyTransaction = (transaction, allowExtra) => {
   return result;
 };
 
+const eip191prefix = ethers.ethers.utils.toUtf8Bytes("\x19Ethereum Signed Message:\n");
+const messageToBytes = message => {
+  if (ethers.ethers.utils.isBytes(message) || ethers.ethers.utils.isHexString(message)) {
+    return ethers.ethers.utils.arrayify(message);
+  }
+
+  return ethers.ethers.utils.toUtf8Bytes(message);
+};
+const prefixEIP191Message = message => {
+  const messageBytes = messageToBytes(message);
+  return ethers.ethers.utils.concat([eip191prefix, ethers.ethers.utils.toUtf8Bytes(String(messageBytes.length)), messageBytes]);
+};
 const isValidSignature = async (address, digest, sig, provider, chainId, walletContext) => {
   if (!chainId) {
     var _await$provider$getNe;
@@ -1710,9 +1725,9 @@ const isValidSignature = async (address, digest, sig, provider, chainId, walletC
   return wallet.isValidSignature(address, digest, sig, provider, walletContext, chainId);
 };
 const isValidMessageSignature = async (address, message, signature, provider, chainId, walletContext) => {
-  const msgDigest = ethers.ethers.utils.arrayify(ethers.ethers.utils.hashMessage(message));
-  if (wallet.isValidEIP712Signature(address, msgDigest, signature) || wallet.isValidEthSignSignature(address, msgDigest, signature)) return true;
-  return isValidSignature(address, utils.encodeMessageDigest(message), signature, provider, chainId, walletContext);
+  const prefixed = prefixEIP191Message(message);
+  const digest = utils.encodeMessageDigest(prefixed);
+  return isValidSignature(address, digest, signature, provider, chainId, walletContext);
 };
 const isValidTypedDataSignature = (address, typedData, signature, provider, chainId, walletContext) => {
   return isValidSignature(address, utils.encodeTypedDataDigest(typedData), signature, provider, chainId, walletContext);
@@ -3109,7 +3124,7 @@ class WalletUtils {
 
     this.recoverWalletConfigFromMessage = async function (address, message, signature, chainId, walletContext) {
       walletContext = walletContext || (await _this.wallet.getWalletContext());
-      return recoverWalletConfig(address, utils.encodeMessageDigest(message), signature, chainId, walletContext);
+      return recoverWalletConfig(address, utils.encodeMessageDigest(prefixEIP191Message(message)), signature, chainId, walletContext);
     };
 
     this.recoverWalletConfigFromTypedData = async function (address, typedData, signature, chainId, walletContext) {
@@ -3157,9 +3172,11 @@ class WalletUtils {
 
 
   async isValidMessageSignature(address, message, signature, chainId, walletContext) {
-    const msgDigest = ethers.ethers.utils.arrayify(ethers.ethers.utils.hashMessage(message));
-    if (wallet.isValidEIP712Signature(address, msgDigest, signature) || wallet.isValidEthSignSignature(address, msgDigest, signature)) return true;
-    return this.isValidSignature(address, utils.encodeMessageDigest(message), signature, chainId, walletContext);
+    const provider = this.wallet.getProvider(chainId);
+    if (!provider) throw new Error(`unable to get provider for chainId ${chainId}`);
+    const prefixed = prefixEIP191Message(message);
+    const digest = utils.encodeMessageDigest(prefixed);
+    return isValidSignature(address, digest, signature, provider, chainId, walletContext);
   } // Verify typedData signature
 
 
@@ -3770,5 +3787,7 @@ exports.isValidMessageSignature = isValidMessageSignature;
 exports.isValidSignature = isValidSignature;
 exports.isValidTypedDataSignature = isValidTypedDataSignature;
 exports.isWalletUpToDate = isWalletUpToDate;
+exports.messageToBytes = messageToBytes;
 exports.nextMessageIdx = nextMessageIdx;
+exports.prefixEIP191Message = prefixEIP191Message;
 exports.recoverWalletConfig = recoverWalletConfig;

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

@@ -4,7 +4,7 @@ import { ethers, BigNumber } from 'ethers';
 import { addressOf, isConfigEqual } from '@0xsequence/config';
 import { Web3Provider as Web3Provider$1, JsonRpcProvider } from '@ethersproject/providers';
 import { JsonRpcSender, maybeChainId, allowProviderMiddleware, networkProviderMiddleware, CachedProvider, JsonRpcRouter, loggingProviderMiddleware, exceptionProviderMiddleware, findNetworkConfig, EagerProvider, SigningProvider, updateNetworkConfig, ensureValidNetworks } from '@0xsequence/network';
-import { Signer, resolveArrayProperties, isValidSignature as isValidSignature$1, isValidEIP712Signature, isValidEthSignSignature, recoverConfig } from '@0xsequence/wallet';
+import { Signer, resolveArrayProperties, isValidSignature as isValidSignature$1, recoverConfig } from '@0xsequence/wallet';
 import { isSignedTransactions } from '@0xsequence/transactions';
 import { signAuthorization } from '@0xsequence/auth';
 
@@ -581,7 +581,10 @@ class WalletRequestHandler {
                 message = data;
               }
 
-              let sig = ''; // TODO:
+              let sig = ''; // Message must be prefixed with "\x19Ethereum Signed Message:\n"
+              // as defined by EIP-191
+
+              message = prefixEIP191Message(message); // TODO:
               // if (process.env.TEST_MODE === 'true' && this.prompter === null) {
 
               if (_this.prompter === null) {
@@ -593,7 +596,7 @@ class WalletRequestHandler {
                 if (promptResultForDeployment) {
                   sig = await _this.prompter.promptSignMessage({
                     chainId: chainId,
-                    message: message
+                    message
                   }, _this.connectOptions);
                 }
               }
@@ -1692,6 +1695,18 @@ const hexlifyTransaction = (transaction, allowExtra) => {
   return result;
 };
 
+const eip191prefix = ethers.utils.toUtf8Bytes("\x19Ethereum Signed Message:\n");
+const messageToBytes = message => {
+  if (ethers.utils.isBytes(message) || ethers.utils.isHexString(message)) {
+    return ethers.utils.arrayify(message);
+  }
+
+  return ethers.utils.toUtf8Bytes(message);
+};
+const prefixEIP191Message = message => {
+  const messageBytes = messageToBytes(message);
+  return ethers.utils.concat([eip191prefix, ethers.utils.toUtf8Bytes(String(messageBytes.length)), messageBytes]);
+};
 const isValidSignature = async (address, digest, sig, provider, chainId, walletContext) => {
   if (!chainId) {
     var _await$provider$getNe;
@@ -1706,9 +1721,9 @@ const isValidSignature = async (address, digest, sig, provider, chainId, walletC
   return isValidSignature$1(address, digest, sig, provider, walletContext, chainId);
 };
 const isValidMessageSignature = async (address, message, signature, provider, chainId, walletContext) => {
-  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);
+  const prefixed = prefixEIP191Message(message);
+  const digest = encodeMessageDigest(prefixed);
+  return isValidSignature(address, digest, signature, provider, chainId, walletContext);
 };
 const isValidTypedDataSignature = (address, typedData, signature, provider, chainId, walletContext) => {
   return isValidSignature(address, encodeTypedDataDigest(typedData), signature, provider, chainId, walletContext);
@@ -3105,7 +3120,7 @@ class WalletUtils {
 
     this.recoverWalletConfigFromMessage = async function (address, message, signature, chainId, walletContext) {
       walletContext = walletContext || (await _this.wallet.getWalletContext());
-      return recoverWalletConfig(address, encodeMessageDigest(message), signature, chainId, walletContext);
+      return recoverWalletConfig(address, encodeMessageDigest(prefixEIP191Message(message)), signature, chainId, walletContext);
     };
 
     this.recoverWalletConfigFromTypedData = async function (address, typedData, signature, chainId, walletContext) {
@@ -3153,9 +3168,11 @@ class WalletUtils {
 
 
   async isValidMessageSignature(address, message, signature, chainId, walletContext) {
-    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);
+    const provider = this.wallet.getProvider(chainId);
+    if (!provider) throw new Error(`unable to get provider for chainId ${chainId}`);
+    const prefixed = prefixEIP191Message(message);
+    const digest = encodeMessageDigest(prefixed);
+    return isValidSignature(address, digest, signature, provider, chainId, walletContext);
   } // Verify typedData signature
 
 
@@ -3736,4 +3753,4 @@ const DefaultProviderConfig = {
   }
 };
 
-export { BaseInjectedTransport, BaseProviderTransport, BaseWalletTransport, CHANNEL_ID, DefaultProviderConfig, ErrSignedInRequired, EventType, ExtensionMessageHandler, ExtensionMessageProvider, InitState, 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, nextMessageIdx, recoverWalletConfig };
+export { BaseInjectedTransport, BaseProviderTransport, BaseWalletTransport, CHANNEL_ID, DefaultProviderConfig, ErrSignedInRequired, EventType, ExtensionMessageHandler, ExtensionMessageProvider, InitState, 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 };

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

@@ -4,6 +4,8 @@ import { WalletConfig, DecodedSignature } from '@0xsequence/config';
 import { TypedData } from '@0xsequence/utils';
 import { Web3Provider } from './provider';
 import { Signer } from '@0xsequence/wallet';
+export declare const messageToBytes: (message: BytesLike) => Uint8Array;
+export declare const prefixEIP191Message: (message: BytesLike) => Uint8Array;
 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>;

package/package.json

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

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

@@ -32,7 +32,7 @@ import { isSignedTransactions, TransactionRequest } from '@0xsequence/transactio
 import { signAuthorization, AuthorizationOptions } from '@0xsequence/auth'
 import { logger, TypedData } from '@0xsequence/utils'
 
-import { isWalletUpToDate } from '../utils'
+import { isWalletUpToDate, prefixEIP191Message } from '../utils'
 
 const SIGNER_READY_TIMEOUT = 10000
 
@@ -305,6 +305,10 @@ export class WalletRequestHandler implements ExternalProvider, JsonRpcHandler, P
 
           let sig = ''
 
+          // Message must be prefixed with "\x19Ethereum Signed Message:\n"
+          // as defined by EIP-191
+          message = prefixEIP191Message(message)
+
           // TODO:
           // if (process.env.TEST_MODE === 'true' && this.prompter === null) {
           if (this.prompter === null) {
@@ -313,7 +317,7 @@ export class WalletRequestHandler implements ExternalProvider, JsonRpcHandler, P
           } else {
             const promptResultForDeployment = await this.handleConfirmWalletDeployPrompt(this.prompter, signer, chainId)
             if (promptResultForDeployment) {
-              sig = await this.prompter.promptSignMessage({ chainId: chainId, message: message }, this.connectOptions)
+              sig = await this.prompter.promptSignMessage({ chainId: chainId, message }, this.connectOptions)
             }
           }
 

package/src/utils/index.ts

@@ -4,7 +4,7 @@ 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 { isValidSignature, prefixEIP191Message, recoverWalletConfig } from '../utils'
 import { isValidEIP712Signature, isValidEthSignSignature } from '@0xsequence/wallet'
 
 export class WalletUtils {
@@ -74,13 +74,11 @@ export class WalletUtils {
     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)
+    const provider = this.wallet.getProvider(chainId)
+    if (!provider) throw new Error(`unable to get provider for chainId ${chainId}`)
+    const prefixed = prefixEIP191Message(message)
+    const digest = encodeMessageDigest(prefixed)
+    return isValidSignature(address, digest, signature, provider, chainId, walletContext)
   }
 
   // Verify typedData signature
@@ -115,7 +113,7 @@ export class WalletUtils {
     walletContext?: WalletContext
   ): Promise<WalletConfig> => {
     walletContext = walletContext || (await this.wallet.getWalletContext())
-    return recoverWalletConfig(address, encodeMessageDigest(message), signature, chainId, walletContext)
+    return recoverWalletConfig(address, encodeMessageDigest(prefixEIP191Message(message)), signature, chainId, walletContext)
   }
 
   // Recover the WalletConfig from a signature of a typedData object

package/src/utils.ts

@@ -5,6 +5,25 @@ import { packMessageData, encodeMessageDigest, TypedData, encodeTypedDataDigest
 import { Web3Provider } from './provider'
 import { isValidSignature as _isValidSignature, recoverConfig, Signer, isValidEIP712Signature, isValidEthSignSignature } from '@0xsequence/wallet'
 
+const eip191prefix = ethers.utils.toUtf8Bytes("\x19Ethereum Signed Message:\n")
+
+export const messageToBytes = (message: BytesLike): Uint8Array => {
+  if (ethers.utils.isBytes(message) || ethers.utils.isHexString(message)) {
+    return ethers.utils.arrayify(message)
+  }
+
+  return ethers.utils.toUtf8Bytes(message)
+}
+
+export const prefixEIP191Message = (message: BytesLike): Uint8Array => {
+  const messageBytes = messageToBytes(message)
+  return ethers.utils.concat([
+    eip191prefix,
+    ethers.utils.toUtf8Bytes(String(messageBytes.length)),
+    messageBytes
+  ])
+}
+
 export const isValidSignature = async (
   address: string,
   digest: Uint8Array,
@@ -30,13 +49,9 @@ export const isValidMessageSignature = async (
   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)
+  const prefixed = prefixEIP191Message(message)
+  const digest = encodeMessageDigest(prefixed)
+  return isValidSignature(address, digest, signature, provider, chainId, walletContext)
 }
 
 export const isValidTypedDataSignature = (