Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions constraints.pro
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,8 @@ gen_enforced_dependency(WorkspaceCwd, DependencyIdent, OtherDependencyRange, Dep
workspace_has_dependency(OtherWorkspaceCwd, DependencyIdent, OtherDependencyRange, OtherDependencyType),
WorkspaceCwd \= OtherWorkspaceCwd,
DependencyRange \= OtherDependencyRange,
% TODO: Remove below line once @metamask/object-multiplex is bumped to ^2.0.0 in snaps-execution-environments
DependencyIdent \= '@metamask/object-multiplex',
npm_version_range_out_of_sync(DependencyRange, OtherDependencyRange).

% If a dependency is listed under "dependencies", it should not be listed under
Expand Down
2 changes: 1 addition & 1 deletion packages/snaps-controllers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"@metamask/approval-controller": "^4.1.0",
"@metamask/base-controller": "^3.2.0",
"@metamask/json-rpc-engine": "^7.1.1",
"@metamask/object-multiplex": "^1.2.0",
"@metamask/object-multiplex": "^2.0.0",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@legobeat Can we bump this across all the snaps monorepo packages?

Copy link
Contributor Author

@legobeat legobeat Nov 8, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I assume this is what will be done eventually. However, it seems to imply quite a bit more (update of providers and some further changes?) when done in snaps-execution-environment:

https://github.com/MetaMask/snaps/actions/runs/6792674292/job/18466373634

https://github.com/legobeat/snaps-monorepo/pull/5/checks

So this PR currently aims at sidestepping that for the moment in order to allow getting @metamask/providers into @metamask/keyring-api.

Think it's worth pushing for doing the full update across the board in one larger update instead?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Our Yarn constraints require that we use the same dependency versions across all packages.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes: I am considering inserting a temporary exception for that, here, until @metamask/snaps-execution-environment is also bumped.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm could be that providers v14 needs some more attention to bump 🤔

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"@metamask/permission-controller": "^5.0.0",
"@metamask/phishing-controller": "^7.0.0",
"@metamask/post-message-stream": "^7.0.0",
Expand Down
12 changes: 11 additions & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -5135,7 +5145,7 @@ __metadata:
"@metamask/eslint-config-nodejs": ^12.1.0
"@metamask/eslint-config-typescript": ^12.1.0
"@metamask/json-rpc-engine": ^7.1.1
"@metamask/object-multiplex": ^1.2.0
"@metamask/object-multiplex": ^2.0.0
"@metamask/permission-controller": ^5.0.0
"@metamask/phishing-controller": ^7.0.0
"@metamask/post-message-stream": ^7.0.0
Expand Down