Skip to content

Commit c773d7a

Browse files
authored
chore: eth-json-rpc-filters@^6.0.1 -> @metamask/eth-json-rpc-filters@^8.0.0 (#12024)
## **Description** Replace deprecated `eth-json-rpc-filters` with `@metamask/eth-json-rpc-filters`. ## **Related issues** - Part of: #12047 - Broken out from: #9274, #11952 - Follow-up to: #11980 ## **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 Mobile Coding Standards](https://github.com/MetaMask/metamask-mobile/blob/main/.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-mobile/blob/main/.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 088a426 commit c773d7a

File tree

5 files changed

+18
-26
lines changed

5 files changed

+18
-26
lines changed

app/core/BackgroundBridge/BackgroundBridge.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ import snapMethodMiddlewareBuilder from '../Snaps/SnapsMethodMiddleware';
2626
import { SubjectType } from '@metamask/permission-controller';
2727
///: END:ONLY_INCLUDE_IF
2828

29-
const createFilterMiddleware = require('eth-json-rpc-filters');
30-
const createSubscriptionManager = require('eth-json-rpc-filters/subscriptionManager');
29+
const createFilterMiddleware = require('@metamask/eth-json-rpc-filters');
30+
const createSubscriptionManager = require('@metamask/eth-json-rpc-filters/subscriptionManager');
3131
const { providerAsMiddleware } = require('eth-json-rpc-middleware');
3232
const pump = require('pump');
3333
// eslint-disable-next-line import/no-nodejs-modules

app/core/Snaps/SnapBridge.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import snapMethodMiddlewareBuilder from './SnapsMethodMiddleware';
2222
import { SubjectType } from '@metamask/permission-controller';
2323

2424
const ObjectMultiplex = require('@metamask/object-multiplex');
25-
const createFilterMiddleware = require('eth-json-rpc-filters');
26-
const createSubscriptionManager = require('eth-json-rpc-filters/subscriptionManager');
25+
const createFilterMiddleware = require('@metamask/eth-json-rpc-filters');
26+
const createSubscriptionManager = require('@metamask/eth-json-rpc-filters/subscriptionManager');
2727
const { providerAsMiddleware } = require('eth-json-rpc-middleware');
2828
const pump = require('pump');
2929

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,7 @@
148148
"@metamask/contract-metadata": "^2.1.0",
149149
"@metamask/controller-utils": "^11.3.0",
150150
"@metamask/design-tokens": "^4.0.0",
151+
"@metamask/eth-json-rpc-filters": "^8.0.0",
151152
"@metamask/eth-ledger-bridge-keyring": "^4.1.0",
152153
"@metamask/eth-query": "^4.0.0",
153154
"@metamask/eth-sig-util": "^7.0.2",
@@ -239,7 +240,6 @@
239240
"eciesjs": "^0.3.15",
240241
"eth-block-tracker": "^7.0.1",
241242
"eth-ens-namehash": "2.0.8",
242-
"eth-json-rpc-filters": "^6.0.1",
243243
"eth-json-rpc-middleware": "9.0.1",
244244
"eth-url-parser": "1.0.4",
245245
"ethereumjs-abi": "0.6.6",

patches/@metamask+post-message-stream+8.1.0.patch renamed to patches/@metamask+post-message-stream+8.1.1.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/node_modules/@metamask/post-message-stream/dist/window/WindowPostMessageStream.js b/node_modules/@metamask/post-message-stream/dist/window/WindowPostMessageStream.js
2-
index cead325..a319ed7 100644
2+
index f2e42ef..27807bb 100644
33
--- a/node_modules/@metamask/post-message-stream/dist/window/WindowPostMessageStream.js
44
+++ b/node_modules/@metamask/post-message-stream/dist/window/WindowPostMessageStream.js
5-
@@ -6,11 +6,21 @@ const utils_1 = require("@metamask/utils");
5+
@@ -17,11 +17,21 @@ const utils_1 = require("@metamask/utils");
66
const BasePostMessageStream_1 = require("../BasePostMessageStream");
77
const utils_2 = require("../utils");
88
/* istanbul ignore next */

yarn.lock

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4529,6 +4529,17 @@
45294529
"@metamask/utils" "^9.2.1"
45304530
ethereum-cryptography "^2.1.2"
45314531

4532+
"@metamask/eth-json-rpc-filters@^8.0.0":
4533+
version "8.0.0"
4534+
resolved "https://registry.yarnpkg.com/@metamask/eth-json-rpc-filters/-/eth-json-rpc-filters-8.0.0.tgz#fd0ca224dc198e270e142c1f2007e05cacb5f16a"
4535+
integrity sha512-kDwSoas8gYWtN79AO4vvyKvaL8bIMstpuwZdsWTSc1goBFTOJEscCD6zUX+MOQFnQohFoC512mNeA5tPLRV46A==
4536+
dependencies:
4537+
"@metamask/eth-query" "^4.0.0"
4538+
"@metamask/json-rpc-engine" "^9.0.0"
4539+
"@metamask/safe-event-emitter" "^3.0.0"
4540+
async-mutex "^0.5.0"
4541+
pify "^5.0.0"
4542+
45324543
"@metamask/eth-json-rpc-infura@^9.0.0", "@metamask/eth-json-rpc-infura@^9.1.0":
45334544
version "9.1.0"
45344545
resolved "https://registry.yarnpkg.com/@metamask/eth-json-rpc-infura/-/eth-json-rpc-infura-9.1.0.tgz#8e09588ed58f49058615cab7040dcbce4682a292"
@@ -16998,17 +17009,6 @@ eth-ens-namehash@^1.0.2:
1699817009
idna-uts46 "^1.0.1"
1699917010
js-sha3 "^0.5.7"
1700017011

17001-
eth-json-rpc-filters@^6.0.1:
17002-
version "6.0.1"
17003-
resolved "https://registry.yarnpkg.com/eth-json-rpc-filters/-/eth-json-rpc-filters-6.0.1.tgz#0b3e370f017f5c6f58d3e7bd0756d8099ed85c56"
17004-
integrity sha512-ITJTvqoCw6OVMLs7pI8f4gG92n/St6x80ACtHodeS+IXmO0w+t1T5OOzfSt7KLSMLRkVUoexV7tztLgDxg+iig==
17005-
dependencies:
17006-
"@metamask/safe-event-emitter" "^3.0.0"
17007-
async-mutex "^0.2.6"
17008-
eth-query "^2.1.2"
17009-
json-rpc-engine "^6.1.0"
17010-
pify "^5.0.0"
17011-
1701217012
1701317013
version "9.0.1"
1701417014
resolved "https://registry.yarnpkg.com/eth-json-rpc-middleware/-/eth-json-rpc-middleware-9.0.1.tgz#193cb05174739fb736737bbbf992e13010c4b44e"
@@ -17041,14 +17041,6 @@ eth-phishing-detect@^1.2.0:
1704117041
dependencies:
1704217042
fast-levenshtein "^2.0.6"
1704317043

17044-
eth-query@^2.1.2:
17045-
version "2.1.2"
17046-
resolved "https://registry.yarnpkg.com/eth-query/-/eth-query-2.1.2.tgz#d6741d9000106b51510c72db92d6365456a6da5e"
17047-
integrity sha1-1nQdkAAQa1FRDHLbktY2VFam2l4=
17048-
dependencies:
17049-
json-rpc-random-id "^1.0.0"
17050-
xtend "^4.0.1"
17051-
1705217044
eth-rpc-errors@^4.0.2, eth-rpc-errors@^4.0.3:
1705317045
version "4.0.3"
1705417046
resolved "https://registry.yarnpkg.com/eth-rpc-errors/-/eth-rpc-errors-4.0.3.tgz#6ddb6190a4bf360afda82790bb7d9d5e724f423a"

0 commit comments

Comments
 (0)