Get basic ENS working

& merge master into ENS branch.

2 files changed, 63 insertions, 27 deletions

diff --git a/development/states/first-time.json b/development/states/first-time.json
index 108af9117..3554ee911 100644
--- a/development/states/first-time.json
+++ b/development/states/first-time.json
@@ -4,6 +4,7 @@
     "isUnlocked": false,
     "rpcTarget": "https://rawtestrpc.metamask.io/",
     "identities": {},
+    "frequentRpcList": [],
     "unapprovedTxs": {},
     "currentFiat": "USD",
     "conversionRate": 12.7527416,
diff --git a/development/states/send.json b/development/states/send.json
index c054af55b..3f52185af 100644
--- a/development/states/send.json
+++ b/development/states/send.json
@@ -2,73 +2,108 @@
   "metamask": {
     "isInitialized": true,
     "isUnlocked": true,
-    "currentDomain": "example.com",
     "rpcTarget": "https://rawtestrpc.metamask.io/",
     "identities": {
       "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825": {
-        "name": "Wallet 1",
         "address": "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825",
-        "mayBeFauceting": false
+        "name": "Account 1"
       },
       "0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb": {
-        "name": "Wallet 2",
         "address": "0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb",
-        "mayBeFauceting": false
+        "name": "Account 2"
       },
       "0x2f8d4a878cfa04a6e60d46362f5644deab66572d": {
-        "name": "Wallet 3",
         "address": "0x2f8d4a878cfa04a6e60d46362f5644deab66572d",
-        "mayBeFauceting": false
+        "name": "Account 3"
+      },
+      "0xd85a4b6a394794842887b8284293d69163007bbb": {
+        "address": "0xd85a4b6a394794842887b8284293d69163007bbb",
+        "name": "Account 4"
       }
     },
-    "unconfTxs": {},
+    "unapprovedTxs": {},
     "currentFiat": "USD",
-    "conversionRate": 11.21283484,
-    "conversionDate": 1472158984,
+    "conversionRate": 16.88200327,
+    "conversionDate": 1489013762,
+    "noActiveNotices": true,
+    "frequentRpcList": [],
+    "network": "3",
     "accounts": {
       "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825": {
         "code": "0x",
-        "balance": "0x34693f54a1e25900",
-        "nonce": "0x100013",
+        "balance": "0x47c9d71831c76efe",
+        "nonce": "0x1b",
         "address": "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825"
       },
       "0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb": {
         "code": "0x",
-        "nonce": "0x100000",
-        "balance": "0x18af912cee770000",
+        "balance": "0x37452b1315889f80",
+        "nonce": "0xa",
         "address": "0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb"
       },
       "0x2f8d4a878cfa04a6e60d46362f5644deab66572d": {
         "code": "0x",
-        "nonce": "0x100000",
-        "balance": "0x2386f26fc10000",
+        "balance": "0x0",
+        "nonce": "0x0",
         "address": "0x2f8d4a878cfa04a6e60d46362f5644deab66572d"
+      },
+      "0xd85a4b6a394794842887b8284293d69163007bbb": {
+        "code": "0x",
+        "balance": "0x0",
+        "nonce": "0x0",
+        "address": "0xd85a4b6a394794842887b8284293d69163007bbb"
       }
     },
-    "transactions": [],
-    "network": "2",
-    "seedWords": null,
-    "unconfMsgs": {},
-    "messages": [],
-    "shapeShiftTxList": [],
+    "transactions": {},
+    "selectedAddressTxList": [],
+    "unapprovedMsgs": {},
+    "unapprovedMsgCount": 0,
+    "unapprovedPersonalMsgs": {},
+    "unapprovedPersonalMsgCount": 0,
+    "keyringTypes": [
+      "Simple Key Pair",
+      "HD Key Tree"
+    ],
+    "keyrings": [
+      {
+        "type": "HD Key Tree",
+        "accounts": [
+          "fdea65c8e26263f6d9a1b5de9555d2931a33b825",
+          "c5b8dbac4c1d3f152cdeb400e2313f309c410acb",
+          "2f8d4a878cfa04a6e60d46362f5644deab66572d"
+        ]
+      },
+      {
+        "type": "Simple Key Pair",
+        "accounts": [
+          "0xd85a4b6a394794842887b8284293d69163007bbb"
+        ]
+      }
+    ],
+    "selectedAddress": "0xd85a4b6a394794842887b8284293d69163007bbb",
+    "currentCurrency": "USD",
     "provider": {
       "type": "testnet"
     },
-    "selectedAddress": "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825"
+    "shapeShiftTxList": [],
+    "lostAccounts": []
   },
   "appState": {
     "menuOpen": false,
     "currentView": {
-      "name": "sendTransaction"
+      "name": "sendTransaction",
+      "context": "0xd85a4b6a394794842887b8284293d69163007bbb"
     },
     "accountDetail": {
-      "subview": "transactions"
+      "subview": "transactions",
+      "accountExport": "none",
+      "privateKey": ""
     },
-    "currentDomain": "127.0.0.1:9966",
     "transForward": true,
     "isLoading": false,
     "warning": null,
-    "detailView": {}
+    "scrollToBottom": false,
+    "forgottenPassword": null
   },
   "identities": {}
 }