Skip to content

Commit 8ea96ce

Browse files
committed
use preview build from MetaMask/core#4602
1 parent 2e9852b commit 8ea96ce

File tree

3 files changed

+48
-6
lines changed

3 files changed

+48
-6
lines changed

app/core/Engine.ts

+29
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,12 @@ import {
8282
ApprovalControllerEvents,
8383
ApprovalControllerState,
8484
} from '@metamask/approval-controller';
85+
import {
86+
METAMASK_DOMAIN,
87+
SelectedNetworkController,
88+
SelectedNetworkControllerState,
89+
createSelectedNetworkMiddleware,
90+
} from '@metamask/selected-network-controller';
8591
import {
8692
PermissionController,
8793
PermissionControllerActions,
@@ -336,6 +342,7 @@ export interface EngineState {
336342
LoggingController: LoggingControllerState;
337343
PPOMController: PPOMState;
338344
AccountsController: AccountsControllerState;
345+
SelectedNetworkController: SelectedNetworkControllerState;
339346
}
340347

341348
/**
@@ -899,6 +906,28 @@ class Engine {
899906
unrestrictedMethods,
900907
});
901908

909+
const selectedNetworkController = new SelectedNetworkController({
910+
messenger: this.controllerMessenger.getRestricted({
911+
name: 'SelectedNetworkController',
912+
allowedActions: [
913+
'NetworkController:getNetworkClientById',
914+
'NetworkController:getState',
915+
'NetworkController:getSelectedNetworkClient',
916+
'PermissionController:hasPermissions',
917+
'PermissionController:getSubjectNames',
918+
],
919+
allowedEvents: [
920+
'NetworkController:stateChange',
921+
'PermissionController:stateChange',
922+
],
923+
}),
924+
state: initialState.SelectedNetworkController || { domains: {} },
925+
useRequestQueuePreference: !!process.env.MULTICHAIN_V1,
926+
// @ts-expect-error TODO: Resolve mismatch between PreferenceController versions.
927+
onPreferencesStateChange,
928+
domainProxyMap: new WeakRefObjectMap(),
929+
});
930+
902931
///: BEGIN:ONLY_INCLUDE_IF(preinstalled-snaps,external-snaps)
903932
const subjectMetadataController = new SubjectMetadataController({
904933
// eslint-disable-next-line @typescript-eslint/ban-ts-comment

package.json

+6-5
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@
167167
"@metamask/message-signing-snap": "^0.3.3",
168168
"@metamask/network-controller": "^19.0.0",
169169
"@metamask/notification-services-controller": "^0.2.1",
170-
"@metamask/permission-controller": "^9.0.0",
170+
"@metamask/permission-controller": "^11.0.0",
171171
"@metamask/phishing-controller": "^9.0.0",
172172
"@metamask/post-message-stream": "^8.0.0",
173173
"@metamask/ppom-validator": "0.32.0",
@@ -182,6 +182,7 @@
182182
"@metamask/rpc-errors": "^6.2.1",
183183
"@metamask/scure-bip39": "^2.1.0",
184184
"@metamask/sdk-communication-layer": "^0.28.1",
185+
"@metamask/selected-network-controller": "^15.0.2",
185186
"@metamask/signature-controller": "^16.0.0",
186187
"@metamask/slip44": "3.1.0",
187188
"@metamask/smart-transactions-controller": "11.0.0",
@@ -193,7 +194,7 @@
193194
"@metamask/swappable-obj-proxy": "^2.1.0",
194195
"@metamask/swaps-controller": "^9.0.2",
195196
"@metamask/transaction-controller": "^35.0.0",
196-
"@metamask/utils": "^8.1.0",
197+
"@metamask/utils": "^9.1.0",
197198
"@ngraveio/bc-ur": "^1.1.6",
198199
"@notifee/react-native": "^7.8.2",
199200
"@react-native-async-storage/async-storage": "^1.23.1",
@@ -476,12 +477,14 @@
476477
"prettier-plugin-gherkin": "^1.1.1",
477478
"react-dom": "18.2.0",
478479
"react-native-cli": "2.0.1",
480+
"react-native-flipper": "^0.263.0",
479481
"react-native-launch-arguments": "^4.0.1",
480482
"react-native-performance": "^5.1.2",
481483
"react-native-storybook-loader": "^2.0.4",
482484
"react-native-svg-asset-plugin": "^0.5.0",
483485
"react-native-svg-transformer": "^1.0.0",
484486
"react-test-renderer": "18.2.0",
487+
"redux-flipper": "^2.0.3",
485488
"regenerator-runtime": "0.13.9",
486489
"rn-nodeify": "10.3.0",
487490
"serve-handler": "^6.1.5",
@@ -493,9 +496,7 @@
493496
"webpack-cli": "^5.1.4",
494497
"xhr2": "^0.2.1",
495498
"xml2js": "^0.5.0",
496-
"yarn-deduplicate": "^6.0.2",
497-
"redux-flipper": "^2.0.3",
498-
"react-native-flipper": "^0.263.0"
499+
"yarn-deduplicate": "^6.0.2"
499500
},
500501
"config": {
501502
"react-native-storybook-loader": {

yarn.lock

+13-1
Original file line numberDiff line numberDiff line change
@@ -4952,7 +4952,7 @@
49524952
immer "^9.0.6"
49534953
nanoid "^3.1.31"
49544954

4955-
"@metamask/permission-controller@^9.0.0", "@metamask/permission-controller@^9.0.2":
4955+
"@metamask/permission-controller@^9.0.2":
49564956
version "9.1.1"
49574957
resolved "https://registry.yarnpkg.com/@metamask/permission-controller/-/permission-controller-9.1.1.tgz#de8c15438afa4ef65e419c20f358799924fc3f2c"
49584958
integrity sha512-h4EakReO5JFDZBIAjXXOiwaMGqrQvNp6/6kQfDYREvT+tIpjGD5JUaqgwBblLkPCLeip57hIqxeobPlgmCfATA==
@@ -5215,6 +5215,18 @@
52155215
utf-8-validate "^5.0.2"
52165216
uuid "^8.3.2"
52175217

5218+
"@metamask/selected-network-controller@^15.0.2":
5219+
version "15.0.2"
5220+
resolved "https://registry.yarnpkg.com/@metamask/selected-network-controller/-/selected-network-controller-15.0.2.tgz#6373156a1e837839ea771b61aa065f69b47a90c9"
5221+
integrity sha512-B4jZO0g49NwK78Zh391UOZsGYlHlWw/GMVkb9rXDLBYpbXSgiVMb5mdgdfqSWvi2YnFuwiCDPTszwBTM+M+aLA==
5222+
dependencies:
5223+
"@metamask/base-controller" "^6.0.0"
5224+
"@metamask/json-rpc-engine" "^9.0.0"
5225+
"@metamask/network-controller" "^19.0.0"
5226+
"@metamask/permission-controller" "^10.0.0"
5227+
"@metamask/swappable-obj-proxy" "^2.2.0"
5228+
"@metamask/utils" "^8.3.0"
5229+
52185230
"@metamask/signature-controller@^16.0.0":
52195231
version "16.0.0"
52205232
resolved "https://registry.yarnpkg.com/@metamask/signature-controller/-/signature-controller-16.0.0.tgz#78c7f23d02da99d4e953eb9b4e8e2909523a3288"

0 commit comments

Comments
 (0)