Merge branch 'feat/eth-json-rpc' into json-rpc-middleware-12

app/core/BackgroundBridge/BackgroundBridge.js

@@ -22,14 +22,14 @@ import {
   selectProviderConfig,
 } from '../../selectors/networkController';
 import { store } from '../../store';
+const createFilterMiddleware = require('@metamask/eth-json-rpc-filters');
+const createSubscriptionManager = require('@metamask/eth-json-rpc-filters/subscriptionManager');
+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('@metamask/eth-json-rpc-filters');
-const createSubscriptionManager = require('@metamask/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;

app/core/Snaps/SnapBridge.ts

@@ -24,7 +24,7 @@ import { SubjectType } from '@metamask/permission-controller';
 const ObjectMultiplex = require('@metamask/object-multiplex');
 const createFilterMiddleware = require('@metamask/eth-json-rpc-filters');
 const createSubscriptionManager = require('@metamask/eth-json-rpc-filters/subscriptionManager');
-const providerAsMiddleware = require('eth-json-rpc-middleware/providerAsMiddleware');
+const { providerAsMiddleware } = require('@metamask/eth-json-rpc-middleware');
 const pump = require('pump');
 
 interface ISnapBridgeProps {

package.json

@@ -145,16 +145,17 @@
     "@metamask/controller-utils": "^8.0.4",
     "@metamask/design-tokens": "^2.0.0",
     "@metamask/eth-json-rpc-filters": "^7.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": "^15.1.2",
     "@metamask/json-rpc-engine": "^7.1.0",
     "@metamask/key-tree": "^9.0.0",
     "@metamask/keyring-api": "^4.0.0",
     "@metamask/keyring-controller": "^16.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",
@@ -224,7 +225,6 @@
     "eciesjs": "^0.3.15",
     "eth-block-tracker": "^7.0.1",
     "eth-ens-namehash": "2.0.8",
-    "eth-json-rpc-middleware": "4.3.0",
     "eth-url-parser": "1.0.4",
     "ethereumjs-abi": "0.6.6",
     "ethereumjs-util": "6.1.0",