From 42fdcf6239fc9278cfa85b6ae6cc025cef0e35ae Mon Sep 17 00:00:00 2001
From: bitpshr <mail@bitpshr.net>
Date: Thu, 13 Sep 2018 15:12:08 -0400
Subject: [PATCH] Update new method namespace from v2 to v3

---
 app/scripts/lib/typed-message-manager.js        | 2 +-
 app/scripts/metamask-controller.js              | 4 ++--
 old-ui/app/components/typed-message-renderer.js | 6 +++---
 ui/app/components/signature-request.js          | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/scripts/lib/typed-message-manager.js b/app/scripts/lib/typed-message-manager.js
index 01e1c9331..b10145f3b 100644
--- a/app/scripts/lib/typed-message-manager.js
+++ b/app/scripts/lib/typed-message-manager.js
@@ -140,7 +140,7 @@ module.exports = class TypedMessageManager extends EventEmitter {
           sigUtil.typedSignatureHash(params.data)
         }, 'Expected EIP712 typed data')
         break
-      case 'V2':
+      case 'V3':
         let data
         assert.equal(typeof params, 'object', 'Params should be an object.')
         assert.ok('data' in params, 'Params must include a data field.')
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index d5005d977..431a49dde 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -991,7 +991,7 @@ module.exports = class MetamaskController extends EventEmitter {
         case 'V1':
           signature = sigUtil.signTypedDataLegacy(privKey, { data: cleanMsgParams.data })
           break
-        case 'V2':
+        case 'V3':
           signature = sigUtil.signTypedData(privKey, { data: JSON.parse(cleanMsgParams.data) })
           break
       }
@@ -1253,7 +1253,7 @@ module.exports = class MetamaskController extends EventEmitter {
     engine.push(this.preferencesController.requestWatchAsset.bind(this.preferencesController))
     engine.push(this.createTypedDataMiddleware('eth_signTypedData', 'V1').bind(this))
     engine.push(this.createTypedDataMiddleware('eth_signTypedData_v1', 'V1').bind(this))
-    engine.push(this.createTypedDataMiddleware('eth_signTypedData_v2', 'V2').bind(this))
+    engine.push(this.createTypedDataMiddleware('eth_signTypedData_v3', 'V3').bind(this))
     engine.push(createProviderMiddleware({ provider: this.provider }))
 
     // setup connection
diff --git a/old-ui/app/components/typed-message-renderer.js b/old-ui/app/components/typed-message-renderer.js
index 0eacb2129..0dc673b8a 100644
--- a/old-ui/app/components/typed-message-renderer.js
+++ b/old-ui/app/components/typed-message-renderer.js
@@ -19,8 +19,8 @@ TypedMessageRenderer.prototype.render = function () {
     case 'V1':
       text = renderTypedData(value)
       break
-    case 'V2':
-      text = renderTypedDataV2(value)
+    case 'V3':
+      text = renderTypedDataV3(value)
       break
   }
 
@@ -54,7 +54,7 @@ function renderTypedData (values) {
   })
 }
 
-function renderTypedDataV2 (values) {
+function renderTypedDataV3 (values) {
   const { domain, message } = JSON.parse(values)
    return [
     domain ? h('div', [
diff --git a/ui/app/components/signature-request.js b/ui/app/components/signature-request.js
index 4d078d23c..5b0c7684a 100644
--- a/ui/app/components/signature-request.js
+++ b/ui/app/components/signature-request.js
@@ -171,7 +171,7 @@ SignatureRequest.prototype.msgHexToText = function (hex) {
 }
 
 // eslint-disable-next-line react/display-name
-SignatureRequest.prototype.renderTypedDataV2 = function (data) {
+SignatureRequest.prototype.renderTypedDataV3 = function (data) {
   const { domain, message } = JSON.parse(data)
   return [
     h('div.request-signature__typed-container', [
@@ -223,8 +223,8 @@ SignatureRequest.prototype.renderBody = function () {
       }),
     }, [notice]),
 
-    h('div.request-signature__rows', type === 'eth_signTypedData' && version === 'V2' ?
-      this.renderTypedDataV2(data) :
+    h('div.request-signature__rows', type === 'eth_signTypedData' && version === 'V3' ?
+      this.renderTypedDataV3(data) :
       rows.map(({ name, value }) => {
         if (typeof value === 'boolean') {
           value = value.toString()