From 0fd099da3ba18d5beb478691febafb260312dc17 Mon Sep 17 00:00:00 2001
From: Jongsun Suh <jongsun.suh@icloud.com>
Date: Fri, 7 Jun 2024 10:57:10 -0400
Subject: [PATCH] Add lavamoat policy allowlisting `@metamask/superstruct` for
 `@metamask/utils`

---
 .../lavamoat/browserify/iframe/policy.json    | 16 +++++-----------
 .../browserify/node-process/policy.json       | 16 +++++-----------
 .../browserify/node-thread/policy.json        | 16 +++++-----------
 .../lavamoat/browserify/webview/policy.json   | 16 +++++-----------
 .../browserify/worker-executor/policy.json    | 16 +++++-----------
 .../browserify/worker-pool/policy.json        | 16 +++++-----------
 .../lavamoat/build-system/policy.json         |  8 +-------
 yarn.lock                                     | 19 +------------------
 8 files changed, 32 insertions(+), 91 deletions(-)

diff --git a/packages/snaps-execution-environments/lavamoat/browserify/iframe/policy.json b/packages/snaps-execution-environments/lavamoat/browserify/iframe/policy.json
index 0dfa39a79b..0d0b837b4c 100644
--- a/packages/snaps-execution-environments/lavamoat/browserify/iframe/policy.json
+++ b/packages/snaps-execution-environments/lavamoat/browserify/iframe/policy.json
@@ -90,8 +90,8 @@
       "packages": {
         "@metamask/rpc-errors": true,
         "@metamask/snaps-sdk>fast-xml-parser": true,
-        "@metamask/utils": true,
-        "superstruct": true
+        "@metamask/superstruct": true,
+        "@metamask/utils": true
       }
     },
     "@metamask/snaps-sdk>fast-xml-parser": {
@@ -115,8 +115,8 @@
       "packages": {
         "@metamask/rpc-errors": true,
         "@metamask/snaps-sdk": true,
-        "@metamask/utils": true,
-        "superstruct": true
+        "@metamask/superstruct": true,
+        "@metamask/utils": true
       }
     },
     "@metamask/utils": {
@@ -125,12 +125,12 @@
         "TextEncoder": true
       },
       "packages": {
+        "@metamask/superstruct": true,
         "@metamask/utils>@noble/hashes": true,
         "@metamask/utils>@scure/base": true,
         "@metamask/utils>pony-cause": true,
         "browserify>buffer": true,
         "depcheck>semver": true,
-        "superstruct": true,
         "tsup>debug": true
       }
     },
@@ -208,12 +208,6 @@
         "localStorage": true
       }
     },
-    "superstruct": {
-      "globals": {
-        "console.warn": true,
-        "define": true
-      }
-    },
     "tsup>debug": {
       "globals": {
         "console": true,
diff --git a/packages/snaps-execution-environments/lavamoat/browserify/node-process/policy.json b/packages/snaps-execution-environments/lavamoat/browserify/node-process/policy.json
index ae4dafe535..1d02605559 100644
--- a/packages/snaps-execution-environments/lavamoat/browserify/node-process/policy.json
+++ b/packages/snaps-execution-environments/lavamoat/browserify/node-process/policy.json
@@ -100,8 +100,8 @@
       "packages": {
         "@metamask/rpc-errors": true,
         "@metamask/snaps-sdk>fast-xml-parser": true,
-        "@metamask/utils": true,
-        "superstruct": true
+        "@metamask/superstruct": true,
+        "@metamask/utils": true
       }
     },
     "@metamask/snaps-sdk>fast-xml-parser": {
@@ -125,8 +125,8 @@
       "packages": {
         "@metamask/rpc-errors": true,
         "@metamask/snaps-sdk": true,
-        "@metamask/utils": true,
-        "superstruct": true
+        "@metamask/superstruct": true,
+        "@metamask/utils": true
       }
     },
     "@metamask/utils": {
@@ -138,12 +138,12 @@
         "TextEncoder": true
       },
       "packages": {
+        "@metamask/superstruct": true,
         "@metamask/utils>@noble/hashes": true,
         "@metamask/utils>@scure/base": true,
         "@metamask/utils>pony-cause": true,
         "buffer": true,
         "depcheck>semver": true,
-        "superstruct": true,
         "tsup>debug": true
       }
     },
@@ -245,12 +245,6 @@
         "util": true
       }
     },
-    "superstruct": {
-      "globals": {
-        "console.warn": true,
-        "define": true
-      }
-    },
     "tsup>debug": {
       "builtin": {
         "tty.isatty": true,
diff --git a/packages/snaps-execution-environments/lavamoat/browserify/node-thread/policy.json b/packages/snaps-execution-environments/lavamoat/browserify/node-thread/policy.json
index ae4dafe535..1d02605559 100644
--- a/packages/snaps-execution-environments/lavamoat/browserify/node-thread/policy.json
+++ b/packages/snaps-execution-environments/lavamoat/browserify/node-thread/policy.json
@@ -100,8 +100,8 @@
       "packages": {
         "@metamask/rpc-errors": true,
         "@metamask/snaps-sdk>fast-xml-parser": true,
-        "@metamask/utils": true,
-        "superstruct": true
+        "@metamask/superstruct": true,
+        "@metamask/utils": true
       }
     },
     "@metamask/snaps-sdk>fast-xml-parser": {
@@ -125,8 +125,8 @@
       "packages": {
         "@metamask/rpc-errors": true,
         "@metamask/snaps-sdk": true,
-        "@metamask/utils": true,
-        "superstruct": true
+        "@metamask/superstruct": true,
+        "@metamask/utils": true
       }
     },
     "@metamask/utils": {
@@ -138,12 +138,12 @@
         "TextEncoder": true
       },
       "packages": {
+        "@metamask/superstruct": true,
         "@metamask/utils>@noble/hashes": true,
         "@metamask/utils>@scure/base": true,
         "@metamask/utils>pony-cause": true,
         "buffer": true,
         "depcheck>semver": true,
-        "superstruct": true,
         "tsup>debug": true
       }
     },
@@ -245,12 +245,6 @@
         "util": true
       }
     },
-    "superstruct": {
-      "globals": {
-        "console.warn": true,
-        "define": true
-      }
-    },
     "tsup>debug": {
       "builtin": {
         "tty.isatty": true,
diff --git a/packages/snaps-execution-environments/lavamoat/browserify/webview/policy.json b/packages/snaps-execution-environments/lavamoat/browserify/webview/policy.json
index 63e69a30b9..f39c98519d 100644
--- a/packages/snaps-execution-environments/lavamoat/browserify/webview/policy.json
+++ b/packages/snaps-execution-environments/lavamoat/browserify/webview/policy.json
@@ -29,8 +29,8 @@
       "packages": {
         "@metamask/rpc-errors": true,
         "@metamask/snaps-sdk>fast-xml-parser": true,
-        "@metamask/utils": true,
-        "superstruct": true
+        "@metamask/superstruct": true,
+        "@metamask/utils": true
       }
     },
     "@metamask/snaps-sdk>fast-xml-parser": {
@@ -54,8 +54,8 @@
       "packages": {
         "@metamask/rpc-errors": true,
         "@metamask/snaps-sdk": true,
-        "@metamask/utils": true,
-        "superstruct": true
+        "@metamask/superstruct": true,
+        "@metamask/utils": true
       }
     },
     "@metamask/utils": {
@@ -64,12 +64,12 @@
         "TextEncoder": true
       },
       "packages": {
+        "@metamask/superstruct": true,
         "@metamask/utils>@noble/hashes": true,
         "@metamask/utils>@scure/base": true,
         "@metamask/utils>pony-cause": true,
         "browserify>buffer": true,
         "depcheck>semver": true,
-        "superstruct": true,
         "tsup>debug": true
       }
     },
@@ -147,12 +147,6 @@
         "localStorage": true
       }
     },
-    "superstruct": {
-      "globals": {
-        "console.warn": true,
-        "define": true
-      }
-    },
     "tsup>debug": {
       "globals": {
         "console": true,
diff --git a/packages/snaps-execution-environments/lavamoat/browserify/worker-executor/policy.json b/packages/snaps-execution-environments/lavamoat/browserify/worker-executor/policy.json
index 0dfa39a79b..0d0b837b4c 100644
--- a/packages/snaps-execution-environments/lavamoat/browserify/worker-executor/policy.json
+++ b/packages/snaps-execution-environments/lavamoat/browserify/worker-executor/policy.json
@@ -90,8 +90,8 @@
       "packages": {
         "@metamask/rpc-errors": true,
         "@metamask/snaps-sdk>fast-xml-parser": true,
-        "@metamask/utils": true,
-        "superstruct": true
+        "@metamask/superstruct": true,
+        "@metamask/utils": true
       }
     },
     "@metamask/snaps-sdk>fast-xml-parser": {
@@ -115,8 +115,8 @@
       "packages": {
         "@metamask/rpc-errors": true,
         "@metamask/snaps-sdk": true,
-        "@metamask/utils": true,
-        "superstruct": true
+        "@metamask/superstruct": true,
+        "@metamask/utils": true
       }
     },
     "@metamask/utils": {
@@ -125,12 +125,12 @@
         "TextEncoder": true
       },
       "packages": {
+        "@metamask/superstruct": true,
         "@metamask/utils>@noble/hashes": true,
         "@metamask/utils>@scure/base": true,
         "@metamask/utils>pony-cause": true,
         "browserify>buffer": true,
         "depcheck>semver": true,
-        "superstruct": true,
         "tsup>debug": true
       }
     },
@@ -208,12 +208,6 @@
         "localStorage": true
       }
     },
-    "superstruct": {
-      "globals": {
-        "console.warn": true,
-        "define": true
-      }
-    },
     "tsup>debug": {
       "globals": {
         "console": true,
diff --git a/packages/snaps-execution-environments/lavamoat/browserify/worker-pool/policy.json b/packages/snaps-execution-environments/lavamoat/browserify/worker-pool/policy.json
index 63e69a30b9..f39c98519d 100644
--- a/packages/snaps-execution-environments/lavamoat/browserify/worker-pool/policy.json
+++ b/packages/snaps-execution-environments/lavamoat/browserify/worker-pool/policy.json
@@ -29,8 +29,8 @@
       "packages": {
         "@metamask/rpc-errors": true,
         "@metamask/snaps-sdk>fast-xml-parser": true,
-        "@metamask/utils": true,
-        "superstruct": true
+        "@metamask/superstruct": true,
+        "@metamask/utils": true
       }
     },
     "@metamask/snaps-sdk>fast-xml-parser": {
@@ -54,8 +54,8 @@
       "packages": {
         "@metamask/rpc-errors": true,
         "@metamask/snaps-sdk": true,
-        "@metamask/utils": true,
-        "superstruct": true
+        "@metamask/superstruct": true,
+        "@metamask/utils": true
       }
     },
     "@metamask/utils": {
@@ -64,12 +64,12 @@
         "TextEncoder": true
       },
       "packages": {
+        "@metamask/superstruct": true,
         "@metamask/utils>@noble/hashes": true,
         "@metamask/utils>@scure/base": true,
         "@metamask/utils>pony-cause": true,
         "browserify>buffer": true,
         "depcheck>semver": true,
-        "superstruct": true,
         "tsup>debug": true
       }
     },
@@ -147,12 +147,6 @@
         "localStorage": true
       }
     },
-    "superstruct": {
-      "globals": {
-        "console.warn": true,
-        "define": true
-      }
-    },
     "tsup>debug": {
       "globals": {
         "console": true,
diff --git a/packages/snaps-execution-environments/lavamoat/build-system/policy.json b/packages/snaps-execution-environments/lavamoat/build-system/policy.json
index f0cf64f764..41f03af11f 100644
--- a/packages/snaps-execution-environments/lavamoat/build-system/policy.json
+++ b/packages/snaps-execution-environments/lavamoat/build-system/policy.json
@@ -1014,11 +1014,11 @@
         "TextEncoder": true
       },
       "packages": {
+        "@metamask/superstruct": true,
         "@metamask/utils>@noble/hashes": true,
         "@metamask/utils>@scure/base": true,
         "@metamask/utils>pony-cause": true,
         "depcheck>semver": true,
-        "superstruct": true,
         "tsup>debug": true
       }
     },
@@ -2341,12 +2341,6 @@
         "util.deprecate": true
       }
     },
-    "superstruct": {
-      "globals": {
-        "console.warn": true,
-        "define": true
-      }
-    },
     "terser": {
       "globals": {
         "Buffer": true,
diff --git a/yarn.lock b/yarn.lock
index a31480a614..64fbb8a413 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6247,24 +6247,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@metamask/utils@npm:^8.0.0, @metamask/utils@npm:^8.1.0, @metamask/utils@npm:^8.2.0, @metamask/utils@npm:^8.2.1, @metamask/utils@npm:^8.3.0":
-  version: 8.4.0
-  resolution: "@metamask/utils@npm:8.4.0"
-  dependencies:
-    "@ethereumjs/tx": ^4.2.0
-    "@noble/hashes": ^1.3.1
-    "@scure/base": ^1.1.3
-    "@types/debug": ^4.1.7
-    debug: ^4.3.4
-    pony-cause: ^2.1.10
-    semver: ^7.5.4
-    superstruct: ^1.0.3
-    uuid: ^9.0.1
-  checksum: b0397e97bac7192f6189a8625a2dfcb56d3c2cf4dd2cb3d4e012a7e9786f04f59f6917805544bc131a6dacd2c8344e237ae43ad47429bb5eb35c6cf1248440b4
-  languageName: node
-  linkType: hard
-
-"@metamask/utils@npm:^8.5.0":
+"@metamask/utils@npm:^8.0.0, @metamask/utils@npm:^8.1.0, @metamask/utils@npm:^8.2.0, @metamask/utils@npm:^8.2.1, @metamask/utils@npm:^8.3.0, @metamask/utils@npm:^8.5.0":
   version: 8.5.0
   resolution: "@metamask/utils@npm:8.5.0"
   dependencies: