Skip to content

Commit

Permalink
bump eth-keyring-controller to v7.0.2 (#819)
Browse files Browse the repository at this point in the history
* bump eth-keyring-controller to v7.0.2

* update seed argument type for createNewVaultAndRestore to string or array of numbers
  • Loading branch information
adonesky1 authored May 11, 2022
1 parent f685920 commit 9c3483a
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 19 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"deep-freeze-strict": "^1.1.1",
"eth-ens-namehash": "^2.0.8",
"eth-json-rpc-infura": "^5.1.0",
"eth-keyring-controller": "^7.0.1",
"eth-keyring-controller": "^7.0.2",
"eth-method-registry": "1.1.0",
"eth-phishing-detect": "^1.1.16",
"eth-query": "^2.1.2",
Expand Down
7 changes: 4 additions & 3 deletions src/keyring/KeyringController.ts
Original file line number Diff line number Diff line change
Expand Up @@ -240,10 +240,11 @@ export class KeyringController extends BaseController<
* using the given seed phrase.
*
* @param password - Password to unlock keychain.
* @param seed - Seed phrase to restore keychain.
* @returns Promise resolving to th restored keychain object.
* @param seed - A BIP39-compliant seed phrase,
* either as a string or an array of UTF-8 bytes that represent the string.
* @returns Promise resolving to the restored keychain object.
*/
async createNewVaultAndRestore(password: string, seed: string) {
async createNewVaultAndRestore(password: string, seed: string | number[]) {
const releaseLock = await this.mutex.acquire();
if (!password || !password.length) {
throw new Error('Invalid password');
Expand Down
20 changes: 5 additions & 15 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2166,16 +2166,6 @@ bindings@^1.2.1, bindings@^1.5.0:
dependencies:
file-uri-to-path "1.0.0"

bip39@^3.0.4:
version "3.0.4"
resolved "https://registry.yarnpkg.com/bip39/-/bip39-3.0.4.tgz#5b11fed966840b5e1b8539f0f54ab6392969b2a0"
integrity sha512-YZKQlb752TrUWqHWj7XAwCSjYEgGAk+/Aas3V7NyjQeZYsztO8JnQUaCWhcnL4T+jL8nvB8typ2jRPzTlgugNw==
dependencies:
"@types/node" "11.11.6"
create-hash "^1.1.0"
pbkdf2 "^3.0.9"
randombytes "^2.0.1"

bip66@^1.1.5:
version "1.1.5"
resolved "https://registry.yarnpkg.com/bip66/-/bip66-1.1.5.tgz#01fa8748785ca70955d5011217d1b3139969ca22"
Expand Down Expand Up @@ -3373,13 +3363,13 @@ eth-json-rpc-middleware@^6.0.0:
pify "^3.0.0"
safe-event-emitter "^1.0.1"

eth-keyring-controller@^7.0.1:
version "7.0.1"
resolved "https://registry.yarnpkg.com/eth-keyring-controller/-/eth-keyring-controller-7.0.1.tgz#7dd959ea6d6dca0be27f732ad08c650ba327cab3"
integrity sha512-mD+MUwGuMStowINfen860SFhCAOm62JpEAbLM4hnD27P/sOEWkxZMjlf7S6j12YziGwX6WAO07k7Hk2hgAhcfQ==
eth-keyring-controller@^7.0.2:
version "7.0.2"
resolved "https://registry.yarnpkg.com/eth-keyring-controller/-/eth-keyring-controller-7.0.2.tgz#c4d7f9be179f08b3bb18410066bc4c8e91f50552"
integrity sha512-U4bqbXkTn7js/47rnFtVyBYQcvOKtmraD/YReBwuy4R56bFSJN8kinP0JJRl3WTtVfVS1l5A/jjsF3qk5TaTeg==
dependencies:
"@metamask/bip39" "^4.0.0"
"@metamask/eth-hd-keyring" "^4.0.2"
bip39 "^3.0.4"
browser-passworder "^2.0.3"
eth-sig-util "^3.0.1"
eth-simple-keyring "^4.2.0"
Expand Down

0 comments on commit 9c3483a

Please sign in to comment.