From 3d68730e0efc1e7ee2acd7175361307bd65f546f Mon Sep 17 00:00:00 2001 From: Charly Chevalier Date: Thu, 19 Sep 2024 16:00:47 +0200 Subject: [PATCH 01/10] chore: update accounts related packages --- lavamoat/browserify/beta/policy.json | 34 +---- lavamoat/browserify/flask/policy.json | 34 +---- lavamoat/browserify/main/policy.json | 34 +---- lavamoat/browserify/mmi/policy.json | 34 +---- package.json | 14 +- yarn.lock | 187 +++++++++++++------------- 6 files changed, 109 insertions(+), 228 deletions(-) diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json index 911a6ff8b04a..95835b028ee9 100644 --- a/lavamoat/browserify/beta/policy.json +++ b/lavamoat/browserify/beta/policy.json @@ -1351,51 +1351,21 @@ "@ethereumjs/tx>@ethereumjs/util": true, "@ethereumjs/tx>ethereum-cryptography": true, "@metamask/eth-sig-util": true, - "@metamask/keyring-controller>@metamask/eth-hd-keyring>@metamask/utils": true, "@metamask/scure-bip39": true, + "@metamask/utils": true, "browserify>buffer": true } }, - "@metamask/keyring-controller>@metamask/eth-hd-keyring>@metamask/utils": { - "globals": { - "TextDecoder": true, - "TextEncoder": true - }, - "packages": { - "@metamask/utils>@metamask/superstruct": true, - "@metamask/utils>@scure/base": true, - "@metamask/utils>pony-cause": true, - "@noble/hashes": true, - "browserify>buffer": true, - "nock>debug": true, - "semver": true - } - }, "@metamask/keyring-controller>@metamask/eth-simple-keyring": { "packages": { "@ethereumjs/tx>@ethereumjs/util": true, "@ethereumjs/tx>ethereum-cryptography": true, "@metamask/eth-sig-util": true, - "@metamask/keyring-controller>@metamask/eth-simple-keyring>@metamask/utils": true, + "@metamask/utils": true, "browserify>buffer": true, "crypto-browserify>randombytes": true } }, - "@metamask/keyring-controller>@metamask/eth-simple-keyring>@metamask/utils": { - "globals": { - "TextDecoder": true, - "TextEncoder": true - }, - "packages": { - "@metamask/utils>@metamask/superstruct": true, - "@metamask/utils>@scure/base": true, - "@metamask/utils>pony-cause": true, - "@noble/hashes": true, - "browserify>buffer": true, - "nock>debug": true, - "semver": true - } - }, "@metamask/keyring-controller>ethereumjs-wallet": { "packages": { "@metamask/keyring-controller>ethereumjs-wallet>ethereum-cryptography": true, diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json index 911a6ff8b04a..95835b028ee9 100644 --- a/lavamoat/browserify/flask/policy.json +++ b/lavamoat/browserify/flask/policy.json @@ -1351,51 +1351,21 @@ "@ethereumjs/tx>@ethereumjs/util": true, "@ethereumjs/tx>ethereum-cryptography": true, "@metamask/eth-sig-util": true, - "@metamask/keyring-controller>@metamask/eth-hd-keyring>@metamask/utils": true, "@metamask/scure-bip39": true, + "@metamask/utils": true, "browserify>buffer": true } }, - "@metamask/keyring-controller>@metamask/eth-hd-keyring>@metamask/utils": { - "globals": { - "TextDecoder": true, - "TextEncoder": true - }, - "packages": { - "@metamask/utils>@metamask/superstruct": true, - "@metamask/utils>@scure/base": true, - "@metamask/utils>pony-cause": true, - "@noble/hashes": true, - "browserify>buffer": true, - "nock>debug": true, - "semver": true - } - }, "@metamask/keyring-controller>@metamask/eth-simple-keyring": { "packages": { "@ethereumjs/tx>@ethereumjs/util": true, "@ethereumjs/tx>ethereum-cryptography": true, "@metamask/eth-sig-util": true, - "@metamask/keyring-controller>@metamask/eth-simple-keyring>@metamask/utils": true, + "@metamask/utils": true, "browserify>buffer": true, "crypto-browserify>randombytes": true } }, - "@metamask/keyring-controller>@metamask/eth-simple-keyring>@metamask/utils": { - "globals": { - "TextDecoder": true, - "TextEncoder": true - }, - "packages": { - "@metamask/utils>@metamask/superstruct": true, - "@metamask/utils>@scure/base": true, - "@metamask/utils>pony-cause": true, - "@noble/hashes": true, - "browserify>buffer": true, - "nock>debug": true, - "semver": true - } - }, "@metamask/keyring-controller>ethereumjs-wallet": { "packages": { "@metamask/keyring-controller>ethereumjs-wallet>ethereum-cryptography": true, diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json index 911a6ff8b04a..95835b028ee9 100644 --- a/lavamoat/browserify/main/policy.json +++ b/lavamoat/browserify/main/policy.json @@ -1351,51 +1351,21 @@ "@ethereumjs/tx>@ethereumjs/util": true, "@ethereumjs/tx>ethereum-cryptography": true, "@metamask/eth-sig-util": true, - "@metamask/keyring-controller>@metamask/eth-hd-keyring>@metamask/utils": true, "@metamask/scure-bip39": true, + "@metamask/utils": true, "browserify>buffer": true } }, - "@metamask/keyring-controller>@metamask/eth-hd-keyring>@metamask/utils": { - "globals": { - "TextDecoder": true, - "TextEncoder": true - }, - "packages": { - "@metamask/utils>@metamask/superstruct": true, - "@metamask/utils>@scure/base": true, - "@metamask/utils>pony-cause": true, - "@noble/hashes": true, - "browserify>buffer": true, - "nock>debug": true, - "semver": true - } - }, "@metamask/keyring-controller>@metamask/eth-simple-keyring": { "packages": { "@ethereumjs/tx>@ethereumjs/util": true, "@ethereumjs/tx>ethereum-cryptography": true, "@metamask/eth-sig-util": true, - "@metamask/keyring-controller>@metamask/eth-simple-keyring>@metamask/utils": true, + "@metamask/utils": true, "browserify>buffer": true, "crypto-browserify>randombytes": true } }, - "@metamask/keyring-controller>@metamask/eth-simple-keyring>@metamask/utils": { - "globals": { - "TextDecoder": true, - "TextEncoder": true - }, - "packages": { - "@metamask/utils>@metamask/superstruct": true, - "@metamask/utils>@scure/base": true, - "@metamask/utils>pony-cause": true, - "@noble/hashes": true, - "browserify>buffer": true, - "nock>debug": true, - "semver": true - } - }, "@metamask/keyring-controller>ethereumjs-wallet": { "packages": { "@metamask/keyring-controller>ethereumjs-wallet>ethereum-cryptography": true, diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json index 2fa339f5201e..8c60013092de 100644 --- a/lavamoat/browserify/mmi/policy.json +++ b/lavamoat/browserify/mmi/policy.json @@ -1443,51 +1443,21 @@ "@ethereumjs/tx>@ethereumjs/util": true, "@ethereumjs/tx>ethereum-cryptography": true, "@metamask/eth-sig-util": true, - "@metamask/keyring-controller>@metamask/eth-hd-keyring>@metamask/utils": true, "@metamask/scure-bip39": true, + "@metamask/utils": true, "browserify>buffer": true } }, - "@metamask/keyring-controller>@metamask/eth-hd-keyring>@metamask/utils": { - "globals": { - "TextDecoder": true, - "TextEncoder": true - }, - "packages": { - "@metamask/utils>@metamask/superstruct": true, - "@metamask/utils>@scure/base": true, - "@metamask/utils>pony-cause": true, - "@noble/hashes": true, - "browserify>buffer": true, - "nock>debug": true, - "semver": true - } - }, "@metamask/keyring-controller>@metamask/eth-simple-keyring": { "packages": { "@ethereumjs/tx>@ethereumjs/util": true, "@ethereumjs/tx>ethereum-cryptography": true, "@metamask/eth-sig-util": true, - "@metamask/keyring-controller>@metamask/eth-simple-keyring>@metamask/utils": true, + "@metamask/utils": true, "browserify>buffer": true, "crypto-browserify>randombytes": true } }, - "@metamask/keyring-controller>@metamask/eth-simple-keyring>@metamask/utils": { - "globals": { - "TextDecoder": true, - "TextEncoder": true - }, - "packages": { - "@metamask/utils>@metamask/superstruct": true, - "@metamask/utils>@scure/base": true, - "@metamask/utils>pony-cause": true, - "@noble/hashes": true, - "browserify>buffer": true, - "nock>debug": true, - "semver": true - } - }, "@metamask/keyring-controller>ethereumjs-wallet": { "packages": { "@metamask/keyring-controller>ethereumjs-wallet>ethereum-cryptography": true, diff --git a/package.json b/package.json index d54962b53b24..a9beb1e2dd05 100644 --- a/package.json +++ b/package.json @@ -298,7 +298,7 @@ "@metamask-institutional/types": "^1.1.0", "@metamask/abi-utils": "^2.0.2", "@metamask/account-watcher": "^4.1.0", - "@metamask/accounts-controller": "^18.2.1", + "@metamask/accounts-controller": "^18.2.2", "@metamask/address-book-controller": "^6.0.0", "@metamask/announcement-controller": "^7.0.0", "@metamask/approval-controller": "^7.0.0", @@ -316,17 +316,17 @@ "@metamask/eth-ledger-bridge-keyring": "^3.0.1", "@metamask/eth-query": "^4.0.0", "@metamask/eth-sig-util": "^7.0.1", - "@metamask/eth-snap-keyring": "^4.3.3", + "@metamask/eth-snap-keyring": "^4.3.6", "@metamask/eth-token-tracker": "^8.0.0", - "@metamask/eth-trezor-keyring": "^3.1.0", + "@metamask/eth-trezor-keyring": "^3.1.3", "@metamask/etherscan-link": "^3.0.0", "@metamask/ethjs": "^0.6.0", "@metamask/ethjs-contract": "^0.4.1", "@metamask/ethjs-query": "^0.7.1", "@metamask/gas-fee-controller": "^18.0.0", "@metamask/jazzicon": "^2.0.0", - "@metamask/keyring-api": "^8.1.0", - "@metamask/keyring-controller": "^17.2.1", + "@metamask/keyring-api": "^8.1.3", + "@metamask/keyring-controller": "^17.2.2", "@metamask/logging-controller": "^6.0.0", "@metamask/logo": "^3.1.2", "@metamask/message-manager": "^10.1.0", @@ -344,7 +344,7 @@ "@metamask/post-message-stream": "^8.0.0", "@metamask/ppom-validator": "0.34.0", "@metamask/preinstalled-example-snap": "^0.1.0", - "@metamask/profile-sync-controller": "^0.9.1", + "@metamask/profile-sync-controller": "^0.9.2", "@metamask/providers": "^14.0.2", "@metamask/queued-request-controller": "^2.0.0", "@metamask/rate-limit-controller": "^6.0.0", @@ -359,7 +359,7 @@ "@metamask/snaps-rpc-methods": "^11.1.1", "@metamask/snaps-sdk": "^6.5.1", "@metamask/snaps-utils": "^8.1.1", - "@metamask/transaction-controller": "^37.0.0", + "@metamask/transaction-controller": "37.1.0", "@metamask/user-operation-controller": "^13.0.0", "@metamask/utils": "^9.1.0", "@ngraveio/bc-ur": "^1.1.12", diff --git a/yarn.lock b/yarn.lock index 4a0bbee20818..f66bd06a1951 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2429,7 +2429,7 @@ __metadata: languageName: node linkType: hard -"@ethereumjs/tx@npm:^4.0.0, @ethereumjs/tx@npm:^4.0.2, @ethereumjs/tx@npm:^4.1.1, @ethereumjs/tx@npm:^4.2.0": +"@ethereumjs/tx@npm:^4.0.2, @ethereumjs/tx@npm:^4.1.1, @ethereumjs/tx@npm:^4.2.0": version: 4.2.0 resolution: "@ethereumjs/tx@npm:4.2.0" dependencies: @@ -4800,14 +4800,14 @@ __metadata: languageName: node linkType: hard -"@metamask/accounts-controller@npm:^18.2.1": - version: 18.2.1 - resolution: "@metamask/accounts-controller@npm:18.2.1" +"@metamask/accounts-controller@npm:^18.2.2": + version: 18.2.2 + resolution: "@metamask/accounts-controller@npm:18.2.2" dependencies: "@ethereumjs/util": "npm:^8.1.0" "@metamask/base-controller": "npm:^7.0.1" - "@metamask/eth-snap-keyring": "npm:^4.3.3" - "@metamask/keyring-api": "npm:^8.1.0" + "@metamask/eth-snap-keyring": "npm:^4.3.6" + "@metamask/keyring-api": "npm:^8.1.3" "@metamask/snaps-sdk": "npm:^6.5.0" "@metamask/snaps-utils": "npm:^8.1.1" "@metamask/utils": "npm:^9.1.0" @@ -4818,7 +4818,7 @@ __metadata: peerDependencies: "@metamask/keyring-controller": ^17.0.0 "@metamask/snaps-controllers": ^9.7.0 - checksum: 10/cad8d68e5c5d8b349fcf5bfd6bc900cccbb5ad54bdcf2678a4469f7b3118064ca26bedafaafa89bea6ddce6f0cfb22af8eb8b7958bbd6cfce916f19a91a8e770 + checksum: 10/095be37c94a577304425f80600d4ef847c83c702ccf3d6b1591602d1fe292bdd3273131e336d6108bd713bff38812dfc4d7b21d4075669cde24e12f117f2dd81 languageName: node linkType: hard @@ -5153,16 +5153,16 @@ __metadata: languageName: node linkType: hard -"@metamask/eth-hd-keyring@npm:^7.0.1": - version: 7.0.1 - resolution: "@metamask/eth-hd-keyring@npm:7.0.1" +"@metamask/eth-hd-keyring@npm:^7.0.4": + version: 7.0.4 + resolution: "@metamask/eth-hd-keyring@npm:7.0.4" dependencies: "@ethereumjs/util": "npm:^8.1.0" - "@metamask/eth-sig-util": "npm:^7.0.0" - "@metamask/scure-bip39": "npm:^2.1.0" - "@metamask/utils": "npm:^8.1.0" + "@metamask/eth-sig-util": "npm:^7.0.3" + "@metamask/scure-bip39": "npm:^2.1.1" + "@metamask/utils": "npm:^9.2.1" ethereum-cryptography: "npm:^2.1.2" - checksum: 10/adb6aa532168db69aa8569be00942a4b62751ce6bff6ef5fbcda0646cfc6baf13c3b20ab72e12622797cb6c5d6901289be943f5b27d55a5ae4a90fa00c2a29cf + checksum: 10/493d06f55225b6f9da48ee001486e18898d6a4a3afd2cf40ff1dcae2ece42d5e96174f6a05b7c39419cb3531b530c8af294d9422195661788c5e0b687a328874 languageName: node linkType: hard @@ -5331,34 +5331,35 @@ __metadata: languageName: node linkType: hard -"@metamask/eth-simple-keyring@npm:^6.0.1": - version: 6.0.1 - resolution: "@metamask/eth-simple-keyring@npm:6.0.1" +"@metamask/eth-simple-keyring@npm:^6.0.5": + version: 6.0.5 + resolution: "@metamask/eth-simple-keyring@npm:6.0.5" dependencies: "@ethereumjs/util": "npm:^8.1.0" - "@metamask/eth-sig-util": "npm:^7.0.0" - "@metamask/utils": "npm:^8.1.0" + "@metamask/eth-sig-util": "npm:^7.0.3" + "@metamask/utils": "npm:^9.2.1" ethereum-cryptography: "npm:^2.1.2" randombytes: "npm:^2.1.0" - checksum: 10/214470a237c9508097faad1df0de7b79300363325ca684182ea7e56d3ac06b030b9f77010b6587c281e8e113c36799f755c595d4bbcdadc45dda88f0a25f5f13 + checksum: 10/98b7bd00df25e7630324e2c762e3a03a7f199108a4dfe22e5a1938f1d01c9b2cd64ab4bb6fd242bf898624903d5a68a2e1f61c95f94a141266ab23dae8d97d21 languageName: node linkType: hard -"@metamask/eth-snap-keyring@npm:^4.3.1, @metamask/eth-snap-keyring@npm:^4.3.3": - version: 4.3.3 - resolution: "@metamask/eth-snap-keyring@npm:4.3.3" +"@metamask/eth-snap-keyring@npm:^4.3.1, @metamask/eth-snap-keyring@npm:^4.3.6": + version: 4.3.6 + resolution: "@metamask/eth-snap-keyring@npm:4.3.6" dependencies: "@ethereumjs/tx": "npm:^4.2.0" "@metamask/eth-sig-util": "npm:^7.0.3" - "@metamask/keyring-api": "npm:^8.1.0" - "@metamask/snaps-controllers": "npm:^9.6.0" - "@metamask/snaps-sdk": "npm:^6.4.0" - "@metamask/snaps-utils": "npm:^7.8.0" + "@metamask/snaps-controllers": "npm:^9.7.0" + "@metamask/snaps-sdk": "npm:^6.5.1" + "@metamask/snaps-utils": "npm:^7.8.1" "@metamask/superstruct": "npm:^3.1.0" "@metamask/utils": "npm:^9.2.1" - "@types/uuid": "npm:^9.0.1" - uuid: "npm:^9.0.0" - checksum: 10/035c82afef82a4cee7bc63b5c4f152a132b683017ec90a4b614764a4bc7adcca8faccf78c25adcddca2d29eee2fed08706f07d72afb93640956b86e862d4f555 + "@types/uuid": "npm:^9.0.8" + uuid: "npm:^9.0.1" + peerDependencies: + "@metamask/keyring-api": ^8.1.3 + checksum: 10/378dce125ba9e38b9ba7d9b7124383b4fd8d2782207dc69e1ae9e262beb83f22044eae5200986d4c353de29e5283c289e56b3acb88c8971a63f9365bdde3d5b4 languageName: node linkType: hard @@ -5379,17 +5380,17 @@ __metadata: languageName: node linkType: hard -"@metamask/eth-trezor-keyring@npm:^3.1.0": - version: 3.1.0 - resolution: "@metamask/eth-trezor-keyring@npm:3.1.0" +"@metamask/eth-trezor-keyring@npm:^3.1.3": + version: 3.1.3 + resolution: "@metamask/eth-trezor-keyring@npm:3.1.3" dependencies: - "@ethereumjs/tx": "npm:^4.0.0" - "@ethereumjs/util": "npm:^8.0.0" - "@metamask/eth-sig-util": "npm:^7.0.1" + "@ethereumjs/tx": "npm:^4.2.0" + "@ethereumjs/util": "npm:^8.1.0" + "@metamask/eth-sig-util": "npm:^7.0.3" "@trezor/connect-plugin-ethereum": "npm:^9.0.3" "@trezor/connect-web": "npm:^9.1.11" hdkey: "npm:^2.1.0" - checksum: 10/2e72ab89f757494f4e4ddf46a6ddd4b6ac7db15d051d6252cd883fff537df01235f56fe9c6d02e8da03cf735a6c67f9bcdf35e50895cab034f88e838b1100b81 + checksum: 10/d32a687bcaab4593e6208a1bb59cbdd2b111eff357fd30e707787454ef571abfb4e6162422504f730f3ab2fe576b555d68114de0406ae5cdad252dab1b635cce languageName: node linkType: hard @@ -5641,9 +5642,9 @@ __metadata: languageName: node linkType: hard -"@metamask/keyring-api@npm:^8.0.0, @metamask/keyring-api@npm:^8.1.0, @metamask/keyring-api@npm:^8.1.2": - version: 8.1.2 - resolution: "@metamask/keyring-api@npm:8.1.2" +"@metamask/keyring-api@npm:^8.0.0, @metamask/keyring-api@npm:^8.1.3": + version: 8.1.3 + resolution: "@metamask/keyring-api@npm:8.1.3" dependencies: "@metamask/snaps-sdk": "npm:^6.5.1" "@metamask/superstruct": "npm:^3.1.0" @@ -5652,29 +5653,29 @@ __metadata: bech32: "npm:^2.0.0" uuid: "npm:^9.0.1" peerDependencies: - "@metamask/providers": ">=15 <18" - checksum: 10/bddb6d8c86f39b9afef0b484b473cfff5e33c99037de6ded2bc5d04d935971bf232237121c0e1297e43f266006f9c8a0cf48aa7d5588a7c4796fc803acdcfd00 + "@metamask/providers": ^17.2.0 + checksum: 10/9857b6286760d22b1b7102ea8bdf03ebf56c71e9f0adee19a2230def6b7a9230561c1a3bfcb308735b79ab9a5afa9afd07a1617c1d165f63d193cd6a6b6e7a15 languageName: node linkType: hard -"@metamask/keyring-controller@npm:^17.1.0, @metamask/keyring-controller@npm:^17.2.1": - version: 17.2.1 - resolution: "@metamask/keyring-controller@npm:17.2.1" +"@metamask/keyring-controller@npm:^17.1.0, @metamask/keyring-controller@npm:^17.2.2": + version: 17.2.2 + resolution: "@metamask/keyring-controller@npm:17.2.2" dependencies: "@ethereumjs/util": "npm:^8.1.0" "@keystonehq/metamask-airgapped-keyring": "npm:^0.14.1" "@metamask/base-controller": "npm:^7.0.1" "@metamask/browser-passworder": "npm:^4.3.0" - "@metamask/eth-hd-keyring": "npm:^7.0.1" + "@metamask/eth-hd-keyring": "npm:^7.0.4" "@metamask/eth-sig-util": "npm:^7.0.1" - "@metamask/eth-simple-keyring": "npm:^6.0.1" - "@metamask/keyring-api": "npm:^8.1.0" + "@metamask/eth-simple-keyring": "npm:^6.0.5" + "@metamask/keyring-api": "npm:^8.1.3" "@metamask/message-manager": "npm:^10.1.1" "@metamask/utils": "npm:^9.1.0" async-mutex: "npm:^0.5.0" ethereumjs-wallet: "npm:^1.0.1" immer: "npm:^9.0.6" - checksum: 10/051cfc790d74a64c2e8139dbcdb38e845d10f3a3a85792ece6b38b0f239057f553c6f74b49e79dd6748093f1bf3b82d484d927aead3aa891247839b1fac8df66 + checksum: 10/3c3cec4c813de78c889c38b9a5f6201929743544a28c9e734bbf57a3774e3c2bc9432bb3cefa69bb7ed3580933898329c8a5e374c21c07ea204ee19bf094c8ff languageName: node linkType: hard @@ -6053,13 +6054,13 @@ __metadata: languageName: node linkType: hard -"@metamask/profile-sync-controller@npm:^0.9.1": - version: 0.9.1 - resolution: "@metamask/profile-sync-controller@npm:0.9.1" +"@metamask/profile-sync-controller@npm:^0.9.2": + version: 0.9.2 + resolution: "@metamask/profile-sync-controller@npm:0.9.2" dependencies: "@metamask/base-controller": "npm:^7.0.1" - "@metamask/keyring-api": "npm:^8.1.2" - "@metamask/keyring-controller": "npm:^17.2.1" + "@metamask/keyring-api": "npm:^8.1.3" + "@metamask/keyring-controller": "npm:^17.2.2" "@metamask/snaps-sdk": "npm:^6.5.0" "@metamask/snaps-utils": "npm:^8.1.1" "@noble/ciphers": "npm:^0.5.2" @@ -6071,7 +6072,7 @@ __metadata: "@metamask/accounts-controller": ^18.1.1 "@metamask/keyring-controller": ^17.2.0 "@metamask/snaps-controllers": ^9.7.0 - checksum: 10/9f0c22e136a526527ec3a147084024b6d5a20219894166f00fc6b22d1554f61f19b357ccbdd32973745e03ab0481d1908295309870f723e7d3bf06f720569d8a + checksum: 10/11a651f366da5a330225938ad6ca9e00c1c644ce67abc7d5e15039278b87b7a203171addd5911f59a21dd850a97e0916207d778f679dcdd4f6eb9bed9d8453b2 languageName: node linkType: hard @@ -6188,7 +6189,7 @@ __metadata: languageName: node linkType: hard -"@metamask/scure-bip39@npm:^2.0.3, @metamask/scure-bip39@npm:^2.1.0, @metamask/scure-bip39@npm:^2.1.1": +"@metamask/scure-bip39@npm:^2.0.3, @metamask/scure-bip39@npm:^2.1.1": version: 2.1.1 resolution: "@metamask/scure-bip39@npm:2.1.1" dependencies: @@ -6267,7 +6268,7 @@ __metadata: languageName: node linkType: hard -"@metamask/snaps-controllers@npm:^9.6.0, @metamask/snaps-controllers@npm:^9.7.0": +"@metamask/snaps-controllers@npm:^9.7.0": version: 9.7.0 resolution: "@metamask/snaps-controllers@npm:9.7.0" dependencies: @@ -6364,7 +6365,7 @@ __metadata: languageName: node linkType: hard -"@metamask/snaps-utils@npm:^7.4.0, @metamask/snaps-utils@npm:^7.8.0": +"@metamask/snaps-utils@npm:^7.4.0, @metamask/snaps-utils@npm:^7.8.1": version: 7.8.1 resolution: "@metamask/snaps-utils@npm:7.8.1" dependencies: @@ -6470,9 +6471,9 @@ __metadata: languageName: node linkType: hard -"@metamask/transaction-controller@npm:^34.0.0": - version: 34.0.0 - resolution: "@metamask/transaction-controller@npm:34.0.0" +"@metamask/transaction-controller@npm:37.1.0": + version: 37.1.0 + resolution: "@metamask/transaction-controller@npm:37.1.0" dependencies: "@ethereumjs/common": "npm:^3.2.0" "@ethereumjs/tx": "npm:^4.2.0" @@ -6480,17 +6481,13 @@ __metadata: "@ethersproject/abi": "npm:^5.7.0" "@ethersproject/contracts": "npm:^5.7.0" "@ethersproject/providers": "npm:^5.7.0" - "@metamask/accounts-controller": "npm:^17.2.0" - "@metamask/approval-controller": "npm:^7.0.0" - "@metamask/base-controller": "npm:^6.0.0" - "@metamask/controller-utils": "npm:^11.0.0" + "@metamask/base-controller": "npm:^7.0.1" + "@metamask/controller-utils": "npm:^11.3.0" "@metamask/eth-query": "npm:^4.0.0" - "@metamask/gas-fee-controller": "npm:^18.0.0" "@metamask/metamask-eth-abis": "npm:^3.1.1" - "@metamask/network-controller": "npm:^19.0.0" - "@metamask/nonce-tracker": "npm:^5.0.0" - "@metamask/rpc-errors": "npm:^6.2.1" - "@metamask/utils": "npm:^8.3.0" + "@metamask/nonce-tracker": "npm:^6.0.0" + "@metamask/rpc-errors": "npm:^6.3.1" + "@metamask/utils": "npm:^9.1.0" async-mutex: "npm:^0.5.0" bn.js: "npm:^5.2.1" eth-method-registry: "npm:^4.0.0" @@ -6499,17 +6496,17 @@ __metadata: uuid: "npm:^8.3.2" peerDependencies: "@babel/runtime": ^7.23.9 - "@metamask/accounts-controller": ^17.0.0 + "@metamask/accounts-controller": ^18.0.0 "@metamask/approval-controller": ^7.0.0 - "@metamask/gas-fee-controller": ^18.0.0 - "@metamask/network-controller": ^19.0.0 - checksum: 10/170b760dec516ca191de8fa2e7afce6aeb445880fa5717387c047202643ec303382a9edbe6c80024cbfc2e219ef98de6f9785b13bb4032b7b1100f29e6f3948d + "@metamask/gas-fee-controller": ^20.0.0 + "@metamask/network-controller": ^21.0.0 + checksum: 10/b265c73f3410660ca2021f091508d6dec5e6b9cce240e420f91dd87f48d846ccca68d23892860fabd32dba62551476a9a7476d240679d58a50c1eab4cd04ab82 languageName: node linkType: hard -"@metamask/transaction-controller@npm:^37.0.0": - version: 37.0.0 - resolution: "@metamask/transaction-controller@npm:37.0.0" +"@metamask/transaction-controller@npm:^34.0.0": + version: 34.0.0 + resolution: "@metamask/transaction-controller@npm:34.0.0" dependencies: "@ethereumjs/common": "npm:^3.2.0" "@ethereumjs/tx": "npm:^4.2.0" @@ -6517,13 +6514,17 @@ __metadata: "@ethersproject/abi": "npm:^5.7.0" "@ethersproject/contracts": "npm:^5.7.0" "@ethersproject/providers": "npm:^5.7.0" - "@metamask/base-controller": "npm:^7.0.1" - "@metamask/controller-utils": "npm:^11.3.0" + "@metamask/accounts-controller": "npm:^17.2.0" + "@metamask/approval-controller": "npm:^7.0.0" + "@metamask/base-controller": "npm:^6.0.0" + "@metamask/controller-utils": "npm:^11.0.0" "@metamask/eth-query": "npm:^4.0.0" + "@metamask/gas-fee-controller": "npm:^18.0.0" "@metamask/metamask-eth-abis": "npm:^3.1.1" - "@metamask/nonce-tracker": "npm:^6.0.0" - "@metamask/rpc-errors": "npm:^6.3.1" - "@metamask/utils": "npm:^9.1.0" + "@metamask/network-controller": "npm:^19.0.0" + "@metamask/nonce-tracker": "npm:^5.0.0" + "@metamask/rpc-errors": "npm:^6.2.1" + "@metamask/utils": "npm:^8.3.0" async-mutex: "npm:^0.5.0" bn.js: "npm:^5.2.1" eth-method-registry: "npm:^4.0.0" @@ -6532,11 +6533,11 @@ __metadata: uuid: "npm:^8.3.2" peerDependencies: "@babel/runtime": ^7.23.9 - "@metamask/accounts-controller": ^18.0.0 + "@metamask/accounts-controller": ^17.0.0 "@metamask/approval-controller": ^7.0.0 - "@metamask/gas-fee-controller": ^20.0.0 - "@metamask/network-controller": ^21.0.0 - checksum: 10/b4608260cb86ad1a867926b983a21050a2be899f17af909ad2403b5148eada348b0fbb3f7ecef9ebc7cf8d28c040ce4d6f5009709328cda00fab61e10fa94de6 + "@metamask/gas-fee-controller": ^18.0.0 + "@metamask/network-controller": ^19.0.0 + checksum: 10/170b760dec516ca191de8fa2e7afce6aeb445880fa5717387c047202643ec303382a9edbe6c80024cbfc2e219ef98de6f9785b13bb4032b7b1100f29e6f3948d languageName: node linkType: hard @@ -26081,7 +26082,7 @@ __metadata: "@metamask-institutional/types": "npm:^1.1.0" "@metamask/abi-utils": "npm:^2.0.2" "@metamask/account-watcher": "npm:^4.1.0" - "@metamask/accounts-controller": "npm:^18.2.1" + "@metamask/accounts-controller": "npm:^18.2.2" "@metamask/address-book-controller": "npm:^6.0.0" "@metamask/announcement-controller": "npm:^7.0.0" "@metamask/api-specs": "npm:^0.9.3" @@ -26108,9 +26109,9 @@ __metadata: "@metamask/eth-ledger-bridge-keyring": "npm:^3.0.1" "@metamask/eth-query": "npm:^4.0.0" "@metamask/eth-sig-util": "npm:^7.0.1" - "@metamask/eth-snap-keyring": "npm:^4.3.3" + "@metamask/eth-snap-keyring": "npm:^4.3.6" "@metamask/eth-token-tracker": "npm:^8.0.0" - "@metamask/eth-trezor-keyring": "npm:^3.1.0" + "@metamask/eth-trezor-keyring": "npm:^3.1.3" "@metamask/etherscan-link": "npm:^3.0.0" "@metamask/ethjs": "npm:^0.6.0" "@metamask/ethjs-contract": "npm:^0.4.1" @@ -26118,8 +26119,8 @@ __metadata: "@metamask/forwarder": "npm:^1.1.0" "@metamask/gas-fee-controller": "npm:^18.0.0" "@metamask/jazzicon": "npm:^2.0.0" - "@metamask/keyring-api": "npm:^8.1.0" - "@metamask/keyring-controller": "npm:^17.2.1" + "@metamask/keyring-api": "npm:^8.1.3" + "@metamask/keyring-controller": "npm:^17.2.2" "@metamask/logging-controller": "npm:^6.0.0" "@metamask/logo": "npm:^3.1.2" "@metamask/message-manager": "npm:^10.1.0" @@ -26138,7 +26139,7 @@ __metadata: "@metamask/post-message-stream": "npm:^8.0.0" "@metamask/ppom-validator": "npm:0.34.0" "@metamask/preinstalled-example-snap": "npm:^0.1.0" - "@metamask/profile-sync-controller": "npm:^0.9.1" + "@metamask/profile-sync-controller": "npm:^0.9.2" "@metamask/providers": "npm:^14.0.2" "@metamask/queued-request-controller": "npm:^2.0.0" "@metamask/rate-limit-controller": "npm:^6.0.0" @@ -26155,7 +26156,7 @@ __metadata: "@metamask/snaps-utils": "npm:^8.1.1" "@metamask/test-bundler": "npm:^1.0.0" "@metamask/test-dapp": "npm:^8.4.0" - "@metamask/transaction-controller": "npm:^37.0.0" + "@metamask/transaction-controller": "npm:37.1.0" "@metamask/user-operation-controller": "npm:^13.0.0" "@metamask/utils": "npm:^9.1.0" "@ngraveio/bc-ur": "npm:^1.1.12" From 720cf81996b7c2505eab253427f3c46d4cbf8bf8 Mon Sep 17 00:00:00 2001 From: Charly Chevalier Date: Tue, 24 Sep 2024 11:05:26 +0200 Subject: [PATCH 02/10] test(metrics): update snapshots --- ...rs-after-init-opt-in-background-state.json | 23 ++++++----------- .../errors-after-init-opt-in-ui-state.json | 25 +++++++------------ 2 files changed, 17 insertions(+), 31 deletions(-) diff --git a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json index c133de6128ca..a77221bb76c2 100644 --- a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json +++ b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json @@ -62,16 +62,8 @@ "bridgeState": { "bridgeFeatureFlags": { "extensionSupport": "boolean", - "srcNetworkAllowlist": { - "0": "string", - "1": "string", - "2": "string" - }, - "destNetworkAllowlist": { - "0": "string", - "1": "string", - "2": "string" - } + "srcNetworkAllowlist": { "0": "string", "1": "string", "2": "string" }, + "destNetworkAllowlist": { "0": "string", "1": "string", "2": "string" } } } }, @@ -180,6 +172,7 @@ "permissionActivityLog": "object" }, "PreferencesController": { + "selectedAddress": "string", "useBlockie": false, "useNonceField": false, "usePhishDetect": true, @@ -213,10 +206,10 @@ "smartTransactionsOptInStatus": false, "useNativeCurrencyAsPrimaryCurrency": true, "petnamesEnabled": true, + "showMultiRpcModal": "boolean", "isRedesignedConfirmationsDeveloperEnabled": "boolean", "redesignedConfirmationsEnabled": true, - "redesignedTransactionsEnabled": "boolean", - "showMultiRpcModal": "boolean" + "redesignedTransactionsEnabled": "boolean" }, "ipfsGateway": "string", "isIpfsGatewayEnabled": "boolean", @@ -228,8 +221,7 @@ "useExternalNameSources": "boolean", "useTransactionSimulations": true, "enableMV3TimestampSave": true, - "useExternalServices": "boolean", - "selectedAddress": "string" + "useExternalServices": "boolean" }, "QueuedRequestController": { "queuedRequestCount": 0 }, "SelectedNetworkController": { "domains": "object" }, @@ -306,7 +298,8 @@ "TxController": { "methodData": "object", "transactions": "object", - "lastFetchedBlockNumbers": "object" + "lastFetchedBlockNumbers": "object", + "submitHistory": "object" }, "UserOperationController": { "userOperations": "object" }, "UserStorageController": { diff --git a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json index dfee54fbd6cb..30182ef39425 100644 --- a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json +++ b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json @@ -17,7 +17,6 @@ "internalAccounts": { "accounts": "object", "selectedAccount": "string" }, "transactions": "object", "networkConfigurations": "object", - "networkConfigurationsByChainId": "object", "addressBook": "object", "confirmationExchangeRates": {}, "pendingTokens": "object", @@ -34,10 +33,10 @@ "smartTransactionsOptInStatus": false, "useNativeCurrencyAsPrimaryCurrency": true, "petnamesEnabled": true, + "showMultiRpcModal": "boolean", "isRedesignedConfirmationsDeveloperEnabled": "boolean", "redesignedConfirmationsEnabled": true, - "redesignedTransactionsEnabled": "boolean", - "showMultiRpcModal": "boolean" + "redesignedTransactionsEnabled": "boolean" }, "firstTimeFlowType": "import", "completedOnboarding": true, @@ -95,7 +94,9 @@ "status": "available" } }, + "networkConfigurationsByChainId": "object", "keyrings": "object", + "selectedAddress": "string", "useNonceField": false, "usePhishDetect": true, "dismissSeedBackUpReminder": true, @@ -127,16 +128,15 @@ "useTransactionSimulations": true, "enableMV3TimestampSave": true, "useExternalServices": "boolean", - "selectedAddress": "string", "metaMetricsId": "fake-metrics-id", "marketingCampaignCookieId": null, - "metaMetricsDataDeletionId": null, - "metaMetricsDataDeletionTimestamp": 0, "eventsBeforeMetricsOptIn": "object", "traits": "object", "previousUserTraits": "object", "fragments": "object", "segmentApiCalls": "object", + "metaMetricsDataDeletionId": null, + "metaMetricsDataDeletionTimestamp": 0, "currentCurrency": "usd", "alertEnabledness": { "unconnectedAccount": true, "web3ShimUsage": true }, "unconnectedAccountAlertShownOrigins": "object", @@ -177,6 +177,7 @@ "logs": "object", "methodData": "object", "lastFetchedBlockNumbers": "object", + "submitHistory": "object", "fiatCurrency": "usd", "rates": { "btc": { "conversionDate": 0, "conversionRate": "0" } }, "cryptocurrencies": ["btc"], @@ -248,16 +249,8 @@ "bridgeState": { "bridgeFeatureFlags": { "extensionSupport": "boolean", - "srcNetworkAllowlist": { - "0": "string", - "1": "string", - "2": "string" - }, - "destNetworkAllowlist": { - "0": "string", - "1": "string", - "2": "string" - } + "srcNetworkAllowlist": { "0": "string", "1": "string", "2": "string" }, + "destNetworkAllowlist": { "0": "string", "1": "string", "2": "string" } } }, "ensEntries": "object", From 1fea8f632458c1fb0d8d1c897828cc230dba7a99 Mon Sep 17 00:00:00 2001 From: Charly Chevalier Date: Thu, 26 Sep 2024 18:30:28 +0200 Subject: [PATCH 03/10] chore: update snap watch-only to version 4.1.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a9beb1e2dd05..e6461ff79dfe 100644 --- a/package.json +++ b/package.json @@ -297,7 +297,7 @@ "@metamask-institutional/transaction-update": "^0.2.5", "@metamask-institutional/types": "^1.1.0", "@metamask/abi-utils": "^2.0.2", - "@metamask/account-watcher": "^4.1.0", + "@metamask/account-watcher": "^4.1.1", "@metamask/accounts-controller": "^18.2.2", "@metamask/address-book-controller": "^6.0.0", "@metamask/announcement-controller": "^7.0.0", From 8f4df3e6c726e378f1a1dbef977e52fea457a741 Mon Sep 17 00:00:00 2001 From: Charly Chevalier Date: Thu, 26 Sep 2024 18:31:08 +0200 Subject: [PATCH 04/10] chore: update snap bitcoin-wallet to 0.6.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e6461ff79dfe..ffbd6bdbfd37 100644 --- a/package.json +++ b/package.json @@ -304,7 +304,7 @@ "@metamask/approval-controller": "^7.0.0", "@metamask/assets-controllers": "^37.0.0", "@metamask/base-controller": "^7.0.0", - "@metamask/bitcoin-wallet-snap": "^0.6.0", + "@metamask/bitcoin-wallet-snap": "^0.6.1", "@metamask/browser-passworder": "^4.3.0", "@metamask/contract-metadata": "^2.5.0", "@metamask/controller-utils": "^11.2.0", From f08e1a781c99962ba41c97f456b6675d8bfbc302 Mon Sep 17 00:00:00 2001 From: Charly Chevalier Date: Thu, 26 Sep 2024 18:31:36 +0200 Subject: [PATCH 05/10] test: use snap AA version 0.4.2 --- test/e2e/constants.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/constants.ts b/test/e2e/constants.ts index e7fef587f533..c8fde6eddafd 100644 --- a/test/e2e/constants.ts +++ b/test/e2e/constants.ts @@ -20,7 +20,7 @@ export const BUNDLER_URL = 'http://localhost:3000/rpc'; /* URL of the 4337 account snap site. */ export const ERC_4337_ACCOUNT_SNAP_URL = - 'https://metamask.github.io/snap-account-abstraction-keyring/0.4.1/'; + 'https://metamask.github.io/snap-account-abstraction-keyring/0.4.2/'; /* Salt used to generate the 4337 account. */ export const ERC_4337_ACCOUNT_SALT = '0x1'; From f17e9152c6f24223440a6e0698c1c6a766367e7b Mon Sep 17 00:00:00 2001 From: Charly Chevalier Date: Thu, 26 Sep 2024 18:31:53 +0200 Subject: [PATCH 06/10] test: use snap SSK version 1.1.6 --- test/e2e/constants.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/constants.ts b/test/e2e/constants.ts index c8fde6eddafd..7e92a28cf463 100644 --- a/test/e2e/constants.ts +++ b/test/e2e/constants.ts @@ -31,7 +31,7 @@ export const SIMPLE_ACCOUNT_FACTORY = /* URL of the Snap Simple Keyring site. */ export const TEST_SNAPS_SIMPLE_KEYRING_WEBSITE_URL = - 'https://metamask.github.io/snap-simple-keyring/1.1.2/'; + 'https://metamask.github.io/snap-simple-keyring/1.1.6/'; /* Address of the VerifyingPaymaster smart contract deployed to Ganache. */ export const VERIFYING_PAYMASTER = '0xbdbDEc38ed168331b1F7004cc9e5392A2272C1D7'; From c1790d4d00e71f317874d81b9a270575d06d1067 Mon Sep 17 00:00:00 2001 From: Charly Chevalier Date: Thu, 26 Sep 2024 18:41:18 +0200 Subject: [PATCH 07/10] chore: yarn dedupe --- yarn.lock | 26 ++++---------------------- 1 file changed, 4 insertions(+), 22 deletions(-) diff --git a/yarn.lock b/yarn.lock index 9ff36d441926..e5a358bf9c43 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5344,25 +5344,7 @@ __metadata: languageName: node linkType: hard -"@metamask/eth-snap-keyring@npm:^4.3.1": - version: 4.3.3 - resolution: "@metamask/eth-snap-keyring@npm:4.3.3" - dependencies: - "@ethereumjs/tx": "npm:^4.2.0" - "@metamask/eth-sig-util": "npm:^7.0.3" - "@metamask/keyring-api": "npm:^8.1.0" - "@metamask/snaps-controllers": "npm:^9.6.0" - "@metamask/snaps-sdk": "npm:^6.4.0" - "@metamask/snaps-utils": "npm:^7.8.0" - "@metamask/superstruct": "npm:^3.1.0" - "@metamask/utils": "npm:^9.2.1" - "@types/uuid": "npm:^9.0.1" - uuid: "npm:^9.0.0" - checksum: 10/035c82afef82a4cee7bc63b5c4f152a132b683017ec90a4b614764a4bc7adcca8faccf78c25adcddca2d29eee2fed08706f07d72afb93640956b86e862d4f555 - languageName: node - linkType: hard - -"@metamask/eth-snap-keyring@npm:^4.3.6": +"@metamask/eth-snap-keyring@npm:^4.3.1, @metamask/eth-snap-keyring@npm:^4.3.6": version: 4.3.6 resolution: "@metamask/eth-snap-keyring@npm:4.3.6" dependencies: @@ -5634,7 +5616,7 @@ __metadata: languageName: node linkType: hard -"@metamask/keyring-api@npm:^8.0.0, @metamask/keyring-api@npm:^8.1.0, @metamask/keyring-api@npm:^8.1.3": +"@metamask/keyring-api@npm:^8.0.0, @metamask/keyring-api@npm:^8.1.3": version: 8.1.3 resolution: "@metamask/keyring-api@npm:8.1.3" dependencies: @@ -6240,7 +6222,7 @@ __metadata: languageName: node linkType: hard -"@metamask/snaps-controllers@npm:^9.6.0, @metamask/snaps-controllers@npm:^9.7.0": +"@metamask/snaps-controllers@npm:^9.7.0": version: 9.7.0 resolution: "@metamask/snaps-controllers@npm:9.7.0" dependencies: @@ -6337,7 +6319,7 @@ __metadata: languageName: node linkType: hard -"@metamask/snaps-utils@npm:^7.4.0, @metamask/snaps-utils@npm:^7.8.0, @metamask/snaps-utils@npm:^7.8.1": +"@metamask/snaps-utils@npm:^7.4.0, @metamask/snaps-utils@npm:^7.8.1": version: 7.8.1 resolution: "@metamask/snaps-utils@npm:7.8.1" dependencies: From 580ee2e76803324063ed1b7ab9aa76422f7cc3c8 Mon Sep 17 00:00:00 2001 From: Charly Chevalier Date: Thu, 26 Sep 2024 21:45:18 +0200 Subject: [PATCH 08/10] test: update snap-account-redirect snapshot --- .../__snapshots__/create-snap-redirect.test.tsx.snap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/pages/snap-account-redirect/__snapshots__/create-snap-redirect.test.tsx.snap b/ui/pages/snap-account-redirect/__snapshots__/create-snap-redirect.test.tsx.snap index a971dd30faba..e6bb4ba7579c 100644 --- a/ui/pages/snap-account-redirect/__snapshots__/create-snap-redirect.test.tsx.snap +++ b/ui/pages/snap-account-redirect/__snapshots__/create-snap-redirect.test.tsx.snap @@ -107,7 +107,7 @@ exports[` renders the url and message when provided and i class="mm-box mm-text mm-text--body-md mm-box--padding-2 mm-box--color-primary-default" data-testid="snap-account-redirect-url-display-box" > - https://metamask.github.io/snap-simple-keyring/1.1.2/ + https://metamask.github.io/snap-simple-keyring/1.1.6/