diff options
| author | kumavis <kumavis@users.noreply.github.com> | 2017-02-16 02:51:49 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-16 02:51:49 +0800 |
| commit | f2539d125c2cfe240511f8505e222a9893bf7748 (patch) | |
| tree | f58eaa54c0fd5818735ab6a282093bc8eb7bcd9d /app/scripts | |
| parent | 07422ae8350c08a68ecf17b8ca2ec08f9ea1805f (diff) | |
| parent | 0b0eec9c52667148fc69e1a3446bcd208dab3858 (diff) | |
| download | tangerine-wallet-browser-f2539d125c2cfe240511f8505e222a9893bf7748.tar tangerine-wallet-browser-f2539d125c2cfe240511f8505e222a9893bf7748.tar.gz tangerine-wallet-browser-f2539d125c2cfe240511f8505e222a9893bf7748.tar.bz2 tangerine-wallet-browser-f2539d125c2cfe240511f8505e222a9893bf7748.tar.lz tangerine-wallet-browser-f2539d125c2cfe240511f8505e222a9893bf7748.tar.xz tangerine-wallet-browser-f2539d125c2cfe240511f8505e222a9893bf7748.tar.zst tangerine-wallet-browser-f2539d125c2cfe240511f8505e222a9893bf7748.zip | |
Merge pull request #1113 from MetaMask/RecoverTests
Add tests showing recovering public key from signature
Diffstat (limited to 'app/scripts')
| -rw-r--r-- | app/scripts/keyrings/hd.js | 4 | ||||
| -rw-r--r-- | app/scripts/keyrings/simple.js | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/app/scripts/keyrings/hd.js b/app/scripts/keyrings/hd.js index 7b10f925a..3a66f7868 100644 --- a/app/scripts/keyrings/hd.js +++ b/app/scripts/keyrings/hd.js @@ -112,9 +112,11 @@ class HdKeyring extends EventEmitter { _getWalletForAccount (account) { + const targetAddress = sigUtil.normalize(account) return this.wallets.find((w) => { const address = w.getAddress().toString('hex') - return ((address === account) || (sigUtil.normalize(address) === account)) + return ((address === targetAddress) || + (sigUtil.normalize(address) === targetAddress)) }) } } diff --git a/app/scripts/keyrings/simple.js b/app/scripts/keyrings/simple.js index b6ffc606e..82881aa2d 100644 --- a/app/scripts/keyrings/simple.js +++ b/app/scripts/keyrings/simple.js @@ -88,7 +88,8 @@ class SimpleKeyring extends EventEmitter { /* PRIVATE METHODS */ _getWalletForAccount (account) { - let wallet = this.wallets.find(w => ethUtil.bufferToHex(w.getAddress()) === account) + const address = sigUtil.normalize(account) + let wallet = this.wallets.find(w => ethUtil.bufferToHex(w.getAddress()) === address) if (!wallet) throw new Error('Simple Keyring - Unable to find matching address.') return wallet } |