@toruslabs/ethereum-controllers 4.4.0 → 4.5.2

package/dist/types/Network/createEthereumMiddleware.d.ts

@@ -1,6 +1,6 @@
 import { InPageWalletProviderState } from "@toruslabs/base-controllers";
 import { JRPCEngineEndCallback, JRPCEngineNextCallback, JRPCMiddleware, JRPCRequest, JRPCResponse } from "@toruslabs/openlogin-jrpc";
-import { BlockParams, EthereumTransactionMeta, MessageParams, TransactionParams, TransactionRPCMeta, TypedMessageParams, UserRequestApprovalParams } from "../utils/interfaces";
+import { BlockParams, EncryptionPublicKeyParams, EthereumTransactionMeta, MessageParams, TransactionParams, TransactionRPCMeta, TypedMessageParams, UserRequestApprovalParams } from "../utils/interfaces";
 export interface IProviderHandlers {
     version: string;
     requestAccounts?: (req: JRPCRequest<string[]>) => Promise<string[]>;
@@ -11,7 +11,7 @@ export interface IProviderHandlers {
     processTypedMessageV3?: (msgParams: TypedMessageParams, req: JRPCRequest<TypedMessageParams> & UserRequestApprovalParams) => Promise<string>;
     processTypedMessageV4?: (msgParams: TypedMessageParams, req: JRPCRequest<TypedMessageParams> & UserRequestApprovalParams) => Promise<string>;
     processPersonalMessage?: (msgParams: MessageParams, req: JRPCRequest<MessageParams> & UserRequestApprovalParams) => Promise<string>;
-    processEncryptionPublicKey?: (address: string, req: JRPCRequest<string> & UserRequestApprovalParams) => Promise<string>;
+    processEncryptionPublicKey?: (msgParams: EncryptionPublicKeyParams, req: JRPCRequest<EncryptionPublicKeyParams> & UserRequestApprovalParams) => Promise<string>;
     processDecryptMessage?: (msgParams: MessageParams, req: JRPCRequest<MessageParams> & UserRequestApprovalParams) => Promise<string>;
     getPendingNonce?: (nonceParams: {
         address: string;
@@ -34,7 +34,7 @@ export declare function createProcessEthSignMessage({ processEthSignMessage, }:
 }): JRPCMiddleware<MessageParams, string>;
 export declare function createProcessTypedMessage({ processTypedMessage, }: {
     processTypedMessage: IProviderHandlers["processTypedMessage"];
-}): JRPCMiddleware<MessageParams, string>;
+}): JRPCMiddleware<TypedMessageParams, string>;
 export declare function createProcessTypedMessageV3({ processTypedMessageV3, }: {
     processTypedMessageV3: IProviderHandlers["processTypedMessageV3"];
 }): JRPCMiddleware<TypedMessageParams, string>;
@@ -56,7 +56,7 @@ export declare function createPendingTxMiddleware({ getPendingTransactionByHash,
 }): JRPCMiddleware<string, TransactionRPCMeta>;
 export declare function createProcessEncryptionPublicKeyMiddleware({ processEncryptionPublicKey, }: {
     processEncryptionPublicKey: IProviderHandlers["processEncryptionPublicKey"];
-}): JRPCMiddleware<string, string>;
+}): JRPCMiddleware<EncryptionPublicKeyParams, string>;
 export declare function createProcessDecryptMessageMiddleware({ processDecryptMessage, }: {
     processDecryptMessage: IProviderHandlers["processDecryptMessage"];
 }): JRPCMiddleware<MessageParams, string>;

package/dist/types/Preferences/PreferencesController.d.ts

@@ -28,6 +28,8 @@ export default class PreferencesController extends BasePreferencesController<Ext
         rehydrate?: boolean;
         locale?: string;
         type?: string;
+        signatures?: string[];
+        network?: string;
     }): Promise<void>;
     getSelectedAddress(): string;
     sync(address: string): Promise<boolean>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toruslabs/ethereum-controllers",
-  "version": "4.4.0",
+  "version": "4.5.2",
   "homepage": "https://github.com/torusresearch/controllers#readme",
   "license": "ISC",
   "main": "dist/ethereumControllers.cjs.js",
@@ -24,7 +24,7 @@
     "@ethereumjs/util": "^9.0.0",
     "@metamask/eth-sig-util": "^7.0.0",
     "@metamask/rpc-errors": "^6.0.0",
-    "@toruslabs/base-controllers": "^4.4.0",
+    "@toruslabs/base-controllers": "^4.5.2",
     "@toruslabs/http-helpers": "^5.0.0",
     "@toruslabs/openlogin-jrpc": "^5.1.0",
     "async-mutex": "^0.4.0",
@@ -64,7 +64,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "121c3cbe5e56fd96a0421ed16fbc176ae766f5d0",
+  "gitHead": "b9cdf82ea7bf007ae8461e27d7213baeb4a84768",
   "devDependencies": {
     "ganache": "^7.9.1"
   }

package/src/Message/DecryptMessageController.ts

@@ -60,7 +60,7 @@ export class DecryptMessageController extends AbstractMessageController<DecryptM
       messageParams.origin = req.origin;
     }
     messageParams.data = normalizeMessageData(messageParams.data);
-    const messageId = randomId();
+    const messageId = messageParams.id || randomId();
     const messageData: DecryptMessage = {
       id: messageId,
       messageParams,

package/src/Message/EncryptionPublicKeyController.ts

@@ -61,7 +61,7 @@ export class EncryptionPublicKeyController extends AbstractMessageController<Enc
     if (req) {
       messageParams.origin = req.origin;
     }
-    const messageId = randomId();
+    const messageId = messageParams.id || randomId();
     const messageData: EncryptionPublicKey = {
       id: messageId,
       messageParams,

package/src/Message/MessageController.ts

@@ -55,7 +55,7 @@ export class MessageController extends AbstractMessageController<Message, Messag
       messageParams.origin = req.origin;
     }
     messageParams.data = normalizeMessageData(messageParams.data);
-    const messageId = randomId();
+    const messageId = messageParams.id || randomId();
     const messageData: Message = {
       id: messageId,
       messageParams,

package/src/Message/TypedMessageController.ts

@@ -48,11 +48,8 @@ export class TypedMessageController extends AbstractMessageController<TypedMessa
     try {
       const msgObject = this.getMessage(messageId);
       const cleanMsgParams = await this.approveMessage(messageId, msgObject.messageParams);
-      const rawSig = await this.signTypedData(
-        cleanMsgParams.data as TypedDataV1 | EthSigTypedMessage<MessageTypes>,
-        cleanMsgParams.from,
-        cleanMsgParams.version
-      );
+      const msgData = cleanMsgParams.version === SignTypedDataVersion.V1 ? cleanMsgParams.data : JSON.parse(cleanMsgParams.data as string);
+      const rawSig = await this.signTypedData(msgData as TypedDataV1 | EthSigTypedMessage<MessageTypes>, cleanMsgParams.from, cleanMsgParams.version);
       this.updateMessage({ ...msgObject, rawSig });
       this.setMessageStatus(messageId, MessageStatus.SIGNED);
       return rawSig;
@@ -93,7 +90,7 @@ export class TypedMessageController extends AbstractMessageController<TypedMessa
       messageParams.origin = req.origin;
     }
     messageParams.version = version;
-    const messageId = randomId();
+    const messageId = messageParams.id || randomId();
     const messageData: TypedMessage = {
       id: messageId,
       messageParams,

package/src/Network/createEthereumMiddleware.ts

@@ -13,6 +13,7 @@ import {
 import { METHOD_TYPES, TRANSACTION_ENVELOPE_TYPES } from "../utils/constants";
 import {
   BlockParams,
+  EncryptionPublicKeyParams,
   EthereumTransactionMeta,
   MessageParams,
   TransactionParams,
@@ -35,7 +36,10 @@ export interface IProviderHandlers {
   processTypedMessageV4?: (msgParams: TypedMessageParams, req: JRPCRequest<TypedMessageParams> & UserRequestApprovalParams) => Promise<string>;
   processPersonalMessage?: (msgParams: MessageParams, req: JRPCRequest<MessageParams> & UserRequestApprovalParams) => Promise<string>;
 
-  processEncryptionPublicKey?: (address: string, req: JRPCRequest<string> & UserRequestApprovalParams) => Promise<string>;
+  processEncryptionPublicKey?: (
+    msgParams: EncryptionPublicKeyParams,
+    req: JRPCRequest<EncryptionPublicKeyParams> & UserRequestApprovalParams
+  ) => Promise<string>;
   processDecryptMessage?: (msgParams: MessageParams, req: JRPCRequest<MessageParams> & UserRequestApprovalParams) => Promise<string>;
 
   getPendingNonce?: (
@@ -98,7 +102,7 @@ export function createProcessTypedMessage({
   processTypedMessage,
 }: {
   processTypedMessage: IProviderHandlers["processTypedMessage"];
-}): JRPCMiddleware<MessageParams, string> {
+}): JRPCMiddleware<TypedMessageParams, string> {
   return createAsyncMiddleware(async (request, response, next) => {
     const { method } = request;
     if (method !== METHOD_TYPES.ETH_SIGN_TYPED_DATA) return next();
@@ -226,7 +230,7 @@ export function createProcessEncryptionPublicKeyMiddleware({
   processEncryptionPublicKey,
 }: {
   processEncryptionPublicKey: IProviderHandlers["processEncryptionPublicKey"];
-}): JRPCMiddleware<string, string> {
+}): JRPCMiddleware<EncryptionPublicKeyParams, string> {
   return createAsyncMiddleware(async (request, response, next) => {
     const { params, method } = request;
     if (method !== METHOD_TYPES.ETH_GET_ENCRYPTION_PUBLIC_KEY) return next();

package/src/Preferences/PreferencesController.ts

@@ -90,9 +90,11 @@ export default class PreferencesController
     rehydrate?: boolean;
     locale?: string;
     type?: string;
+    signatures?: string[];
+    network?: string;
   }): Promise<void> {
-    const { address, jwtToken, calledFromEmbed, userInfo, rehydrate, locale = "en-US", type } = params;
-    await super.init(address, userInfo, jwtToken, { type, email: userInfo.email });
+    const { address, jwtToken, calledFromEmbed, userInfo, rehydrate, locale = "en-US", type, signatures, network } = params;
+    await super.init(address, userInfo, jwtToken, { type, email: userInfo.email, signatures, network });
     const { aggregateVerifier, verifier, verifierId } = userInfo || {};
     const userExists = await this.sync(address);
     if (!userExists) {