Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jl/caip multichain/cleanup middleware destroy #28751

Merged
merged 13 commits into from
Dec 2, 2024
Merged

Jl/caip multichain/cleanup middleware destroy #28751

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
8587442
use preview build 7f262294 (sub middleware destroy cleanup)
jiexi Nov 27, 2024
7d32306
Merge branch 'jl/caip-multichain-migrate-core' into jl/caip-multichai…
jiexi Nov 27, 2024
2c395c3
lavamoat
jiexi Nov 27, 2024
81867db
Update LavaMoat policies
metamaskbot Nov 27, 2024
0f0bb96
Merge branch 'jl/caip-multichain-migrate-core' into jl/caip-multichai…
jiexi Nov 27, 2024
f901781
Merge branch 'jl/caip-multichain-migrate-core' into jl/caip-multichai…
jiexi Dec 2, 2024
2de1268
Merge branch 'jl/caip-multichain-migrate-core' into jl/caip-multichai…
jiexi Dec 2, 2024
8d2b2dd
use preview build 1c8fd633 (separate middleware instance)
jiexi Dec 2, 2024
2adafd0
Merge branch 'jl/caip-multichain-migrate-core' into jl/caip-multichai…
jiexi Dec 2, 2024
3154dd8
use preview build b8323ae4 (separate middleware instance rebuilt)
jiexi Dec 2, 2024
c2bdfea
use preview build 31564566 (separate middleware instance fixed)
jiexi Dec 2, 2024
3005665
yarn dedupe
jiexi Dec 2, 2024
3dbd915
use preview build 57e6ab5d (separate middleware instance merged)
jiexi Dec 2, 2024
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
10 changes: 0 additions & 10 deletions app/scripts/metamask-controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5984,16 +5984,6 @@ export default class MetamaskController extends EventEmitter {
outStream,
(err) => {
// handle any middleware cleanup
// TODO: is this needed or does the middleware destory chain handle this?
this.multichainMiddlewareManager.removeMiddlewareByOriginAndTabId(
origin,
tabId,
);
// TODO: is this needed or does the middleware destory chain handle this?
this.multichainSubscriptionManager.unsubscribeByOriginAndTabId(
origin,
tabId,
);
engine.destroy();
connectionId && this.removeConnection(origin, connectionId);
// For context and todos related to the error message match, see https://github.com/MetaMask/metamask-extension/issues/26337
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@
"@metamask/message-manager": "^11.0.0",
"@metamask/message-signing-snap": "^0.4.0",
"@metamask/metamask-eth-abis": "^3.1.1",
"@metamask/multichain": "npm:@metamask-previews/[email protected]944be534",
"@metamask/multichain": "npm:@metamask-previews/[email protected]57e6ab5d",
"@metamask/name-controller": "^8.0.0",
"@metamask/network-controller": "patch:@metamask/network-controller@npm%3A21.0.0#~/.yarn/patches/@metamask-network-controller-npm-21.0.0-559aa8e395.patch",
"@metamask/notification-services-controller": "^0.14.0",
Expand Down
19 changes: 6 additions & 13 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4102,20 +4102,13 @@ __metadata:
languageName: node
linkType: hard

"@json-schema-tools/traverse@npm:^1.10.4":
"@json-schema-tools/traverse@npm:^1.10.4, @json-schema-tools/traverse@npm:^1.7.5, @json-schema-tools/traverse@npm:^1.7.8":
version: 1.10.4
resolution: "@json-schema-tools/traverse@npm:1.10.4"
checksum: 10/0027bc90df01c5eeee0833e722b7320b53be8b5ce3f4e0e4a6e45713a38e6f88f21aba31e3dd973093ef75cd21a40c07fe8f112da8f49a7919b1c0e44c904d20
languageName: node
linkType: hard

"@json-schema-tools/traverse@npm:^1.7.5, @json-schema-tools/traverse@npm:^1.7.8":
version: 1.10.3
resolution: "@json-schema-tools/traverse@npm:1.10.3"
checksum: 10/690623740d223ea373d8e561dad5c70bf86461bcedc5fc45da01c87bcdf3284bbdbad3006d4a423f8d82e4b2d4580e45f92c0b272f006024fb597d7f01876215
languageName: node
linkType: hard

"@juggle/resize-observer@npm:^3.3.1":
version: 3.4.0
resolution: "@juggle/resize-observer@npm:3.4.0"
Expand Down Expand Up @@ -5825,9 +5818,9 @@ __metadata:
languageName: node
linkType: hard

"@metamask/multichain@npm:@metamask-previews/[email protected]944be534":
version: 1.1.0-preview-944be534
resolution: "@metamask-previews/multichain@npm:1.1.0-preview-944be534"
"@metamask/multichain@npm:@metamask-previews/[email protected]57e6ab5d":
version: 1.1.0-preview-57e6ab5d
resolution: "@metamask-previews/multichain@npm:1.1.0-preview-57e6ab5d"
dependencies:
"@metamask/api-specs": "npm:^0.10.12"
"@metamask/controller-utils": "npm:^11.4.3"
Expand All @@ -5841,7 +5834,7 @@ __metadata:
peerDependencies:
"@metamask/network-controller": ^22.0.0
"@metamask/permission-controller": ^11.0.0
checksum: 10/5392f48f3866ebff3bf04b60de5405e3cb4db9ca8f536408a3d6f708de8db5ba1c6e2f57faa9a1587fd9ab5431d83243ea7dcd3b3839fe4e4b4f676a59722533
checksum: 10/2ffd8972f2ed0b30ff3c0300e5bf3cc1f49050a3f71dfb7cfa0ffdf4554d5dc19475f607118bcca7155474af022a057ea281a753b44fbbd27cb17be816bbbf60
languageName: node
linkType: hard

Expand Down Expand Up @@ -26623,7 +26616,7 @@ __metadata:
"@metamask/message-manager": "npm:^11.0.0"
"@metamask/message-signing-snap": "npm:^0.4.0"
"@metamask/metamask-eth-abis": "npm:^3.1.1"
"@metamask/multichain": "npm:@metamask-previews/[email protected]944be534"
"@metamask/multichain": "npm:@metamask-previews/[email protected]57e6ab5d"
"@metamask/name-controller": "npm:^8.0.0"
"@metamask/network-controller": "patch:@metamask/network-controller@npm%3A21.0.0#~/.yarn/patches/@metamask-network-controller-npm-21.0.0-559aa8e395.patch"
"@metamask/notification-services-controller": "npm:^0.14.0"
Expand Down
Loading