m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-22 09:57:02 +01:00
Code

Fix invalid state persistence error (#20080)

Browse Source 
* Fix invalid state persistence error

We have been seeing Sentry errors showing that state persistence has
been failing for some users that have invalid `NetworkController`
state. This has been fixed by updating to
`@metamask/base-controller@v3.2.0`, which is more tolerant of
unexpected state properties.

* Update LavaMoat policies

---------

Co-authored-by: MetaMask Bot <metamaskbot@users.noreply.github.com>
This commit is contained in:
Mark Stacey 2023-07-18 20:05:06 -02:30 committed by Dan J Miller
parent f01e8379fa
commit fbae250b0a
7 changed files with 40 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lavamoat/browserify/beta/policy.json
View File

@ -1527,6 +1527,7 @@
"TextEncoder": true "TextEncoder": true
}, },
"packages": { "packages": {
"@metamask/key-tree>@noble/hashes": true,
"browserify>buffer": true, "browserify>buffer": true,
"nock>debug": true, "nock>debug": true,
"semver": true, "semver": true,
@ -1769,6 +1770,7 @@
"TextEncoder": true "TextEncoder": true
}, },
"packages": { "packages": {
"@metamask/key-tree>@noble/hashes": true,
"browserify>buffer": true, "browserify>buffer": true,
"nock>debug": true, "nock>debug": true,
"semver": true, "semver": true,
@ -1911,6 +1913,7 @@
"TextEncoder": true "TextEncoder": true
}, },
"packages": { "packages": {
"@metamask/key-tree>@noble/hashes": true,
"browserify>buffer": true, "browserify>buffer": true,
"nock>debug": true, "nock>debug": true,
"semver": true, "semver": true,
@ -1946,6 +1949,7 @@
"TextEncoder": true "TextEncoder": true
}, },
"packages": { "packages": {
"@metamask/key-tree>@noble/hashes": true,
"browserify>buffer": true, "browserify>buffer": true,
"nock>debug": true, "nock>debug": true,
"semver": true, "semver": true,

8
lavamoat/browserify/desktop/policy.json
View File

@ -1274,6 +1274,7 @@
"TextEncoder": true "TextEncoder": true
}, },
"packages": { "packages": {
"@metamask/key-tree>@noble/hashes": true,
"browserify>buffer": true, "browserify>buffer": true,
"nock>debug": true, "nock>debug": true,
"semver": true, "semver": true,
@ -1291,6 +1292,7 @@
"TextEncoder": true "TextEncoder": true
}, },
"packages": { "packages": {
"@metamask/key-tree>@noble/hashes": true,
"browserify>buffer": true, "browserify>buffer": true,
"nock>debug": true, "nock>debug": true,
"semver": true, "semver": true,
@ -1653,6 +1655,7 @@
"TextEncoder": true "TextEncoder": true
}, },
"packages": { "packages": {
"@metamask/key-tree>@noble/hashes": true,
"browserify>buffer": true, "browserify>buffer": true,
"nock>debug": true, "nock>debug": true,
"semver": true, "semver": true,
@ -1992,6 +1995,7 @@
"TextEncoder": true "TextEncoder": true
}, },
"packages": { "packages": {
"@metamask/key-tree>@noble/hashes": true,
"browserify>buffer": true, "browserify>buffer": true,
"nock>debug": true, "nock>debug": true,
"semver": true, "semver": true,
@ -2198,6 +2202,7 @@
"TextEncoder": true "TextEncoder": true
}, },
"packages": { "packages": {
"@metamask/key-tree>@noble/hashes": true,
"browserify>buffer": true, "browserify>buffer": true,
"nock>debug": true, "nock>debug": true,
"semver": true, "semver": true,
@ -2367,6 +2372,7 @@
"TextEncoder": true "TextEncoder": true
}, },
"packages": { "packages": {
"@metamask/key-tree>@noble/hashes": true,
"browserify>buffer": true, "browserify>buffer": true,
"nock>debug": true, "nock>debug": true,
"semver": true, "semver": true,
@ -2404,6 +2410,7 @@
"TextEncoder": true "TextEncoder": true
}, },
"packages": { "packages": {
"@metamask/key-tree>@noble/hashes": true,
"browserify>buffer": true, "browserify>buffer": true,
"nock>debug": true, "nock>debug": true,
"semver": true, "semver": true,
@ -2437,6 +2444,7 @@
"TextEncoder": true "TextEncoder": true
}, },
"packages": { "packages": {
"@metamask/key-tree>@noble/hashes": true,
"browserify>buffer": true, "browserify>buffer": true,
"nock>debug": true, "nock>debug": true,
"semver": true, "semver": true,

8
lavamoat/browserify/flask/policy.json
View File

@ -1274,6 +1274,7 @@
"TextEncoder": true "TextEncoder": true
}, },
"packages": { "packages": {
"@metamask/key-tree>@noble/hashes": true,
"browserify>buffer": true, "browserify>buffer": true,
"nock>debug": true, "nock>debug": true,
"semver": true, "semver": true,
@ -1291,6 +1292,7 @@
"TextEncoder": true "TextEncoder": true
}, },
"packages": { "packages": {
"@metamask/key-tree>@noble/hashes": true,
"browserify>buffer": true, "browserify>buffer": true,
"nock>debug": true, "nock>debug": true,
"semver": true, "semver": true,
@ -1653,6 +1655,7 @@
"TextEncoder": true "TextEncoder": true
}, },
"packages": { "packages": {
"@metamask/key-tree>@noble/hashes": true,
"browserify>buffer": true, "browserify>buffer": true,
"nock>debug": true, "nock>debug": true,
"semver": true, "semver": true,
@ -1992,6 +1995,7 @@
"TextEncoder": true "TextEncoder": true
}, },
"packages": { "packages": {
"@metamask/key-tree>@noble/hashes": true,
"browserify>buffer": true, "browserify>buffer": true,
"nock>debug": true, "nock>debug": true,
"semver": true, "semver": true,
@ -2198,6 +2202,7 @@
"TextEncoder": true "TextEncoder": true
}, },
"packages": { "packages": {
"@metamask/key-tree>@noble/hashes": true,
"browserify>buffer": true, "browserify>buffer": true,
"nock>debug": true, "nock>debug": true,
"semver": true, "semver": true,
@ -2367,6 +2372,7 @@
"TextEncoder": true "TextEncoder": true
}, },
"packages": { "packages": {
"@metamask/key-tree>@noble/hashes": true,
"browserify>buffer": true, "browserify>buffer": true,
"nock>debug": true, "nock>debug": true,
"semver": true, "semver": true,
@ -2404,6 +2410,7 @@
"TextEncoder": true "TextEncoder": true
}, },
"packages": { "packages": {
"@metamask/key-tree>@noble/hashes": true,
"browserify>buffer": true, "browserify>buffer": true,
"nock>debug": true, "nock>debug": true,
"semver": true, "semver": true,
@ -2437,6 +2444,7 @@
"TextEncoder": true "TextEncoder": true
}, },
"packages": { "packages": {
"@metamask/key-tree>@noble/hashes": true,
"browserify>buffer": true, "browserify>buffer": true,
"nock>debug": true, "nock>debug": true,
"semver": true, "semver": true,

4
lavamoat/browserify/main/policy.json
View File

@ -1527,6 +1527,7 @@
"TextEncoder": true "TextEncoder": true
}, },
"packages": { "packages": {
"@metamask/key-tree>@noble/hashes": true,
"browserify>buffer": true, "browserify>buffer": true,
"nock>debug": true, "nock>debug": true,
"semver": true, "semver": true,
@ -1769,6 +1770,7 @@
"TextEncoder": true "TextEncoder": true
}, },
"packages": { "packages": {
"@metamask/key-tree>@noble/hashes": true,
"browserify>buffer": true, "browserify>buffer": true,
"nock>debug": true, "nock>debug": true,
"semver": true, "semver": true,
@ -1911,6 +1913,7 @@
"TextEncoder": true "TextEncoder": true
}, },
"packages": { "packages": {
"@metamask/key-tree>@noble/hashes": true,
"browserify>buffer": true, "browserify>buffer": true,
"nock>debug": true, "nock>debug": true,
"semver": true, "semver": true,
@ -1946,6 +1949,7 @@
"TextEncoder": true "TextEncoder": true
}, },
"packages": { "packages": {
"@metamask/key-tree>@noble/hashes": true,
"browserify>buffer": true, "browserify>buffer": true,
"nock>debug": true, "nock>debug": true,
"semver": true, "semver": true,

4
lavamoat/browserify/mmi/policy.json
View File

@ -1748,6 +1748,7 @@
"TextEncoder": true "TextEncoder": true
}, },
"packages": { "packages": {
"@metamask/key-tree>@noble/hashes": true,
"browserify>buffer": true, "browserify>buffer": true,
"nock>debug": true, "nock>debug": true,
"semver": true, "semver": true,
@ -1990,6 +1991,7 @@
"TextEncoder": true "TextEncoder": true
}, },
"packages": { "packages": {
"@metamask/key-tree>@noble/hashes": true,
"browserify>buffer": true, "browserify>buffer": true,
"nock>debug": true, "nock>debug": true,
"semver": true, "semver": true,
@ -2132,6 +2134,7 @@
"TextEncoder": true "TextEncoder": true
}, },
"packages": { "packages": {
"@metamask/key-tree>@noble/hashes": true,
"browserify>buffer": true, "browserify>buffer": true,
"nock>debug": true, "nock>debug": true,
"semver": true, "semver": true,
@ -2167,6 +2170,7 @@
"TextEncoder": true "TextEncoder": true
}, },
"packages": { "packages": {
"@metamask/key-tree>@noble/hashes": true,
"browserify>buffer": true, "browserify>buffer": true,
"nock>debug": true, "nock>debug": true,
"semver": true, "semver": true,

2
package.json
View File

@ -227,7 +227,7 @@
"@metamask/announcement-controller": "^4.0.0", "@metamask/announcement-controller": "^4.0.0",
"@metamask/approval-controller": "^3.3.0", "@metamask/approval-controller": "^3.3.0",
"@metamask/assets-controllers": "^9.2.0", "@metamask/assets-controllers": "^9.2.0",
"@metamask/base-controller": "^3.1.0", "@metamask/base-controller": "^3.2.0",
"@metamask/browser-passworder": "^4.1.0", "@metamask/browser-passworder": "^4.1.0",
"@metamask/contract-metadata": "^2.3.1", "@metamask/contract-metadata": "^2.3.1",
"@metamask/controller-utils": "^4.2.0", "@metamask/controller-utils": "^4.2.0",

21
yarn.lock
View File

@ -3940,13 +3940,13 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@metamask/base-controller@npm:^3.0.0, @metamask/base-controller@npm:^3.1.0": "@metamask/base-controller@npm:^3.0.0, @metamask/base-controller@npm:^3.1.0, @metamask/base-controller@npm:^3.2.0":
version: 3.1.0 version: 3.2.0
resolution: "@metamask/base-controller@npm:3.1.0" resolution: "@metamask/base-controller@npm:3.2.0"
dependencies: dependencies:
"@metamask/utils": ^5.0.2 "@metamask/utils": ^6.2.0
immer: ^9.0.6 immer: ^9.0.6
checksum: fc1597a099e6d28bd089df936ca349d6c38c2e1b0f0737385cba30c34a5239241519eb172d77c70f8db2604f4dc5724f6893affe42bdd104cef98f9cfd6f1db8 checksum: 3be6f2594309c013e07f83c4bb8271e1e99f02b6ff829c18b5e7218fbab4e6a9e03bcb49056704ce47f84ae2f38b1bc1c10284ec538aad56ed7b554ef2d3e189
languageName: node languageName: node
linkType: hard linkType: hard
@ -5005,16 +5005,17 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@metamask/utils@npm:^6.0.0, @metamask/utils@npm:^6.0.1, @metamask/utils@npm:^6.1.0": "@metamask/utils@npm:^6.0.0, @metamask/utils@npm:^6.0.1, @metamask/utils@npm:^6.1.0, @metamask/utils@npm:^6.2.0":
version: 6.1.0 version: 6.2.0
resolution: "@metamask/utils@npm:6.1.0" resolution: "@metamask/utils@npm:6.2.0"
dependencies: dependencies:
"@ethereumjs/tx": ^4.1.2 "@ethereumjs/tx": ^4.1.2
"@noble/hashes": ^1.3.1
"@types/debug": ^4.1.7 "@types/debug": ^4.1.7
debug: ^4.3.4 debug: ^4.3.4
semver: ^7.3.8 semver: ^7.3.8
superstruct: ^1.0.3 superstruct: ^1.0.3
checksum: d4eac3ce3c08674b8e9ef838d1661a5025690c6f266c26ebdb8e8d0da11fce786e54c326b5d9c6d33b262f37e7057e31d6545a3715613bd0a5bfa10e7755643a checksum: 0bc675358ecc09b3bc04da613d73666295d7afa51ff6b8554801585966900b24b8545bd93b8b2e9a17db867ebe421fe884baf3558ec4ca3199fa65504f677c1b
languageName: node languageName: node
linkType: hard linkType: hard
@ -24474,7 +24475,7 @@ __metadata:
"@metamask/approval-controller": ^3.3.0 "@metamask/approval-controller": ^3.3.0
"@metamask/assets-controllers": ^9.2.0 "@metamask/assets-controllers": ^9.2.0
"@metamask/auto-changelog": ^2.1.0 "@metamask/auto-changelog": ^2.1.0
"@metamask/base-controller": ^3.1.0 "@metamask/base-controller": ^3.2.0
"@metamask/browser-passworder": ^4.1.0 "@metamask/browser-passworder": ^4.1.0
"@metamask/contract-metadata": ^2.3.1 "@metamask/contract-metadata": ^2.3.1
"@metamask/controller-utils": ^4.2.0 "@metamask/controller-utils": ^4.2.0