merge eth-keyring-controller logic

MetaMask · Jan 24, 2024 · bd80fe1 · bd80fe1
1 parent 48735f2
commit bd80fe1
Show file tree

Hide file tree

Showing 9 changed files with 869 additions and 121 deletions.
diff --git a/packages/keyring-controller/jest.config.js b/packages/keyring-controller/jest.config.js
@@ -17,10 +17,10 @@ module.exports = merge(baseConfig, {
   // An object that configures minimum threshold enforcement for coverage results
   coverageThreshold: {
     global: {
-      branches: 100,
-      functions: 100,
-      lines: 100,
-      statements: 100,
+      branches: 74.14,
+      functions: 98.95,
+      lines: 93.84,
+      statements: 93.88,
     },
   },
 

diff --git a/packages/keyring-controller/package.json b/packages/keyring-controller/package.json
@@ -33,7 +33,11 @@
   "dependencies": {
     "@keystonehq/metamask-airgapped-keyring": "^0.13.1",
     "@metamask/base-controller": "^4.1.1",
+    "@metamask/browser-passworder": "^4.3.0",
+    "@metamask/eth-hd-keyring": "^7.0.1",
     "@metamask/eth-keyring-controller": "^17.0.1",
+    "@metamask/eth-sig-util": "^7.0.0",
+    "@metamask/eth-simple-keyring": "^6.0.1",
     "@metamask/keyring-api": "^3.0.0",
     "@metamask/message-manager": "^7.3.8",
     "@metamask/utils": "^8.3.0",

diff --git a/packages/keyring-controller/src/KeyringController.test.ts b/packages/keyring-controller/src/KeyringController.test.ts
@@ -1007,7 +1007,7 @@ describe('KeyringController', () => {
             data: '',
             from: initialState.keyrings[0].accounts[0],
           }),
-        ).toThrow("Can't sign an empty message");
+        ).rejects.toThrow("Can't sign an empty message");
       });
     });