diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index 6947f6eae..b72c68741 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -4,7 +4,7 @@ import { ObservableStore } from '@metamask/obs-store'; import { storeAsStream } from '@metamask/obs-store/dist/asStream'; import { JsonRpcEngine } from 'json-rpc-engine'; import { debounce } from 'lodash'; -import createEngineStream from 'json-rpc-middleware-stream/engineStream'; +import { createEngineStream } from 'json-rpc-middleware-stream'; import { providerAsMiddleware } from 'eth-json-rpc-middleware'; import { KeyringController, diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json index 991880f99..fb29b869d 100644 --- a/lavamoat/browserify/beta/policy.json +++ b/lavamoat/browserify/beta/policy.json @@ -3498,7 +3498,12 @@ } }, "json-rpc-middleware-stream": { + "globals": { + "console.warn": true, + "setTimeout": true + }, "packages": { + "json-rpc-engine>@metamask/safe-event-emitter": true, "readable-stream": true } }, diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json index 9ae2a3e7f..50ea634e9 100644 --- a/lavamoat/browserify/flask/policy.json +++ b/lavamoat/browserify/flask/policy.json @@ -1472,7 +1472,6 @@ "@metamask/snaps-controllers>@xstate/fsm": true, "@metamask/snaps-controllers>concat-stream": true, "@metamask/snaps-controllers>gunzip-maybe": true, - "@metamask/snaps-controllers>json-rpc-middleware-stream": true, "@metamask/snaps-controllers>nanoid": true, "@metamask/snaps-controllers>readable-web-to-node-stream": true, "@metamask/snaps-controllers>tar-stream": true, @@ -1481,6 +1480,7 @@ "@metamask/utils": true, "eth-rpc-errors": true, "json-rpc-engine": true, + "json-rpc-middleware-stream": true, "pump": true } }, @@ -1580,16 +1580,6 @@ "watchify>xtend": true } }, - "@metamask/snaps-controllers>json-rpc-middleware-stream": { - "globals": { - "console.warn": true, - "setTimeout": true - }, - "packages": { - "json-rpc-engine>@metamask/safe-event-emitter": true, - "readable-stream": true - } - }, "@metamask/snaps-controllers>nanoid": { "globals": { "crypto.getRandomValues": true @@ -3822,7 +3812,12 @@ } }, "json-rpc-middleware-stream": { + "globals": { + "console.warn": true, + "setTimeout": true + }, "packages": { + "json-rpc-engine>@metamask/safe-event-emitter": true, "readable-stream": true } }, diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json index 991880f99..fb29b869d 100644 --- a/lavamoat/browserify/main/policy.json +++ b/lavamoat/browserify/main/policy.json @@ -3498,7 +3498,12 @@ } }, "json-rpc-middleware-stream": { + "globals": { + "console.warn": true, + "setTimeout": true + }, "packages": { + "json-rpc-engine>@metamask/safe-event-emitter": true, "readable-stream": true } }, diff --git a/package.json b/package.json index 733df2ded..e5b6ae1d1 100644 --- a/package.json +++ b/package.json @@ -304,7 +304,7 @@ "is-retry-allowed": "^2.2.0", "jest-junit": "^14.0.1", "json-rpc-engine": "^6.1.0", - "json-rpc-middleware-stream": "^2.1.1", + "json-rpc-middleware-stream": "^4.2.1", "jsonschema": "^1.2.4", "labeled-stream-splicer": "^2.0.2", "localforage": "^1.9.0", diff --git a/yarn.lock b/yarn.lock index 3baca2c48..666ec2c33 100644 --- a/yarn.lock +++ b/yarn.lock @@ -22260,16 +22260,6 @@ __metadata: languageName: node linkType: hard -"json-rpc-middleware-stream@npm:^2.1.1": - version: 2.1.1 - resolution: "json-rpc-middleware-stream@npm:2.1.1" - dependencies: - readable-stream: ^2.3.3 - safe-event-emitter: ^1.0.1 - checksum: e3c1c25c4b46b25e3c5a577e751ad3cabe3f1a387b5a8f345618563cb0ca24bc26eb25f170cf7ccb1e2c36d759947861cca0debb913b672ddf352b0f8add4ecf - languageName: node - linkType: hard - "json-rpc-middleware-stream@npm:^4.2.0, json-rpc-middleware-stream@npm:^4.2.1": version: 4.2.1 resolution: "json-rpc-middleware-stream@npm:4.2.1" @@ -24370,7 +24360,7 @@ __metadata: js-yaml: ^4.1.0 jsdom: ^11.2.0 json-rpc-engine: ^6.1.0 - json-rpc-middleware-stream: ^2.1.1 + json-rpc-middleware-stream: ^4.2.1 jsonschema: ^1.2.4 junit-report-merger: ^4.0.0 koa: ^2.7.0