fix: Prevent invalid selectedNetworkClientId on startup by mcmire · Pull Request #33480 · MetaMask/metamask-extension

mcmire · 2025-06-04T19:37:49Z

Description

If selectedNetworkClientId in NetworkController state does not point to an RPC endpoint and therefore does not also point to a network client, then we automatically correct it to point to the default RPC endpoint of the first network (sorted by chain ID). This allows the wallet to start normally.

This change is being added as a patch because we do not want to upgrade to 23.5.1, as doing so would fix another unrelated bug, and we want to limit the scope of the change.

Related issues

See MetaMask/core#5851 for the equivalent changes to network-controller that were copied here.

Also see MetaMask/metamask-mobile#15941 for a similar fix on the mobile side.

Manual testing steps

Check out this branch.
Run yarn start.
Open the extension, and go through onboarding.
Close the UI.
Find the extension and open the service worker.
Navigate to the Application tab.
Click on "Extension storage", then "Local".
Click on the value for "data".
Look in the preview pane below (rendered JSON), right-click and choose "Copy value".
Paste the value in another screen such as TextEdit.
Look for selectedNetworkClientId and change it to something invalid.
Reload the extension.
The extension should still load successfully.
Go back to the service worker. You should still be on the Application tab, and the preview should have been updated so that selectedNetworkClientId should no longer be invalid.
Repeat the same steps, except run yarn webpack --watch instead of yarn start (to test MV2).

Screenshots/Recordings

(N/A)

Before

After

Pre-merge author checklist

I've followed MetaMask Contributor Docs and MetaMask Extension Coding Standards.
I've completed the PR template to the best of my ability
I’ve included tests if applicable
I’ve documented my code using JSDoc format if applicable
I’ve applied the right labels on the PR (see labeling guidelines). Not required for external contributors.

Pre-merge reviewer checklist

I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed).
I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots.

github-actions · 2025-06-04T19:38:00Z

CLA Signature Action: All authors have signed the CLA. You may need to manually re-run the blocking PR check if it doesn't pass in a few minutes.

If `selectedNetworkClientId` in NetworkController state does not point to an RPC endpoint and therefore does not also point to a network client, then we automatically correct it to point to the default RPC endpoint of the first network (sorted by chain ID). This allows the wallet to start normally. This change is being added as a patch because we do not want to upgrade to 23.5.1, as doing so would fix another unrelated bug, and we want to limit the scope of the change.

mcmire · 2025-06-04T20:06:47Z

@metamaskbot update-policies

metamaskbot · 2025-06-04T20:23:09Z

Policies updated.
👀 Please review the diff for suspicious new powers.

🧠 Learn how: https://lavamoat.github.io/guides/policy-diff/#what-to-look-for-when-reviewing-a-policy-diff

metamaskbot · 2025-06-04T20:25:35Z

✨ Files requiring CODEOWNER review ✨

🧩 @MetaMask/extension-devs

lavamoat/browserify/beta/policy.json
lavamoat/browserify/flask/policy.json
lavamoat/browserify/main/policy.json

📜 @MetaMask/policy-reviewers

Tip

Follow the policy review process outlined in the LavaMoat Policy Review Process doc before expecting an approval from Policy Reviewers.

lavamoat/browserify/beta/policy.json
lavamoat/browserify/flask/policy.json
lavamoat/browserify/main/policy.json

🔗 @MetaMask/supply-chain

lavamoat/browserify/beta/policy.json
lavamoat/browserify/flask/policy.json
lavamoat/browserify/main/policy.json

metamaskbot · 2025-06-04T20:57:28Z

Builds ready [eb9ee9a]

builds: chrome, firefox
builds (beta): chrome
builds (flask): chrome, firefox
builds (test): chrome, firefox
builds (test-flask): chrome, firefox
build viz: Build System
bundle size: Bundle Size Stats
user-actions-benchmark: User Actions Stats
storybook: Storybook
typescript migration: Dashboard
all CircleCI artifacts
bundle viz:
- background: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9
- common: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13
- ui: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13
- content-script: 0
- offscreen: 0

UI Startup Metrics (1184 ± 71 ms)

Platform	BuildType	Page	Metric	Mean (ms)	Min (ms)	Max (ms)	Std Dev (ms)	P 75 (ms)	P 95 (ms)
Chrome	Browserify	Home	uiStartup	1184	1071	1530	71	1217	1309
			load	1013	917	1174	57	1051	1122
			domContentLoaded	1006	908	1165	57	1045	1116
			domInteractive	16	13	38	5	16	28
			firstPaint	667	129	1150	401	1022	1106
			backgroundConnect	7	4	29	4	7	13
			firstReactRender	21	16	49	6	21	32
			getState	16	5	129	15	20	32
			initialActions	0	0	1	0	0	1
			loadScripts	799	696	949	55	836	903
			setupStore	8	5	27	3	9	14
	Webpack	Home	uiStartup	2118	1706	2521	199	2264	2440
			load	1641	1323	1943	150	1750	1864
			domContentLoaded	1634	1320	1934	148	1745	1852
			domInteractive	15	11	56	9	12	42
			firstPaint	155	66	375	56	177	267
			backgroundConnect	22	9	45	7	27	36
			firstReactRender	156	43	361	116	301	348
			getState	19	4	321	48	12	33
			initialActions	3	1	7	1	3	5
			loadScripts	1631	1318	1931	147	1743	1841
			setupStore	23	6	309	43	18	43
Firefox	Browserify	Home	uiStartup	1288	1121	1807	122	1323	1546
			load	1138	999	1658	112	1178	1383
			domContentLoaded	1138	998	1657	112	1177	1383
			domInteractive	96	35	242	32	103	171
			firstPaint	NaN	NaN	NaN	NaN	NaN	NaN
			backgroundConnect	20	12	140	15	20	39
			firstReactRender	23	19	48	4	23	30
			getState	7	4	24	2	8	10
			initialActions	0	0	1	0	0	1
			loadScripts	1120	982	1621	107	1164	1364
			setupStore	10	4	208	27	6	21
	Webpack	Home	uiStartup	1606	1360	2300	184	1681	2042
			load	1395	1177	1897	169	1490	1825
			domContentLoaded	1395	1177	1897	169	1489	1825
			domInteractive	83	36	161	22	91	139
			firstPaint	NaN	NaN	NaN	NaN	NaN	NaN
			backgroundConnect	21	15	66	6	23	32
			firstReactRender	42	27	53	4	45	50
			getState	8	4	29	3	9	14
			initialActions	1	0	2	1	1	1
			loadScripts	1376	1159	1876	168	1469	1806
			setupStore	8	5	80	8	8	12

Benchmark value 16 exceeds gate value 15 for chrome browserify home mean getState
Benchmark value 11 exceeds gate value 9 for firefox browserify home mean setupStore
Benchmark value 1395 exceeds gate value 1380 for firefox webpack home mean load
Benchmark value 1395 exceeds gate value 1380 for firefox webpack home mean domContentLoaded
Benchmark value 42 exceeds gate value 38 for firefox webpack home mean firstReactRender
Benchmark value 1377 exceeds gate value 1360 for firefox webpack home mean loadScripts
Benchmark value 2042 exceeds gate value 1935 for firefox webpack home p95 uiStartup
Benchmark value 1825 exceeds gate value 1660 for firefox webpack home p95 load
Benchmark value 1825 exceeds gate value 1660 for firefox webpack home p95 domContentLoaded
Benchmark value 1806 exceeds gate value 1630 for firefox webpack home p95 loadScripts
Sum of mean exceeds: 54ms | Sum of p95 exceeds: 613ms
Sum of all benchmark exceeds: 667ms

metamaskbot added the team-wallet-framework label Jun 4, 2025

mcmire changed the title ~~Prevent invalid selectedNetworkClientId on startup~~ fix: Prevent invalid selectedNetworkClientId on startup Jun 4, 2025

mcmire force-pushed the fix-incident-1051 branch from 47fc2a2 to 678bbd7 Compare June 4, 2025 19:49

Update LavaMoat policies

eb9ee9a

DDDDDanica marked this pull request as ready for review June 4, 2025 22:23

DDDDDanica requested review from a team as code owners June 4, 2025 22:23

DDDDDanica merged commit 329624c into chore/master-sync-12.20.0 Jun 4, 2025
148 of 152 checks passed

DDDDDanica deleted the fix-incident-1051 branch June 4, 2025 22:23

github-actions bot locked and limited conversation to collaborators Jun 4, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: Prevent invalid selectedNetworkClientId on startup#33480

fix: Prevent invalid selectedNetworkClientId on startup#33480
DDDDDanica merged 2 commits intochore/master-sync-12.20.0from
fix-incident-1051

mcmire commented Jun 4, 2025 •

edited

Loading

Uh oh!

github-actions bot commented Jun 4, 2025

Uh oh!

mcmire commented Jun 4, 2025

Uh oh!

metamaskbot commented Jun 4, 2025

Uh oh!

metamaskbot commented Jun 4, 2025

Uh oh!

metamaskbot commented Jun 4, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

mcmire commented Jun 4, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Related issues

Manual testing steps

Screenshots/Recordings

Before

After

Pre-merge author checklist

Pre-merge reviewer checklist

Uh oh!

github-actions bot commented Jun 4, 2025

Uh oh!

mcmire commented Jun 4, 2025

Uh oh!

metamaskbot commented Jun 4, 2025

Uh oh!

metamaskbot commented Jun 4, 2025

✨ Files requiring CODEOWNER review ✨

Uh oh!

metamaskbot commented Jun 4, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

mcmire commented Jun 4, 2025 •

edited

Loading