Pass EIP6492 inside MsgToSign

0xsequence · Jun 30, 2023 · a294c7b · a294c7b
1 parent fb8958b
commit a294c7b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/packages/provider/src/transports/wallet-request-handler.ts b/packages/provider/src/transports/wallet-request-handler.ts
@@ -349,10 +349,11 @@ export class WalletRequestHandler implements ExternalProvider, JsonRpcHandler, P
             // prompter is null, so we'll sign from here
             sig = await account.signMessage(prefixedMessage, chainId ?? this.defaultChainId(), sequenceVerified ? 'eip6492' : 'ignore')
           } else {
-            const promptResultForDeployment = await this.handleConfirmWalletDeployPrompt(this.prompter, account, sequenceVerified, chainId)
-            if (promptResultForDeployment) {
-              sig = await this.prompter.promptSignMessage({ chainId: chainId, message: prefixedMessage }, sequenceVerified, this.connectOptions)
-            }
+            sig = await this.prompter.promptSignMessage({
+              chainId: chainId,
+              message: prefixedMessage,
+              eip6492: sequenceVerified
+            }, this.connectOptions)
           }
 
           if (sig && sig.length > 0) {
@@ -393,10 +394,11 @@ export class WalletRequestHandler implements ExternalProvider, JsonRpcHandler, P
             // prompter is null, so we'll sign from here
             sig = await account.signTypedData(typedData.domain, typedData.types, typedData.message, chainId ?? this.defaultChainId(), sequenceVerified ? 'eip6492' : 'ignore')
           } else {
-            const promptResultForDeployment = await this.handleConfirmWalletDeployPrompt(this.prompter, account, sequenceVerified, chainId)
-            if (promptResultForDeployment) {
-              sig = await this.prompter.promptSignMessage({ chainId: chainId, typedData: typedData }, sequenceVerified, this.connectOptions)
-            }
+            sig = await this.prompter.promptSignMessage({
+              chainId: chainId,
+              typedData: typedData,
+              eip6492: sequenceVerified
+            }, this.connectOptions)
           }
 
           if (sig && sig.length > 0) {
@@ -844,7 +846,7 @@ export interface WalletUserPrompter {
   promptConnect(options?: ConnectOptions): Promise<PromptConnectDetails>
   promptSignInConnect(options?: ConnectOptions): Promise<PromptConnectDetails>
 
-  promptSignMessage(message: MessageToSign, sequenceVerified: boolean, options?: ConnectOptions): Promise<string>
+  promptSignMessage(message: MessageToSign, options?: ConnectOptions): Promise<string>
   promptSignTransaction(txn: commons.transaction.Transactionish, chainId?: number, options?: ConnectOptions): Promise<string>
   promptSendTransaction(txn: commons.transaction.Transactionish, chainId?: number, options?: ConnectOptions): Promise<string>
   promptConfirmWalletDeploy(chainId: number, options?: ConnectOptions): Promise<boolean>

diff --git a/packages/provider/src/types.ts b/packages/provider/src/types.ts
@@ -264,6 +264,8 @@ export interface MessageToSign {
   message?: Uint8Array
   typedData?: TypedData
   chainId?: number
+
+  eip6492?: boolean
 }
 
 export type ETHAuthProof = AuthETHAuthProof