From 7059894399f397526c606bce5fc54c6a4848f634 Mon Sep 17 00:00:00 2001
From: Mark Stacey <markjstacey@gmail.com>
Date: Tue, 4 Apr 2023 09:27:51 -0230
Subject: [PATCH] Update `@metamask/swappable-obj-proxy` (#18422)

* Update `@metamask/swappable-obj-proxy`

The package `@metamask/swappable-obj-proxy` has been updated to the
latest version. The breaking changes include moving the package under
the `@metamask` scope and converting it to TypeScript.

* Update policy
---
 .../controllers/network/network-controller.js    |  2 +-
 lavamoat/browserify/desktop/policy.json          |  4 ++--
 lavamoat/browserify/flask/policy.json            |  4 ++--
 package.json                                     |  2 +-
 yarn.lock                                        | 16 ++++++++--------
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/app/scripts/controllers/network/network-controller.js b/app/scripts/controllers/network/network-controller.js
index ad8ded74b..4449bc683 100644
--- a/app/scripts/controllers/network/network-controller.js
+++ b/app/scripts/controllers/network/network-controller.js
@@ -5,7 +5,7 @@ import log from 'loglevel';
 import {
   createSwappableProxy,
   createEventEmitterProxy,
-} from 'swappable-obj-proxy';
+} from '@metamask/swappable-obj-proxy';
 import EthQuery from 'eth-query';
 // ControllerMessenger is referred to in the JSDocs
 // eslint-disable-next-line no-unused-vars
diff --git a/lavamoat/browserify/desktop/policy.json b/lavamoat/browserify/desktop/policy.json
index 167424fd4..5967ac0ac 100644
--- a/lavamoat/browserify/desktop/policy.json
+++ b/lavamoat/browserify/desktop/policy.json
@@ -878,8 +878,8 @@
       },
       "packages": {
         "@metamask/desktop>@metamask/obs-store>through2": true,
-        "browserify>stream-browserify": true,
-        "json-rpc-engine>@metamask/safe-event-emitter": true
+        "@metamask/safe-event-emitter": true,
+        "browserify>stream-browserify": true
       }
     },
     "@metamask/desktop>@metamask/obs-store>through2": {
diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json
index 167424fd4..5967ac0ac 100644
--- a/lavamoat/browserify/flask/policy.json
+++ b/lavamoat/browserify/flask/policy.json
@@ -878,8 +878,8 @@
       },
       "packages": {
         "@metamask/desktop>@metamask/obs-store>through2": true,
-        "browserify>stream-browserify": true,
-        "json-rpc-engine>@metamask/safe-event-emitter": true
+        "@metamask/safe-event-emitter": true,
+        "browserify>stream-browserify": true
       }
     },
     "@metamask/desktop>@metamask/obs-store>through2": {
diff --git a/package.json b/package.json
index d53e20a06..7db67a7fd 100644
--- a/package.json
+++ b/package.json
@@ -263,6 +263,7 @@
     "@metamask/snaps-ui": "^0.32.2",
     "@metamask/snaps-utils": "^0.32.2",
     "@metamask/subject-metadata-controller": "^1.0.0",
+    "@metamask/swappable-obj-proxy": "^2.1.0",
     "@metamask/utils": "^5.0.0",
     "@ngraveio/bc-ur": "^1.1.6",
     "@popperjs/core": "^2.4.0",
@@ -351,7 +352,6 @@
     "reselect": "^3.0.1",
     "ses": "^0.12.4",
     "single-call-balance-checker-abi": "^1.0.0",
-    "swappable-obj-proxy": "^1.1.0",
     "unicode-confusables": "^0.1.1",
     "uuid": "^8.3.2",
     "valid-url": "^1.0.9",
diff --git a/yarn.lock b/yarn.lock
index 832517322..da88ae8bb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4467,6 +4467,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/swappable-obj-proxy@npm:^2.1.0":
+  version: 2.1.0
+  resolution: "@metamask/swappable-obj-proxy@npm:2.1.0"
+  checksum: b15cebee7fb189d1143d3a755a38a7d88f56f91e1277425a51f63c50c432dfb4e6e22650ef67474ae4ef2a97344231af00be6780f126c47d401a23c8a8fb3c9c
+  languageName: node
+  linkType: hard
+
 "@metamask/test-dapp@npm:^5.6.0":
   version: 5.6.0
   resolution: "@metamask/test-dapp@npm:5.6.0"
@@ -24315,6 +24322,7 @@ __metadata:
     "@metamask/snaps-ui": ^0.32.2
     "@metamask/snaps-utils": ^0.32.2
     "@metamask/subject-metadata-controller": ^1.0.0
+    "@metamask/swappable-obj-proxy": ^2.1.0
     "@metamask/test-dapp": ^5.6.0
     "@metamask/utils": ^5.0.0
     "@ngraveio/bc-ur": ^1.1.6
@@ -24553,7 +24561,6 @@ __metadata:
     string.prototype.matchall: ^4.0.2
     style-loader: ^0.21.0
     stylelint: ^13.6.1
-    swappable-obj-proxy: ^1.1.0
     terser: ^5.7.0
     through2: ^4.0.2
     ts-node: ^10.5.0
@@ -32606,13 +32613,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"swappable-obj-proxy@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "swappable-obj-proxy@npm:1.1.0"
-  checksum: 6b1d087e6d03fdb89f94bcb251a407d832964813ed9129f46096dcf99fdbd44398dadbed941dcaeb8d07b89e400fd603f9a589aa01938916b1d0d2a1c9906c65
-  languageName: node
-  linkType: hard
-
 "symbol-observable@npm:^2.0.3":
   version: 2.0.3
   resolution: "symbol-observable@npm:2.0.3"