@toruslabs/ethereum-controllers 4.3.0 → 4.5.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -2444,7 +2444,7 @@ class DecryptMessageController extends AbstractMessageController {
2444
2444
  messageParams.origin = req.origin;
2445
2445
  }
2446
2446
  messageParams.data = normalizeMessageData(messageParams.data);
2447
- const messageId = (0,base_controllers_namespaceObject.randomId)();
2447
+ const messageId = messageParams.id || (0,base_controllers_namespaceObject.randomId)();
2448
2448
  const messageData = {
2449
2449
  id: messageId,
2450
2450
  messageParams,
@@ -2511,7 +2511,7 @@ class EncryptionPublicKeyController extends AbstractMessageController {
2511
2511
  if (req) {
2512
2512
  messageParams.origin = req.origin;
2513
2513
  }
2514
- const messageId = (0,base_controllers_namespaceObject.randomId)();
2514
+ const messageId = messageParams.id || (0,base_controllers_namespaceObject.randomId)();
2515
2515
  const messageData = {
2516
2516
  id: messageId,
2517
2517
  messageParams,
@@ -2581,7 +2581,7 @@ class MessageController extends AbstractMessageController {
2581
2581
  messageParams.origin = req.origin;
2582
2582
  }
2583
2583
  messageParams.data = normalizeMessageData(messageParams.data);
2584
- const messageId = (0,base_controllers_namespaceObject.randomId)();
2584
+ const messageId = messageParams.id || (0,base_controllers_namespaceObject.randomId)();
2585
2585
  const messageData = {
2586
2586
  id: messageId,
2587
2587
  messageParams,
@@ -2707,7 +2707,8 @@ class TypedMessageController extends AbstractMessageController {
2707
2707
  try {
2708
2708
  const msgObject = this.getMessage(messageId);
2709
2709
  const cleanMsgParams = await this.approveMessage(messageId, msgObject.messageParams);
2710
- const rawSig = await this.signTypedData(cleanMsgParams.data, cleanMsgParams.from, cleanMsgParams.version);
2710
+ const msgData = cleanMsgParams.version === eth_sig_util_namespaceObject.SignTypedDataVersion.V1 ? cleanMsgParams.data : JSON.parse(cleanMsgParams.data);
2711
+ const rawSig = await this.signTypedData(msgData, cleanMsgParams.from, cleanMsgParams.version);
2711
2712
  this.updateMessage(objectSpread2_default()(objectSpread2_default()({}, msgObject), {}, {
2712
2713
  rawSig
2713
2714
  }));
@@ -2737,7 +2738,7 @@ class TypedMessageController extends AbstractMessageController {
2737
2738
  messageParams.origin = req.origin;
2738
2739
  }
2739
2740
  messageParams.version = version;
2740
- const messageId = (0,base_controllers_namespaceObject.randomId)();
2741
+ const messageId = messageParams.id || (0,base_controllers_namespaceObject.randomId)();
2741
2742
  const messageData = {
2742
2743
  id: messageId,
2743
2744
  messageParams,