Merge pull request #869 from MetaMask/dev-cleanup

Dev Cleanup Package
2024-12-23 01:39:44 +01:00 · 2016-11-22 15:23:55 -05:00 · 2016-11-22 15:23:55 -05:00 · e61d792832
commit e61d792832
parent 1a8d95f562 8261cf232d
37 changed files with 77 additions and 71 deletions
--- a/README.md
+++ b/README.md
@ -18,6 +18,12 @@ If you're a web dapp developer, we've got two types of guides for you:

 Uncompressed builds can be found in `/dist`, compressed builds can be found in `/builds` once they're built.

+## Installing Local Builds on Chrome
+
+To install your locally built extension on Chrome, [follow this guide](http://stackoverflow.com/a/24577660/272576).
+
+The built extension is stored in `./dist/chrome/`.
+
 ## Architecture

 [![Architecture Diagram](./docs/architecture.png)][1]
--- a/app/scripts/inpage.js
+++ b/app/scripts/inpage.js
@ -50,7 +50,7 @@ endOfStream(pingStream, triggerReload)

 // set web3 defaultAcount
 inpageProvider.publicConfigStore.subscribe(function (state) {
-  web3.eth.defaultAccount = state.selectedAddress
+  web3.eth.defaultAccount = state.selectedAccount
 })

 //
--- a/app/scripts/keyring-controller.js
+++ b/app/scripts/keyring-controller.js
@ -9,7 +9,6 @@ const EventEmitter = require('events').EventEmitter
 const normalize = require('./lib/sig-util').normalize
 const encryptor = require('./lib/encryptor')
 const messageManager = require('./lib/message-manager')
-const autoFaucet = require('./lib/auto-faucet')
 const IdStoreMigrator = require('./lib/idStore-migrator')
 const BN = ethUtil.BN

@ -61,7 +60,6 @@ module.exports = class KeyringController extends EventEmitter {
      transactions: this.configManager.getTxList(),
      unconfMsgs: messageManager.unconfirmedMsgs(),
      messages: messageManager.getMsgList(),
-      selectedAddress: address,
      selectedAccount: address,
      shapeShiftTxList: this.configManager.getShapeShiftTxList(),
      currentFiat: this.configManager.getCurrentFiat(),
@ -76,8 +74,8 @@ module.exports = class KeyringController extends EventEmitter {
    this.ethStore = ethStore
  }

-  createNewVaultAndKeychain (password, entropy, cb) {
-    this.createNewVault(password, entropy, (err) => {
+  createNewVaultAndKeychain (password, cb) {
+    this.createNewVault(password, (err) => {
      if (err) return cb(err)
      this.createFirstKeyTree(password, cb)
    })
@ -94,7 +92,7 @@ module.exports = class KeyringController extends EventEmitter {

    this.clearKeyrings()

-    this.createNewVault(password, '', (err) => {
+    this.createNewVault(password, (err) => {
      if (err) return cb(err)
      this.addNewKeyring('HD Key Tree', {
        mnemonic: seed,
@ -135,7 +133,7 @@ module.exports = class KeyringController extends EventEmitter {
    })
  }

-  createNewVault (password, entropy, cb) {
+  createNewVault (password, cb) {
    const configManager = this.configManager
    const salt = this.encryptor.generateSalt()
    configManager.setSalt(salt)
@ -161,7 +159,7 @@ module.exports = class KeyringController extends EventEmitter {
      this.configManager.setSelectedAccount(firstAccount)

      this.placeSeedWords()
-      autoFaucet(hexAccount)
+      this.emit('newAccount', hexAccount)
      this.setupAccounts(accounts)
      this.persistAllKeyrings()
      .then(() => {
@ -329,7 +327,7 @@ module.exports = class KeyringController extends EventEmitter {
    }, [])
  }

-  setSelectedAddress (address, cb) {
+  setSelectedAccount (address, cb) {
    var addr = normalize(address)
    this.configManager.setSelectedAccount(addr)
    cb(null, addr)
--- 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,
--- 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
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@ -7,6 +7,8 @@ const HostStore = require('./lib/remote-store.js').HostStore
 const Web3 = require('web3')
 const ConfigManager = require('./lib/config-manager')
 const extension = require('./lib/extension')
+const autoFaucet = require('./lib/auto-faucet')
+

 module.exports = class MetamaskController {

@ -67,7 +69,7 @@ module.exports = class MetamaskController {
      addNewKeyring: keyringController.addNewKeyring.bind(keyringController),
      addNewAccount: keyringController.addNewAccount.bind(keyringController),
      submitPassword: keyringController.submitPassword.bind(keyringController),
-      setSelectedAddress: keyringController.setSelectedAddress.bind(keyringController),
+      setSelectedAccount: keyringController.setSelectedAccount.bind(keyringController),
      approveTransaction: keyringController.approveTransaction.bind(keyringController),
      cancelTransaction: keyringController.cancelTransaction.bind(keyringController),
      signMessage: keyringController.signMessage.bind(keyringController),
@ -125,8 +127,8 @@ module.exports = class MetamaskController {
      rpcUrl: this.configManager.getCurrentRpcAddress(),
      // account mgmt
      getAccounts: (cb) => {
-        var selectedAddress = this.configManager.getSelectedAccount()
-        var result = selectedAddress ? [selectedAddress] : []
+        var selectedAccount = this.configManager.getSelectedAccount()
+        var result = selectedAccount ? [selectedAccount] : []
        cb(null, result)
      },
      // tx signing
@ -174,17 +176,21 @@ module.exports = class MetamaskController {
      this.sendUpdate()
    })

+    this.keyringController.on('newAccount', (account) => {
+      autoFaucet(account)
+    })
+
    // keyringController substate
    function keyringControllerToPublic (state) {
      return {
-        selectedAddress: state.selectedAddress,
+        selectedAccount: state.selectedAccount,
      }
    }
    // config substate
    function configToPublic (state) {
      return {
        provider: state.provider,
-        selectedAddress: state.selectedAccount,
+        selectedAccount: state.selectedAccount,
      }
    }
    // dump obj into store
--- a/development/states.js
+++ b/development/states.js
--- a/development/states/account-detail-with-shapeshift-tx.json
+++ b/development/states/account-detail-with-shapeshift-tx.json
@ -133,7 +133,7 @@
        "address": "0x704107d04affddd9b66ab9de3dd7b095852e9b69"
      }
    },
-    "selectedAddress": "0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc",
+    "selectedAccount": "0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc",
    "network": "1",
    "seedWords": null,
    "isDisclaimerConfirmed": true,
--- a/development/states/account-detail-with-transaction-history.json
+++ b/development/states/account-detail-with-transaction-history.json
@ -99,7 +99,7 @@
        "status": "confirmed",
        "containsDelegateCall": false
      }],
-    "selectedAddress": "0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc",
+    "selectedAccount": "0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc",
    "network": "2",
    "seedWords": null,
    "isDisclaimerConfirmed": true,
--- a/development/states/account-detail.json
+++ b/development/states/account-detail.json
@ -57,7 +57,7 @@
      }
    },
    "transactions": [],
-    "selectedAddress": "0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc",
+    "selectedAccount": "0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc",
    "network": "2",
    "seedWords": null,
    "isDisclaimerConfirmed": true,
--- a/development/states/accounts.json
+++ b/development/states/accounts.json
@ -89,7 +89,7 @@
      }
    },
    "transactions": [],
-    "selectedAddress": "0x0abdd95cafcabec9b3e99dcd09fc4b441037cb80",
+    "selectedAccount": "0x0abdd95cafcabec9b3e99dcd09fc4b441037cb80",
    "network": "2",
    "isDisclaimerConfirmed": true,
    "unconfMsgs": {},
--- a/development/states/config.json
+++ b/development/states/config.json
@ -57,7 +57,7 @@
      }
    },
    "transactions": [],
-    "selectedAddress": "0x843963b837841dad3b0f5969ff271108776616df",
+    "selectedAccount": "0x843963b837841dad3b0f5969ff271108776616df",
    "network": "2",
    "isDisclaimerConfirmed": true,
    "unconfMsgs": {},
--- a/development/states/custom-rpc.json
+++ b/development/states/custom-rpc.json
@ -157,7 +157,7 @@
        "estimatedGas": "0x5208"
      }
    ],
-    "selectedAddress": "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825",
+    "selectedAccount": "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825",
    "network": "166",
    "seedWords": null,
    "isDisclaimerConfirmed": true,
--- a/development/states/empty-account-detail.json
+++ b/development/states/empty-account-detail.json
@ -54,7 +54,7 @@
      }
    },
    "transactions": [],
-    "selectedAddress": "0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc",
+    "selectedAccount": "0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc",
    "network": "2",
    "seedWords": null,
    "isDisclaimerConfirmed": true,
--- a/development/states/help.json
+++ b/development/states/help.json
@ -62,7 +62,7 @@
      "type": "testnet"
    },
    "selectedAccount": "0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc",
-    "selectedAddress": "0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc",
+    "selectedAccount": "0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc",
    "seedWords": null
  },
  "appState": {
--- a/development/states/locked.json
+++ b/development/states/locked.json
@ -11,7 +11,7 @@
    "conversionDate": 1473358355,
    "accounts": {},
    "transactions": [],
-    "selectedAddress": "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825",
+    "selectedAccount": "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825",
    "network": "1473186153102",
    "seedWords": null,
    "isDisclaimerConfirmed": true,
--- a/development/states/pending-crash.json
+++ b/development/states/pending-crash.json
--- a/development/states/pending-signature.json
+++ b/development/states/pending-signature.json
@ -351,7 +351,7 @@
        "hash": "0xb6e6ff57e7b5f6bd7f2e6dc44c39f4e858a227c9509586634ca547179345a13e"
      }
    ],
-    "selectedAddress": "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825",
+    "selectedAccount": "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825",
    "network": "1471904489432",
    "seedWords": null,
    "isDisclaimerConfirmed": true,
--- a/development/states/pending-tx-contract.json
+++ b/development/states/pending-tx-contract.json
--- a/development/states/pending-tx-send-coin.json
+++ b/development/states/pending-tx-send-coin.json
@ -1 +1 @@
-{"metamask":{"isInitialized":true,"isUnlocked":true,"currentDomain":"example.com","rpcTarget":"https://rawtestrpc.metamask.io/","identities":{"0xfdea65c8e26263f6d9a1b5de9555d2931a33b825":{"name":"Wallet 1","address":"0xfdea65c8e26263f6d9a1b5de9555d2931a33b825","mayBeFauceting":false},"0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb":{"name":"Wallet 2","address":"0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb","mayBeFauceting":false},"0x2f8d4a878cfa04a6e60d46362f5644deab66572d":{"name":"Wallet 3","address":"0x2f8d4a878cfa04a6e60d46362f5644deab66572d","mayBeFauceting":false}},"unconfTxs":{"1467868023090690":{"id":1467868023090690,"txParams":{"data":"0xa9059cbb0000000000000000000000008deb4d106090c3eb8f1950f727e87c4f884fb06f0000000000000000000000000000000000000000000000000000000000000064","from":"0xfdea65c8e26263f6d9a1b5de9555d2931a33b825","value":"0x16345785d8a0000","to":"0xbeb0ed3034c4155f3d16a64a5c5e7c8d4ea9e9c9","origin":"MetaMask","metamaskId":1467868023090690,"metamaskNetworkId":"2"},"time":1467868023090,"status":"unconfirmed","containsDelegateCall":false}},"accounts":{"0xfdea65c8e26263f6d9a1b5de9555d2931a33b825":{"code":"0x","balance":"0x38326dc32cf80800","nonce":"0x10000c","address":"0xfdea65c8e26263f6d9a1b5de9555d2931a33b825"},"0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb":{"code":"0x","balance":"0x15e578bd8e9c8000","nonce":"0x100000","address":"0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb"},"0x2f8d4a878cfa04a6e60d46362f5644deab66572d":{"code":"0x","nonce":"0x100000","balance":"0x2386f26fc10000","address":"0x2f8d4a878cfa04a6e60d46362f5644deab66572d"}},"transactions":[],"selectedAddress":"0xfdea65c8e26263f6d9a1b5de9555d2931a33b825","network":"2","seedWords":null,"isDisclaimerConfirmed":true,"unconfMsgs":{},"messages":[],"provider":{"type":"testnet"},"selectedAccount":"0xfdea65c8e26263f6d9a1b5de9555d2931a33b825"},"appState":{"menuOpen":false,"currentView":{"name":"confTx","context":0},"accountDetail":{"subview":"transactions"},"currentDomain":"extensions","transForward":true,"isLoading":false,"warning":null},"identities":{}}
+{"metamask":{"isInitialized":true,"isUnlocked":true,"currentDomain":"example.com","rpcTarget":"https://rawtestrpc.metamask.io/","identities":{"0xfdea65c8e26263f6d9a1b5de9555d2931a33b825":{"name":"Wallet 1","address":"0xfdea65c8e26263f6d9a1b5de9555d2931a33b825","mayBeFauceting":false},"0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb":{"name":"Wallet 2","address":"0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb","mayBeFauceting":false},"0x2f8d4a878cfa04a6e60d46362f5644deab66572d":{"name":"Wallet 3","address":"0x2f8d4a878cfa04a6e60d46362f5644deab66572d","mayBeFauceting":false}},"unconfTxs":{"1467868023090690":{"id":1467868023090690,"txParams":{"data":"0xa9059cbb0000000000000000000000008deb4d106090c3eb8f1950f727e87c4f884fb06f0000000000000000000000000000000000000000000000000000000000000064","from":"0xfdea65c8e26263f6d9a1b5de9555d2931a33b825","value":"0x16345785d8a0000","to":"0xbeb0ed3034c4155f3d16a64a5c5e7c8d4ea9e9c9","origin":"MetaMask","metamaskId":1467868023090690,"metamaskNetworkId":"2"},"time":1467868023090,"status":"unconfirmed","containsDelegateCall":false}},"accounts":{"0xfdea65c8e26263f6d9a1b5de9555d2931a33b825":{"code":"0x","balance":"0x38326dc32cf80800","nonce":"0x10000c","address":"0xfdea65c8e26263f6d9a1b5de9555d2931a33b825"},"0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb":{"code":"0x","balance":"0x15e578bd8e9c8000","nonce":"0x100000","address":"0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb"},"0x2f8d4a878cfa04a6e60d46362f5644deab66572d":{"code":"0x","nonce":"0x100000","balance":"0x2386f26fc10000","address":"0x2f8d4a878cfa04a6e60d46362f5644deab66572d"}},"transactions":[],"selectedAccount":"0xfdea65c8e26263f6d9a1b5de9555d2931a33b825","network":"2","seedWords":null,"isDisclaimerConfirmed":true,"unconfMsgs":{},"messages":[],"provider":{"type":"testnet"},"selectedAccount":"0xfdea65c8e26263f6d9a1b5de9555d2931a33b825"},"appState":{"menuOpen":false,"currentView":{"name":"confTx","context":0},"accountDetail":{"subview":"transactions"},"currentDomain":"extensions","transForward":true,"isLoading":false,"warning":null},"identities":{}}
--- a/development/states/pending-tx-value.json
+++ b/development/states/pending-tx-value.json
--- a/development/states/private-network.json
+++ b/development/states/private-network.json
@ -52,7 +52,7 @@
        "hash": "0xad609a6931f54a575ad71222ffc27cd6746017106d5b89f4ad300b37b273f8ac"
      }
    ],
-    "selectedAddress": "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825",
+    "selectedAccount": "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825",
    "network": "1479753732793",
    "isConfirmed": true,
    "isEthConfirmed": true,
--- a/development/states/shapeshift.json
+++ b/development/states/shapeshift.json
@ -46,7 +46,7 @@
      }
    },
    "transactions": [],
-    "selectedAddress": "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825",
+    "selectedAccount": "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825",
    "network": "1",
    "seedWords": null,
    "isDisclaimerConfirmed": true,
--- a/test/unit/actions/set_selected_account_test.js
+++ b/test/unit/actions/set_selected_account_test.js
@ -44,6 +44,5 @@ describe('SHOW_ACCOUNT_DETAIL', function() {

    var resultingState = reducers(initialState, action)
    assert.equal(resultingState.metamask.selectedAccount, action.value)
-    assert.equal(resultingState.metamask.selectedAddress, action.value)
  })
 })
--- a/test/unit/idStore-migration-test.js
+++ b/test/unit/idStore-migration-test.js
@ -52,7 +52,7 @@ describe('IdentityStore to KeyringController migration', function() {
      },
    })

-    idStore._createVault(password, mockVault.seed, null, (err) => {
+    idStore._createVault(password, mockVault.seed, (err) => {
      assert.ifError(err, 'createNewVault threw error')
      originalKeystore = idStore._idmgmt.keyStore

--- a/test/unit/idStore-test.js
+++ b/test/unit/idStore-test.js
@ -11,7 +11,6 @@ describe('IdentityStore', function() {
  describe('#createNewVault', function () {
    let idStore
    let password = 'password123'
-    let entropy = 'entripppppyy duuude'
    let seedWords
    let accounts = []
    let originalKeystore
@ -26,7 +25,7 @@ describe('IdentityStore', function() {
        },
      })

-      idStore.createNewVault(password, entropy, (err, seeds) => {
+      idStore.createNewVault(password, (err, seeds) => {
        assert.ifError(err, 'createNewVault threw error')
        seedWords = seeds
        originalKeystore = idStore._idmgmt.keyStore
--- a/test/unit/keyring-controller-test.js
+++ b/test/unit/keyring-controller-test.js
@ -12,7 +12,6 @@ describe('KeyringController', function() {

  let keyringController, state
  let password = 'password123'
-  let entropy = 'entripppppyy duuude'
  let seedWords = 'puzzle seed penalty soldier say clay field arctic metal hen cage runway'
  let addresses = ['eF35cA8EbB9669A35c31b5F6f249A9941a812AC1'.toLowerCase()]
  let accounts = []
@ -33,7 +32,7 @@ describe('KeyringController', function() {
    // Browser crypto is tested in the integration test suite.
    keyringController.encryptor = mockEncryptor

-    keyringController.createNewVaultAndKeychain(password, null, function (err, newState) {
+    keyringController.createNewVaultAndKeychain(password, function (err, newState) {
      assert.ifError(err)
      state = newState
      done()
@ -51,7 +50,7 @@ describe('KeyringController', function() {
    it('should set a vault on the configManager', function(done) {
      keyringController.configManager.setVault(null)
      assert(!keyringController.configManager.getVault(), 'no previous vault')
-      keyringController.createNewVaultAndKeychain(password, null, (err, state) => {
+      keyringController.createNewVaultAndKeychain(password, (err, state) => {
        assert.ifError(err)
        const vault = keyringController.configManager.getVault()
        assert(vault, 'vault created')
--- a/ui/app/accounts/account-list-item.js
+++ b/ui/app/accounts/account-list-item.js
@ -16,7 +16,7 @@ function AccountListItem () {

 AccountListItem.prototype.render = function () {
  const identity = this.props.identity
-  var isSelected = this.props.selectedAddress === identity.address
+  var isSelected = this.props.selectedAccount === identity.address
  var account = this.props.accounts[identity.address]
  const selectedClass = isSelected ? '.selected' : ''

--- a/ui/app/accounts/index.js
+++ b/ui/app/accounts/index.js
@ -19,7 +19,7 @@ function mapStateToProps (state) {
    accounts: state.metamask.accounts,
    identities: state.metamask.identities,
    unconfTxs: state.metamask.unconfTxs,
-    selectedAddress: state.metamask.selectedAddress,
+    selectedAccount: state.metamask.selectedAccount,
    scrollToBottom: state.appState.scrollToBottom,
    pending,
  }
@ -72,7 +72,7 @@ AccountsScreen.prototype.render = function () {
            return h(AccountListItem, {
              key: `acct-panel-${identity.address}`,
              identity,
-              selectedAddress: this.props.selectedAddress,
+              selectedAccount: this.props.selectedAccount,
              accounts: this.props.accounts,
              onShowDetail: this.onShowDetail.bind(this),
              pending,
@ -133,8 +133,8 @@ AccountsScreen.prototype.navigateToConfTx = function () {
 AccountsScreen.prototype.onSelect = function (address, event) {
  event.stopPropagation()
  // if already selected, deselect
-  if (this.props.selectedAddress === address) address = null
-  this.props.dispatch(actions.setSelectedAddress(address))
+  if (this.props.selectedAccount === address) address = null
+  this.props.dispatch(actions.setSelectedAccount(address))
 }

 AccountsScreen.prototype.onShowDetail = function (address, event) {
--- a/ui/app/actions.js
+++ b/ui/app/actions.js
@ -71,7 +71,7 @@ var actions = {
  TRANSACTION_ERROR: 'TRANSACTION_ERROR',
  NEXT_TX: 'NEXT_TX',
  PREVIOUS_TX: 'PREV_TX',
-  setSelectedAddress: setSelectedAddress,
+  setSelectedAccount: setSelectedAccount,
  signMsg: signMsg,
  cancelMsg: cancelMsg,
  sendTx: sendTx,
@ -201,9 +201,9 @@ function createNewVaultAndRestore (password, seed) {
  }
 }

-function createNewVaultAndKeychain (password, entropy) {
+function createNewVaultAndKeychain (password) {
  return (dispatch) => {
-    background.createNewVaultAndKeychain(password, entropy, (err) => {
+    background.createNewVaultAndKeychain(password, (err) => {
      if (err) {
        return dispatch(actions.showWarning(err.message))
      }
@ -259,9 +259,9 @@ function showInfoPage () {
  }
 }

-function setSelectedAddress (address) {
+function setSelectedAccount (address) {
  return (dispatch) => {
-    background.setSelectedAddress(address)
+    background.setSelectedAccount(address)
  }
 }

@ -455,7 +455,7 @@ function lockMetamask () {
 function showAccountDetail (address) {
  return (dispatch) => {
    dispatch(actions.showLoadingIndication())
-    background.setSelectedAddress(address, (err, address) => {
+    background.setSelectedAccount(address, (err, address) => {
      dispatch(actions.hideLoadingIndication())
      if (err) {
        return dispatch(actions.displayWarning(err.message))
--- a/ui/app/components/pending-msg-details.js
+++ b/ui/app/components/pending-msg-details.js
@ -16,7 +16,7 @@ PendingMsgDetails.prototype.render = function () {
  var msgData = state.txData

  var msgParams = msgData.msgParams || {}
-  var address = msgParams.from || state.selectedAddress
+  var address = msgParams.from || state.selectedAccount
  var identity = state.identities[address] || { address: address }
  var account = state.accounts[address] || { address: address }

--- a/ui/app/components/pending-tx-details.js
+++ b/ui/app/components/pending-tx-details.js
@ -24,7 +24,7 @@ PTXP.render = function () {
  var txData = props.txData

  var txParams = txData.txParams || {}
-  var address = txParams.from || props.selectedAddress
+  var address = txParams.from || props.selectedAccount
  var identity = props.identities[address] || { address: address }
  var account = props.accounts[address]
  var balance = account ? account.balance : '0x0'
--- a/ui/app/conf-tx.js
+++ b/ui/app/conf-tx.js
@ -18,7 +18,7 @@ function mapStateToProps (state) {
  return {
    identities: state.metamask.identities,
    accounts: state.metamask.accounts,
-    selectedAddress: state.metamask.selectedAddress,
+    selectedAccount: state.metamask.selectedAccount,
    unconfTxs: state.metamask.unconfTxs,
    unconfMsgs: state.metamask.unconfMsgs,
    index: state.appState.currentView.context,
@ -90,12 +90,12 @@ ConfirmTxScreen.prototype.render = function () {
          // Properties
          txData: txData,
          key: txData.id,
-          selectedAddress: state.selectedAddress,
+          selectedAccount: state.selectedAccount,
          accounts: state.accounts,
          identities: state.identities,
          insufficientBalance: this.checkBalnceAgainstTx(txData),
          // Actions
-          buyEth: this.buyEth.bind(this, txParams.from || state.selectedAddress),
+          buyEth: this.buyEth.bind(this, txParams.from || state.selectedAccount),
          sendTransaction: this.sendTransaction.bind(this, txData),
          cancelTransaction: this.cancelTransaction.bind(this, txData),
          signMessage: this.signMessage.bind(this, txData),
@ -120,7 +120,7 @@ ConfirmTxScreen.prototype.checkBalnceAgainstTx = function (txData) {
  var state = this.props

  var txParams = txData.txParams || {}
-  var address = txParams.from || state.selectedAddress
+  var address = txParams.from || state.selectedAccount
  var account = state.accounts[address]
  var balance = account ? account.balance : '0x0'

--- a/ui/app/first-time/init-menu.js
+++ b/ui/app/first-time/init-menu.js
@ -165,7 +165,7 @@ InitializeMenuScreen.prototype.createNewVaultAndKeychain = function () {
    return
  }

-  this.props.dispatch(actions.createNewVaultAndKeychain(password, ''/* entropy*/))
+  this.props.dispatch(actions.createNewVaultAndKeychain(password))
 }

 InitializeMenuScreen.prototype.inputChanged = function (event) {
--- a/ui/app/reducers/app.js
+++ b/ui/app/reducers/app.js
@ -285,7 +285,7 @@ function reduceApp (state, action) {
          warning: null,
          currentView: {
            name: 'accountDetail',
-            context: state.metamask.selectedAddress,
+            context: state.metamask.selectedAccount,
          },
          accountDetail: {
            subview: 'transactions',
--- a/ui/app/reducers/metamask.js
+++ b/ui/app/reducers/metamask.js
@ -98,7 +98,6 @@ function reduceMetamask (state, action) {
        isUnlocked: true,
        isInitialized: true,
        selectedAccount: action.value,
-        selectedAddress: action.value,
      })
      delete newState.seedWords
      return newState
--- a/ui/example.js
+++ b/ui/example.js
@ -53,14 +53,14 @@ function addUnconfTx (txParams) {
 }

 var isUnlocked = false
-var selectedAddress = null
+var selectedAccount = null

 function getState () {
  return {
    isUnlocked: isUnlocked,
    identities: isUnlocked ? identities : {},
    unconfTxs: isUnlocked ? unconfTxs : {},
-    selectedAddress: selectedAddress,
+    selectedAccount: selectedAccount,
  }
 }

@ -85,8 +85,8 @@ accountManager.submitPassword = function (password, cb) {
  }
 }

-accountManager.setSelectedAddress = function (address, cb) {
-  selectedAddress = address
+accountManager.setSelectedAccount = function (address, cb) {
+  selectedAccount = address
  cb(null, getState())
  this._didUpdate()
 }