From 2d08c2d290b977c2c74ee3aabcc1eec85d1dfd10 Mon Sep 17 00:00:00 2001
From: Jongsun Suh <jongsun.suh@icloud.com>
Date: Thu, 11 Jan 2024 10:48:41 -0500
Subject: [PATCH] [assets-controllers] Install `{accounts,keyring}-controller`
 as deps and peerDeps

---
 packages/assets-controllers/package.json        | 4 ++++
 packages/assets-controllers/tsconfig.build.json | 2 ++
 packages/assets-controllers/tsconfig.json       | 2 ++
 yarn.lock                                       | 6 +++++-
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/packages/assets-controllers/package.json b/packages/assets-controllers/package.json
index 23b82e5dba1..5d94618938c 100644
--- a/packages/assets-controllers/package.json
+++ b/packages/assets-controllers/package.json
@@ -36,11 +36,13 @@
     "@ethersproject/contracts": "^5.7.0",
     "@ethersproject/providers": "^5.7.0",
     "@metamask/abi-utils": "^2.0.2",
+    "@metamask/accounts-controller": "^10.0.0",
     "@metamask/approval-controller": "^5.1.2",
     "@metamask/base-controller": "^4.1.1",
     "@metamask/contract-metadata": "^2.4.0",
     "@metamask/controller-utils": "^8.0.2",
     "@metamask/eth-query": "^4.0.0",
+    "@metamask/keyring-controller": "^12.2.0",
     "@metamask/metamask-eth-abis": "3.0.0",
     "@metamask/network-controller": "^17.2.0",
     "@metamask/polling-controller": "^5.0.0",
@@ -73,7 +75,9 @@
     "typescript": "~4.8.4"
   },
   "peerDependencies": {
+    "@metamask/accounts-controller": "^10.0.0",
     "@metamask/approval-controller": "^5.1.2",
+    "@metamask/keyring-controller": "^12.2.0",
     "@metamask/network-controller": "^17.2.0",
     "@metamask/preferences-controller": "^7.0.0"
   },
diff --git a/packages/assets-controllers/tsconfig.build.json b/packages/assets-controllers/tsconfig.build.json
index 93737886c16..5d38b996867 100644
--- a/packages/assets-controllers/tsconfig.build.json
+++ b/packages/assets-controllers/tsconfig.build.json
@@ -6,9 +6,11 @@
     "rootDir": "./src"
   },
   "references": [
+    { "path": "../accounts-controller/tsconfig.build.json" },
     { "path": "../approval-controller/tsconfig.build.json" },
     { "path": "../base-controller/tsconfig.build.json" },
     { "path": "../controller-utils/tsconfig.build.json" },
+    { "path": "../keyring-controller/tsconfig.build.json" },
     { "path": "../network-controller/tsconfig.build.json" },
     { "path": "../preferences-controller/tsconfig.build.json" },
     { "path": "../polling-controller/tsconfig.build.json" }
diff --git a/packages/assets-controllers/tsconfig.json b/packages/assets-controllers/tsconfig.json
index 0dba0b3a1de..05bd347469b 100644
--- a/packages/assets-controllers/tsconfig.json
+++ b/packages/assets-controllers/tsconfig.json
@@ -5,9 +5,11 @@
     "rootDir": "../.."
   },
   "references": [
+    { "path": "../accounts-controller" },
     { "path": "../approval-controller" },
     { "path": "../base-controller" },
     { "path": "../controller-utils" },
+    { "path": "../keyring-controller" },
     { "path": "../network-controller" },
     { "path": "../preferences-controller" },
     { "path": "../polling-controller" }
diff --git a/yarn.lock b/yarn.lock
index 742aa45ffc3..a9f6bb30a41 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1468,7 +1468,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/accounts-controller@workspace:packages/accounts-controller":
+"@metamask/accounts-controller@^10.0.0, @metamask/accounts-controller@workspace:packages/accounts-controller":
   version: 0.0.0-use.local
   resolution: "@metamask/accounts-controller@workspace:packages/accounts-controller"
   dependencies:
@@ -1572,6 +1572,7 @@ __metadata:
     "@ethersproject/contracts": ^5.7.0
     "@ethersproject/providers": ^5.7.0
     "@metamask/abi-utils": ^2.0.2
+    "@metamask/accounts-controller": ^10.0.0
     "@metamask/approval-controller": ^5.1.2
     "@metamask/auto-changelog": ^3.4.4
     "@metamask/base-controller": ^4.1.1
@@ -1579,6 +1580,7 @@ __metadata:
     "@metamask/controller-utils": ^8.0.2
     "@metamask/eth-query": ^4.0.0
     "@metamask/ethjs-provider-http": ^0.2.0
+    "@metamask/keyring-controller": ^12.2.0
     "@metamask/metamask-eth-abis": 3.0.0
     "@metamask/network-controller": ^17.2.0
     "@metamask/polling-controller": ^5.0.0
@@ -1606,7 +1608,9 @@ __metadata:
     typescript: ~4.8.4
     uuid: ^8.3.2
   peerDependencies:
+    "@metamask/accounts-controller": ^10.0.0
     "@metamask/approval-controller": ^5.1.2
+    "@metamask/keyring-controller": ^12.2.0
     "@metamask/network-controller": ^17.2.0
     "@metamask/preferences-controller": ^7.0.0
   languageName: unknown