able to add accounts

4 files changed, 107 insertions, 40 deletions

diff --git a/app/scripts/eth-ledger-keyring-listener.js b/app/scripts/eth-ledger-keyring-listener.js
index 1c02f0610..b9b8eb3c8 100644
--- a/app/scripts/eth-ledger-keyring-listener.js
+++ b/app/scripts/eth-ledger-keyring-listener.js
@@ -1,11 +1,16 @@
 const extension = require('extensionizer')
 const {EventEmitter} = require('events')
+const HDKey = require('hdkey')
+const ethUtil = require('ethereumjs-util')
+const sigUtil = require('eth-sig-util')
+const Transaction = require('ethereumjs-tx')
 
 
 // HD path differs from eth-hd-keyring - MEW, Parity, Geth and Official Ledger clients use same unusual derivation for Ledger
 const hdPathString = `m/44'/60'/0'`
 const type = 'Ledger Hardware Keyring'
-const ORIGIN  = 'http://localhost:9000'
+const ORIGIN  = 'https://localhost:3000'
+const pathBase = 'm'
 
 class LedgerKeyring extends EventEmitter {
   constructor (opts = {}) {
@@ -14,6 +19,7 @@ class LedgerKeyring extends EventEmitter {
     this.page = 0
     this.perPage = 5
     this.unlockedAccount = 0
+    this.hdk = new HDKey()
     this.paths = {}
     this.iframe = null
     this.setupIframe()
@@ -26,10 +32,6 @@ class LedgerKeyring extends EventEmitter {
     console.log('Injecting ledger iframe')
     document.head.appendChild(this.iframe)
 
-    
-     /*
-    Passing messages from iframe to background script
-    */
     console.log('[LEDGER]: LEDGER FROM-IFRAME LISTENER READY')
     
   }
@@ -78,32 +80,39 @@ class LedgerKeyring extends EventEmitter {
       },
       ({action, success, payload}) => {  
         if (success) {
-          resolve(payload)
+          this.hdk.publicKey = new Buffer(payload.publicKey, 'hex')
+          this.hdk.chainCode = new Buffer(payload.chainCode, 'hex')
+          resolve('just unlocked')
         } else {
-          reject(payload)
+          reject(payload.error || 'Unknown error')
         }
       })
     })
   }
 
-  async addAccounts (n = 1) {
+  setAccountToUnlock (index) {
+    this.unlockedAccount = parseInt(index, 10)
+  }
+
+  addAccounts (n = 1) {
+
     return new Promise((resolve, reject) => {
       this.unlock()
-      .then(_ => {
-        this.sendMessage({
-          action: 'ledger-add-account',
-          params: {
-            n,
-          },
-        },
-        ({action, success, payload}) => {
-          if (success) {
-            resolve(payload)
-          } else {
-            reject(payload)
-          }        
+        .then(_ => {
+          const from = this.unlockedAccount
+          const to = from + n
+          this.accounts = []
+
+          for (let i = from; i < to; i++) {
+            const address = this._addressFromIndex(pathBase, i)
+            this.accounts.push(address)
+            this.page = 0
+          }
+          resolve(this.accounts)
+        })
+        .catch(e => {
+          reject(e)
         })
-      })
     })
   }
 
@@ -129,20 +138,27 @@ class LedgerKeyring extends EventEmitter {
     return new Promise((resolve, reject) => {
       this.unlock()
         .then(_ => {
-          this.sendMessage({
-            action: 'ledger-get-page',
-            params: {
-              page: this.page,
-            },
-          },
-          ({action, success, payload}) => {
-            if (success) {
-              resolve(payload)
-            } else {
-              reject(payload)
-            }        
-          })
-      })
+
+          const from = (this.page - 1) * this.perPage
+          const to = from + this.perPage
+
+          const accounts = []
+
+          for (let i = from; i < to; i++) {
+            const address = this._addressFromIndex(pathBase, i)
+             accounts.push({
+              address: address,
+              balance: null,
+              index: i,
+            })
+            this.paths[ethUtil.toChecksumAddress(address)] = i
+
+          }
+          resolve(accounts)
+        })
+        .catch(e => {
+          reject(e)
+        })
     })
   }
 
@@ -157,6 +173,7 @@ class LedgerKeyring extends EventEmitter {
     this.accounts = this.accounts.filter(a => a.toLowerCase() !== address.toLowerCase())
   }
 
+
   // tx is an instance of the ethereumjs-transaction class.
   async signTransaction (address, tx) {
     return new Promise((resolve, reject) => {
@@ -224,6 +241,56 @@ class LedgerKeyring extends EventEmitter {
     this.unlockedAccount = 0
     this.paths = {}
   }
+
+  /* PRIVATE METHODS */
+
+  _padLeftEven (hex) {
+    return hex.length % 2 !== 0 ? `0${hex}` : hex
+  }
+
+  _normalize (buf) {
+    return this._padLeftEven(ethUtil.bufferToHex(buf).substring(2).toLowerCase())
+  }
+
+  _addressFromIndex (pathBase, i) {
+    const dkey = this.hdk.derive(`${pathBase}/${i}`)
+    const address = ethUtil
+      .publicToAddress(dkey.publicKey, true)
+      .toString('hex')
+    return ethUtil.toChecksumAddress(address)
+  }
+
+  _pathFromAddress (address) {
+    const checksummedAddress = ethUtil.toChecksumAddress(address)
+    let index = this.paths[checksummedAddress]
+    if (typeof index === 'undefined') {
+      for (let i = 0; i < MAX_INDEX; i++) {
+        if (checksummedAddress === this._addressFromIndex(pathBase, i)) {
+          index = i
+          break
+        }
+      }
+    }
+
+    if (typeof index === 'undefined') {
+      throw new Error('Unknown address')
+    }
+    return `${this.hdPath}/${index}`
+  }
+
+  _toAscii (hex) {
+      let str = ''
+      let i = 0; const l = hex.length
+      if (hex.substring(0, 2) === '0x') {
+          i = 2
+      }
+      for (; i < l; i += 2) {
+          const code = parseInt(hex.substr(i, 2), 16)
+          str += String.fromCharCode(code)
+      }
+
+      return str
+  }
 }
 
 LedgerKeyring.type = type
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 58bab9789..c79e5141e 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -615,7 +615,7 @@ module.exports = class MetamaskController extends EventEmitter {
    *
    * @returns {} keyState
    */
-  async unlockHardwareWalletAccount (deviceName, index) {
+  async unlockHardwareWalletAccount (index, deviceName) {
     const keyring = await this.getKeyringForDevice(deviceName)
 
     keyring.setAccountToUnlock(index)
diff --git a/ui/app/components/pages/create-account/connect-hardware/account-list.js b/ui/app/components/pages/create-account/connect-hardware/account-list.js
index 730f2df34..ac020345a 100644
--- a/ui/app/components/pages/create-account/connect-hardware/account-list.js
+++ b/ui/app/components/pages/create-account/connect-hardware/account-list.js
@@ -11,7 +11,7 @@ class AccountList extends Component {
     renderHeader () {
       return (
         h('div.hw-connect', [
-          h('h3.hw-connect__title', {}, this.context.t('selectAnAccount')),
+          h('h3.hw-connect__title', {}, `${this.props.device.toUpperCase()} - ${this.context.t('selectAnAccount')}`),
           h('p.hw-connect__msg', {}, this.context.t('selectAnAccountHelp')),
         ])
       )
diff --git a/ui/app/components/pages/create-account/connect-hardware/index.js b/ui/app/components/pages/create-account/connect-hardware/index.js
index 86a4d7257..644742172 100644
--- a/ui/app/components/pages/create-account/connect-hardware/index.js
+++ b/ui/app/components/pages/create-account/connect-hardware/index.js
@@ -128,13 +128,13 @@ class ConnectHardwareForm extends Component {
     })
   }
 
-  onUnlockAccount = () => {
+  onUnlockAccount = (device) => {
 
     if (this.state.selectedAccount === null) {
       this.setState({ error: this.context.t('accountSelectionRequired') })
     }
 
-    this.props.unlockHardwareWalletAccount(this.state.selectedAccount, this.state.device)
+    this.props.unlockHardwareWalletAccount(this.state.selectedAccount, device)
     .then(_ => {
       this.props.history.push(DEFAULT_ROUTE)
     }).catch(e => {