diff --git a/README.md b/README.md index dcff3658..85b92c53 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ The KeyringController has three main responsibilities: ```javascript const KeyringController = require('eth-keyring-controller'); -const SimpleKeyring = require('eth-simple-keyring'); +const SimpleKeyring = require('@metamask/eth-simple-keyring'); const keyringController = new KeyringController({ keyringTypes: [SimpleKeyring], // optional array of types to support. diff --git a/index.js b/index.js index f210ce20..17f641d6 100644 --- a/index.js +++ b/index.js @@ -5,7 +5,7 @@ const ObservableStore = require('obs-store'); const encryptor = require('@metamask/browser-passworder'); const { normalize: normalizeAddress } = require('eth-sig-util'); -const SimpleKeyring = require('eth-simple-keyring'); +const SimpleKeyring = require('@metamask/eth-simple-keyring'); const HdKeyring = require('@metamask/eth-hd-keyring'); const keyringTypes = [SimpleKeyring, HdKeyring]; diff --git a/package.json b/package.json index f3cbf86c..c103b525 100644 --- a/package.json +++ b/package.json @@ -33,8 +33,8 @@ "@metamask/bip39": "^4.0.0", "@metamask/browser-passworder": "^4.0.1", "@metamask/eth-hd-keyring": "^4.0.2", + "@metamask/eth-simple-keyring": "^5.0.0", "eth-sig-util": "^3.0.1", - "eth-simple-keyring": "^4.2.0", "obs-store": "^4.0.3" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index e40a042c..47799e25 100644 --- a/yarn.lock +++ b/yarn.lock @@ -462,6 +462,26 @@ __metadata: languageName: node linkType: hard +"@ethereumjs/rlp@npm:^4.0.0-beta.2": + version: 4.0.0 + resolution: "@ethereumjs/rlp@npm:4.0.0" + bin: + rlp: bin/rlp + checksum: 407dfb8b1e09b4282e6be561e8d74f8939da78f460c08456c7ba2fb273fc42ee16027955a07085abfd7600ffb466c4c4add159885e67abb91bc85db9dd81ffb5 + languageName: node + linkType: hard + +"@ethereumjs/util@npm:^8.0.0": + version: 8.0.2 + resolution: "@ethereumjs/util@npm:8.0.2" + dependencies: + "@ethereumjs/rlp": ^4.0.0-beta.2 + async: ^3.2.4 + ethereum-cryptography: ^1.1.2 + checksum: 652a40f9dffb9ed749c8adff21c924dec7a6d38129e480ab35ae2e56644bb6e49fcdb5f0cd0451fb6878de7e16cf117e87e34ba01f311bf216b4a8dd5b23aa90 + languageName: node + linkType: hard + "@gar/promisify@npm:^1.1.3": version: 1.1.3 resolution: "@gar/promisify@npm:1.1.3" @@ -808,6 +828,53 @@ __metadata: languageName: node linkType: hard +"@metamask/eth-sig-util@npm:^5.0.1": + version: 5.0.2 + resolution: "@metamask/eth-sig-util@npm:5.0.2" + dependencies: + "@ethereumjs/util": ^8.0.0 + bn.js: ^4.11.8 + ethereum-cryptography: ^1.1.2 + ethjs-util: ^0.1.6 + tweetnacl: ^1.0.3 + tweetnacl-util: ^0.15.1 + checksum: 1fbf1a0f5e654058f0219c9018dbebadf53036c9c3b47c8faf1cac54816532bb18996821736f526ac4e3d579afcaf502af4ad07e88158a50f015141858b08a90 + languageName: node + linkType: hard + +"@metamask/eth-simple-keyring@npm:^5.0.0": + version: 5.0.0 + resolution: "@metamask/eth-simple-keyring@npm:5.0.0" + dependencies: + "@ethereumjs/util": ^8.0.0 + "@metamask/eth-sig-util": ^5.0.1 + ethereum-cryptography: ^1.1.2 + randombytes: ^2.1.0 + checksum: 6fd05173531b84f6fb816b90ab8cfb176ac3300f07daa51c4adac673fa17dbcc6ce1ebdf064b9f66549f37476bbc54eb2dd9d28935d57654ef62b935a1e31e1d + languageName: node + linkType: hard + +"@noble/hashes@npm:1.1.2": + version: 1.1.2 + resolution: "@noble/hashes@npm:1.1.2" + checksum: 3c2a8cb7c2e053811032f242155d870c5eb98844d924d69702244d48804cb03b42d4a666c49c2b71164420d8229cb9a6f242b972d50d5bb2f1d673b98b041de2 + languageName: node + linkType: hard + +"@noble/hashes@npm:~1.1.1": + version: 1.1.4 + resolution: "@noble/hashes@npm:1.1.4" + checksum: 663c1e7ebaa3ca4ff836c799a9dd697fda861ae8b9923a4850659fbf5c3d5f7cf541e77aee3c1bcc6f81a815b7f88fad75c004c0f30eda301deeedc2c9435368 + languageName: node + linkType: hard + +"@noble/secp256k1@npm:1.6.3, @noble/secp256k1@npm:~1.6.0": + version: 1.6.3 + resolution: "@noble/secp256k1@npm:1.6.3" + checksum: 16eb3242533e645deb64444c771515f66bdc2ee0759894efd42fdeed4ab226ed29827aaaf6caa27d3d95b831452fd4246aa1007cd688aa462ad48fc084ab76e6 + languageName: node + linkType: hard + "@nodelib/fs.scandir@npm:2.1.5": version: 2.1.5 resolution: "@nodelib/fs.scandir@npm:2.1.5" @@ -884,6 +951,34 @@ __metadata: languageName: node linkType: hard +"@scure/base@npm:~1.1.0": + version: 1.1.1 + resolution: "@scure/base@npm:1.1.1" + checksum: b4fc810b492693e7e8d0107313ac74c3646970c198bbe26d7332820886fa4f09441991023ec9aa3a2a51246b74409ab5ebae2e8ef148bbc253da79ac49130309 + languageName: node + linkType: hard + +"@scure/bip32@npm:1.1.0": + version: 1.1.0 + resolution: "@scure/bip32@npm:1.1.0" + dependencies: + "@noble/hashes": ~1.1.1 + "@noble/secp256k1": ~1.6.0 + "@scure/base": ~1.1.0 + checksum: e6102ab9038896861fca5628b8a97f3c4cb24a073cc9f333c71c747037d82e4423d1d111fd282ba212efaf73cbc5875702567fb4cf13b5f0eb23a5bab402e37e + languageName: node + linkType: hard + +"@scure/bip39@npm:1.1.0": + version: 1.1.0 + resolution: "@scure/bip39@npm:1.1.0" + dependencies: + "@noble/hashes": ~1.1.1 + "@scure/base": ~1.1.0 + checksum: c4361406f092a45e511dc572c89f497af6665ad81cb3fd7bf78e6772f357f7ae885e129ef0b985cb3496a460b4811318f77bc61634d9b0a8446079a801b6003c + languageName: node + linkType: hard + "@sinonjs/commons@npm:^1.6.0, @sinonjs/commons@npm:^1.8.3": version: 1.8.3 resolution: "@sinonjs/commons@npm:1.8.3" @@ -1502,6 +1597,13 @@ __metadata: languageName: node linkType: hard +"async@npm:^3.2.4": + version: 3.2.4 + resolution: "async@npm:3.2.4" + checksum: 43d07459a4e1d09b84a20772414aa684ff4de085cbcaec6eea3c7a8f8150e8c62aa6cd4e699fe8ee93c3a5b324e777d34642531875a0817a35697522c1b02e89 + languageName: node + linkType: hard + "asynckit@npm:^0.4.0": version: 0.4.0 resolution: "asynckit@npm:0.4.0" @@ -2754,6 +2856,7 @@ __metadata: "@metamask/eslint-config-jest": ^7.0.0 "@metamask/eslint-config-nodejs": ^7.0.1 "@metamask/eth-hd-keyring": ^4.0.2 + "@metamask/eth-simple-keyring": ^5.0.0 eslint: ^7.29.0 eslint-config-prettier: ^8.3.0 eslint-plugin-import: ^2.23.4 @@ -2761,7 +2864,6 @@ __metadata: eslint-plugin-node: ^11.1.0 eslint-plugin-prettier: ^3.4.0 eth-sig-util: ^3.0.1 - eth-simple-keyring: ^4.2.0 ethereumjs-wallet: ^1.0.1 jest: ^27.0.6 obs-store: ^4.0.3 @@ -2818,6 +2920,18 @@ __metadata: languageName: node linkType: hard +"ethereum-cryptography@npm:^1.1.2": + version: 1.1.2 + resolution: "ethereum-cryptography@npm:1.1.2" + dependencies: + "@noble/hashes": 1.1.2 + "@noble/secp256k1": 1.6.3 + "@scure/bip32": 1.1.0 + "@scure/bip39": 1.1.0 + checksum: 0ef55f141acad45b1ba1db58ce3d487155eb2d0b14a77b3959167a36ad324f46762873257def75e7f00dbe8ac78aabc323d2207830f85e63a42a1fb67063a6ba + languageName: node + linkType: hard + "ethereumjs-abi@npm:^0.6.8": version: 0.6.8 resolution: "ethereumjs-abi@npm:0.6.8"