From 6d1be9586f9ccf72029f8f8a0e8d86a3fbc30a0f Mon Sep 17 00:00:00 2001
From: Charly Chevalier <charly.chevalier@consensys.net>
Date: Tue, 10 Dec 2024 17:36:49 +0100
Subject: [PATCH 1/8] refactor: move deps to devDeps for types + use peerDep
 for keyring-api

---
 .depcheckrc.yml                               |  2 --
 README.md                                     |  8 +++---
 packages/keyring-api/package.json             |  1 -
 packages/keyring-eth-hd/package.json          |  3 ++-
 packages/keyring-eth-trezor/package.json      |  7 ++++--
 packages/keyring-internal-api/package.json    |  5 +++-
 .../keyring-internal-snap-client/package.json | 17 ++++++-------
 packages/keyring-snap-bridge/package.json     | 22 +++++++---------
 .../keyring-snap-bridge/src/SnapKeyring.ts    |  2 +-
 packages/keyring-snap-client/package.json     | 10 +++-----
 packages/keyring-snap-sdk/package.json        | 10 ++++----
 yarn.lock                                     | 25 ++++++-------------
 12 files changed, 48 insertions(+), 64 deletions(-)

diff --git a/.depcheckrc.yml b/.depcheckrc.yml
index 277d274e..3cb4e0c4 100644
--- a/.depcheckrc.yml
+++ b/.depcheckrc.yml
@@ -9,8 +9,6 @@ ignores:
   - 'tsd'
   # Ignore dependencies imported implicitly by TypeScript
   - '@types/*'
-  # Ignore peer dependencies that appears unused, but are required
-  - 'webextension-polyfill'
   # Ignore tools (packages which we use as executables and not libraries)
   - 'rimraf'
   - '@lavamoat/allow-scripts'
diff --git a/README.md b/README.md
index 50c7d3a9..1526708e 100644
--- a/README.md
+++ b/README.md
@@ -46,17 +46,17 @@ linkStyle default opacity:0.5
   keyring_snap_sdk(["@metamask/keyring-snap-sdk"]);
   keyring_utils(["@metamask/keyring-utils"]);
   keyring_api --> keyring_utils;
-  keyring_internal_api --> keyring_api;
   keyring_internal_api --> keyring_utils;
-  keyring_internal_snap_client --> keyring_api;
+  keyring_internal_api --> keyring_api;
   keyring_internal_snap_client --> keyring_snap_client;
   keyring_internal_snap_client --> keyring_utils;
-  eth_snap_keyring --> keyring_api;
+  keyring_internal_snap_client --> keyring_api;
   eth_snap_keyring --> keyring_internal_api;
   eth_snap_keyring --> keyring_internal_snap_client;
   eth_snap_keyring --> keyring_utils;
-  keyring_snap_client --> keyring_api;
+  eth_snap_keyring --> keyring_api;
   keyring_snap_client --> keyring_utils;
+  keyring_snap_client --> keyring_api;
   keyring_snap_sdk --> keyring_utils;
   keyring_snap_sdk --> keyring_api;
 ```
diff --git a/packages/keyring-api/package.json b/packages/keyring-api/package.json
index 3a9832b5..a3ccf7bf 100644
--- a/packages/keyring-api/package.json
+++ b/packages/keyring-api/package.json
@@ -59,7 +59,6 @@
     "@ts-bridge/cli": "^0.6.1",
     "@types/jest": "^29.5.12",
     "@types/node": "^20.12.12",
-    "@types/webextension-polyfill": "^0.12.1",
     "deepmerge": "^4.2.2",
     "depcheck": "^1.4.7",
     "jest": "^29.5.0",
diff --git a/packages/keyring-eth-hd/package.json b/packages/keyring-eth-hd/package.json
index 173437d2..6f486a44 100644
--- a/packages/keyring-eth-hd/package.json
+++ b/packages/keyring-eth-hd/package.json
@@ -61,7 +61,8 @@
     "@ts-bridge/cli": "^0.6.1",
     "@types/jest": "^29.5.12",
     "deepmerge": "^4.2.2",
-    "jest": "^29.5.0"
+    "jest": "^29.5.0",
+    "typescript": "~5.6.3"
   },
   "engines": {
     "node": "^18.18 || >=20"
diff --git a/packages/keyring-eth-trezor/package.json b/packages/keyring-eth-trezor/package.json
index d5f68ff2..ab813da8 100644
--- a/packages/keyring-eth-trezor/package.json
+++ b/packages/keyring-eth-trezor/package.json
@@ -52,8 +52,7 @@
     "@metamask/eth-sig-util": "^8.1.2",
     "@trezor/connect-plugin-ethereum": "^9.0.3",
     "@trezor/connect-web": "^9.1.11",
-    "hdkey": "^2.1.0",
-    "tslib": "^2.6.2"
+    "hdkey": "^2.1.0"
   },
   "devDependencies": {
     "@ethereumjs/common": "^3.2.0",
@@ -76,9 +75,13 @@
     "sinon": "^19.0.2",
     "ts-jest": "^29.0.5",
     "ts-node": "^10.9.2",
+    "tslib": "^2.6.2",
     "typedoc": "^0.25.13",
     "typescript": "~5.6.3"
   },
+  "peerDependencies": {
+    "tslib": "^2.6.2"
+  },
   "engines": {
     "node": "^18.18 || >=20"
   },
diff --git a/packages/keyring-internal-api/package.json b/packages/keyring-internal-api/package.json
index 25e32834..5aaabece 100644
--- a/packages/keyring-internal-api/package.json
+++ b/packages/keyring-internal-api/package.json
@@ -45,7 +45,6 @@
     "test:watch": "jest --watch"
   },
   "dependencies": {
-    "@metamask/keyring-api": "workspace:^",
     "@metamask/keyring-utils": "workspace:^",
     "@metamask/superstruct": "^3.1.0",
     "@metamask/utils": "^11.0.1"
@@ -54,6 +53,7 @@
     "@lavamoat/allow-scripts": "^3.2.1",
     "@lavamoat/preinstall-always-fail": "^2.1.0",
     "@metamask/auto-changelog": "^3.4.4",
+    "@metamask/keyring-api": "workspace:^",
     "@ts-bridge/cli": "^0.6.1",
     "@types/jest": "^29.5.12",
     "@types/node": "^20.12.12",
@@ -68,6 +68,9 @@
     "typedoc": "^0.25.13",
     "typescript": "~5.6.3"
   },
+  "peerDependencies": {
+    "@metamask/keyring-api": "workspace:^"
+  },
   "engines": {
     "node": "^18.18 || >=20"
   },
diff --git a/packages/keyring-internal-snap-client/package.json b/packages/keyring-internal-snap-client/package.json
index a50f9b48..487bebdd 100644
--- a/packages/keyring-internal-snap-client/package.json
+++ b/packages/keyring-internal-snap-client/package.json
@@ -45,19 +45,18 @@
     "test:watch": "jest --watch"
   },
   "dependencies": {
-    "@metamask/keyring-api": "workspace:^",
     "@metamask/keyring-snap-client": "workspace:^",
-    "@metamask/keyring-utils": "workspace:^",
-    "@metamask/snaps-controllers": "^9.10.0",
-    "@metamask/snaps-sdk": "^6.7.0",
-    "@metamask/snaps-utils": "^8.3.0",
-    "webextension-polyfill": "^0.12.0"
+    "@metamask/keyring-utils": "workspace:^"
   },
   "devDependencies": {
     "@lavamoat/allow-scripts": "^3.2.1",
     "@lavamoat/preinstall-always-fail": "^2.1.0",
     "@metamask/auto-changelog": "^3.4.4",
+    "@metamask/keyring-api": "workspace:^",
     "@metamask/providers": "^18.3.1",
+    "@metamask/snaps-controllers": "^9.10.0",
+    "@metamask/snaps-sdk": "^6.7.0",
+    "@metamask/snaps-utils": "^8.3.0",
     "@metamask/utils": "^11.0.1",
     "@ts-bridge/cli": "^0.6.1",
     "@types/jest": "^29.5.12",
@@ -71,10 +70,8 @@
     "ts-node": "^10.9.2",
     "tsd": "^0.31.0",
     "typedoc": "^0.25.13",
-    "typescript": "~5.6.3"
-  },
-  "peerDependencies": {
-    "@metamask/providers": "^18.3.1"
+    "typescript": "~5.6.3",
+    "webextension-polyfill": "^0.12.0"
   },
   "engines": {
     "node": "^18.18 || >=20"
diff --git a/packages/keyring-snap-bridge/package.json b/packages/keyring-snap-bridge/package.json
index 70e94867..a13f88ff 100644
--- a/packages/keyring-snap-bridge/package.json
+++ b/packages/keyring-snap-bridge/package.json
@@ -39,27 +39,23 @@
   "dependencies": {
     "@ethereumjs/tx": "^4.2.0",
     "@metamask/eth-sig-util": "^8.1.2",
-    "@metamask/keyring-api": "workspace:^",
     "@metamask/keyring-internal-api": "workspace:^",
     "@metamask/keyring-internal-snap-client": "workspace:^",
     "@metamask/keyring-utils": "workspace:^",
-    "@metamask/snaps-controllers": "^9.10.0",
-    "@metamask/snaps-sdk": "^6.7.0",
-    "@metamask/snaps-utils": "^8.3.0",
     "@metamask/superstruct": "^3.1.0",
     "@metamask/utils": "^11.0.1",
-    "@types/uuid": "^9.0.8",
-    "uuid": "^9.0.1",
-    "webextension-polyfill": "^0.12.0"
+    "uuid": "^9.0.1"
   },
   "devDependencies": {
-    "@lavamoat/allow-scripts": "^3.2.1",
-    "@lavamoat/preinstall-always-fail": "^2.1.0",
-    "@metamask/auto-changelog": "^3.4.4",
+    "@metamask/keyring-api": "workspace:^",
     "@metamask/providers": "^18.3.1",
+    "@metamask/snaps-controllers": "^9.10.0",
+    "@metamask/snaps-sdk": "^6.7.0",
+    "@metamask/snaps-utils": "^8.3.0",
     "@ts-bridge/cli": "^0.6.1",
     "@types/jest": "^29.5.12",
     "@types/node": "^20.12.12",
+    "@types/uuid": "^9.0.8",
     "deepmerge": "^4.2.2",
     "depcheck": "^1.4.7",
     "jest": "^29.5.0",
@@ -68,11 +64,11 @@
     "ts-node": "^10.9.2",
     "tsd": "^0.31.0",
     "typedoc": "^0.25.13",
-    "typescript": "~5.6.3"
+    "typescript": "~5.6.3",
+    "webextension-polyfill": "^0.12.0"
   },
   "peerDependencies": {
-    "@metamask/keyring-api": "workspace:^",
-    "@metamask/providers": "^18.3.1"
+    "@metamask/keyring-api": "workspace:^"
   },
   "engines": {
     "node": "^18.18 || >=20"
diff --git a/packages/keyring-snap-bridge/src/SnapKeyring.ts b/packages/keyring-snap-bridge/src/SnapKeyring.ts
index 68dd7800..2014192f 100644
--- a/packages/keyring-snap-bridge/src/SnapKeyring.ts
+++ b/packages/keyring-snap-bridge/src/SnapKeyring.ts
@@ -29,7 +29,7 @@ import { KeyringSnapControllerClient } from '@metamask/keyring-internal-snap-cli
 import { strictMask } from '@metamask/keyring-utils';
 import type { SnapController } from '@metamask/snaps-controllers';
 import type { SnapId } from '@metamask/snaps-sdk';
-import { type Snap } from '@metamask/snaps-utils';
+import type { Snap } from '@metamask/snaps-utils';
 import { assert, mask, object, string } from '@metamask/superstruct';
 import type { Json } from '@metamask/utils';
 import {
diff --git a/packages/keyring-snap-client/package.json b/packages/keyring-snap-client/package.json
index ef364ac4..557acfbf 100644
--- a/packages/keyring-snap-client/package.json
+++ b/packages/keyring-snap-client/package.json
@@ -45,22 +45,20 @@
     "test:watch": "jest --watch"
   },
   "dependencies": {
-    "@metamask/keyring-api": "workspace:^",
     "@metamask/keyring-utils": "workspace:^",
     "@metamask/superstruct": "^3.1.0",
-    "@types/uuid": "^9.0.8",
-    "uuid": "^9.0.1",
-    "webextension-polyfill": "^0.12.0"
+    "uuid": "^9.0.1"
   },
   "devDependencies": {
     "@lavamoat/allow-scripts": "^3.2.1",
     "@lavamoat/preinstall-always-fail": "^2.1.0",
     "@metamask/auto-changelog": "^3.4.4",
-    "@metamask/providers": "^18.3.1",
+    "@metamask/keyring-api": "workspace:^",
     "@metamask/utils": "^11.0.1",
     "@ts-bridge/cli": "^0.6.1",
     "@types/jest": "^29.5.12",
     "@types/node": "^20.12.12",
+    "@types/uuid": "^9.0.8",
     "deepmerge": "^4.2.2",
     "depcheck": "^1.4.7",
     "jest": "^29.5.0",
@@ -73,7 +71,7 @@
     "typescript": "~5.6.3"
   },
   "peerDependencies": {
-    "@metamask/providers": "^18.3.1"
+    "@metamask/keyring-api": "workspace:^"
   },
   "engines": {
     "node": "^18.18 || >=20"
diff --git a/packages/keyring-snap-sdk/package.json b/packages/keyring-snap-sdk/package.json
index 24df5c01..c2f64cc7 100644
--- a/packages/keyring-snap-sdk/package.json
+++ b/packages/keyring-snap-sdk/package.json
@@ -46,10 +46,8 @@
   },
   "dependencies": {
     "@metamask/keyring-utils": "workspace:^",
-    "@metamask/snaps-sdk": "^6.7.0",
     "@metamask/superstruct": "^3.1.0",
-    "@metamask/utils": "^11.0.1",
-    "webextension-polyfill": "^0.12.0"
+    "@metamask/utils": "^11.0.1"
   },
   "devDependencies": {
     "@lavamoat/allow-scripts": "^3.2.1",
@@ -57,6 +55,7 @@
     "@metamask/auto-changelog": "^3.4.4",
     "@metamask/keyring-api": "workspace:^",
     "@metamask/providers": "^18.3.1",
+    "@metamask/snaps-sdk": "^6.7.0",
     "@ts-bridge/cli": "^0.6.1",
     "@types/jest": "^29.5.12",
     "@types/node": "^20.12.12",
@@ -69,10 +68,11 @@
     "ts-node": "^10.9.2",
     "tsd": "^0.31.0",
     "typedoc": "^0.25.13",
-    "typescript": "~5.6.3"
+    "typescript": "~5.6.3",
+    "webextension-polyfill": "^0.12.0"
   },
   "peerDependencies": {
-    "@metamask/providers": "^18.3.1"
+    "@metamask/keyring-api": "workspace:^"
   },
   "engines": {
     "node": "^18.18 || >=20"
diff --git a/yarn.lock b/yarn.lock
index cdbd90d7..ffd115bc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1883,6 +1883,7 @@ __metadata:
     deepmerge: "npm:^4.2.2"
     ethereum-cryptography: "npm:^2.1.2"
     jest: "npm:^29.5.0"
+    typescript: "npm:~5.6.3"
   languageName: unknown
   linkType: soft
 
@@ -1994,9 +1995,6 @@ __metadata:
   resolution: "@metamask/eth-snap-keyring@workspace:packages/keyring-snap-bridge"
   dependencies:
     "@ethereumjs/tx": "npm:^4.2.0"
-    "@lavamoat/allow-scripts": "npm:^3.2.1"
-    "@lavamoat/preinstall-always-fail": "npm:^2.1.0"
-    "@metamask/auto-changelog": "npm:^3.4.4"
     "@metamask/eth-sig-util": "npm:^8.1.2"
     "@metamask/keyring-api": "workspace:^"
     "@metamask/keyring-internal-api": "workspace:^"
@@ -2025,7 +2023,6 @@ __metadata:
     webextension-polyfill: "npm:^0.12.0"
   peerDependencies:
     "@metamask/keyring-api": "workspace:^"
-    "@metamask/providers": ^18.3.1
   languageName: unknown
   linkType: soft
 
@@ -2062,6 +2059,8 @@ __metadata:
     tslib: "npm:^2.6.2"
     typedoc: "npm:^0.25.13"
     typescript: "npm:~5.6.3"
+  peerDependencies:
+    tslib: ^2.6.2
   languageName: unknown
   linkType: soft
 
@@ -2150,7 +2149,6 @@ __metadata:
     "@ts-bridge/cli": "npm:^0.6.1"
     "@types/jest": "npm:^29.5.12"
     "@types/node": "npm:^20.12.12"
-    "@types/webextension-polyfill": "npm:^0.12.1"
     bech32: "npm:^2.0.0"
     deepmerge: "npm:^4.2.2"
     depcheck: "npm:^1.4.7"
@@ -2188,6 +2186,8 @@ __metadata:
     tsd: "npm:^0.31.0"
     typedoc: "npm:^0.25.13"
     typescript: "npm:~5.6.3"
+  peerDependencies:
+    "@metamask/keyring-api": "workspace:^"
   languageName: unknown
   linkType: soft
 
@@ -2220,8 +2220,6 @@ __metadata:
     typedoc: "npm:^0.25.13"
     typescript: "npm:~5.6.3"
     webextension-polyfill: "npm:^0.12.0"
-  peerDependencies:
-    "@metamask/providers": ^18.3.1
   languageName: unknown
   linkType: soft
 
@@ -2234,7 +2232,6 @@ __metadata:
     "@metamask/auto-changelog": "npm:^3.4.4"
     "@metamask/keyring-api": "workspace:^"
     "@metamask/keyring-utils": "workspace:^"
-    "@metamask/providers": "npm:^18.3.1"
     "@metamask/superstruct": "npm:^3.1.0"
     "@metamask/utils": "npm:^11.0.1"
     "@ts-bridge/cli": "npm:^0.6.1"
@@ -2252,9 +2249,8 @@ __metadata:
     typedoc: "npm:^0.25.13"
     typescript: "npm:~5.6.3"
     uuid: "npm:^9.0.1"
-    webextension-polyfill: "npm:^0.12.0"
   peerDependencies:
-    "@metamask/providers": ^18.3.1
+    "@metamask/keyring-api": "workspace:^"
   languageName: unknown
   linkType: soft
 
@@ -2286,7 +2282,7 @@ __metadata:
     typescript: "npm:~5.6.3"
     webextension-polyfill: "npm:^0.12.0"
   peerDependencies:
-    "@metamask/providers": ^18.3.1
+    "@metamask/keyring-api": "workspace:^"
   languageName: unknown
   linkType: soft
 
@@ -3678,13 +3674,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/webextension-polyfill@npm:^0.12.1":
-  version: 0.12.1
-  resolution: "@types/webextension-polyfill@npm:0.12.1"
-  checksum: 10/80c1f81af272d378098474a41e0941bf9375261423ea289cd8250efc9a628cec4fa6083cb9cd5c62ff0f828ac235a044c0b95543c0606e894dfd485cea55b0aa
-  languageName: node
-  linkType: hard
-
 "@types/ws@npm:^7.2.0, @types/ws@npm:^7.4.4":
   version: 7.4.7
   resolution: "@types/ws@npm:7.4.7"

From c440dc859515fafdfe0a59626fc0ddca8d43542b Mon Sep 17 00:00:00 2001
From: Charly Chevalier <charly.chevalier@consensys.net>
Date: Mon, 20 Jan 2025 11:55:59 +0100
Subject: [PATCH 2/8] chore: re-introduce snaps-* runtime deps

---
 packages/keyring-internal-snap-client/package.json | 12 ++++++++----
 packages/keyring-snap-bridge/package.json          | 10 ++++++----
 packages/keyring-snap-sdk/package.json             |  6 ++++--
 yarn.lock                                          |  7 +++++++
 4 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/packages/keyring-internal-snap-client/package.json b/packages/keyring-internal-snap-client/package.json
index 487bebdd..3e716304 100644
--- a/packages/keyring-internal-snap-client/package.json
+++ b/packages/keyring-internal-snap-client/package.json
@@ -46,7 +46,10 @@
   },
   "dependencies": {
     "@metamask/keyring-snap-client": "workspace:^",
-    "@metamask/keyring-utils": "workspace:^"
+    "@metamask/keyring-utils": "workspace:^",
+    "@metamask/snaps-controllers": "^9.10.0",
+    "@metamask/snaps-sdk": "^6.7.0",
+    "@metamask/snaps-utils": "^8.3.0"
   },
   "devDependencies": {
     "@lavamoat/allow-scripts": "^3.2.1",
@@ -54,9 +57,6 @@
     "@metamask/auto-changelog": "^3.4.4",
     "@metamask/keyring-api": "workspace:^",
     "@metamask/providers": "^18.3.1",
-    "@metamask/snaps-controllers": "^9.10.0",
-    "@metamask/snaps-sdk": "^6.7.0",
-    "@metamask/snaps-utils": "^8.3.0",
     "@metamask/utils": "^11.0.1",
     "@ts-bridge/cli": "^0.6.1",
     "@types/jest": "^29.5.12",
@@ -73,6 +73,10 @@
     "typescript": "~5.6.3",
     "webextension-polyfill": "^0.12.0"
   },
+  "peerDependencies": {
+    "@metamask/providers": "^18.3.1",
+    "webextension-polyfill": "^0.10.0 || ^0.11.0 || ^0.12.0"
+  },
   "engines": {
     "node": "^18.18 || >=20"
   },
diff --git a/packages/keyring-snap-bridge/package.json b/packages/keyring-snap-bridge/package.json
index a13f88ff..9a2d1183 100644
--- a/packages/keyring-snap-bridge/package.json
+++ b/packages/keyring-snap-bridge/package.json
@@ -42,6 +42,9 @@
     "@metamask/keyring-internal-api": "workspace:^",
     "@metamask/keyring-internal-snap-client": "workspace:^",
     "@metamask/keyring-utils": "workspace:^",
+    "@metamask/snaps-controllers": "^9.10.0",
+    "@metamask/snaps-sdk": "^6.7.0",
+    "@metamask/snaps-utils": "^8.3.0",
     "@metamask/superstruct": "^3.1.0",
     "@metamask/utils": "^11.0.1",
     "uuid": "^9.0.1"
@@ -49,9 +52,6 @@
   "devDependencies": {
     "@metamask/keyring-api": "workspace:^",
     "@metamask/providers": "^18.3.1",
-    "@metamask/snaps-controllers": "^9.10.0",
-    "@metamask/snaps-sdk": "^6.7.0",
-    "@metamask/snaps-utils": "^8.3.0",
     "@ts-bridge/cli": "^0.6.1",
     "@types/jest": "^29.5.12",
     "@types/node": "^20.12.12",
@@ -68,7 +68,9 @@
     "webextension-polyfill": "^0.12.0"
   },
   "peerDependencies": {
-    "@metamask/keyring-api": "workspace:^"
+    "@metamask/keyring-api": "workspace:^",
+    "@metamask/providers": "^18.3.1",
+    "webextension-polyfill": "^0.10.0 || ^0.11.0 || ^0.12.0"
   },
   "engines": {
     "node": "^18.18 || >=20"
diff --git a/packages/keyring-snap-sdk/package.json b/packages/keyring-snap-sdk/package.json
index c2f64cc7..4820921c 100644
--- a/packages/keyring-snap-sdk/package.json
+++ b/packages/keyring-snap-sdk/package.json
@@ -46,6 +46,7 @@
   },
   "dependencies": {
     "@metamask/keyring-utils": "workspace:^",
+    "@metamask/snaps-sdk": "^6.7.0",
     "@metamask/superstruct": "^3.1.0",
     "@metamask/utils": "^11.0.1"
   },
@@ -55,7 +56,6 @@
     "@metamask/auto-changelog": "^3.4.4",
     "@metamask/keyring-api": "workspace:^",
     "@metamask/providers": "^18.3.1",
-    "@metamask/snaps-sdk": "^6.7.0",
     "@ts-bridge/cli": "^0.6.1",
     "@types/jest": "^29.5.12",
     "@types/node": "^20.12.12",
@@ -72,7 +72,9 @@
     "webextension-polyfill": "^0.12.0"
   },
   "peerDependencies": {
-    "@metamask/keyring-api": "workspace:^"
+    "@metamask/keyring-api": "workspace:^",
+    "@metamask/providers": "^18.3.1",
+    "webextension-polyfill": "^0.10.0 || ^0.11.0 || ^0.12.0"
   },
   "engines": {
     "node": "^18.18 || >=20"
diff --git a/yarn.lock b/yarn.lock
index ffd115bc..9640931f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2023,6 +2023,8 @@ __metadata:
     webextension-polyfill: "npm:^0.12.0"
   peerDependencies:
     "@metamask/keyring-api": "workspace:^"
+    "@metamask/providers": ^18.3.1
+    webextension-polyfill: ^0.10.0 || ^0.11.0 || ^0.12.0
   languageName: unknown
   linkType: soft
 
@@ -2220,6 +2222,9 @@ __metadata:
     typedoc: "npm:^0.25.13"
     typescript: "npm:~5.6.3"
     webextension-polyfill: "npm:^0.12.0"
+  peerDependencies:
+    "@metamask/providers": ^18.3.1
+    webextension-polyfill: ^0.10.0 || ^0.11.0 || ^0.12.0
   languageName: unknown
   linkType: soft
 
@@ -2283,6 +2288,8 @@ __metadata:
     webextension-polyfill: "npm:^0.12.0"
   peerDependencies:
     "@metamask/keyring-api": "workspace:^"
+    "@metamask/providers": ^18.3.1
+    webextension-polyfill: ^0.10.0 || ^0.11.0 || ^0.12.0
   languageName: unknown
   linkType: soft
 

From 0a0d43395915677ea0af314aa311a114e6b03b3c Mon Sep 17 00:00:00 2001
From: Charly Chevalier <charly.chevalier@consensys.net>
Date: Mon, 20 Jan 2025 12:00:24 +0100
Subject: [PATCH 3/8] chore: force version for keyring-api peer dep

---
 packages/keyring-internal-api/package.json | 2 +-
 packages/keyring-snap-bridge/package.json  | 2 +-
 packages/keyring-snap-client/package.json  | 2 +-
 packages/keyring-snap-sdk/package.json     | 2 +-
 yarn.lock                                  | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/keyring-internal-api/package.json b/packages/keyring-internal-api/package.json
index 5aaabece..3016f651 100644
--- a/packages/keyring-internal-api/package.json
+++ b/packages/keyring-internal-api/package.json
@@ -69,7 +69,7 @@
     "typescript": "~5.6.3"
   },
   "peerDependencies": {
-    "@metamask/keyring-api": "workspace:^"
+    "@metamask/keyring-api": "^13.0.0"
   },
   "engines": {
     "node": "^18.18 || >=20"
diff --git a/packages/keyring-snap-bridge/package.json b/packages/keyring-snap-bridge/package.json
index 9a2d1183..48ad7d77 100644
--- a/packages/keyring-snap-bridge/package.json
+++ b/packages/keyring-snap-bridge/package.json
@@ -68,7 +68,7 @@
     "webextension-polyfill": "^0.12.0"
   },
   "peerDependencies": {
-    "@metamask/keyring-api": "workspace:^",
+    "@metamask/keyring-api": "^13.0.0",
     "@metamask/providers": "^18.3.1",
     "webextension-polyfill": "^0.10.0 || ^0.11.0 || ^0.12.0"
   },
diff --git a/packages/keyring-snap-client/package.json b/packages/keyring-snap-client/package.json
index 557acfbf..374ed9fd 100644
--- a/packages/keyring-snap-client/package.json
+++ b/packages/keyring-snap-client/package.json
@@ -71,7 +71,7 @@
     "typescript": "~5.6.3"
   },
   "peerDependencies": {
-    "@metamask/keyring-api": "workspace:^"
+    "@metamask/keyring-api": "^13.0.0"
   },
   "engines": {
     "node": "^18.18 || >=20"
diff --git a/packages/keyring-snap-sdk/package.json b/packages/keyring-snap-sdk/package.json
index 4820921c..45202a0a 100644
--- a/packages/keyring-snap-sdk/package.json
+++ b/packages/keyring-snap-sdk/package.json
@@ -72,7 +72,7 @@
     "webextension-polyfill": "^0.12.0"
   },
   "peerDependencies": {
-    "@metamask/keyring-api": "workspace:^",
+    "@metamask/keyring-api": "^13.0.0",
     "@metamask/providers": "^18.3.1",
     "webextension-polyfill": "^0.10.0 || ^0.11.0 || ^0.12.0"
   },
diff --git a/yarn.lock b/yarn.lock
index 9640931f..6fb972c3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2022,7 +2022,7 @@ __metadata:
     uuid: "npm:^9.0.1"
     webextension-polyfill: "npm:^0.12.0"
   peerDependencies:
-    "@metamask/keyring-api": "workspace:^"
+    "@metamask/keyring-api": ^13.0.0
     "@metamask/providers": ^18.3.1
     webextension-polyfill: ^0.10.0 || ^0.11.0 || ^0.12.0
   languageName: unknown
@@ -2287,7 +2287,7 @@ __metadata:
     typescript: "npm:~5.6.3"
     webextension-polyfill: "npm:^0.12.0"
   peerDependencies:
-    "@metamask/keyring-api": "workspace:^"
+    "@metamask/keyring-api": ^13.0.0
     "@metamask/providers": ^18.3.1
     webextension-polyfill: ^0.10.0 || ^0.11.0 || ^0.12.0
   languageName: unknown

From 5a3ab44770dff08f54203470d8909fb598e42745 Mon Sep 17 00:00:00 2001
From: Charly Chevalier <charly.chevalier@consensys.net>
Date: Mon, 20 Jan 2025 12:00:47 +0100
Subject: [PATCH 4/8] chore(keyring-snap-client): re-add missing providers dep

---
 packages/keyring-snap-client/package.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/keyring-snap-client/package.json b/packages/keyring-snap-client/package.json
index 374ed9fd..80d2fd8e 100644
--- a/packages/keyring-snap-client/package.json
+++ b/packages/keyring-snap-client/package.json
@@ -71,7 +71,8 @@
     "typescript": "~5.6.3"
   },
   "peerDependencies": {
-    "@metamask/keyring-api": "^13.0.0"
+    "@metamask/keyring-api": "^13.0.0",
+    "@metamask/providers": "^18.3.1"
   },
   "engines": {
     "node": "^18.18 || >=20"

From 9c33f64386fcdb6232c149156807f9908e598220 Mon Sep 17 00:00:00 2001
From: Charly Chevalier <charly.chevalier@consensys.net>
Date: Mon, 20 Jan 2025 12:05:00 +0100
Subject: [PATCH 5/8] chore: yarn.lock

---
 yarn.lock | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 6fb972c3..e7092665 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2189,7 +2189,7 @@ __metadata:
     typedoc: "npm:^0.25.13"
     typescript: "npm:~5.6.3"
   peerDependencies:
-    "@metamask/keyring-api": "workspace:^"
+    "@metamask/keyring-api": ^13.0.0
   languageName: unknown
   linkType: soft
 
@@ -2255,7 +2255,8 @@ __metadata:
     typescript: "npm:~5.6.3"
     uuid: "npm:^9.0.1"
   peerDependencies:
-    "@metamask/keyring-api": "workspace:^"
+    "@metamask/keyring-api": ^13.0.0
+    "@metamask/providers": ^18.3.1
   languageName: unknown
   linkType: soft
 

From 4d69b8209e270b8aa152148c6ed611514fa292cb Mon Sep 17 00:00:00 2001
From: Charly Chevalier <charly.chevalier@consensys.net>
Date: Mon, 20 Jan 2025 12:15:27 +0100
Subject: [PATCH 6/8] chore(keyring-snap-bridge): add missing auto-changelog

---
 packages/keyring-snap-bridge/package.json | 1 +
 yarn.lock                                 | 1 +
 2 files changed, 2 insertions(+)

diff --git a/packages/keyring-snap-bridge/package.json b/packages/keyring-snap-bridge/package.json
index 48ad7d77..1f0d3bd2 100644
--- a/packages/keyring-snap-bridge/package.json
+++ b/packages/keyring-snap-bridge/package.json
@@ -50,6 +50,7 @@
     "uuid": "^9.0.1"
   },
   "devDependencies": {
+    "@metamask/auto-changelog": "^3.4.4",
     "@metamask/keyring-api": "workspace:^",
     "@metamask/providers": "^18.3.1",
     "@ts-bridge/cli": "^0.6.1",
diff --git a/yarn.lock b/yarn.lock
index e7092665..bbb5b444 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1995,6 +1995,7 @@ __metadata:
   resolution: "@metamask/eth-snap-keyring@workspace:packages/keyring-snap-bridge"
   dependencies:
     "@ethereumjs/tx": "npm:^4.2.0"
+    "@metamask/auto-changelog": "npm:^3.4.4"
     "@metamask/eth-sig-util": "npm:^8.1.2"
     "@metamask/keyring-api": "workspace:^"
     "@metamask/keyring-internal-api": "workspace:^"

From 24ef2d5146a6195ff4dde84cbf86edd5ae12f804 Mon Sep 17 00:00:00 2001
From: Charly Chevalier <charly.chevalier@consensys.net>
Date: Mon, 20 Jan 2025 12:15:56 +0100
Subject: [PATCH 7/8] fix(syncpack): fix keyring-api warnings + fix ranges for
 webextension-polyfill

---
 .syncpackrc | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.syncpackrc b/.syncpackrc
index 1b627cba..a38605be 100644
--- a/.syncpackrc
+++ b/.syncpackrc
@@ -23,7 +23,7 @@
     },
     {
       "label": "use workspace version of the keyring-api",
-      "dependencyTypes": ["!local"],
+      "dependencyTypes": ["!peer", "!local"],
       "dependencies": ["@metamask/keyring-api"],
       "pinVersion": "workspace:^"
     },
@@ -57,5 +57,12 @@
       "dependencies": ["@metamask/keyring-utils"],
       "pinVersion": "workspace:^"
     },
+    {
+      "label": "use same range than @metamask/providers for webextension-polyfill",
+      "packages": ["**"],
+      "dependencyTypes": ["peer"],
+      "dependencies": ["webextension-polyfill"],
+      "range": "^0.10.0 || ^0.11.0 || ^0.12.0"
+    }
   ]
 }

From f5bc4504aaba1759e2f1a5d5cabd8742d121b7e4 Mon Sep 17 00:00:00 2001
From: Charly Chevalier <charly.chevalier@consensys.net>
Date: Mon, 20 Jan 2025 12:20:43 +0100
Subject: [PATCH 8/8] chore: undo changes to .depcheckrc

---
 .depcheckrc.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.depcheckrc.yml b/.depcheckrc.yml
index 3cb4e0c4..277d274e 100644
--- a/.depcheckrc.yml
+++ b/.depcheckrc.yml
@@ -9,6 +9,8 @@ ignores:
   - 'tsd'
   # Ignore dependencies imported implicitly by TypeScript
   - '@types/*'
+  # Ignore peer dependencies that appears unused, but are required
+  - 'webextension-polyfill'
   # Ignore tools (packages which we use as executables and not libraries)
   - 'rimraf'
   - '@lavamoat/allow-scripts'