Skip to content

Commit eb77786

Browse files
legobeatlegobeat
authored
fix: @metamask/eth-json-rpc-filters@^7.0.0->^8.0.0 (#27917)
## **Description** - chore: remove obsolete allow-scripts entries - deps: @metamask/eth-json-rpc-filters@^7.0.0->^8.0.0 - https://github.com/MetaMask/eth-json-rpc-filters/releases/tag/v8.0.0 - remove usage of legacy `metamask/eth-query@3.0.1` [![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/27917?quickstart=1) ## **Related issues** ### Blocking - #27956 ## **Manual testing steps** ## **Screenshots/Recordings** ### **Before** ### **After** ## **Pre-merge author checklist** - [x] I've followed [MetaMask Contributor Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Extension Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). - [x] I've completed the PR template to the best of my ability - [x] I’ve included tests if applicable - [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format if applicable - [ ] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)). Not required for external contributors. ## **Pre-merge reviewer checklist** - [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots.
1 parent ad6d1b3 commit eb77786

File tree

6 files changed

+34
-229
lines changed

6 files changed

+34
-229
lines changed

‎lavamoat/browserify/beta/policy.json‎

Lines changed: 6 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -860,68 +860,24 @@
860860
"console.error": true
861861
},
862862
"packages": {
863-
"@metamask/eth-json-rpc-filters>@metamask/eth-query": true,
864863
"@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine": true,
865-
"@metamask/eth-json-rpc-filters>async-mutex": true,
864+
"@metamask/eth-query": true,
865+
"@metamask/name-controller>async-mutex": true,
866866
"@metamask/safe-event-emitter": true,
867867
"pify": true
868868
}
869869
},
870-
"@metamask/eth-json-rpc-filters>@metamask/eth-query": {
871-
"packages": {
872-
"@metamask/eth-query>json-rpc-random-id": true,
873-
"watchify>xtend": true
874-
}
875-
},
876870
"@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine": {
877871
"packages": {
878872
"@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine>@metamask/rpc-errors": true,
879-
"@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine>@metamask/utils": true,
880-
"@metamask/safe-event-emitter": true
873+
"@metamask/safe-event-emitter": true,
874+
"@metamask/utils": true
881875
}
882876
},
883877
"@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine>@metamask/rpc-errors": {
884878
"packages": {
885-
"@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine>@metamask/rpc-errors>@metamask/utils": true,
886-
"@metamask/rpc-errors>fast-safe-stringify": true
887-
}
888-
},
889-
"@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine>@metamask/rpc-errors>@metamask/utils": {
890-
"globals": {
891-
"TextDecoder": true,
892-
"TextEncoder": true
893-
},
894-
"packages": {
895-
"@metamask/utils>@metamask/superstruct": true,
896-
"@metamask/utils>@scure/base": true,
897-
"@metamask/utils>pony-cause": true,
898-
"@noble/hashes": true,
899-
"browserify>buffer": true,
900-
"nock>debug": true,
901-
"semver": true
902-
}
903-
},
904-
"@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine>@metamask/utils": {
905-
"globals": {
906-
"TextDecoder": true,
907-
"TextEncoder": true
908-
},
909-
"packages": {
910-
"@metamask/utils>@metamask/superstruct": true,
911-
"@metamask/utils>@scure/base": true,
912-
"@metamask/utils>pony-cause": true,
913-
"@noble/hashes": true,
914-
"browserify>buffer": true,
915-
"nock>debug": true,
916-
"semver": true
917-
}
918-
},
919-
"@metamask/eth-json-rpc-filters>async-mutex": {
920-
"globals": {
921-
"setTimeout": true
922-
},
923-
"packages": {
924-
"@swc/helpers>tslib": true
879+
"@metamask/rpc-errors>fast-safe-stringify": true,
880+
"@metamask/utils": true
925881
}
926882
},
927883
"@metamask/eth-json-rpc-middleware": {

‎lavamoat/browserify/flask/policy.json‎

Lines changed: 6 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -860,68 +860,24 @@
860860
"console.error": true
861861
},
862862
"packages": {
863-
"@metamask/eth-json-rpc-filters>@metamask/eth-query": true,
864863
"@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine": true,
865-
"@metamask/eth-json-rpc-filters>async-mutex": true,
864+
"@metamask/eth-query": true,
865+
"@metamask/name-controller>async-mutex": true,
866866
"@metamask/safe-event-emitter": true,
867867
"pify": true
868868
}
869869
},
870-
"@metamask/eth-json-rpc-filters>@metamask/eth-query": {
871-
"packages": {
872-
"@metamask/eth-query>json-rpc-random-id": true,
873-
"watchify>xtend": true
874-
}
875-
},
876870
"@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine": {
877871
"packages": {
878872
"@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine>@metamask/rpc-errors": true,
879-
"@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine>@metamask/utils": true,
880-
"@metamask/safe-event-emitter": true
873+
"@metamask/safe-event-emitter": true,
874+
"@metamask/utils": true
881875
}
882876
},
883877
"@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine>@metamask/rpc-errors": {
884878
"packages": {
885-
"@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine>@metamask/rpc-errors>@metamask/utils": true,
886-
"@metamask/rpc-errors>fast-safe-stringify": true
887-
}
888-
},
889-
"@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine>@metamask/rpc-errors>@metamask/utils": {
890-
"globals": {
891-
"TextDecoder": true,
892-
"TextEncoder": true
893-
},
894-
"packages": {
895-
"@metamask/utils>@metamask/superstruct": true,
896-
"@metamask/utils>@scure/base": true,
897-
"@metamask/utils>pony-cause": true,
898-
"@noble/hashes": true,
899-
"browserify>buffer": true,
900-
"nock>debug": true,
901-
"semver": true
902-
}
903-
},
904-
"@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine>@metamask/utils": {
905-
"globals": {
906-
"TextDecoder": true,
907-
"TextEncoder": true
908-
},
909-
"packages": {
910-
"@metamask/utils>@metamask/superstruct": true,
911-
"@metamask/utils>@scure/base": true,
912-
"@metamask/utils>pony-cause": true,
913-
"@noble/hashes": true,
914-
"browserify>buffer": true,
915-
"nock>debug": true,
916-
"semver": true
917-
}
918-
},
919-
"@metamask/eth-json-rpc-filters>async-mutex": {
920-
"globals": {
921-
"setTimeout": true
922-
},
923-
"packages": {
924-
"@swc/helpers>tslib": true
879+
"@metamask/rpc-errors>fast-safe-stringify": true,
880+
"@metamask/utils": true
925881
}
926882
},
927883
"@metamask/eth-json-rpc-middleware": {

‎lavamoat/browserify/main/policy.json‎

Lines changed: 6 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -860,68 +860,24 @@
860860
"console.error": true
861861
},
862862
"packages": {
863-
"@metamask/eth-json-rpc-filters>@metamask/eth-query": true,
864863
"@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine": true,
865-
"@metamask/eth-json-rpc-filters>async-mutex": true,
864+
"@metamask/eth-query": true,
865+
"@metamask/name-controller>async-mutex": true,
866866
"@metamask/safe-event-emitter": true,
867867
"pify": true
868868
}
869869
},
870-
"@metamask/eth-json-rpc-filters>@metamask/eth-query": {
871-
"packages": {
872-
"@metamask/eth-query>json-rpc-random-id": true,
873-
"watchify>xtend": true
874-
}
875-
},
876870
"@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine": {
877871
"packages": {
878872
"@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine>@metamask/rpc-errors": true,
879-
"@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine>@metamask/utils": true,
880-
"@metamask/safe-event-emitter": true
873+
"@metamask/safe-event-emitter": true,
874+
"@metamask/utils": true
881875
}
882876
},
883877
"@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine>@metamask/rpc-errors": {
884878
"packages": {
885-
"@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine>@metamask/rpc-errors>@metamask/utils": true,
886-
"@metamask/rpc-errors>fast-safe-stringify": true
887-
}
888-
},
889-
"@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine>@metamask/rpc-errors>@metamask/utils": {
890-
"globals": {
891-
"TextDecoder": true,
892-
"TextEncoder": true
893-
},
894-
"packages": {
895-
"@metamask/utils>@metamask/superstruct": true,
896-
"@metamask/utils>@scure/base": true,
897-
"@metamask/utils>pony-cause": true,
898-
"@noble/hashes": true,
899-
"browserify>buffer": true,
900-
"nock>debug": true,
901-
"semver": true
902-
}
903-
},
904-
"@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine>@metamask/utils": {
905-
"globals": {
906-
"TextDecoder": true,
907-
"TextEncoder": true
908-
},
909-
"packages": {
910-
"@metamask/utils>@metamask/superstruct": true,
911-
"@metamask/utils>@scure/base": true,
912-
"@metamask/utils>pony-cause": true,
913-
"@noble/hashes": true,
914-
"browserify>buffer": true,
915-
"nock>debug": true,
916-
"semver": true
917-
}
918-
},
919-
"@metamask/eth-json-rpc-filters>async-mutex": {
920-
"globals": {
921-
"setTimeout": true
922-
},
923-
"packages": {
924-
"@swc/helpers>tslib": true
879+
"@metamask/rpc-errors>fast-safe-stringify": true,
880+
"@metamask/utils": true
925881
}
926882
},
927883
"@metamask/eth-json-rpc-middleware": {

‎lavamoat/browserify/mmi/policy.json‎

Lines changed: 6 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -952,68 +952,24 @@
952952
"console.error": true
953953
},
954954
"packages": {
955-
"@metamask/eth-json-rpc-filters>@metamask/eth-query": true,
956955
"@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine": true,
957-
"@metamask/eth-json-rpc-filters>async-mutex": true,
956+
"@metamask/eth-query": true,
957+
"@metamask/name-controller>async-mutex": true,
958958
"@metamask/safe-event-emitter": true,
959959
"pify": true
960960
}
961961
},
962-
"@metamask/eth-json-rpc-filters>@metamask/eth-query": {
963-
"packages": {
964-
"@metamask/eth-query>json-rpc-random-id": true,
965-
"watchify>xtend": true
966-
}
967-
},
968962
"@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine": {
969963
"packages": {
970964
"@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine>@metamask/rpc-errors": true,
971-
"@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine>@metamask/utils": true,
972-
"@metamask/safe-event-emitter": true
965+
"@metamask/safe-event-emitter": true,
966+
"@metamask/utils": true
973967
}
974968
},
975969
"@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine>@metamask/rpc-errors": {
976970
"packages": {
977-
"@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine>@metamask/rpc-errors>@metamask/utils": true,
978-
"@metamask/rpc-errors>fast-safe-stringify": true
979-
}
980-
},
981-
"@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine>@metamask/rpc-errors>@metamask/utils": {
982-
"globals": {
983-
"TextDecoder": true,
984-
"TextEncoder": true
985-
},
986-
"packages": {
987-
"@metamask/utils>@metamask/superstruct": true,
988-
"@metamask/utils>@scure/base": true,
989-
"@metamask/utils>pony-cause": true,
990-
"@noble/hashes": true,
991-
"browserify>buffer": true,
992-
"nock>debug": true,
993-
"semver": true
994-
}
995-
},
996-
"@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine>@metamask/utils": {
997-
"globals": {
998-
"TextDecoder": true,
999-
"TextEncoder": true
1000-
},
1001-
"packages": {
1002-
"@metamask/utils>@metamask/superstruct": true,
1003-
"@metamask/utils>@scure/base": true,
1004-
"@metamask/utils>pony-cause": true,
1005-
"@noble/hashes": true,
1006-
"browserify>buffer": true,
1007-
"nock>debug": true,
1008-
"semver": true
1009-
}
1010-
},
1011-
"@metamask/eth-json-rpc-filters>async-mutex": {
1012-
"globals": {
1013-
"setTimeout": true
1014-
},
1015-
"packages": {
1016-
"@swc/helpers>tslib": true
971+
"@metamask/rpc-errors>fast-safe-stringify": true,
972+
"@metamask/utils": true
1017973
}
1018974
},
1019975
"@metamask/eth-json-rpc-middleware": {

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@
316316
"@metamask/design-tokens": "^4.0.0",
317317
"@metamask/ens-controller": "^13.0.0",
318318
"@metamask/ens-resolver-snap": "^0.1.2",
319-
"@metamask/eth-json-rpc-filters": "^7.0.0",
319+
"@metamask/eth-json-rpc-filters": "^8.0.0",
320320
"@metamask/eth-json-rpc-middleware": "patch:@metamask/eth-json-rpc-middleware@npm%3A14.0.1#~/.yarn/patches/@metamask-eth-json-rpc-middleware-npm-14.0.1-b6c2ccbe8c.patch",
321321
"@metamask/eth-ledger-bridge-keyring": "^3.0.1",
322322
"@metamask/eth-query": "^4.0.0",

‎yarn.lock‎

Lines changed: 9 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -5144,16 +5144,16 @@ __metadata:
51445144
languageName: node
51455145
linkType: hard
51465146

5147-
"@metamask/eth-json-rpc-filters@npm:^7.0.0":
5148-
version: 7.0.0
5149-
resolution: "@metamask/eth-json-rpc-filters@npm:7.0.0"
5147+
"@metamask/eth-json-rpc-filters@npm:^8.0.0":
5148+
version: 8.0.0
5149+
resolution: "@metamask/eth-json-rpc-filters@npm:8.0.0"
51505150
dependencies:
5151-
"@metamask/eth-query": "npm:^3.0.1"
5152-
"@metamask/json-rpc-engine": "npm:^7.1.0"
5151+
"@metamask/eth-query": "npm:^4.0.0"
5152+
"@metamask/json-rpc-engine": "npm:^9.0.0"
51535153
"@metamask/safe-event-emitter": "npm:^3.0.0"
5154-
async-mutex: "npm:^0.2.6"
5154+
async-mutex: "npm:^0.5.0"
51555155
pify: "npm:^5.0.0"
5156-
checksum: 10/8ee6a6791f8e84d590192ade2c8b1ddaaa81fd4eb64b042facaafd8fbe69f29df3a3e2c79dfb0da0839f72e53832e73ac8b72dbedb94a919fe9afcdad51a2c2a
5156+
checksum: 10/2a0a081abe3ed152e4c74116a486dae49a37cdda1ea1d4739825fc888be40518623a69593034b7da2489204af968060670b00d1e2299ff721b554c615b09127b
51575157
languageName: node
51585158
linkType: hard
51595159

@@ -5275,16 +5275,6 @@ __metadata:
52755275
languageName: node
52765276
linkType: hard
52775277

5278-
"@metamask/eth-query@npm:^3.0.1":
5279-
version: 3.0.1
5280-
resolution: "@metamask/eth-query@npm:3.0.1"
5281-
dependencies:
5282-
json-rpc-random-id: "npm:^1.0.0"
5283-
xtend: "npm:^4.0.1"
5284-
checksum: 10/d463aff018ae3f1229331177e9efa0eb62958c6fcc30039c22d151ee64da17d55153ef4861060aecec674f764aa9074341bef53fdf86c2258d3cb2682976e835
5285-
languageName: node
5286-
linkType: hard
5287-
52885278
"@metamask/eth-query@npm:^4.0.0":
52895279
version: 4.0.0
52905280
resolution: "@metamask/eth-query@npm:4.0.0"
@@ -5547,7 +5537,7 @@ __metadata:
55475537
languageName: node
55485538
linkType: hard
55495539

5550-
"@metamask/json-rpc-engine@npm:^7.1.0, @metamask/json-rpc-engine@npm:^7.1.1, @metamask/json-rpc-engine@npm:^7.3.2":
5540+
"@metamask/json-rpc-engine@npm:^7.1.1, @metamask/json-rpc-engine@npm:^7.3.2":
55515541
version: 7.3.3
55525542
resolution: "@metamask/json-rpc-engine@npm:7.3.3"
55535543
dependencies:
@@ -12787,15 +12777,6 @@ __metadata:
1278712777
languageName: node
1278812778
linkType: hard
1278912779

12790-
"async-mutex@npm:^0.2.6":
12791-
version: 0.2.6
12792-
resolution: "async-mutex@npm:0.2.6"
12793-
dependencies:
12794-
tslib: "npm:^2.0.0"
12795-
checksum: 10/3cf676fc48b4686abf534cc02d4784bab3f35d7836a0a7476c96e57c3f6607dd3d94cc0989b29d33ce5ae5cde8be8e1a96f3e769ba3b0e1ba4a244f873aa5623
12796-
languageName: node
12797-
linkType: hard
12798-
1279912780
"async-mutex@npm:^0.3.1":
1280012781
version: 0.3.2
1280112782
resolution: "async-mutex@npm:0.3.2"
@@ -25976,7 +25957,7 @@ __metadata:
2597625957
"@metamask/eslint-config-nodejs": "npm:^9.0.0"
2597725958
"@metamask/eslint-config-typescript": "npm:^9.0.1"
2597825959
"@metamask/eslint-plugin-design-tokens": "npm:^1.1.0"
25979-
"@metamask/eth-json-rpc-filters": "npm:^7.0.0"
25960+
"@metamask/eth-json-rpc-filters": "npm:^8.0.0"
2598025961
"@metamask/eth-json-rpc-middleware": "patch:@metamask/eth-json-rpc-middleware@npm%3A14.0.1#~/.yarn/patches/@metamask-eth-json-rpc-middleware-npm-14.0.1-b6c2ccbe8c.patch"
2598125962
"@metamask/eth-ledger-bridge-keyring": "npm:^3.0.1"
2598225963
"@metamask/eth-query": "npm:^4.0.0"

0 commit comments

Comments
 (0)