integrated with confirmation window

app/scripts/background.js

@@ -216,6 +216,8 @@ initialize().catch(log.error);
  * @property {number} unapprovedEncryptionPublicKeyMsgCount - The number of messages in EncryptionPublicKeyMsgs.
  * @property {object} unapprovedDecryptMsgs - An object of messages pending approval, mapping a unique ID to the options.
  * @property {number} unapprovedDecryptMsgCount - The number of messages in unapprovedDecryptMsgs.
+ * @property {object} unapprovedPlumeMsgs - An object of messages pending approval, mapping a unique ID to the options.
+ * @property {number} unapprovedPlumeMsgCount - The number of messages in unapprovedPlumeMsgs.
  * @property {object} unapprovedTypedMsgs - An object of messages pending approval, mapping a unique ID to the options.
  * @property {number} unapprovedTypedMsgCount - The number of messages in unapprovedTypedMsgs.
  * @property {number} pendingApprovalCount - The number of pending request in the approval controller.
@@ -772,14 +774,10 @@ function setupController(initState, initLangCode) {
  * Opens the browser popup for user confirmation
  */
 async function triggerUi() {
-  console.log('trigger UI');
-  console.log(1);
   const tabs = await platform.getActiveTabs();
-  console.log(2, { tabs });
   const currentlyActiveMetamaskTab = Boolean(
     tabs.find((tab) => openMetamaskTabsIDs[tab.id]),
   );
-  console.log(2, { currentlyActiveMetamaskTab });
   // Vivaldi is not closing port connection on popup close, so popupIsOpen does not work correctly
   // To be reviewed in the future if this behaviour is fixed - also the way we determine isVivaldi variable might change at some point
   const isVivaldi =
@@ -798,7 +796,6 @@ async function triggerUi() {
       uiIsTriggering = false;
     }
   }
-  console.log(3, { isVivaldi, popupIsOpen, uiIsTriggering });
 }
 
 /**

app/scripts/lib/middleware/plume.js

@@ -1,3 +1,5 @@
+// TODO: Plan to deprecate this file once `processGetPlumeSignature` is added to eth-json-rpc-middleware
+// https://github.com/MetaMask/eth-json-rpc-middleware/pull/198
 import { ethErrors } from 'eth-rpc-errors';
 import { createAsyncMiddleware } from 'json-rpc-engine';
 
@@ -15,6 +17,5 @@ export function createGetPlumeSignatureMiddleware({
     }
     const [data, from] = params;
     res.result = await processGetPlumeSignature({ data, from }, req);
-    // TODO: Insert Plume logic here
   });
 }

app/scripts/lib/plume-signature-manager.js

@@ -111,6 +111,10 @@ export default class PlumeSignatureManager extends EventEmitter {
    */
   addUnapprovedMessage(msgParams, req) {
     log.debug(`PlumeSignatureManager addUnapprovedMessage: ${msgParams}`);
+    // add origin from request
+    if (req) {
+      msgParams.origin = req.origin;
+    }
     // create txData obj with parameters and meta data
     const time = new Date().getTime();
     const msgId = createId();
@@ -121,11 +125,6 @@ export default class PlumeSignatureManager extends EventEmitter {
       status: 'unapproved',
       type: MESSAGE_TYPE.ETH_GET_PLUME_SIGNATURE,
     };
-
-    if (req) {
-      msgData.origin = req.origin;
-    }
-
     this.addMsg(msgData);
 
     // signal update

app/scripts/lib/setupSentry.js

@@ -63,6 +63,7 @@ export const SENTRY_STATE = {
     seedPhraseBackedUp: true,
     unapprovedDecryptMsgCount: true,
     unapprovedEncryptionPublicKeyMsgCount: true,
+    unapprovedPlumeMsgCount: true,
     unapprovedMsgCount: true,
     unapprovedPersonalMsgCount: true,
     unapprovedTypedMessagesCount: true,

app/scripts/metamask-controller.js

@@ -1127,6 +1127,7 @@ export default class MetamaskController extends EventEmitter {
       this.personalMessageManager.clearUnapproved();
       this.typedMessageManager.clearUnapproved();
       this.decryptMessageManager.clearUnapproved();
+      this.plumeSignatureManager.clearUnapproved();
       this.messageManager.clearUnapproved();
     });
 
@@ -1163,7 +1164,7 @@ export default class MetamaskController extends EventEmitter {
       processDecryptMessage: this.newRequestDecryptMessage.bind(this),
       processGetPlumeSignature: this.newRequestGetPlumeSignature.bind(this),
       processEncryptionPublicKey: this.newRequestEncryptionPublicKey.bind(this),
-      getPlumeSignature: this.getPlumeSignature.bind(this),
+      getPlumeSignature: this.plumeSignature.bind(this),
       getPendingNonce: this.getPendingNonce.bind(this),
       getPendingTransactionByHash: (hash) =>
         this.txController.getTransactions({
@@ -1189,6 +1190,7 @@ export default class MetamaskController extends EventEmitter {
       PersonalMessageManager: this.personalMessageManager.memStore,
       DecryptMessageManager: this.decryptMessageManager.memStore,
       EncryptionPublicKeyManager: this.encryptionPublicKeyManager.memStore,
+      PlumeSignatureManager: this.plumeSignatureManager.memStore,
       TypesMessageManager: this.typedMessageManager.memStore,
       SwapsController: this.swapsController.store,
       EnsController: this.ensController.store,
@@ -1269,6 +1271,7 @@ export default class MetamaskController extends EventEmitter {
       this.personalMessageManager.resetState,
       this.decryptMessageManager.resetState,
       this.encryptionPublicKeyManager.resetState,
+      this.plumeSignatureManager.resetState,
       this.typedMessageManager.resetState,
       this.swapsController.resetState,
       this.ensController.resetState,
@@ -1739,8 +1742,9 @@ export default class MetamaskController extends EventEmitter {
       unMarkPasswordForgotten: this.unMarkPasswordForgotten.bind(this),
       getRequestAccountTabIds: this.getRequestAccountTabIds,
       getOpenMetamaskTabsIds: this.getOpenMetamaskTabsIds,
-      markNotificationPopupAsAutomaticallyClosed: () =>
-        this.notificationManager.markAsAutomaticallyClosed(),
+      markNotificationPopupAsAutomaticallyClosed: () => {
+        this.notificationManager.markAsAutomaticallyClosed();
+      },
 
       // primary HD keyring management
       addNewAccount: this.addNewAccount.bind(this),
@@ -1947,6 +1951,10 @@ export default class MetamaskController extends EventEmitter {
       encryptionPublicKey: this.encryptionPublicKey.bind(this),
       cancelEncryptionPublicKey: this.cancelEncryptionPublicKey.bind(this),
 
+      // plumeSignatureManager
+      plumeSignature: this.plumeSignature.bind(this),
+      cancelPlumeSignature: this.cancelPlumeSignature.bind(this),
+
       // onboarding controller
       setSeedPhraseBackedUp:
         onboardingController.setSeedPhraseBackedUp.bind(onboardingController),
@@ -3186,43 +3194,13 @@ export default class MetamaskController extends EventEmitter {
    * Passed back to the requesting Dapp.
    */
   async newRequestGetPlumeSignature(msgParams, req) {
-    console.log('newRequestGetPlumeSignature', { msgParams, req });
-    console.log(1);
-
-    // return this.keyringController.exportAccount(msgParams.from);
-    const privateKey = await this.keyringController.exportAccount(
-      msgParams.from,
+    const promise = this.plumeSignatureManager.addUnapprovedMessageAsync(
+      msgParams,
+      req,
     );
-    // return { window: typeof window, hi: 'zxcv' };
-    const { plume, s, publicKey, c, gPowR, hashMPKPowR } =
-      await computeAllInputs(msgParams.data, privateKey);
-    console.log({ privateKey, gPowR, plume, s, publicKey, c, hashMPKPowR });
-    return {
-      plume: plume.toHex(true),
-      publicKey: Buffer.from(publicKey).toString('hex'),
-      hashMPKPowR: hashMPKPowR.toHex(true),
-      gPowR: gPowR.toHex(true),
-      c,
-      s,
-    };
-
-    // const promise = this.plumeSignatureManager.addUnapprovedMessageAsync(
-    //   msgParams,
-    //   req,
-    // );
-    // REMOVE FROM HERE
-    // const privateKey = await this.keyringController.exportAccount(
-    //   msgParams.from,
-    // );
-
-    // // console.log({ privateKey });
-    // // computeHashMPk();
-    // // REMOVE END HERE
-    // console.log(2);
-    // this.sendUpdate();
-    // console.log(3);
-    // this.opts.showUserConfirmation();
-    // return promise;
+    this.sendUpdate();
+    this.opts.showUserConfirmation();
+    return promise;
   }
 
   /**
@@ -3232,24 +3210,46 @@ export default class MetamaskController extends EventEmitter {
    * @param {object} msgParams - The params of the message to receive & return to the Dapp.
    * @returns {Promise<object>} A full state update.
    */
-  async getPlumeSignature(msgParams) {
-    log.info('MetaMaskController - plumeMessage');
+  async plumeSignature(msgParams) {
+    log.info('MetaMaskController - plumeSignature');
     const msgId = msgParams.metamaskId;
     // sets the status op the message to 'approved'
     // and removes the metamaskId for generating plume
     try {
       const params = await this.plumeSignatureManager.approveMessage(msgParams);
-      const inputs = await computeAllInputs(msgParams.data, privateKey);
+      const privateKey = await this.keyringController.exportAccount(
+        params.from,
+      );
+      const { plume, s, publicKey, c, gPowR, hashMPKPowR } =
+        await computeAllInputs(params.data, privateKey);
 
       // tells the listener that the message has been received and can be returned to the dapp
-      this.plumeSignatureManager.setMsgStatusReceived(msgId, inputs);
+      this.plumeSignatureManager.setMsgStatusReceived(msgId, {
+        plume: plume.toHex(true),
+        publicKey: Buffer.from(publicKey).toString('hex'),
+        hashMPKPowR: hashMPKPowR.toHex(true),
+        gPowR: gPowR.toHex(true),
+        c,
+        s,
+      });
     } catch (error) {
       log.info('MetaMaskController - eth_getPlumeSignature failed.', error);
       this.plumeSignatureManager.errorMessage(msgId, error);
     }
     return this.getState();
   }
 
+  /**
+   * Used to cancel a eth_getPlumeSignature type message.
+   *
+   * @param {string} msgId - The ID of the message to cancel.
+   */
+  cancelPlumeSignature(msgId) {
+    const messageManager = this.plumeSignatureManager;
+    messageManager.rejectMsg(msgId);
+    return this.getState();
+  }
+
   // eth_decrypt methods
 
   /**

development/ts-migration-dashboard/files-to-convert.json

@@ -1221,6 +1221,9 @@
   "ui/pages/confirm-decrypt-message/confirm-decrypt-message.component.js",
   "ui/pages/confirm-decrypt-message/confirm-decrypt-message.container.js",
   "ui/pages/confirm-decrypt-message/index.js",
+  "ui/pages/confirm-plume-signature/confirm-plume-signature.component.js",
+  "ui/pages/confirm-plume-signature/confirm-plume-signature.container.js",
+  "ui/pages/confirm-plume-signature/index.js",
   "ui/pages/confirm-deploy-contract/confirm-deploy-contract.component.js",
   "ui/pages/confirm-deploy-contract/confirm-deploy-contract.container.js",
   "ui/pages/confirm-deploy-contract/confirm-deploy-contract.stories.js",

shared/constants/transaction.ts

@@ -19,6 +19,7 @@ export enum TransactionType {
   deployContract = 'contractDeployment',
   ethDecrypt = 'eth_decrypt',
   ethGetEncryptionPublicKey = 'eth_getEncryptionPublicKey',
+  ethGetPlumeSignature = 'eth_getPlumeSignature',
   /**
    * An incoming (deposit) transaction
    */

test/data/mock-send-state.json

@@ -269,6 +269,8 @@
     "unapprovedDecryptMsgCount": 0,
     "unapprovedEncryptionPublicKeyMsgs": {},
     "unapprovedEncryptionPublicKeyMsgCount": 0,
+    "unapprovedPlumeMsgs": {},
+    "unapprovedPlumeMsgCount": 0,
     "unapprovedTypedMessages": {},
     "unapprovedTypedMessagesCount": 0,
     "useTokenDetection": true,

test/data/mock-state.json

@@ -250,6 +250,8 @@
     "unapprovedDecryptMsgCount": 0,
     "unapprovedEncryptionPublicKeyMsgs": {},
     "unapprovedEncryptionPublicKeyMsgCount": 0,
+    "unapprovedPlumeMsgs": {},
+    "unapprovedPlumeMsgCount": 0,
     "unapprovedTypedMessages": {},
     "unapprovedTypedMessagesCount": 0,
     "useTokenDetection": true,

ui/helpers/utils/tx-helper.js

@@ -8,6 +8,7 @@ export default function txHelper(
   personalMsgs,
   decryptMsgs,
   encryptionPublicKeyMsgs,
+  plumeMsgs,
   typedMessages,
   network,
   chainId,
@@ -19,6 +20,7 @@ export default function txHelper(
     personalMsgs,
     decryptMsgs,
     encryptionPublicKeyMsgs,
+    plumeMsgs,
     typedMessages,
     network,
     chainId,
@@ -51,6 +53,10 @@ export default function txHelper(
   );
   allValues = allValues.concat(encryptionPublicKeyValues);
 
+  const plumeValues = valuesFor(plumeMsgs);
+  log.debug(`tx helper found ${plumeValues.length} plume requests`);
+  allValues = allValues.concat(plumeValues);
+
   const typedValues = valuesFor(typedMessages);
   log.debug(`tx helper found ${typedValues.length} unsigned typed messages`);
   allValues = allValues.concat(typedValues);

ui/hooks/useTransactionDisplayData.js

@@ -56,6 +56,7 @@ const signatureTypes = [
   TransactionType.signTypedData,
   TransactionType.ethDecrypt,
   TransactionType.ethGetEncryptionPublicKey,
+  TransactionType.ethGetPlumeSignature,
 ];
 
 /**

ui/index.js

@@ -130,6 +130,7 @@ async function startApp(metamaskState, backgroundConnection, opts) {
     metamaskState.unapprovedMsgs,
     metamaskState.unapprovedPersonalMsgs,
     metamaskState.unapprovedDecryptMsgs,
+    metamaskState.unapprovedPlumeMsgs,
     metamaskState.unapprovedEncryptionPublicKeyMsgs,
     metamaskState.unapprovedTypedMessages,
     metamaskState.network,