diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 60dae3130..8378cb02a 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -1210,6 +1210,8 @@ export default class MetamaskController extends EventEmitter {
           ?.disabledRpcMethodPreferences?.eth_sign,
       getAllState: this.getState.bind(this),
       securityProviderRequest: this.securityProviderRequest.bind(this),
+      getCurrentChainId: () =>
+        this.networkController.store.getState().providerConfig.chainId,
     });
 
     this.signatureController.hub.on('cancelWithReason', (message, reason) => {
diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json
index 7504336d4..bff7adb06 100644
--- a/lavamoat/browserify/beta/policy.json
+++ b/lavamoat/browserify/beta/policy.json
@@ -4293,6 +4293,7 @@
       },
       "packages": {
         "browserify>process": true,
+        "browserify>util": true,
         "semver>lru-cache": true
       }
     },
diff --git a/lavamoat/browserify/desktop/policy.json b/lavamoat/browserify/desktop/policy.json
index e3184f749..c5eee11b6 100644
--- a/lavamoat/browserify/desktop/policy.json
+++ b/lavamoat/browserify/desktop/policy.json
@@ -4859,6 +4859,7 @@
       },
       "packages": {
         "browserify>process": true,
+        "browserify>util": true,
         "semver>lru-cache": true
       }
     },
diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json
index e3184f749..c5eee11b6 100644
--- a/lavamoat/browserify/flask/policy.json
+++ b/lavamoat/browserify/flask/policy.json
@@ -4859,6 +4859,7 @@
       },
       "packages": {
         "browserify>process": true,
+        "browserify>util": true,
         "semver>lru-cache": true
       }
     },
diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json
index 7504336d4..bff7adb06 100644
--- a/lavamoat/browserify/main/policy.json
+++ b/lavamoat/browserify/main/policy.json
@@ -4293,6 +4293,7 @@
       },
       "packages": {
         "browserify>process": true,
+        "browserify>util": true,
         "semver>lru-cache": true
       }
     },
diff --git a/lavamoat/build-system/policy.json b/lavamoat/build-system/policy.json
index 49711a209..fd2759c0b 100644
--- a/lavamoat/build-system/policy.json
+++ b/lavamoat/build-system/policy.json
@@ -6799,6 +6799,9 @@
       }
     },
     "semver": {
+      "builtin": {
+        "util.inspect": true
+      },
       "globals": {
         "console.error": true,
         "process": true
@@ -7990,14 +7993,7 @@
       },
       "globals": {
         "console.warn": true,
-        "process.env.BROWSERSLIST": true,
-        "process.env.BROWSERSLIST_CONFIG": true,
-        "process.env.BROWSERSLIST_DANGEROUS_EXTEND": true,
-        "process.env.BROWSERSLIST_DISABLE_CACHE": true,
-        "process.env.BROWSERSLIST_ENV": true,
-        "process.env.BROWSERSLIST_IGNORE_OLD_DATA": true,
-        "process.env.BROWSERSLIST_STATS": true,
-        "process.env.NODE_ENV": true,
+        "process.env": true,
         "process.versions.node": true
       },
       "packages": {
diff --git a/package.json b/package.json
index 8ea8817b3..5c2920ed6 100644
--- a/package.json
+++ b/package.json
@@ -253,7 +253,7 @@
     "@metamask/jazzicon": "^2.0.0",
     "@metamask/key-tree": "^7.0.0",
     "@metamask/logo": "^3.1.1",
-    "@metamask/message-manager": "^4.0.0",
+    "@metamask/message-manager": "^5.0.0",
     "@metamask/metamask-eth-abis": "^3.0.0",
     "@metamask/notification-controller": "^2.0.0",
     "@metamask/obs-store": "^8.1.0",
@@ -266,7 +266,7 @@
     "@metamask/rpc-methods-flask": "npm:@metamask/rpc-methods@0.32.2",
     "@metamask/safe-event-emitter": "^2.0.0",
     "@metamask/scure-bip39": "^2.0.3",
-    "@metamask/signature-controller": "^1.0.0",
+    "@metamask/signature-controller": "^2.0.0",
     "@metamask/slip44": "^3.0.0",
     "@metamask/smart-transactions-controller": "^3.1.0",
     "@metamask/snaps-controllers": "^0.32.2",
diff --git a/yarn.lock b/yarn.lock
index 6c4da2694..773754267 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4078,9 +4078,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/message-manager@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "@metamask/message-manager@npm:4.0.0"
+"@metamask/message-manager@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "@metamask/message-manager@npm:5.0.0"
   dependencies:
     "@metamask/base-controller": ^2.0.0
     "@metamask/controller-utils": ^3.4.0
@@ -4089,7 +4089,7 @@ __metadata:
     ethereumjs-util: ^7.0.10
     jsonschema: ^1.2.4
     uuid: ^8.3.2
-  checksum: 9c3295a726eb59c2cc3f764b96010833edf2463e2dd3ee0a4d23ea6bf662615b3bd71110a5c6b60f253eac1de6c8b38af1edc0188ec766770a9d02c0f7401caa
+  checksum: 078c7eeca03975c3a899dcaa7485ce7aaff6d97b53c2a8e8563ec4e17791b836914fbc0f57a64cbf263be231609e0ffc77eabbe9a98fdcc1240af09a733ba574
   languageName: node
   linkType: hard
 
@@ -4345,18 +4345,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/signature-controller@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "@metamask/signature-controller@npm:1.0.0"
+"@metamask/signature-controller@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "@metamask/signature-controller@npm:2.0.0"
   dependencies:
     "@metamask/approval-controller": ^2.1.1
     "@metamask/base-controller": ^2.0.0
     "@metamask/controller-utils": ^3.4.0
-    "@metamask/message-manager": ^4.0.0
+    "@metamask/message-manager": ^5.0.0
     eth-rpc-errors: ^4.0.2
     ethereumjs-util: ^7.0.10
     immer: ^9.0.6
-  checksum: 7efb738646a179db15c45d6e1654e17ce6c7a3e42b03fd27d365e50bb2e4287a1757f26efc0b3e99b3e5d320816f3f9e0c7038491289cf6071b7f886eaa0f27b
+  checksum: aa7a37079cb108bd9dcb23292f82690b6796b3cde5a2b841db7f636fa9f19a5eaaa8eea7461d757dcfd664d1a6a5da3af8ea25a402c6fe575c3204390ff3964f
   languageName: node
   linkType: hard
 
@@ -24080,7 +24080,7 @@ __metadata:
     "@metamask/jazzicon": ^2.0.0
     "@metamask/key-tree": ^7.0.0
     "@metamask/logo": ^3.1.1
-    "@metamask/message-manager": ^4.0.0
+    "@metamask/message-manager": ^5.0.0
     "@metamask/metamask-eth-abis": ^3.0.0
     "@metamask/notification-controller": ^2.0.0
     "@metamask/obs-store": ^8.1.0
@@ -24094,7 +24094,7 @@ __metadata:
     "@metamask/rpc-methods-flask": "npm:@metamask/rpc-methods@0.32.2"
     "@metamask/safe-event-emitter": ^2.0.0
     "@metamask/scure-bip39": ^2.0.3
-    "@metamask/signature-controller": ^1.0.0
+    "@metamask/signature-controller": ^2.0.0
     "@metamask/slip44": ^3.0.0
     "@metamask/smart-transactions-controller": ^3.1.0
     "@metamask/snaps-controllers": ^0.32.2