From 2e86126d31a36cc97f185f6a9c25dc9677a1f697 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 16 Apr 2025 06:52:43 +0000 Subject: [PATCH 1/2] chore(deps): bump @metamask/post-message-stream from 9.0.0 to 10.0.0 Bumps [@metamask/post-message-stream](https://github.com/MetaMask/post-message-stream) from 9.0.0 to 10.0.0. - [Release notes](https://github.com/MetaMask/post-message-stream/releases) - [Changelog](https://github.com/MetaMask/post-message-stream/blob/main/CHANGELOG.md) - [Commits](https://github.com/MetaMask/post-message-stream/compare/v9.0.0...v10.0.0) --- updated-dependencies: - dependency-name: "@metamask/post-message-stream" dependency-version: 10.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- packages/snaps-controllers/package.json | 2 +- .../snaps-execution-environments/package.json | 2 +- packages/snaps-utils/package.json | 2 +- yarn.lock | 33 ++++++++++++++----- 4 files changed, 28 insertions(+), 11 deletions(-) diff --git a/packages/snaps-controllers/package.json b/packages/snaps-controllers/package.json index 66814d3a8e..22b1b9db07 100644 --- a/packages/snaps-controllers/package.json +++ b/packages/snaps-controllers/package.json @@ -88,7 +88,7 @@ "@metamask/object-multiplex": "^2.1.0", "@metamask/permission-controller": "^11.0.6", "@metamask/phishing-controller": "^12.4.1", - "@metamask/post-message-stream": "^9.0.0", + "@metamask/post-message-stream": "^10.0.0", "@metamask/rpc-errors": "^7.0.2", "@metamask/snaps-registry": "^3.2.3", "@metamask/snaps-rpc-methods": "workspace:^", diff --git a/packages/snaps-execution-environments/package.json b/packages/snaps-execution-environments/package.json index 3c8708ca16..aa3fbeaae3 100644 --- a/packages/snaps-execution-environments/package.json +++ b/packages/snaps-execution-environments/package.json @@ -67,7 +67,7 @@ "dependencies": { "@metamask/json-rpc-engine": "^10.0.2", "@metamask/object-multiplex": "^2.1.0", - "@metamask/post-message-stream": "^9.0.0", + "@metamask/post-message-stream": "^10.0.0", "@metamask/providers": "^21.0.0", "@metamask/rpc-errors": "^7.0.2", "@metamask/snaps-sdk": "workspace:^", diff --git a/packages/snaps-utils/package.json b/packages/snaps-utils/package.json index aa854f97fb..0ed767bb9c 100644 --- a/packages/snaps-utils/package.json +++ b/packages/snaps-utils/package.json @@ -106,7 +106,7 @@ "devDependencies": { "@lavamoat/allow-scripts": "^3.0.4", "@metamask/auto-changelog": "^5.0.1", - "@metamask/post-message-stream": "^9.0.0", + "@metamask/post-message-stream": "^10.0.0", "@swc/core": "1.3.78", "@swc/jest": "^0.2.26", "@testing-library/dom": "^10.4.0", diff --git a/yarn.lock b/yarn.lock index 8a8e61302b..abbe9f9e4e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3718,13 +3718,13 @@ __metadata: languageName: node linkType: hard -"@metamask/post-message-stream@npm:^9.0.0": - version: 9.0.0 - resolution: "@metamask/post-message-stream@npm:9.0.0" +"@metamask/post-message-stream@npm:^10.0.0": + version: 10.0.0 + resolution: "@metamask/post-message-stream@npm:10.0.0" dependencies: - "@metamask/utils": "npm:^11.0.1" + "@metamask/utils": "npm:^11.4.0" readable-stream: "npm:3.6.2" - checksum: 10/5da711d3274e724452322939a5a77c60ed1d7ed73cdaa62e95c16debc443804d5a16de116dce742e05b3fbfa962e009dfeafc3a12a66f20e163617567f2cace5 + checksum: 10/7892b30e6107b662680dfba75c078ac925c9f45bf1f90a0c86035f206a6305ddf903086a02b08e6fe9aec9ec32a0fecd2ff31941d5961d45ee782c07993846c5 languageName: node linkType: hard @@ -4058,7 +4058,7 @@ __metadata: "@metamask/object-multiplex": "npm:^2.1.0" "@metamask/permission-controller": "npm:^11.0.6" "@metamask/phishing-controller": "npm:^12.4.1" - "@metamask/post-message-stream": "npm:^9.0.0" + "@metamask/post-message-stream": "npm:^10.0.0" "@metamask/rpc-errors": "npm:^7.0.2" "@metamask/snaps-registry": "npm:^3.2.3" "@metamask/snaps-rpc-methods": "workspace:^" @@ -4135,7 +4135,7 @@ __metadata: "@metamask/auto-changelog": "npm:^5.0.1" "@metamask/json-rpc-engine": "npm:^10.0.2" "@metamask/object-multiplex": "npm:^2.1.0" - "@metamask/post-message-stream": "npm:^9.0.0" + "@metamask/post-message-stream": "npm:^10.0.0" "@metamask/providers": "npm:^21.0.0" "@metamask/rpc-errors": "npm:^7.0.2" "@metamask/snaps-sdk": "workspace:^" @@ -4368,7 +4368,7 @@ __metadata: "@metamask/base-controller": "npm:^8.0.0" "@metamask/key-tree": "npm:^10.1.1" "@metamask/permission-controller": "npm:^11.0.6" - "@metamask/post-message-stream": "npm:^9.0.0" + "@metamask/post-message-stream": "npm:^10.0.0" "@metamask/rpc-errors": "npm:^7.0.2" "@metamask/slip44": "npm:^4.1.0" "@metamask/snaps-registry": "npm:^3.2.3" @@ -4556,6 +4556,23 @@ __metadata: languageName: node linkType: hard +"@metamask/utils@npm:^11.4.0": + version: 11.4.0 + resolution: "@metamask/utils@npm:11.4.0" + dependencies: + "@ethereumjs/tx": "npm:^4.2.0" + "@metamask/superstruct": "npm:^3.1.0" + "@noble/hashes": "npm:^1.3.1" + "@scure/base": "npm:^1.1.3" + "@types/debug": "npm:^4.1.7" + debug: "npm:^4.3.4" + pony-cause: "npm:^2.1.10" + semver: "npm:^7.5.4" + uuid: "npm:^9.0.1" + checksum: 10/7c976268e944b542b5e936bae89f58a50eef58501bd3512944995c6d416cb1a7dd3f712aec8c7ca0969dcee889ab963b815fbc3e863dc80ccf16e9258eaec3ff + languageName: node + linkType: hard + "@metamask/utils@npm:^9.0.0": version: 9.2.1 resolution: "@metamask/utils@npm:9.2.1" From e18cae1ba2e1ee9c1c61c2085e8c84fdd08bad71 Mon Sep 17 00:00:00 2001 From: Maarten Zuidhoorn Date: Wed, 16 Apr 2025 10:26:02 +0200 Subject: [PATCH 2/2] Handle breaking changes Update more imports Update even more imports Update even more even more imports --- .../src/services/node-js/NodeProcessExecutionService.ts | 2 +- .../src/services/node-js/NodeThreadExecutionService.ts | 2 +- .../src/services/webview/WebViewMessageStream.ts | 6 ++++-- .../src/node-process/ChildProcessSnapExecutor.ts | 2 +- .../src/node-thread/ThreadSnapExecutor.ts | 2 +- .../src/webview/WebViewExecutorStream.ts | 6 ++++-- 6 files changed, 12 insertions(+), 8 deletions(-) diff --git a/packages/snaps-controllers/src/services/node-js/NodeProcessExecutionService.ts b/packages/snaps-controllers/src/services/node-js/NodeProcessExecutionService.ts index 39777e2920..fa17b8e05f 100644 --- a/packages/snaps-controllers/src/services/node-js/NodeProcessExecutionService.ts +++ b/packages/snaps-controllers/src/services/node-js/NodeProcessExecutionService.ts @@ -1,5 +1,5 @@ import type { BasePostMessageStream } from '@metamask/post-message-stream'; -import { ProcessParentMessageStream } from '@metamask/post-message-stream'; +import { ProcessParentMessageStream } from '@metamask/post-message-stream/node'; import type { ChildProcess } from 'child_process'; import { fork } from 'child_process'; diff --git a/packages/snaps-controllers/src/services/node-js/NodeThreadExecutionService.ts b/packages/snaps-controllers/src/services/node-js/NodeThreadExecutionService.ts index f6bfeaf2d9..4e7a91fd9a 100644 --- a/packages/snaps-controllers/src/services/node-js/NodeThreadExecutionService.ts +++ b/packages/snaps-controllers/src/services/node-js/NodeThreadExecutionService.ts @@ -1,5 +1,5 @@ import type { BasePostMessageStream } from '@metamask/post-message-stream'; -import { ThreadParentMessageStream } from '@metamask/post-message-stream'; +import { ThreadParentMessageStream } from '@metamask/post-message-stream/node'; import { Worker } from 'worker_threads'; import type { TerminateJobArgs } from '..'; diff --git a/packages/snaps-controllers/src/services/webview/WebViewMessageStream.ts b/packages/snaps-controllers/src/services/webview/WebViewMessageStream.ts index 8d6f390a91..f2d445cb76 100644 --- a/packages/snaps-controllers/src/services/webview/WebViewMessageStream.ts +++ b/packages/snaps-controllers/src/services/webview/WebViewMessageStream.ts @@ -1,6 +1,8 @@ import type { PostMessageEvent } from '@metamask/post-message-stream'; -import { BasePostMessageStream } from '@metamask/post-message-stream'; -import { isValidStreamMessage } from '@metamask/post-message-stream/dist/utils'; +import { + BasePostMessageStream, + isValidStreamMessage, +} from '@metamask/post-message-stream'; import { assert, stringToBytes } from '@metamask/utils'; export type WebViewInterface = { diff --git a/packages/snaps-execution-environments/src/node-process/ChildProcessSnapExecutor.ts b/packages/snaps-execution-environments/src/node-process/ChildProcessSnapExecutor.ts index 9deb33bddc..0eb1acd54c 100644 --- a/packages/snaps-execution-environments/src/node-process/ChildProcessSnapExecutor.ts +++ b/packages/snaps-execution-environments/src/node-process/ChildProcessSnapExecutor.ts @@ -1,5 +1,5 @@ import ObjectMultiplex from '@metamask/object-multiplex'; -import { ProcessMessageStream } from '@metamask/post-message-stream'; +import { ProcessMessageStream } from '@metamask/post-message-stream/node'; import { logError, SNAP_STREAM_NAMES } from '@metamask/snaps-utils'; import { pipeline } from 'readable-stream'; diff --git a/packages/snaps-execution-environments/src/node-thread/ThreadSnapExecutor.ts b/packages/snaps-execution-environments/src/node-thread/ThreadSnapExecutor.ts index a66e59d22c..32e1c2784f 100644 --- a/packages/snaps-execution-environments/src/node-thread/ThreadSnapExecutor.ts +++ b/packages/snaps-execution-environments/src/node-thread/ThreadSnapExecutor.ts @@ -1,5 +1,5 @@ import ObjectMultiplex from '@metamask/object-multiplex'; -import { ThreadMessageStream } from '@metamask/post-message-stream'; +import { ThreadMessageStream } from '@metamask/post-message-stream/node'; import { logError, SNAP_STREAM_NAMES } from '@metamask/snaps-utils'; import { pipeline } from 'readable-stream'; diff --git a/packages/snaps-execution-environments/src/webview/WebViewExecutorStream.ts b/packages/snaps-execution-environments/src/webview/WebViewExecutorStream.ts index c3bb7f20da..e7f65b0510 100644 --- a/packages/snaps-execution-environments/src/webview/WebViewExecutorStream.ts +++ b/packages/snaps-execution-environments/src/webview/WebViewExecutorStream.ts @@ -1,6 +1,8 @@ import type { PostMessageEvent } from '@metamask/post-message-stream'; -import { BasePostMessageStream } from '@metamask/post-message-stream'; -import { isValidStreamMessage } from '@metamask/post-message-stream/dist/utils'; +import { + BasePostMessageStream, + isValidStreamMessage, +} from '@metamask/post-message-stream'; import { bytesToString } from '@metamask/utils'; type WebViewExecutorStreamArgs = {