From 9123e70434fcd35dcb79a587e6d5c00734cb99e4 Mon Sep 17 00:00:00 2001
From: Kevin Serrano <kevgagser@gmail.com>
Date: Mon, 21 Nov 2016 15:49:03 -0800
Subject: Remove entropy from encryption and project.

---
 app/scripts/lib/idStore.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'app/scripts/lib')

diff --git a/app/scripts/lib/idStore.js b/app/scripts/lib/idStore.js
index b73652af5..e5861c0ca 100644
--- a/app/scripts/lib/idStore.js
+++ b/app/scripts/lib/idStore.js
@@ -44,7 +44,7 @@ function IdentityStore (opts = {}) {
 // public
 //
 
-IdentityStore.prototype.createNewVault = function (password, entropy, cb) {
+IdentityStore.prototype.createNewVault = function (password, cb) {
   delete this._keyStore
   var serializedKeystore = this.configManager.getWallet()
 
@@ -53,7 +53,7 @@ IdentityStore.prototype.createNewVault = function (password, entropy, cb) {
   }
 
   this.purgeCache()
-  this._createVault(password, null, entropy, (err) => {
+  this._createVault(password, null, (err) => {
     if (err) return cb(err)
 
     this._autoFaucet()
@@ -77,7 +77,7 @@ IdentityStore.prototype.recoverSeed = function (cb) {
 IdentityStore.prototype.recoverFromSeed = function (password, seed, cb) {
   this.purgeCache()
 
-  this._createVault(password, seed, null, (err) => {
+  this._createVault(password, seed, (err) => {
     if (err) return cb(err)
 
     this._loadIdentities()
@@ -497,7 +497,7 @@ IdentityStore.prototype.tryPassword = function (password, cb) {
   })
 }
 
-IdentityStore.prototype._createVault = function (password, seedPhrase, entropy, cb) {
+IdentityStore.prototype._createVault = function (password, seedPhrase, cb) {
   const opts = {
     password,
     hdPathString: this.hdPathString,
-- 
cgit 


From f5b0795ac5582dd53de728479cf47c43eabfe67c Mon Sep 17 00:00:00 2001
From: Kevin Serrano <kevgagser@gmail.com>
Date: Mon, 21 Nov 2016 16:21:16 -0800
Subject: change all instances of selectedAddress to selectedAccount.

---
 app/scripts/lib/inpage-provider.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'app/scripts/lib')

diff --git a/app/scripts/lib/inpage-provider.js b/app/scripts/lib/inpage-provider.js
index 034812b6a..7179ae978 100644
--- a/app/scripts/lib/inpage-provider.js
+++ b/app/scripts/lib/inpage-provider.js
@@ -66,20 +66,20 @@ function MetamaskInpageProvider (connectionStream) {
 MetamaskInpageProvider.prototype.send = function (payload) {
   const self = this
 
-  let selectedAddress
+  let selectedAccount
   let result = null
   switch (payload.method) {
 
     case 'eth_accounts':
       // read from localStorage
-      selectedAddress = self.publicConfigStore.get('selectedAddress')
-      result = selectedAddress ? [selectedAddress] : []
+      selectedAccount = self.publicConfigStore.get('selectedAddress')
+      result = selectedAccount ? [selectedAccount] : []
       break
 
     case 'eth_coinbase':
       // read from localStorage
-      selectedAddress = self.publicConfigStore.get('selectedAddress')
-      result = selectedAddress || '0x0000000000000000000000000000000000000000'
+      selectedAccount = self.publicConfigStore.get('selectedAddress')
+      result = selectedAccount || '0x0000000000000000000000000000000000000000'
       break
 
     // throw not-supported Error
-- 
cgit