Skip to content

Commit

Permalink
feat: use metamask ethJsonRpcMiddleware
Browse files Browse the repository at this point in the history
  • Loading branch information
@MarioAslau
MarioAslau committed Jun 10, 2024
1 parent cd796ce commit 205db8f
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 69 deletions.
2 changes: 1 addition & 1 deletion app/core/BackgroundBridge/BackgroundBridge.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ import {
selectProviderConfig,
} from '../../selectors/networkController';
import { store } from '../../store';
import { providerAsMiddleware } from '@metamask/eth-json-rpc-middleware';
///: BEGIN:ONLY_INCLUDE_IF(snaps)
import snapMethodMiddlewareBuilder from '../Snaps/SnapsMethodMiddleware';
import { SubjectType } from '@metamask/permission-controller';
///: END:ONLY_INCLUDE_IF

const createFilterMiddleware = require('eth-json-rpc-filters');
const createSubscriptionManager = require('eth-json-rpc-filters/subscriptionManager');
const providerAsMiddleware = require('eth-json-rpc-middleware/providerAsMiddleware');
const pump = require('pump');
// eslint-disable-next-line import/no-nodejs-modules
const EventEmitter = require('events').EventEmitter;
Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,15 +145,16 @@
"@metamask/contract-metadata": "^2.1.0",
"@metamask/controller-utils": "^8.0.4",
"@metamask/design-tokens": "^2.0.0",
"@metamask/eth-json-rpc-middleware": ">=12.0.0",
"@metamask/eth-sig-util": "^7.0.2",
"@metamask/etherscan-link": "^2.0.0",
"@metamask/gas-fee-controller": "^13.0.0",
"@metamask/key-tree": "^9.0.0",
"@metamask/keyring-api": "^4.0.0",
"@metamask/keyring-controller": "^13.0.0",
"@metamask/network-controller": "^18.1.0",
"@metamask/logging-controller": "^3.0.0",
"@metamask/message-signing-snap": "^0.3.3",
"@metamask/network-controller": "^18.1.0",
"@metamask/permission-controller": "^9.0.0",
"@metamask/phishing-controller": "^9.0.0",
"@metamask/post-message-stream": "8.0.0",
Expand Down Expand Up @@ -224,7 +225,6 @@
"eth-block-tracker": "^7.0.1",
"eth-ens-namehash": "2.0.8",
"eth-json-rpc-filters": "4.2.2",
"eth-json-rpc-middleware": "4.3.0",
"eth-url-parser": "1.0.4",
"ethereumjs-abi": "0.6.6",
"ethereumjs-util": "6.1.0",
Expand Down
95 changes: 29 additions & 66 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3874,6 +3874,17 @@
resolved "https://registry.yarnpkg.com/@metamask/eslint-config/-/eslint-config-9.0.0.tgz#22d4911b705f7e4e566efbdda0e37912da33e30f"
integrity sha512-mWlLGQKjXXFOj9EtDClKSoTLeQuPW2kM1w3EpUMf4goYAQ+kLXCCa8pEff6h8ApWAnjhYmXydA1znQ2J4XvD+A==

"@metamask/eth-block-tracker@^9.0.2":
version "9.0.3"
resolved "https://registry.yarnpkg.com/@metamask/eth-block-tracker/-/eth-block-tracker-9.0.3.tgz#ceebe9bc720a54c3a4749fc09c8f8bb9fe206255"
integrity sha512-I29IwdhnSJtk/A05vFsiOV92ADXXtBymXfC0naSvHP9TYNNOryG9y2l0jmnSzBsP3+wefCkHJWEzEwF4YSKogw==
dependencies:
"@metamask/eth-json-rpc-provider" "^3.0.2"
"@metamask/safe-event-emitter" "^3.0.0"
"@metamask/utils" "^8.1.0"
json-rpc-random-id "^1.0.1"
pify "^5.0.0"

"@metamask/eth-hd-keyring@^7.0.1":
version "7.0.1"
resolved "https://registry.yarnpkg.com/@metamask/eth-hd-keyring/-/eth-hd-keyring-7.0.1.tgz#799006d8fd57c5580dc5843f74a7343eeb2985f3"
Expand Down Expand Up @@ -3917,6 +3928,21 @@
"@metamask/utils" "^8.1.0"
node-fetch "^2.7.0"

"@metamask/eth-json-rpc-middleware@>=12.0.0":
version "12.1.1"
resolved "https://registry.yarnpkg.com/@metamask/eth-json-rpc-middleware/-/eth-json-rpc-middleware-12.1.1.tgz#5b6a19386f420211cb554c637f0927b76dc3167a"
integrity sha512-6N5y5CIo3mjJlD3oUaCPsAR5KGkxzt2pL+nQaRKwZ0Z0HtXIu0dIKf4awtfzJDNNQGhlPG5Im+kG1oxkh0FkSQ==
dependencies:
"@metamask/eth-block-tracker" "^9.0.2"
"@metamask/eth-json-rpc-provider" "^2.1.0"
"@metamask/eth-sig-util" "^7.0.0"
"@metamask/json-rpc-engine" "^7.1.1"
"@metamask/rpc-errors" "^6.0.0"
"@metamask/utils" "^8.1.0"
klona "^2.0.6"
pify "^5.0.0"
safe-stable-stringify "^2.4.3"

"@metamask/eth-json-rpc-middleware@^11.0.2":
version "11.0.2"
resolved "https://registry.yarnpkg.com/@metamask/eth-json-rpc-middleware/-/eth-json-rpc-middleware-11.0.2.tgz#85e6639f5d159a3277d13609dea9f12ebfb5b4e8"
Expand Down Expand Up @@ -3965,7 +3991,7 @@
"@metamask/safe-event-emitter" "^3.0.0"
"@metamask/utils" "^8.3.0"

"@metamask/eth-json-rpc-provider@^3.0.1":
"@metamask/eth-json-rpc-provider@^3.0.1", "@metamask/eth-json-rpc-provider@^3.0.2":
version "3.0.2"
resolved "https://registry.yarnpkg.com/@metamask/eth-json-rpc-provider/-/eth-json-rpc-provider-3.0.2.tgz#42e544d227285fe56336e2301961a6283dcfadad"
integrity sha512-ma5bYjKa71bSw5+iibEnIiY25s8wkDnTljrqOnGw5MkTEU4PQDiKnK9YjxfUZSasx2BPEsp1OW2NS+pnrRMO4Q==
Expand Down Expand Up @@ -15930,13 +15956,6 @@ eth-hd-keyring@^3.6.0:
ethereumjs-util "^7.0.9"
ethereumjs-wallet "^1.0.1"

eth-json-rpc-errors@^1.0.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/eth-json-rpc-errors/-/eth-json-rpc-errors-1.1.1.tgz#148377ef55155585981c21ff574a8937f9d6991f"
integrity sha512-WT5shJ5KfNqHi9jOZD+ID8I1kuYWNrigtZat7GOQkvwo99f8SzAVaEcWhJUv656WiZOAg3P1RiJQANtUmDmbIg==
dependencies:
fast-safe-stringify "^2.0.6"

eth-json-rpc-filters@4.2.2:
version "4.2.2"
resolved "https://registry.yarnpkg.com/eth-json-rpc-filters/-/eth-json-rpc-filters-4.2.2.tgz#eb35e1dfe9357ace8a8908e7daee80b2cd60a10d"
Expand Down Expand Up @@ -15971,26 +15990,6 @@ eth-json-rpc-infura@^5.1.0:
json-rpc-engine "^5.3.0"
node-fetch "^2.6.0"

eth-json-rpc-middleware@4.3.0:
version "4.3.0"
resolved "https://registry.yarnpkg.com/eth-json-rpc-middleware/-/eth-json-rpc-middleware-4.3.0.tgz#d3e72efb60b6f601f022ce01384481eaed552b6b"
integrity sha512-Acr+FaIHB0oIV0nWrCvepQghgA3FzYFvnMDXdTUeHQvAX/G6ioMbw1exGJs+6HirRjJ+MmkZqaArphx+PTrRNQ==
dependencies:
btoa "^1.2.1"
clone "^2.1.1"
eth-json-rpc-errors "^1.0.1"
eth-query "^2.1.2"
eth-sig-util "^1.4.2"
ethereumjs-block "^1.6.0"
ethereumjs-tx "^1.3.7"
ethereumjs-util "^5.1.2"
ethereumjs-vm "^2.6.0"
fetch-ponyfill "^4.0.0"
json-rpc-engine "^5.1.3"
json-stable-stringify "^1.0.1"
pify "^3.0.0"
safe-event-emitter "^1.0.1"

eth-json-rpc-middleware@^6.0.0:
version "6.0.0"
resolved "https://registry.yarnpkg.com/eth-json-rpc-middleware/-/eth-json-rpc-middleware-6.0.0.tgz#4fe16928b34231a2537856f08a5ebbc3d0c31175"
Expand Down Expand Up @@ -16119,16 +16118,6 @@ eth-url-parser@1.0.4:
bignumber.js "^7.2.1"
qs "^6.5.2"

ethereum-common@0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/ethereum-common/-/ethereum-common-0.2.0.tgz#13bf966131cce1eeade62a1b434249bb4cb120ca"
integrity sha512-XOnAR/3rntJgbCdGhqdaLIxDLWKLmsZOGhHdBKadEr6gEnJLH52k93Ou+TUdFaPN3hJc3isBZBal3U/XZ15abA==

ethereum-common@^0.0.18:
version "0.0.18"
resolved "https://registry.yarnpkg.com/ethereum-common/-/ethereum-common-0.0.18.tgz#2fdc3576f232903358976eb39da783213ff9523f"
integrity sha512-EoltVQTRNg2Uy4o84qpa2aXymXDJhxm7eos/ACOg0DG4baAbMjhbdAEsx9GeE8sC3XCxnYvrrzZDH8D8MtA2iQ==

ethereum-cryptography@^0.1.3:
version "0.1.3"
resolved "https://registry.yarnpkg.com/ethereum-cryptography/-/ethereum-cryptography-0.1.3.tgz#8d6143cfc3d74bf79bbd8edecdf29e4ae20dd191"
Expand Down Expand Up @@ -16189,17 +16178,6 @@ ethereumjs-account@^2.0.3:
rlp "^2.0.0"
safe-buffer "^5.1.1"

ethereumjs-block@^1.6.0:
version "1.7.1"
resolved "https://registry.yarnpkg.com/ethereumjs-block/-/ethereumjs-block-1.7.1.tgz#78b88e6cc56de29a6b4884ee75379b6860333c3f"
integrity sha512-B+sSdtqm78fmKkBq78/QLKJbu/4Ts4P2KFISdgcuZUPDm9x+N7qgBPIIFUGbaakQh8bzuquiRVbdmvPKqbILRg==
dependencies:
async "^2.0.1"
ethereum-common "0.2.0"
ethereumjs-tx "^1.2.2"
ethereumjs-util "^5.0.0"
merkle-patricia-tree "^2.1.2"

ethereumjs-block@^2.2.2, ethereumjs-block@~2.2.0:
version "2.2.2"
resolved "https://registry.yarnpkg.com/ethereumjs-block/-/ethereumjs-block-2.2.2.tgz#c7654be7e22df489fda206139ecd63e2e9c04965"
Expand All @@ -16216,14 +16194,6 @@ ethereumjs-common@^1.1.0, ethereumjs-common@^1.5.0:
resolved "https://registry.yarnpkg.com/ethereumjs-common/-/ethereumjs-common-1.5.2.tgz#2065dbe9214e850f2e955a80e650cb6999066979"
integrity sha512-hTfZjwGX52GS2jcVO6E2sx4YuFnf0Fhp5ylo4pEPhEffNln7vS59Hr5sLnp3/QCazFLluuBZ+FZ6J5HTp0EqCA==

ethereumjs-tx@^1.2.2, ethereumjs-tx@^1.3.7:
version "1.3.7"
resolved "https://registry.yarnpkg.com/ethereumjs-tx/-/ethereumjs-tx-1.3.7.tgz#88323a2d875b10549b8347e09f4862b546f3d89a"
integrity sha512-wvLMxzt1RPhAQ9Yi3/HKZTn0FZYpnsmQdbKYfUUpi4j1SEIcbkd9tndVjcPrufY3V7j2IebOpC00Zp2P/Ay2kA==
dependencies:
ethereum-common "^0.0.18"
ethereumjs-util "^5.0.0"

ethereumjs-tx@^2.1.1:
version "2.1.2"
resolved "https://registry.yarnpkg.com/ethereumjs-tx/-/ethereumjs-tx-2.1.2.tgz#5dfe7688bf177b45c9a23f86cf9104d47ea35fed"
Expand Down Expand Up @@ -17011,13 +16981,6 @@ fecha@^4.2.0:
resolved "https://registry.yarnpkg.com/fecha/-/fecha-4.2.3.tgz#4d9ccdbc61e8629b259fdca67e65891448d569fd"
integrity sha512-OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw==

fetch-ponyfill@^4.0.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/fetch-ponyfill/-/fetch-ponyfill-4.1.0.tgz#ae3ce5f732c645eab87e4ae8793414709b239893"
integrity sha1-rjzl9zLGReq4fkroeTQUcJsjmJM=
dependencies:
node-fetch "~1.7.1"

figures@^3.0.0, figures@^3.2.0:
version "3.2.0"
resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af"
Expand Down Expand Up @@ -19997,7 +19960,7 @@ json-parse-even-better-errors@^3.0.0:
resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.0.tgz#2cb2ee33069a78870a0c7e3da560026b89669cf7"
integrity sha512-iZbGHafX/59r39gPwVPRBGw0QQKnA7tte5pSMrhWOW7swGsVvVTjmfyAV9pNqk8YGT7tRCdxRu8uzcgZwoDooA==

json-rpc-engine@^5.1.3, json-rpc-engine@^5.3.0:
json-rpc-engine@^5.3.0:
version "5.4.0"
resolved "https://registry.yarnpkg.com/json-rpc-engine/-/json-rpc-engine-5.4.0.tgz#75758609d849e1dba1e09021ae473f3ab63161e5"
integrity sha512-rAffKbPoNDjuRnXkecTjnsE3xLLrb00rEkdgalINhaYVYIxDwWtvYBr9UFbhTvPB1B2qUOLoFd/cV6f4Q7mh7g==
Expand Down Expand Up @@ -22086,7 +22049,7 @@ node-fetch-native@^1.4.0, node-fetch-native@^1.4.1:
resolved "https://registry.yarnpkg.com/node-fetch-native/-/node-fetch-native-1.6.1.tgz#f95c74917d3cebc794cdae0cd2a9c7594aad0cb4"
integrity sha512-bW9T/uJDPAJB2YNYEpWzE54U5O3MQidXsOyTfnbKYtTtFexRvGzb1waphBN4ZwP6EcIvYYEOwW0b72BpAqydTw==

node-fetch@2.6.7, node-fetch@^2.0.0, node-fetch@^2.2.0, node-fetch@^2.6.0, node-fetch@^2.6.1, node-fetch@^2.6.12, node-fetch@^2.6.7, node-fetch@^2.7.0, node-fetch@~1.7.1:
node-fetch@2.6.7, node-fetch@^2.0.0, node-fetch@^2.2.0, node-fetch@^2.6.0, node-fetch@^2.6.1, node-fetch@^2.6.12, node-fetch@^2.6.7, node-fetch@^2.7.0:
version "2.6.7"
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==
Expand Down

0 comments on commit 205db8f

Please sign in to comment.