From c25ddfccebd86ab68426e1eba860dd994043e0be Mon Sep 17 00:00:00 2001 From: Prithpal Sooriya Date: Tue, 3 Dec 2024 16:32:04 +0000 Subject: [PATCH 1/2] feat: bump @metamask/message-signing-snap to ^0.6.0 --- package.json | 2 +- yarn.lock | 29 +++++++---------------------- 2 files changed, 8 insertions(+), 23 deletions(-) diff --git a/package.json b/package.json index abd56565d35d..23eba3470a20 100644 --- a/package.json +++ b/package.json @@ -318,7 +318,7 @@ "@metamask/logging-controller": "^6.0.0", "@metamask/logo": "^3.1.2", "@metamask/message-manager": "^10.1.0", - "@metamask/message-signing-snap": "^0.4.0", + "@metamask/message-signing-snap": "^0.6.0", "@metamask/metamask-eth-abis": "^3.1.1", "@metamask/name-controller": "^8.0.0", "@metamask/network-controller": "patch:@metamask/network-controller@npm%3A21.0.0#~/.yarn/patches/@metamask-network-controller-npm-21.0.0-559aa8e395.patch", diff --git a/yarn.lock b/yarn.lock index 922fc470e8e6..042a728c3a10 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5912,18 +5912,10 @@ __metadata: languageName: node linkType: hard -"@metamask/message-signing-snap@npm:^0.4.0": - version: 0.4.0 - resolution: "@metamask/message-signing-snap@npm:0.4.0" - dependencies: - "@metamask/rpc-errors": "npm:^6.3.0" - "@metamask/snaps-sdk": "npm:^6.0.0" - "@metamask/utils": "npm:^9.0.0" - "@noble/ciphers": "npm:^0.5.3" - "@noble/curves": "npm:^1.4.2" - "@noble/hashes": "npm:^1.4.0" - zod: "npm:^3.23.8" - checksum: 10/fb61da8f2999305f99ad5a1d6be2def224c88c1059fcdc8e70d06641d695eef82d9b8463c6b57d797a519aa70dc741b7cb59596f503faf2eff68a1647248b4de +"@metamask/message-signing-snap@npm:^0.6.0": + version: 0.6.0 + resolution: "@metamask/message-signing-snap@npm:0.6.0" + checksum: 10/c74b3d897ffdadb2c2772e715578d037430955e962ff25fc3e56edfc60f0b08e55dd1e04dcda104d02a4424af09fedf8e2bd0dab24a34d91c1b8c685849b510a languageName: node linkType: hard @@ -6384,7 +6376,7 @@ __metadata: languageName: node linkType: hard -"@metamask/rpc-errors@npm:^6.0.0, @metamask/rpc-errors@npm:^6.2.1, @metamask/rpc-errors@npm:^6.3.0, @metamask/rpc-errors@npm:^6.3.1": +"@metamask/rpc-errors@npm:^6.0.0, @metamask/rpc-errors@npm:^6.2.1, @metamask/rpc-errors@npm:^6.3.1": version: 6.4.0 resolution: "@metamask/rpc-errors@npm:6.4.0" dependencies: @@ -6903,7 +6895,7 @@ __metadata: languageName: node linkType: hard -"@noble/ciphers@npm:^0.5.2, @noble/ciphers@npm:^0.5.3": +"@noble/ciphers@npm:^0.5.2": version: 0.5.3 resolution: "@noble/ciphers@npm:0.5.3" checksum: 10/af0ad96b5807feace93e63549e05de6f5e305b36e2e95f02d90532893fbc3af3f19b9621b6de4caa98303659e5df2e7aa082064e5d4a82e6f38c728d48dfae5d @@ -26858,7 +26850,7 @@ __metadata: "@metamask/logging-controller": "npm:^6.0.0" "@metamask/logo": "npm:^3.1.2" "@metamask/message-manager": "npm:^10.1.0" - "@metamask/message-signing-snap": "npm:^0.4.0" + "@metamask/message-signing-snap": "npm:^0.6.0" "@metamask/metamask-eth-abis": "npm:^3.1.1" "@metamask/name-controller": "npm:^8.0.0" "@metamask/network-controller": "patch:@metamask/network-controller@npm%3A21.0.0#~/.yarn/patches/@metamask-network-controller-npm-21.0.0-559aa8e395.patch" @@ -38526,13 +38518,6 @@ __metadata: languageName: node linkType: hard -"zod@npm:^3.23.8": - version: 3.23.8 - resolution: "zod@npm:3.23.8" - checksum: 10/846fd73e1af0def79c19d510ea9e4a795544a67d5b34b7e1c4d0425bf6bfd1c719446d94cdfa1721c1987d891321d61f779e8236fde517dc0e524aa851a6eff1 - languageName: node - linkType: hard - "zstd-codec@npm:^0.1.4": version: 0.1.4 resolution: "zstd-codec@npm:0.1.4" From c595a71e739fbd3584764c8732a4faa68ddf4446 Mon Sep 17 00:00:00 2001 From: Prithpal Sooriya Date: Tue, 3 Dec 2024 16:52:37 +0000 Subject: [PATCH 2/2] build: update lavamoat polices --- lavamoat/browserify/beta/policy.json | 54 +++++++++++++-------------- lavamoat/browserify/flask/policy.json | 54 +++++++++++++-------------- lavamoat/browserify/main/policy.json | 54 +++++++++++++-------------- lavamoat/browserify/mmi/policy.json | 54 +++++++++++++-------------- 4 files changed, 108 insertions(+), 108 deletions(-) diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json index 77c0940ef550..833590589528 100644 --- a/lavamoat/browserify/beta/policy.json +++ b/lavamoat/browserify/beta/policy.json @@ -187,9 +187,23 @@ "crypto": true }, "packages": { + "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true, "@ethereumjs/tx>ethereum-cryptography>@noble/hashes": true, - "@ethereumjs/tx>ethereum-cryptography>@scure/bip32": true, - "@metamask/message-signing-snap>@noble/curves": true + "@ethereumjs/tx>ethereum-cryptography>@scure/bip32": true + } + }, + "@ethereumjs/tx>ethereum-cryptography>@noble/curves": { + "globals": { + "TextEncoder": true + }, + "packages": { + "@ethereumjs/tx>ethereum-cryptography>@noble/curves>@noble/hashes": true + } + }, + "@ethereumjs/tx>ethereum-cryptography>@noble/curves>@noble/hashes": { + "globals": { + "TextEncoder": true, + "crypto": true } }, "@ethereumjs/tx>ethereum-cryptography>@noble/hashes": { @@ -200,8 +214,8 @@ }, "@ethereumjs/tx>ethereum-cryptography>@scure/bip32": { "packages": { + "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true, "@ethereumjs/tx>ethereum-cryptography>@scure/bip32>@noble/hashes": true, - "@metamask/message-signing-snap>@noble/curves": true, "@metamask/utils>@scure/base": true } }, @@ -1664,27 +1678,6 @@ "browserify>url": true } }, - "@metamask/message-signing-snap>@noble/ciphers": { - "globals": { - "TextDecoder": true, - "TextEncoder": true, - "crypto": true - } - }, - "@metamask/message-signing-snap>@noble/curves": { - "globals": { - "TextEncoder": true - }, - "packages": { - "@metamask/message-signing-snap>@noble/curves>@noble/hashes": true - } - }, - "@metamask/message-signing-snap>@noble/curves>@noble/hashes": { - "globals": { - "TextEncoder": true, - "crypto": true - } - }, "@metamask/name-controller": { "globals": { "fetch": true @@ -2230,13 +2223,20 @@ "@metamask/base-controller": true, "@metamask/keyring-api": true, "@metamask/keyring-controller": true, - "@metamask/message-signing-snap>@noble/ciphers": true, + "@metamask/profile-sync-controller>@noble/ciphers": true, "@metamask/profile-sync-controller>siwe": true, "@noble/hashes": true, "browserify>buffer": true, "loglevel": true } }, + "@metamask/profile-sync-controller>@noble/ciphers": { + "globals": { + "TextDecoder": true, + "TextEncoder": true, + "crypto": true + } + }, "@metamask/profile-sync-controller>siwe": { "globals": { "console.error": true, @@ -2616,7 +2616,7 @@ }, "@metamask/snaps-sdk>@metamask/key-tree": { "packages": { - "@metamask/message-signing-snap>@noble/curves": true, + "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true, "@metamask/scure-bip39": true, "@metamask/snaps-sdk>@metamask/key-tree>@metamask/utils": true, "@metamask/utils>@scure/base": true, @@ -2675,7 +2675,7 @@ }, "@metamask/snaps-utils>@metamask/snaps-registry": { "packages": { - "@metamask/message-signing-snap>@noble/curves": true, + "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true, "@metamask/utils": true, "@metamask/utils>@metamask/superstruct": true, "@noble/hashes": true diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json index 77c0940ef550..833590589528 100644 --- a/lavamoat/browserify/flask/policy.json +++ b/lavamoat/browserify/flask/policy.json @@ -187,9 +187,23 @@ "crypto": true }, "packages": { + "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true, "@ethereumjs/tx>ethereum-cryptography>@noble/hashes": true, - "@ethereumjs/tx>ethereum-cryptography>@scure/bip32": true, - "@metamask/message-signing-snap>@noble/curves": true + "@ethereumjs/tx>ethereum-cryptography>@scure/bip32": true + } + }, + "@ethereumjs/tx>ethereum-cryptography>@noble/curves": { + "globals": { + "TextEncoder": true + }, + "packages": { + "@ethereumjs/tx>ethereum-cryptography>@noble/curves>@noble/hashes": true + } + }, + "@ethereumjs/tx>ethereum-cryptography>@noble/curves>@noble/hashes": { + "globals": { + "TextEncoder": true, + "crypto": true } }, "@ethereumjs/tx>ethereum-cryptography>@noble/hashes": { @@ -200,8 +214,8 @@ }, "@ethereumjs/tx>ethereum-cryptography>@scure/bip32": { "packages": { + "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true, "@ethereumjs/tx>ethereum-cryptography>@scure/bip32>@noble/hashes": true, - "@metamask/message-signing-snap>@noble/curves": true, "@metamask/utils>@scure/base": true } }, @@ -1664,27 +1678,6 @@ "browserify>url": true } }, - "@metamask/message-signing-snap>@noble/ciphers": { - "globals": { - "TextDecoder": true, - "TextEncoder": true, - "crypto": true - } - }, - "@metamask/message-signing-snap>@noble/curves": { - "globals": { - "TextEncoder": true - }, - "packages": { - "@metamask/message-signing-snap>@noble/curves>@noble/hashes": true - } - }, - "@metamask/message-signing-snap>@noble/curves>@noble/hashes": { - "globals": { - "TextEncoder": true, - "crypto": true - } - }, "@metamask/name-controller": { "globals": { "fetch": true @@ -2230,13 +2223,20 @@ "@metamask/base-controller": true, "@metamask/keyring-api": true, "@metamask/keyring-controller": true, - "@metamask/message-signing-snap>@noble/ciphers": true, + "@metamask/profile-sync-controller>@noble/ciphers": true, "@metamask/profile-sync-controller>siwe": true, "@noble/hashes": true, "browserify>buffer": true, "loglevel": true } }, + "@metamask/profile-sync-controller>@noble/ciphers": { + "globals": { + "TextDecoder": true, + "TextEncoder": true, + "crypto": true + } + }, "@metamask/profile-sync-controller>siwe": { "globals": { "console.error": true, @@ -2616,7 +2616,7 @@ }, "@metamask/snaps-sdk>@metamask/key-tree": { "packages": { - "@metamask/message-signing-snap>@noble/curves": true, + "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true, "@metamask/scure-bip39": true, "@metamask/snaps-sdk>@metamask/key-tree>@metamask/utils": true, "@metamask/utils>@scure/base": true, @@ -2675,7 +2675,7 @@ }, "@metamask/snaps-utils>@metamask/snaps-registry": { "packages": { - "@metamask/message-signing-snap>@noble/curves": true, + "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true, "@metamask/utils": true, "@metamask/utils>@metamask/superstruct": true, "@noble/hashes": true diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json index 77c0940ef550..833590589528 100644 --- a/lavamoat/browserify/main/policy.json +++ b/lavamoat/browserify/main/policy.json @@ -187,9 +187,23 @@ "crypto": true }, "packages": { + "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true, "@ethereumjs/tx>ethereum-cryptography>@noble/hashes": true, - "@ethereumjs/tx>ethereum-cryptography>@scure/bip32": true, - "@metamask/message-signing-snap>@noble/curves": true + "@ethereumjs/tx>ethereum-cryptography>@scure/bip32": true + } + }, + "@ethereumjs/tx>ethereum-cryptography>@noble/curves": { + "globals": { + "TextEncoder": true + }, + "packages": { + "@ethereumjs/tx>ethereum-cryptography>@noble/curves>@noble/hashes": true + } + }, + "@ethereumjs/tx>ethereum-cryptography>@noble/curves>@noble/hashes": { + "globals": { + "TextEncoder": true, + "crypto": true } }, "@ethereumjs/tx>ethereum-cryptography>@noble/hashes": { @@ -200,8 +214,8 @@ }, "@ethereumjs/tx>ethereum-cryptography>@scure/bip32": { "packages": { + "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true, "@ethereumjs/tx>ethereum-cryptography>@scure/bip32>@noble/hashes": true, - "@metamask/message-signing-snap>@noble/curves": true, "@metamask/utils>@scure/base": true } }, @@ -1664,27 +1678,6 @@ "browserify>url": true } }, - "@metamask/message-signing-snap>@noble/ciphers": { - "globals": { - "TextDecoder": true, - "TextEncoder": true, - "crypto": true - } - }, - "@metamask/message-signing-snap>@noble/curves": { - "globals": { - "TextEncoder": true - }, - "packages": { - "@metamask/message-signing-snap>@noble/curves>@noble/hashes": true - } - }, - "@metamask/message-signing-snap>@noble/curves>@noble/hashes": { - "globals": { - "TextEncoder": true, - "crypto": true - } - }, "@metamask/name-controller": { "globals": { "fetch": true @@ -2230,13 +2223,20 @@ "@metamask/base-controller": true, "@metamask/keyring-api": true, "@metamask/keyring-controller": true, - "@metamask/message-signing-snap>@noble/ciphers": true, + "@metamask/profile-sync-controller>@noble/ciphers": true, "@metamask/profile-sync-controller>siwe": true, "@noble/hashes": true, "browserify>buffer": true, "loglevel": true } }, + "@metamask/profile-sync-controller>@noble/ciphers": { + "globals": { + "TextDecoder": true, + "TextEncoder": true, + "crypto": true + } + }, "@metamask/profile-sync-controller>siwe": { "globals": { "console.error": true, @@ -2616,7 +2616,7 @@ }, "@metamask/snaps-sdk>@metamask/key-tree": { "packages": { - "@metamask/message-signing-snap>@noble/curves": true, + "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true, "@metamask/scure-bip39": true, "@metamask/snaps-sdk>@metamask/key-tree>@metamask/utils": true, "@metamask/utils>@scure/base": true, @@ -2675,7 +2675,7 @@ }, "@metamask/snaps-utils>@metamask/snaps-registry": { "packages": { - "@metamask/message-signing-snap>@noble/curves": true, + "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true, "@metamask/utils": true, "@metamask/utils>@metamask/superstruct": true, "@noble/hashes": true diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json index 142c348220e3..b917769d9bfc 100644 --- a/lavamoat/browserify/mmi/policy.json +++ b/lavamoat/browserify/mmi/policy.json @@ -187,9 +187,23 @@ "crypto": true }, "packages": { + "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true, "@ethereumjs/tx>ethereum-cryptography>@noble/hashes": true, - "@ethereumjs/tx>ethereum-cryptography>@scure/bip32": true, - "@metamask/message-signing-snap>@noble/curves": true + "@ethereumjs/tx>ethereum-cryptography>@scure/bip32": true + } + }, + "@ethereumjs/tx>ethereum-cryptography>@noble/curves": { + "globals": { + "TextEncoder": true + }, + "packages": { + "@ethereumjs/tx>ethereum-cryptography>@noble/curves>@noble/hashes": true + } + }, + "@ethereumjs/tx>ethereum-cryptography>@noble/curves>@noble/hashes": { + "globals": { + "TextEncoder": true, + "crypto": true } }, "@ethereumjs/tx>ethereum-cryptography>@noble/hashes": { @@ -200,8 +214,8 @@ }, "@ethereumjs/tx>ethereum-cryptography>@scure/bip32": { "packages": { + "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true, "@ethereumjs/tx>ethereum-cryptography>@scure/bip32>@noble/hashes": true, - "@metamask/message-signing-snap>@noble/curves": true, "@metamask/utils>@scure/base": true } }, @@ -1756,27 +1770,6 @@ "browserify>url": true } }, - "@metamask/message-signing-snap>@noble/ciphers": { - "globals": { - "TextDecoder": true, - "TextEncoder": true, - "crypto": true - } - }, - "@metamask/message-signing-snap>@noble/curves": { - "globals": { - "TextEncoder": true - }, - "packages": { - "@metamask/message-signing-snap>@noble/curves>@noble/hashes": true - } - }, - "@metamask/message-signing-snap>@noble/curves>@noble/hashes": { - "globals": { - "TextEncoder": true, - "crypto": true - } - }, "@metamask/name-controller": { "globals": { "fetch": true @@ -2322,13 +2315,20 @@ "@metamask/base-controller": true, "@metamask/keyring-api": true, "@metamask/keyring-controller": true, - "@metamask/message-signing-snap>@noble/ciphers": true, + "@metamask/profile-sync-controller>@noble/ciphers": true, "@metamask/profile-sync-controller>siwe": true, "@noble/hashes": true, "browserify>buffer": true, "loglevel": true } }, + "@metamask/profile-sync-controller>@noble/ciphers": { + "globals": { + "TextDecoder": true, + "TextEncoder": true, + "crypto": true + } + }, "@metamask/profile-sync-controller>siwe": { "globals": { "console.error": true, @@ -2708,7 +2708,7 @@ }, "@metamask/snaps-sdk>@metamask/key-tree": { "packages": { - "@metamask/message-signing-snap>@noble/curves": true, + "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true, "@metamask/scure-bip39": true, "@metamask/snaps-sdk>@metamask/key-tree>@metamask/utils": true, "@metamask/utils>@scure/base": true, @@ -2767,7 +2767,7 @@ }, "@metamask/snaps-utils>@metamask/snaps-registry": { "packages": { - "@metamask/message-signing-snap>@noble/curves": true, + "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true, "@metamask/utils": true, "@metamask/utils>@metamask/superstruct": true, "@noble/hashes": true