From f3955f008f8a81a0bd7a03804626033acb79d408 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 9 Nov 2023 06:27:13 +0000 Subject: [PATCH 1/3] Bump @metamask/providers from 13.0.0 to 14.0.0 Bumps [@metamask/providers](https://github.com/MetaMask/providers) from 13.0.0 to 14.0.0. - [Release notes](https://github.com/MetaMask/providers/releases) - [Changelog](https://github.com/MetaMask/providers/blob/main/CHANGELOG.md) - [Commits](https://github.com/MetaMask/providers/compare/v13.0.0...v14.0.0) --- updated-dependencies: - dependency-name: "@metamask/providers" dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .../snaps-execution-environments/package.json | 2 +- packages/test-snaps/package.json | 2 +- yarn.lock | 75 ++++++++++++++++++- 3 files changed, 74 insertions(+), 5 deletions(-) diff --git a/packages/snaps-execution-environments/package.json b/packages/snaps-execution-environments/package.json index 27ff3dd74c..9344d97fb7 100644 --- a/packages/snaps-execution-environments/package.json +++ b/packages/snaps-execution-environments/package.json @@ -47,7 +47,7 @@ "@metamask/json-rpc-engine": "^7.1.1", "@metamask/object-multiplex": "^1.2.0", "@metamask/post-message-stream": "^7.0.0", - "@metamask/providers": "^13.0.0", + "@metamask/providers": "^14.0.0", "@metamask/rpc-errors": "^6.1.0", "@metamask/snaps-sdk": "workspace:^", "@metamask/snaps-utils": "workspace:^", diff --git a/packages/test-snaps/package.json b/packages/test-snaps/package.json index 96c985fd7f..0e2509dc0e 100644 --- a/packages/test-snaps/package.json +++ b/packages/test-snaps/package.json @@ -66,7 +66,7 @@ "@metamask/eslint-config-jest": "^12.1.0", "@metamask/eslint-config-nodejs": "^12.1.0", "@metamask/eslint-config-typescript": "^12.1.0", - "@metamask/providers": "^13.0.0", + "@metamask/providers": "^14.0.0", "@pmmmwh/react-refresh-webpack-plugin": "^0.5.10", "@swc/core": "1.3.78", "@swc/jest": "^0.2.26", diff --git a/yarn.lock b/yarn.lock index 7a5277b49d..8e146ee8a1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4850,6 +4850,16 @@ __metadata: languageName: node linkType: hard +"@metamask/object-multiplex@npm:^2.0.0": + version: 2.0.0 + resolution: "@metamask/object-multiplex@npm:2.0.0" + dependencies: + once: ^1.4.0 + readable-stream: ^3.6.2 + checksum: 54baea752a3ac7c2742c376512e00d4902d383e9da8787574d3b21eb0081523309e24e3915a98f3ae0341d65712b6832d2eb7eeb862f4ef0da1ead52dcde5387 + languageName: node + linkType: hard + "@metamask/permission-controller@npm:^5.0.0": version: 5.0.0 resolution: "@metamask/permission-controller@npm:5.0.0" @@ -4912,6 +4922,26 @@ __metadata: languageName: node linkType: hard +"@metamask/providers@npm:^14.0.0": + version: 14.0.0 + resolution: "@metamask/providers@npm:14.0.0" + dependencies: + "@metamask/json-rpc-engine": ^7.1.1 + "@metamask/object-multiplex": ^2.0.0 + "@metamask/rpc-errors": ^6.0.0 + "@metamask/safe-event-emitter": ^3.0.0 + "@metamask/utils": ^8.1.0 + detect-browser: ^5.2.0 + extension-port-stream: ^3.0.0 + fast-deep-equal: ^3.1.3 + is-stream: ^2.0.0 + json-rpc-middleware-stream: ^5.0.1 + readable-stream: ^3.6.2 + webextension-polyfill: ^0.10.0 + checksum: 32c2695cf49ef6445c6e3bc8d6be30e64a16cf2b28d32369e315e841fbf29103dbb8e6da9d37b412ec119998feb1cce1fdc1f48ec46dfe96028018e69198c4e8 + languageName: node + linkType: hard + "@metamask/rollup-plugin-example-snap@workspace:packages/examples/packages/rollup-plugin": version: 0.0.0-use.local resolution: "@metamask/rollup-plugin-example-snap@workspace:packages/examples/packages/rollup-plugin" @@ -5230,7 +5260,7 @@ __metadata: "@metamask/json-rpc-engine": ^7.1.1 "@metamask/object-multiplex": ^1.2.0 "@metamask/post-message-stream": ^7.0.0 - "@metamask/providers": ^13.0.0 + "@metamask/providers": ^14.0.0 "@metamask/rpc-errors": ^6.1.0 "@metamask/snaps-sdk": "workspace:^" "@metamask/snaps-utils": "workspace:^" @@ -5739,7 +5769,7 @@ __metadata: "@metamask/name-lookup-example-snap": "workspace:^" "@metamask/network-example-snap": "workspace:^" "@metamask/notification-example-snap": "workspace:^" - "@metamask/providers": ^13.0.0 + "@metamask/providers": ^14.0.0 "@metamask/snaps-utils": "workspace:^" "@metamask/utils": ^8.1.0 "@metamask/wasm-example-snap": "workspace:^" @@ -8325,6 +8355,15 @@ __metadata: languageName: node linkType: hard +"abort-controller@npm:^3.0.0": + version: 3.0.0 + resolution: "abort-controller@npm:3.0.0" + dependencies: + event-target-shim: ^5.0.0 + checksum: 170bdba9b47b7e65906a28c8ce4f38a7a369d78e2271706f020849c1bfe0ee2067d4261df8bbb66eb84f79208fd5b710df759d64191db58cfba7ce8ef9c54b75 + languageName: node + linkType: hard + "accepts@npm:~1.3.4, accepts@npm:~1.3.5, accepts@npm:~1.3.8": version: 1.3.8 resolution: "accepts@npm:1.3.8" @@ -12650,6 +12689,13 @@ __metadata: languageName: node linkType: hard +"event-target-shim@npm:^5.0.0": + version: 5.0.1 + resolution: "event-target-shim@npm:5.0.1" + checksum: 1ffe3bb22a6d51bdeb6bf6f7cf97d2ff4a74b017ad12284cc9e6a279e727dc30a5de6bb613e5596ff4dc3e517841339ad09a7eec44266eccb1aa201a30448166 + languageName: node + linkType: hard + "eventemitter3@npm:^4.0.0": version: 4.0.7 resolution: "eventemitter3@npm:4.0.7" @@ -12861,6 +12907,16 @@ __metadata: languageName: node linkType: hard +"extension-port-stream@npm:^3.0.0": + version: 3.0.0 + resolution: "extension-port-stream@npm:3.0.0" + dependencies: + readable-stream: ^3.6.2 || ^4.4.2 + webextension-polyfill: ">=0.10.0 <1.0" + checksum: 4f51d2258a96154c2d916a8a5425636a2b0817763e9277f7dc378d08b6f050c90d185dbde4313d27cf66ad99d4b3116479f9f699c40358c64cccfa524d2b55bf + languageName: node + linkType: hard + "external-editor@npm:^3.1.0": version: 3.1.0 resolution: "external-editor@npm:3.1.0" @@ -15974,7 +16030,7 @@ __metadata: languageName: node linkType: hard -"json-rpc-middleware-stream@npm:^5.0.0": +"json-rpc-middleware-stream@npm:^5.0.0, json-rpc-middleware-stream@npm:^5.0.1": version: 5.0.1 resolution: "json-rpc-middleware-stream@npm:5.0.1" dependencies: @@ -19553,6 +19609,19 @@ __metadata: languageName: node linkType: hard +"readable-stream@npm:^3.6.2 || ^4.4.2": + version: 4.4.2 + resolution: "readable-stream@npm:4.4.2" + dependencies: + abort-controller: ^3.0.0 + buffer: ^6.0.3 + events: ^3.3.0 + process: ^0.11.10 + string_decoder: ^1.3.0 + checksum: 6f4063763dbdb52658d22d3f49ca976420e1fbe16bbd241f744383715845350b196a2f08b8d6330f8e219153dff34b140aeefd6296da828e1041a7eab1f20d5e + languageName: node + linkType: hard + "readable-web-to-node-stream@npm:^3.0.2": version: 3.0.2 resolution: "readable-web-to-node-stream@npm:3.0.2" From a0c2d7d3c1a6dcbb329e367336398315047c5645 Mon Sep 17 00:00:00 2001 From: Frederik Bolding Date: Wed, 15 Nov 2023 17:01:26 +0100 Subject: [PATCH 2/3] Update LavaMoat policies --- .../lavamoat/browserify/iframe/policy.json | 61 ++++++------ .../browserify/node-process/policy.json | 95 ++++++++++--------- .../browserify/node-thread/policy.json | 95 ++++++++++--------- .../browserify/worker-executor/policy.json | 61 ++++++------ 4 files changed, 168 insertions(+), 144 deletions(-) diff --git a/packages/snaps-execution-environments/lavamoat/browserify/iframe/policy.json b/packages/snaps-execution-environments/lavamoat/browserify/iframe/policy.json index a7ef31d909..fd2bb3a734 100644 --- a/packages/snaps-execution-environments/lavamoat/browserify/iframe/policy.json +++ b/packages/snaps-execution-environments/lavamoat/browserify/iframe/policy.json @@ -94,6 +94,7 @@ }, "@metamask/providers": { "globals": { + "CustomEvent": true, "Event": true, "addEventListener": true, "chrome.runtime.connect": true, @@ -107,18 +108,28 @@ "web3": true }, "packages": { + "@lavamoat/lavapack>readable-stream": true, "@metamask/json-rpc-engine": true, - "@metamask/object-multiplex": true, + "@metamask/providers>@metamask/object-multiplex": true, "@metamask/providers>@metamask/safe-event-emitter": true, "@metamask/providers>detect-browser": true, "@metamask/providers>extension-port-stream": true, "@metamask/providers>is-stream": true, "@metamask/providers>json-rpc-middleware-stream": true, "@metamask/rpc-errors": true, - "browserify>stream-browserify": true, + "@metamask/utils": true, "eslint>fast-deep-equal": true } }, + "@metamask/providers>@metamask/object-multiplex": { + "globals": { + "console.warn": true + }, + "packages": { + "@lavamoat/lavapack>readable-stream": true, + "@metamask/object-multiplex>once": true + } + }, "@metamask/providers>@metamask/safe-event-emitter": { "globals": { "setTimeout": true @@ -138,43 +149,35 @@ }, "@metamask/providers>extension-port-stream": { "packages": { - "browserify>buffer": true, - "browserify>stream-browserify": true + "@metamask/providers>extension-port-stream>readable-stream": true, + "browserify>buffer": true } }, - "@metamask/providers>json-rpc-middleware-stream": { + "@metamask/providers>extension-port-stream>readable-stream": { "globals": { - "console.warn": true, - "setTimeout": true + "AbortController": true, + "AggregateError": true, + "Blob": true, + "new": true, + "target": true }, "packages": { - "@metamask/providers>@metamask/safe-event-emitter": true, - "@metamask/providers>json-rpc-middleware-stream>readable-stream": true - } - }, - "@metamask/providers>json-rpc-middleware-stream>readable-stream": { - "packages": { - "@metamask/providers>json-rpc-middleware-stream>readable-stream>isarray": true, - "@metamask/providers>json-rpc-middleware-stream>readable-stream>safe-buffer": true, - "@metamask/providers>json-rpc-middleware-stream>readable-stream>string_decoder": true, - "browserify>browser-resolve": true, + "@metamask/providers>extension-port-stream>readable-stream>abort-controller": true, + "browserify>buffer": true, "browserify>events": true, - "browserify>inherits": true, "browserify>process": true, - "browserify>readable-stream>core-util-is": true, - "browserify>readable-stream>process-nextick-args": true, - "browserify>readable-stream>util-deprecate": true, - "browserify>timers-browserify": true - } - }, - "@metamask/providers>json-rpc-middleware-stream>readable-stream>safe-buffer": { - "packages": { - "browserify>buffer": true + "browserify>string_decoder": true } }, - "@metamask/providers>json-rpc-middleware-stream>readable-stream>string_decoder": { + "@metamask/providers>json-rpc-middleware-stream": { + "globals": { + "console.log": true, + "console.warn": true, + "setTimeout": true + }, "packages": { - "@metamask/providers>json-rpc-middleware-stream>readable-stream>safe-buffer": true + "@lavamoat/lavapack>readable-stream": true, + "@metamask/providers>@metamask/safe-event-emitter": true } }, "@metamask/rpc-errors": { diff --git a/packages/snaps-execution-environments/lavamoat/browserify/node-process/policy.json b/packages/snaps-execution-environments/lavamoat/browserify/node-process/policy.json index c713ca0771..125d41cbad 100644 --- a/packages/snaps-execution-environments/lavamoat/browserify/node-process/policy.json +++ b/packages/snaps-execution-environments/lavamoat/browserify/node-process/policy.json @@ -133,10 +133,8 @@ } }, "@metamask/providers": { - "builtin": { - "stream.pipeline": true - }, "globals": { + "CustomEvent": true, "Event": true, "addEventListener": true, "chrome.runtime.connect": true, @@ -150,16 +148,26 @@ "web3": true }, "packages": { + "@lavamoat/lavapack>readable-stream": true, "@metamask/json-rpc-engine": true, - "@metamask/object-multiplex": true, + "@metamask/providers>@metamask/object-multiplex": true, "@metamask/providers>@metamask/safe-event-emitter": true, "@metamask/providers>detect-browser": true, "@metamask/providers>extension-port-stream": true, "@metamask/providers>is-stream": true, "@metamask/providers>json-rpc-middleware-stream": true, "@metamask/rpc-errors": true, - "eslint>fast-deep-equal": true, - "stream": true + "@metamask/utils": true, + "eslint>fast-deep-equal": true + } + }, + "@metamask/providers>@metamask/object-multiplex": { + "globals": { + "console.warn": true + }, + "packages": { + "@lavamoat/lavapack>readable-stream": true, + "@metamask/object-multiplex>once": true } }, "@metamask/providers>@metamask/safe-event-emitter": { @@ -182,63 +190,59 @@ }, "@metamask/providers>extension-port-stream": { "builtin": { - "buffer.Buffer": true, - "stream.Duplex": true - }, - "packages": { - "buffer": true, - "stream": true - } - }, - "@metamask/providers>json-rpc-middleware-stream": { - "globals": { - "console.warn": true, - "setTimeout": true + "buffer.Buffer": true }, "packages": { - "@metamask/providers>@metamask/safe-event-emitter": true, - "@metamask/providers>json-rpc-middleware-stream>readable-stream": true + "@metamask/providers>extension-port-stream>readable-stream": true, + "buffer": true } }, - "@metamask/providers>json-rpc-middleware-stream>readable-stream": { + "@metamask/providers>extension-port-stream>readable-stream": { "builtin": { + "buffer.Blob": true, + "buffer.Buffer": true, "events.EventEmitter": true, "stream": true, - "timers.setImmediate": true, - "util": true + "string_decoder.StringDecoder": true }, "globals": { - "process.browser": true, + "AbortController": true, + "AggregateError": true, + "Blob": true, + "new": true, "process.env.READABLE_STREAM": true, - "process.stderr": true, - "process.stdout": true, - "process.version.slice": true + "target": true }, "packages": { - "@metamask/providers>json-rpc-middleware-stream>readable-stream>isarray": true, - "@metamask/providers>json-rpc-middleware-stream>readable-stream>safe-buffer": true, - "@metamask/providers>json-rpc-middleware-stream>readable-stream>string_decoder": true, - "browserify>inherits": true, - "browserify>readable-stream>core-util-is": true, - "browserify>readable-stream>process-nextick-args": true, - "browserify>readable-stream>util-deprecate": true, + "@metamask/providers>extension-port-stream>readable-stream>abort-controller": true, + "browserify>process": true, + "buffer": true, "events": true, "stream": true, - "timers": true, - "util": true + "string_decoder": true } }, - "@metamask/providers>json-rpc-middleware-stream>readable-stream>safe-buffer": { - "builtin": { - "buffer": true - }, + "@metamask/providers>extension-port-stream>readable-stream>abort-controller": { "packages": { - "buffer": true + "@metamask/providers>extension-port-stream>readable-stream>abort-controller>event-target-shim": true } }, - "@metamask/providers>json-rpc-middleware-stream>readable-stream>string_decoder": { + "@metamask/providers>extension-port-stream>readable-stream>abort-controller>event-target-shim": { + "globals": { + "Event": true, + "EventTarget": true, + "console": true + } + }, + "@metamask/providers>json-rpc-middleware-stream": { + "globals": { + "console.log": true, + "console.warn": true, + "setTimeout": true + }, "packages": { - "@metamask/providers>json-rpc-middleware-stream>readable-stream>safe-buffer": true + "@lavamoat/lavapack>readable-stream": true, + "@metamask/providers>@metamask/safe-event-emitter": true } }, "@metamask/rpc-errors": { @@ -328,6 +332,11 @@ "util": true } }, + "browserify>process": { + "globals": { + "process": true + } + }, "browserify>readable-stream>core-util-is": { "packages": { "browserify>insert-module-globals>is-buffer": true diff --git a/packages/snaps-execution-environments/lavamoat/browserify/node-thread/policy.json b/packages/snaps-execution-environments/lavamoat/browserify/node-thread/policy.json index c713ca0771..125d41cbad 100644 --- a/packages/snaps-execution-environments/lavamoat/browserify/node-thread/policy.json +++ b/packages/snaps-execution-environments/lavamoat/browserify/node-thread/policy.json @@ -133,10 +133,8 @@ } }, "@metamask/providers": { - "builtin": { - "stream.pipeline": true - }, "globals": { + "CustomEvent": true, "Event": true, "addEventListener": true, "chrome.runtime.connect": true, @@ -150,16 +148,26 @@ "web3": true }, "packages": { + "@lavamoat/lavapack>readable-stream": true, "@metamask/json-rpc-engine": true, - "@metamask/object-multiplex": true, + "@metamask/providers>@metamask/object-multiplex": true, "@metamask/providers>@metamask/safe-event-emitter": true, "@metamask/providers>detect-browser": true, "@metamask/providers>extension-port-stream": true, "@metamask/providers>is-stream": true, "@metamask/providers>json-rpc-middleware-stream": true, "@metamask/rpc-errors": true, - "eslint>fast-deep-equal": true, - "stream": true + "@metamask/utils": true, + "eslint>fast-deep-equal": true + } + }, + "@metamask/providers>@metamask/object-multiplex": { + "globals": { + "console.warn": true + }, + "packages": { + "@lavamoat/lavapack>readable-stream": true, + "@metamask/object-multiplex>once": true } }, "@metamask/providers>@metamask/safe-event-emitter": { @@ -182,63 +190,59 @@ }, "@metamask/providers>extension-port-stream": { "builtin": { - "buffer.Buffer": true, - "stream.Duplex": true - }, - "packages": { - "buffer": true, - "stream": true - } - }, - "@metamask/providers>json-rpc-middleware-stream": { - "globals": { - "console.warn": true, - "setTimeout": true + "buffer.Buffer": true }, "packages": { - "@metamask/providers>@metamask/safe-event-emitter": true, - "@metamask/providers>json-rpc-middleware-stream>readable-stream": true + "@metamask/providers>extension-port-stream>readable-stream": true, + "buffer": true } }, - "@metamask/providers>json-rpc-middleware-stream>readable-stream": { + "@metamask/providers>extension-port-stream>readable-stream": { "builtin": { + "buffer.Blob": true, + "buffer.Buffer": true, "events.EventEmitter": true, "stream": true, - "timers.setImmediate": true, - "util": true + "string_decoder.StringDecoder": true }, "globals": { - "process.browser": true, + "AbortController": true, + "AggregateError": true, + "Blob": true, + "new": true, "process.env.READABLE_STREAM": true, - "process.stderr": true, - "process.stdout": true, - "process.version.slice": true + "target": true }, "packages": { - "@metamask/providers>json-rpc-middleware-stream>readable-stream>isarray": true, - "@metamask/providers>json-rpc-middleware-stream>readable-stream>safe-buffer": true, - "@metamask/providers>json-rpc-middleware-stream>readable-stream>string_decoder": true, - "browserify>inherits": true, - "browserify>readable-stream>core-util-is": true, - "browserify>readable-stream>process-nextick-args": true, - "browserify>readable-stream>util-deprecate": true, + "@metamask/providers>extension-port-stream>readable-stream>abort-controller": true, + "browserify>process": true, + "buffer": true, "events": true, "stream": true, - "timers": true, - "util": true + "string_decoder": true } }, - "@metamask/providers>json-rpc-middleware-stream>readable-stream>safe-buffer": { - "builtin": { - "buffer": true - }, + "@metamask/providers>extension-port-stream>readable-stream>abort-controller": { "packages": { - "buffer": true + "@metamask/providers>extension-port-stream>readable-stream>abort-controller>event-target-shim": true } }, - "@metamask/providers>json-rpc-middleware-stream>readable-stream>string_decoder": { + "@metamask/providers>extension-port-stream>readable-stream>abort-controller>event-target-shim": { + "globals": { + "Event": true, + "EventTarget": true, + "console": true + } + }, + "@metamask/providers>json-rpc-middleware-stream": { + "globals": { + "console.log": true, + "console.warn": true, + "setTimeout": true + }, "packages": { - "@metamask/providers>json-rpc-middleware-stream>readable-stream>safe-buffer": true + "@lavamoat/lavapack>readable-stream": true, + "@metamask/providers>@metamask/safe-event-emitter": true } }, "@metamask/rpc-errors": { @@ -328,6 +332,11 @@ "util": true } }, + "browserify>process": { + "globals": { + "process": true + } + }, "browserify>readable-stream>core-util-is": { "packages": { "browserify>insert-module-globals>is-buffer": true diff --git a/packages/snaps-execution-environments/lavamoat/browserify/worker-executor/policy.json b/packages/snaps-execution-environments/lavamoat/browserify/worker-executor/policy.json index a7ef31d909..fd2bb3a734 100644 --- a/packages/snaps-execution-environments/lavamoat/browserify/worker-executor/policy.json +++ b/packages/snaps-execution-environments/lavamoat/browserify/worker-executor/policy.json @@ -94,6 +94,7 @@ }, "@metamask/providers": { "globals": { + "CustomEvent": true, "Event": true, "addEventListener": true, "chrome.runtime.connect": true, @@ -107,18 +108,28 @@ "web3": true }, "packages": { + "@lavamoat/lavapack>readable-stream": true, "@metamask/json-rpc-engine": true, - "@metamask/object-multiplex": true, + "@metamask/providers>@metamask/object-multiplex": true, "@metamask/providers>@metamask/safe-event-emitter": true, "@metamask/providers>detect-browser": true, "@metamask/providers>extension-port-stream": true, "@metamask/providers>is-stream": true, "@metamask/providers>json-rpc-middleware-stream": true, "@metamask/rpc-errors": true, - "browserify>stream-browserify": true, + "@metamask/utils": true, "eslint>fast-deep-equal": true } }, + "@metamask/providers>@metamask/object-multiplex": { + "globals": { + "console.warn": true + }, + "packages": { + "@lavamoat/lavapack>readable-stream": true, + "@metamask/object-multiplex>once": true + } + }, "@metamask/providers>@metamask/safe-event-emitter": { "globals": { "setTimeout": true @@ -138,43 +149,35 @@ }, "@metamask/providers>extension-port-stream": { "packages": { - "browserify>buffer": true, - "browserify>stream-browserify": true + "@metamask/providers>extension-port-stream>readable-stream": true, + "browserify>buffer": true } }, - "@metamask/providers>json-rpc-middleware-stream": { + "@metamask/providers>extension-port-stream>readable-stream": { "globals": { - "console.warn": true, - "setTimeout": true + "AbortController": true, + "AggregateError": true, + "Blob": true, + "new": true, + "target": true }, "packages": { - "@metamask/providers>@metamask/safe-event-emitter": true, - "@metamask/providers>json-rpc-middleware-stream>readable-stream": true - } - }, - "@metamask/providers>json-rpc-middleware-stream>readable-stream": { - "packages": { - "@metamask/providers>json-rpc-middleware-stream>readable-stream>isarray": true, - "@metamask/providers>json-rpc-middleware-stream>readable-stream>safe-buffer": true, - "@metamask/providers>json-rpc-middleware-stream>readable-stream>string_decoder": true, - "browserify>browser-resolve": true, + "@metamask/providers>extension-port-stream>readable-stream>abort-controller": true, + "browserify>buffer": true, "browserify>events": true, - "browserify>inherits": true, "browserify>process": true, - "browserify>readable-stream>core-util-is": true, - "browserify>readable-stream>process-nextick-args": true, - "browserify>readable-stream>util-deprecate": true, - "browserify>timers-browserify": true - } - }, - "@metamask/providers>json-rpc-middleware-stream>readable-stream>safe-buffer": { - "packages": { - "browserify>buffer": true + "browserify>string_decoder": true } }, - "@metamask/providers>json-rpc-middleware-stream>readable-stream>string_decoder": { + "@metamask/providers>json-rpc-middleware-stream": { + "globals": { + "console.log": true, + "console.warn": true, + "setTimeout": true + }, "packages": { - "@metamask/providers>json-rpc-middleware-stream>readable-stream>safe-buffer": true + "@lavamoat/lavapack>readable-stream": true, + "@metamask/providers>@metamask/safe-event-emitter": true } }, "@metamask/rpc-errors": { From ba8de5bcdde94abda364f68c2c94ef7fdef36756 Mon Sep 17 00:00:00 2001 From: Frederik Bolding Date: Wed, 15 Nov 2023 17:02:28 +0100 Subject: [PATCH 3/3] Bump sdk version --- packages/snaps-sdk/package.json | 2 +- yarn.lock | 42 ++------------------------------- 2 files changed, 3 insertions(+), 41 deletions(-) diff --git a/packages/snaps-sdk/package.json b/packages/snaps-sdk/package.json index 55abb59d63..63e657af01 100644 --- a/packages/snaps-sdk/package.json +++ b/packages/snaps-sdk/package.json @@ -36,7 +36,7 @@ }, "dependencies": { "@metamask/key-tree": "^9.0.0", - "@metamask/providers": "^13.0.0", + "@metamask/providers": "^14.0.0", "@metamask/rpc-errors": "^6.1.0", "@metamask/utils": "^8.1.0", "is-svg": "^4.4.0", diff --git a/yarn.lock b/yarn.lock index 8e146ee8a1..7b14662fdc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4839,7 +4839,7 @@ __metadata: languageName: unknown linkType: soft -"@metamask/object-multiplex@npm:^1.1.0, @metamask/object-multiplex@npm:^1.2.0": +"@metamask/object-multiplex@npm:^1.2.0": version: 1.2.0 resolution: "@metamask/object-multiplex@npm:1.2.0" dependencies: @@ -4903,25 +4903,6 @@ __metadata: languageName: node linkType: hard -"@metamask/providers@npm:^13.0.0": - version: 13.0.0 - resolution: "@metamask/providers@npm:13.0.0" - dependencies: - "@metamask/json-rpc-engine": ^7.1.1 - "@metamask/object-multiplex": ^1.1.0 - "@metamask/rpc-errors": ^6.0.0 - "@metamask/safe-event-emitter": ^3.0.0 - "@metamask/utils": ^8.1.0 - detect-browser: ^5.2.0 - extension-port-stream: ^2.1.1 - fast-deep-equal: ^3.1.3 - is-stream: ^2.0.0 - json-rpc-middleware-stream: ^4.2.1 - webextension-polyfill: ^0.10.0 - checksum: b41748cf179794bf7a68d3028e84234e876498611221ba40846ed0859b4470a806c4cf99ff9fcdc60fde1af2f0d999281e6edbdd42113223d8f7018a009ff0ab - languageName: node - linkType: hard - "@metamask/providers@npm:^14.0.0": version: 14.0.0 resolution: "@metamask/providers@npm:14.0.0" @@ -5478,7 +5459,7 @@ __metadata: "@metamask/eslint-config-nodejs": ^12.1.0 "@metamask/eslint-config-typescript": ^12.1.0 "@metamask/key-tree": ^9.0.0 - "@metamask/providers": ^13.0.0 + "@metamask/providers": ^14.0.0 "@metamask/rpc-errors": ^6.1.0 "@metamask/utils": ^8.1.0 "@swc/cli": ^0.1.62 @@ -12898,15 +12879,6 @@ __metadata: languageName: node linkType: hard -"extension-port-stream@npm:^2.1.1": - version: 2.1.1 - resolution: "extension-port-stream@npm:2.1.1" - dependencies: - webextension-polyfill: ">=0.10.0 <1.0" - checksum: aee8bbeb2ed6f69a62f58a89580e0e9002dadb11062edbaedb7bb04cfc5a5e0b0d3980bfeaa1c3ee7e08dec7e5fac26e25497fc2f82000db7653442bd5eca157 - languageName: node - linkType: hard - "extension-port-stream@npm:^3.0.0": version: 3.0.0 resolution: "extension-port-stream@npm:3.0.0" @@ -16020,16 +15992,6 @@ __metadata: languageName: node linkType: hard -"json-rpc-middleware-stream@npm:^4.2.1": - version: 4.2.2 - resolution: "json-rpc-middleware-stream@npm:4.2.2" - dependencies: - "@metamask/safe-event-emitter": ^3.0.0 - readable-stream: ^2.3.3 - checksum: 01ff3a23b501fde5c2abb8c3b4d100c4fd430b41cf5e7750235f860a02d5823f8a43b0e81150c1d3bb196737f2273af1c7a50ff179e95e3d59fb7fe172249de3 - languageName: node - linkType: hard - "json-rpc-middleware-stream@npm:^5.0.0, json-rpc-middleware-stream@npm:^5.0.1": version: 5.0.1 resolution: "json-rpc-middleware-stream@npm:5.0.1"