From 5d7c2810a701097ef1a4f9de23948418340f9cb4 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Mon, 18 Jun 2018 15:05:41 -0700
Subject: [PATCH] Begin adding eth_watchToken

---
 app/scripts/background.js              |  2 ++
 app/scripts/controllers/preferences.js | 25 +++++++++++++++++++++++++
 app/scripts/metamask-controller.js     |  1 +
 3 files changed, 28 insertions(+)

diff --git a/app/scripts/background.js b/app/scripts/background.js
index 2451cddb6..2be600c4b 100644
--- a/app/scripts/background.js
+++ b/app/scripts/background.js
@@ -248,6 +248,7 @@ function setupController (initState, initLangCode) {
     showUnconfirmedMessage: triggerUi,
     unlockAccountMessage: triggerUi,
     showUnapprovedTx: triggerUi,
+    showAddTokenUi: triggerUi,
     // initial state
     initState,
     // initial locale code
@@ -436,3 +437,4 @@ extension.runtime.onInstalled.addListener(function (details) {
     extension.tabs.create({url: 'https://metamask.io/#how-it-works'})
   }
 })
+
diff --git a/app/scripts/controllers/preferences.js b/app/scripts/controllers/preferences.js
index 8411e3a28..8a8b9a335 100644
--- a/app/scripts/controllers/preferences.js
+++ b/app/scripts/controllers/preferences.js
@@ -25,6 +25,7 @@ class PreferencesController {
       frequentRpcList: [],
       currentAccountTab: 'history',
       tokens: [],
+      suggestedTokens: [],
       useBlockie: false,
       featureFlags: {},
       currentLocale: opts.initLangCode,
@@ -48,6 +49,30 @@ class PreferencesController {
     this.store.updateState({ useBlockie: val })
   }
 
+  getSuggestedTokens () {
+    return this.store.getState().suggestedTokens
+  }
+
+  /**
+   * RPC engine middleware for requesting new token added
+   *
+   * @param req
+   * @param res
+   * @param {Function} - next
+   * @param {Function} - end
+   */
+  requestAddToken(req, res, next, end) {
+    if (req.method === 'eth_watchToken') {
+      // Validate params!
+ //     this.suggestedTokens.push(req.params)
+      const [ rawAddress, symbol, decimals ] = req.params
+      this.addToken(rawAddress, symbol, decimals)
+      end(null, rawAddress)
+    } else {
+      next()
+    }
+  }
+
   /**
    * Getter for the `useBlockie` property
    *
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index d40a351a5..0af7c5051 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -1077,6 +1077,7 @@ module.exports = class MetamaskController extends EventEmitter {
     engine.push(createOriginMiddleware({ origin }))
     engine.push(createLoggerMiddleware({ origin }))
     engine.push(filterMiddleware)
+    engine.push(this.preferencesController.requestAddToken.bind(this.preferencesController))
     engine.push(createProviderMiddleware({ provider: this.provider }))
 
     // setup connection